Index: /trunk/JFCMonitor/src/de/ugoe/cs/eventbench/jfcmonitor/JFCListener.java
===================================================================
--- /trunk/JFCMonitor/src/de/ugoe/cs/eventbench/jfcmonitor/JFCListener.java	(revision 276)
+++ /trunk/JFCMonitor/src/de/ugoe/cs/eventbench/jfcmonitor/JFCListener.java	(revision 277)
@@ -101,11 +101,15 @@
 	 */
 	private void addSourceInfo(StringBuilder builder, AWTEvent event) {
-		builder.append(" <param name=\"Source\" value=\""
+		builder.append(" <source>" + ENDLINE);
+		builder.append("  <param name=\"toString\" value=\""
 				+ event.getSource().toString() + "\" />" + ENDLINE);
 		if (event.getSource() instanceof Component) {
 			Component source = (Component) event.getSource();
-			addComponentInfo(builder, source, "Source");
-			addComponentInfo(builder, source.getParent(), "Parent");
+			addComponentInfo(builder, source);
+			builder.append(" <parent>" + ENDLINE);
+			addComponentInfo(builder, source.getParent());
+			builder.append(" </parent>" + ENDLINE);
 		}
+		builder.append(" </source>" + ENDLINE);
 	}
 
@@ -120,10 +124,7 @@
 	 * @param component
 	 *            component whose information is appended
-	 * @param prefix
-	 *            prefix to give further information about the component
 	 */
-	private void addComponentInfo(StringBuilder builder, Component component,
-			String prefix) {
-		builder.append(" <param name=\"" + prefix + "Name\" value=\""
+	private void addComponentInfo(StringBuilder builder, Component component) {
+		builder.append("  <param name=\"getName\" value=\""
 				+ component.getName() + "\" />" + ENDLINE);
 		for (Method method : component.getClass().getMethods()) {
@@ -132,12 +133,10 @@
 					String text = (String) method.invoke(component,
 							new Object[] {});
-					builder.append(" <param name=\"" + prefix
-							+ "Text\" value=\"" + text + "\" />" + ENDLINE);
+					builder.append("  <param name=\"getText\" value=\"" + text + "\" />" + ENDLINE);
 				}
 				if (method.getName() == "getTitle") {
 					String title = (String) method.invoke(component,
 							new Object[] {});
-					builder.append(" <param name=\"" + prefix
-							+ "Title\" value=\"" + title + "\" />" + ENDLINE);
+					builder.append("  <param name=\"getTitle\" value=\"" + title + "\" />" + ENDLINE);
 				}
 			} catch (IllegalArgumentException e) {