Changeset 235 for trunk/EventBenchConsole/src/de/ugoe/cs/eventbench

Timestamp:

10/05/11 00:59:21 (13 years ago)

Author:

sherbold

Message:

• added commands startTimer, showTimer for measuring time of experiments

Location:

trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/commands

Files:

• CMDshowSequences.java (modified) (4 diffs)
• CMDshowTimer.java (added)
• CMDstartTimer.java (added)

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

@@ -1 +1 @@
 package de.ugoe.cs.eventbench.commands;
 
-import java.security.InvalidParameterException;
-import java.util.Collection;
 import java.util.List;
 
-import de.ugoe.cs.eventbench.swing.DlgSequences;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.widgets.Shell;
+
+import de.ugoe.cs.eventbench.SequenceInstanceOf;
+import de.ugoe.cs.eventbench.data.GlobalDataContainer;
+import de.ugoe.cs.eventbench.swt.SequencesDialog;
 import de.ugoe.cs.util.console.Command;
 import de.ugoe.cs.util.console.Console;
-import de.ugoe.cs.eventbench.data.GlobalDataContainer;
-import de.ugoe.cs.eventbench.data.Event;
 
 /**
@@ -27 +28 @@
         @Override
         public void help() {
-                Console.println("Usage: showSequences");
+                Console.println("Usage: showSequences <sequencesName>");
         }
 
@@ -35 +36 @@
          * @see de.ugoe.cs.util.console.Command#run(java.util.List)
          */
-        @SuppressWarnings("unchecked")
         @Override
         public void run(List<Object> parameters) {
-
-                if (parameters.size() > 0)
-                        throw new InvalidParameterException();
-
-                Collection<List<Event<?>>> containedSequences = null;
-
-                try {
-                        containedSequences = (Collection<List<Event<?>>>) GlobalDataContainer
-                                        .getInstance().getData("sequences");
-                } catch (ClassCastException e) {
-                        Console.println("Unable to cast Data in GlobalDataContainer to List of Sequences");
+                String sequencesName = "sequences";
+                if (parameters.size() == 1) {
+                        sequencesName = (String) parameters.get(0);
                 }
 
-                if (containedSequences == null) {
-                        Console.printerrln("No sequences found.");
-                } else {
+                Object dataObject = GlobalDataContainer.getInstance().getData(
+                                sequencesName);
+                if (dataObject == null) {
+                        Console.println("Object " + sequencesName
+                                        + " not found in storage.");
+                        return;
+                }
+                if (!SequenceInstanceOf.isCollectionOfSequences(dataObject)) {
+                        Console.println("Object " + sequencesName
+                                        + "not of type Collection<List<Event<?>>>.");
+                        return;
+                }
 
-                        // TODO use SWT-GUI instead
-                        DlgSequences.showDialog();
-
+                // TODO use SWT-GUI instead
+                SequencesDialog sequencesDialog = new SequencesDialog(new Shell(), SWT.NONE);
+                sequencesDialog.open(sequencesName);
+                        /*
                         synchronized (Console.getInstance()) {
                                 try {
@@ -64 +66 @@
                                         e.printStackTrace();
                                 }
-                        }
-                }
+                        }*/
         }
 }