Changeset 380

Timestamp:

02/01/12 13:46:11 (12 years ago)

Author:

sherbold

Message:

• further improved checks for equality of JFC event targets

Location:

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

Files:

• JFCEvent.java (modified) (1 diff)
• JFCTargetComparator.java (added)

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

@@ -173 +173 @@
         @Override
         protected boolean targetEquals(String otherTarget) {
-                if( target==null || otherTarget==null ) {
-                        return target==otherTarget; 
-                }
-                String[] targetParts = target.split("\\]\\.\\[");
-                String[] otherParts = otherTarget.split("\\]\\.\\[");
-                if (targetParts.length != otherParts.length) {
-                        return false;
-                }
-                
-                boolean retVal;
-                if (targetParts.length == 0) {
-                        retVal = compareWidgets(target, otherTarget);
-                } else {
-                        retVal = true;
-                        for (int i = 0; retVal && i < targetParts.length; i++) {
-                                retVal &= compareWidgets(targetParts[i], otherParts[i]);
-                        }
-                }
-                return retVal;
-        }
-
-        /**
-         * <p>
-         * Compares two widget strings of the form
-         * {@code ['title','class','index','text','hashCode']}.
-         * </p>
-         * 
-         * @param widget1
-         * @param widget2
-         * @return
-         */
-        private boolean compareWidgets(String widget1, String widget2) {
-                String[] widgetInfo1 = widget1.split("','");
-                String[] widgetInfo2 = widget2.split("','");
-                // ensure size is equal
-                if (widgetInfo1.length != 5 || widgetInfo2.length != 5) {
-                        return false;
-                }
-                // ensure that class [1], index [2], and text [3] are equal
-                // and title [0] or hashCode [4] are equal
-                return (widgetInfo1[1].equals(widgetInfo2[1])
-                                && widgetInfo1[2].equals(widgetInfo2[2]) && widgetInfo1[3]
-                                        .equals(widgetInfo2[3]))
-                                && (widgetInfo1[0].equals(widgetInfo2[0]) || widgetInfo1[4]
-                                                .equals(widgetInfo2[4]));
-
-        }
-        
+                return JFCTargetComparator.compare(target, otherTarget);
+        }
+
+        /**
+         * <p>
+         * The targetHashCode ignores the parts of the target that describe the
+         * title and hash of a widget, to ensure that the equals/hashCode contract
+         * is fulfilled.
+         * </p>
+         * 
+         * @see de.ugoe.cs.eventbench.data.Event#targetHashCode()
+         */
         @Override
         protected int targetHashCode() {
                 int hashCode = 0;
                 int multiplier = 29;
-                if( target!=null ) {
-                        String[] targetParts = target.split("\\[\\.\\[");
-                        if( targetParts.length==0 ) {
+                if (target != null) {
+                        String[] targetParts = target.split("\\]\\.\\[");
+                        if (targetParts.length == 0) {
                                 hashCode = widgetHashCode(target);
                         } else {
-                                for( String widgetString : targetParts ) {
-                                        hashCode = hashCode * multiplier + widgetHashCode(widgetString);
+                                for (String widgetString : targetParts) {
+                                        hashCode = hashCode * multiplier
+                                                        + widgetHashCode(widgetString);
                                 }
                         }
                 }
-                
+
                 return hashCode;
         }
-        
+
+        /**
+         * <p>
+         * This method calculates the hashCode for a a widget. If is used by
+         * {@link #targetHashCode()} to build the complete hashCode.
+         * </p>
+         * 
+         * @param widget
+         *            string describing the widget
+         * @return hashCode of the widget
+         */
         private int widgetHashCode(String widget) {
                 int hashCode = 0;
                 int multiplier = 37;
                 String[] widgetInfo = widget.split("','");
-                if( widgetInfo.length==5 ) {
+                if (widgetInfo.length == 5) {
                         hashCode = hashCode * multiplier + widgetInfo[1].hashCode();
                         hashCode = hashCode * multiplier + widgetInfo[2].hashCode();