Changeset 1250

Timestamp:

07/04/13 16:22:42 (11 years ago)

Author:

pharms

Message:

• update to HTML 5 and parsing of key presses

Location:

trunk/autoquest-plugin-html

Files:

• data/guimappings/guimapping-html.txt (modified) (1 diff)
• src/main/java/de/ugoe/cs/autoquest/plugin/html/eventcore/HTMLEventTypeFactory.java (modified) (3 diffs)

trunk/autoquest-plugin-html/data/guimappings/guimapping-html.txt

@@ -59 +59 @@
 input_button = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLButton
 input_checkbox = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLCheckBox
+input_color = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLTextField
+input_date = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLTextField
+input_datetime = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLTextField
+input_datetime-local = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLTextField
+input_email = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLTextField
 input_file = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLTextField
 input_image = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLButton
+input_month = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLTextField
 input_number = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLComboBox
 input_password = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLTextField
 input_radio = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLRadioButton
+input_range = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLTextField
 input_reset = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLButton
+input_search = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLTextField
 input_submit = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLButton
+input_tel = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLTextField
 input_text = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLTextField
-input_search = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLTextField
+input_time = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLTextField
+input_url = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLTextField
+input_week = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLTextField
 # input =
 ins = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLText

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

@@ -20 +20 @@
 import de.ugoe.cs.autoquest.eventcore.IEventType;
 import de.ugoe.cs.autoquest.eventcore.gui.IInteraction;
+import de.ugoe.cs.autoquest.eventcore.gui.KeyPressed;
 import de.ugoe.cs.autoquest.eventcore.gui.KeyboardFocusChange;
 import de.ugoe.cs.autoquest.eventcore.gui.MouseButtonInteraction;
@@ -33 +34 @@
 import de.ugoe.cs.autoquest.eventcore.guimodel.ITextArea;
 import de.ugoe.cs.autoquest.eventcore.guimodel.ITextField;
+import de.ugoe.cs.autoquest.keyboardmaps.VirtualKey;
 import de.ugoe.cs.util.console.Console;
 
@@ -112 +114 @@
             }
         }
+        else if ("onkeydown".equals(eventName)) {
+            try {
+                int key = Integer.parseInt(eventParameters.get("key"));
+                result = new KeyPressed(VirtualKey.valueOf(key));
+            }
+            catch (NumberFormatException e) {
+                throw new IllegalArgumentException("the key id provided by an " + eventName +
+                                                   " is no correct integer");
+            }
+        }
         else if ("onfocus".equals(eventName)) {
             result = new KeyboardFocusChange();