Changeset 710 for trunk/quest-core-tasktrees/src

Timestamp:

08/30/12 14:05:47 (12 years ago)

Author:

pharms

Message:

• moved target correction of key events regarding the current keyboard focus to a dedicated command

File:

• trunk/quest-core-tasktrees/src/main/java/de/ugoe/cs/quest/tasktrees/manager/TaskTreeManager.java (modified) (5 diffs)

trunk/quest-core-tasktrees/src/main/java/de/ugoe/cs/quest/tasktrees/manager/TaskTreeManager.java

@@ -4 +4 @@
 
 import de.ugoe.cs.quest.eventcore.Event;
-import de.ugoe.cs.quest.eventcore.IEventTarget;
-import de.ugoe.cs.quest.eventcore.gui.KeyInteraction;
 import de.ugoe.cs.quest.eventcore.gui.KeyboardFocusChange;
 import de.ugoe.cs.quest.tasktrees.treeifc.IEventTask;
@@ -41 +39 @@
     private ISequence rootSequence;
 
-    /** */
-    private IEventTarget currentKeyboardFocusGUIElement;
-
     /**
      * TODO: comment
@@ -56 +51 @@
      */
     public void handleNewEvent(Event event) {
-        if (event.getType() instanceof KeyInteraction) {
-            if (currentKeyboardFocusGUIElement == null) {
-                currentKeyboardFocusGUIElement = event.getTarget();
-            }
-
-            addEventTask
-              (taskTreeNodeFactory.createNewEventTask
-                 (event.getType(), currentKeyboardFocusGUIElement));
-        }
-        else {
-            addEventTask
-              (taskTreeNodeFactory.createNewEventTask(event.getType(), event.getTarget()));
-        }
+        addEventTask(taskTreeNodeFactory.createNewEventTask(event.getType(), event.getTarget()));
     }
 
@@ -98 +81 @@
      */
     private void handleEventTask(IEventTask eventTask) {
-        if (eventTask.getEventType() instanceof KeyboardFocusChange) {
-            currentKeyboardFocusGUIElement = eventTask.getEventTarget();
-        }
-        else {
-            LOG.info("handling event task \"" + eventTask + "\"");
-            addTaskToSequence(eventTask, currentKeyboardFocusGUIElement);
+        if (!(eventTask.getEventType() instanceof KeyboardFocusChange)) {
+            LOG.info("handling interaction event task \"" + eventTask + "\"");
+            addTaskToSequence(eventTask);
         }
     }
@@ -110 +90 @@
      *
      */
-    private void addTaskToSequence(ITaskTreeNode task, IEventTarget currentKeyboardFocusGUIElement)
+    private void addTaskToSequence(ITaskTreeNode task)
     {
         taskTreeBuilder.addChild(rootSequence, task);