Index: /trunk/autoquest-plugin-html/data/guimappings/guimapping-html.txt
===================================================================
--- /trunk/autoquest-plugin-html/data/guimappings/guimapping-html.txt	(revision 1011)
+++ /trunk/autoquest-plugin-html/data/guimappings/guimapping-html.txt	(revision 1012)
@@ -1,13 +1,134 @@
+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 =
+
Index: /trunk/autoquest-plugin-html/src/main/java/de/ugoe/cs/autoquest/plugin/html/commands/CMDparseDirHTML.java
===================================================================
--- /trunk/autoquest-plugin-html/src/main/java/de/ugoe/cs/autoquest/plugin/html/commands/CMDparseDirHTML.java	(revision 1011)
+++ /trunk/autoquest-plugin-html/src/main/java/de/ugoe/cs/autoquest/plugin/html/commands/CMDparseDirHTML.java	(revision 1012)
@@ -16,4 +16,5 @@
 
 import java.io.File;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;
@@ -69,5 +70,8 @@
 
         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);
Index: /trunk/autoquest-plugin-html/src/main/java/de/ugoe/cs/autoquest/plugin/html/guimodel/HTMLCanvas.java
===================================================================
--- /trunk/autoquest-plugin-html/src/main/java/de/ugoe/cs/autoquest/plugin/html/guimodel/HTMLCanvas.java	(revision 1012)
+++ /trunk/autoquest-plugin-html/src/main/java/de/ugoe/cs/autoquest/plugin/html/guimodel/HTMLCanvas.java	(revision 1012)
@@ -0,0 +1,53 @@
+//   Copyright 2012 Georg-August-Universität Göttingen, Germany
+//
+//   Licensed under the Apache License, Version 2.0 (the "License");
+//   you may not use this file except in compliance with the License.
+//   You may obtain a copy of the License at
+//
+//       http://www.apache.org/licenses/LICENSE-2.0
+//
+//   Unless required by applicable law or agreed to in writing, software
+//   distributed under the License is distributed on an "AS IS" BASIS,
+//   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//   See the License for the specific language governing permissions and
+//   limitations under the License.
+
+package de.ugoe.cs.autoquest.plugin.html.guimodel;
+
+import de.ugoe.cs.autoquest.eventcore.guimodel.ICanvas;
+
+/**
+ * <p>
+ * TODO comment
+ * </p>
+ * 
+ * @author Patrick Harms
+ */
+public class HTMLCanvas extends HTMLPageElement implements ICanvas {
+
+    /**  */
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * <p>
+     * TODO: comment
+     * </p>
+     *
+     * @param specification
+     * @param parent
+     */
+    public HTMLCanvas(HTMLPageElementSpec specification, HTMLGUIElement parent) {
+        super(specification, parent);
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLGUIElement#getElementDescriptor()
+     */
+    @Override
+    protected String getElementDescriptor() {
+        return "Canvas";
+    }
+
+}
Index: /trunk/autoquest-plugin-html/src/main/java/de/ugoe/cs/autoquest/plugin/html/guimodel/HTMLCheckBox.java
===================================================================
--- /trunk/autoquest-plugin-html/src/main/java/de/ugoe/cs/autoquest/plugin/html/guimodel/HTMLCheckBox.java	(revision 1012)
+++ /trunk/autoquest-plugin-html/src/main/java/de/ugoe/cs/autoquest/plugin/html/guimodel/HTMLCheckBox.java	(revision 1012)
@@ -0,0 +1,53 @@
+//   Copyright 2012 Georg-August-Universität Göttingen, Germany
+//
+//   Licensed under the Apache License, Version 2.0 (the "License");
+//   you may not use this file except in compliance with the License.
+//   You may obtain a copy of the License at
+//
+//       http://www.apache.org/licenses/LICENSE-2.0
+//
+//   Unless required by applicable law or agreed to in writing, software
+//   distributed under the License is distributed on an "AS IS" BASIS,
+//   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//   See the License for the specific language governing permissions and
+//   limitations under the License.
+
+package de.ugoe.cs.autoquest.plugin.html.guimodel;
+
+import de.ugoe.cs.autoquest.eventcore.guimodel.ICheckBox;
+
+/**
+ * <p>
+ * TODO comment
+ * </p>
+ * 
+ * @author Patrick Harms
+ */
+public class HTMLCheckBox extends HTMLPageElement implements ICheckBox {
+
+    /**  */
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * <p>
+     * TODO: comment
+     * </p>
+     *
+     * @param specification
+     * @param parent
+     */
+    public HTMLCheckBox(HTMLPageElementSpec specification, HTMLGUIElement parent) {
+        super(specification, parent);
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLGUIElement#getElementDescriptor()
+     */
+    @Override
+    protected String getElementDescriptor() {
+        return "CheckBox";
+    }
+
+}
Index: /trunk/autoquest-plugin-html/src/main/java/de/ugoe/cs/autoquest/plugin/html/guimodel/HTMLComboBox.java
===================================================================
--- /trunk/autoquest-plugin-html/src/main/java/de/ugoe/cs/autoquest/plugin/html/guimodel/HTMLComboBox.java	(revision 1012)
+++ /trunk/autoquest-plugin-html/src/main/java/de/ugoe/cs/autoquest/plugin/html/guimodel/HTMLComboBox.java	(revision 1012)
@@ -0,0 +1,53 @@
+//   Copyright 2012 Georg-August-Universität Göttingen, Germany
+//
+//   Licensed under the Apache License, Version 2.0 (the "License");
+//   you may not use this file except in compliance with the License.
+//   You may obtain a copy of the License at
+//
+//       http://www.apache.org/licenses/LICENSE-2.0
+//
+//   Unless required by applicable law or agreed to in writing, software
+//   distributed under the License is distributed on an "AS IS" BASIS,
+//   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//   See the License for the specific language governing permissions and
+//   limitations under the License.
+
+package de.ugoe.cs.autoquest.plugin.html.guimodel;
+
+import de.ugoe.cs.autoquest.eventcore.guimodel.IComboBox;
+
+/**
+ * <p>
+ * TODO comment
+ * </p>
+ * 
+ * @author Patrick Harms
+ */
+public class HTMLComboBox extends HTMLPageElement implements IComboBox {
+
+    /**  */
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * <p>
+     * TODO: comment
+     * </p>
+     *
+     * @param specification
+     * @param parent
+     */
+    public HTMLComboBox(HTMLPageElementSpec specification, HTMLGUIElement parent) {
+        super(specification, parent);
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLGUIElement#getElementDescriptor()
+     */
+    @Override
+    protected String getElementDescriptor() {
+        return "ComboBox";
+    }
+
+}
Index: /trunk/autoquest-plugin-html/src/main/java/de/ugoe/cs/autoquest/plugin/html/guimodel/HTMLPage.java
===================================================================
--- /trunk/autoquest-plugin-html/src/main/java/de/ugoe/cs/autoquest/plugin/html/guimodel/HTMLPage.java	(revision 1011)
+++ /trunk/autoquest-plugin-html/src/main/java/de/ugoe/cs/autoquest/plugin/html/guimodel/HTMLPage.java	(revision 1012)
@@ -15,5 +15,5 @@
 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,5 +24,5 @@
  * @author Patrick Harms
  */
-public class HTMLPage extends HTMLGUIElement implements IFrame {
+public class HTMLPage extends HTMLGUIElement implements IDialog {
 
     /**  */
Index: /trunk/autoquest-plugin-html/src/main/java/de/ugoe/cs/autoquest/plugin/html/guimodel/HTMLRadioButton.java
===================================================================
--- /trunk/autoquest-plugin-html/src/main/java/de/ugoe/cs/autoquest/plugin/html/guimodel/HTMLRadioButton.java	(revision 1012)
+++ /trunk/autoquest-plugin-html/src/main/java/de/ugoe/cs/autoquest/plugin/html/guimodel/HTMLRadioButton.java	(revision 1012)
@@ -0,0 +1,53 @@
+//   Copyright 2012 Georg-August-Universität Göttingen, Germany
+//
+//   Licensed under the Apache License, Version 2.0 (the "License");
+//   you may not use this file except in compliance with the License.
+//   You may obtain a copy of the License at
+//
+//       http://www.apache.org/licenses/LICENSE-2.0
+//
+//   Unless required by applicable law or agreed to in writing, software
+//   distributed under the License is distributed on an "AS IS" BASIS,
+//   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//   See the License for the specific language governing permissions and
+//   limitations under the License.
+
+package de.ugoe.cs.autoquest.plugin.html.guimodel;
+
+import de.ugoe.cs.autoquest.eventcore.guimodel.IRadioButton;
+
+/**
+ * <p>
+ * TODO comment
+ * </p>
+ * 
+ * @author Patrick Harms
+ */
+public class HTMLRadioButton extends HTMLPageElement implements IRadioButton {
+
+    /**  */
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * <p>
+     * TODO: comment
+     * </p>
+     *
+     * @param specification
+     * @param parent
+     */
+    public HTMLRadioButton(HTMLPageElementSpec specification, HTMLGUIElement parent) {
+        super(specification, parent);
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLGUIElement#getElementDescriptor()
+     */
+    @Override
+    protected String getElementDescriptor() {
+        return "RadioButton";
+    }
+
+}
Index: /trunk/autoquest-plugin-html/src/main/java/de/ugoe/cs/autoquest/plugin/html/guimodel/HTMLTextField.java
===================================================================
--- /trunk/autoquest-plugin-html/src/main/java/de/ugoe/cs/autoquest/plugin/html/guimodel/HTMLTextField.java	(revision 1012)
+++ /trunk/autoquest-plugin-html/src/main/java/de/ugoe/cs/autoquest/plugin/html/guimodel/HTMLTextField.java	(revision 1012)
@@ -0,0 +1,53 @@
+//   Copyright 2012 Georg-August-Universität Göttingen, Germany
+//
+//   Licensed under the Apache License, Version 2.0 (the "License");
+//   you may not use this file except in compliance with the License.
+//   You may obtain a copy of the License at
+//
+//       http://www.apache.org/licenses/LICENSE-2.0
+//
+//   Unless required by applicable law or agreed to in writing, software
+//   distributed under the License is distributed on an "AS IS" BASIS,
+//   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//   See the License for the specific language governing permissions and
+//   limitations under the License.
+
+package de.ugoe.cs.autoquest.plugin.html.guimodel;
+
+import de.ugoe.cs.autoquest.eventcore.guimodel.ITextField;
+
+/**
+ * <p>
+ * TODO comment
+ * </p>
+ * 
+ * @author Patrick Harms
+ */
+public class HTMLTextField extends HTMLPageElement implements ITextField {
+
+    /**  */
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * <p>
+     * TODO: comment
+     * </p>
+     *
+     * @param specification
+     * @param parent
+     */
+    public HTMLTextField(HTMLPageElementSpec specification, HTMLGUIElement parent) {
+        super(specification, parent);
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLGUIElement#getElementDescriptor()
+     */
+    @Override
+    protected String getElementDescriptor() {
+        return "TextField";
+    }
+
+}
