You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pivot.apache.org by gb...@apache.org on 2010/08/22 16:47:31 UTC
svn commit: r987915 - in /pivot/trunk/wtk/src/org/apache/pivot/wtk:
Button.java ButtonBindingListener.java
Author: gbrown
Date: Sun Aug 22 14:47:31 2010
New Revision: 987915
URL: http://svn.apache.org/viewvc?rev=987915&view=rev
Log:
Resolve PIVOT-604.
Modified:
pivot/trunk/wtk/src/org/apache/pivot/wtk/Button.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/ButtonBindingListener.java
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/Button.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/Button.java?rev=987915&r1=987914&r2=987915&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/Button.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/Button.java Sun Aug 22 14:47:31 2010
@@ -197,65 +197,65 @@ public abstract class Button extends Com
private static class ButtonBindingListenerList extends ListenerList<ButtonBindingListener>
implements ButtonBindingListener {
@Override
- public void selectedKeyChanged(Button button, String previousSelectedKey) {
+ public void buttonDataKeyChanged(Button button, String previousButtonDataKey) {
for (ButtonBindingListener listener : this) {
- listener.selectedKeyChanged(button, previousSelectedKey);
+ listener.buttonDataKeyChanged(button, previousButtonDataKey);
}
}
@Override
- public void selectedBindTypeChanged(Button button, BindType previousSelectedBindType) {
+ public void buttonDataBindTypeChanged(Button button, BindType previousDataBindType) {
for (ButtonBindingListener listener : this) {
- listener.selectedBindTypeChanged(button, previousSelectedBindType);
+ listener.buttonDataBindTypeChanged(button, previousDataBindType);
}
}
@Override
- public void selectedBindMappingChanged(Button button, Button.SelectedBindMapping previousSelectedBindMapping) {
+ public void buttonDataBindMappingChanged(Button button, Button.ButtonDataBindMapping previousButtonDataBindMapping) {
for (ButtonBindingListener listener : this) {
- listener.selectedBindMappingChanged(button, previousSelectedBindMapping);
+ listener.buttonDataBindMappingChanged(button, previousButtonDataBindMapping);
}
}
@Override
- public void stateKeyChanged(Button button, String previousStateKey) {
+ public void selectedKeyChanged(Button button, String previousSelectedKey) {
for (ButtonBindingListener listener : this) {
- listener.stateKeyChanged(button, previousStateKey);
+ listener.selectedKeyChanged(button, previousSelectedKey);
}
}
@Override
- public void stateBindTypeChanged(Button button, BindType previousStateBindType) {
+ public void selectedBindTypeChanged(Button button, BindType previousSelectedBindType) {
for (ButtonBindingListener listener : this) {
- listener.stateBindTypeChanged(button, previousStateBindType);
+ listener.selectedBindTypeChanged(button, previousSelectedBindType);
}
}
@Override
- public void stateBindMappingChanged(Button button, Button.StateBindMapping previousStateBindMapping) {
+ public void selectedBindMappingChanged(Button button, Button.SelectedBindMapping previousSelectedBindMapping) {
for (ButtonBindingListener listener : this) {
- listener.stateBindMappingChanged(button, previousStateBindMapping);
+ listener.selectedBindMappingChanged(button, previousSelectedBindMapping);
}
}
@Override
- public void buttonDataKeyChanged(Button button, String previousStateKey) {
+ public void stateKeyChanged(Button button, String previousStateKey) {
for (ButtonBindingListener listener : this) {
- listener.buttonDataKeyChanged(button, previousStateKey);
+ listener.stateKeyChanged(button, previousStateKey);
}
}
@Override
- public void buttonDataBindTypeChanged(Button button, BindType previousStateBindType) {
+ public void stateBindTypeChanged(Button button, BindType previousStateBindType) {
for (ButtonBindingListener listener : this) {
- listener.buttonDataBindTypeChanged(button, previousStateBindType);
+ listener.stateBindTypeChanged(button, previousStateBindType);
}
}
@Override
- public void buttonDataBindMappingChanged(Button button, Button.ButtonDataBindMapping previousButtonDataBindMapping) {
+ public void stateBindMappingChanged(Button button, Button.StateBindMapping previousStateBindMapping) {
for (ButtonBindingListener listener : this) {
- listener.buttonDataBindMappingChanged(button, previousButtonDataBindMapping);
+ listener.stateBindMappingChanged(button, previousStateBindMapping);
}
}
}
@@ -585,6 +585,48 @@ public abstract class Button extends Com
}
}
+ public String getButtonDataKey() {
+ return buttonDataKey;
+ }
+
+ public void setButtonDataKey(String buttonDataKey) {
+ String previousButtonDataKey = this.buttonDataKey;
+ if (previousButtonDataKey != buttonDataKey) {
+ this.buttonDataKey = buttonDataKey;
+ buttonBindingListeners.buttonDataKeyChanged(this, previousButtonDataKey);
+ }
+ }
+
+ public BindType getButtonDataBindType() {
+ return buttonDataBindType;
+ }
+
+ public void setButtonDataBindType(BindType buttonDataBindType) {
+ if (buttonDataBindType == null) {
+ throw new IllegalArgumentException();
+ }
+
+ BindType previousButtonDataBindType = this.buttonDataBindType;
+
+ if (previousButtonDataBindType != buttonDataBindType) {
+ this.buttonDataBindType = buttonDataBindType;
+ buttonBindingListeners.buttonDataBindTypeChanged(this, previousButtonDataBindType);
+ }
+ }
+
+ public ButtonDataBindMapping getButtonDataBindMapping() {
+ return buttonDataBindMapping;
+ }
+
+ public void setButtonDataBindMapping(ButtonDataBindMapping buttonDataBindMapping) {
+ ButtonDataBindMapping previousButtonDataBindMapping = this.buttonDataBindMapping;
+
+ if (previousButtonDataBindMapping != buttonDataBindMapping) {
+ this.buttonDataBindMapping = buttonDataBindMapping;
+ buttonBindingListeners.buttonDataBindMappingChanged(this, previousButtonDataBindMapping);
+ }
+ }
+
public String getSelectedKey() {
return selectedKey;
}
@@ -687,19 +729,6 @@ public abstract class Button extends Com
}
}
- public ButtonDataBindMapping getButtonDataBindMapping() {
- return buttonDataBindMapping;
- }
-
- public void setButtonDataBindMapping(ButtonDataBindMapping buttonDataBindMapping) {
- ButtonDataBindMapping previousButtonDataBindMapping = this.buttonDataBindMapping;
-
- if (previousButtonDataBindMapping != buttonDataBindMapping) {
- this.buttonDataBindMapping = buttonDataBindMapping;
- buttonBindingListeners.buttonDataBindMappingChanged(this, previousButtonDataBindMapping);
- }
- }
-
@Override
public void load(Object context) {
if (toggleButton) {
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/ButtonBindingListener.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/ButtonBindingListener.java?rev=987915&r1=987914&r2=987915&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/ButtonBindingListener.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/ButtonBindingListener.java Sun Aug 22 14:47:31 2010
@@ -25,43 +25,67 @@ public interface ButtonBindingListener {
*/
public static class Adapter implements ButtonBindingListener {
@Override
- public void selectedKeyChanged(Button button, String previousSelectedKey) {
+ public void buttonDataKeyChanged(Button button, String previousButtonDataKey) {
}
@Override
- public void selectedBindTypeChanged(Button button, BindType previousSelectedBindType) {
+ public void buttonDataBindTypeChanged(Button button, BindType previousButtonDataBindType) {
}
@Override
- public void selectedBindMappingChanged(Button button, Button.SelectedBindMapping previousSelectedBindMapping) {
+ public void buttonDataBindMappingChanged(Button button, Button.ButtonDataBindMapping previousButtonDataBindMapping) {
}
@Override
- public void stateKeyChanged(Button button, String previousStateKey) {
+ public void selectedKeyChanged(Button button, String previousSelectedKey) {
}
@Override
- public void stateBindTypeChanged(Button button, BindType previousStateBindType) {
+ public void selectedBindTypeChanged(Button button, BindType previousSelectedBindType) {
}
@Override
- public void stateBindMappingChanged(Button button, Button.StateBindMapping previousStateBindMapping) {
+ public void selectedBindMappingChanged(Button button, Button.SelectedBindMapping previousSelectedBindMapping) {
}
@Override
- public void buttonDataKeyChanged(Button button, String previousStateKey) {
+ public void stateKeyChanged(Button button, String previousStateKey) {
}
@Override
- public void buttonDataBindTypeChanged(Button button, BindType previousStateBindType) {
+ public void stateBindTypeChanged(Button button, BindType previousStateBindType) {
}
@Override
- public void buttonDataBindMappingChanged(Button button, Button.ButtonDataBindMapping previousButtonDataBindMapping) {
+ public void stateBindMappingChanged(Button button, Button.StateBindMapping previousStateBindMapping) {
}
}
/**
+ * Called when a button's buttonData key has changed.
+ *
+ * @param button
+ * @param previousButtonDataKey
+ */
+ public void buttonDataKeyChanged(Button button, String previousButtonDataKey);
+
+ /**
+ * Called when a button's buttonData bind type has changed.
+ *
+ * @param button
+ * @param previousButtonDataBindType
+ */
+ public void buttonDataBindTypeChanged(Button button, BindType previousButtonDataBindType);
+
+ /**
+ * Called when a button's buttonData bind mapping has changed.
+ *
+ * @param button
+ * @param previousButtonDataBindMapping
+ */
+ public void buttonDataBindMappingChanged(Button button, Button.ButtonDataBindMapping previousButtonDataBindMapping);
+
+ /**
* Called when a button's selected key has changed.
*
* @param button
@@ -108,28 +132,4 @@ public interface ButtonBindingListener {
* @param previousStateBindMapping
*/
public void stateBindMappingChanged(Button button, Button.StateBindMapping previousStateBindMapping);
-
- /**
- * Called when a button's buttonData key has changed.
- *
- * @param button
- * @param previousButtonDataKey
- */
- public void buttonDataKeyChanged(Button button, String previousButtonDataKey);
-
- /**
- * Called when a button's buttonData bind type has changed.
- *
- * @param button
- * @param previousButtonDataBindType
- */
- public void buttonDataBindTypeChanged(Button button, BindType previousButtonDataBindType);
-
- /**
- * Called when a button's buttonData bind mapping has changed.
- *
- * @param button
- * @param previousButtonDataBindMapping
- */
- public void buttonDataBindMappingChanged(Button button, Button.ButtonDataBindMapping previousButtonDataBindMapping);
}