You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pivot.apache.org by rw...@apache.org on 2017/05/17 18:25:15 UTC
svn commit: r1795442 - /pivot/trunk/wtk/src/org/apache/pivot/wtk/
Author: rwhitcomb
Date: Wed May 17 18:25:15 2017
New Revision: 1795442
URL: http://svn.apache.org/viewvc?rev=1795442&view=rev
Log:
PIVOT-997: Another round of changing WTKListenerList to just ListenerList
as part of the effort to deprecate and then remove this now empty class.
Modified:
pivot/trunk/wtk/src/org/apache/pivot/wtk/Action.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/ActivityIndicator.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/Alert.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/Border.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/BoxPane.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/Button.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/ButtonGroup.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/Calendar.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/CalendarButton.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/CardPane.java
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/Component.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/Container.java
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/Action.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/Action.java?rev=1795442&r1=1795441&r2=1795442&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/Action.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/Action.java Wed May 17 18:25:15 2017
@@ -82,7 +82,7 @@ public abstract class Action {
}
}
- private static class ActionListenerList extends WTKListenerList<ActionListener> implements
+ private static class ActionListenerList extends ListenerList<ActionListener> implements
ActionListener {
@Override
public void enabledChanged(Action action) {
@@ -92,7 +92,7 @@ public abstract class Action {
}
}
- private static class ActionClassListenerList extends WTKListenerList<ActionClassListener>
+ private static class ActionClassListenerList extends ListenerList<ActionClassListener>
implements ActionClassListener {
@Override
public void actionAdded(String id) {
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/ActivityIndicator.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/ActivityIndicator.java?rev=1795442&r1=1795441&r2=1795442&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/ActivityIndicator.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/ActivityIndicator.java Wed May 17 18:25:15 2017
@@ -23,7 +23,7 @@ import org.apache.pivot.util.ListenerLis
*/
public class ActivityIndicator extends Component {
private static class ActivityIndicatorListenerList extends
- WTKListenerList<ActivityIndicatorListener> implements ActivityIndicatorListener {
+ ListenerList<ActivityIndicatorListener> implements ActivityIndicatorListener {
@Override
public void activeChanged(ActivityIndicator activityIndicator) {
for (ActivityIndicatorListener listener : this) {
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/Alert.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/Alert.java?rev=1795442&r1=1795441&r2=1795442&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/Alert.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/Alert.java Wed May 17 18:25:15 2017
@@ -118,7 +118,7 @@ public class Alert extends Dialog {
}
}
- private static class AlertListenerList extends WTKListenerList<AlertListener> implements
+ private static class AlertListenerList extends ListenerList<AlertListener> implements
AlertListener {
@Override
public void messageTypeChanged(Alert alert, MessageType previousMessageType) {
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/Border.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/Border.java?rev=1795442&r1=1795441&r2=1795442&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/Border.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/Border.java Wed May 17 18:25:15 2017
@@ -25,7 +25,7 @@ import org.apache.pivot.util.ListenerLis
*/
@DefaultProperty("content")
public class Border extends Container {
- private static class BorderListenerList extends WTKListenerList<BorderListener> implements
+ private static class BorderListenerList extends ListenerList<BorderListener> implements
BorderListener {
@Override
public void titleChanged(Border border, String previousTitle) {
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/BoxPane.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/BoxPane.java?rev=1795442&r1=1795441&r2=1795442&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/BoxPane.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/BoxPane.java Wed May 17 18:25:15 2017
@@ -47,7 +47,7 @@ import org.apache.pivot.util.ListenerLis
* have their heights set accordingly.
*/
public class BoxPane extends Container {
- private static class BoxPaneListenerList extends WTKListenerList<BoxPaneListener> implements
+ private static class BoxPaneListenerList extends ListenerList<BoxPaneListener> implements
BoxPaneListener {
@Override
public void orientationChanged(BoxPane boxPane) {
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=1795442&r1=1795441&r2=1795442&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/Button.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/Button.java Wed May 17 18:25:15 2017
@@ -140,7 +140,7 @@ public abstract class Button extends Com
public Object valueOf(Object buttonData);
}
- private static class ButtonListenerList extends WTKListenerList<ButtonListener> implements
+ private static class ButtonListenerList extends ListenerList<ButtonListener> implements
ButtonListener {
@Override
public void buttonDataChanged(Button button, Object previousButtonData) {
@@ -185,7 +185,7 @@ public abstract class Button extends Com
}
}
- private static class ButtonStateListenerList extends WTKListenerList<ButtonStateListener>
+ private static class ButtonStateListenerList extends ListenerList<ButtonStateListener>
implements ButtonStateListener {
@Override
public void stateChanged(Button button, Button.State previousState) {
@@ -195,7 +195,7 @@ public abstract class Button extends Com
}
}
- private static class ButtonPressListenerList extends WTKListenerList<ButtonPressListener>
+ private static class ButtonPressListenerList extends ListenerList<ButtonPressListener>
implements ButtonPressListener {
@Override
public void buttonPressed(Button button) {
@@ -205,7 +205,7 @@ public abstract class Button extends Com
}
}
- private static class ButtonBindingListenerList extends WTKListenerList<ButtonBindingListener>
+ private static class ButtonBindingListenerList extends ListenerList<ButtonBindingListener>
implements ButtonBindingListener {
@Override
public void buttonDataKeyChanged(Button button, String previousButtonDataKey) {
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/ButtonGroup.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/ButtonGroup.java?rev=1795442&r1=1795441&r2=1795442&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/ButtonGroup.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/ButtonGroup.java Wed May 17 18:25:15 2017
@@ -27,7 +27,7 @@ import org.apache.pivot.util.ListenerLis
* Class representing a toggle button group.
*/
public class ButtonGroup implements Group<Button>, Iterable<Button> {
- private static class ButtonGroupListenerList extends WTKListenerList<ButtonGroupListener>
+ private static class ButtonGroupListenerList extends ListenerList<ButtonGroupListener>
implements ButtonGroupListener {
@Override
public void buttonAdded(ButtonGroup buttonGroup, Button button) {
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/Calendar.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/Calendar.java?rev=1795442&r1=1795441&r2=1795442&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/Calendar.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/Calendar.java Wed May 17 18:25:15 2017
@@ -51,7 +51,7 @@ public class Calendar extends Container
public Object valueOf(CalendarDate calendarDate);
}
- private static class CalendarListenerList extends WTKListenerList<CalendarListener> implements
+ private static class CalendarListenerList extends ListenerList<CalendarListener> implements
CalendarListener {
@Override
public void yearChanged(Calendar calendar, int previousYear) {
@@ -84,7 +84,7 @@ public class Calendar extends Container
}
private static class CalendarSelectionListenerList extends
- WTKListenerList<CalendarSelectionListener> implements CalendarSelectionListener {
+ ListenerList<CalendarSelectionListener> implements CalendarSelectionListener {
@Override
public void selectedDateChanged(Calendar calendar, CalendarDate previousSelectedDate) {
@@ -95,7 +95,7 @@ public class Calendar extends Container
}
private static class CalendarBindingListenerList extends
- WTKListenerList<CalendarBindingListener> implements CalendarBindingListener {
+ ListenerList<CalendarBindingListener> implements CalendarBindingListener {
@Override
public void selectedDateKeyChanged(Calendar calendar, String previousSelectedDateKey) {
for (CalendarBindingListener listener : this) {
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/CalendarButton.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/CalendarButton.java?rev=1795442&r1=1795441&r2=1795442&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/CalendarButton.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/CalendarButton.java Wed May 17 18:25:15 2017
@@ -32,7 +32,7 @@ import org.apache.pivot.wtk.content.Cale
* hidden until the user pushes the button.
*/
public class CalendarButton extends Button {
- private static class CalendarButtonListenerList extends WTKListenerList<CalendarButtonListener>
+ private static class CalendarButtonListenerList extends ListenerList<CalendarButtonListener>
implements CalendarButtonListener {
@Override
public void yearChanged(CalendarButton calendarButton, int previousYear) {
@@ -65,7 +65,7 @@ public class CalendarButton extends Butt
}
private static class CalendarButtonSelectionListenerList extends
- WTKListenerList<CalendarButtonSelectionListener> implements CalendarButtonSelectionListener {
+ ListenerList<CalendarButtonSelectionListener> implements CalendarButtonSelectionListener {
@Override
public void selectedDateChanged(CalendarButton calendarButton,
@@ -77,7 +77,7 @@ public class CalendarButton extends Butt
}
private static class CalendarButtonBindingListenerList extends
- WTKListenerList<CalendarButtonBindingListener> implements CalendarButtonBindingListener {
+ ListenerList<CalendarButtonBindingListener> implements CalendarButtonBindingListener {
@Override
public void selectedDateKeyChanged(CalendarButton calendarButton,
String previousSelectedDateKey) {
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/CardPane.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/CardPane.java?rev=1795442&r1=1795441&r2=1795442&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/CardPane.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/CardPane.java Wed May 17 18:25:15 2017
@@ -25,7 +25,7 @@ import org.apache.pivot.util.Vote;
* at a time.
*/
public class CardPane extends Container {
- private static class CardPaneListenerList extends WTKListenerList<CardPaneListener> implements
+ private static class CardPaneListenerList extends ListenerList<CardPaneListener> implements
CardPaneListener {
@Override
public Vote previewSelectedIndexChange(CardPane cardPane, int selectedIndex) {
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=1795442&r1=1795441&r2=1795442&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/ColorChooser.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/ColorChooser.java Wed May 17 18:25:15 2017
@@ -52,7 +52,7 @@ public class ColorChooser extends Contai
* Color chooser selection listener list.
*/
private static class ColorChooserSelectionListenerList extends
- WTKListenerList<ColorChooserSelectionListener> implements ColorChooserSelectionListener {
+ ListenerList<ColorChooserSelectionListener> implements ColorChooserSelectionListener {
@Override
public void selectedColorChanged(ColorChooser colorChooser, Color previousSelectedColor) {
@@ -66,7 +66,7 @@ public class ColorChooser extends Contai
* Color chooser binding listener list.
*/
private static class ColorChooserBindingListenerList extends
- WTKListenerList<ColorChooserBindingListener> implements ColorChooserBindingListener {
+ ListenerList<ColorChooserBindingListener> implements ColorChooserBindingListener {
@Override
public void selectedColorKeyChanged(ColorChooser colorChooser,
String previousSelectedColorKey) {
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=1795442&r1=1795441&r2=1795442&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/ColorChooserButton.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/ColorChooserButton.java Wed May 17 18:25:15 2017
@@ -32,7 +32,7 @@ public class ColorChooserButton extends
* ColorChooser button selection listener list.
*/
private static class ColorChooserButtonSelectionListenerList extends
- WTKListenerList<ColorChooserButtonSelectionListener> implements
+ ListenerList<ColorChooserButtonSelectionListener> implements
ColorChooserButtonSelectionListener {
@Override
@@ -48,7 +48,7 @@ public class ColorChooserButton extends
* Color chooser button binding listener list.
*/
private static class ColorChooserButtonBindingListenerList extends
- WTKListenerList<ColorChooserButtonBindingListener> implements
+ ListenerList<ColorChooserButtonBindingListener> implements
ColorChooserButtonBindingListener {
@Override
public void selectedColorKeyChanged(ColorChooserButton colorChooserButton,
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/Component.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/Component.java?rev=1795442&r1=1795441&r2=1795442&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/Component.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/Component.java Wed May 17 18:25:15 2017
@@ -37,6 +37,7 @@ import org.apache.pivot.util.ImmutableIt
import org.apache.pivot.util.ListenerList;
import org.apache.pivot.util.Utils;
import org.apache.pivot.wtk.effects.Decorator;
+import org.apache.pivot.wtk.skin.ComponentSkin;
/**
* Top level abstract base class for all components. In MVC terminology, a
@@ -274,7 +275,7 @@ public abstract class Component implemen
}
}
- private static class ComponentListenerList extends WTKListenerList<ComponentListener> implements
+ private static class ComponentListenerList extends ListenerList<ComponentListener> implements
ComponentListener {
@Override
public void parentChanged(Component component, Container previousParent) {
@@ -380,7 +381,7 @@ public abstract class Component implemen
}
}
- private static class ComponentStateListenerList extends WTKListenerList<ComponentStateListener>
+ private static class ComponentStateListenerList extends ListenerList<ComponentStateListener>
implements ComponentStateListener {
@Override
public void enabledChanged(Component component) {
@@ -398,7 +399,7 @@ public abstract class Component implemen
}
private static class ComponentDecoratorListenerList extends
- WTKListenerList<ComponentDecoratorListener> implements ComponentDecoratorListener {
+ ListenerList<ComponentDecoratorListener> implements ComponentDecoratorListener {
@Override
public void decoratorInserted(Component component, int index) {
for (ComponentDecoratorListener listener : this) {
@@ -421,7 +422,7 @@ public abstract class Component implemen
}
}
- private static class ComponentStyleListenerList extends WTKListenerList<ComponentStyleListener>
+ private static class ComponentStyleListenerList extends ListenerList<ComponentStyleListener>
implements ComponentStyleListener {
@Override
public void styleUpdated(Component component, String styleKey, Object previousValue) {
@@ -431,7 +432,7 @@ public abstract class Component implemen
}
}
- private static class ComponentMouseListenerList extends WTKListenerList<ComponentMouseListener>
+ private static class ComponentMouseListenerList extends ListenerList<ComponentMouseListener>
implements ComponentMouseListener {
@Override
public boolean mouseMove(Component component, int x, int y) {
@@ -460,7 +461,7 @@ public abstract class Component implemen
}
private static class ComponentMouseButtonListenerList extends
- WTKListenerList<ComponentMouseButtonListener> implements ComponentMouseButtonListener {
+ ListenerList<ComponentMouseButtonListener> implements ComponentMouseButtonListener {
@Override
public boolean mouseDown(Component component, Mouse.Button button, int x, int y) {
boolean consumed = false;
@@ -496,7 +497,7 @@ public abstract class Component implemen
}
private static class ComponentMouseWheelListenerList extends
- WTKListenerList<ComponentMouseWheelListener> implements ComponentMouseWheelListener {
+ ListenerList<ComponentMouseWheelListener> implements ComponentMouseWheelListener {
@Override
public boolean mouseWheel(Component component, Mouse.ScrollType scrollType,
int scrollAmount, int wheelRotation, int x, int y) {
@@ -511,7 +512,7 @@ public abstract class Component implemen
}
}
- private static class ComponentKeyListenerList extends WTKListenerList<ComponentKeyListener>
+ private static class ComponentKeyListenerList extends ListenerList<ComponentKeyListener>
implements ComponentKeyListener {
@Override
public boolean keyTyped(Component component, char character) {
@@ -549,7 +550,7 @@ public abstract class Component implemen
}
private static class ComponentTooltipListenerList extends
- WTKListenerList<ComponentTooltipListener> implements ComponentTooltipListener {
+ ListenerList<ComponentTooltipListener> implements ComponentTooltipListener {
@Override
public void tooltipTriggered(Component component, int x, int y) {
for (ComponentTooltipListener listener : this) {
@@ -558,7 +559,7 @@ public abstract class Component implemen
}
}
- private static class ComponentDataListenerList extends WTKListenerList<ComponentDataListener>
+ private static class ComponentDataListenerList extends ListenerList<ComponentDataListener>
implements ComponentDataListener {
@Override
public void valueAdded(Component component, String key) {
@@ -582,7 +583,7 @@ public abstract class Component implemen
}
}
- private static class ComponentClassListenerList extends WTKListenerList<ComponentClassListener>
+ private static class ComponentClassListenerList extends ListenerList<ComponentClassListener>
implements ComponentClassListener {
@Override
public void focusedComponentChanged(Component previousFocusedComponent) {
@@ -2771,12 +2772,26 @@ public abstract class Component implemen
return consumed;
}
+ /**
+ * Returns the input method listener for this component,
+ * which will reside in the skin, so defer to the skin class.
+ *
+ * @return The input method listener (if any) for this
+ * component.
+ */
+ public TextInputMethodListener getTextInputMethodListener() {
+System.out.println("Component.getTextInputMethodListener() called");
+ return ((ComponentSkin)getSkin()).getTextInputMethodListener();
+ }
+
@Override
public String toString() {
- String s = this.getClass().getName();
+ String s;
if (automationID != null) {
- s += "#" + automationID;
+ s = this.getClass().getName() + "#" + automationID;
+ } else {
+ s = super.toString();
}
return s;
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/Container.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/Container.java?rev=1795442&r1=1795441&r2=1795442&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/Container.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/Container.java Wed May 17 18:25:15 2017
@@ -33,7 +33,7 @@ import org.apache.pivot.wtk.effects.Deco
*/
public abstract class Container extends Component implements Sequence<Component>,
Iterable<Component> {
- private static class ContainerListenerList extends WTKListenerList<ContainerListener> implements
+ private static class ContainerListenerList extends ListenerList<ContainerListener> implements
ContainerListener {
@Override
public void componentInserted(Container container, int index) {
@@ -65,7 +65,7 @@ public abstract class Container extends
}
}
- private static class ContainerMouseListenerList extends WTKListenerList<ContainerMouseListener>
+ private static class ContainerMouseListenerList extends ListenerList<ContainerMouseListener>
implements ContainerMouseListener {
@Override
public boolean mouseMove(Container container, int x, int y) {