Changeset 842 for trunk/quest-jfcmonitor/src/main/java/de/ugoe/cs/quest/jfcmonitor/Runner.java

Timestamp:

09/20/12 17:01:25 (12 years ago)

Author:

fglaser

Message:

• OutputFormat? of JFCMonitor changed:
• Components are printed, when they are created
• Events hold hash values for components instead of full source path

File:

• trunk/quest-jfcmonitor/src/main/java/de/ugoe/cs/quest/jfcmonitor/Runner.java (modified) (5 diffs)

trunk/quest-jfcmonitor/src/main/java/de/ugoe/cs/quest/jfcmonitor/Runner.java

@@ -20 +20 @@
  * </p>
  * 
- * @author Steffen Herbold
+ * @author Steffen Herbold, Fabian Glaser
  * @version 1.0
  */
@@ -50 +50 @@
             // the writer is not closed explicitly!
             fis = new FileOutputStream(logfileName, true);
-            writer = new OutputStreamWriter(fis, "UTF-16");
+            writer = new OutputStreamWriter(fis, "UTF-8");
         }
         catch (IOException e) {
@@ -57 +57 @@
         }
 
-        AWTEventListener listenerFile = new JFCListener(writer);
+        JFCMonitorOutputWriter jfcWriter = new JFCMonitorOutputWriter(writer);
+        AWTEventListener listenerFile = new JFCListener(jfcWriter);
         Toolkit.getDefaultToolkit().addAWTEventListener(listenerFile, AWTEvent.KEY_EVENT_MASK);
         Toolkit.getDefaultToolkit().addAWTEventListener(listenerFile, AWTEvent.MOUSE_EVENT_MASK);
         Toolkit.getDefaultToolkit().addAWTEventListener(listenerFile, FocusEvent.FOCUS_EVENT_MASK);
-        Toolkit.getDefaultToolkit().addAWTEventListener(new WindowMonitor(),
+        Toolkit.getDefaultToolkit().addAWTEventListener(new WindowMonitor(jfcWriter),
                                                         AWTEvent.WINDOW_EVENT_MASK);
 
@@ -67 +68 @@
             AWTEventListener listenerStdOut;
             try {
-                listenerStdOut = new JFCListener(new OutputStreamWriter(System.out, "UTF-8"));
+                OutputStreamWriter stdOutputWriter = new OutputStreamWriter(System.out, "UTF-8");
+                JFCMonitorOutputWriter stdJfcWriter = new JFCMonitorOutputWriter(stdOutputWriter);
+                listenerStdOut = new JFCListener(stdJfcWriter);
                 Toolkit.getDefaultToolkit().addAWTEventListener(listenerStdOut,
                                                                 AWTEvent.KEY_EVENT_MASK);
@@ -74 +77 @@
                 Toolkit.getDefaultToolkit().addAWTEventListener(listenerStdOut,
                                                                 FocusEvent.FOCUS_EVENT_MASK);
+                Toolkit.getDefaultToolkit().addAWTEventListener(new WindowMonitor(stdJfcWriter),
+                        AWTEvent.WINDOW_EVENT_MASK);
             }
             catch (UnsupportedEncodingException e) {