Changeset 385 for trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/jfc

Timestamp:

02/15/12 15:02:03 (13 years ago)

Author:

sherbold

Message:

• de.ugoe.cs.eventbench.jfc.data.JFCTargetComparator adapted as follows: ignores window titles that start with "Pos(", i.e., positions; ignores index of GUI objects of class "Class" (optimization for working with ArgoUML)

File:

• trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/jfc/data/JFCTargetComparator.java (modified) (3 diffs)

trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/jfc/data/JFCTargetComparator.java

@@ -170 +170 @@
                 String[] widgetInfo = widgetString.split("','");
                 JFCWidget widget = new JFCWidget();
-                widget.titles.add(widgetInfo[0]);
+                if (widgetInfo[0].startsWith("'Pos(")) {
+                        widget.titles.add("Pos");
+                } else {
+                        widget.titles.add(widgetInfo[0]);
+                }
                 widget.widgetClass = widgetInfo[1];
-                widget.index = widgetInfo[2];
-                widget.text = widgetInfo[3];
+                widget.text = widgetInfo[2];
+                widget.index = widgetInfo[3];
                 widget.hashCodes.add(widgetInfo[4]);
                 return widget;
@@ -311 +315 @@
                                 hashCodesCopy.retainAll(other.hashCodes);
 
-                                return (widgetClass.equals(other.widgetClass)
-                                                && index.equals(other.index) && text.equals(other.text) && (!titlesCopy
-                                                .isEmpty() || !hashCodesCopy.isEmpty()));
+                                boolean retVal;
+                                if (widgetClass.equals("Class")) {
+                                        retVal = (widgetClass.equals(other.widgetClass)
+                                                        && text.equals(other.text) && (!titlesCopy
+                                                        .isEmpty() || !hashCodesCopy.isEmpty()));
+                                } else {
+                                        retVal = (widgetClass.equals(other.widgetClass)
+                                                        && index.equals(other.index)
+                                                        && text.equals(other.text) && (!titlesCopy
+                                                        .isEmpty() || !hashCodesCopy.isEmpty()));
+                                }
+                                return retVal;
                         }
                         return false;
@@ -328 +341 @@
                         int hashCode = 0;
                         hashCode = multiplier * hashCode + widgetClass.hashCode();
-                        hashCode = multiplier * hashCode + index.hashCode();
+                        if (!widgetClass.equals("Class")) {
+                                hashCode = multiplier * hashCode + index.hashCode();
+                        }
                         hashCode = multiplier * hashCode + text.hashCode();
                         return hashCode;