Index: /trunk/autoquest-plugin-android/data/guimappings/guimapping-android.txt
===================================================================
--- /trunk/autoquest-plugin-android/data/guimappings/guimapping-android.txt	(revision 1869)
+++ /trunk/autoquest-plugin-android/data/guimappings/guimapping-android.txt	(revision 1870)
@@ -1,14 +1,103 @@
+android.widget.AbsListView = de.ugoe.cs.autoquest.plugin.android.guimodel.ANDROIDPanel
+android.widget.AbsoluteLayout = de.ugoe.cs.autoquest.plugin.android.guimodel.ANDROIDFrame
+android.widget.AbsSeekBar = de.ugoe.cs.autoquest.plugin.android.guimodel.ANDROIDPanel
+android.widget.AbsSpinner = de.ugoe.cs.autoquest.plugin.android.guimodel.ANDROIDPanel
+android.widget.ActionMenuView = de.ugoe.cs.autoquest.plugin.android.guimodel.ANDROIDMenu
+android.widget.AnalogClock = de.ugoe.cs.autoquest.plugin.android.guimodel.ANDROIDTimeAndDate
+android.widget.AutoCompleteTextView = de.ugoe.cs.autoquest.plugin.android.guimodel.ANDROIDTextField
+android.widget.BaseAdapter = de.ugoe.cs.autoquest.plugin.android.guimodel.ANDROIDPanel
+android.widget.BaseExpandableListAdapter = de.ugoe.cs.autoquest.plugin.android.guimodel.ANDROIDPanel
 android.widget.Button = de.ugoe.cs.autoquest.plugin.android.guimodel.ANDROIDButton
+android.widget.CalendarView = de.ugoe.cs.autoquest.plugin.android.guimodel.ANDROIDCalendar
+android.widget.CheckBox = de.ugoe.cs.autoquest.plugin.android.guimodel.ANDROIDCheckBox
+android.widget.CheckedTextView = de.ugoe.cs.autoquest.plugin.android.guimodel.ANDROIDCheckBox
+android.widget.Chronometer = de.ugoe.cs.autoquest.plugin.android.guimodel.ANDROIDTimeAndDate
+android.widget.CompoundButton = de.ugoe.cs.autoquest.plugin.android.guimodel.ANDROIDCompoundButton
+android.widget.CursorAdapter = de.ugoe.cs.autoquest.plugin.android.guimodel.ANDROIDPanel
+android.widget.CursorTreeAdapter = de.ugoe.cs.autoquest.plugin.android.guimodel.ANDROIDTree
+android.widget.DatePicker = de.ugoe.cs.autoquest.plugin.android.guimodel.ANDROIDCalendar
+android.widget.DialerFilter = de.ugoe.cs.autoquest.plugin.android.guimodel.ANDROIDCanvas
+android.widget.DigitalClock = de.ugoe.cs.autoquest.plugin.android.guimodel.ANDROIDTimeAndDate
+android.widget.EdgeEffect = de.ugoe.cs.autoquest.plugin.android.guimodel.ANDROIDCanvas
+android.widget.EditText = de.ugoe.cs.autoquest.plugin.android.guimodel.ANDROIDTextField
+android.widget.ExpandableListView = de.ugoe.cs.autoquest.plugin.android.guimodel.ANDROIDFrame
+android.widget.Filter = de.ugoe.cs.autoquest.plugin.android.guimodel.ANDROIDCanvas
+android.widget.FrameLayout = de.ugoe.cs.autoquest.plugin.android.guimodel.ANDROIDFrame
+android.widget.Gallery = de.ugoe.cs.autoquest.plugin.android.guimodel.ANDROIDFrame
+android.widget.GridLayout = de.ugoe.cs.autoquest.plugin.android.guimodel.ANDROIDFrame
+android.widget.GridView = de.ugoe.cs.autoquest.plugin.android.guimodel.ANDROIDPanel
+android.widget.HeaderViewListAdapter = de.ugoe.cs.autoquest.plugin.android.guimodel.ANDROIDPanel
+android.widget.HorizontalScrollView = de.ugoe.cs.autoquest.plugin.android.guimodel.ANDROIDPanel
+android.widget.ImageButton = de.ugoe.cs.autoquest.plugin.android.guimodel.ANDROIDButton
+android.widget.ImageSwitcher = de.ugoe.cs.autoquest.plugin.android.guimodel.ANDROIDImage
+android.widget.ImageView = de.ugoe.cs.autoquest.plugin.android.guimodel.ANDROIDImage
+android.widget.LinearLayout = de.ugoe.cs.autoquest.plugin.android.guimodel.ANDROIDFrame
+android.widget.ListPopupWindow = de.ugoe.cs.autoquest.plugin.android.guimodel.ANDROIDFrame
+android.widget.ListView = de.ugoe.cs.autoquest.plugin.android.guimodel.ANDROIDFrame
+android.widget.MediaController = de.ugoe.cs.autoquest.plugin.android.guimodel.ANDROIDFrame
+android.widget.MultiAutoCompleteTextView = de.ugoe.cs.autoquest.plugin.android.guimodel.ANDROIDTextField
+android.widget.NumberPicker = de.ugoe.cs.autoquest.plugin.android.guimodel.ANDROIDComboBox
+android.widget.OverScroller = de.ugoe.cs.autoquest.plugin.android.guimodel.ANDROIDScrollPane
+android.widget.PopupMenu = de.ugoe.cs.autoquest.plugin.android.guimodel.ANDROIDMenu
+android.widget.PopupWindow = de.ugoe.cs.autoquest.plugin.android.guimodel.ANDROIDDialog
+android.widget.ProgressBar = de.ugoe.cs.autoquest.plugin.android.guimodel.ANDROIDProgressBar
+android.widget.QuickContactBadge = de.ugoe.cs.autoquest.plugin.android.guimodel.ANDROIDCanvas
 android.widget.RadioButton = de.ugoe.cs.autoquest.plugin.android.guimodel.ANDROIDRadioButton
 android.widget.RadioGroup = de.ugoe.cs.autoquest.plugin.android.guimodel.ANDROIDPanel
-android.widget.FrameLayout = de.ugoe.cs.autoquest.plugin.android.guimodel.ANDROIDFrame
-android.widget.ImageView = de.ugoe.cs.autoquest.plugin.android.guimodel.ANDROIDFrame
-android.widget.LinearLayout = de.ugoe.cs.autoquest.plugin.android.guimodel.ANDROIDFrame
+android.widget.RatingBar = de.ugoe.cs.autoquest.plugin.android.guimodel.ANDROIDRatingBar
+android.widget.RelativeLayout = de.ugoe.cs.autoquest.plugin.android.guimodel.ANDROIDFrame
+android.widget.RemoteViews = de.ugoe.cs.autoquest.plugin.android.guimodel.ANDROIDFrame
+android.widget.ResourceCursorAdapter = de.ugoe.cs.autoquest.plugin.android.guimodel.ANDROIDPanel
+android.widget.ResourceCursorTreeAdapter = de.ugoe.cs.autoquest.plugin.android.guimodel.ANDROIDTree
+android.widget.Scroller = de.ugoe.cs.autoquest.plugin.android.guimodel.ANDROIDScrollPane
+android.widget.ScrollView = de.ugoe.cs.autoquest.plugin.android.guimodel.ANDROIDFrame
+android.widget.SearchView = de.ugoe.cs.autoquest.plugin.android.guimodel.ANDROIDFrame
+android.widget.SeekBar = de.ugoe.cs.autoquest.plugin.android.guimodel.ANDROIDProgressBar
+android.widget.ShareActionProvider = de.ugoe.cs.autoquest.plugin.android.guimodel.ANDROIDPanel
+android.widget.SimpleAdapter = de.ugoe.cs.autoquest.plugin.android.guimodel.ANDROIDPanel
+android.widget.SimpleCursorAdapter = de.ugoe.cs.autoquest.plugin.android.guimodel.ANDROIDPanel
+android.widget.SimpleCursorTreeAdapter = de.ugoe.cs.autoquest.plugin.android.guimodel.ANDROIDTree
+android.widget.SimpleExpandableListAdapter = de.ugoe.cs.autoquest.plugin.android.guimodel.ANDROIDListBox
+android.widget.SlidingDrawer = de.ugoe.cs.autoquest.plugin.android.guimodel.ANDROIDFrame
+android.widget.Space = de.ugoe.cs.autoquest.plugin.android.guimodel.ANDROIDFrame
+android.widget.Spinner = de.ugoe.cs.autoquest.plugin.android.guimodel.ANDROIDComboBox
+android.widget.StackView = de.ugoe.cs.autoquest.plugin.android.guimodel.ANDROIDListBox
+android.widget.Switch = de.ugoe.cs.autoquest.plugin.android.guimodel.ANDROIDCompoundButton
+android.widget.TabHost = de.ugoe.cs.autoquest.plugin.android.guimodel.ANDROIDPanel
+android.widget.TableLayout = de.ugoe.cs.autoquest.plugin.android.guimodel.ANDROIDTable
+android.widget.TableRow = de.ugoe.cs.autoquest.plugin.android.guimodel.ANDROIDTable
+android.widget.TabWidget = de.ugoe.cs.autoquest.plugin.android.guimodel.ANDROIDFrame
+android.widget.TextClock = de.ugoe.cs.autoquest.plugin.android.guimodel.ANDROIDTimeAndDate
+android.widget.TextSwitcher = de.ugoe.cs.autoquest.plugin.android.guimodel.ANDROIDTextField
 android.widget.TextView = de.ugoe.cs.autoquest.plugin.android.guimodel.ANDROIDTextField
-android.widget.EditText = de.ugoe.cs.autoquest.plugin.android.guimodel.ANDROIDTextField
-android.widget.RelativeLayout = de.ugoe.cs.autoquest.plugin.android.guimodel.ANDROIDFrame
+android.widget.TimePicker = de.ugoe.cs.autoquest.plugin.android.guimodel.ANDROIDTimeAndDate
+android.widget.Toast = de.ugoe.cs.autoquest.plugin.android.guimodel.ANDROIDToast
+android.widget.ToggleButton = de.ugoe.cs.autoquest.plugin.android.guimodel.ANDROIDCompoundButton
+android.widget.Toolbar = de.ugoe.cs.autoquest.plugin.android.guimodel.ANDROIDToolBar
+android.widget.TwoLineListItem = de.ugoe.cs.autoquest.plugin.android.guimodel.ANDROIDListBox
+android.widget.VideoView = de.ugoe.cs.autoquest.plugin.android.guimodel.ANDROIDCanvas
+android.widget.ViewAnimator = de.ugoe.cs.autoquest.plugin.android.guimodel.ANDROIDCanvas
+android.widget.ViewFlipper = de.ugoe.cs.autoquest.plugin.android.guimodel.ANDROIDCanvas
+android.widget.ViewSwitcher = de.ugoe.cs.autoquest.plugin.android.guimodel.ANDROIDCanvas
+android.widget.ZoomButton = de.ugoe.cs.autoquest.plugin.android.guimodel.ANDROIDButton
+android.widget.ZoomControls = de.ugoe.cs.autoquest.plugin.android.guimodel.ANDROIDButton
 com.android.internal.policy.impl.PhoneWindow$DecorView = de.ugoe.cs.autoquest.plugin.android.guimodel.ANDROIDPanel
+com.android.internal.widget.AbsActionBarView = de.ugoe.cs.autoquest.plugin.android.guimodel.ANDROIDPanel
 com.android.internal.widget.ActionBarContainer = de.ugoe.cs.autoquest.plugin.android.guimodel.ANDROIDPanel
 com.android.internal.widget.ActionBarContextView = de.ugoe.cs.autoquest.plugin.android.guimodel.ANDROIDPanel
+com.android.internal.widget.ActionBarOverlayLayout = de.ugoe.cs.autoquest.plugin.android.guimodel.ANDROIDPanel
 com.android.internal.widget.ActionBarView = de.ugoe.cs.autoquest.plugin.android.guimodel.ANDROIDPanel
 com.android.internal.widget.ActionBarView$HomeView = de.ugoe.cs.autoquest.plugin.android.guimodel.ANDROIDPanel
+com.android.internal.widget.DialogTitle = de.ugoe.cs.autoquest.plugin.android.guimodel.ANDROIDDialog
+com.android.internal.widget.DigitalClock = de.ugoe.cs.autoquest.plugin.android.guimodel.ANDROIDTimeAndDate
+com.android.internal.widget.DrawableHolder = de.ugoe.cs.autoquest.plugin.android.guimodel.ANDROIDPanel
+com.android.internal.widget.FaceUnlockView = de.ugoe.cs.autoquest.plugin.android.guimodel.ANDROIDPanel
+com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient = de.ugoe.cs.autoquest.plugin.android.guimodel.ANDROIDPanel
+com.android.internal.widget.LockPatternUtils = de.ugoe.cs.autoquest.plugin.android.guimodel.ANDROIDPanel
+com.android.internal.widget.LockPatternView = de.ugoe.cs.autoquest.plugin.android.guimodel.ANDROIDPanel
+com.android.internal.widget.RotarySelector = de.ugoe.cs.autoquest.plugin.android.guimodel.ANDROIDPanel
+com.android.internal.widget.ScrollingTabContainerView = de.ugoe.cs.autoquest.plugin.android.guimodel.ANDROIDFrame
+com.android.internal.widget.SizeAdaptiveLayout = de.ugoe.cs.autoquest.plugin.android.guimodel.ANDROIDPanel
+com.android.internal.widget.SlidingTab = de.ugoe.cs.autoquest.plugin.android.guimodel.ANDROIDPanel
+com.android.internal.widget.Smileys = de.ugoe.cs.autoquest.plugin.android.guimodel.ANDROIDImage
+com.android.internal.widget.WeightedLinearLayout = de.ugoe.cs.autoquest.plugin.android.guimodel.ANDROIDFrame
Index: /trunk/autoquest-plugin-android/src/main/java/de/ugoe/cs/autoquest/plugin/android/AndroidLogParser.java
===================================================================
--- /trunk/autoquest-plugin-android/src/main/java/de/ugoe/cs/autoquest/plugin/android/AndroidLogParser.java	(revision 1869)
+++ /trunk/autoquest-plugin-android/src/main/java/de/ugoe/cs/autoquest/plugin/android/AndroidLogParser.java	(revision 1870)
@@ -156,5 +156,5 @@
      * Show parsed elements to find out failures.  
      */
-    private Boolean showSteps = true;
+    private Boolean showSteps = false;
 
     /**
Index: /trunk/autoquest-plugin-android/src/main/java/de/ugoe/cs/autoquest/plugin/android/guimodel/ANDROIDCalendar.java
===================================================================
--- /trunk/autoquest-plugin-android/src/main/java/de/ugoe/cs/autoquest/plugin/android/guimodel/ANDROIDCalendar.java	(revision 1870)
+++ /trunk/autoquest-plugin-android/src/main/java/de/ugoe/cs/autoquest/plugin/android/guimodel/ANDROIDCalendar.java	(revision 1870)
@@ -0,0 +1,58 @@
+//   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.android.guimodel;
+
+import de.ugoe.cs.autoquest.eventcore.guimodel.ICanvas;
+
+/**
+ * <p>
+ * Class that represents calendars in Android GUIs.
+ * </p>
+ * 
+ * @version 1.0
+ * @author Florian Unger
+ */
+public class ANDROIDCalendar extends ANDROIDGUIElement implements ICanvas{
+    /**
+     * <p>
+     * Id for object serialization.
+     * </p>
+     */
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * <p>
+     * Constructor. Creates a new ANDROIDCalendar.
+     * </p>
+     * 
+     * @param specification
+     *            specification of created GUI element
+     * @param parent
+     *            parent of the created GUI element; null means that the element is a top-level
+     *            window
+     */
+    public ANDROIDCalendar(ANDROIDGUIElementSpec specification, ANDROIDGUIElement parent) {
+        super(specification, parent);
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see de.ugoe.cs.autoquest.plugin.android.guimodel.ANDROIDGUIElement#getElementDescriptor()
+     */
+    @Override
+    protected String getElementDescriptor() {
+        return "Calendar";
+    }
+}
Index: /trunk/autoquest-plugin-android/src/main/java/de/ugoe/cs/autoquest/plugin/android/guimodel/ANDROIDCanvas.java
===================================================================
--- /trunk/autoquest-plugin-android/src/main/java/de/ugoe/cs/autoquest/plugin/android/guimodel/ANDROIDCanvas.java	(revision 1870)
+++ /trunk/autoquest-plugin-android/src/main/java/de/ugoe/cs/autoquest/plugin/android/guimodel/ANDROIDCanvas.java	(revision 1870)
@@ -0,0 +1,58 @@
+//   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.android.guimodel;
+
+import de.ugoe.cs.autoquest.eventcore.guimodel.ICanvas;
+
+/**
+ * <p>
+ * Class that represents canvas' in Android GUIs.
+ * </p>
+ * 
+ * @version 1.0
+ * @author Florian Unger
+ */
+public class ANDROIDCanvas extends ANDROIDGUIElement implements ICanvas{
+    /**
+     * <p>
+     * Id for object serialization.
+     * </p>
+     */
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * <p>
+     * Constructor. Creates a new ANDROIDCanvas.
+     * </p>
+     * 
+     * @param specification
+     *            specification of created GUI element
+     * @param parent
+     *            parent of the created GUI element; null means that the element is a top-level
+     *            window
+     */
+    public ANDROIDCanvas(ANDROIDGUIElementSpec specification, ANDROIDGUIElement parent) {
+        super(specification, parent);
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see de.ugoe.cs.autoquest.plugin.android.guimodel.ANDROIDGUIElement#getElementDescriptor()
+     */
+    @Override
+    protected String getElementDescriptor() {
+        return "Canvas";
+    }
+}
Index: /trunk/autoquest-plugin-android/src/main/java/de/ugoe/cs/autoquest/plugin/android/guimodel/ANDROIDCheckBox.java
===================================================================
--- /trunk/autoquest-plugin-android/src/main/java/de/ugoe/cs/autoquest/plugin/android/guimodel/ANDROIDCheckBox.java	(revision 1870)
+++ /trunk/autoquest-plugin-android/src/main/java/de/ugoe/cs/autoquest/plugin/android/guimodel/ANDROIDCheckBox.java	(revision 1870)
@@ -0,0 +1,59 @@
+//   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.android.guimodel;
+
+import de.ugoe.cs.autoquest.eventcore.guimodel.ICheckBox;
+
+/**
+ * <p>
+ * Class that represents check boxes in Android GUIs.
+ * </p>
+ * 
+ * @version 1.0
+ * @author Florian Unger
+ */
+public class ANDROIDCheckBox extends ANDROIDGUIElement implements ICheckBox{
+    /**
+     * <p>
+     * Id for object serialization.
+     * </p>
+     */
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * <p>
+     * Constructor. Creates a new ANDROIDCheckBox.
+     * </p>
+     * 
+     * @param specification
+     *            specification of created GUI element
+     * @param parent
+     *            parent of the created GUI element; null means that the element is a top-level
+     *            window
+     */
+    public ANDROIDCheckBox(ANDROIDGUIElementSpec specification, ANDROIDGUIElement parent) {
+        super(specification, parent);
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see de.ugoe.cs.autoquest.plugin.android.guimodel.ANDROIDGUIElement#getElementDescriptor()
+     */
+    @Override
+    protected String getElementDescriptor() {
+        return "CheckBox";
+    }
+}
Index: /trunk/autoquest-plugin-android/src/main/java/de/ugoe/cs/autoquest/plugin/android/guimodel/ANDROIDComboBox.java
===================================================================
--- /trunk/autoquest-plugin-android/src/main/java/de/ugoe/cs/autoquest/plugin/android/guimodel/ANDROIDComboBox.java	(revision 1870)
+++ /trunk/autoquest-plugin-android/src/main/java/de/ugoe/cs/autoquest/plugin/android/guimodel/ANDROIDComboBox.java	(revision 1870)
@@ -0,0 +1,60 @@
+//   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.android.guimodel;
+
+import de.ugoe.cs.autoquest.eventcore.guimodel.IComboBox;
+
+/**
+ * <p>
+ * Class that represents combo boxes in Android GUIs.
+ * </p>
+ * 
+ * @version 1.0
+ * @author Florian Unger
+ */
+public class ANDROIDComboBox extends ANDROIDGUIElement implements IComboBox{
+    /**
+     * <p>
+     * Id for object serialization.
+     * </p>
+     */
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * <p>
+     * Constructor. Creates a new ANDROIDComboBox.
+     * </p>
+     * 
+     * @param specification
+     *            specification of created GUI element
+     * @param parent
+     *            parent of the created GUI element; null means that the element is a top-level
+     *            window
+     */
+    public ANDROIDComboBox(ANDROIDGUIElementSpec specification, ANDROIDGUIElement parent) {
+        super(specification, parent);
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see de.ugoe.cs.autoquest.plugin.android.guimodel.ANDROIDGUIElement#getElementDescriptor()
+     */
+    @Override
+    protected String getElementDescriptor() {
+        return "ComboBox";
+    }
+
+}
Index: /trunk/autoquest-plugin-android/src/main/java/de/ugoe/cs/autoquest/plugin/android/guimodel/ANDROIDCompoundButton.java
===================================================================
--- /trunk/autoquest-plugin-android/src/main/java/de/ugoe/cs/autoquest/plugin/android/guimodel/ANDROIDCompoundButton.java	(revision 1870)
+++ /trunk/autoquest-plugin-android/src/main/java/de/ugoe/cs/autoquest/plugin/android/guimodel/ANDROIDCompoundButton.java	(revision 1870)
@@ -0,0 +1,65 @@
+//   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.android.guimodel;
+
+import de.ugoe.cs.autoquest.eventcore.guimodel.ICheckBox;
+
+/*
+ * (non-Javadoc)
+ * 
+ * @see http://developer.android.com/reference/android/widget/CompoundButton.html
+ */
+/**
+ * <p>
+ * Class that represents compound buttons in Android GUIs. A button with two states, checked and
+ * unchecked. When the button is pressed or clicked, the state changes automatically.
+ * </p>
+ * 
+ * @version 1.0
+ * @author Florian Unger
+ */
+public class ANDROIDCompoundButton extends ANDROIDGUIElement implements ICheckBox {
+    /**
+     * <p>
+     * Id for object serialization.
+     * </p>
+     */
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * <p>
+     * Constructor. Creates a new ANDROIDCompoundButton.
+     * </p>
+     * 
+     * @param specification
+     *            specification of created GUI element
+     * @param parent
+     *            parent of the created GUI element; null means that the element is a top-level
+     *            window
+     */
+    public ANDROIDCompoundButton(ANDROIDGUIElementSpec specification, ANDROIDGUIElement parent) {
+        super(specification, parent);
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see de.ugoe.cs.autoquest.plugin.android.guimodel.ANDROIDGUIElement#getElementDescriptor()
+     */
+    @Override
+    protected String getElementDescriptor() {
+        return "CompoundButton";
+    }
+}
Index: /trunk/autoquest-plugin-android/src/main/java/de/ugoe/cs/autoquest/plugin/android/guimodel/ANDROIDDialog.java
===================================================================
--- /trunk/autoquest-plugin-android/src/main/java/de/ugoe/cs/autoquest/plugin/android/guimodel/ANDROIDDialog.java	(revision 1870)
+++ /trunk/autoquest-plugin-android/src/main/java/de/ugoe/cs/autoquest/plugin/android/guimodel/ANDROIDDialog.java	(revision 1870)
@@ -0,0 +1,59 @@
+//   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.android.guimodel;
+
+import de.ugoe.cs.autoquest.eventcore.guimodel.IDialog;
+
+/**
+ * <p>
+ * Class that represents dialogs in Android GUIs.
+ * </p>
+ * 
+ * @version 1.0
+ * @author Florian Unger
+ */
+public class ANDROIDDialog extends ANDROIDGUIElement implements IDialog{
+    /**
+     * <p>
+     * Id for object serialization.
+     * </p>
+     */
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * <p>
+     * Constructor. Creates a new ANDROIDDialog.
+     * </p>
+     * 
+     * @param specification
+     *            specification of created GUI element
+     * @param parent
+     *            parent of the created GUI element; null means that the element is a top-level
+     *            window
+     */
+    public ANDROIDDialog(ANDROIDGUIElementSpec specification, ANDROIDGUIElement parent) {
+        super(specification, parent);
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see de.ugoe.cs.autoquest.plugin.android.guimodel.ANDROIDGUIElement#getElementDescriptor()
+     */
+    @Override
+    protected String getElementDescriptor() {
+        return "Dialog";
+    }
+}
Index: /trunk/autoquest-plugin-android/src/main/java/de/ugoe/cs/autoquest/plugin/android/guimodel/ANDROIDImage.java
===================================================================
--- /trunk/autoquest-plugin-android/src/main/java/de/ugoe/cs/autoquest/plugin/android/guimodel/ANDROIDImage.java	(revision 1870)
+++ /trunk/autoquest-plugin-android/src/main/java/de/ugoe/cs/autoquest/plugin/android/guimodel/ANDROIDImage.java	(revision 1870)
@@ -0,0 +1,60 @@
+//   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.android.guimodel;
+
+import de.ugoe.cs.autoquest.eventcore.guimodel.IImage;
+
+/**
+ * <p>
+ * Class that represents images in Android GUIs.
+ * </p>
+ * 
+ * @version 1.0
+ * @author Florian Unger
+ */
+public class ANDROIDImage extends ANDROIDGUIElement implements IImage {
+
+    /**
+     * <p>
+     * Id for object serialization.
+     * </p>
+     */
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * <p>
+     * Constructor. Creates a new ANDROIDImage.
+     * </p>
+     * 
+     * @param specification
+     *            specification of created GUI element
+     * @param parent
+     *            parent of the created GUI element; null means that the element is a top-level
+     *            window
+     */
+    public ANDROIDImage(ANDROIDGUIElementSpec specification, ANDROIDGUIElement parent) {
+        super(specification, parent);
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see de.ugoe.cs.autoquest.plugin.android.guimodel.ANDROIDGUIElement#getElementDescriptor()
+     */
+    @Override
+    protected String getElementDescriptor() {
+        return "Image";
+    }
+}
Index: /trunk/autoquest-plugin-android/src/main/java/de/ugoe/cs/autoquest/plugin/android/guimodel/ANDROIDListBox.java
===================================================================
--- /trunk/autoquest-plugin-android/src/main/java/de/ugoe/cs/autoquest/plugin/android/guimodel/ANDROIDListBox.java	(revision 1870)
+++ /trunk/autoquest-plugin-android/src/main/java/de/ugoe/cs/autoquest/plugin/android/guimodel/ANDROIDListBox.java	(revision 1870)
@@ -0,0 +1,59 @@
+//   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.android.guimodel;
+
+import de.ugoe.cs.autoquest.eventcore.guimodel.IListBox;
+
+/**
+ * <p>
+ * Class that represents a list or list box in Android GUIs.
+ * </p>
+ * 
+ * @version 1.0
+ * @author Florian Unger
+ */
+public class ANDROIDListBox extends ANDROIDGUIElement implements IListBox{
+    /**
+     * <p>
+     * Id for object serialization.
+     * </p>
+     */
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * <p>
+     * Constructor. Creates a new ANDROIDListBox.
+     * </p>
+     * 
+     * @param specification
+     *            specification of created GUI element
+     * @param parent
+     *            parent of the created GUI element; null means that the element is a top-level
+     *            window
+     */
+    public ANDROIDListBox(ANDROIDGUIElementSpec specification, ANDROIDGUIElement parent) {
+        super(specification, parent);
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see de.ugoe.cs.autoquest.plugin.android.guimodel.ANDROIDGUIElement#getElementDescriptor()
+     */
+    @Override
+    protected String getElementDescriptor() {
+        return "ListBox";
+    }
+}
Index: /trunk/autoquest-plugin-android/src/main/java/de/ugoe/cs/autoquest/plugin/android/guimodel/ANDROIDMenu.java
===================================================================
--- /trunk/autoquest-plugin-android/src/main/java/de/ugoe/cs/autoquest/plugin/android/guimodel/ANDROIDMenu.java	(revision 1870)
+++ /trunk/autoquest-plugin-android/src/main/java/de/ugoe/cs/autoquest/plugin/android/guimodel/ANDROIDMenu.java	(revision 1870)
@@ -0,0 +1,60 @@
+//   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.android.guimodel;
+
+import de.ugoe.cs.autoquest.eventcore.guimodel.IMenu;
+
+/**
+ * <p>
+ * Class that represents menus in Android GUIs.
+ * </p>
+ * 
+ * @version 1.0
+ * @author Florian Unger
+ */
+public class ANDROIDMenu extends ANDROIDGUIElement implements IMenu{
+    /**
+     * <p>
+     * Id for object serialization.
+     * </p>
+     */
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * <p>
+     * Constructor. Creates a new ANDROIDMenu.
+     * </p>
+     * 
+     * @param specification
+     *            specification of created GUI element
+     * @param parent
+     *            parent of the created GUI element; null means that the element is a top-level
+     *            window
+     */
+    public ANDROIDMenu(ANDROIDGUIElementSpec specification, ANDROIDGUIElement parent) {
+        super(specification, parent);
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see de.ugoe.cs.autoquest.plugin.android.guimodel.ANDROIDGUIElement#getElementDescriptor()
+     */
+    @Override
+    protected String getElementDescriptor() {
+        return "Menu";
+    }
+
+}
Index: /trunk/autoquest-plugin-android/src/main/java/de/ugoe/cs/autoquest/plugin/android/guimodel/ANDROIDProgressBar.java
===================================================================
--- /trunk/autoquest-plugin-android/src/main/java/de/ugoe/cs/autoquest/plugin/android/guimodel/ANDROIDProgressBar.java	(revision 1870)
+++ /trunk/autoquest-plugin-android/src/main/java/de/ugoe/cs/autoquest/plugin/android/guimodel/ANDROIDProgressBar.java	(revision 1870)
@@ -0,0 +1,59 @@
+//   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.android.guimodel;
+
+import de.ugoe.cs.autoquest.eventcore.guimodel.IProgressBar;
+
+/**
+ * <p>
+ * Class that represents progress bars in Android GUIs.
+ * </p>
+ * 
+ * @version 1.0
+ * @author Florian Unger
+ */
+public class ANDROIDProgressBar extends ANDROIDGUIElement implements IProgressBar{
+    /**
+     * <p>
+     * Id for object serialization.
+     * </p>
+     */
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * <p>
+     * Constructor. Creates a new ANDROIDProgressBar.
+     * </p>
+     * 
+     * @param specification
+     *            specification of created GUI element
+     * @param parent
+     *            parent of the created GUI element; null means that the element is a top-level
+     *            window
+     */
+    public ANDROIDProgressBar(ANDROIDGUIElementSpec specification, ANDROIDGUIElement parent) {
+        super(specification, parent);
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see de.ugoe.cs.autoquest.plugin.android.guimodel.ANDROIDGUIElement#getElementDescriptor()
+     */
+    @Override
+    protected String getElementDescriptor() {
+        return "ProgressBar";
+    }
+}
Index: /trunk/autoquest-plugin-android/src/main/java/de/ugoe/cs/autoquest/plugin/android/guimodel/ANDROIDRatingBar.java
===================================================================
--- /trunk/autoquest-plugin-android/src/main/java/de/ugoe/cs/autoquest/plugin/android/guimodel/ANDROIDRatingBar.java	(revision 1870)
+++ /trunk/autoquest-plugin-android/src/main/java/de/ugoe/cs/autoquest/plugin/android/guimodel/ANDROIDRatingBar.java	(revision 1870)
@@ -0,0 +1,60 @@
+//   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.android.guimodel;
+
+import de.ugoe.cs.autoquest.eventcore.guimodel.IRadioButton;
+
+/**
+ * <p>
+ * Class that represents rating bars in Android GUIs.
+ * </p>
+ * 
+ * @version 1.0
+ * @author Florian Unger
+ */
+public class ANDROIDRatingBar extends ANDROIDGUIElement implements IRadioButton{
+
+    /**
+     * <p>
+     * Id for object serialization.
+     * </p>
+     */
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * <p>
+     * Constructor. Creates a new ANDROIDRatingBar.
+     * </p>
+     * 
+     * @param specification
+     *            specification of created GUI element
+     * @param parent
+     *            parent of the created GUI element; null means that the element is a top-level
+     *            window
+     */
+    public ANDROIDRatingBar(ANDROIDGUIElementSpec specification, ANDROIDGUIElement parent) {
+        super(specification, parent);
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see de.ugoe.cs.autoquest.plugin.android.guimodel.ANDROIDGUIElement#getElementDescriptor()
+     */
+    @Override
+    protected String getElementDescriptor() {
+        return "RatingBar";
+    }
+}
Index: /trunk/autoquest-plugin-android/src/main/java/de/ugoe/cs/autoquest/plugin/android/guimodel/ANDROIDScrollPane.java
===================================================================
--- /trunk/autoquest-plugin-android/src/main/java/de/ugoe/cs/autoquest/plugin/android/guimodel/ANDROIDScrollPane.java	(revision 1870)
+++ /trunk/autoquest-plugin-android/src/main/java/de/ugoe/cs/autoquest/plugin/android/guimodel/ANDROIDScrollPane.java	(revision 1870)
@@ -0,0 +1,59 @@
+//   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.android.guimodel;
+
+import de.ugoe.cs.autoquest.eventcore.guimodel.IScrollPane;
+
+/**
+ * <p>
+ * Class that represents scroll panes in Android GUIs.
+ * </p>
+ * 
+ * @version 1.0
+ * @author Florian Unger
+ */
+public class ANDROIDScrollPane extends ANDROIDGUIElement implements IScrollPane{
+    /**
+     * <p>
+     * Id for object serialization.
+     * </p>
+     */
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * <p>
+     * Constructor. Creates a new ANDROIDScrollPane.
+     * </p>
+     * 
+     * @param specification
+     *            specification of created GUI element
+     * @param parent
+     *            parent of the created GUI element; null means that the element is a top-level
+     *            window
+     */
+    public ANDROIDScrollPane(ANDROIDGUIElementSpec specification, ANDROIDGUIElement parent) {
+        super(specification, parent);
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see de.ugoe.cs.autoquest.plugin.android.guimodel.ANDROIDGUIElement#getElementDescriptor()
+     */
+    @Override
+    protected String getElementDescriptor() {
+        return "ScrollPane";
+    }
+}
Index: /trunk/autoquest-plugin-android/src/main/java/de/ugoe/cs/autoquest/plugin/android/guimodel/ANDROIDTable.java
===================================================================
--- /trunk/autoquest-plugin-android/src/main/java/de/ugoe/cs/autoquest/plugin/android/guimodel/ANDROIDTable.java	(revision 1870)
+++ /trunk/autoquest-plugin-android/src/main/java/de/ugoe/cs/autoquest/plugin/android/guimodel/ANDROIDTable.java	(revision 1870)
@@ -0,0 +1,59 @@
+//   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.android.guimodel;
+
+import de.ugoe.cs.autoquest.eventcore.guimodel.ITable;
+
+/**
+ * <p>
+ * Class that represents tables in Android GUIs.
+ * </p>
+ * 
+ * @version 1.0
+ * @author Florian Unger
+ */
+public class ANDROIDTable extends ANDROIDGUIElement implements ITable{
+    /**
+     * <p>
+     * Id for object serialization.
+     * </p>
+     */
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * <p>
+     * Constructor. Creates a new ANDROIDTable.
+     * </p>
+     * 
+     * @param specification
+     *            specification of created GUI element
+     * @param parent
+     *            parent of the created GUI element; null means that the element is a top-level
+     *            window
+     */
+    public ANDROIDTable(ANDROIDGUIElementSpec specification, ANDROIDGUIElement parent) {
+        super(specification, parent);
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see de.ugoe.cs.autoquest.plugin.android.guimodel.ANDROIDGUIElement#getElementDescriptor()
+     */
+    @Override
+    protected String getElementDescriptor() {
+        return "Table";
+    }
+}
Index: /trunk/autoquest-plugin-android/src/main/java/de/ugoe/cs/autoquest/plugin/android/guimodel/ANDROIDTimeAndDate.java
===================================================================
--- /trunk/autoquest-plugin-android/src/main/java/de/ugoe/cs/autoquest/plugin/android/guimodel/ANDROIDTimeAndDate.java	(revision 1870)
+++ /trunk/autoquest-plugin-android/src/main/java/de/ugoe/cs/autoquest/plugin/android/guimodel/ANDROIDTimeAndDate.java	(revision 1870)
@@ -0,0 +1,60 @@
+//   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.android.guimodel;
+
+import de.ugoe.cs.autoquest.eventcore.guimodel.ICanvas;
+
+/**
+ * <p>
+ * Class that represents time and date elements in Android GUIs. E.g. DatePicker, Calendar,
+ * AnalogClock ...
+ * </p>
+ * 
+ * @version 1.0
+ * @author Florian Unger
+ */
+public class ANDROIDTimeAndDate extends ANDROIDGUIElement implements ICanvas{
+    /**
+     * <p>
+     * Id for object serialization.
+     * </p>
+     */
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * <p>
+     * Constructor. Creates a new ANDROIDTimeAndDate.
+     * </p>
+     * 
+     * @param specification
+     *            specification of created GUI element
+     * @param parent
+     *            parent of the created GUI element; null means that the element is a top-level
+     *            window
+     */
+    public ANDROIDTimeAndDate(ANDROIDGUIElementSpec specification, ANDROIDGUIElement parent) {
+        super(specification, parent);
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see de.ugoe.cs.autoquest.plugin.android.guimodel.ANDROIDGUIElement#getElementDescriptor()
+     */
+    @Override
+    protected String getElementDescriptor() {
+        return "TimeAndDate";
+    }
+}
Index: /trunk/autoquest-plugin-android/src/main/java/de/ugoe/cs/autoquest/plugin/android/guimodel/ANDROIDToast.java
===================================================================
--- /trunk/autoquest-plugin-android/src/main/java/de/ugoe/cs/autoquest/plugin/android/guimodel/ANDROIDToast.java	(revision 1870)
+++ /trunk/autoquest-plugin-android/src/main/java/de/ugoe/cs/autoquest/plugin/android/guimodel/ANDROIDToast.java	(revision 1870)
@@ -0,0 +1,59 @@
+//   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.android.guimodel;
+
+import de.ugoe.cs.autoquest.eventcore.guimodel.IDialog;
+
+/**
+ * <p>
+ * Class that represents a quick little message for the user in Android GUIs.
+ * </p>
+ * 
+ * @version 1.0
+ * @author Florian Unger
+ */
+public class ANDROIDToast extends ANDROIDGUIElement implements IDialog{
+    /**
+     * <p>
+     * Id for object serialization.
+     * </p>
+     */
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * <p>
+     * Constructor. Creates a new ANDROIDToast.
+     * </p>
+     * 
+     * @param specification
+     *            specification of created GUI element
+     * @param parent
+     *            parent of the created GUI element; null means that the element is a top-level
+     *            window
+     */
+    public ANDROIDToast(ANDROIDGUIElementSpec specification, ANDROIDGUIElement parent) {
+        super(specification, parent);
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see de.ugoe.cs.autoquest.plugin.android.guimodel.ANDROIDGUIElement#getElementDescriptor()
+     */
+    @Override
+    protected String getElementDescriptor() {
+        return "Toast";
+    }
+}
Index: /trunk/autoquest-plugin-android/src/main/java/de/ugoe/cs/autoquest/plugin/android/guimodel/ANDROIDToolBar.java
===================================================================
--- /trunk/autoquest-plugin-android/src/main/java/de/ugoe/cs/autoquest/plugin/android/guimodel/ANDROIDToolBar.java	(revision 1870)
+++ /trunk/autoquest-plugin-android/src/main/java/de/ugoe/cs/autoquest/plugin/android/guimodel/ANDROIDToolBar.java	(revision 1870)
@@ -0,0 +1,59 @@
+//   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.android.guimodel;
+
+import de.ugoe.cs.autoquest.eventcore.guimodel.IToolBar;
+
+/**
+ * <p>
+ * Class that represents a tool bar in Android GUIs.
+ * </p>
+ * 
+ * @version 1.0
+ * @author Florian Unger
+ */
+public class ANDROIDToolBar extends ANDROIDGUIElement implements IToolBar{
+    /**
+     * <p>
+     * Id for object serialization.
+     * </p>
+     */
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * <p>
+     * Constructor. Creates a new ANDROIDToolBar.
+     * </p>
+     * 
+     * @param specification
+     *            specification of created GUI element
+     * @param parent
+     *            parent of the created GUI element; null means that the element is a top-level
+     *            window
+     */
+    public ANDROIDToolBar(ANDROIDGUIElementSpec specification, ANDROIDGUIElement parent) {
+        super(specification, parent);
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see de.ugoe.cs.autoquest.plugin.android.guimodel.ANDROIDGUIElement#getElementDescriptor()
+     */
+    @Override
+    protected String getElementDescriptor() {
+        return "ToolBar";
+    }
+}
Index: /trunk/autoquest-plugin-android/src/main/java/de/ugoe/cs/autoquest/plugin/android/guimodel/ANDROIDTree.java
===================================================================
--- /trunk/autoquest-plugin-android/src/main/java/de/ugoe/cs/autoquest/plugin/android/guimodel/ANDROIDTree.java	(revision 1870)
+++ /trunk/autoquest-plugin-android/src/main/java/de/ugoe/cs/autoquest/plugin/android/guimodel/ANDROIDTree.java	(revision 1870)
@@ -0,0 +1,60 @@
+//   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.android.guimodel;
+
+import de.ugoe.cs.autoquest.eventcore.guimodel.ITree;
+
+/**
+ * <p>
+ * Class that represents trees in Android GUIs.
+ * </p>
+ * 
+ * @version 1.0
+ * @author Florian Unger
+ */
+public class ANDROIDTree extends ANDROIDGUIElement implements ITree{
+    /**
+     * <p>
+     * Id for object serialization.
+     * </p>
+     */
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * <p>
+     * Constructor. Creates a new ANDROIDTree.
+     * </p>
+     * 
+     * @param specification
+     *            specification of created GUI element
+     * @param parent
+     *            parent of the created GUI element; null means that the element is a top-level
+     *            window
+     */
+    public ANDROIDTree(ANDROIDGUIElementSpec specification, ANDROIDGUIElement parent) {
+        super(specification, parent);
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see de.ugoe.cs.autoquest.plugin.android.guimodel.ANDROIDGUIElement#getElementDescriptor()
+     */
+    @Override
+    protected String getElementDescriptor() {
+        return "Tree";
+    }
+
+}
