Changeset 373 for trunk/EventBenchCore/src/de/ugoe/cs/eventbench

Timestamp:

01/30/12 15:40:38 (13 years ago)

Author:

sherbold

Message:

• extended de.ugoe.cs.eventbench.data.Event with a function targetEquals() that can be overridden by subclasses to allow sophisticated target comparisons instead of simple string comparisons.

File:

• trunk/EventBenchCore/src/de/ugoe/cs/eventbench/data/Event.java (modified) (2 diffs)

trunk/EventBenchCore/src/de/ugoe/cs/eventbench/data/Event.java

@@ -97 +97 @@
                         Event<?> otherEvent = (Event<?>) other;
                         if (otherEvent.canEqual(this)) {
-                                if (type != null && target != null) {
+                                if (type != null) {
                                         return type.equals(otherEvent.type)
-                                                        && target.equals(otherEvent.target);
-                                } else if (type != null && target == null) {
-                                        return type.equals(otherEvent.type)
-                                                        && otherEvent.target == null;
-                                } else if (type == null && target != null) {
+                                                        && targetEquals(otherEvent.target);
+                                } else {
                                         return otherEvent.type == null
-                                                        && target.equals(otherEvent.target);
-                                } else {
-                                        return otherEvent.type == null && otherEvent.target == null;
+                                                        && targetEquals(otherEvent.target);
                                 }
                         } else {
@@ -287 +282 @@
                 return true;
         }
+
+        /**
+         * <p>
+         * This function is used by {@link #equals(Object)} to determine if the
+         * targets of both events are equal. The standard implementation provided by
+         * this class performs a String comparison between the target strings.
+         * </p>
+         * <p>
+         * Subclasses can override this method to implemented more sophisticated
+         * means for the target comparison, e.g., to account for changes in the
+         * title of a widget.
+         * </p>
+         * 
+         * @param otherTarget
+         * @return
+         */
+        protected boolean targetEquals(String otherTarget) {
+                boolean retVal;
+                if (target != null) {
+                        retVal = target.equals(otherTarget);
+                } else {
+                        retVal = (otherTarget == null);
+                }
+                return retVal;
+        }
 }