Changeset 1722 for trunk

Timestamp:

09/04/14 16:38:21 (10 years ago)

Author:

dmay

Message:

Implement new command, that generates Jacareto indices. Also, get rid of all previous index hacks.

Location:

trunk/autoquest-plugin-jfc/src/main/java/de/ugoe/cs/autoquest/plugin/jfc

Files:

• commands/CMDparseJFCwithJacaretoIndices.java (added)
• guimodel/JFCGUIElement.java (modified) (1 diff)
• guimodel/JFCGUIElementSpec.java (modified) (7 diffs)

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

@@ -157 +157 @@
         // get the Java classname, ignore the package hierarchy if present
         String[] parts = getSpecification().getType().split("\\.");
-        String name = parts[parts.length - 1];
 
         // find the correct Jacareto index
         // jacareto indices start at 1
-        int jacIndex = getIndex() + 1;
-
-        // FIXME: some class specific hacks
-        if (name.equals("JFrame")) {
-            jacIndex++;
-        }
-        else if (name.equals("JLayeredPane")) {
-            jacIndex--;
-        }
-        else if (name.equals("JTextField")) {
-            jacIndex = 1;
-        }
-
+        int jacIndex = ((JFCGUIElementSpec) getSpecification()).getAltIndex() + 1;
         str = parts[parts.length - 1] + "_(" + jacIndex + ")";
 

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

@@ -77 +77 @@
     /**
      * <p>
+     * An alternative index of the specified GUI element in its parent element. Each element type is
+     * counted separately. This index is used for replaying programs such as Jacareto.
+     * </p>
+     */
+    private int altIndex = -1;
+
+    /**
+     * <p>
      * Hash code of the GUI element. Used as unique identifier during its existence.
      * </p>
@@ -88 +96 @@
      */
     private List<Integer> formerElementHashes = new ArrayList<Integer>();
-    
+
     /**
      * <p>
@@ -203 +211 @@
         JFCGUIElementSpec otherSpec = (JFCGUIElementSpec) other;
 
-        return
-            (name == null ? otherSpec.name == null : name.equals(otherSpec.name)) &&
+        return (name == null ? otherSpec.name == null : name.equals(otherSpec.name)) &&
             (type == null ? otherSpec.type == null : type.equals(otherSpec.type)) &&
             (icon == null ? otherSpec.icon == null : icon.equals(otherSpec.icon)) &&
@@ -294 +301 @@
     /**
      * <p>
+     * Returns an alternative index of the specified GUI element in its parent element. Each element
+     * type is counted separately.
+     * </p>
+     * 
+     * @return the index
+     */
+    public int getAltIndex() {
+        return altIndex;
+    }
+
+    /**
+     * <p>
      * Returns the object hash of the specified GUI element.
      * </p>
@@ -301 +320 @@
     public int getElementHash() {
         return elementHash;
+    }
+
+    /**
+     * <p>
+     * Sets the alternative index.
+     * </p>
+     * 
+     * @param newAltIndex
+     *            the index
+     */
+    public void setAltIndex(int newAltIndex) {
+        altIndex = newAltIndex;
     }
 
@@ -372 +403 @@
         this.elementHash = newElementHash;
     }
-    
+
     /**
      * <p>
      * Sets the type hierarchy of the specified GUI element.
+     * 
      * @param typeHierarchy
-     * </p>
-     */
-    public void setTypeHierarchy(List<String> typeHierarchy){
-        this.typeHierarchy = typeHierarchy;
+     *            </p>
+     */
+    public void setTypeHierarchy(List<String> typeHierarchy) {
+        this.typeHierarchy = typeHierarchy;
     }
 
@@ -423 +455 @@
     @Override
     public String[] getTypeHierarchy() {
-        if (typeHierarchy == null){
-                return new String[]{(getType())};
-        }
-        else
-                return typeHierarchy.toArray(new String[typeHierarchy.size()]);
+        if (typeHierarchy == null) {
+            return new String[]
+                { (getType()) };
+        }
+        else
+            return typeHierarchy.toArray(new String[typeHierarchy.size()]);
     }