Changeset 928

Timestamp:

10/17/12 10:50:44 (12 years ago)

Author:

fglaser

Message:

• Title change hierarchy control added
• JFCNameChangeListener renamed to JFCTitleChangeListener
• JFCTitleChangeListener now additionaly listens on icon and position changes

Location:

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

Files:

• JFCComponent.java (modified) (5 diffs)
• JFCComponentTitleHierachy.java (added)
• JFCTitleChangeListener.java (moved) (moved from trunk/autoquest-jfcmonitor/src/main/java/de/ugoe/cs/autoquest/jfcmonitor/JFCNameChangeListener.java) (1 diff)
• Runner.java (modified) (2 diffs)

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

@@ -142 +142 @@
      * @param component
      *            component that is searched for
-     * @return corresponding JFComponent instance; null if the compenent is not found
+     * @return corresponding JFComponent instance; null if the component is not found
      */
     public static JFCComponent find(Component component) {
@@ -192 +192 @@
      */
     private String title = null;
+    
+    /**
+     * <p>
+     * Helper attribute that encodes the source of the title.
+     * </p>
+     */
+    private int titleSource = JFCComponentTitleHierachy.SOURCE_NOT_KNOWN;
 
     /**
@@ -303 +310 @@
     /**
      * <p>
+     * Returns an integer that encodes the source of the title.
+     * </p>
+     * @return int
+     */
+    public int getTitleSource(){
+        return titleSource;
+    }
+    
+    /**
+     * <p>
      * Returns an XML representation of the components children.
      * </p>
@@ -363 +380 @@
      * </p>
      */
-    private void setTitle() {
+    public void setTitle() {
+        // Note that JFCComponentTitleHierarchy depends on this method. So any changes made
+        // here should be reflected in JFCComponentTitleHierarchy.
+        
         title = null; // reset title
 
@@ -369 +389 @@
         if (accessibleContext != null) {
             title = accessibleContext.getAccessibleName();
+            titleSource = JFCComponentTitleHierachy.ACCESSIBLE_NAME;
         }
         if (title == null) {
             title = icon;
+            titleSource = JFCComponentTitleHierachy.ICON;
         }
         if (title == null) {
             title = component.getName();
+            titleSource = JFCComponentTitleHierachy.NAME;
         }
         if (title == null) {
             // use coordinates as last resort
             title = "Pos(" + component.getX() + "," + component.getY() + ")";
+            titleSource = JFCComponentTitleHierachy.POS;
         }
     }

trunk/autoquest-jfcmonitor/src/main/java/de/ugoe/cs/autoquest/jfcmonitor/JFCTitleChangeListener.java

@@ -25 +25 @@
 /**
  * <p>
- * Listener that listens on the name change of a component.     
+ * Listener that listens on the name change of a component.
  * </p>
+ * 
  * @author Fabian Glaser
  * @version 1.0
  */
-public class JFCNameChangeListener implements PropertyChangeListener {
-         /**
-     * <p>
-     * Writer for logging events.
-     * </p>
-     */
-    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;
-    }
-        
+public class JFCTitleChangeListener implements PropertyChangeListener {
+        /**
+         * <p>
+         * Writer for logging events.
+         * </p>
+         */
+        final private JFCMonitorOutputWriter outputWriter;
+
+        final private boolean CHECK_HIERARCHY = true;
+
+        /**
+         * <p>
+         * Constructor. Creates a new JFCNameChangeListener with a given
+         * {@link JFCMonitorOutputWriter}.
+         * </p>
+         * 
+         * @param outputWriter
+         */
+        public JFCTitleChangeListener(JFCMonitorOutputWriter outputWriter) {
+                this.outputWriter = outputWriter;
+        }
+
         @Override
-        public void propertyChange(PropertyChangeEvent evt) {
+        public synchronized void propertyChange(PropertyChangeEvent evt) {
                 String propertyName = evt.getPropertyName();
                 Component component = null;
-                
-                if (propertyName.equals("AccessibleName")){
+                int titleSource = JFCComponentTitleHierachy.SOURCE_NOT_KNOWN;
+
+                // Set source component and title source
+                if (propertyName.equals("AccessibleName")) {
                         AccessibleContext context = (AccessibleContext) evt.getSource();
                         component = (Component) context.getAccessibleParent();
+                        titleSource = JFCComponentTitleHierachy.ACCESSIBLE_NAME;
                 }
-                
-                if (propertyName.equals("name")){
+
+                if (propertyName.equals("name")) {
                         component = (Component) evt.getSource();
+                        titleSource = JFCComponentTitleHierachy.NAME;
                 }
-                
-                if (propertyName.equals("")){
-                        
+
+                if (propertyName.equals("icon")) {
+                        component = (Component) evt.getSource();
+                        titleSource = JFCComponentTitleHierachy.ICON;
                 }
-                
-                if (component != null){
-                        if (!JFCComponent.isKnown(component)){
-                                System.err.println("Referenced component is not known");
+
+                if (propertyName.equals("x") || propertyName.equals("y")) {
+                        component = (Component) evt.getSource();
+                        titleSource = JFCComponentTitleHierachy.POS;
+                }
+
+                if (component != null) {
+                        JFCComponent jfcComponent = JFCComponent.find(component);
+                        if (jfcComponent != null) {
+                                int oldTitleSource = jfcComponent.getTitleSource();
+                                Object newTitle = evt.getNewValue();
+                                // We only print the name change message if the new title is as
+                                // least as informative as the initial title
+                                if ((!CHECK_HIERARCHY || oldTitleSource <= titleSource)) {
+                                        StringBuilder builder = new StringBuilder();
+                                        builder.append("<componentNameChange hash=\"");
+                                        builder.append(Integer.toHexString(component.hashCode()));
+                                        builder.append("\" newName=\"" + newTitle);
+                                        builder.append("\" source=\"" + propertyName);
+                                        builder.append("\" />" + StringTools.ENDLINE);
+                                        outputWriter.write(builder.toString());
+                                }
+                        } else {
                                 throw new AssertionError("Referenced component is not known.");
                         }
-                        StringBuilder builder = new StringBuilder();
-                        builder.append("<componentNameChange hash=\"");
-                        builder.append(Integer.toHexString(component.hashCode()));
-                        builder.append("\" newName=\"" + evt.getNewValue());
-                        builder.append("\" source=\"" + propertyName);
-                        builder.append("\" />" + StringTools.ENDLINE);
-                        outputWriter.write(builder.toString());
                 }
         }
-        
+
 }

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

@@ -78 +78 @@
         Toolkit.getDefaultToolkit().addAWTEventListener(new JFCWindowMonitor(jfcWriter),
                                                         AWTEvent.WINDOW_EVENT_MASK);
-        JFCComponent.addPropertyChangeListener(new JFCNameChangeListener(jfcWriter));
+        JFCComponent.addPropertyChangeListener(new JFCTitleChangeListener(jfcWriter));
         JFCComponent.addContainerListener(new JFCContainerListener(jfcWriter));
 
@@ -95 +95 @@
                 Toolkit.getDefaultToolkit().addAWTEventListener(new JFCWindowMonitor(stdJfcWriter),
                         AWTEvent.WINDOW_EVENT_MASK);
-                JFCComponent.addPropertyChangeListener(new JFCNameChangeListener(stdJfcWriter));
+                JFCComponent.addPropertyChangeListener(new JFCTitleChangeListener(stdJfcWriter));
                 JFCComponent.addContainerListener(new JFCContainerListener(stdJfcWriter));
             }