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

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

@@ -6 +6 @@
 
 import de.ugoe.cs.eventbench.ReplayGenerator;
-import de.ugoe.cs.eventbench.data.Event;
+import de.ugoe.cs.eventbench.SequenceInstanceOf;
 import de.ugoe.cs.eventbench.data.GlobalDataContainer;
 import de.ugoe.cs.eventbench.data.ReplayableEvent;
@@ -13 +13 @@
 
 /**
- * <p>Command to create a replay file from stored sessions.</p>
+ * <p>
+ * Command to create a replay file from stored sessions.
+ * </p>
+ * 
  * @author Steffen Herbold
  * @version 1.0
@@ -19 +22 @@
 public class CMDgenerateReplayfile implements Command {
 
-        /* (non-Javadoc)
+        /*
+         * (non-Javadoc)
+         * 
          * @see de.ugoe.cs.util.console.Command#help()
          */
         @Override
         public void help() {
-                Console.println("Usage: generateReplayfile <filename> {<sequences>}");          
+                Console.println("Usage: generateReplayfile <filename> {<sequences>}");
         }
 
-        /* (non-Javadoc)
+        /*
+         * (non-Javadoc)
+         * 
          * @see de.ugoe.cs.util.console.Command#run(java.util.List)
          */
@@ -33 +40 @@
         @Override
         public void run(List<Object> parameters) {
-                if( parameters.size() < 1 ) {
+                if (parameters.size() < 1) {
                         throw new InvalidParameterException();
                 }
                 String filename = (String) parameters.get(0);
                 String sequencesName = "sequences";
-                if( parameters.size()==2 ) {
+                if (parameters.size() == 2) {
                         sequencesName = (String) parameters.get(1);
                 }
-                
+
                 Collection<List<ReplayableEvent<?>>> sequences = null;
-                Object dataObject = GlobalDataContainer.getInstance().getData(sequencesName);
-                        
-                try {
-                        sequences = (Collection<List<ReplayableEvent<?>>>) dataObject;
-                        ReplayGenerator generator = new ReplayGenerator();
-                        if( sequences!=null && sequences.size()>0 && sequences.iterator().next().get(0) instanceof Event ) {
-                                generator.createLogfileMultipleSessions(sequences, filename);
-                        } else {
-                                Console.printerrln("Loaded data not are not sequences!");
-                                if( sequencesName.equals("sequences") ) { 
-                                        Console.traceln("Illegal use of \"sequences\" parameter in the GlobalDataContainer.");
-                                        Console.traceln("The parameter should always be of type Collection<List<Event>>!");
-                                }
-                        }
+                Object dataObject = GlobalDataContainer.getInstance().getData(
+                                sequencesName);
+                if (dataObject == null) {
+                        Console.println("Object " + sequencesName
+                                        + " not found in storage.");
+                        return;
                 }
-                catch(ClassCastException e) {
-                        Console.printerrln("Sequences not found");
+                if (!SequenceInstanceOf.isCollectionOfSequences(dataObject)) {
+                        Console.println("Object " + sequencesName
+                                        + "not of type Collection<List<Event<?>>>.");
+                        return;
                 }
-                
+
+                sequences = (Collection<List<ReplayableEvent<?>>>) dataObject;
+                ReplayGenerator generator = new ReplayGenerator();
+                generator.createLogfileMultipleSessions(sequences, filename);
         }