Changeset 1084

Timestamp:

02/18/13 09:30:13 (11 years ago)

Author:

pharms

Message:

• forwarded problems in GUI element mapping to parser to allow better handling of this exception

Location:

trunk

Files:

• autoquest-core-events/src/main/java/de/ugoe/cs/autoquest/eventcore/guimodel/GUIElementTree.java (modified) (2 diffs)
• autoquest-plugin-html/src/main/java/de/ugoe/cs/autoquest/plugin/html/HTMLLogParser.java (modified) (3 diffs)
• autoquest-plugin-jfc/src/main/java/de/ugoe/cs/autoquest/plugin/jfc/JFCSimplifiedLogParser.java (modified) (2 diffs)
• autoquest-plugin-mfc/src/main/java/de/ugoe/cs/autoquest/plugin/mfc/HandlerCreate.java (modified) (2 diffs)
• autoquest-plugin-mfc/src/main/java/de/ugoe/cs/autoquest/plugin/mfc/MessageHandler.java (modified) (2 diffs)

trunk/autoquest-core-events/src/main/java/de/ugoe/cs/autoquest/eventcore/guimodel/GUIElementTree.java

@@ -126 +126 @@
      * @param guiElementSpec
      *            the GUI element specification
+     *            
+     * @throws GUIModelException if the GUI element can not be added to the underlying GUI model
      */
     public void add(T guiElementID,
                     T parentID,
                     IGUIElementSpec guiElementSpec)
+        throws GUIModelException
     {
         IGUIElement guiElement = guiElements.get(guiElementID);
@@ -158 +161 @@
             }
 
-            try {
-                guiElement = guiModel.integratePath(guiElementPath, guiElementFactory);
-            }
-            catch (GUIModelException e) {
-                throw new RuntimeException("could not instantiate GUI element with id " + guiElementID, e);
-            }
+            guiElement = guiModel.integratePath(guiElementPath, guiElementFactory);
             guiElements.put(guiElementID, guiElement);
         }

trunk/autoquest-plugin-html/src/main/java/de/ugoe/cs/autoquest/plugin/html/HTMLLogParser.java

@@ -25 +25 @@
 import de.ugoe.cs.autoquest.eventcore.IEventType;
 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.html.eventcore.HTMLEventTypeFactory;
@@ -133 +134 @@
 
         if (specification != null) {
-            super.getGUIElementTree().add(id, parentId, specification);
+            try {
+                super.getGUIElementTree().add(id, parentId, specification);
+            }
+            catch (GUIModelException e) {
+                throw new SAXException("could not handle GUI element with id " +
+                                       id + ": " + e.getMessage(), e);
+            }
             return true;
         }
@@ -174 +181 @@
             HTMLEventTypeFactory.getInstance().getEventType(type, parameters, target);
         
-        Event event = new Event(eventType, target);
-
-        String timestampStr = parameters.get("timestamp");
-        
-        if (timestampStr != null) {
-            event.setTimestamp(Long.parseLong(timestampStr));
-        }
-
-        ((HTMLGUIElement) event.getTarget()).markUsed();
-        
-        super.addToSequence(event);
+        if (eventType != null) {
+            Event event = new Event(eventType, target);
+
+            String timestampStr = parameters.get("timestamp");
+        
+            if (timestampStr != null) {
+                event.setTimestamp(Long.parseLong(timestampStr));
+            }
+
+            ((HTMLGUIElement) event.getTarget()).markUsed();
+        
+            super.addToSequence(event);
+        }
+        // else ignore unknown event type
 
         return true;

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

@@ -38 +38 @@
 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;
@@ -397 +398 @@
         }
         else if (qName.equals("component") && currentGUIElementHash != null) {
-            currentGUIElementTree.add(currentGUIElementHash, currentParentHash,
-                                      currentGuiElementSpec);
+            try {
+                currentGUIElementTree.add(currentGUIElementHash, currentParentHash,
+                                          currentGuiElementSpec);
+            }
+            catch (GUIModelException e) {
+                throw new SAXException("could not handle GUI element with hash " +
+                                       currentGUIElementHash + ": " + e.getMessage(), e);
+            }
             List<Event> unhandledEvents = eventsWithoutTargets.get(currentGUIElementHash);
             if (unhandledEvents != null) {

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

@@ -15 +15 @@
 package de.ugoe.cs.autoquest.plugin.mfc;
 
+import org.xml.sax.SAXException;
+
 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;
@@ -89 +92 @@
      */
     @Override
-    public void onEndElement() {
+    public void onEndElement() throws SAXException {
         if (hwnd != 0) {
                 IGUIElementSpec spec = new MFCGUIElementSpec(hwnd, guiElementName, resourceId, className, isModal);
-            super.getGUIElementTree().add(hwnd, parentHwnd, spec);
+            try {
+                super.getGUIElementTree().add(hwnd, parentHwnd, spec);
+            }
+            catch (GUIModelException 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/MessageHandler.java

@@ -14 +14 @@
 
 package de.ugoe.cs.autoquest.plugin.mfc;
+
+import org.xml.sax.SAXException;
 
 import de.ugoe.cs.autoquest.eventcore.guimodel.GUIElementTree;
@@ -73 +75 @@
      * Called in the endElement() method of {@link MFCLogParser} when a msg-node ends.
      * </p>
+     * 
+     * @throws SAXException if the msg-node could not be processed for some reason
      */
-    public void onEndElement() {}
+    public void onEndElement() throws SAXException {}
 
     /**