Changeset 2146 for trunk/autoquest-plugin-jfc/src/main

Timestamp:

05/19/17 11:31:29 (8 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-jfc/src/main/java/de/ugoe/cs/autoquest/plugin/jfc

Files:

• JFCLogParser.java (modified) (3 diffs)
• JFCSimplifiedLogParser.java (modified) (3 diffs)
• guimodel/JFCGUIElement.java (modified) (2 diffs)
• guimodel/JFCGUIElementSpec.java (modified) (2 diffs)

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

@@ -43 +43 @@
 
 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.KeyPressed;
@@ -53 +54 @@
 import de.ugoe.cs.autoquest.eventcore.guimodel.GUIElementFactory;
 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.keyboardmaps.VirtualKey;
@@ -407 +407 @@
                         (currentGuiElementPath, GUIElementFactory.getInstance());
                 }
-                catch (GUIModelException e) {
+                catch (EventTargetModelException e) {
                     throw new SAXException("error in the GUI model provided in the log", e);
                 }

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

@@ -41 +41 @@
 
 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.KeyPressed;
@@ -51 +52 @@
 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.keyboardmaps.VirtualKey;
@@ -436 +436 @@
                 currentGUIElementTree.add(guiElementId, parentGuiElementId, currentGuiElementSpec);
             }
-            catch (GUIModelException e) {
+            catch (EventTargetModelException e) {
                 throw new SAXException("could not handle GUI element with hash " +
                                        currentGUIElementHash + ": " + e.getMessage(), e);

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

@@ -15 +15 @@
 package de.ugoe.cs.autoquest.plugin.jfc.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;
 
@@ -169 +169 @@
      */
     @Override
-    public void updateSpecification(IGUIElementSpec updateSpecification) {
+    public void updateSpecification(IEventTargetSpec updateSpecification) {
         if (updateSpecification instanceof JFCGUIElementSpec) {
             specification.update(((JFCGUIElementSpec) updateSpecification));

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

@@ -21 +21 @@
 import org.apache.commons.lang.mutable.MutableInt;
 
+import de.ugoe.cs.autoquest.eventcore.IEventTargetSpec;
 import de.ugoe.cs.autoquest.eventcore.guimodel.IGUIElement;
 import de.ugoe.cs.autoquest.eventcore.guimodel.IGUIElementSpec;
@@ -113 +114 @@
      */
     @Override
-    public boolean getSimilarity(IGUIElementSpec other) {
+    public boolean getSimilarity(IEventTargetSpec other) {
         if (this == other) {
             return true;