Index: /trunk/JFCMonitor/src/de/ugoe/cs/eventbench/jfcmonitor/JFCListener.java
===================================================================
--- /trunk/JFCMonitor/src/de/ugoe/cs/eventbench/jfcmonitor/JFCListener.java	(revision 355)
+++ /trunk/JFCMonitor/src/de/ugoe/cs/eventbench/jfcmonitor/JFCListener.java	(revision 356)
@@ -24,11 +24,4 @@
 	/**
 	 * <p>
-	 * Convenience variable.
-	 * </p>
-	 */
-	final static private String ENDLINE = System.getProperty("line.separator");
-
-	/**
-	 * <p>
 	 * Writer for logging events.
 	 * </p>
@@ -49,6 +42,6 @@
 		try {
 			outputWriter.write("<?xml version=\"1.0\" encoding=\"UTF-16\"?>"
-					+ ENDLINE);
-			outputWriter.write("<sessions>" + ENDLINE);
+					+ StringTools.ENDLINE);
+			outputWriter.write("<sessions>" + StringTools.ENDLINE);
 		} catch (IOException e) {
 			System.err.println("JFCMONITOR -- Failure writing to log: "
@@ -72,15 +65,15 @@
 			MouseEvent mouseEvent = (MouseEvent) event;
 			if (!isMouseMovement(event.getID())) {
-				builder.append("<event id=\"" + event.getID() + "\">" + ENDLINE);
+				builder.append("<event id=\"" + event.getID() + "\">" + StringTools.ENDLINE);
 				builder.append(" <param name=\"X\" value=\""
-						+ mouseEvent.getX() + "\" />" + ENDLINE);
+						+ mouseEvent.getX() + "\" />" + StringTools.ENDLINE);
 				builder.append(" <param name=\"Y\" value=\""
-						+ mouseEvent.getY() + "\" />" + ENDLINE);
+						+ mouseEvent.getY() + "\" />" + StringTools.ENDLINE);
 				builder.append(" <param name=\"Button\" value=\""
-						+ mouseEvent.getButton() + "\" />" + ENDLINE);
+						+ mouseEvent.getButton() + "\" />" + StringTools.ENDLINE);
 				builder.append(" <param name=\"Modifiers\" value=\""
-						+ mouseEvent.getModifiers() + "\" />" + ENDLINE);
+						+ mouseEvent.getModifiers() + "\" />" + StringTools.ENDLINE);
 				addSourceInfo(builder, event);
-				builder.append("</event>" + ENDLINE);
+				builder.append("</event>" + StringTools.ENDLINE);
 			}
 		}
@@ -88,11 +81,11 @@
 			KeyEvent keyEvent = (KeyEvent) event;
 			if (keyEvent.getID() == KeyEvent.KEY_TYPED) {
-				builder.append("<event id=\"" + event.getID() + "\">" + ENDLINE);
+				builder.append("<event id=\"" + event.getID() + "\">" + StringTools.ENDLINE);
 				builder.append(" <param name=\"KeyCode\" value=\""
-						+ keyEvent.getKeyCode() + "\" />" + ENDLINE);
+						+ keyEvent.getKeyCode() + "\" />" + StringTools.ENDLINE);
 				builder.append(" <param name=\"Modifiers\" value=\""
-						+ keyEvent.getModifiers() + "\" />" + ENDLINE);
+						+ keyEvent.getModifiers() + "\" />" + StringTools.ENDLINE);
 				addSourceInfo(builder, event);
-				builder.append("</event>" + ENDLINE);
+				builder.append("</event>" + StringTools.ENDLINE);
 			}
 		}
@@ -119,9 +112,9 @@
 	 */
 	private void addSourceInfo(StringBuilder builder, AWTEvent event) {
-		builder.append(" <source>" + ENDLINE);
+		builder.append(" <source>" + StringTools.ENDLINE);
 		builder.append("  <param name=\"toString\" value=\""
 				+ StringTools
 						.xmlEntityReplacement(event.getSource().toString())
-				+ "\" />" + ENDLINE);
+				+ "\" />" + StringTools.ENDLINE);
 		if (event.getSource() instanceof Component) {
 			Component source = (Component) event.getSource();
@@ -131,5 +124,5 @@
 			}
 		}
-		builder.append(" </source>" + ENDLINE);
+		builder.append(" </source>" + StringTools.ENDLINE);
 	}