Changeset 2146 for trunk/autoquest-plugin-mfc/src/main/java

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-mfc/src/main/java/de/ugoe/cs/autoquest/plugin/mfc

Files:

• HandlerCreate.java (modified) (2 diffs)
• guimodel/MFCGUIElement.java (modified) (2 diffs)
• guimodel/MFCGUIElementSpec.java (modified) (2 diffs)
• guimodel/MFCWindowTree.java (modified) (3 diffs)

trunk/autoquest-plugin-mfc/src/main/java/de/ugoe/cs/autoquest/plugin/mfc/HandlerCreate.java

@@ -17 +17 @@
 import org.xml.sax.SAXException;
 
+import de.ugoe.cs.autoquest.eventcore.EventTargetModelException;
 import de.ugoe.cs.autoquest.eventcore.guimodel.GUIElementTree;
-import de.ugoe.cs.autoquest.eventcore.guimodel.GUIModelException;
 import de.ugoe.cs.autoquest.eventcore.guimodel.IGUIElementSpec;
 import de.ugoe.cs.autoquest.plugin.mfc.guimodel.MFCGUIElementSpec;
@@ -98 +98 @@
                 super.getGUIElementTree().add(hwnd, parentHwnd, spec);
             }
-            catch (GUIModelException e) {
+            catch (EventTargetModelException e) {
                 throw new SAXException("could not handle GUI element with handle " +
                                        hwnd + ": " + e.getMessage(), e);

trunk/autoquest-plugin-mfc/src/main/java/de/ugoe/cs/autoquest/plugin/mfc/guimodel/MFCGUIElement.java

@@ -15 +15 @@
 package de.ugoe.cs.autoquest.plugin.mfc.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;
 
@@ -125 +125 @@
      */
     @Override
-    public void updateSpecification(IGUIElementSpec furtherSpec) {
-        ((MFCGUIElementSpec) super.getSpecification()).update(furtherSpec);
+    public void updateSpecification(IEventTargetSpec furtherSpec) {
+        if (furtherSpec instanceof MFCGUIElementSpec) {
+            ((MFCGUIElementSpec) super.getSpecification()).update((MFCGUIElementSpec) furtherSpec);
+        }
     }
 

trunk/autoquest-plugin-mfc/src/main/java/de/ugoe/cs/autoquest/plugin/mfc/guimodel/MFCGUIElementSpec.java

@@ -18 +18 @@
 import java.util.List;
 
+import de.ugoe.cs.autoquest.eventcore.IEventTargetSpec;
 import de.ugoe.cs.autoquest.eventcore.guimodel.IGUIElementSpec;
 import de.ugoe.cs.util.StringTools;
@@ -241 +242 @@
      */
     @Override
-    public boolean getSimilarity(IGUIElementSpec other) {
+    public boolean getSimilarity(IEventTargetSpec other) {
 
         if (this == other) {

trunk/autoquest-plugin-mfc/src/main/java/de/ugoe/cs/autoquest/plugin/mfc/guimodel/MFCWindowTree.java

@@ -22 +22 @@
 import java.util.Set;
 
+import de.ugoe.cs.autoquest.eventcore.EventTargetModelException;
+import de.ugoe.cs.autoquest.eventcore.IEventTargetFactory;
 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.IGUIElementFactory;
 
 /**
@@ -87 +87 @@
      * </p>
      */
-    private IGUIElementFactory guiElementFactory = GUIElementFactory.getInstance();
+    private IEventTargetFactory guiElementFactory = GUIElementFactory.getInstance();
 
     /**
@@ -188 +188 @@
                     (MFCGUIElement) guiModel.integratePath(guiElementPath, guiElementFactory);
             }
-            catch (GUIModelException e) {
+            catch (EventTargetModelException e) {
                 throw new RuntimeException("could not instantiate GUI element with id " + hwnd, e);
             }