Index: lams_build/3rdParty.userlibraries
===================================================================
diff -u -ra03d663fb89c9c0ebafef753314cc5da82f7aaa1 -r5b6ae6b7ee8ace9fe2d02d76b5b5763149b07cf6
--- lams_build/3rdParty.userlibraries (.../3rdParty.userlibraries) (revision a03d663fb89c9c0ebafef753314cc5da82f7aaa1)
+++ lams_build/3rdParty.userlibraries (.../3rdParty.userlibraries) (revision 5b6ae6b7ee8ace9fe2d02d76b5b5763149b07cf6)
@@ -11,7 +11,6 @@
-
@@ -33,5 +32,6 @@
+
Index: lams_build/lib/xstream/xstream-1.5.0-SNAPSHOT.jar
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r5b6ae6b7ee8ace9fe2d02d76b5b5763149b07cf6
Binary files differ
Index: lams_build/lib/xstream/xstream.module.xml
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r5b6ae6b7ee8ace9fe2d02d76b5b5763149b07cf6
--- lams_build/lib/xstream/xstream.module.xml (.../xstream.module.xml) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_build/lib/xstream/xstream.module.xml (.../xstream.module.xml) (revision 5b6ae6b7ee8ace9fe2d02d76b5b5763149b07cf6)
@@ -24,7 +24,7 @@
-
+
Index: lams_build/liblist.txt
===================================================================
diff -u -rb69db8c0c19115290e73865c3c51b408b78f41c9 -r5b6ae6b7ee8ace9fe2d02d76b5b5763149b07cf6
--- lams_build/liblist.txt (.../liblist.txt) (revision b69db8c0c19115290e73865c3c51b408b78f41c9)
+++ lams_build/liblist.txt (.../liblist.txt) (revision 5b6ae6b7ee8ace9fe2d02d76b5b5763149b07cf6)
@@ -52,6 +52,6 @@
urlrewritefilter urlrewritefilter-4.0.3.jar 4.0.3 BSD License tuckey.org Java Web Filter which allows rewriting URLs
-xstream xstream-1.5.0-SNAPSHOT.jar 1.5.0 XML serializer
+xstream xstream-1.4.10.jar 1.4.10 XML serializer
yuicompressor yuicompressor-2.4.9 2.4.9 BSD License YUI CSS and JS minifier
Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java
===================================================================
diff -u -r671c0123933f9264962a7a2a9aba940ded111d57 -r5b6ae6b7ee8ace9fe2d02d76b5b5763149b07cf6
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java (.../ExportToolContentService.java) (revision 671c0123933f9264962a7a2a9aba940ded111d57)
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java (.../ExportToolContentService.java) (revision 5b6ae6b7ee8ace9fe2d02d76b5b5763149b07cf6)
@@ -302,7 +302,7 @@
private class FileConverter implements Converter {
private Converter defaultConverter;
- private List fileNodes = new ArrayList();
+ private List fileNodes = new ArrayList<>();
public FileConverter(XStream xstream) {
this.defaultConverter = new ReflectionConverter(xstream.getMapper(), xstream.getReflectionProvider());
@@ -313,7 +313,7 @@
}
@Override
- public boolean canConvert(Class type) {
+ public boolean canConvert(Class type) {
for (NameInfo info : fileHandleClassList) {
if (info.className.equals(type.getName())) {
log.debug("XStream will handle [" + info.className + "] as file node class.");
@@ -387,7 +387,7 @@
* Default contructor method.
*/
public ExportToolContentService() {
- fileHandleClassList = new ArrayList();
+ fileHandleClassList = new ArrayList<>();
}
/**
@@ -416,7 +416,7 @@
* learning design DTO is ready to be written into XML, but we need to find out which groupings and
* branching mappings are not supposed to be included into the structure (LDEV-1825)
*/
- Set groupingsToSkip = new TreeSet();
+ Set groupingsToSkip = new TreeSet<>();
// iterator all activities in this learning design and export
// their content to given folder.
@@ -634,7 +634,7 @@
Object[] ldResults = new Object[3];
Long ldId = null;
- List ldErrorMsgs = new ArrayList();
+ List ldErrorMsgs = new ArrayList<>();
String filename = designFile.getName();
String extension = (filename != null) && (filename.length() >= 4) ? filename.substring(filename.length() - 4)
: "";
@@ -692,8 +692,8 @@
log.debug("Learning design xml deserialize to LearingDesignDTO success.");
// begin tool import
- Map toolMapper = new HashMap();
- Map removedActMap = new HashMap();
+ Map toolMapper = new HashMap<>();
+ Map removedActMap = new HashMap<>();
List activities = ldDto.getActivities();
// LDs with version 3.0.2 have already correct paths
boolean rewriteResourcePaths = !VersionUtil.isSameOrLaterVersion("3.0.2", importedFileVersion);
@@ -1031,7 +1031,7 @@
File toolFile = new File(toolFilePath);
Path path = toolFile.toPath();
List oldLines = Files.readAllLines(path);
- List newLines = new LinkedList();
+ List newLines = new LinkedList<>();
for (String oldLine : oldLines) {
String newLine = oldLine.replaceAll(oldPath, newPath);
newLines.add(newLine);
@@ -1082,7 +1082,7 @@
Object filter = filterClass.newInstance();
Method[] methods = filterClass.getDeclaredMethods();
- Map methodNeeds = new TreeMap();
+ Map methodNeeds = new TreeMap<>();
for (Method method : methods) {
String name = method.getName();
if (name.startsWith(filterMethodPrefix)) {
@@ -1160,8 +1160,8 @@
// grouping object list
List groupingDtoList = dto.getGroupings();
- Map groupingMapper = new HashMap();
- Map groupByUIIDMapper = new HashMap();
+ Map groupingMapper = new HashMap<>();
+ Map groupByUIIDMapper = new HashMap<>();
for (GroupingDTO groupingDto : groupingDtoList) {
Grouping grouping = getGrouping(groupingDto, groupByUIIDMapper);
groupingMapper.put(grouping.getGroupingId(), grouping);
@@ -1185,8 +1185,8 @@
}
}
Set actList = new TreeSet(new ActivityOrderComparator());
- Map activityMapper = new HashMap();
- Map activityByUIIDMapper = new HashMap();
+ Map activityMapper = new HashMap<>();
+ Map activityByUIIDMapper = new HashMap<>();
// as we create the activities, we need to record any "default
// activities" for the sequence activity
@@ -1195,7 +1195,7 @@
// been created yet and if we leave it till later and then find all the
// activities we are
// going through the activity set over and over again for no reason.
- Map defaultActivityToParentActivityMapping = new HashMap();
+ Map defaultActivityToParentActivityMapping = new HashMap<>();
for (AuthoringActivityDTO actDto : actDtoList) {
Activity act = getActivity(actDto, groupingMapper, toolMapper, defaultActivityToParentActivityMapping);
@@ -1366,7 +1366,7 @@
// transition object list
List transDtoList = dto.getTransitions();
- Set transList = new HashSet();
+ Set transList = new HashSet<>();
for (TransitionDTO transDto : transDtoList) {
// Any transitions relating with this tool will be removed!
Long fromId = transDto.getFromActivityID();
@@ -1384,7 +1384,7 @@
}
// Once the learning design is saved, we can import the competences
- Set competenceList = new HashSet();
+ Set competenceList = new HashSet<>();
if (dto.getCompetences() != null) {
for (CompetenceDTO competenceDTO : dto.getCompetences()) {
Competence competence = new Competence();
@@ -1397,7 +1397,7 @@
// branch mappings - maps groups to branches, map conditions to branches
List entryDtoList = dto.getBranchMappings();
if (entryDtoList != null) {
- Set entryList = new HashSet();
+ Set entryList = new HashSet<>();
for (BranchActivityEntryDTO entryDto : entryDtoList) {
BranchActivityEntry entry = getBranchActivityEntry(entryDto, groupByUIIDMapper, activityByUIIDMapper);
entryList.add(entry);
@@ -1431,7 +1431,7 @@
}
// Once we have the competences saved, we can save the competence mappings
- Set allCompetenceMappings = new HashSet();
+ Set allCompetenceMappings = new HashSet<>();
for (AuthoringActivityDTO actDto : actDtoList) {
if (removedActMap.containsKey(actDto.getActivityID())) {
continue;
@@ -1466,8 +1466,8 @@
* @return
*/
private List getSortedParentList(List activities) {
- List result = new ArrayList();
- List actIdList = new ArrayList();
+ List result = new ArrayList<>();
+ List actIdList = new ArrayList<>();
// NOTICE: this code can not handle all nodes have their parents, ie,
// there is at least one node parent is