Changeset 589 for trunk/quest-core-events/src

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-core-events/src/main/java/de/ugoe/cs/quest/eventcore/guimodel

Files:

• GUIModel.java (modified) (3 diffs)
• IGUIElement.java (modified) (1 diff)
• IGUIElementSpec.java (modified) (1 diff)

trunk/quest-core-events/src/main/java/de/ugoe/cs/quest/eventcore/guimodel/GUIModel.java

@@ -8 +8 @@
 
 import java.util.ArrayList;
+import java.util.LinkedList;
 import java.util.List;
 
@@ -106 +107 @@
         IGUIElementSpec specToIntegrateElementFor = remainingPath.remove(0);
         
-        List<TreeNode> matchingChildren = new ArrayList<TreeNode>();
-        int maximumSimilarity = 0;
+        List<TreeNode> matchingChildren = new LinkedList<TreeNode>();
         
         if (parentNode.children != null) {
             for (TreeNode child : parentNode.children) {
-                int similarityLevel = getSimilarityLevel
-                    (specToIntegrateElementFor, child.guiElement.getSpecification());
-                
-                if (similarityLevel >= maximumSimilarity) {
-                    if (maximumSimilarity == 100) {
-                        throw new GUIModelException
-                          ("several children of gui element " + parentNode.guiElement +
-                           " pretend to fully match specification " + specToIntegrateElementFor);
-                    }
-                    
-                    if (maximumSimilarity != similarityLevel) {
-                        matchingChildren.clear();
-                        maximumSimilarity = similarityLevel;
-                    }
-                    
+                if( specToIntegrateElementFor.getSimilarity(child.guiElement.getSpecification())) {
                     matchingChildren.add(child);
                 }
             }
-        }
-        
-        // we do not see something as matching if the similarity level is below 80%
-        if (maximumSimilarity < 80) {
-            matchingChildren.clear();
         }
         
@@ -150 +131 @@
         
         if (remainingPath.size() > 0) {
+            // TODO update spec here matchingChildren.get(0).guiElement
+            matchingChildren.get(0).guiElement.updateSpecification(specToIntegrateElementFor);
             return integratePath(matchingChildren.get(0), remainingPath, guiElementFactory);
         }
         else {
             return matchingChildren.get(0).guiElement;
-        }
-    }
-
-    /**
-     * <p>
-     * TODO: comment
-     * </p>
-     *
-     * @param spec1
-     * @param spec2
-     * @return
-     * @throws GUIModelException 
-     */
-    private int getSimilarityLevel(IGUIElementSpec spec1, IGUIElementSpec spec2)
-        throws GUIModelException
-    {
-        if (spec1 == spec2) {
-            return 100;
-        }
-        else if (spec1 != null) {
-            int level = spec1.getSimilarity(spec2);
-            
-            if ((level < 0) || (100 < level)) {
-               throw new GUIModelException("invalid tree node similarity provided (" + level +
-                                           "). Must be between 0 and 100."); 
-            }
-            
-            return level;
-        }
-        else {
-            return 0;
         }
     }

trunk/quest-core-events/src/main/java/de/ugoe/cs/quest/eventcore/guimodel/IGUIElement.java

@@ -32 +32 @@
      */
     public int hashCode();
+
+    public void updateSpecification(IGUIElementSpec specToIntegrateElementFor);
 }

trunk/quest-core-events/src/main/java/de/ugoe/cs/quest/eventcore/guimodel/IGUIElementSpec.java

@@ -33 +33 @@
      * @return
      */
-    public int getSimilarity(IGUIElementSpec otherParameters);
+    public boolean getSimilarity(IGUIElementSpec otherParameters);
 
     /**