Changeset 209 for trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/commands/CMDupdateModel.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/commands/CMDupdateModel.java (modified) (3 diffs)

trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/commands/CMDupdateModel.java

@@ -5 +5 @@
 import java.util.List;
 
+import de.ugoe.cs.eventbench.SequenceInstanceOf;
 import de.ugoe.cs.eventbench.data.Event;
 import de.ugoe.cs.eventbench.data.GlobalDataContainer;
@@ -39 +40 @@
                 }
 
-                Collection<List<Event<?>>> sequences = null;
                 Object dataObject = GlobalDataContainer.getInstance().getData(
                                 sequencesName);
@@ -47 +47 @@
                         return;
                 }
-                try {
-                        sequences = (Collection<List<Event<?>>>) dataObject;
-                } catch (ClassCastException e) {
-                        Console.println("Object " + sequencesName
-                                        + "not of type Collection<List<Event<?>>>.");
-                }
-                if (sequences.size() == 0
-                                || !(sequences.iterator().next().get(0) instanceof Event)) {
+                if (!SequenceInstanceOf.isCollectionOfSequences(dataObject)) {
                         Console.println("Object " + sequencesName
                                         + "not of type Collection<List<Event<?>>>.");
                         return;
                 }
+                Collection<List<Event<?>>> sequences = (Collection<List<Event<?>>>) dataObject;
 
                 dataObject = GlobalDataContainer.getInstance().getData(modelname);
                 if (dataObject == null) {
-                        Console.println("Model " + modelname + " not found in storage.");
+                        Console.println("Object " + modelname + " not found in storage.");
                         return;
                 }
                 if (!(dataObject instanceof TrieBasedModel)) {
                         Console.println("Object " + modelname
-                                        + " not of type TrieBasedModel!");
+                                        + " not of type TrieBasedModel");
                         return;
                 }
+
                 TrieBasedModel model = (TrieBasedModel) dataObject;
                 model.update(sequences);