Changeset 229 for trunk/EventBenchConsole/src/de

Timestamp:

10/03/11 23:06:06 (13 years ago)

Author:

sherbold

Message:

 

Location:

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

Files:

• commands/CMDshowSequences.java (modified) (2 diffs)
• swing/DlgInsert.java (modified) (3 diffs)
• swing/DlgSequenceDetails.java (modified) (1 diff)
• swing/DlgSequences.java (modified) (1 diff)
• windows/commands/CMDparseXML.java (modified) (2 diffs)
• windows/data/WindowTree.java (modified) (4 diffs)

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

@@ -11 +11 @@
 import de.ugoe.cs.eventbench.data.Event;
 
+/**
+ * <p>
+ * Command to show sequences.
+ * </p>
+ * 
+ * @author Jeffrey Hall, Steffen Herbold
+ */
 public class CMDshowSequences implements Command {
 
+        /*
+         * (non-Javadoc)
+         * 
+         * @see de.ugoe.cs.util.console.Command#help()
+         */
+        @Override
         public void help() {
                 Console.println("Usage: showSequences");
         }
 
+        /*
+         * (non-Javadoc)
+         * 
+         * @see de.ugoe.cs.util.console.Command#run(java.util.List)
+         */
         @SuppressWarnings("unchecked")
+        @Override
         public void run(List<Object> parameters) {
 
@@ -36 +55 @@
                 } else {
 
+                        // TODO use SWT-GUI instead
                         DlgSequences.showDialog();
 

trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/swing/DlgInsert.java

@@ -45 +45 @@
  * @author Jeffrey Hall
  * @version 1.0
+ * @deprecated Use SWT-GUI for modifying sequences.
  */
 public class DlgInsert extends JDialog {
@@ -498 +499 @@
                                 return false;
                         } else {
-                                FileEqualsReplay file = new FileEqualsReplay();
-                                file.setActualFile(textFieldActualFile.getText());
-                                file.setExpectedFile(textFieldExpectedFile.getText());
+                                FileEqualsReplay file = new FileEqualsReplay(textFieldExpectedFile.getText(), textFieldActualFile.getText());
 
                                 AssertEvent<FileEqualsReplay> e = new AssertEvent<FileEqualsReplay>(
@@ -546 +545 @@
                                 // ***
 
-                                TextEqualsReplay text = new TextEqualsReplay();
-                                text.setExpectedValue(textFieldExpectedValue.getText());
-                                text.setTarget(target);
+                                TextEqualsReplay text = new TextEqualsReplay(textFieldExpectedValue.getText(),target);
 
                                 AssertEvent<TextEqualsReplay> e = new AssertEvent<TextEqualsReplay>(

trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/swing/DlgSequenceDetails.java

@@ -37 +37 @@
  * @author Jeffrey Hall
  * @version 1.0
+ * @deprecated Use SWT-GUI for modifying sequences.
  */
 public class DlgSequenceDetails {

trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/swing/DlgSequences.java

@@ -29 +29 @@
  * @author Jeffrey Hall
  * @version 1.0
+ * @deprecated Use SWT-GUI for modifying sequences.
  */
 public class DlgSequences {

trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/windows/commands/CMDparseXML.java

@@ -4 +4 @@
 import java.util.Collection;
 import java.util.List;
+import java.util.SortedSet;
 
 import de.ugoe.cs.eventbench.data.GlobalDataContainer;
 import de.ugoe.cs.eventbench.windows.LogParser;
+import de.ugoe.cs.eventbench.windows.data.WindowTree;
 import de.ugoe.cs.eventbench.windows.data.WindowsEvent;
 import de.ugoe.cs.util.console.Command;
@@ -60 +62 @@
 
                 Collection<List<WindowsEvent>> sequences = parser.getSequences();
+                SortedSet<String> targets = WindowTree.getInstance().getTargets();
 
                 if (GlobalDataContainer.getInstance().addData(sequencesName, sequences)) {
                         Console.traceln("Old data \"" + sequencesName + "\" overwritten");
                 }
+                if( GlobalDataContainer.getInstance().addData(sequencesName+"_targets", targets)) {
+                        Console.traceln("Old data \"" + sequencesName+"_targets" + "\" overwritten");
+                }
         }
 

trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/windows/data/WindowTree.java

@@ -5 +5 @@
 import java.util.Map;
 import java.util.SortedSet;
-import java.util.TreeSet;
-
-import de.ugoe.cs.eventbench.data.GlobalDataContainer;
-import de.ugoe.cs.util.console.Console;
 
 /**
@@ -39 +35 @@
          */
         private static WindowTree theInstance = null;
+
+        /**
+         * <p>
+         * Maintains a set of all the target strings of all widgets that were at
+         * some point part of the window tree.
+         * </p>
+         */
+        private SortedSet<String> targets;
 
         /**
@@ -112 +116 @@
                         }
                         nodes.put(childHwnd, child);
+                        targets.add(child.xmlRepresentation());
                 }
-
-                storeTarget(childHwnd);
         }
 
@@ -172 +175 @@
         /**
          * <p>
-         * Stores a target in GlobalDataContainer to be able to work on with it in
-         * DlgInsert
+         * Returns a sorted set of all targets that existed any time in the window
+         * tree.
          * </p>
          * 
-         * @param hwnd
-         *            hwnd of the window to be stored
+         * @return set of targets
          */
-        @SuppressWarnings("unchecked")
-        private void storeTarget(int hwnd) {
-                SortedSet<String> targets = new TreeSet<String>();
-
-                if (GlobalDataContainer.getInstance().getData("ListTargets") == null) {
-                        GlobalDataContainer.getInstance().addData("ListTargets", targets);
-                }
-
-                try {
-                        targets = (SortedSet<String>) GlobalDataContainer.getInstance().getData("ListTargets");
-                        targets.add(nodes.get(hwnd).xmlRepresentation());
-                } catch (ClassCastException e) {
-                        Console.println("Not able to cast data in GlobalDataContainer to SortedSet of Strings");
-                }               
+        public SortedSet<String> getTargets() {
+                return targets;
         }
 }