Changeset 1012 for trunk

Timestamp:

12/12/12 15:19:15 (12 years ago)

Author:

pharms

Message:

• extended supported GUI Model

Location:

trunk/autoquest-plugin-html

Files:

• data/guimappings/guimapping-html.txt (modified) (1 diff)
• src/main/java/de/ugoe/cs/autoquest/plugin/html/commands/CMDparseDirHTML.java (modified) (2 diffs)
• src/main/java/de/ugoe/cs/autoquest/plugin/html/guimodel/HTMLCanvas.java (added)
• src/main/java/de/ugoe/cs/autoquest/plugin/html/guimodel/HTMLCheckBox.java (added)
• src/main/java/de/ugoe/cs/autoquest/plugin/html/guimodel/HTMLComboBox.java (added)
• src/main/java/de/ugoe/cs/autoquest/plugin/html/guimodel/HTMLPage.java (modified) (2 diffs)
• src/main/java/de/ugoe/cs/autoquest/plugin/html/guimodel/HTMLRadioButton.java (added)
• src/main/java/de/ugoe/cs/autoquest/plugin/html/guimodel/HTMLTextField.java (added)

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

@@ +1 @@
+a = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLLink
+# abbr =
+# address =
+# applet =
+area = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLLink
+# article
+# aside =
+# audio =
+
+b = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLText
+# bdi =
+# bdo =
+# blockquote
+body = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLPanel
+button = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLButton
+
+canvas = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLCanvas
+# caption =
+cite = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLText
+code = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLText
+# col =
+# colgroup =
+command = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLButton
+
+# datalist =
+dd = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLText
+del = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLText
+# details =
+dfn = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLText
+div = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLPanel
+dl = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLPanel
+dt = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLText
+
+em = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLText
+embed = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLCanvas
+
+fieldset = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLPanel
+figcaption = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLText
+figure = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLPanel
+footer = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLPanel
+form = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLPanel
+
+header = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLPanel
+hgroup = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLPanel
+h1 = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLText
+h2 = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLText
+h3 = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLText
+h4 = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLText
+h5 = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLText
+h6 = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLText
+# hr =
+html = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLPanel
+
+i = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLText
+# iframe =
+img = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLImage
+input_button = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLButton
+input_checkbox = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLCheckBox
+input_file = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLButton
+input_image = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLButton
+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_reset = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLButton
+input_submit = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLButton
+input_text = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLTextField
+# input =
+ins = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLText
+
+kbd = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLText
+keygen = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLComboBox
+
+label = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLText
+legend = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLText
+li = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLPanel
+
+# map =
+mark = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLText
+# menu =
+meter = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLImage
+
+nav = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLPanel
+# noscript =
+
+object = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLCanvas
+ol = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLPanel
+# optgroup =
+# option =
+output = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLText
+
+p = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLPanel
+page = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLPage
+# param =
+pre = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLText
+progress = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLImage
+
+q = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLText
+
+# rp =
+# rt =
+# ruby =
+
+s = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLText
+samp = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLText
+section = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLPanel
+select = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLComboBox
 server = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLServer
-page = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLPage
-html = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLPanel
-body = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLPanel
-div = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLPanel
-form = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLPanel
-fieldset = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLPanel
+small = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLText
+# source =
+span = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLText
+strong = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLText
+sub = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLText
+summary = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLText
+sup = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLText
+
+table = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLPanel
+tbody = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLPanel
+td = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLPanel
+textarea = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLTextArea
+tfoot = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLPanel
+th = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLPanel
+thead = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLPanel
+time = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLText
+tr = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLPanel
+# track =
+
+u = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLText
 ul = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLPanel
-li = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLPanel
-p = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLPanel
-a = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLLink
-input_submit = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLButton
-textarea = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLTextArea
+
+var = de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLText
+# video =
+
+# wbr =
+

trunk/autoquest-plugin-html/src/main/java/de/ugoe/cs/autoquest/plugin/html/commands/CMDparseDirHTML.java

@@ -16 +16 @@
 
 import java.io.File;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;
@@ -69 +70 @@
 
         String absolutPath = folder.getAbsolutePath();
-        for (String filename : folder.list()) {
+        String[] files = folder.list();
+        Arrays.sort(files);
+        
+        for (String filename : files) {
             String source = absolutPath + "/" + filename;
             Console.traceln(Level.INFO, "Processing file: " + source);

trunk/autoquest-plugin-html/src/main/java/de/ugoe/cs/autoquest/plugin/html/guimodel/HTMLPage.java

@@ -15 +15 @@
 package de.ugoe.cs.autoquest.plugin.html.guimodel;
 
-import de.ugoe.cs.autoquest.eventcore.guimodel.IFrame;
+import de.ugoe.cs.autoquest.eventcore.guimodel.IDialog;
 
 /**
@@ -24 +24 @@
  * @author Patrick Harms
  */
-public class HTMLPage extends HTMLGUIElement implements IFrame {
+public class HTMLPage extends HTMLGUIElement implements IDialog {
 
     /**  */