+ * Helper attribute that encodes the source of the title. + *
+ */ + private int titleSource = JFCComponentTitleHierachy.SOURCE_NOT_KNOWN; /** @@ -303,4 +310,14 @@ /** *+ * Returns an integer that encodes the source of the title. + *
+ * @return int + */ + public int getTitleSource(){ + return titleSource; + } + + /** + ** Returns an XML representation of the components children. *
@@ -363,5 +380,8 @@ * */ - 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,14 +389,18 @@ 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; } } Index: /trunk/autoquest-jfcmonitor/src/main/java/de/ugoe/cs/autoquest/jfcmonitor/JFCComponentTitleHierachy.java =================================================================== --- /trunk/autoquest-jfcmonitor/src/main/java/de/ugoe/cs/autoquest/jfcmonitor/JFCComponentTitleHierachy.java (revision 928) +++ /trunk/autoquest-jfcmonitor/src/main/java/de/ugoe/cs/autoquest/jfcmonitor/JFCComponentTitleHierachy.java (revision 928) @@ -0,0 +1,14 @@ +package de.ugoe.cs.autoquest.jfcmonitor; + +/** + * Class that encodes the source hierarchy for {@link JFCComponent} title. + * @author Fabian Glaser + * + */ +public class JFCComponentTitleHierachy { + static final int SOURCE_NOT_KNOWN = 10; + static final int ACCESSIBLE_NAME = 1; + static final int ICON = 2; + static final int NAME = 3; + static final int POS = 4; +} Index: unk/autoquest-jfcmonitor/src/main/java/de/ugoe/cs/autoquest/jfcmonitor/JFCNameChangeListener.java =================================================================== --- /trunk/autoquest-jfcmonitor/src/main/java/de/ugoe/cs/autoquest/jfcmonitor/JFCNameChangeListener.java (revision 927) +++ (revision ) @@ -1,84 +1,0 @@ -// Copyright 2012 Georg-August-Universität Göttingen, Germany -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -package de.ugoe.cs.autoquest.jfcmonitor; - -import java.awt.Component; -import java.beans.PropertyChangeEvent; -import java.beans.PropertyChangeListener; - -import javax.accessibility.AccessibleContext; - -import de.ugoe.cs.util.StringTools; - -/** - *- * Listener that listens on the name change of a component. - *
- * @author Fabian Glaser - * @version 1.0 - */ -public class JFCNameChangeListener implements PropertyChangeListener { - /** - *- * Writer for logging events. - *
- */ - final private JFCMonitorOutputWriter outputWriter; - - /** - *- * Constructor. Creates a new JFCNameChangeListener with a given - * {@link JFCMonitorOutputWriter}. - *
- * @param outputWriter - */ - public JFCNameChangeListener(JFCMonitorOutputWriter outputWriter){ - this.outputWriter = outputWriter; - } - - @Override - public void propertyChange(PropertyChangeEvent evt) { - String propertyName = evt.getPropertyName(); - Component component = null; - - if (propertyName.equals("AccessibleName")){ - AccessibleContext context = (AccessibleContext) evt.getSource(); - component = (Component) context.getAccessibleParent(); - } - - if (propertyName.equals("name")){ - component = (Component) evt.getSource(); - } - - if (propertyName.equals("")){ - - } - - if (component != null){ - if (!JFCComponent.isKnown(component)){ - System.err.println("Referenced component is not known"); - throw new AssertionError("Referenced component is not known."); - } - StringBuilder builder = new StringBuilder(); - builder.append("+ * Listener that listens on the name change of a component. + *
+ * + * @author Fabian Glaser + * @version 1.0 + */ +public class JFCTitleChangeListener implements PropertyChangeListener { + /** + *+ * Writer for logging events. + *
+ */ + final private JFCMonitorOutputWriter outputWriter; + + final private boolean CHECK_HIERARCHY = true; + + /** + *+ * Constructor. Creates a new JFCNameChangeListener with a given + * {@link JFCMonitorOutputWriter}. + *
+ * + * @param outputWriter + */ + public JFCTitleChangeListener(JFCMonitorOutputWriter outputWriter) { + this.outputWriter = outputWriter; + } + + @Override + public synchronized void propertyChange(PropertyChangeEvent evt) { + String propertyName = evt.getPropertyName(); + Component component = null; + 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")) { + component = (Component) evt.getSource(); + titleSource = JFCComponentTitleHierachy.NAME; + } + + if (propertyName.equals("icon")) { + component = (Component) evt.getSource(); + titleSource = JFCComponentTitleHierachy.ICON; + } + + 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("