Changeset 681 for trunk/quest-plugin-guitar/src/main/java

Timestamp:

08/29/12 10:05:50 (12 years ago)

Author:

sherbold

Message:

• added getStringIdentifier() to interface IEventTarget
• all event types and targets now implement equals and hashCode

Location:

trunk/quest-plugin-guitar/src/main/java/de/ugoe/cs/quest/plugin/guitar/eventcore

Files:

• GUITAREventTarget.java (modified) (3 diffs)
• GUITAREventType.java (modified) (4 diffs)

trunk/quest-plugin-guitar/src/main/java/de/ugoe/cs/quest/plugin/guitar/eventcore/GUITAREventTarget.java

@@ +1 @@
+
 package de.ugoe.cs.quest.plugin.guitar.eventcore;
 
@@ -15 +16 @@
 
     private static final long serialVersionUID = 1L;
-    
+
     String widgetId;
-    
+
     public GUITAREventTarget(String widgetId) {
         this.widgetId = widgetId;
     }
 
-    /* (non-Javadoc)
+    /*
+     * (non-Javadoc)
+     * 
      * @see de.ugoe.cs.quest.eventcore.IEventTarget#getPlatform()
      */
     @Override
     public String getPlatform() {
-        // TODO Auto-generated method stub
-        System.out.println("TODO: implement GUITAREventTarget.getPlatform ");
-        return null;
+        return "GUITAR";
     }
-    
+
+    @Override
+    public String getStringIdentifier() {
+        return this.toString();
+    }
+
     /*
      * (non-Javadoc)
+     * 
      * @see java.lang.Object#toString()
      */
@@ -41 +48 @@
     }
 
+    /*
+     * (non-Javadoc)
+     * 
+     * @see java.lang.Object#equals(java.lang.Object)
+     */
+    @Override
+    public boolean equals(Object obj) {
+        if (obj instanceof GUITAREventTarget) {
+            if (widgetId != null) {
+                return widgetId.equals(((GUITAREventTarget) obj).widgetId);
+            }
+            else {
+                return ((GUITAREventTarget) obj).widgetId == null;
+            }
+        }
+        return false;
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see java.lang.Object#hashCode()
+     */
+    @Override
+    public int hashCode() {
+        int hash = 13;
+        if (widgetId != null) {
+            hash = widgetId.hashCode();
+        }
+        return hash;
+    }
+
 }

trunk/quest-plugin-guitar/src/main/java/de/ugoe/cs/quest/plugin/guitar/eventcore/GUITAREventType.java

@@ +1 @@
+
 package de.ugoe.cs.quest.plugin.guitar.eventcore;
 
@@ -16 +17 @@
     /**  */
     private static final long serialVersionUID = 1L;
-    
+
     String guitarEventId;
-    
+
     public GUITAREventType(String eventId) {
         this.guitarEventId = eventId;
     }
-    
-    /* (non-Javadoc)
+
+    /*
+     * (non-Javadoc)
+     * 
      * @see de.ugoe.cs.quest.eventcore.IEventType#getName()
      */
@@ -30 +33 @@
         return "GUITAREventType";
     }
-    
+
     /*
      * (non-Javadoc)
+     * 
      * @see java.lang.Object#toString()
      */
@@ -40 +44 @@
     }
 
+    /*
+     * (non-Javadoc)
+     * 
+     * @see java.lang.Object#equals(java.lang.Object)
+     */
+    @Override
+    public boolean equals(Object obj) {
+        if (obj instanceof GUITAREventType) {
+            if (guitarEventId != null) {
+                return guitarEventId.equals(((GUITAREventType) obj).guitarEventId);
+            }
+            else {
+                return ((GUITAREventType) obj).guitarEventId == null;
+            }
+        }
+        return false;
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see java.lang.Object#hashCode()
+     */
+    @Override
+    public int hashCode() {
+        int hash = 37;
+        if (guitarEventId != null) {
+            hash = guitarEventId.hashCode();
+        }
+        return hash;
+    }
+
 }