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

Timestamp:

04/03/12 10:15:39 (13 years ago)

Author:

sherbold

Message:

• updated de.ugoe.cs.eventbench.data.ReplayableEvent? such that equals does not take the replay messages into account anymore.

File:

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

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

@@ -160 +160 @@
                 this.decorator = decorator;
         }
-
-        /*
-         * (non-Javadoc)
-         * 
-         * @see de.ugoe.cs.eventbench.data.Event#equals(java.lang.Object)
-         */
-        @Override
-        public boolean equals(Object other) {
-                if (this == other) {
-                        return true;
-                }
-                if (other instanceof ReplayableEvent<?>) {
-                        ReplayableEvent<?> otherEvent = (ReplayableEvent<?>) other;
-                        if (replayEvents != null) {
-                                return super.equals(otherEvent)
-                                                && replayEvents.equals(otherEvent.replayEvents)
-                                                && replayValid == otherEvent.replayValid;
-                        } else {
-                                return super.equals(otherEvent)
-                                                && otherEvent.replayEvents == null
-                                                && replayValid == otherEvent.replayValid;
-                        }
-
-                } else {
-                        return false;
-                }
-        }
         
         @Override
@@ -192 +165 @@
                 return (other instanceof ReplayableEvent<?>);
         }
-
-        /*
-         * (non-Javadoc)
-         * 
-         * @see de.ugoe.cs.eventbench.data.Event#hashCode()
-         */
-        @Override
-        public int hashCode() {
-                int multiplier = 17;
-                int hash = super.hashCode();
-                if (replayEvents != null) {
-                        hash = multiplier * hash + replayEvents.hashCode();
-                }
-                hash = multiplier * hash + (replayValid ? 1 : 0);
-
-                return hash;
-        }
 }