Changeset 2146 for trunk/autoquest-plugin-android/src/main/java/de/ugoe/cs/autoquest/plugin

Timestamp:

05/19/17 11:31:29 (7 years ago)

Author:

pharms

Message:

• refactored GUI model so that hierarchical event target structures can also be used and created by plugins not being strictly for GUIs

Location:

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

Files:

• AndroidLogParser.java (modified) (3 diffs)
• guimodel/ANDROIDGUIElement.java (modified) (2 diffs)
• guimodel/ANDROIDGUIElementSpec.java (modified) (2 diffs)

trunk/autoquest-plugin-android/src/main/java/de/ugoe/cs/autoquest/plugin/android/AndroidLogParser.java

@@ -39 +39 @@
 
 import de.ugoe.cs.autoquest.eventcore.Event;
+import de.ugoe.cs.autoquest.eventcore.EventTargetModelException;
 import de.ugoe.cs.autoquest.eventcore.gui.IInteraction;
 import de.ugoe.cs.autoquest.eventcore.gui.TextInput;
@@ -44 +45 @@
 import de.ugoe.cs.autoquest.eventcore.guimodel.GUIElementTree;
 import de.ugoe.cs.autoquest.eventcore.guimodel.GUIModel;
-import de.ugoe.cs.autoquest.eventcore.guimodel.GUIModelException;
 import de.ugoe.cs.autoquest.eventcore.guimodel.IGUIElement;
 import de.ugoe.cs.autoquest.plugin.android.guimodel.ANDROIDGUIElement;
@@ -374 +374 @@
                                           currentGUIElementSpec);
             }
-            catch (GUIModelException e) {
+            catch (EventTargetModelException e) {
                 throw new SAXException("could not handle GUI element with hash " +
                     currentGUIElementHash + ": " + e.getMessage(), e);

trunk/autoquest-plugin-android/src/main/java/de/ugoe/cs/autoquest/plugin/android/guimodel/ANDROIDGUIElement.java

@@ -15 +15 @@
 package de.ugoe.cs.autoquest.plugin.android.guimodel;
 
+import de.ugoe.cs.autoquest.eventcore.IEventTargetSpec;
 import de.ugoe.cs.autoquest.eventcore.guimodel.AbstractDefaultGUIElement;
 import de.ugoe.cs.autoquest.eventcore.guimodel.IGUIElement;
-import de.ugoe.cs.autoquest.eventcore.guimodel.IGUIElementSpec;
 import de.ugoe.cs.autoquest.eventcore.guimodel.IGUIView;
 
@@ -68 +68 @@
      */
     @Override
-    public void updateSpecification(IGUIElementSpec furtherSpec) {
+    public void updateSpecification(IEventTargetSpec furtherSpec) {
         // nothing do do here up to now.
     }

trunk/autoquest-plugin-android/src/main/java/de/ugoe/cs/autoquest/plugin/android/guimodel/ANDROIDGUIElementSpec.java

@@ -17 +17 @@
 import java.util.List;
 
+import de.ugoe.cs.autoquest.eventcore.IEventTargetSpec;
 import de.ugoe.cs.autoquest.eventcore.guimodel.IGUIElementSpec;
 
@@ -106 +107 @@
      */
     @Override
-    public boolean getSimilarity(IGUIElementSpec other) {
+    public boolean getSimilarity(IEventTargetSpec other) {
         if (this == other) {
             return true;