This commit was manufactured by cvs2svn to create tag
'Root_R1_2_0_M1_BRANCH'.
diff --git a/plugins/org.eclipse.epf.library.edit/src/org/eclipse/epf/library/edit/navigator/PluginUIPackagesItemProvider.java b/plugins/org.eclipse.epf.library.edit/src/org/eclipse/epf/library/edit/navigator/PluginUIPackagesItemProvider.java
index 1fef8fe..2578f1b 100755
--- a/plugins/org.eclipse.epf.library.edit/src/org/eclipse/epf/library/edit/navigator/PluginUIPackagesItemProvider.java
+++ b/plugins/org.eclipse.epf.library.edit/src/org/eclipse/epf/library/edit/navigator/PluginUIPackagesItemProvider.java
@@ -229,7 +229,7 @@
super.dispose();
}
- private synchronized void retainPluginPackagesItemProviders(Collection<String> names) {
+ private void retainPluginPackagesItemProviders(Collection<String> names) {
for (Iterator<String> iter = pluginPackagesItemProvidersMap.keySet().iterator();iter.hasNext();) {
String keyName = iter.next();
if (!names.contains(keyName)) {
diff --git a/plugins/org.eclipse.epf.library.edit/src/org/eclipse/epf/library/edit/util/ContentElementOrderList.java b/plugins/org.eclipse.epf.library.edit/src/org/eclipse/epf/library/edit/util/ContentElementOrderList.java
index feceead..e7b9973 100755
--- a/plugins/org.eclipse.epf.library.edit/src/org/eclipse/epf/library/edit/util/ContentElementOrderList.java
+++ b/plugins/org.eclipse.epf.library.edit/src/org/eclipse/epf/library/edit/util/ContentElementOrderList.java
@@ -14,12 +14,10 @@
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
-import java.util.HashSet;
import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
-import java.util.Set;
import org.eclipse.emf.common.util.AbstractTreeIterator;
import org.eclipse.emf.common.util.BasicEList;
@@ -32,6 +30,7 @@
import org.eclipse.epf.uma.ContentElement;
import org.eclipse.epf.uma.CustomCategory;
import org.eclipse.epf.uma.DescribableElement;
+import org.eclipse.epf.uma.Section;
import org.eclipse.epf.uma.VariabilityElement;
import org.eclipse.epf.uma.VariabilityType;
import org.eclipse.epf.uma.util.AssociationHelper;
@@ -183,7 +182,7 @@
//
OrderInfo latestInfo = null;
Map guidMap = new HashMap();
- Set elements = new HashSet();
+ List elements = new LinkedList();
while (iter.hasNext()) {
ContentElement element = (ContentElement) iter.next();
guidMap.put(element.getGuid(), element);
diff --git a/plugins/org.eclipse.epf.library.edit/src/org/eclipse/epf/library/edit/util/SectionList.java b/plugins/org.eclipse.epf.library.edit/src/org/eclipse/epf/library/edit/util/SectionList.java
index 235e9ca..869f8d3 100755
--- a/plugins/org.eclipse.epf.library.edit/src/org/eclipse/epf/library/edit/util/SectionList.java
+++ b/plugins/org.eclipse.epf.library.edit/src/org/eclipse/epf/library/edit/util/SectionList.java
@@ -14,12 +14,10 @@
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
-import java.util.HashSet;
import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
-import java.util.Set;
import org.eclipse.emf.common.util.AbstractTreeIterator;
import org.eclipse.emf.common.util.BasicEList;
@@ -122,7 +120,7 @@
//
OrderInfo latestInfo = null;
Map guidSectionMap = new HashMap();
- Set sects = new HashSet();
+ List sects = new LinkedList();
while (iter.hasNext()) {
ContentElement element = (ContentElement) iter.next();
if (ContentDescriptionFactory.hasPresentation(element)) {