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

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

@@ -5 +5 @@
 import java.util.List;
 
+import de.ugoe.cs.eventbench.SequenceInstanceOf;
 import de.ugoe.cs.eventbench.coverage.CoverageCalculatorObserved;
 import de.ugoe.cs.eventbench.coverage.CoverageCalculatorProcess;
@@ -68 +69 @@
                         return;
                 }
-                if (!(dataObjectObserved instanceof Collection<?>)) {
-                        // weak instance check!
-                        Console.printerrln("Object " + observedName + " not a Collection!");
+                if (!SequenceInstanceOf.isCollectionOfSequences(dataObjectObserved)) {
+                        Console.printerrln("Object " + observedName
+                                        + " of type Collection<List<Event<?>>>!");
                         return;
                 }
@@ -98 +99 @@
                                 Console.println("Sequences " + sequenceName
                                                 + " not found in storage.");
-                        } else if (!(dataObjectSequences instanceof Collection<?>)) {
-                                // cannot really perform type check at runtime! this is an
-                                // approximative substitute
+                                return;
+                        } else if (!SequenceInstanceOf
+                                        .isCollectionOfSequences(dataObjectSequences)) {
                                 Console.printerrln("Object " + sequenceName
-                                                + "not of type Collection<?>!");
+                                                + "not of type Collection<List<Event<?>!");
                                 return;
                         }