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 2018/01/31 01:35:39 UTC

svn commit: r1822722 [2/3] - in /pivot/trunk: wtk-terra/src/org/apache/pivot/wtk/skin/terra/ wtk/src/org/apache/pivot/wtk/

Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/PromptListener.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/PromptListener.java?rev=1822722&r1=1822721&r2=1822722&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/PromptListener.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/PromptListener.java Wed Jan 31 01:35:38 2018
@@ -17,14 +17,52 @@
 package org.apache.pivot.wtk;
 
 import org.apache.pivot.collections.Sequence;
+import org.apache.pivot.util.ListenerList;
 
 /**
  * Prompt listener interface.
  */
 public interface PromptListener {
     /**
+     * Prompt listeners.
+     */
+    public static class Listeners extends ListenerList<PromptListener> implements PromptListener {
+        @Override
+        public void messageTypeChanged(Prompt prompt, MessageType previousMessageType) {
+            forEach(listener -> listener.messageTypeChanged(prompt, previousMessageType));
+        }
+
+        @Override
+        public void messageChanged(Prompt prompt, String previousMessage) {
+            forEach(listener -> listener.messageChanged(prompt, previousMessage));
+        }
+
+        @Override
+        public void bodyChanged(Prompt prompt, Component previousBody) {
+            forEach(listener -> listener.bodyChanged(prompt, previousBody));
+        }
+
+        @Override
+        public void optionInserted(Prompt prompt, int index) {
+            forEach(listener -> listener.optionInserted(prompt, index));
+        }
+
+        @Override
+        public void optionsRemoved(Prompt prompt, int index, Sequence<?> removed) {
+            forEach(listener -> listener.optionsRemoved(prompt, index, removed));
+        }
+
+        @Override
+        public void selectedOptionChanged(Prompt prompt, int previousSelectedOption) {
+            forEach(listener -> listener.selectedOptionChanged(prompt, previousSelectedOption));
+        }
+    }
+
+    /**
      * Prompt listener adapter.
+     * @deprecated Since 2.1 and Java 8 the interface itself has default implementations.
      */
+    @Deprecated
     public static class Adapter implements PromptListener {
         @Override
         public void messageTypeChanged(Prompt prompt, MessageType previousMessageType) {
@@ -63,7 +101,8 @@ public interface PromptListener {
      * @param prompt The prompt object that has been changed.
      * @param previousMessageType The message type before the change.
      */
-    public void messageTypeChanged(Prompt prompt, MessageType previousMessageType);
+    default public void messageTypeChanged(Prompt prompt, MessageType previousMessageType) {
+    }
 
     /**
      * Called when a prompt's message has changed.
@@ -71,7 +110,8 @@ public interface PromptListener {
      * @param prompt The prompt whose message has changed.
      * @param previousMessage What the message used to be.
      */
-    public void messageChanged(Prompt prompt, String previousMessage);
+    default public void messageChanged(Prompt prompt, String previousMessage) {
+    }
 
     /**
      * Called when a prompt's body has changed.
@@ -79,7 +119,8 @@ public interface PromptListener {
      * @param prompt The prompt that has changed.
      * @param previousBody What the body of this prompt used to be.
      */
-    public void bodyChanged(Prompt prompt, Component previousBody);
+    default public void bodyChanged(Prompt prompt, Component previousBody) {
+    }
 
     /**
      * Called when an option has been inserted into a prompt's option sequence.
@@ -87,7 +128,8 @@ public interface PromptListener {
      * @param prompt The prompt whose options have changed.
      * @param index The location where the new option was inserted.
      */
-    public void optionInserted(Prompt prompt, int index);
+    default public void optionInserted(Prompt prompt, int index) {
+    }
 
     /**
      * Called when options have been removed from a prompt's option sequence.
@@ -96,7 +138,8 @@ public interface PromptListener {
      * @param index The starting location of the removed options.
      * @param removed The actual sequence of options removed.
      */
-    public void optionsRemoved(Prompt prompt, int index, Sequence<?> removed);
+    default public void optionsRemoved(Prompt prompt, int index, Sequence<?> removed) {
+    }
 
     /**
      * Called when a prompt's selected option has changed.
@@ -104,5 +147,6 @@ public interface PromptListener {
      * @param prompt The prompt that changed.
      * @param previousSelectedOption The option that used to be the selected one.
      */
-    public void selectedOptionChanged(Prompt prompt, int previousSelectedOption);
+    default public void selectedOptionChanged(Prompt prompt, int previousSelectedOption) {
+    }
 }

Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/Rollup.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/Rollup.java?rev=1822722&r1=1822721&r2=1822722&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/Rollup.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/Rollup.java Wed Jan 31 01:35:38 2018
@@ -29,66 +29,14 @@ import org.apache.pivot.util.Vote;
  */
 @DefaultProperty("content")
 public class Rollup extends Container {
-    private static class RollupListenerList extends ListenerList<RollupListener> implements
-        RollupListener {
-        @Override
-        public void headingChanged(Rollup rollup, Component previousHeading) {
-            for (RollupListener listener : this) {
-                listener.headingChanged(rollup, previousHeading);
-            }
-        }
-
-        @Override
-        public void contentChanged(Rollup rollup, Component previousContent) {
-            for (RollupListener listener : this) {
-                listener.contentChanged(rollup, previousContent);
-            }
-        }
-
-        @Override
-        public void collapsibleChanged(Rollup rollup) {
-            for (RollupListener listener : this) {
-                listener.collapsibleChanged(rollup);
-            }
-        }
-    }
-
-    private static class RollupStateListenerList extends ListenerList<RollupStateListener>
-        implements RollupStateListener {
-        @Override
-        public Vote previewExpandedChange(Rollup rollup) {
-            Vote vote = Vote.APPROVE;
-
-            for (RollupStateListener listener : this) {
-                vote = vote.tally(listener.previewExpandedChange(rollup));
-            }
-
-            return vote;
-        }
-
-        @Override
-        public void expandedChangeVetoed(Rollup rollup, Vote reason) {
-            for (RollupStateListener listener : this) {
-                listener.expandedChangeVetoed(rollup, reason);
-            }
-        }
-
-        @Override
-        public void expandedChanged(Rollup rollup) {
-            for (RollupStateListener listener : this) {
-                listener.expandedChanged(rollup);
-            }
-        }
-    }
-
     private Component heading = null;
     private Component content = null;
 
     private boolean expanded = true;
     private boolean collapsible = true;
 
-    private RollupListenerList rollupListeners = new RollupListenerList();
-    private RollupStateListenerList rollupStateListeners = new RollupStateListenerList();
+    private RollupListener.Listeners rollupListeners = new RollupListener.Listeners();
+    private RollupStateListener.Listeners rollupStateListeners = new RollupStateListener.Listeners();
 
     public Rollup() {
         this(false, null);

Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/RollupListener.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/RollupListener.java?rev=1822722&r1=1822721&r2=1822722&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/RollupListener.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/RollupListener.java Wed Jan 31 01:35:38 2018
@@ -16,6 +16,8 @@
  */
 package org.apache.pivot.wtk;
 
+import org.apache.pivot.util.ListenerList;
+
 /**
  * Defines event listener methods that pertain to rollups. Developers register
  * for such events by adding themselves to a rollup's list of "rollup listeners"
@@ -23,8 +25,30 @@ package org.apache.pivot.wtk;
  */
 public interface RollupListener {
     /**
+     * Rollup listeners.
+     */
+    public static class Listeners extends ListenerList<RollupListener> implements RollupListener {
+        @Override
+        public void headingChanged(Rollup rollup, Component previousHeading) {
+            forEach(listener -> listener.headingChanged(rollup, previousHeading));
+        }
+
+        @Override
+        public void contentChanged(Rollup rollup, Component previousContent) {
+            forEach(listener -> listener.contentChanged(rollup, previousContent));
+        }
+
+        @Override
+        public void collapsibleChanged(Rollup rollup) {
+            forEach(listener -> listener.collapsibleChanged(rollup));
+        }
+    }
+
+    /**
      * Rollup listener adapter.
+     * @deprecated Since 2.1 and Java 8 the interface itself has default implementations.
      */
+    @Deprecated
     public static class Adapter implements RollupListener {
         @Override
         public void headingChanged(Rollup rollup, Component previousHeading) {
@@ -48,7 +72,8 @@ public interface RollupListener {
      * @param rollup The rollup whose heading changed.
      * @param previousHeading What the heading used to be.
      */
-    public void headingChanged(Rollup rollup, Component previousHeading);
+    default public void headingChanged(Rollup rollup, Component previousHeading) {
+    }
 
     /**
      * Called when a rollup's content component changed.
@@ -56,12 +81,14 @@ public interface RollupListener {
      * @param rollup The rollup that has new content.
      * @param previousContent What the content used to be.
      */
-    public void contentChanged(Rollup rollup, Component previousContent);
+    default public void contentChanged(Rollup rollup, Component previousContent) {
+    }
 
     /**
      * Called when a rollup's collapsible flag has changed.
      *
      * @param rollup The rollup that changed.
      */
-    public void collapsibleChanged(Rollup rollup);
+    default public void collapsibleChanged(Rollup rollup) {
+    }
 }

Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/RollupStateListener.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/RollupStateListener.java?rev=1822722&r1=1822721&r2=1822722&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/RollupStateListener.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/RollupStateListener.java Wed Jan 31 01:35:38 2018
@@ -16,7 +16,9 @@
  */
 package org.apache.pivot.wtk;
 
+import org.apache.pivot.util.ListenerList;
 import org.apache.pivot.util.Vote;
+import org.apache.pivot.util.VoteResult;
 
 /**
  * Defines event listener methods that pertain to rollup state. Developers
@@ -25,8 +27,34 @@ import org.apache.pivot.util.Vote;
  */
 public interface RollupStateListener {
     /**
+     * Rollup state listeners.
+     */
+    public static class Listeners extends ListenerList<RollupStateListener> implements RollupStateListener {
+        @Override
+        public Vote previewExpandedChange(Rollup rollup) {
+            VoteResult result = new VoteResult();
+
+            forEach(listener -> result.tally(listener.previewExpandedChange(rollup)));
+
+            return result.get();
+        }
+
+        @Override
+        public void expandedChangeVetoed(Rollup rollup, Vote reason) {
+            forEach(listener -> listener.expandedChangeVetoed(rollup, reason));
+        }
+
+        @Override
+        public void expandedChanged(Rollup rollup) {
+            forEach(listener -> listener.expandedChanged(rollup));
+        }
+    }
+
+    /**
      * Rollup state listener adapter.
+     * @deprecated Since 2.1 and Java 8 the interface itself has default implementations.
      */
+    @Deprecated
     public static class Adapter implements RollupStateListener {
         @Override
         public Vote previewExpandedChange(Rollup rollup) {
@@ -50,7 +78,9 @@ public interface RollupStateListener {
      * @param rollup The rollup that might change.
      * @return The result of this listener voting on the expansion.
      */
-    public Vote previewExpandedChange(Rollup rollup);
+    default public Vote previewExpandedChange(Rollup rollup) {
+        return Vote.APPROVE;
+    }
 
     /**
      * Called when a rollup expansion event has been vetoed.
@@ -58,12 +88,14 @@ public interface RollupStateListener {
      * @param rollup The rollup that didn't change.
      * @param reason The reason the expansion was vetoed.
      */
-    public void expandedChangeVetoed(Rollup rollup, Vote reason);
+    default public void expandedChangeVetoed(Rollup rollup, Vote reason) {
+    }
 
     /**
      * Called when a rollup's expanded state changed.
      *
      * @param rollup The rollup that did change.
      */
-    public void expandedChanged(Rollup rollup);
+    default public void expandedChanged(Rollup rollup) {
+    }
 }

Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/ScrollBar.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/ScrollBar.java?rev=1822722&r1=1822721&r2=1822722&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/ScrollBar.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/ScrollBar.java Wed Jan 31 01:35:38 2018
@@ -29,7 +29,7 @@ import org.apache.pivot.util.Utils;
  */
 public class ScrollBar extends Container {
     /**
-     * Class representing a scroll bar's scope.
+     * Class representing a scroll bar's scope (that is, the start, end and extent values).
      */
     public static final class Scope {
         public final int start;
@@ -112,38 +112,6 @@ public class ScrollBar extends Container
         }
     }
 
-    private static class ScrollBarListenerList extends ListenerList<ScrollBarListener> implements
-        ScrollBarListener {
-        @Override
-        public void orientationChanged(ScrollBar scrollBar, Orientation previousOrientation) {
-            forEach(listener -> listener.orientationChanged(scrollBar, previousOrientation));
-        }
-
-        @Override
-        public void scopeChanged(ScrollBar scrollBar, int previousStart, int previousEnd,
-            int previousExtent) {
-            forEach(listener -> listener.scopeChanged(scrollBar, previousStart, previousEnd, previousExtent));
-        }
-
-        @Override
-        public void unitIncrementChanged(ScrollBar scrollBar, int previousUnitIncrement) {
-            forEach(listener -> listener.unitIncrementChanged(scrollBar, previousUnitIncrement));
-        }
-
-        @Override
-        public void blockIncrementChanged(ScrollBar scrollBar, int previousBlockIncrement) {
-            forEach(listener -> listener.blockIncrementChanged(scrollBar, previousBlockIncrement));
-        }
-    }
-
-    private static class ScrollBarValueListenerList extends ListenerList<ScrollBarValueListener>
-        implements ScrollBarValueListener {
-        @Override
-        public void valueChanged(ScrollBar scrollBar, int previousValue) {
-            forEach(listener -> listener.valueChanged(scrollBar, previousValue));
-        }
-    }
-
     private Orientation orientation;
     private int start = 0;
     private int end = 100;
@@ -152,8 +120,8 @@ public class ScrollBar extends Container
     private int unitIncrement = 1;
     private int blockIncrement = 1;
 
-    private ScrollBarListenerList scrollBarListeners = new ScrollBarListenerList();
-    private ScrollBarValueListenerList scrollBarValueListeners = new ScrollBarValueListenerList();
+    private ScrollBarListener.Listeners scrollBarListeners = new ScrollBarListener.Listeners();
+    private ScrollBarValueListener.Listeners scrollBarValueListeners = new ScrollBarValueListener.Listeners();
 
     public ScrollBar() {
         this(Orientation.HORIZONTAL);
@@ -216,6 +184,10 @@ public class ScrollBar extends Container
         setRange(new Span(range));
     }
 
+    public final void setRange(Sequence<?> range) {
+        setRange(new Span(range));
+    }
+
     public final void setRange(String range) {
         setRange(Span.decode(range));
     }

Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/ScrollBarListener.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/ScrollBarListener.java?rev=1822722&r1=1822721&r2=1822722&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/ScrollBarListener.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/ScrollBarListener.java Wed Jan 31 01:35:38 2018
@@ -16,13 +16,43 @@
  */
 package org.apache.pivot.wtk;
 
+import org.apache.pivot.util.ListenerList;
+
 /**
  * Scroll bar listener interface.
  */
 public interface ScrollBarListener {
     /**
+     * Scroll bar listeners.
+     */
+    public static class Listeners extends ListenerList<ScrollBarListener> implements ScrollBarListener {
+        @Override
+        public void orientationChanged(ScrollBar scrollBar, Orientation previousOrientation) {
+            forEach(listener -> listener.orientationChanged(scrollBar, previousOrientation));
+        }
+
+        @Override
+        public void scopeChanged(ScrollBar scrollBar, int previousStart, int previousEnd,
+            int previousExtent) {
+            forEach(listener -> listener.scopeChanged(scrollBar, previousStart, previousEnd, previousExtent));
+        }
+
+        @Override
+        public void unitIncrementChanged(ScrollBar scrollBar, int previousUnitIncrement) {
+            forEach(listener -> listener.unitIncrementChanged(scrollBar, previousUnitIncrement));
+        }
+
+        @Override
+        public void blockIncrementChanged(ScrollBar scrollBar, int previousBlockIncrement) {
+            forEach(listener -> listener.blockIncrementChanged(scrollBar, previousBlockIncrement));
+        }
+    }
+
+    /**
      * Scroll bar listener adapter.
+     * @deprecated Since 2.1 and Java 8 the interface itself has default implementations.
      */
+    @Deprecated
     public static class Adapter implements ScrollBarListener {
         @Override
         public void orientationChanged(ScrollBar scrollBar, Orientation previousOrientation) {
@@ -52,7 +82,8 @@ public interface ScrollBarListener {
      * @param scrollBar The scroll bar that changed orientation.
      * @param previousOrientation The previous orientation.
      */
-    public void orientationChanged(ScrollBar scrollBar, Orientation previousOrientation);
+    default public void orientationChanged(ScrollBar scrollBar, Orientation previousOrientation) {
+    }
 
     /**
      * Called when a scroll bar's scope has changed.
@@ -62,8 +93,9 @@ public interface ScrollBarListener {
      * @param previousEnd The previous end value.
      * @param previousExtent The previous scroll bar extent value.
      */
-    public void scopeChanged(ScrollBar scrollBar, int previousStart, int previousEnd,
-        int previousExtent);
+    default public void scopeChanged(ScrollBar scrollBar, int previousStart, int previousEnd,
+        int previousExtent) {
+    }
 
     /**
      * Called when a scroll bar's unit increment has changed.
@@ -71,7 +103,8 @@ public interface ScrollBarListener {
      * @param scrollBar The scroll bar that changed.
      * @param previousUnitIncrement The previous unit increment value.
      */
-    public void unitIncrementChanged(ScrollBar scrollBar, int previousUnitIncrement);
+    default public void unitIncrementChanged(ScrollBar scrollBar, int previousUnitIncrement) {
+    }
 
     /**
      * Called when a scroll bar's block increment has changed.
@@ -79,5 +112,6 @@ public interface ScrollBarListener {
      * @param scrollBar The scroll bar that changed.
      * @param previousBlockIncrement The previous block increment value.
      */
-    public void blockIncrementChanged(ScrollBar scrollBar, int previousBlockIncrement);
+    default public void blockIncrementChanged(ScrollBar scrollBar, int previousBlockIncrement) {
+    }
 }

Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/ScrollBarValueListener.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/ScrollBarValueListener.java?rev=1822722&r1=1822721&r2=1822722&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/ScrollBarValueListener.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/ScrollBarValueListener.java Wed Jan 31 01:35:38 2018
@@ -16,11 +16,24 @@
  */
 package org.apache.pivot.wtk;
 
+import org.apache.pivot.util.ListenerList;
+
 /**
  * Scroll bar value listener interface.
  */
 public interface ScrollBarValueListener {
     /**
+     * Scroll bar value listeners.
+     */
+    public static class Listeners extends ListenerList<ScrollBarValueListener>
+        implements ScrollBarValueListener {
+        @Override
+        public void valueChanged(ScrollBar scrollBar, int previousValue) {
+            forEach(listener -> listener.valueChanged(scrollBar, previousValue));
+        }
+    }
+
+    /**
      * Called when a scroll bar's value has changed.
      *
      * @param scrollBar The scroll bar that is changing.

Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/Slider.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/Slider.java?rev=1822722&r1=1822721&r2=1822722&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/Slider.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/Slider.java Wed Jan 31 01:35:38 2018
@@ -25,34 +25,13 @@ import org.apache.pivot.util.Utils;
  * Allows a user to select one of a range of values.
  */
 public class Slider extends Container {
-    private static class SliderListenerList extends ListenerList<SliderListener> implements
-        SliderListener {
-        @Override
-        public void orientationChanged(Slider slider) {
-            forEach(listener -> listener.orientationChanged(slider));
-        }
-
-        @Override
-        public void rangeChanged(Slider slider, int previousStart, int previousEnd) {
-            forEach(listener -> listener.rangeChanged(slider, previousStart, previousEnd));
-        }
-    }
-
-    private static class SliderValueListenerList extends ListenerList<SliderValueListener>
-        implements SliderValueListener {
-        @Override
-        public void valueChanged(Slider slider, int previousValue) {
-            forEach(listener -> listener.valueChanged(slider, previousValue));
-        }
-    }
-
     private int start = DEFAULT_START;
     private int end = DEFAULT_END;
     private int value = DEFAULT_VALUE;
     private Orientation orientation = null;
 
-    private SliderListenerList sliderListeners = new SliderListenerList();
-    private SliderValueListenerList sliderValueListeners = new SliderValueListenerList();
+    private SliderListener.Listeners sliderListeners = new SliderListener.Listeners();
+    private SliderValueListener.Listeners sliderValueListeners = new SliderValueListener.Listeners();
 
     public static final int DEFAULT_START = 0;
     public static final int DEFAULT_END = 100;

Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/SliderListener.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/SliderListener.java?rev=1822722&r1=1822721&r2=1822722&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/SliderListener.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/SliderListener.java Wed Jan 31 01:35:38 2018
@@ -16,13 +16,32 @@
  */
 package org.apache.pivot.wtk;
 
+import org.apache.pivot.util.ListenerList;
+
 /**
  * Slider listener interface.
  */
 public interface SliderListener {
     /**
+     * Slider listeners.
+     */
+    public static class Listeners extends ListenerList<SliderListener> implements SliderListener {
+        @Override
+        public void orientationChanged(Slider slider) {
+            forEach(listener -> listener.orientationChanged(slider));
+        }
+
+        @Override
+        public void rangeChanged(Slider slider, int previousStart, int previousEnd) {
+            forEach(listener -> listener.rangeChanged(slider, previousStart, previousEnd));
+        }
+    }
+
+    /**
      * Slider listener adapter.
+     * @deprecated Since 2.1 and Java 8 the interface itself has default implementations.
      */
+    @Deprecated
     public static class Adapter implements SliderListener {
         @Override
         public void rangeChanged(Slider slider, int previousStart, int previousEnd) {
@@ -42,12 +61,14 @@ public interface SliderListener {
      * @param previousStart The previous start of the slider's range.
      * @param previousEnd The previous end value.
      */
-    public void rangeChanged(Slider slider, int previousStart, int previousEnd);
+    default public void rangeChanged(Slider slider, int previousStart, int previousEnd) {
+    }
 
     /**
      * Called when a sliders's orientation has changed.
      *
      * @param slider The source of the event.
      */
-    public void orientationChanged(Slider slider);
+    default public void orientationChanged(Slider slider) {
+    }
 }

Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/SliderValueListener.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/SliderValueListener.java?rev=1822722&r1=1822721&r2=1822722&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/SliderValueListener.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/SliderValueListener.java Wed Jan 31 01:35:38 2018
@@ -16,11 +16,24 @@
  */
 package org.apache.pivot.wtk;
 
+import org.apache.pivot.util.ListenerList;
+
 /**
  * Slider value listener interface.
  */
 public interface SliderValueListener {
     /**
+     * Slider value listeners.
+     */
+    public static class Listeners extends ListenerList<SliderValueListener>
+        implements SliderValueListener {
+        @Override
+        public void valueChanged(Slider slider, int previousValue) {
+            forEach(listener -> listener.valueChanged(slider, previousValue));
+        }
+    }
+
+    /**
      * Called when a slider's value has changed.
      *
      * @param slider The slider whose value has changed.

Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/SplitPane.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/SplitPane.java?rev=1822722&r1=1822721&r2=1822722&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/SplitPane.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/SplitPane.java Wed Jan 31 01:35:38 2018
@@ -38,7 +38,8 @@ public class SplitPane extends Container
      * Enumeration defining split pane regions.
      */
     public enum Region {
-        TOP_LEFT, BOTTOM_RIGHT
+        TOP_LEFT,
+        BOTTOM_RIGHT
     }
 
     /**
@@ -56,44 +57,6 @@ public class SplitPane extends Container
         PRIMARY_REGION
     }
 
-    private static class SplitPaneListenerList extends ListenerList<SplitPaneListener> implements
-        SplitPaneListener {
-        @Override
-        public void topLeftChanged(SplitPane splitPane, Component previousTopLeft) {
-            forEach(listener -> listener.topLeftChanged(splitPane, previousTopLeft));
-        }
-
-        @Override
-        public void bottomRightChanged(SplitPane splitPane, Component previousBottomRight) {
-            forEach(listener -> listener.bottomRightChanged(splitPane, previousBottomRight));
-        }
-
-        @Override
-        public void orientationChanged(SplitPane splitPane) {
-            forEach(listener -> listener.orientationChanged(splitPane));
-        }
-
-        @Override
-        public void primaryRegionChanged(SplitPane splitPane) {
-            forEach(listener -> listener.primaryRegionChanged(splitPane));
-        }
-
-        @Override
-        public void splitRatioChanged(SplitPane splitPane, float previousSplitRatio) {
-            forEach(listener -> listener.splitRatioChanged(splitPane, previousSplitRatio));
-        }
-
-        @Override
-        public void lockedChanged(SplitPane splitPane) {
-            forEach(listener -> listener.lockedChanged(splitPane));
-        }
-
-        @Override
-        public void resizeModeChanged(SplitPane splitPane, ResizeMode previousResizeMode) {
-            forEach(listener -> listener.resizeModeChanged(splitPane, previousResizeMode));
-        }
-    }
-
     private Component topLeft = null;
     private Component bottomRight = null;
     private Orientation orientation = null;
@@ -102,7 +65,7 @@ public class SplitPane extends Container
     private float splitRatio = 0.5f;
     private boolean locked = false;
 
-    private SplitPaneListenerList splitPaneListeners = new SplitPaneListenerList();
+    private SplitPaneListener.Listeners splitPaneListeners = new SplitPaneListener.Listeners();
 
     public SplitPane() {
         this(Orientation.HORIZONTAL);
@@ -139,7 +102,7 @@ public class SplitPane extends Container
 
             if (topLeft != null) {
                 if (topLeft.getParent() != null) {
-                    throw new IllegalArgumentException("Component already has a parent.");
+                    throw new IllegalArgumentException("Top/left component already has a parent.");
                 }
 
                 // Add the component
@@ -168,7 +131,7 @@ public class SplitPane extends Container
 
             if (bottomRight != null) {
                 if (bottomRight.getParent() != null) {
-                    throw new IllegalArgumentException("Component already has a parent.");
+                    throw new IllegalArgumentException("Bottom/right component already has a parent.");
                 }
 
                 // Add the component
@@ -179,6 +142,10 @@ public class SplitPane extends Container
         }
     }
 
+    /**
+     * @return The "top" component of the split pane, which only applies in vertical mode;
+     * otherwise it is <tt>null</tt>.
+     */
     public Component getTop() {
         return (orientation == Orientation.HORIZONTAL) ? null : getTopLeft();
     }
@@ -187,6 +154,10 @@ public class SplitPane extends Container
         setTopLeft(component);
     }
 
+    /**
+     * @return The "bottom" component of the split pane, which only applies in vertical mode;
+     * otherwise it is <tt>null</tt>.
+     */
     public Component getBottom() {
         return (orientation == Orientation.HORIZONTAL) ? null : getBottomRight();
     }
@@ -195,6 +166,10 @@ public class SplitPane extends Container
         setBottomRight(component);
     }
 
+    /**
+     * @return The "left" component of the split pane, which only applies in horizontal mode;
+     * otherwise it is <tt>null</tt>.
+     */
     public Component getLeft() {
         return (orientation == Orientation.VERTICAL) ? null : getTopLeft();
     }
@@ -203,6 +178,10 @@ public class SplitPane extends Container
         setTopLeft(component);
     }
 
+    /**
+     * @return The "right" component of the split pane, which only applies in horizontal mode;
+     * otherwise it is <tt>null</tt>.
+     */
     public Component getRight() {
         return (orientation == Orientation.VERTICAL) ? null : getBottomRight();
     }

Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/SplitPaneListener.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/SplitPaneListener.java?rev=1822722&r1=1822721&r2=1822722&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/SplitPaneListener.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/SplitPaneListener.java Wed Jan 31 01:35:38 2018
@@ -16,13 +16,57 @@
  */
 package org.apache.pivot.wtk;
 
+import org.apache.pivot.util.ListenerList;
+
 /**
  * Split pane listener interface.
  */
 public interface SplitPaneListener {
     /**
+     * Split pane listeners.
+     */
+    public static class Listeners extends ListenerList<SplitPaneListener> implements SplitPaneListener {
+        @Override
+        public void topLeftChanged(SplitPane splitPane, Component previousTopLeft) {
+            forEach(listener -> listener.topLeftChanged(splitPane, previousTopLeft));
+        }
+
+        @Override
+        public void bottomRightChanged(SplitPane splitPane, Component previousBottomRight) {
+            forEach(listener -> listener.bottomRightChanged(splitPane, previousBottomRight));
+        }
+
+        @Override
+        public void orientationChanged(SplitPane splitPane) {
+            forEach(listener -> listener.orientationChanged(splitPane));
+        }
+
+        @Override
+        public void primaryRegionChanged(SplitPane splitPane) {
+            forEach(listener -> listener.primaryRegionChanged(splitPane));
+        }
+
+        @Override
+        public void splitRatioChanged(SplitPane splitPane, float previousSplitRatio) {
+            forEach(listener -> listener.splitRatioChanged(splitPane, previousSplitRatio));
+        }
+
+        @Override
+        public void lockedChanged(SplitPane splitPane) {
+            forEach(listener -> listener.lockedChanged(splitPane));
+        }
+
+        @Override
+        public void resizeModeChanged(SplitPane splitPane, SplitPane.ResizeMode previousResizeMode) {
+            forEach(listener -> listener.resizeModeChanged(splitPane, previousResizeMode));
+        }
+    }
+
+    /**
      * Split pane listener adapter.
+     * @deprecated Since 2.1 and Java 8 the interface itself has default implementations.
      */
+    @Deprecated
     public static class Adapter implements SplitPaneListener {
         @Override
         public void topLeftChanged(SplitPane splitPane, Component previousTopLeft) {
@@ -67,7 +111,8 @@ public interface SplitPaneListener {
      * @param previousTopLeft The previous component. The new component can be
      * found inside the splitPane.
      */
-    public void topLeftChanged(SplitPane splitPane, Component previousTopLeft);
+    default public void topLeftChanged(SplitPane splitPane, Component previousTopLeft) {
+    }
 
     /**
      * Called when a split pane's bottom right component has changed.
@@ -76,21 +121,24 @@ public interface SplitPaneListener {
      * @param previousBottomRight The previous component. The new component can
      * be found inside the splitPane.
      */
-    public void bottomRightChanged(SplitPane splitPane, Component previousBottomRight);
+    default public void bottomRightChanged(SplitPane splitPane, Component previousBottomRight) {
+    }
 
     /**
      * Called when a split pane's orientation has changed.
      *
      * @param splitPane The source of the event.
      */
-    public void orientationChanged(SplitPane splitPane);
+    default public void orientationChanged(SplitPane splitPane) {
+    }
 
     /**
      * Called when a split pane's primary region has changed.
      *
      * @param splitPane The source of the event.
      */
-    public void primaryRegionChanged(SplitPane splitPane);
+    default public void primaryRegionChanged(SplitPane splitPane) {
+    }
 
     /**
      * Called when a split pane's split location has changed.
@@ -98,14 +146,16 @@ public interface SplitPaneListener {
      * @param splitPane The source of the event.
      * @param previousSplitRatio The previous setting of the splitRatio.
      */
-    public void splitRatioChanged(SplitPane splitPane, float previousSplitRatio);
+    default public void splitRatioChanged(SplitPane splitPane, float previousSplitRatio) {
+    }
 
     /**
      * Called when a split pane's locked flag has changed.
      *
      * @param splitPane The source of the event.
      */
-    public void lockedChanged(SplitPane splitPane);
+    default public void lockedChanged(SplitPane splitPane) {
+    }
 
     /**
      * Called when a split pane's split location has changed.
@@ -113,5 +163,6 @@ public interface SplitPaneListener {
      * @param splitPane The source of the event.
      * @param previousResizeMode The previous setting of the resizeMode.
      */
-    public void resizeModeChanged(SplitPane splitPane, SplitPane.ResizeMode previousResizeMode);
+    default public void resizeModeChanged(SplitPane splitPane, SplitPane.ResizeMode previousResizeMode) {
+    }
 }

Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/SuggestionPopup.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/SuggestionPopup.java?rev=1822722&r1=1822721&r2=1822722&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/SuggestionPopup.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/SuggestionPopup.java Wed Jan 31 01:35:38 2018
@@ -31,117 +31,6 @@ import org.apache.pivot.wtk.content.List
  * Popup that presents a list of text suggestions to the user.
  */
 public class SuggestionPopup extends Window {
-    private static class SuggestionPopupListenerList extends
-        ListenerList<SuggestionPopupListener> implements SuggestionPopupListener {
-        @Override
-        public void suggestionDataChanged(SuggestionPopup suggestionPopup,
-            List<?> previousSuggestionData) {
-            for (SuggestionPopupListener listener : this) {
-                listener.suggestionDataChanged(suggestionPopup, previousSuggestionData);
-            }
-        }
-
-        @Override
-        public void suggestionRendererChanged(SuggestionPopup suggestionPopup,
-            ListView.ItemRenderer previousSuggestionRenderer) {
-            for (SuggestionPopupListener listener : this) {
-                listener.suggestionRendererChanged(suggestionPopup, previousSuggestionRenderer);
-            }
-        }
-
-        @Override
-        public void listSizeChanged(SuggestionPopup suggestionPopup, int previousListSize) {
-            for (SuggestionPopupListener listener : this) {
-                listener.listSizeChanged(suggestionPopup, previousListSize);
-            }
-        }
-    }
-
-    private static class SuggestionPopupItemListenerList extends
-        ListenerList<SuggestionPopupItemListener> implements SuggestionPopupItemListener {
-        @Override
-        public void itemInserted(SuggestionPopup suggestionPopup, int index) {
-            for (SuggestionPopupItemListener listener : this) {
-                listener.itemInserted(suggestionPopup, index);
-            }
-        }
-
-        @Override
-        public void itemsRemoved(SuggestionPopup suggestionPopup, int index, int count) {
-            for (SuggestionPopupItemListener listener : this) {
-                listener.itemsRemoved(suggestionPopup, index, count);
-            }
-        }
-
-        @Override
-        public void itemUpdated(SuggestionPopup suggestionPopup, int index) {
-            for (SuggestionPopupItemListener listener : this) {
-                listener.itemUpdated(suggestionPopup, index);
-            }
-        }
-
-        @Override
-        public void itemsCleared(SuggestionPopup suggestionPopup) {
-            for (SuggestionPopupItemListener listener : this) {
-                listener.itemsCleared(suggestionPopup);
-            }
-        }
-
-        @Override
-        public void itemsSorted(SuggestionPopup suggestionPopup) {
-            for (SuggestionPopupItemListener listener : this) {
-                listener.itemsSorted(suggestionPopup);
-            }
-        }
-    }
-
-    private static class SuggestionPopupSelectionListenerList extends
-        ListenerList<SuggestionPopupSelectionListener> implements
-        SuggestionPopupSelectionListener {
-        @Override
-        public void selectedIndexChanged(SuggestionPopup suggestionPopup, int previousSelectedIndex) {
-            for (SuggestionPopupSelectionListener listener : this) {
-                listener.selectedIndexChanged(suggestionPopup, previousSelectedIndex);
-            }
-        }
-
-        @Override
-        public void selectedSuggestionChanged(SuggestionPopup suggestionPopup,
-            Object previousSelectedSuggestion) {
-            for (SuggestionPopupSelectionListener listener : this) {
-                listener.selectedSuggestionChanged(suggestionPopup, previousSelectedSuggestion);
-            }
-        }
-    }
-
-    private static class SuggestionPopupStateListenerList extends
-        ListenerList<SuggestionPopupStateListener> implements SuggestionPopupStateListener {
-        @Override
-        public Vote previewSuggestionPopupClose(SuggestionPopup suggestionPopup, boolean result) {
-            Vote vote = Vote.APPROVE;
-
-            for (SuggestionPopupStateListener listener : this) {
-                vote = vote.tally(listener.previewSuggestionPopupClose(suggestionPopup, result));
-            }
-
-            return vote;
-        }
-
-        @Override
-        public void suggestionPopupCloseVetoed(SuggestionPopup suggestionPopup, Vote reason) {
-            for (SuggestionPopupStateListener listener : this) {
-                listener.suggestionPopupCloseVetoed(suggestionPopup, reason);
-            }
-        }
-
-        @Override
-        public void suggestionPopupClosed(SuggestionPopup suggestionPopup) {
-            for (SuggestionPopupStateListener listener : this) {
-                listener.suggestionPopupClosed(suggestionPopup);
-            }
-        }
-    }
-
     private TextInput textInput = null;
     private SuggestionPopupCloseListener suggestionPopupCloseListener = null;
 
@@ -236,10 +125,10 @@ public class SuggestionPopup extends Win
         }
     };
 
-    private SuggestionPopupListenerList suggestionPopupListeners = new SuggestionPopupListenerList();
-    private SuggestionPopupItemListenerList suggestionPopupItemListeners = new SuggestionPopupItemListenerList();
-    private SuggestionPopupSelectionListenerList suggestionPopupSelectionListeners = new SuggestionPopupSelectionListenerList();
-    private SuggestionPopupStateListenerList suggestionPopupStateListeners = new SuggestionPopupStateListenerList();
+    private SuggestionPopupListener.Listeners suggestionPopupListeners = new SuggestionPopupListener.Listeners();
+    private SuggestionPopupItemListener.Listeners suggestionPopupItemListeners = new SuggestionPopupItemListener.Listeners();
+    private SuggestionPopupSelectionListener.Listeners suggestionPopupSelectionListeners = new SuggestionPopupSelectionListener.Listeners();
+    private SuggestionPopupStateListener.Listeners suggestionPopupStateListeners = new SuggestionPopupStateListener.Listeners();
 
     private static final ListView.ItemRenderer DEFAULT_SUGGESTION_RENDERER = new ListViewItemRenderer();
 

Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/SuggestionPopupCloseListener.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/SuggestionPopupCloseListener.java?rev=1822722&r1=1822721&r2=1822722&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/SuggestionPopupCloseListener.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/SuggestionPopupCloseListener.java Wed Jan 31 01:35:38 2018
@@ -25,5 +25,6 @@ public interface SuggestionPopupCloseLis
      *
      * @param suggestionPopup The suggestion popup that has closed.
      */
-    public void suggestionPopupClosed(SuggestionPopup suggestionPopup);
+    default public void suggestionPopupClosed(SuggestionPopup suggestionPopup) {
+    }
 }

Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/SuggestionPopupItemListener.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/SuggestionPopupItemListener.java?rev=1822722&r1=1822721&r2=1822722&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/SuggestionPopupItemListener.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/SuggestionPopupItemListener.java Wed Jan 31 01:35:38 2018
@@ -16,13 +16,48 @@
  */
 package org.apache.pivot.wtk;
 
+import org.apache.pivot.util.ListenerList;
+
 /**
  * Suggestion popup item listener interface.
  */
 public interface SuggestionPopupItemListener {
     /**
+     * Suggestion popup item listeners.
+     */
+    public static class Listeners extends ListenerList<SuggestionPopupItemListener>
+        implements SuggestionPopupItemListener {
+        @Override
+        public void itemInserted(SuggestionPopup suggestionPopup, int index) {
+            forEach(listener -> listener.itemInserted(suggestionPopup, index));
+        }
+
+        @Override
+        public void itemsRemoved(SuggestionPopup suggestionPopup, int index, int count) {
+            forEach(listener -> listener.itemsRemoved(suggestionPopup, index, count));
+        }
+
+        @Override
+        public void itemUpdated(SuggestionPopup suggestionPopup, int index) {
+            forEach(listener -> listener.itemUpdated(suggestionPopup, index));
+        }
+
+        @Override
+        public void itemsCleared(SuggestionPopup suggestionPopup) {
+            forEach(listener -> listener.itemsCleared(suggestionPopup));
+        }
+
+        @Override
+        public void itemsSorted(SuggestionPopup suggestionPopup) {
+            forEach(listener -> listener.itemsSorted(suggestionPopup));
+        }
+    }
+
+    /**
      * Suggestion popup item listener adapter.
+     * @deprecated Since 2.1 and Java 8 the interface itself has default implementations.
      */
+    @Deprecated
     public static class Adapter implements SuggestionPopupItemListener {
         @Override
         public void itemInserted(SuggestionPopup suggestionPopup, int index) {
@@ -56,7 +91,8 @@ public interface SuggestionPopupItemList
      * @param suggestionPopup The source of this event.
      * @param index The location where the item was inserted.
      */
-    public void itemInserted(SuggestionPopup suggestionPopup, int index);
+    default public void itemInserted(SuggestionPopup suggestionPopup, int index) {
+    }
 
     /**
      * Called when items are removed from the suggestion popup's data list.
@@ -65,7 +101,8 @@ public interface SuggestionPopupItemList
      * @param index The starting index where items were removed.
      * @param count The number of items that were removed.
      */
-    public void itemsRemoved(SuggestionPopup suggestionPopup, int index, int count);
+    default public void itemsRemoved(SuggestionPopup suggestionPopup, int index, int count) {
+    }
 
     /**
      * Called when an item is updated within a suggestion popup's data list.
@@ -73,19 +110,22 @@ public interface SuggestionPopupItemList
      * @param suggestionPopup The source of this event.
      * @param index Which item was updated.
      */
-    public void itemUpdated(SuggestionPopup suggestionPopup, int index);
+    default public void itemUpdated(SuggestionPopup suggestionPopup, int index) {
+    }
 
     /**
      * Called when a list button's list data has been cleared.
      *
      * @param suggestionPopup The source of this event.
      */
-    public void itemsCleared(SuggestionPopup suggestionPopup);
+    default public void itemsCleared(SuggestionPopup suggestionPopup) {
+    }
 
     /**
      * Called when a list button's list data is sorted.
      *
      * @param suggestionPopup The source of this event.
      */
-    public void itemsSorted(SuggestionPopup suggestionPopup);
+    default public void itemsSorted(SuggestionPopup suggestionPopup) {
+    }
 }

Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/SuggestionPopupListener.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/SuggestionPopupListener.java?rev=1822722&r1=1822721&r2=1822722&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/SuggestionPopupListener.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/SuggestionPopupListener.java Wed Jan 31 01:35:38 2018
@@ -17,14 +17,40 @@
 package org.apache.pivot.wtk;
 
 import org.apache.pivot.collections.List;
+import org.apache.pivot.util.ListenerList;
 
 /**
  * Suggestion popup listener interface.
  */
 public interface SuggestionPopupListener {
     /**
+     * Suggestion popup listeners.
+     */
+    public static class Listeners extends ListenerList<SuggestionPopupListener>
+        implements SuggestionPopupListener {
+        @Override
+        public void suggestionDataChanged(SuggestionPopup suggestionPopup,
+            List<?> previousSuggestionData) {
+            forEach(listener -> listener.suggestionDataChanged(suggestionPopup, previousSuggestionData));
+        }
+
+        @Override
+        public void suggestionRendererChanged(SuggestionPopup suggestionPopup,
+            ListView.ItemRenderer previousSuggestionRenderer) {
+            forEach(listener -> listener.suggestionRendererChanged(suggestionPopup, previousSuggestionRenderer));
+        }
+
+        @Override
+        public void listSizeChanged(SuggestionPopup suggestionPopup, int previousListSize) {
+            forEach(listener -> listener.listSizeChanged(suggestionPopup, previousListSize));
+        }
+    }
+
+    /**
      * Suggestion popup listener adapter.
+     * @deprecated Since 2.1 and Java 8 the interface itself has default implementations.
      */
+    @Deprecated
     public static class Adapter implements SuggestionPopupListener {
         @Override
         public void suggestionDataChanged(SuggestionPopup suggestionPopup,
@@ -50,8 +76,9 @@ public interface SuggestionPopupListener
      * @param suggestionPopup The source of this event.
      * @param previousSuggestionData The previous data that was being shown.
      */
-    public void suggestionDataChanged(SuggestionPopup suggestionPopup,
-        List<?> previousSuggestionData);
+    default public void suggestionDataChanged(SuggestionPopup suggestionPopup,
+        List<?> previousSuggestionData) {
+    }
 
     /**
      * Called when a suggestion popup's item renderer has changed.
@@ -59,8 +86,9 @@ public interface SuggestionPopupListener
      * @param suggestionPopup The source of this event.
      * @param previousSuggestionRenderer The previous item renderer.
      */
-    public void suggestionRendererChanged(SuggestionPopup suggestionPopup,
-        ListView.ItemRenderer previousSuggestionRenderer);
+    default public void suggestionRendererChanged(SuggestionPopup suggestionPopup,
+        ListView.ItemRenderer previousSuggestionRenderer) {
+    }
 
     /**
      * Called when a suggestion popup's list size has changed.
@@ -68,5 +96,6 @@ public interface SuggestionPopupListener
      * @param suggestionPopup The source of this event.
      * @param previousListSize The previous value of the visible window.
      */
-    public void listSizeChanged(SuggestionPopup suggestionPopup, int previousListSize);
+    default public void listSizeChanged(SuggestionPopup suggestionPopup, int previousListSize) {
+    }
 }

Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/SuggestionPopupSelectionListener.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/SuggestionPopupSelectionListener.java?rev=1822722&r1=1822721&r2=1822722&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/SuggestionPopupSelectionListener.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/SuggestionPopupSelectionListener.java Wed Jan 31 01:35:38 2018
@@ -16,13 +16,34 @@
  */
 package org.apache.pivot.wtk;
 
+import org.apache.pivot.util.ListenerList;
+
 /**
  * Suggestion popup selection listener interface.
  */
 public interface SuggestionPopupSelectionListener {
     /**
+     * Suggestion popup selection listeners.
+     */
+    public static class Listeners extends ListenerList<SuggestionPopupSelectionListener>
+        implements SuggestionPopupSelectionListener {
+        @Override
+        public void selectedIndexChanged(SuggestionPopup suggestionPopup, int previousSelectedIndex) {
+            forEach(listener -> listener.selectedIndexChanged(suggestionPopup, previousSelectedIndex));
+        }
+
+        @Override
+        public void selectedSuggestionChanged(SuggestionPopup suggestionPopup,
+            Object previousSelectedSuggestion) {
+            forEach(listener -> listener.selectedSuggestionChanged(suggestionPopup, previousSelectedSuggestion));
+        }
+    }
+
+    /**
      * Suggestion popup selection listener adapter.
+     * @deprecated Since 2.1 and Java 8 the interface itself has default implementations.
      */
+    @Deprecated
     public static class Adapter implements SuggestionPopupSelectionListener {
         @Override
         public void selectedIndexChanged(SuggestionPopup suggestionPopup, int previousSelectedIndex) {
@@ -42,7 +63,8 @@ public interface SuggestionPopupSelectio
      * @param suggestionPopup The source of this event.
      * @param previousSelectedIndex What the selected index used to be.
      */
-    public void selectedIndexChanged(SuggestionPopup suggestionPopup, int previousSelectedIndex);
+    default public void selectedIndexChanged(SuggestionPopup suggestionPopup, int previousSelectedIndex) {
+    }
 
     /**
      * Called when a suggestion popup's selected suggestion has changed.
@@ -51,6 +73,7 @@ public interface SuggestionPopupSelectio
      * @param previousSelectedSuggestion The item that was previously selected,
      * or <tt>null</tt> if the previous selection cannot be determined.
      */
-    public void selectedSuggestionChanged(SuggestionPopup suggestionPopup,
-        Object previousSelectedSuggestion);
+    default void selectedSuggestionChanged(SuggestionPopup suggestionPopup,
+        Object previousSelectedSuggestion) {
+    }
 }

Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/SuggestionPopupStateListener.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/SuggestionPopupStateListener.java?rev=1822722&r1=1822721&r2=1822722&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/SuggestionPopupStateListener.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/SuggestionPopupStateListener.java Wed Jan 31 01:35:38 2018
@@ -16,15 +16,44 @@
  */
 package org.apache.pivot.wtk;
 
+import org.apache.pivot.util.ListenerList;
 import org.apache.pivot.util.Vote;
+import org.apache.pivot.util.VoteResult;
 
 /**
  * Suggestion popup state listener interface.
  */
 public interface SuggestionPopupStateListener extends SuggestionPopupCloseListener {
     /**
+     * Suggestion popup state listeners.
+     */
+    public static class Listeners extends ListenerList<SuggestionPopupStateListener>
+        implements SuggestionPopupStateListener {
+        @Override
+        public Vote previewSuggestionPopupClose(SuggestionPopup suggestionPopup, boolean result) {
+            VoteResult vote = new VoteResult();
+
+            forEach(listener -> vote.tally(listener.previewSuggestionPopupClose(suggestionPopup, result)));
+
+            return vote.get();
+        }
+
+        @Override
+        public void suggestionPopupCloseVetoed(SuggestionPopup suggestionPopup, Vote reason) {
+            forEach(listener -> listener.suggestionPopupCloseVetoed(suggestionPopup, reason));
+        }
+
+        @Override
+        public void suggestionPopupClosed(SuggestionPopup suggestionPopup) {
+            forEach(listener -> listener.suggestionPopupClosed(suggestionPopup));
+        }
+    }
+
+    /**
      * Suggestion popup state listener adapter.
+     * @deprecated Since 2.1 and Java 8 the interface itself has default implementations.
      */
+    @Deprecated
     public static class Adapter implements SuggestionPopupStateListener {
         @Override
         public Vote previewSuggestionPopupClose(SuggestionPopup suggestionPopup, boolean result) {
@@ -49,7 +78,9 @@ public interface SuggestionPopupStateLis
      * @param result What the result would be.
      * @return What this listener thinks about closing the popup with this result.
      */
-    public Vote previewSuggestionPopupClose(SuggestionPopup suggestionPopup, boolean result);
+    default public Vote previewSuggestionPopupClose(SuggestionPopup suggestionPopup, boolean result) {
+        return Vote.APPROVE;
+    }
 
     /**
      * Called when a suggestion popup close event has been vetoed.
@@ -57,5 +88,6 @@ public interface SuggestionPopupStateLis
      * @param suggestionPopup The source of this event.
      * @param reason The accumulated vote that forced the veto.
      */
-    public void suggestionPopupCloseVetoed(SuggestionPopup suggestionPopup, Vote reason);
+    default public void suggestionPopupCloseVetoed(SuggestionPopup suggestionPopup, Vote reason) {
+    }
 }

Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/TablePane.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/TablePane.java?rev=1822722&r1=1822721&r2=1822722&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/TablePane.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/TablePane.java Wed Jan 31 01:35:38 2018
@@ -642,88 +642,14 @@ public class TablePane extends Container
         ROW_SPAN, COLUMN_SPAN;
     }
 
-    private static class TablePaneListenerList extends ListenerList<TablePaneListener> implements
-        TablePaneListener {
-        @Override
-        public void rowInserted(TablePane tablePane, int index) {
-            forEach(listener -> listener.rowInserted(tablePane, index));
-        }
-
-        @Override
-        public void rowsRemoved(TablePane tablePane, int index, Sequence<TablePane.Row> rows) {
-            forEach(listener -> listener.rowsRemoved(tablePane, index, rows));
-        }
-
-        @Override
-        public void rowHeightChanged(TablePane.Row row, int previousHeight, boolean previousRelative) {
-            forEach(listener -> listener.rowHeightChanged(row, previousHeight, previousRelative));
-        }
-
-        @Override
-        public void rowHighlightedChanged(TablePane.Row row) {
-            forEach(listener -> listener.rowHighlightedChanged(row));
-        }
-
-        @Override
-        public void columnInserted(TablePane tablePane, int index) {
-            forEach(listener -> listener.columnInserted(tablePane, index));
-        }
-
-        @Override
-        public void columnsRemoved(TablePane tablePane, int index,
-            Sequence<TablePane.Column> columns) {
-            forEach(listener -> listener.columnsRemoved(tablePane, index, columns));
-        }
-
-        @Override
-        public void columnWidthChanged(TablePane.Column column, int previousWidth,
-            boolean previousRelative) {
-            forEach(listener -> listener.columnWidthChanged(column, previousWidth, previousRelative));
-        }
-
-        @Override
-        public void columnHighlightedChanged(TablePane.Column column) {
-            forEach(listener -> listener.columnHighlightedChanged(column));
-        }
-
-        @Override
-        public void cellInserted(TablePane.Row row, int column) {
-            forEach(listener -> listener.cellInserted(row, column));
-        }
-
-        @Override
-        public void cellsRemoved(TablePane.Row row, int column, Sequence<Component> removed) {
-            forEach(listener -> listener.cellsRemoved(row, column, removed));
-        }
-
-        @Override
-        public void cellUpdated(TablePane.Row row, int column, Component previousComponent) {
-            forEach(listener -> listener.cellUpdated(row, column, previousComponent));
-        }
-    }
-
-    private static class TablePaneAttributeListenerList extends
-        ListenerList<TablePaneAttributeListener> implements TablePaneAttributeListener {
-        @Override
-        public void rowSpanChanged(TablePane tablePane, Component component, int previousRowSpan) {
-            forEach(listener -> listener.rowSpanChanged(tablePane, component, previousRowSpan));
-        }
-
-        @Override
-        public void columnSpanChanged(TablePane tablePane, Component component,
-            int previousColumnSpan) {
-            forEach(listener -> listener.columnSpanChanged(tablePane, component, previousColumnSpan));
-        }
-    }
-
     private ArrayList<Row> rows = null;
     private RowSequence rowSequence = new RowSequence();
 
     private ArrayList<Column> columns = null;
     private ColumnSequence columnSequence = new ColumnSequence();
 
-    private TablePaneListenerList tablePaneListeners = new TablePaneListenerList();
-    private TablePaneAttributeListenerList tablePaneAttributeListeners = new TablePaneAttributeListenerList();
+    private TablePaneListener.Listeners tablePaneListeners = new TablePaneListener.Listeners();
+    private TablePaneAttributeListener.Listeners tablePaneAttributeListeners = new TablePaneAttributeListener.Listeners();
 
     public static final String RELATIVE_SIZE_INDICATOR = "*";
 

Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/TablePaneAttributeListener.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/TablePaneAttributeListener.java?rev=1822722&r1=1822721&r2=1822722&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/TablePaneAttributeListener.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/TablePaneAttributeListener.java Wed Jan 31 01:35:38 2018
@@ -16,13 +16,33 @@
  */
 package org.apache.pivot.wtk;
 
+import org.apache.pivot.util.ListenerList;
+
 /**
  * Table pane attribute listener interface.
  */
 public interface TablePaneAttributeListener {
     /**
+     * Table pane attribute listeners.
+     */
+    public static class Listeners extends ListenerList<TablePaneAttributeListener> implements TablePaneAttributeListener {
+        @Override
+        public void rowSpanChanged(TablePane tablePane, Component component, int previousRowSpan) {
+            forEach(listener -> listener.rowSpanChanged(tablePane, component, previousRowSpan));
+        }
+
+        @Override
+        public void columnSpanChanged(TablePane tablePane, Component component,
+            int previousColumnSpan) {
+            forEach(listener -> listener.columnSpanChanged(tablePane, component, previousColumnSpan));
+        }
+    }
+
+    /**
      * Table pane attribute listener adapter.
+     * @deprecated Since 2.1 and Java 8 the interface itself has default implementations.
      */
+    @Deprecated
     public static class Adapter implements TablePaneAttributeListener {
         @Override
         public void rowSpanChanged(TablePane tablePane, Component component, int previousRowSpan) {
@@ -43,7 +63,8 @@ public interface TablePaneAttributeListe
      * @param component The component that changed.
      * @param previousRowSpan What the row span value used to be.
      */
-    public void rowSpanChanged(TablePane tablePane, Component component, int previousRowSpan);
+    default public void rowSpanChanged(TablePane tablePane, Component component, int previousRowSpan) {
+    }
 
     /**
      * Called when a component's column span attribute has changed.
@@ -52,5 +73,6 @@ public interface TablePaneAttributeListe
      * @param component THe component that changed.
      * @param previousColumnSpan What the column span for this component used to be.
      */
-    public void columnSpanChanged(TablePane tablePane, Component component, int previousColumnSpan);
+    default public void columnSpanChanged(TablePane tablePane, Component component, int previousColumnSpan) {
+    }
 }

Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/TablePaneListener.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/TablePaneListener.java?rev=1822722&r1=1822721&r2=1822722&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/TablePaneListener.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/TablePaneListener.java Wed Jan 31 01:35:38 2018
@@ -17,14 +17,79 @@
 package org.apache.pivot.wtk;
 
 import org.apache.pivot.collections.Sequence;
+import org.apache.pivot.util.ListenerList;
 
 /**
  * Table pane listener interface.
  */
 public interface TablePaneListener {
     /**
+     * Table pane listeners.
+     */
+    public static class Listeners extends ListenerList<TablePaneListener> implements TablePaneListener {
+        @Override
+        public void rowInserted(TablePane tablePane, int index) {
+            forEach(listener -> listener.rowInserted(tablePane, index));
+        }
+
+        @Override
+        public void rowsRemoved(TablePane tablePane, int index, Sequence<TablePane.Row> rows) {
+            forEach(listener -> listener.rowsRemoved(tablePane, index, rows));
+        }
+
+        @Override
+        public void rowHeightChanged(TablePane.Row row, int previousHeight, boolean previousRelative) {
+            forEach(listener -> listener.rowHeightChanged(row, previousHeight, previousRelative));
+        }
+
+        @Override
+        public void rowHighlightedChanged(TablePane.Row row) {
+            forEach(listener -> listener.rowHighlightedChanged(row));
+        }
+
+        @Override
+        public void columnInserted(TablePane tablePane, int index) {
+            forEach(listener -> listener.columnInserted(tablePane, index));
+        }
+
+        @Override
+        public void columnsRemoved(TablePane tablePane, int index,
+            Sequence<TablePane.Column> columns) {
+            forEach(listener -> listener.columnsRemoved(tablePane, index, columns));
+        }
+
+        @Override
+        public void columnWidthChanged(TablePane.Column column, int previousWidth,
+            boolean previousRelative) {
+            forEach(listener -> listener.columnWidthChanged(column, previousWidth, previousRelative));
+        }
+
+        @Override
+        public void columnHighlightedChanged(TablePane.Column column) {
+            forEach(listener -> listener.columnHighlightedChanged(column));
+        }
+
+        @Override
+        public void cellInserted(TablePane.Row row, int column) {
+            forEach(listener -> listener.cellInserted(row, column));
+        }
+
+        @Override
+        public void cellsRemoved(TablePane.Row row, int column, Sequence<Component> removed) {
+            forEach(listener -> listener.cellsRemoved(row, column, removed));
+        }
+
+        @Override
+        public void cellUpdated(TablePane.Row row, int column, Component previousComponent) {
+            forEach(listener -> listener.cellUpdated(row, column, previousComponent));
+        }
+    }
+
+    /**
      * Table pane listener adapter.
+     * @deprecated Since 2.1 and Java 8 the interface itself has default implementations.
      */
+    @Deprecated
     public static class Adapter implements TablePaneListener {
         @Override
         public void rowInserted(TablePane tablePane, int index) {
@@ -90,7 +155,8 @@ public interface TablePaneListener {
      * @param tablePane The source of this event.
      * @param index The index of the inserted row.
      */
-    public void rowInserted(TablePane tablePane, int index);
+    default public void rowInserted(TablePane tablePane, int index) {
+    }
 
     /**
      * Called when rows have been removed from a table pane.
@@ -99,7 +165,8 @@ public interface TablePaneListener {
      * @param index The starting index of the rows that were removed.
      * @param rows The actual sequence of rows that were removed.
      */
-    public void rowsRemoved(TablePane tablePane, int index, Sequence<TablePane.Row> rows);
+    default public void rowsRemoved(TablePane tablePane, int index, Sequence<TablePane.Row> rows) {
+    }
 
     /**
      * Called when a row's height has changed.
@@ -108,14 +175,16 @@ public interface TablePaneListener {
      * @param previousHeight The previous numeric height value.
      * @param previousRelative Whether the previous row height was relative or not.
      */
-    public void rowHeightChanged(TablePane.Row row, int previousHeight, boolean previousRelative);
+    default public void rowHeightChanged(TablePane.Row row, int previousHeight, boolean previousRelative) {
+    }
 
     /**
      * Called when a row's highlighted state has changed.
      *
      * @param row The source of this event.
      */
-    public void rowHighlightedChanged(TablePane.Row row);
+    default public void rowHighlightedChanged(TablePane.Row row) {
+    }
 
     /**
      * Called when a column has been inserted into a table pane.
@@ -123,7 +192,8 @@ public interface TablePaneListener {
      * @param tablePane The table pane that changed.
      * @param index The location where the column was inserted.
      */
-    public void columnInserted(TablePane tablePane, int index);
+    default public void columnInserted(TablePane tablePane, int index) {
+    }
 
     /**
      * Called when columns have been removed from a table pane.
@@ -132,7 +202,8 @@ public interface TablePaneListener {
      * @param index The starting index of the removed columns.
      * @param columns The actual sequence of the columns that were removed.
      */
-    public void columnsRemoved(TablePane tablePane, int index, Sequence<TablePane.Column> columns);
+    default public void columnsRemoved(TablePane tablePane, int index, Sequence<TablePane.Column> columns) {
+    }
 
     /**
      * Called when a column's width has changed.
@@ -141,15 +212,17 @@ public interface TablePaneListener {
      * @param previousWidth The previous numeric value of the width.
      * @param previousRelative Whether the previous width was relative or not.
      */
-    public void columnWidthChanged(TablePane.Column column, int previousWidth,
-        boolean previousRelative);
+    default public void columnWidthChanged(TablePane.Column column, int previousWidth,
+        boolean previousRelative) {
+    }
 
     /**
      * Called when a column's highlighted state has changed.
      *
      * @param column The column that changed.
      */
-    public void columnHighlightedChanged(TablePane.Column column);
+    default public void columnHighlightedChanged(TablePane.Column column) {
+    }
 
     /**
      * Called when a cell has been inserted into a table pane.
@@ -157,7 +230,8 @@ public interface TablePaneListener {
      * @param row The table pane row that has changed.
      * @param column The index of the new column.
      */
-    public void cellInserted(TablePane.Row row, int column);
+    default public void cellInserted(TablePane.Row row, int column) {
+    }
 
     /**
      * Called when cells have been removed from a table pane.
@@ -166,7 +240,8 @@ public interface TablePaneListener {
      * @param column The starting index of the column(s) that were removed.
      * @param removed The actual sequence of removed columns.
      */
-    public void cellsRemoved(TablePane.Row row, int column, Sequence<Component> removed);
+    default public void cellsRemoved(TablePane.Row row, int column, Sequence<Component> removed) {
+    }
 
     /**
      * Called when a cell has been updated in a table pane.
@@ -175,5 +250,6 @@ public interface TablePaneListener {
      * @param column Index of the column that was updated.
      * @param previousComponent The previous cell contents.
      */
-    public void cellUpdated(TablePane.Row row, int column, Component previousComponent);
+    default public void cellUpdated(TablePane.Row row, int column, Component previousComponent) {
+    }
 }

Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/VFSBrowser.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/VFSBrowser.java?rev=1822722&r1=1822721&r2=1822722&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/VFSBrowser.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/VFSBrowser.java Wed Jan 31 01:35:38 2018
@@ -49,67 +49,6 @@ public class VFSBrowser extends Containe
 
     private static final URI USER_HOME = new File(System.getProperty("user.home")).toURI();
 
-    private static class FileBrowserListenerList extends ListenerList<VFSBrowserListener>
-        implements VFSBrowserListener {
-        @Override
-        public void managerChanged(VFSBrowser fileBrowser, FileSystemManager previousManager) {
-            for (VFSBrowserListener listener : this) {
-                listener.managerChanged(fileBrowser, previousManager);
-            }
-        }
-
-        @Override
-        public void rootDirectoryChanged(VFSBrowser fileBrowser, FileObject previousRootDirectory) {
-            for (VFSBrowserListener listener : this) {
-                listener.rootDirectoryChanged(fileBrowser, previousRootDirectory);
-            }
-        }
-
-        @Override
-        public void homeDirectoryChanged(VFSBrowser fileBrowser, FileObject previousHomeDirectory) {
-            for (VFSBrowserListener listener : this) {
-                listener.homeDirectoryChanged(fileBrowser, previousHomeDirectory);
-            }
-        }
-
-        @Override
-        public void selectedFileAdded(VFSBrowser fileBrowser, FileObject file) {
-            for (VFSBrowserListener listener : this) {
-                listener.selectedFileAdded(fileBrowser, file);
-            }
-        }
-
-        @Override
-        public void selectedFileRemoved(VFSBrowser fileBrowser, FileObject file) {
-            for (VFSBrowserListener listener : this) {
-                listener.selectedFileRemoved(fileBrowser, file);
-            }
-        }
-
-        @Override
-        public void selectedFilesChanged(VFSBrowser fileBrowser,
-            Sequence<FileObject> previousSelectedFiles) {
-            for (VFSBrowserListener listener : this) {
-                listener.selectedFilesChanged(fileBrowser, previousSelectedFiles);
-            }
-        }
-
-        @Override
-        public void multiSelectChanged(VFSBrowser fileBrowser) {
-            for (VFSBrowserListener listener : this) {
-                listener.multiSelectChanged(fileBrowser);
-            }
-        }
-
-        @Override
-        public void disabledFileFilterChanged(VFSBrowser fileBrowser,
-            Filter<FileObject> previousDisabledFileFilter) {
-            for (VFSBrowserListener listener : this) {
-                listener.disabledFileFilterChanged(fileBrowser, previousDisabledFileFilter);
-            }
-        }
-    }
-
     private FileSystemManager manager;
     private FileName baseFileName;
     private FileObject rootDirectory;
@@ -118,7 +57,7 @@ public class VFSBrowser extends Containe
     private boolean multiSelect = false;
     private Filter<FileObject> disabledFileFilter = null;
 
-    private FileBrowserListenerList fileBrowserListeners = new FileBrowserListenerList();
+    private VFSBrowserListener.Listeners fileBrowserListeners = new VFSBrowserListener.Listeners();
 
     /**
      * Creates a new VFSBrowser <p> Note that this version sets, by default,

Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/VFSBrowserListener.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/VFSBrowserListener.java?rev=1822722&r1=1822721&r2=1822722&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/VFSBrowserListener.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/VFSBrowserListener.java Wed Jan 31 01:35:38 2018
@@ -20,14 +20,65 @@ import org.apache.commons.vfs2.FileObjec
 import org.apache.commons.vfs2.FileSystemManager;
 import org.apache.pivot.collections.Sequence;
 import org.apache.pivot.util.Filter;
+import org.apache.pivot.util.ListenerList;
 
 /**
  * Commons VFS browser listener interface.
  */
 public interface VFSBrowserListener {
     /**
+     * VFS Browser listeners.
+     */
+    public static class Listeners extends ListenerList<VFSBrowserListener>
+        implements VFSBrowserListener {
+        @Override
+        public void managerChanged(VFSBrowser fileBrowser, FileSystemManager previousManager) {
+            forEach(listener -> listener.managerChanged(fileBrowser, previousManager));
+        }
+
+        @Override
+        public void rootDirectoryChanged(VFSBrowser fileBrowser, FileObject previousRootDirectory) {
+            forEach(listener -> listener.rootDirectoryChanged(fileBrowser, previousRootDirectory));
+        }
+
+        @Override
+        public void homeDirectoryChanged(VFSBrowser fileBrowser, FileObject previousHomeDirectory) {
+            forEach(listener -> listener.homeDirectoryChanged(fileBrowser, previousHomeDirectory));
+        }
+
+        @Override
+        public void selectedFileAdded(VFSBrowser fileBrowser, FileObject file) {
+            forEach(listener -> listener.selectedFileAdded(fileBrowser, file));
+        }
+
+        @Override
+        public void selectedFileRemoved(VFSBrowser fileBrowser, FileObject file) {
+            forEach(listener -> listener.selectedFileRemoved(fileBrowser, file));
+        }
+
+        @Override
+        public void selectedFilesChanged(VFSBrowser fileBrowser,
+            Sequence<FileObject> previousSelectedFiles) {
+            forEach(listener -> listener.selectedFilesChanged(fileBrowser, previousSelectedFiles));
+        }
+
+        @Override
+        public void multiSelectChanged(VFSBrowser fileBrowser) {
+            forEach(listener -> listener.multiSelectChanged(fileBrowser));
+        }
+
+        @Override
+        public void disabledFileFilterChanged(VFSBrowser fileBrowser,
+            Filter<FileObject> previousDisabledFileFilter) {
+            forEach(listener -> listener.disabledFileFilterChanged(fileBrowser, previousDisabledFileFilter));
+        }
+    }
+
+    /**
      * Commons VFS browser listener adapter.
+     * @deprecated Since 2.1 and Java 8 the interface itself has default implementations.
      */
+    @Deprecated
     public static class Adapter implements VFSBrowserListener {
         @Override
         public void managerChanged(VFSBrowser fileBrowser, FileSystemManager previousManager) {
@@ -79,7 +130,8 @@ public interface VFSBrowserListener {
      * @param fileBrowser     The browser that has changed.
      * @param previousManager The previous file manager for this browser.
      */
-    public void managerChanged(VFSBrowser fileBrowser, FileSystemManager previousManager);
+    default public void managerChanged(VFSBrowser fileBrowser, FileSystemManager previousManager) {
+    }
 
     /**
      * Called when a file browser's root directory has changed.
@@ -87,7 +139,8 @@ public interface VFSBrowserListener {
      * @param fileBrowser           The browser that has changed.
      * @param previousRootDirectory The previous root directory that we were browsing.
      */
-    public void rootDirectoryChanged(VFSBrowser fileBrowser, FileObject previousRootDirectory);
+    default public void rootDirectoryChanged(VFSBrowser fileBrowser, FileObject previousRootDirectory) {
+    }
 
     /**
      * Called when a file browser's home directory has changed.
@@ -95,7 +148,8 @@ public interface VFSBrowserListener {
      * @param fileBrowser           The browser that has changed.
      * @param previousHomeDirectory The previous home directory.
      */
-    public void homeDirectoryChanged(VFSBrowser fileBrowser, FileObject previousHomeDirectory);
+    default public void homeDirectoryChanged(VFSBrowser fileBrowser, FileObject previousHomeDirectory) {
+    }
 
     /**
      * Called when a file has been added to a file browser's selection.
@@ -103,7 +157,8 @@ public interface VFSBrowserListener {
      * @param fileBrowser The source of this event.
      * @param file        The file newly added to the selection.
      */
-    public void selectedFileAdded(VFSBrowser fileBrowser, FileObject file);
+    default public void selectedFileAdded(VFSBrowser fileBrowser, FileObject file) {
+    }
 
     /**
      * Called when a file has been removed from a file browser's selection.
@@ -111,7 +166,8 @@ public interface VFSBrowserListener {
      * @param fileBrowser The source of this event.
      * @param file        The file just removed from the selection.
      */
-    public void selectedFileRemoved(VFSBrowser fileBrowser, FileObject file);
+    default public void selectedFileRemoved(VFSBrowser fileBrowser, FileObject file) {
+    }
 
     /**
      * Called when a file browser's selection state has been reset.
@@ -119,15 +175,17 @@ public interface VFSBrowserListener {
      * @param fileBrowser           The source of this event.
      * @param previousSelectedFiles The sequence of files that were previously selected.
      */
-    public void selectedFilesChanged(VFSBrowser fileBrowser,
-        Sequence<FileObject> previousSelectedFiles);
+    default public void selectedFilesChanged(VFSBrowser fileBrowser,
+        Sequence<FileObject> previousSelectedFiles) {
+    }
 
     /**
      * Called when a file browser's multi-select flag has changed.
      *
      * @param fileBrowser The browser that has changed selection modes.
      */
-    public void multiSelectChanged(VFSBrowser fileBrowser);
+    default public void multiSelectChanged(VFSBrowser fileBrowser) {
+    }
 
     /**
      * Called when a file browser's file filter has changed.
@@ -135,6 +193,7 @@ public interface VFSBrowserListener {
      * @param fileBrowser                The source of this event.
      * @param previousDisabledFileFilter The previous filter for disabled files (if any).
      */
-    public void disabledFileFilterChanged(VFSBrowser fileBrowser,
-        Filter<FileObject> previousDisabledFileFilter);
+    default public void disabledFileFilterChanged(VFSBrowser fileBrowser,
+        Filter<FileObject> previousDisabledFileFilter) {
+    }
 }

Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/VFSBrowserSheet.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/VFSBrowserSheet.java?rev=1822722&r1=1822721&r2=1822722&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/VFSBrowserSheet.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/VFSBrowserSheet.java Wed Jan 31 01:35:38 2018
@@ -48,56 +48,6 @@ public class VFSBrowserSheet extends She
 
     private static final String USER_HOME = System.getProperty("user.home");
 
-    private static class FileBrowserSheetListenerList extends
-        ListenerList<VFSBrowserSheetListener> implements VFSBrowserSheetListener {
-        @Override
-        public void managerChanged(VFSBrowserSheet fileBrowserSheet,
-            FileSystemManager previousManager) {
-            for (VFSBrowserSheetListener listener : this) {
-                listener.managerChanged(fileBrowserSheet, previousManager);
-            }
-        }
-
-        @Override
-        public void modeChanged(VFSBrowserSheet fileBrowserSheet, VFSBrowserSheet.Mode previousMode) {
-            for (VFSBrowserSheetListener listener : this) {
-                listener.modeChanged(fileBrowserSheet, previousMode);
-            }
-        }
-
-        @Override
-        public void rootDirectoryChanged(VFSBrowserSheet fileBrowserSheet,
-            FileObject previousRootDirectory) {
-            for (VFSBrowserSheetListener listener : this) {
-                listener.rootDirectoryChanged(fileBrowserSheet, previousRootDirectory);
-            }
-        }
-
-        @Override
-        public void homeDirectoryChanged(VFSBrowserSheet fileBrowserSheet,
-            FileObject previousHomeDirectory) {
-            for (VFSBrowserSheetListener listener : this) {
-                listener.homeDirectoryChanged(fileBrowserSheet, previousHomeDirectory);
-            }
-        }
-
-        @Override
-        public void selectedFilesChanged(VFSBrowserSheet fileBrowserSheet,
-            Sequence<FileObject> previousSelectedFiles) {
-            for (VFSBrowserSheetListener listener : this) {
-                listener.selectedFilesChanged(fileBrowserSheet, previousSelectedFiles);
-            }
-        }
-
-        @Override
-        public void disabledFileFilterChanged(VFSBrowserSheet fileBrowserSheet,
-            Filter<FileObject> previousDisabledFileFilter) {
-            for (VFSBrowserSheetListener listener : this) {
-                listener.disabledFileFilterChanged(fileBrowserSheet, previousDisabledFileFilter);
-            }
-        }
-    }
-
     private Mode mode;
     private FileSystemManager manager;
     private FileName baseFileName;
@@ -106,7 +56,7 @@ public class VFSBrowserSheet extends She
     private FileObjectList selectedFiles = new FileObjectList();
     private Filter<FileObject> disabledFileFilter = null;
 
-    private FileBrowserSheetListenerList fileBrowserSheetListeners = new FileBrowserSheetListenerList();
+    private VFSBrowserSheetListener.Listeners fileBrowserSheetListeners = new VFSBrowserSheetListener.Listeners();
 
     /**
      * Creates a new VFSBrowserSheet <p> Note that this version set by default