Changeset 209 for trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/data/GlobalDataContainer.java

Timestamp:

09/28/11 03:03:13 (13 years ago)

Author:

sherbold

Message:

• greatly improved type checking and consistency of type checking for objects checked out of the GlobalDataContainer?

File:

• trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/data/GlobalDataContainer.java (modified) (2 diffs)

trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/data/GlobalDataContainer.java

@@ -8 +8 @@
 import java.util.HashMap;
 import java.util.LinkedList;
-import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 
+import de.ugoe.cs.eventbench.SequenceInstanceOf;
 import de.ugoe.cs.eventbench.models.IStochasticProcess;
 
@@ -188 +188 @@
                 Collection<String> allSequencesNames = new LinkedList<String>();
                 for (Entry<String, Object> entry : dataObjects.entrySet()) {
-                        if (entry.getValue() instanceof Collection<?>) {
-                                Object listObj = ((Collection<?>) entry.getValue()).iterator()
-                                                .next();
-                                if (listObj instanceof List<?>) {
-                                        if (((List<?>) listObj).iterator().next() instanceof Event<?>) {
-                                                allSequencesNames.add(entry.getKey());
-                                        }
-                                }
+                        if( SequenceInstanceOf.isCollectionOfSequences(entry.getValue())) {
+                                allSequencesNames.add(entry.getKey());
                         }
                 }