Index: /trunk/autoquest-androidmonitor/src/de/ugoe/cs/autoquest/androidmonitor/Androidmonitor.java
===================================================================
--- /trunk/autoquest-androidmonitor/src/de/ugoe/cs/autoquest/androidmonitor/Androidmonitor.java	(revision 1755)
+++ /trunk/autoquest-androidmonitor/src/de/ugoe/cs/autoquest/androidmonitor/Androidmonitor.java	(revision 1756)
@@ -146,5 +146,5 @@
 				public void onClick(View v) {
 
-					logFile.addEvent(v);
+					logFile.addEvent(v, "onClick");
 
 					// track information ...
Index: /trunk/autoquest-androidmonitor/src/de/ugoe/cs/autoquest/androidmonitor/AndroidmonitorLogFile.java
===================================================================
--- /trunk/autoquest-androidmonitor/src/de/ugoe/cs/autoquest/androidmonitor/AndroidmonitorLogFile.java	(revision 1755)
+++ /trunk/autoquest-androidmonitor/src/de/ugoe/cs/autoquest/androidmonitor/AndroidmonitorLogFile.java	(revision 1756)
@@ -14,4 +14,9 @@
 import android.view.ViewGroup;
 
+/**
+ * 
+ * @author Florian Unger
+ * @version 1.0
+ */
 public class AndroidmonitorLogFile {
 
@@ -70,7 +75,10 @@
 
 	/**
-	 * get file name
-	 * 
-	 * @return
+	 * <p>
+	 * Get file name which is in use.
+	 * </p>
+	 * 
+	 * @return filename
+	 * 
 	 */
 	public String getName() {
@@ -86,7 +94,9 @@
 
 	/**
-	 * Query device information. XML format.
-	 * 
-	 * @return
+	 * <p>
+	 * Query device information.
+	 * </p>
+	 * 
+	 * @return XML device information in XML format
 	 */
 	// should be set
@@ -133,4 +143,16 @@
 	}
 
+	/**
+	 * <p>
+	 * Adds some information of an component of an activity (view) to the file.
+	 * </p>
+	 * 
+	 * @param view
+	 *            view to be logged
+	 * @param parentHash
+	 *            hash of the parent view
+	 * @param activityName
+	 *            name of the activity that is analyzed
+	 */
 	public void addComponent(View view, int parentHash, String activityName) {
 		XmlSerializer serializer = Xml.newSerializer();
@@ -141,5 +163,11 @@
 			serializer.setOutput(writer);
 			serializer.startTag("", "component");
-			// TODO use hex string instead of integer number
+			// TODO find a way in that the hash code is unique over time and
+			// target
+			/*
+			 * (non-Javadoc) view.getId() seems to be unique over time and
+			 * targets but there is a problem. In some cases there is no ID
+			 * (value: -1).
+			 */
 			serializer.attribute("", "hash", "" + view.hashCode());
 
@@ -171,4 +199,9 @@
 			serializer.endTag("", "param");
 
+			// TODO add title e.g. android:text="Button"
+
+			// TODO add ancestors @see:
+			// de.ugoe.cs.autoquest.jfcmonitor.JFCComponent#getClassHierarchy()
+
 			serializer.endTag("", "component");
 			serializer.endDocument();
@@ -192,5 +225,15 @@
 	}
 
-	public void addEvent(View view) {
+	/**
+	 * <p>
+	 * Add an event to the log file
+	 * </p>
+	 * 
+	 * @param view
+	 *            the calling view of the listener
+	 * @param type
+	 *            the type of listener e.g. onClick ...
+	 */
+	public void addEvent(View view, String type) {
 
 		String x = "" + view.getX();
@@ -204,5 +247,5 @@
 
 			serializer.startTag("", "event");
-			serializer.attribute("", "type", view.getClass().getSimpleName());
+			serializer.attribute("", "id", type);
 
 			serializer.startTag("", "param");
@@ -245,4 +288,13 @@
 	}
 
+	/**
+	 * <p>
+	 * Writes given information to the file. e.g. previous produced XML
+	 * statements.
+	 * </p>
+	 * 
+	 * @param data
+	 *            content to add to the file
+	 */
 	private void writeToFile(String data) {
 
@@ -263,8 +315,10 @@
 
 	/**
-	 * generates the path of an view element
+	 * <p>
+	 * Generates the path of an view element.
+	 * </p>
 	 * 
 	 * @param view
-	 * @return path to the element
+	 * @return path path to the element
 	 */
 	private String getViewPath(View view) {
@@ -273,9 +327,11 @@
 
 	/**
-	 * generates the path of an view element
+	 * <p>
+	 * Generates the path of an view element.
+	 * </p>
 	 * 
 	 * @param view
 	 * @param path
-	 * @return path to the element
+	 * @return path path to the element
 	 */
 	private String getViewPath(View view, String path) {