Changeset 589 for trunk/quest-plugin-jfc/src/main/java/de/ugoe/cs/quest

Timestamp:

08/23/12 10:42:41 (12 years ago)

Author:

sherbold

Message:

• started changing the similarity structure of the GUI model. The equality is now absolute (i.e., boolean instead of an int indicating the degree). Also, lists of equally observed name/hash combinations are now stored. There still seem to be mistakes, however, the structural changes to the interfaces warrant a commit.

Location:

trunk/quest-plugin-jfc/src/main/java/de/ugoe/cs/quest/plugin/jfc/guimodel

Files:

• JFCGUIElement.java (modified) (2 diffs)
• JFCGUIElementSpec.java (modified) (8 diffs)

trunk/quest-plugin-jfc/src/main/java/de/ugoe/cs/quest/plugin/jfc/guimodel/JFCGUIElement.java

@@ -8 +8 @@
 
 import de.ugoe.cs.quest.eventcore.guimodel.AbstractDefaultGUIElement;
+import de.ugoe.cs.quest.eventcore.guimodel.IGUIElementSpec;
 
 /**
@@ -79 +80 @@
     }
 
+    @Override
+    public void updateSpecification(IGUIElementSpec updateSpecification) {
+        if( updateSpecification instanceof JFCGUIElementSpec ) {
+            specification.setName(((JFCGUIElementSpec) updateSpecification).getName());
+            specification.setElementHash(((JFCGUIElementSpec) updateSpecification).getElementHash());
+        }
+    }
+
 }

trunk/quest-plugin-jfc/src/main/java/de/ugoe/cs/quest/plugin/jfc/guimodel/JFCGUIElementSpec.java

@@ -5 +5 @@
 // Copyright : Patrick Harms, 2012
 package de.ugoe.cs.quest.plugin.jfc.guimodel;
+
+import java.util.LinkedList;
+import java.util.List;
+
+import org.apache.commons.collections15.CollectionUtils;
 
 import de.ugoe.cs.quest.eventcore.guimodel.IGUIElementSpec;
@@ -19 +24 @@
 
     /** */
-    private String name = null;
+    private List<String> name = new LinkedList<String>();
     
     /** */
@@ -31 +36 @@
     
     /** */
-    private String elementHash = null;
+    private List<String> elementHash = new LinkedList<String>();
     
     /* (non-Javadoc)
@@ -37 +42 @@
      */
     @Override
-    public int getSimilarity(IGUIElementSpec other) {
+    public boolean getSimilarity(IGUIElementSpec other) {
         if (this == other)
         {
-            return 100;
+            return true;
         }
         
         if (!(other instanceof JFCGUIElementSpec))
         {
-            return 0;
+            return false;
         }
         
         JFCGUIElementSpec otherSpec = (JFCGUIElementSpec) other;
-        int result = 0;
-
-        if ((type == otherSpec.type) || ((type != null) && (type.equals(otherSpec.type)))) {
-            result += 50;
-        }
-
-        if ((icon == otherSpec.icon) || ((icon != null) && (icon.equals(otherSpec.icon)))) {
-            result += 10;
-        }
-
-        if (index == otherSpec.index) {
-            result += 10;
-        }
-
-        if ((name == otherSpec.name) || ((name != null) && (name.equals(otherSpec.name)))) {
-            result += 15;
-        }
-
-        if (elementHash == otherSpec.elementHash || ((elementHash!=null) && elementHash.equals(otherSpec.elementHash))) {
-            result += 15;
+        
+        boolean retVal = false;
+        
+        boolean titleEqual = CollectionUtils.containsAny(name, otherSpec.name);
+        boolean hashEqual = CollectionUtils.containsAny(elementHash, otherSpec.elementHash);
+        
+        if( type.equals("Class") ) {
+            retVal = type.equals(otherSpec.type) && (titleEqual || hashEqual);
+        } else {
+            retVal = type.equals(otherSpec.type) && index==otherSpec.index && (titleEqual || hashEqual);
         }
         
-        return result;
+        return retVal;
     }
 
@@ -102 +97 @@
      */
     public String getName() {
-        return name;
+        // TODO for now always returns first matched name
+        if( name.isEmpty() ) {
+            return null;
+        }
+        return name.get(0);
     }
 
@@ -130 +129 @@
      */
     public String getElementHash() {
-        return elementHash;
+        // TODO for now always returns the first hash value
+        if( elementHash.isEmpty() ) {
+            return null;
+        }
+        return elementHash.get(0);
     }
 
@@ -137 +140 @@
      */
     public void setName(String name) {
-        this.name = name;
+        if( !this.name.contains(name) && name!=null ) {
+            this.name.add(name);
+        }
     }
 
@@ -165 +170 @@
      */
     public void setElementHash(String elementHash) {
-        this.elementHash = elementHash;
+        if( !this.elementHash.contains(elementHash) ) {
+            this.elementHash.add(elementHash);
+        }
     }