Changeset 719 for trunk/quest-core-events/src

Timestamp:

08/31/12 09:57:46 (12 years ago)

Author:

pharms

Message:

• now keyboard focus change events are discarded because they are implicitly included through the correction of the event targets.

File:

• trunk/quest-core-events/src/main/java/de/ugoe/cs/quest/eventcore/gui/KeyInteractionTargetCorrector.java (modified) (3 diffs)

trunk/quest-core-events/src/main/java/de/ugoe/cs/quest/eventcore/gui/KeyInteractionTargetCorrector.java

@@ -17 +17 @@
  * to the GUI element having the current keyboard focus. The current keyboard focus is determined
  * either by keyboard focus events or by using the target of the first key interaction in the
- * provided sequence sequence.
+ * provided sequence. Events changing the keyboard focus are discarded herewith.
  * </p>
  * 
@@ -41 +41 @@
         List<Event> resultingSequence = new LinkedList<Event>();
         IGUIElement currentKeyboardFocusGUIElement = null;
-        Event resultingEvent;
         
         for (Event event : sequence) {
-            resultingEvent = null;
-            
             if (event.getTarget() instanceof IGUIElement) {
                 if (event.getType() instanceof KeyboardFocusChange) {
                     currentKeyboardFocusGUIElement = (IGUIElement) event.getTarget();
+                    event = null;
                 }
                 else if (event.getType() instanceof KeyInteraction) {
@@ -56 +54 @@
                     
                     if (!currentKeyboardFocusGUIElement.equals(event.getTarget())) {
-                        resultingEvent = new Event(event.getType(), currentKeyboardFocusGUIElement);
+                        event = new Event(event.getType(), currentKeyboardFocusGUIElement);
                     }
                 }
             }
             
-            if (resultingEvent != null) {
-                resultingSequence.add(resultingEvent);
-            }
-            else {
+            if (event != null) {
                 resultingSequence.add(event);
             }