Changeset 1868

Timestamp:

01/30/15 18:01:08 (9 years ago)

Author:

funger

Message:

• equals and hashCode now fits to their contracts
• added UnsupportedOperationException? to startsLogicalSequence and finischesLogicalSequence

Location:

trunk/autoquest-plugin-android/src/main/java/de/ugoe/cs/autoquest/eventcore/gui

Files:

• CharacterTyped.java (modified) (3 diffs)
• TouchSingle.java (modified) (3 diffs)

trunk/autoquest-plugin-android/src/main/java/de/ugoe/cs/autoquest/eventcore/gui/CharacterTyped.java

@@ -58 +58 @@
     @Override
     public boolean startsLogicalSequence() {
-        return false;
+        throw new UnsupportedOperationException("not implemented yet");
     }
 
     @Override
     public boolean finishesLogicalSequence() {
-        return false;
+        throw new UnsupportedOperationException("not implemented yet");
     }
 
@@ -73 +73 @@
     @Override
     public boolean equals(Object obj) {
-        if (obj instanceof CharacterTyped) {
-            return (((CharacterTyped) obj).getString() == getString());
+        if(obj == this){
+            return true;
         }
-        return false;
+        if(!(obj instanceof CharacterTyped)){
+            return false;
+        }
+        CharacterTyped character = (CharacterTyped)obj;
+        return character.string.equals(string);
+        
     }
 
@@ -87 +92 @@
     public int hashCode() {
         return getString().hashCode();
+    }
+    
+    /*
+     * (non-Javadoc)
+     * 
+     * @see java.lang.Object#toString()
+     */
+    @Override
+    public String toString() {
+        return "StringTyped: " + string;
     }
 

trunk/autoquest-plugin-android/src/main/java/de/ugoe/cs/autoquest/eventcore/gui/TouchSingle.java

@@ -17 +17 @@
 /**
  * <p>
- * Event type for a single touch events, i.e., touch on a mobile phone.
+ * Event type for a single touch events, i.e. touch on a mobile phone.
  * </p>
  * 
@@ -104 +104 @@
     @Override
     public boolean equals(Object obj) {
-        if (obj instanceof TouchSingle) {
-            return (((TouchSingle) obj).getX() == getX()) && (((TouchSingle) obj).getY() == getY());
+        if(obj == this){
+            return true;
         }
-        return false;
+        if(!(obj instanceof TouchSingle)){
+            return false;
+        }
+        TouchSingle touch = (TouchSingle)obj;
+        return touch.getX() == x && touch.getY() == y;
     }
 
@@ -117 +121 @@
     @Override
     public int hashCode() {
-        //TODO create a hashCode
-        return 0;
+        // 17 due to the reason that this is a prime number.
+        int result = 17;
+        /*
+         * 31 due to the reason that a lot of VM's could optimize this multiplication by a shift.
+         * Source: Effective Java, Joshua Bloch, 2008, p.48
+         */
+        result = 31 * result + Float.floatToIntBits(x);
+        result = 31 * result + Float.floatToIntBits(y);
+        return result;
     }