Changeset 1704

Timestamp:

09/01/14 16:16:15 (10 years ago)

Author:

dmay

Message:

implement keypress modifiers: ctrl, shift, alt and alt graph - should be enough for now

File:

• trunk/autoquest-plugin-jfc/src/main/java/de/ugoe/cs/autoquest/plugin/jfc/commands/CMDgenerateJacaretoReplay.java (modified) (6 diffs)

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

@@ -22 +22 @@
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
@@ -91 +92 @@
     private JFCGUIElement currentFocus;
     private StructureNode structure;
+
     private StructureNode lastKeySequenceEvent;
     private StructureNode lastKeyTypedEvent;
+    private int currentKeyModifiers;
+
+    private HashMap<VirtualKey, Integer> modifiers;
+    
     private StructureNode lastMouseClickEvent;
     private StructureNode lastFocusChangeEvent;
@@ -138 +144 @@
         sequences = (Collection<List<Event>>) dataObject;
 
+        // map which maps VirtualKeys back to awt key modifier codes
+        modifiers = new HashMap<>();
+        modifiers.put(VirtualKey.SHIFT, 1);
+        modifiers.put(VirtualKey.CONTROL, 2);
+        modifiers.put(VirtualKey.ALT, 8);
+        modifiers.put(VirtualKey.ALT_GRAPH, 32);
+        currentKeyModifiers = 0;
+        
         writeJacaretoXML(sequences, filename);
     }
@@ -438 +452 @@
         KeyInteraction info = (KeyInteraction) event.getType();
         JFCGUIElement target = (JFCGUIElement) event.getTarget();
-
+        int keyCode = info.getKey().getVirtualKeyCode();
+
+        applyKeyModifier(info.getKey(), jacId == 401);
+        
         //@formatter:off
         writeLine(writer,
@@ -459 +476 @@
         writeLine(writer,
             "<KeyInfo "
-            + "keyCode=\"" + info.getKey().getVirtualKeyCode() + "\" "
-            + "keyChar=\"" + getKeyChar(info.getKey().getVirtualKeyCode()) + "\" "
-            + "modifiers=\"0\" />"
+            + "keyCode=\"" + keyCode + "\" "
+            + "keyChar=\"" + getKeyChar(keyCode) + "\" "
+            + "modifiers=\"" + currentKeyModifiers + "\" />"
         );
         
@@ -477 +494 @@
         }
     }
+    
+    private void applyKeyModifier (VirtualKey key, boolean set) {
+        Integer modifier = modifiers.get(key);
+        if (modifier != null) {
+            if (set) {
+                currentKeyModifiers |= modifier;
+            }
+            else {
+                currentKeyModifiers &= ~modifier;
+            }
+        }
+    }
 }