Changeset 642 for trunk/quest-plugin-jfc/src/main/java/de/ugoe/cs/quest/plugin

Timestamp:

08/27/12 17:40:57 (12 years ago)

Author:

sherbold

Message:

• removed unnecessary class JFCEvent

Location:

trunk/quest-plugin-jfc/src/main/java/de/ugoe/cs/quest/plugin/jfc

Files:

• JFCLogParser.java (modified) (6 diffs)
• eventcore/JFCEvent.java (deleted)

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

@@ -45 +45 @@
 import de.ugoe.cs.quest.eventcore.guimodel.GUIModelException;
 import de.ugoe.cs.quest.eventcore.guimodel.IGUIElement;
-import de.ugoe.cs.quest.plugin.jfc.eventcore.JFCEvent;
 import de.ugoe.cs.quest.plugin.jfc.eventcore.JFCEventId;
 import de.ugoe.cs.quest.plugin.jfc.guimodel.JFCGUIElementSpec;
@@ -92 +91 @@
     /**
      * <p>
-     * Internal handle to the parent parameters of the event that is currently being parsed.
-     * </p>
-     */
-    private Map<String, String> currentParentParameters;
-
-    /**
-     * <p>
      * Internal handle to the event sequence that is currently being parsed.
      * </p>
@@ -325 +317 @@
                 currentEventParameters = new HashMap<String, String>();
                 currentSourceParameters = new HashMap<String, String>();
-                currentParentParameters = new HashMap<String, String>();
                 paramSource = ParamSource.EVENT;
             }
@@ -336 +327 @@
                 else if (paramSource == ParamSource.SOURCE) {
                     currentSourceParameters.put(atts.getValue("name"), atts.getValue("value"));
-                }
-                else if (paramSource == ParamSource.PARENT) {
-                    currentParentParameters.put(atts.getValue("name"), atts.getValue("value"));
                 }
                 else if (paramSource == ParamSource.COMPONENT) {
@@ -408 +396 @@
                 }
                 
-                JFCEvent event = new JFCEvent
+                Event event = new Event
                     (instantiateInteraction(currentEventId, currentEventParameters),
-                     (currentGUIElement == null ? lastGUIElement : currentGUIElement),
-                     currentEventParameters, currentSourceParameters, currentParentParameters);
+                     (currentGUIElement == null ? lastGUIElement : currentGUIElement));
                 
                 currentSequence.add(event);
@@ -417 +404 @@
                 currentEventParameters = null;
                 currentSourceParameters = null;
-                currentParentParameters = null;
                 currentGuiElementSpec = null;
                 currentGuiElementPath.clear();