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

Timestamp:

10/05/11 17:29:56 (13 years ago)

Author:

sherbold

Message:

• added class de.ugoe.cs.eventbench.CommandHelpers? that gathers methods that are often used by the commands, e.g., to display that an object has not been found in the GlobalDataContainer?.
• adapted commands to use CommandHelpers?

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.CommandHelpers;
 import de.ugoe.cs.eventbench.SequenceInstanceOf;
 import de.ugoe.cs.eventbench.coverage.CoverageCalculatorObserved;
@@ -57 +58 @@
                                 observedName);
                 if (dataObjectProcess == null) {
-                        Console.printerrln("Model " + modelname + " not found in storage.");
+                        CommandHelpers.objectNotFoundMessage(modelname);
                         return;
                 }
                 if (!(dataObjectProcess instanceof IStochasticProcess)) {
-                        Console.printerrln("Object " + modelname
-                                        + " not of type IStochasticProcess!");
+                        CommandHelpers.objectNotType(modelname, "IStochasticProcess");
                         return;
                 }
                 if (dataObjectObserved == null) {
-                        Console.printerrln("Observed sequences not found in storage.");
+                        CommandHelpers.objectNotFoundMessage(observedName);
                         return;
                 }
                 if (!SequenceInstanceOf.isCollectionOfSequences(dataObjectObserved)) {
-                        Console.printerrln("Object " + observedName
-                                        + " of type Collection<List<Event<?>>>!");
+                        CommandHelpers.objectNotType(observedName,
+                                        "Collection<List<Event<?>>>");
                         return;
                 }
@@ -97 +97 @@
                                         .getData(sequenceName);
                         if (dataObjectSequences == null) {
-                                Console.println("Sequences " + sequenceName
-                                                + " not found in storage.");
+                                CommandHelpers.objectNotFoundMessage(sequenceName);
                                 return;
                         } else if (!SequenceInstanceOf
                                         .isCollectionOfSequences(dataObjectSequences)) {
-                                Console.printerrln("Object " + sequenceName
-                                                + "not of type Collection<List<Event<?>!");
+                                CommandHelpers.objectNotType(sequenceName,
+                                                "Collection<List<Event<?>>>");
                                 return;
                         }