Version one of the description moved to the attached file '548392.txt.version.one'

See below for an updated statement from the fix submitter:

A DESCRIPTION OF THE FIX :
  Bug Description :

RFE: Make it easier to customize the Swing action framework

DISCUSSION: The addition of the SELECTED, LONG_DESCRIPTION, and MNEMONIC_INDEX
properties is a welcome improvement, but many developers will still want to change
the way components respond to property changes on their associated actions. Until
now, we could only do this by adding our own PropertyChangeListeners, but if we could
override the new actionPropertyChanged callback method, it would be much easier. For
that to happen, the method's visibility needs to be changed from package-private to
protected. Also, the SHORT_DESCRIPTION and "enabled" properties are now handled by
ActionPropertyChangeListener in such a way that it's impossible to override their
behaviors. These properties need to be handled in the actionPropertyChanged method
of the target components like all the other properties are.

This RFE should replace my earlier submission, #6328849.


Diff Baseline : jdk-6_0-ea-src-b54.
Diff :
diff -u ../../../jdk1.6.0/src/javax/swing/AbstractButton.java src/javax/swing/AbstractButton.java
--- ../../../jdk1.6.0/src/javax/swing/AbstractButton.java 2005-09-29 00:09:14.000000000 -0700
+++ src/javax/swing/AbstractButton.java 2005-10-01 16:45:28.644804800 -0700
@@ -1154,9 +1154,22 @@
         return false;
     }
 
- void actionPropertyChanged(Action action, String propertyName) {
+ /**
+ * Updates the button's state in response to property changes in the
+ * associated action.
+ *
+ * @param action the <code>Action</code> associated with this button
+ * @param propertyName the name of the property that changed
+ * @since 1.6
+ * @see Action
+ */
+ protected void actionPropertyChanged(Action action, String propertyName) {
         if (propertyName == Action.NAME) {
             setTextFromAction(action, true);
+ } else if ("enabled" == propertyName) {
+ AbstractAction.setEnabledFromAction(this, getAction());
+ } else if (Action.SHORT_DESCRIPTION == propertyName) {
+ AbstractAction.setToolTipTextFromAction(this, getAction());
         } else if (propertyName == Action.SMALL_ICON) {
             smallIconChanged(action);
         } else if (propertyName == Action.MNEMONIC_KEY) {
@@ -1294,16 +1307,14 @@
  ButtonActionPropertyChangeListener(AbstractButton b, Action a) {
  super(b, a);
  }
- protected boolean actionPropertyChanged(AbstractButton button,
- Action action,
- PropertyChangeEvent e) {
+ protected void actionPropertyChanged(AbstractButton button,
+ Action action,
+ PropertyChangeEvent e) {
             if (AbstractAction.shouldReconfigure(e)) {
                 button.configurePropertiesFromAction(action);
- } else if (!super.actionPropertyChanged(button, action, e)) {
+ } else {
                 button.actionPropertyChanged(action, e.getPropertyName());
             }
- // Not subclassed, return value doesn't matter.
- return true;
         }
     }
 
diff -u ../../../jdk1.6.0/src/javax/swing/ActionPropertyChangeListener.java src/javax/swing/ActionPropertyChangeListener.java
--- ../../../jdk1.6.0/src/javax/swing/ActionPropertyChangeListener.java 2005-09-29 00:09:14.000000000 -0700
+++ src/javax/swing/ActionPropertyChangeListener.java 2005-09-30 16:59:22.872760000 -0700
@@ -34,7 +34,7 @@
  * @author Georges Saab
  * @see AbstractButton
  */
-class ActionPropertyChangeListener<T extends JComponent> implements PropertyChangeListener, Serializable {
+abstract class ActionPropertyChangeListener<T extends JComponent> implements PropertyChangeListener, Serializable {
     private static ReferenceQueue<JComponent> queue;
 
     // WeakReference's aren't serializable.
@@ -74,25 +74,10 @@
 
     /**
      * Invoked when a property changes on the Action and the target
- * still exists. If this implementation handles the property true
- * will be returned. This implementation handles 'enabled' and
- * 'short_description' changes.
+ * still exists.
      */
- protected boolean actionPropertyChanged(T target, Action action,
- PropertyChangeEvent e) {
- String propertyName = e.getPropertyName();
- boolean allChanged = AbstractAction.shouldReconfigure(e);
- boolean handled = false;
- if (allChanged || "enabled" == propertyName) {
- AbstractAction.setEnabledFromAction(target, getAction());
- handled = true;
- }
- if (allChanged || Action.SHORT_DESCRIPTION == propertyName) {
- AbstractAction.setToolTipTextFromAction(target, getAction());
- handled = true;
- }
- return handled;
- }
+ protected abstract void actionPropertyChanged(T target, Action action,
+ PropertyChangeEvent e);
     
     private void setTarget(T c) {
         ReferenceQueue<JComponent> queue = getQueue();
diff -u ../../../jdk1.6.0/src/javax/swing/JComboBox.java src/javax/swing/JComboBox.java
--- ../../../jdk1.6.0/src/javax/swing/JComboBox.java 2005-09-29 00:09:14.000000000 -0700
+++ src/javax/swing/JComboBox.java 2005-10-01 16:45:26.461665600 -0700
@@ -1121,9 +1121,22 @@
         return new ComboBoxActionPropertyChangeListener(this, a);
     }
 
- private void actionPropertyChanged(Action action, String propertyName) {
+ /**
+ * Updates the combobox's state in response to property changes in
+ * the associated action.
+ *
+ * @param action the <code>Action</code> associated with this combobox
+ * @param propertyName the name of the property that changed
+ * @since 1.6
+ * @see Action
+ */
+ protected void actionPropertyChanged(Action action, String propertyName) {
         if (propertyName == Action.ACTION_COMMAND_KEY) {
             setActionCommandFromAction(action);
+ } else if ("enabled" == propertyName) {
+ AbstractAction.setEnabledFromAction(this, getAction());
+ } else if (Action.SHORT_DESCRIPTION == propertyName) {
+ AbstractAction.setToolTipTextFromAction(this, getAction());
         }
     }
 
@@ -1139,16 +1152,14 @@
         ComboBoxActionPropertyChangeListener(JComboBox b, Action a) {
             super(b, a);
         }
- protected boolean actionPropertyChanged(JComboBox cb,
- Action action,
- PropertyChangeEvent e) {
+ protected void actionPropertyChanged(JComboBox cb,
+ Action action,
+ PropertyChangeEvent e) {
             if (AbstractAction.shouldReconfigure(e)) {
                 cb.configurePropertiesFromAction(action);
- } else if (!super.actionPropertyChanged(cb, action, e)) {
+ } else {
                 cb.actionPropertyChanged(action, e.getPropertyName());
             }
- // Not subclassed, return value doesn't matter.
- return true;
         }
     }
 
diff -u ../../../jdk1.6.0/src/javax/swing/JMenuItem.java src/javax/swing/JMenuItem.java
--- ../../../jdk1.6.0/src/javax/swing/JMenuItem.java 2005-09-29 00:09:14.000000000 -0700
+++ src/javax/swing/JMenuItem.java 2005-09-25 15:10:23.617150400 -0700
@@ -365,7 +365,16 @@
         setAccelerator(ks);
     }
 
- void actionPropertyChanged(Action action, String propertyName) {
+ /**
+ * Updates the menuitem's state in response to property changes in
+ * the associated action.
+ *
+ * @param action the <code>Action</code> associated with this menuitem
+ * @param propertyName the name of the property that changed
+ * @since 1.6
+ * @see Action
+ */
+ protected void actionPropertyChanged(Action action, String propertyName) {
         if (propertyName == Action.ACCELERATOR_KEY) {
             configureAcceleratorFromAction(action);
         }
diff -u ../../../jdk1.6.0/src/javax/swing/JTextField.java src/javax/swing/JTextField.java
--- ../../../jdk1.6.0/src/javax/swing/JTextField.java 2005-09-29 00:09:14.000000000 -0700
+++ src/javax/swing/JTextField.java 2005-10-01 16:45:24.448771200 -0700
@@ -604,9 +604,22 @@
         setActionCommandFromAction(a);
     }
 
- void actionPropertyChanged(Action action, String propertyName) {
+ /**
+ * Updates the textfield's state in response to property changes in
+ * the associated action.
+ *
+ * @param action the <code>Action</code> associated with this textfield
+ * @param propertyName the name of the property that changed
+ * @since 1.6
+ * @see Action
+ */
+ protected void actionPropertyChanged(Action action, String propertyName) {
         if (propertyName == Action.ACTION_COMMAND_KEY) {
             setActionCommandFromAction(action);
+ } else if ("enabled" == propertyName) {
+ AbstractAction.setEnabledFromAction(this, getAction());
+ } else if (Action.SHORT_DESCRIPTION == propertyName) {
+ AbstractAction.setToolTipTextFromAction(this, getAction());
         }
     }
 
@@ -639,16 +652,14 @@
             super(tf, a);
         }
 
- protected boolean actionPropertyChanged(JTextField textField,
- Action action,
- PropertyChangeEvent e) {
+ protected void actionPropertyChanged(JTextField textField,
+ Action action,
+ PropertyChangeEvent e) {
             if (AbstractAction.shouldReconfigure(e)) {
                 textField.configurePropertiesFromAction(action);
- } else if (!super.actionPropertyChanged(textField, action, e)) {
+ } else {
                 textField.actionPropertyChanged(action, e.getPropertyName());
             }
- // Not subclassed, return value doesn't matter.
- return true;
         }
     }