Changeset 851

Timestamp:

10/01/12 12:01:25 (12 years ago)

Author:

fglaser

Message:

• JFCMonitor: Added new ContainerListener? that listens on component added and component removed events
• small refactorings

Location:

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

Files:

• JFCComponent.java (modified) (5 diffs)
• JFCContainerListener.java (added)
• JFCNameChangeListener.java (moved) (moved from trunk/quest-jfcmonitor/src/main/java/de/ugoe/cs/quest/jfcmonitor/NameChangeListener.java) (4 diffs)
• Runner.java (modified) (2 diffs)
• WindowMonitor.java (modified) (1 diff)

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

@@ -4 +4 @@
 import java.awt.Component;
 import java.awt.Container;
+import java.awt.event.ContainerListener;
 import java.beans.PropertyChangeListener;
 import java.io.File;
@@ -46 +47 @@
     private static List<PropertyChangeListener> propertyChangeListeners = 
         new ArrayList<PropertyChangeListener>();
+    
+    private static List<ContainerListener> containerListeners =
+                new ArrayList<ContainerListener>();
 
     /**
@@ -60 +64 @@
     }
     
-    public static void addListener(PropertyChangeListener list){
+    public static void addPropertyChangeListener(PropertyChangeListener list){
         propertyChangeListeners.add(list);
+    }
+    
+    public static void addContainerListener(ContainerListener list){
+        containerListeners.add(list);
+    }
+    
+    public static boolean isKnown(Component component){
+        if (knownComponents.containsKey(component))
+                return true;
+        return false;
     }
 
@@ -190 +204 @@
 
         if (component instanceof Container) {
+                for (ContainerListener listener: containerListeners)
+                        ((Container) component).addContainerListener(listener);
+                
             for (Component childComponent : ((Container) component).getComponents()) {
                 add(childComponent, this);
@@ -223 +240 @@
         builder.append("  <component");
         if (parent != null){
+                if (!JFCComponent.isKnown(parent.component))
+                        throw new AssertionError("Referenced parent is not known.");
                 builder.append(" parent=\"" + Integer.toHexString(parent.component.hashCode()) + "\"");
         }

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

@@ -8 +8 @@
 import java.beans.PropertyChangeListener;
 
+import javax.accessibility.AccessibleContext;
+
 import de.ugoe.cs.util.StringTools;
 
@@ -14 +16 @@
  *
  */
-public class NameChangeListener implements PropertyChangeListener {
+public class JFCNameChangeListener implements PropertyChangeListener {
          /**
      * <p>
@@ -22 +24 @@
     final private JFCMonitorOutputWriter outputWriter;  
     
-    public NameChangeListener(JFCMonitorOutputWriter outputWriter){
+    public JFCNameChangeListener(JFCMonitorOutputWriter outputWriter){
         this.outputWriter = outputWriter;
     }
@@ -29 +31 @@
         public void propertyChange(PropertyChangeEvent evt) {
                 if (evt.getPropertyName().equals("AccessibleName")){
+                        AccessibleContext context = (AccessibleContext) evt.getSource();
+                        Component component = (Component) context.getAccessibleParent();
                         StringBuilder builder = new StringBuilder();
                         builder.append("<componentNameChange hash=\"");
-                        outputWriter.write(evt.getSource().toString());
-                        if (JFCComponent.find((Component) evt.getSource()) == null)
-                                        System.err.println("Quelle nicht bekannt");
-                        builder.append(Integer.toHexString(evt.getSource().hashCode()));
+                        if (!JFCComponent.isKnown(component)){
+                                        System.err.println("Referenced component is not known");
+                                        throw new AssertionError("Referenced component is not known.");
+                        }
+                        builder.append(Integer.toHexString(component.hashCode()));
                         builder.append("\" newName=\"" + evt.getNewValue());
                         builder.append("\"/>" + StringTools.ENDLINE);
                         outputWriter.write(builder.toString());
-                }
-                        
+                }               
         }
         

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

@@ -64 +64 @@
         Toolkit.getDefaultToolkit().addAWTEventListener(new WindowMonitor(jfcWriter),
                                                         AWTEvent.WINDOW_EVENT_MASK);
-        JFCComponent.addListener(new NameChangeListener(jfcWriter));
+        JFCComponent.addPropertyChangeListener(new JFCNameChangeListener(jfcWriter));
 
         if (stdOutputWrite) {
@@ -80 +80 @@
                 Toolkit.getDefaultToolkit().addAWTEventListener(new WindowMonitor(stdJfcWriter),
                         AWTEvent.WINDOW_EVENT_MASK);
-                JFCComponent.addListener(new NameChangeListener(stdJfcWriter));
+                JFCComponent.addPropertyChangeListener(new JFCNameChangeListener(stdJfcWriter));
+                JFCComponent.addContainerListener(new JFCContainerListener(stdJfcWriter));
             }
             catch (UnsupportedEncodingException e) {

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

@@ -60 +60 @@
                 }
                 break;
-            case WindowEvent.WINDOW_CLOSED:
-                window = ((WindowEvent) event).getWindow();
-                JFCComponent.remove(window);
-                break;
             default:
                 break;