catch up with branch daily
Signed-off-by: Ralf Mollik <ramollik@compex-commerce.com>
diff --git a/org.eclipse.osbp.ecview.extension.strategy/src/org/eclipse/osbp/ecview/extension/strategy/AbstractLayoutingStrategy.java b/org.eclipse.osbp.ecview.extension.strategy/src/org/eclipse/osbp/ecview/extension/strategy/AbstractLayoutingStrategy.java
index 37c3781..72bbb4f 100644
--- a/org.eclipse.osbp.ecview.extension.strategy/src/org/eclipse/osbp/ecview/extension/strategy/AbstractLayoutingStrategy.java
+++ b/org.eclipse.osbp.ecview.extension.strategy/src/org/eclipse/osbp/ecview/extension/strategy/AbstractLayoutingStrategy.java
@@ -20,6 +20,7 @@
import java.util.Collections;
import java.util.Comparator;
import java.util.HashMap;
+import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
@@ -362,8 +363,13 @@
}
}
Collections.sort(suspectCollectionList, new SuspectComparator());
+ groupSuspects(suspectList, suspectCollectionList);
+ return suspectList;
+ }
+
+ private void groupSuspects(ArrayList<YSuspect> suspectList, ArrayList<YSuspect> suspectCollectionList) {
// sort by first appearance in entity
- HashMap<String, List<YSuspect>> suspectMap = new HashMap<>();
+ Map<String, List<YSuspect>> suspectMap = new LinkedHashMap<>();
List<String> suspectGroupList = new ArrayList<>();
for (YSuspect suspect : suspectList) {
if (suspect.getGroupName() == null) {
@@ -399,7 +405,6 @@
}
// add the collections for the following tabs
suspectList.addAll(suspectCollectionList);
- return suspectList;
}
/**
