You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pivot.apache.org by tv...@apache.org on 2010/03/25 16:50:05 UTC
svn commit: r927457 - in /pivot/trunk/wtk/src/org/apache/pivot/wtk: ./ skin/
Author: tvolkert
Date: Thu Mar 25 15:50:04 2010
New Revision: 927457
URL: http://svn.apache.org/viewvc?rev=927457&view=rev
Log:
PIVOT-425 :: Improve data binding for ColorChooser and ColorChooserButton
Added:
pivot/trunk/wtk/src/org/apache/pivot/wtk/ColorChooserBindingListener.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/ColorChooserButtonBindingListener.java
Removed:
pivot/trunk/wtk/src/org/apache/pivot/wtk/ColorChooserButtonListener.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/ColorChooserListener.java
Modified:
pivot/trunk/wtk/src/org/apache/pivot/wtk/ColorChooser.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/ColorChooserButton.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/ColorChooserButtonSkin.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/ColorChooserSkin.java
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/ColorChooser.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/ColorChooser.java?rev=927457&r1=927456&r2=927457&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/ColorChooser.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/ColorChooser.java Thu Mar 25 15:50:04 2010
@@ -27,17 +27,22 @@ import org.apache.pivot.util.ListenerLis
*/
public class ColorChooser extends Container {
/**
- * Calendar listener list.
+ * Translates between color and context data during data binding.
*/
- private static class ColorChooserListenerList extends ListenerList<ColorChooserListener>
- implements ColorChooserListener {
- @Override
- public void selectedColorKeyChanged(ColorChooser colorChooser,
- String previousSelectedColorKey) {
- for (ColorChooserListener listener : this) {
- listener.selectedColorKeyChanged(colorChooser, previousSelectedColorKey);
- }
- }
+ public interface SelectedColorBindMapping {
+ /**
+ * Converts a context value to a color.
+ *
+ * @param value
+ */
+ public Color toColor(Object value);
+
+ /**
+ * Converts a color to a context value.
+ *
+ * @param color
+ */
+ public Object valueOf(Color color);
}
/**
@@ -56,12 +61,48 @@ public class ColorChooser extends Contai
}
}
+ /**
+ * Color chooser binding listener list.
+ */
+ private static class ColorChooserBindingListenerList
+ extends ListenerList<ColorChooserBindingListener>
+ implements ColorChooserBindingListener {
+ @Override
+ public void selectedColorKeyChanged(ColorChooser colorChooser,
+ String previousSelectedColorKey) {
+ for (ColorChooserBindingListener listener : this) {
+ listener.selectedColorKeyChanged(colorChooser, previousSelectedColorKey);
+ }
+ }
+
+ @Override
+ public void selectedColorBindTypeChanged(ColorChooser colorChooser,
+ BindType previousSelectedColorBindType) {
+ for (ColorChooserBindingListener listener : this) {
+ listener.selectedColorBindTypeChanged(colorChooser, previousSelectedColorBindType);
+ }
+ }
+
+ @Override
+ public void selectedColorBindMappingChanged(ColorChooser colorChooser,
+ SelectedColorBindMapping previousSelectedColorBindMapping) {
+ for (ColorChooserBindingListener listener : this) {
+ listener.selectedColorBindMappingChanged(colorChooser,
+ previousSelectedColorBindMapping);
+ }
+ }
+ }
+
private Color selectedColor = null;
+
private String selectedColorKey = null;
+ private BindType selectedColorBindType = BindType.BOTH;
+ private SelectedColorBindMapping selectedColorBindMapping = null;
- private ColorChooserListenerList colorChooserListeners = new ColorChooserListenerList();
private ColorChooserSelectionListenerList colorChooserSelectionListeners =
new ColorChooserSelectionListenerList();
+ private ColorChooserBindingListenerList colorChooserBindingListeners =
+ new ColorChooserBindingListenerList();
public ColorChooser() {
installThemeSkin(ColorChooser.class);
@@ -119,7 +160,47 @@ public class ColorChooser extends Contai
if (selectedColorKey != previousSelectedColorKey) {
this.selectedColorKey = selectedColorKey;
- colorChooserListeners.selectedColorKeyChanged(this, previousSelectedColorKey);
+ colorChooserBindingListeners.selectedColorKeyChanged(this, previousSelectedColorKey);
+ }
+ }
+
+ public BindType getSelectedColorBindType() {
+ return selectedColorBindType;
+ }
+
+ public void setSelectedColorBindType(BindType selectedColorBindType) {
+ if (selectedColorBindType == null) {
+ throw new IllegalArgumentException();
+ }
+
+ BindType previousSelectedColorBindType = this.selectedColorBindType;
+
+ if (previousSelectedColorBindType != selectedColorBindType) {
+ this.selectedColorBindType = selectedColorBindType;
+ colorChooserBindingListeners.selectedColorBindTypeChanged(this,
+ previousSelectedColorBindType);
+ }
+ }
+
+ public final void setSelectedColorBindType(String selectedColorBindType) {
+ if (selectedColorBindType == null) {
+ throw new IllegalArgumentException();
+ }
+
+ setSelectedColorBindType(BindType.valueOf(selectedColorBindType.toUpperCase()));
+ }
+
+ public SelectedColorBindMapping getSelectedColorBindMapping() {
+ return selectedColorBindMapping;
+ }
+
+ public void setSelectedColorBindMapping(SelectedColorBindMapping selectedColorBindMapping) {
+ SelectedColorBindMapping previousSelectedColorBindMapping = this.selectedColorBindMapping;
+
+ if (previousSelectedColorBindMapping != selectedColorBindMapping) {
+ this.selectedColorBindMapping = selectedColorBindMapping;
+ colorChooserBindingListeners.selectedColorBindMappingChanged(this,
+ previousSelectedColorBindMapping);
}
}
@@ -130,37 +211,47 @@ public class ColorChooser extends Contai
@Override
public void load(Dictionary<String, ?> context) {
if (selectedColorKey != null
- && JSON.containsKey(context, selectedColorKey)) {
+ && JSON.containsKey(context, selectedColorKey)
+ && selectedColorBindType != BindType.STORE) {
Object value = JSON.get(context, selectedColorKey);
+ Color selectedColor = null;
+
if (value instanceof Color) {
- setSelectedColor((Color)value);
- } else if (value instanceof String) {
- setSelectedColor((String)value);
+ selectedColor = (Color)value;
+ } else if (selectedColorBindMapping == null) {
+ if (value != null) {
+ selectedColor = Color.decode(value.toString());
+ }
} else {
- throw new IllegalArgumentException("Invalid color type: " +
- value.getClass().getName());
+ selectedColor = selectedColorBindMapping.toColor(value);
}
+
+ setSelectedColor(selectedColor);
}
}
/**
* Stores the selected color into the specified bind context using this color
- * picker's bind key, if one is set.
+ * chooser's bind key, if one is set.
*/
@Override
public void store(Dictionary<String, ?> context) {
- if (isEnabled()
- && selectedColorKey != null) {
- JSON.put(context, selectedColorKey, selectedColor);
+ if (selectedColorKey != null
+ && selectedColorBindType != BindType.LOAD) {
+ JSON.put(context, selectedColorKey, (selectedColorBindMapping == null) ?
+ selectedColor : selectedColorBindMapping.valueOf(selectedColor));
}
}
/**
- * Returns the color chooser listener list.
+ * If a bind key is set, clears the selected color.
*/
- public ListenerList<ColorChooserListener> getColorChooserListeners() {
- return colorChooserListeners;
+ @Override
+ public void clear() {
+ if (selectedColorKey != null) {
+ setSelectedColor((Color)null);
+ }
}
/**
@@ -169,4 +260,11 @@ public class ColorChooser extends Contai
public ListenerList<ColorChooserSelectionListener> getColorChooserSelectionListeners() {
return colorChooserSelectionListeners;
}
+
+ /**
+ * Returns the color chooser binding listener list.
+ */
+ public ListenerList<ColorChooserBindingListener> getColorChooserBindingListeners() {
+ return colorChooserBindingListeners;
+ }
}
Added: pivot/trunk/wtk/src/org/apache/pivot/wtk/ColorChooserBindingListener.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/ColorChooserBindingListener.java?rev=927457&view=auto
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/ColorChooserBindingListener.java (added)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/ColorChooserBindingListener.java Thu Mar 25 15:50:04 2010
@@ -0,0 +1,69 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you 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 org.apache.pivot.wtk;
+
+/**
+ * Color chooser binding listener interface.
+ */
+public interface ColorChooserBindingListener {
+ /**
+ * Color chooser binding listener adapter.
+ */
+ public static class Adapter implements ColorChooserBindingListener {
+ @Override
+ public void selectedColorKeyChanged(ColorChooser colorChooser,
+ String previousSelectedColorKey) {
+ }
+
+ @Override
+ public void selectedColorBindTypeChanged(ColorChooser colorChooser,
+ BindType previousSelectedColorBindType) {
+ }
+
+ @Override
+ public void selectedColorBindMappingChanged(ColorChooser colorChooser,
+ ColorChooser.SelectedColorBindMapping previousSelectedColorBindMapping) {
+ }
+ }
+
+ /**
+ * Called when a color chooser's selected color key has changed.
+ *
+ * @param colorChooser
+ * @param previousSelectedColorKey
+ */
+ public void selectedColorKeyChanged(ColorChooser colorChooser,
+ String previousSelectedColorKey);
+
+ /**
+ * Called when a color chooser's selected color bind type has changed.
+ *
+ * @param colorChooser
+ * @param previousSelectedColorBindType
+ */
+ public void selectedColorBindTypeChanged(ColorChooser colorChooser,
+ BindType previousSelectedColorBindType);
+
+ /**
+ * Called when a color chooser's selected color bind mapping has changed.
+ *
+ * @param colorChooser
+ * @param previousSelectedColorBindMapping
+ */
+ public void selectedColorBindMappingChanged(ColorChooser colorChooser,
+ ColorChooser.SelectedColorBindMapping previousSelectedColorBindMapping);
+}
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/ColorChooserButton.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/ColorChooserButton.java?rev=927457&r1=927456&r2=927457&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/ColorChooserButton.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/ColorChooserButton.java Thu Mar 25 15:50:04 2010
@@ -29,21 +29,6 @@ import org.apache.pivot.wtk.content.List
*/
public class ColorChooserButton extends Button {
/**
- * Color chooser button listener list.
- */
- private static class ColorChooserButtonListenerList
- extends ListenerList<ColorChooserButtonListener>
- implements ColorChooserButtonListener {
- @Override
- public void selectedColorKeyChanged(ColorChooserButton colorChooserButton,
- String previousSelectedColorKey) {
- for (ColorChooserButtonListener listener : this) {
- listener.selectedColorKeyChanged(colorChooserButton, previousSelectedColorKey);
- }
- }
- }
-
- /**
* ColorChooser button selection listener list.
*/
private static class ColorChooserButtonSelectionListenerList
@@ -59,13 +44,49 @@ public class ColorChooserButton extends
}
}
+ /**
+ * Color chooser button binding listener list.
+ */
+ private static class ColorChooserButtonBindingListenerList
+ extends ListenerList<ColorChooserButtonBindingListener>
+ implements ColorChooserButtonBindingListener {
+ @Override
+ public void selectedColorKeyChanged(ColorChooserButton colorChooserButton,
+ String previousSelectedColorKey) {
+ for (ColorChooserButtonBindingListener listener : this) {
+ listener.selectedColorKeyChanged(colorChooserButton, previousSelectedColorKey);
+ }
+ }
+
+ @Override
+ public void selectedColorBindTypeChanged(ColorChooserButton colorChooserButton,
+ BindType previousSelectedColorBindType) {
+ for (ColorChooserButtonBindingListener listener : this) {
+ listener.selectedColorBindTypeChanged(colorChooserButton,
+ previousSelectedColorBindType);
+ }
+ }
+
+ @Override
+ public void selectedColorBindMappingChanged(ColorChooserButton colorChooserButton,
+ ColorChooser.SelectedColorBindMapping previousSelectedColorBindMapping) {
+ for (ColorChooserButtonBindingListener listener : this) {
+ listener.selectedColorBindMappingChanged(colorChooserButton,
+ previousSelectedColorBindMapping);
+ }
+ }
+ }
+
private Color selectedColor = null;
+
private String selectedColorKey = null;
+ private BindType selectedColorBindType = BindType.BOTH;
+ private ColorChooser.SelectedColorBindMapping selectedColorBindMapping = null;
- private ColorChooserButtonListenerList colorChooserButtonListeners =
- new ColorChooserButtonListenerList();
private ColorChooserButtonSelectionListenerList colorChooserButtonSelectionListeners =
new ColorChooserButtonSelectionListenerList();
+ private ColorChooserButtonBindingListenerList colorChooserButtonBindingListeners =
+ new ColorChooserButtonBindingListenerList();
private static final Button.DataRenderer DEFAULT_DATA_RENDERER =
new ListButtonColorItemRenderer();
@@ -146,7 +167,49 @@ public class ColorChooserButton extends
if (previousSelectedColorKey != selectedColorKey) {
this.selectedColorKey = selectedColorKey;
- colorChooserButtonListeners.selectedColorKeyChanged(this, previousSelectedColorKey);
+ colorChooserButtonBindingListeners.selectedColorKeyChanged(this,
+ previousSelectedColorKey);
+ }
+ }
+
+ public BindType getSelectedColorBindType() {
+ return selectedColorBindType;
+ }
+
+ public void setSelectedColorBindType(BindType selectedColorBindType) {
+ if (selectedColorBindType == null) {
+ throw new IllegalArgumentException();
+ }
+
+ BindType previousSelectedColorBindType = this.selectedColorBindType;
+
+ if (previousSelectedColorBindType != selectedColorBindType) {
+ this.selectedColorBindType = selectedColorBindType;
+ colorChooserButtonBindingListeners.selectedColorBindTypeChanged(this,
+ previousSelectedColorBindType);
+ }
+ }
+
+ public final void setSelectedColorBindType(String selectedColorBindType) {
+ if (selectedColorBindType == null) {
+ throw new IllegalArgumentException();
+ }
+
+ setSelectedColorBindType(BindType.valueOf(selectedColorBindType.toUpperCase()));
+ }
+
+ public ColorChooser.SelectedColorBindMapping getSelectedColorBindMapping() {
+ return selectedColorBindMapping;
+ }
+
+ public void setSelectedColorBindMapping(ColorChooser.SelectedColorBindMapping bindMapping) {
+ ColorChooser.SelectedColorBindMapping previousSelectedColorBindMapping =
+ this.selectedColorBindMapping;
+
+ if (previousSelectedColorBindMapping != bindMapping) {
+ this.selectedColorBindMapping = bindMapping;
+ colorChooserButtonBindingListeners.selectedColorBindMappingChanged(this,
+ previousSelectedColorBindMapping);
}
}
@@ -156,20 +219,24 @@ public class ColorChooserButton extends
*/
@Override
public void load(Dictionary<String, ?> context) {
- String selectedColorKey = getSelectedColorKey();
-
if (selectedColorKey != null
- && JSON.containsKey(context, selectedColorKey)) {
+ && JSON.containsKey(context, selectedColorKey)
+ && selectedColorBindType != BindType.STORE) {
Object value = JSON.get(context, selectedColorKey);
+ Color selectedColor = null;
+
if (value instanceof Color) {
- setSelectedColor((Color)value);
- } else if (value instanceof String) {
- setSelectedColor((String)value);
+ selectedColor = (Color)value;
+ } else if (selectedColorBindMapping == null) {
+ if (value != null) {
+ selectedColor = Color.decode(value.toString());
+ }
} else {
- throw new IllegalArgumentException("Invalid color type: " +
- value.getClass().getName());
+ selectedColor = selectedColorBindMapping.toColor(value);
}
+
+ setSelectedColor(selectedColor);
}
}
@@ -179,9 +246,10 @@ public class ColorChooserButton extends
*/
@Override
public void store(Dictionary<String, ?> context) {
- if (isEnabled()
- && selectedColorKey != null) {
- JSON.put(context, selectedColorKey, selectedColor);
+ if (selectedColorKey != null
+ && selectedColorBindType != BindType.LOAD) {
+ JSON.put(context, selectedColorKey, (selectedColorBindMapping == null) ?
+ selectedColor : selectedColorBindMapping.valueOf(selectedColor));
}
}
@@ -196,16 +264,16 @@ public class ColorChooserButton extends
}
/**
- * Returns the color chooser button listener list.
+ * Returns the color chooser button selection listener list.
*/
- public ListenerList<ColorChooserButtonListener> getColorChooserButtonListeners() {
- return colorChooserButtonListeners;
+ public ListenerList<ColorChooserButtonSelectionListener> getColorChooserButtonSelectionListeners() {
+ return colorChooserButtonSelectionListeners;
}
/**
- * Returns the color chooser button selection listener list.
+ * Returns the color chooser button binding listener list.
*/
- public ListenerList<ColorChooserButtonSelectionListener> getColorChooserButtonSelectionListeners() {
- return colorChooserButtonSelectionListeners;
+ public ListenerList<ColorChooserButtonBindingListener> getColorChooserButtonBindingListeners() {
+ return colorChooserButtonBindingListeners;
}
}
Added: pivot/trunk/wtk/src/org/apache/pivot/wtk/ColorChooserButtonBindingListener.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/ColorChooserButtonBindingListener.java?rev=927457&view=auto
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/ColorChooserButtonBindingListener.java (added)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/ColorChooserButtonBindingListener.java Thu Mar 25 15:50:04 2010
@@ -0,0 +1,71 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you 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 org.apache.pivot.wtk;
+
+/**
+ * Color chooser button binding listener interface.
+ */
+public interface ColorChooserButtonBindingListener {
+ /**
+ * Color chooser button binding listener adapter.
+ */
+ public static class Adapter implements ColorChooserButtonBindingListener {
+ @Override
+ public void selectedColorKeyChanged(ColorChooserButton colorChooserButton,
+ String previousSelectedColorKey) {
+ }
+
+ @Override
+ public void selectedColorBindTypeChanged(ColorChooserButton colorChooserButton,
+ BindType previousSelectedColorBindType) {
+ }
+
+ @Override
+ public void selectedColorBindMappingChanged(ColorChooserButton colorChooserButton,
+ ColorChooser.SelectedColorBindMapping previousSelectedColorBindMapping) {
+ }
+ }
+
+ /**
+ * Called when a color chooser button's selected color key has changed.
+ *
+ * @param colorChooserButton
+ * @param previousSelectedColorKey
+ */
+ public void selectedColorKeyChanged(ColorChooserButton colorChooserButton,
+ String previousSelectedColorKey);
+
+ /**
+ * Called when a color chooser button's selected color bind type has
+ * changed.
+ *
+ * @param colorChooserButton
+ * @param previousSelectedColorBindType
+ */
+ public void selectedColorBindTypeChanged(ColorChooserButton colorChooserButton,
+ BindType previousSelectedColorBindType);
+
+ /**
+ * Called when a color chooser button's selected color bind mapping has
+ * changed.
+ *
+ * @param colorChooserButton
+ * @param previousSelectedColorBindMapping
+ */
+ public void selectedColorBindMappingChanged(ColorChooserButton colorChooserButton,
+ ColorChooser.SelectedColorBindMapping previousSelectedColorBindMapping);
+}
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/ColorChooserButtonSkin.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/ColorChooserButtonSkin.java?rev=927457&r1=927456&r2=927457&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/ColorChooserButtonSkin.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/ColorChooserButtonSkin.java Thu Mar 25 15:50:04 2010
@@ -28,7 +28,6 @@ import org.apache.pivot.wtk.Display;
import org.apache.pivot.wtk.Keyboard;
import org.apache.pivot.wtk.ColorChooser;
import org.apache.pivot.wtk.ColorChooserButton;
-import org.apache.pivot.wtk.ColorChooserButtonListener;
import org.apache.pivot.wtk.ColorChooserButtonSelectionListener;
import org.apache.pivot.wtk.Mouse;
import org.apache.pivot.wtk.Window;
@@ -38,7 +37,7 @@ import org.apache.pivot.wtk.WindowStateL
* Abstract base class for color chooser button skins.
*/
public abstract class ColorChooserButtonSkin extends ButtonSkin
- implements ColorChooserButtonListener, ColorChooserButtonSelectionListener {
+ implements ColorChooserButtonSelectionListener {
/**
* A focusable window class used by color chooser button skins.
*/
@@ -185,7 +184,6 @@ public abstract class ColorChooserButton
super.install(component);
ColorChooserButton colorChooserButton = (ColorChooserButton)component;
- colorChooserButton.getColorChooserButtonListeners().add(this);
colorChooserButton.getColorChooserButtonSelectionListeners().add(this);
}
@@ -291,14 +289,6 @@ public abstract class ColorChooserButton
return consumed;
}
- // ColorChooserButtonListener methods
-
- @Override
- public void selectedColorKeyChanged(ColorChooserButton colorChooserButton,
- String previousSelectedColorKey) {
- // No-op
- }
-
// ColorChooserButtonSelectionListener methods
@Override
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/ColorChooserSkin.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/ColorChooserSkin.java?rev=927457&r1=927456&r2=927457&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/ColorChooserSkin.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/ColorChooserSkin.java Thu Mar 25 15:50:04 2010
@@ -19,7 +19,6 @@ package org.apache.pivot.wtk.skin;
import java.awt.Color;
import org.apache.pivot.wtk.ColorChooser;
-import org.apache.pivot.wtk.ColorChooserListener;
import org.apache.pivot.wtk.ColorChooserSelectionListener;
import org.apache.pivot.wtk.Component;
import org.apache.pivot.wtk.skin.ContainerSkin;
@@ -28,21 +27,16 @@ import org.apache.pivot.wtk.skin.Contain
* Abstract base class for color chooser skins.
*/
public abstract class ColorChooserSkin extends ContainerSkin
- implements ColorChooserListener, ColorChooserSelectionListener {
+ implements ColorChooserSelectionListener {
@Override
public void install(Component component) {
super.install(component);
ColorChooser colorChooser = (ColorChooser)component;
- colorChooser.getColorChooserListeners().add(this);
colorChooser.getColorChooserSelectionListeners().add(this);
}
- @Override
- public void selectedColorKeyChanged(ColorChooser colorChooser,
- String previousSelectedColorKey) {
- // No-op
- }
+ // ColorChooserSelectionListener methods
@Override
public void selectedColorChanged(ColorChooser colorChooser, Color previousSelectedColor) {