Index: /trunk/autoquest-jfcmonitor/src/main/java/de/ugoe/cs/autoquest/jfcmonitor/JFCComponent.java
===================================================================
--- /trunk/autoquest-jfcmonitor/src/main/java/de/ugoe/cs/autoquest/jfcmonitor/JFCComponent.java	(revision 931)
+++ /trunk/autoquest-jfcmonitor/src/main/java/de/ugoe/cs/autoquest/jfcmonitor/JFCComponent.java	(revision 932)
@@ -471,10 +471,12 @@
     	StringBuilder builder = new StringBuilder();
     	Class<? extends Object> classobject = component.getClass();
+    	builder.append(" <ancestors>");
     	while(classobject.getSuperclass() != null){
     		classobject = classobject.getSuperclass();
-    		builder.append(" <ancestor name=\"");
+    		builder.append("  <ancestor name=\"");
     		builder.append(classobject.getName());
     		builder.append("\" />" + StringTools.ENDLINE);
     	}
+    	builder.append(" </ancestors>" + StringTools.ENDLINE);
     	return builder.toString();
     }
Index: /trunk/autoquest-jfcmonitor/src/main/java/de/ugoe/cs/autoquest/jfcmonitor/JFCListener.java
===================================================================
--- /trunk/autoquest-jfcmonitor/src/main/java/de/ugoe/cs/autoquest/jfcmonitor/JFCListener.java	(revision 931)
+++ /trunk/autoquest-jfcmonitor/src/main/java/de/ugoe/cs/autoquest/jfcmonitor/JFCListener.java	(revision 932)
@@ -118,14 +118,10 @@
      */
     private void addSourceInfo(StringBuilder builder, AWTEvent event) {
-        builder.append(" <source");
+        builder.append(" <param name=\"source\"");
         if (event.getSource() instanceof Component) {
             Component source = (Component) event.getSource();
-            builder.append(" hash=\"" + Integer.toHexString(source.hashCode()) + "\"");
+            builder.append(" value=\"" + Integer.toHexString(source.hashCode()) + "\"");
         }  
-        builder.append(">" + StringTools.ENDLINE);
-        builder.append("  <param name=\"toString\" value=\"" +
-            StringTools.xmlEntityReplacement(event.getSource().toString()) + "\" />" +
-            StringTools.ENDLINE);
-        builder.append(" </source>" + StringTools.ENDLINE);
+        builder.append(" />" + StringTools.ENDLINE);
     }