Index: trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/commands/CMDshowSequences.java =================================================================== --- trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/commands/CMDshowSequences.java (revision 228) +++ trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/commands/CMDshowSequences.java (revision 229) @@ -11,11 +11,30 @@ import de.ugoe.cs.eventbench.data.Event; +/** + *

+ * Command to show sequences. + *

+ * + * @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 parameters) { @@ -36,4 +55,5 @@ } else { + // TODO use SWT-GUI instead DlgSequences.showDialog(); Index: trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/swing/DlgInsert.java =================================================================== --- trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/swing/DlgInsert.java (revision 228) +++ trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/swing/DlgInsert.java (revision 229) @@ -45,4 +45,5 @@ * @author Jeffrey Hall * @version 1.0 + * @deprecated Use SWT-GUI for modifying sequences. */ public class DlgInsert extends JDialog { @@ -498,7 +499,5 @@ return false; } else { - FileEqualsReplay file = new FileEqualsReplay(); - file.setActualFile(textFieldActualFile.getText()); - file.setExpectedFile(textFieldExpectedFile.getText()); + FileEqualsReplay file = new FileEqualsReplay(textFieldExpectedFile.getText(), textFieldActualFile.getText()); AssertEvent e = new AssertEvent( @@ -546,7 +545,5 @@ // *** - TextEqualsReplay text = new TextEqualsReplay(); - text.setExpectedValue(textFieldExpectedValue.getText()); - text.setTarget(target); + TextEqualsReplay text = new TextEqualsReplay(textFieldExpectedValue.getText(),target); AssertEvent e = new AssertEvent( Index: trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/swing/DlgSequenceDetails.java =================================================================== --- trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/swing/DlgSequenceDetails.java (revision 228) +++ trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/swing/DlgSequenceDetails.java (revision 229) @@ -37,4 +37,5 @@ * @author Jeffrey Hall * @version 1.0 + * @deprecated Use SWT-GUI for modifying sequences. */ public class DlgSequenceDetails { Index: trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/swing/DlgSequences.java =================================================================== --- trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/swing/DlgSequences.java (revision 228) +++ trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/swing/DlgSequences.java (revision 229) @@ -29,4 +29,5 @@ * @author Jeffrey Hall * @version 1.0 + * @deprecated Use SWT-GUI for modifying sequences. */ public class DlgSequences { Index: trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/windows/commands/CMDparseXML.java =================================================================== --- trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/windows/commands/CMDparseXML.java (revision 228) +++ trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/windows/commands/CMDparseXML.java (revision 229) @@ -4,7 +4,9 @@ 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,8 +62,12 @@ Collection> sequences = parser.getSequences(); + SortedSet 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"); + } } Index: trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/windows/data/WindowTree.java =================================================================== --- trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/windows/data/WindowTree.java (revision 228) +++ trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/windows/data/WindowTree.java (revision 229) @@ -5,8 +5,4 @@ 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,4 +35,12 @@ */ private static WindowTree theInstance = null; + + /** + *

+ * Maintains a set of all the target strings of all widgets that were at + * some point part of the window tree. + *

+ */ + private SortedSet targets; /** @@ -112,7 +116,6 @@ } nodes.put(childHwnd, child); + targets.add(child.xmlRepresentation()); } - - storeTarget(childHwnd); } @@ -172,25 +175,12 @@ /** *

- * 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. *

* - * @param hwnd - * hwnd of the window to be stored + * @return set of targets */ - @SuppressWarnings("unchecked") - private void storeTarget(int hwnd) { - SortedSet targets = new TreeSet(); - - if (GlobalDataContainer.getInstance().getData("ListTargets") == null) { - GlobalDataContainer.getInstance().addData("ListTargets", targets); - } - - try { - targets = (SortedSet) 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 getTargets() { + return targets; } } Index: trunk/EventBenchCore/src/de/ugoe/cs/eventbench/assertions/FileEqualsReplay.java =================================================================== --- trunk/EventBenchCore/src/de/ugoe/cs/eventbench/assertions/FileEqualsReplay.java (revision 228) +++ trunk/EventBenchCore/src/de/ugoe/cs/eventbench/assertions/FileEqualsReplay.java (revision 229) @@ -6,11 +6,9 @@ /** *

- * This class defines the fileEquals assertion type. This type does have two - * parameters, actualFile and expectedFile. + * This class defines the replay for file equals assertions. *

* - * @author jeffrey.hall - * @version 1.0 - * + * @author Jeffrey Hall, Steffen Herbold + * @version 2.0 */ public class FileEqualsReplay implements IReplayable { @@ -27,27 +25,29 @@ /** + *

* Id for object serialization. + *

*/ private static final long serialVersionUID = 1L; /** + *

+ * Constructor. Creates a new FileEqualsReplay. + *

* + * @param expectedFile + * name and path of the expected file * @param actualFile - * The file that should be equal to expectedFile. + * name and path of the actual file */ - public void setActualFile(String actualFile) { + public FileEqualsReplay(String expectedFile, String actualFile) { + this.expectedFile = expectedFile; this.actualFile = actualFile; } - /** - * @param exptectedFile - * The file that is used as the reference. - */ - public void setExpectedFile(String expectedFile) { - this.expectedFile = expectedFile; - } - - /** - * Returns the string that has to be written to the replay file. + /* + * (non-Javadoc) + * + * @see de.ugoe.cs.eventbench.data.IReplayable#getReplay() */ public String getReplay() { @@ -64,7 +64,10 @@ } - /** - * No target used by fileEquals. + /* + * (non-Javadoc) + * + * @see de.ugoe.cs.eventbench.data.IReplayable#getTarget() */ + @Override public String getTarget() { return "targetNotUsed"; Index: trunk/EventBenchCore/src/de/ugoe/cs/eventbench/assertions/TextEqualsReplay.java =================================================================== --- trunk/EventBenchCore/src/de/ugoe/cs/eventbench/assertions/TextEqualsReplay.java (revision 228) +++ trunk/EventBenchCore/src/de/ugoe/cs/eventbench/assertions/TextEqualsReplay.java (revision 229) @@ -6,48 +6,44 @@ /** *

- * This class defines the textEquals assertion type. This type does have two - * parameters, expectedValue and target. + * This class defines the replay for a textEquals assertion. *

* - * @author jeffrey.hall - * @version 1.0 - * + * @author Jeffrey Hall, Steffen Herbold + * @version 2.0 */ public class TextEqualsReplay implements IReplayable { /** - * The reference value which is compared to the targets text. + *

+ * Reference value which is compared to the targets text. + *

*/ - private String expectedValue = null; + private String expectedValue; /** - * The window which text is compared to expectedValue. + *

+ * Target to which the text is compared. + *

*/ - private String target = null; + private String target; /** + *

* Id for object serialization. + *

*/ private static final long serialVersionUID = 1L; - /** - * @param expectedValue - * The reference value which is compared to the targets text. - */ - public void setExpectedValue(String expectedValue) { + public TextEqualsReplay(String expectedValue, String target) { this.expectedValue = expectedValue; - } - - /** - * @param target - * The window which text is compared to expectedValue. - */ - public void setTarget(String target) { this.target = target; } - /** - * Returns the string that has to be written to the replay file. + /* + * (non-Javadoc) + * + * @see de.ugoe.cs.eventbench.data.IReplayable#getReplay() */ + @Override public String getReplay() { @@ -69,7 +65,10 @@ } - /** - * Returns the target window. + /* + * (non-Javadoc) + * + * @see de.ugoe.cs.eventbench.data.IReplayable#getTarget() */ + @Override public String getTarget() { return target;