Changeset 853

Timestamp:

10/02/12 11:43:50 (12 years ago)

Author:

fglaser

Message:

• JFCMonitor now logs component class parents
• Renamed WindowMonitor? to JFCWindowMonitor

Location:

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

Files:

• JFCComponent.java (modified) (6 diffs)
• JFCListener.java (modified) (1 diff)
• JFCMonitorOutputWriter.java (modified) (1 diff)
• JFCNameChangeListener.java (modified) (2 diffs)
• JFCWindowMonitor.java (moved) (moved from trunk/quest-jfcmonitor/src/main/java/de/ugoe/cs/quest/jfcmonitor/WindowMonitor.java) (3 diffs)
• Runner.java (modified) (3 diffs)

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

@@ -26 +26 @@
  * </p>
  * 
- * @author Steffen Herbold, Fabian Glaser
+ * @author Steffen Herbold 
+ * @author Fabian Glaser
  * @version 1.0
  */
@@ -44 +45 @@
      * </p>
      */
-    
     private static List<PropertyChangeListener> propertyChangeListeners = 
         new ArrayList<PropertyChangeListener>();
     
+    /**
+     * <p>
+     * List of ContainerListeners that are registered on the components.
+     * </p>
+     */
     private static List<ContainerListener> containerListeners =
                 new ArrayList<ContainerListener>();
@@ -64 +69 @@
     }
     
+    /**
+     * <p>
+     * Adds a new PropertyChangeListener to the components.
+     * </p> 
+     * @param list 
+     *                  the PropertyChangeListener
+     */
     public static void addPropertyChangeListener(PropertyChangeListener list){
         propertyChangeListeners.add(list);
     }
     
+    /**
+     * <p> 
+     * Adds a new ContainerListener to the components.
+     * </p> 
+     * @param list
+     *                  the ContainerListener
+     */
     public static void addContainerListener(ContainerListener list){
         containerListeners.add(list);
     }
     
+    /**
+     * <p>
+     * Tests if a component is already known.
+     * </p>
+     * @param component to be tested
+     * @return true, if component is already known, false otherwise.
+     */
     public static boolean isKnown(Component component){
         if (knownComponents.containsKey(component))
@@ -238 +264 @@
         setTitle();
         StringBuilder builder = new StringBuilder();
-        builder.append("  <component");
+        builder.append("<component");
         if (parent != null){
                 if (!JFCComponent.isKnown(parent.component))
@@ -245 +271 @@
         }
         builder.append(">"+ StringTools.ENDLINE);
-        builder.append("   <param name=\"title\" value=\"" + title + "\" />" + StringTools.ENDLINE);
-        builder.append("   <param name=\"class\" value=\"" + componentClass + "\" />" +
+        builder.append(" <param name=\"title\" value=\"" + title + "\" />" + StringTools.ENDLINE);
+        builder.append(" <param name=\"class\" value=\"" + componentClass + "\" />" +
             StringTools.ENDLINE);
-        builder.append("   <param name=\"icon\" value=\"" + icon + "\" />" + StringTools.ENDLINE);
-        builder.append("   <param name=\"index\" value=\"" + index + "\" />" + StringTools.ENDLINE);
-        builder.append("   <param name=\"hash\" value=\"" +
+        builder.append(" <param name=\"icon\" value=\"" + icon + "\" />" + StringTools.ENDLINE);
+        builder.append(" <param name=\"index\" value=\"" + index + "\" />" + StringTools.ENDLINE);
+        builder.append(" <param name=\"hash\" value=\"" +
             Integer.toHexString(component.hashCode()) + "\" />" + StringTools.ENDLINE);
-        builder.append("  </component>" + StringTools.ENDLINE);
+        builder.append(getInheritanceTree());
+        builder.append("</component>" + StringTools.ENDLINE);
         return builder.toString();
     }
@@ -392 +419 @@
         }
     }
+    
+    /**
+     * <p>
+     * Constructs a string that represents inheritance of component.
+     * </p>
+     * @return
+     */
+    private String getInheritanceTree(){
+        StringBuilder builder = new StringBuilder();
+        Class<? extends Object> classobject = component.getClass();
+        while(classobject.getSuperclass() != null){
+                classobject = classobject.getSuperclass();
+                builder.append(" <ancestor name=\"");
+                builder.append(classobject.getName());
+                builder.append("\" />" + StringTools.ENDLINE);
+        }
+        return builder.toString();
+    }
 }

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

@@ -17 +17 @@
  * </p>
  * 
- * @author Steffen Herbold, Fabian Glaser
+ * @author Steffen Herbold 
+ * @author Fabian Glaser
  * @version 1.0
  */

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

@@ -38 +38 @@
     }
     
-    public void write(String str){
+    /**
+     * <p>
+     * Writes a string to the internal OutputStreamWriter.
+     * </p>
+     * @param str
+     */
+    public synchronized void write(String str){
         try {
                         outputWriter.write(str);

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

@@ -13 +13 @@
 
 /**
+ * <p>
+ * Listener that listens on the name change of a component.     
+ * </p>
  * @author Fabian Glaser
- *
+ * @version 1.0
  */
 public class JFCNameChangeListener implements PropertyChangeListener {
@@ -22 +25 @@
      * </p>
      */
-    final private JFCMonitorOutputWriter outputWriter;  
+    final private JFCMonitorOutputWriter outputWriter;
     
+    /**
+     * <p>
+     * Constructor. Creates a new JFCNameChangeListener with a given 
+     * {@link JFCMonitorOutputWriter}   
+     * </p>
+     * @param outputWriter
+     */
     public JFCNameChangeListener(JFCMonitorOutputWriter outputWriter){
         this.outputWriter = outputWriter;

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

@@ -12 +12 @@
  * </p>
  * 
- * @author Steffen Herbold, Fabian Glaser
+ * @author Steffen Herbold 
+ * @author Fabian Glaser
  * @version 1.0
  */
-public class WindowMonitor implements AWTEventListener {
+public class JFCWindowMonitor implements AWTEventListener {
          /**
      * <p>
@@ -25 +26 @@
     /**
      * <p>
-     * Constructor. Creates a new WindowMonitor with a given {@link JFCMonitorOutputWriter}, where the
+     * Constructor. Creates a new JFCWindowMonitor with a given {@link JFCMonitorOutputWriter}, where the
      * monitored information is logged.
      * </p>
@@ -32 +33 @@
      *            writer for the logged information
      */
-    public WindowMonitor(JFCMonitorOutputWriter outputWriter) {
+    public JFCWindowMonitor(JFCMonitorOutputWriter outputWriter) {
         this.outputWriter = outputWriter;
     }

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

@@ -20 +20 @@
  * </p>
  * 
- * @author Steffen Herbold, Fabian Glaser
+ * @author Steffen Herbold
+ * @author Fabian Glaser
  * @version 1.0
  */
@@ -62 +63 @@
         Toolkit.getDefaultToolkit().addAWTEventListener(listenerFile, AWTEvent.MOUSE_EVENT_MASK);
         Toolkit.getDefaultToolkit().addAWTEventListener(listenerFile, FocusEvent.FOCUS_EVENT_MASK);
-        Toolkit.getDefaultToolkit().addAWTEventListener(new WindowMonitor(jfcWriter),
+        Toolkit.getDefaultToolkit().addAWTEventListener(new JFCWindowMonitor(jfcWriter),
                                                         AWTEvent.WINDOW_EVENT_MASK);
         JFCComponent.addPropertyChangeListener(new JFCNameChangeListener(jfcWriter));
+        JFCComponent.addContainerListener(new JFCContainerListener(jfcWriter));
 
         if (stdOutputWrite) {
@@ -78 +80 @@
                 Toolkit.getDefaultToolkit().addAWTEventListener(listenerStdOut,
                                                                 FocusEvent.FOCUS_EVENT_MASK);
-                Toolkit.getDefaultToolkit().addAWTEventListener(new WindowMonitor(stdJfcWriter),
+                Toolkit.getDefaultToolkit().addAWTEventListener(new JFCWindowMonitor(stdJfcWriter),
                         AWTEvent.WINDOW_EVENT_MASK);
                 JFCComponent.addPropertyChangeListener(new JFCNameChangeListener(stdJfcWriter));