Changeset 1874 for trunk/autoquest-plugin-html/src/main/java/de

Timestamp:

02/13/15 10:23:23 (10 years ago)

Author:

pharms

Message:

• improved GUI element and event processing

File:

• trunk/autoquest-plugin-html/src/main/java/de/ugoe/cs/autoquest/plugin/html/AbstractDefaultLogParser.java (modified) (3 diffs)

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

@@ -310 +310 @@
         if (qName.equals("session") && (eventBuffer != null)) {
             eventBuffer.add(new BufferEntry("sessionSwitch", null));
+            processGUIElements();
             processEvents();
         }
         else if (qName.equals("component") && (currentGUIElementId != null)) {
             guiElementBuffer.add(0, new BufferEntry(currentGUIElementId, currentParameters));
-
-            processGUIElements();
-
             currentGUIElementId = null;
             currentParameters = null;
@@ -322 +320 @@
         else if (qName.equals("event") && (currentEventType != null)) {
             eventBuffer.add(new BufferEntry(currentEventType, currentParameters));
-
-            processEvents();
-
             currentEventType = null;
             currentParameters = null;
@@ -404 +399 @@
             while (iterator.hasNext()) {
                 BufferEntry entry = iterator.next();
-                processedElement = handleGUIElement(entry.id, entry.parameters);
-
-                if (processedElement) {
+                
+                if (handleGUIElement(entry.id, entry.parameters)) {
                     iterator.remove();
                     processedElements++;
-                    break;
+                    processedElement = true;
                 }
             }