Author: rwhitcomb
Date: Wed May 17 17:29:09 2017
New Revision: 1795435
URL: http://svn.apache.org/viewvc?rev=1795435&view=rev
Log:
PIVOT-997: Deprecate and remove use of WTKListenerList since it is a now
unnecessary and empty class.
This is first of a set of changes to the internal WTK code:
* Deprecate the WTKListenerList class.
* Change all internal uses of it to just use ListenerList instead.
Added:
pivot/trunk/wtk/src/org/apache/pivot/wtk/TextInputMethodListener.java
Modified:
pivot/trunk/tutorials/src/org/apache/pivot/tutorials/bxmlexplorer/FakeWindow.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/Accordion.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/TabPane.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/TablePane.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/TableView.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/TableViewHeader.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/TextArea.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/TextInput.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/TextPane.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/TreeView.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/VFSBrowser.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/VFSBrowserSheet.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/Viewport.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/WTKListenerList.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/Window.java
Modified:
pivot/trunk/tutorials/src/org/apache/pivot/tutorials/bxmlexplorer/FakeWindow.java
URL:
http://svn.apache.org/viewvc/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/bxmlexplorer/FakeWindow.java?rev=1795435&r1=1795434&r2=1795435&view=diff
==============================================================================
---
pivot/trunk/tutorials/src/org/apache/pivot/tutorials/bxmlexplorer/FakeWindow.java
(original)
+++
pivot/trunk/tutorials/src/org/apache/pivot/tutorials/bxmlexplorer/FakeWindow.java
Wed May 17 17:29:09 2017
@@ -23,7 +23,6 @@ import org.apache.pivot.collections.Sequ
import org.apache.pivot.util.ListenerList;
import org.apache.pivot.wtk.Component;
import org.apache.pivot.wtk.Container;
-import org.apache.pivot.wtk.WTKListenerList;
import org.apache.pivot.wtk.Window;
import org.apache.pivot.wtk.Window.IconImageSequence;
import org.apache.pivot.wtk.WindowListener;
@@ -36,7 +35,7 @@ import org.apache.pivot.wtk.media.Image;
@DefaultProperty("content")
public class FakeWindow extends Container {
- private static class FakeWindowListenerList extends
WTKListenerList<FakeWindowListener>
+ private static class FakeWindowListenerList extends
ListenerList<FakeWindowListener>
implements FakeWindowListener {
@Override
public void titleChanged(FakeWindow window, String previousTitle) {
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/Accordion.java
URL:
http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/Accordion.java?rev=1795435&r1=1795434&r2=1795435&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/Accordion.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/Accordion.java Wed May 17 17:29:09
2017
@@ -146,7 +146,7 @@ public class Accordion extends Container
HEADER_DATA, TOOLTIP_TEXT;
}
- private static class AccordionListenerList extends
WTKListenerList<AccordionListener> implements
+ private static class AccordionListenerList extends
ListenerList<AccordionListener> implements
AccordionListener {
@Override
public void panelInserted(Accordion accordion, int index) {
@@ -172,7 +172,7 @@ public class Accordion extends Container
}
private static class AccordionSelectionListenerList extends
- WTKListenerList<AccordionSelectionListener> implements
AccordionSelectionListener {
+ ListenerList<AccordionSelectionListener> implements
AccordionSelectionListener {
@Override
public Vote previewSelectedIndexChange(Accordion accordion, int
selectedIndex) {
Vote vote = Vote.APPROVE;
@@ -200,7 +200,7 @@ public class Accordion extends Container
}
private static class AccordionAttributeListenerList extends
- WTKListenerList<AccordionAttributeListener> implements
AccordionAttributeListener {
+ ListenerList<AccordionAttributeListener> implements
AccordionAttributeListener {
@Override
public void headerDataChanged(Accordion accordion, Component component,
Object previousHeaderData) {
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/TabPane.java
URL:
http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/TabPane.java?rev=1795435&r1=1795434&r2=1795435&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/TabPane.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/TabPane.java Wed May 17 17:29:09
2017
@@ -164,7 +164,7 @@ public class TabPane extends Container {
TAB_DATA, TOOLTIP_TEXT;
}
- private static class TabPaneListenerList extends
WTKListenerList<TabPaneListener> implements
+ private static class TabPaneListenerList extends
ListenerList<TabPaneListener> implements
TabPaneListener {
@Override
public void tabInserted(TabPane tabPane, int index) {
@@ -229,7 +229,7 @@ public class TabPane extends Container {
}
private static class TabPaneSelectionListenerList extends
- WTKListenerList<TabPaneSelectionListener> implements
TabPaneSelectionListener {
+ ListenerList<TabPaneSelectionListener> implements
TabPaneSelectionListener {
@Override
public Vote previewSelectedIndexChange(TabPane tabPane, int
selectedIndex) {
Vote vote = Vote.APPROVE;
@@ -257,7 +257,7 @@ public class TabPane extends Container {
}
private static class TabPaneAttributeListenerList extends
- WTKListenerList<TabPaneAttributeListener> implements
TabPaneAttributeListener {
+ ListenerList<TabPaneAttributeListener> implements
TabPaneAttributeListener {
@Override
public void tabDataChanged(TabPane tabPane, Component component,
Object previousTabData) {
for (TabPaneAttributeListener listener : this) {
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=1795435&r1=1795434&r2=1795435&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/TablePane.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/TablePane.java Wed May 17 17:29:09
2017
@@ -649,7 +649,7 @@ public class TablePane extends Container
ROW_SPAN, COLUMN_SPAN;
}
- private static class TablePaneListenerList extends
WTKListenerList<TablePaneListener> implements
+ private static class TablePaneListenerList extends
ListenerList<TablePaneListener> implements
TablePaneListener {
@Override
public void rowInserted(TablePane tablePane, int index) {
@@ -732,7 +732,7 @@ public class TablePane extends Container
}
private static class TablePaneAttributeListenerList extends
- WTKListenerList<TablePaneAttributeListener> implements
TablePaneAttributeListener {
+ ListenerList<TablePaneAttributeListener> implements
TablePaneAttributeListener {
@Override
public void rowSpanChanged(TablePane tablePane, Component component,
int previousRowSpan) {
for (TablePaneAttributeListener listener : this) {
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/TableView.java
URL:
http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/TableView.java?rev=1795435&r1=1795434&r2=1795435&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/TableView.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/TableView.java Wed May 17 17:29:09
2017
@@ -775,7 +775,7 @@ public class TableView extends Component
}
}
- private static class TableViewListenerList extends
WTKListenerList<TableViewListener> implements
+ private static class TableViewListenerList extends
ListenerList<TableViewListener> implements
TableViewListener {
@Override
public void tableDataChanged(TableView tableView, List<?>
previousTableData) {
@@ -815,7 +815,7 @@ public class TableView extends Component
}
private static class TableViewColumnListenerList extends
- WTKListenerList<TableViewColumnListener> implements
TableViewColumnListener {
+ ListenerList<TableViewColumnListener> implements
TableViewColumnListener {
@Override
public void columnInserted(TableView tableView, int index) {
for (TableViewColumnListener listener : this) {
@@ -885,7 +885,7 @@ public class TableView extends Component
}
}
- private static class TableViewRowListenerList extends
WTKListenerList<TableViewRowListener>
+ private static class TableViewRowListenerList extends
ListenerList<TableViewRowListener>
implements TableViewRowListener {
@Override
public void rowInserted(TableView tableView, int index) {
@@ -924,7 +924,7 @@ public class TableView extends Component
}
private static class TableViewSelectionListenerList extends
- WTKListenerList<TableViewSelectionListener> implements
TableViewSelectionListener {
+ ListenerList<TableViewSelectionListener> implements
TableViewSelectionListener {
@Override
public void selectedRangeAdded(TableView tableView, int rangeStart,
int rangeEnd) {
for (TableViewSelectionListener listener : this) {
@@ -954,7 +954,7 @@ public class TableView extends Component
}
}
- private static class TableViewSortListenerList extends
WTKListenerList<TableViewSortListener>
+ private static class TableViewSortListenerList extends
ListenerList<TableViewSortListener>
implements TableViewSortListener {
@Override
public void sortAdded(TableView tableView, String columnName) {
@@ -987,7 +987,7 @@ public class TableView extends Component
}
private static class TableViewBindingListenerList extends
- WTKListenerList<TableViewBindingListener> implements
TableViewBindingListener {
+ ListenerList<TableViewBindingListener> implements
TableViewBindingListener {
@Override
public void tableDataKeyChanged(TableView tableView, String
previousTableDataKey) {
for (TableViewBindingListener listener : this) {
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/TableViewHeader.java
URL:
http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/TableViewHeader.java?rev=1795435&r1=1795434&r2=1795435&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/TableViewHeader.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/TableViewHeader.java Wed May 17
17:29:09 2017
@@ -40,7 +40,7 @@ public class TableViewHeader extends Com
}
private static class TableViewHeaderListenerList extends
- WTKListenerList<TableViewHeaderListener> implements
TableViewHeaderListener {
+ ListenerList<TableViewHeaderListener> implements
TableViewHeaderListener {
@Override
public void tableViewChanged(TableViewHeader tableViewHeader,
TableView previousTableView) {
for (TableViewHeaderListener listener : this) {
@@ -57,7 +57,7 @@ public class TableViewHeader extends Com
}
private static class TableViewHeaderPressListenerList extends
- WTKListenerList<TableViewHeaderPressListener> implements
TableViewHeaderPressListener {
+ ListenerList<TableViewHeaderPressListener> implements
TableViewHeaderPressListener {
@Override
public void headerPressed(TableViewHeader tableViewHeader, int index) {
for (TableViewHeaderPressListener listener : this) {
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/TextArea.java
URL:
http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/TextArea.java?rev=1795435&r1=1795434&r2=1795435&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/TextArea.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/TextArea.java Wed May 17 17:29:09
2017
@@ -484,7 +484,7 @@ public class TextArea extends Component
}
}
- private static class TextAreaListenerList extends
WTKListenerList<TextAreaListener> implements
+ private static class TextAreaListenerList extends
ListenerList<TextAreaListener> implements
TextAreaListener {
@Override
public void maximumLengthChanged(TextArea textArea, int
previousMaximumLength) {
@@ -502,7 +502,7 @@ public class TextArea extends Component
}
private static class TextAreaContentListenerList extends
- WTKListenerList<TextAreaContentListener> implements
TextAreaContentListener {
+ ListenerList<TextAreaContentListener> implements
TextAreaContentListener {
@Override
public void paragraphInserted(TextArea textArea, int index) {
for (TextAreaContentListener listener : this) {
@@ -527,7 +527,7 @@ public class TextArea extends Component
}
private static class TextAreaSelectionListenerList extends
- WTKListenerList<TextAreaSelectionListener> implements
TextAreaSelectionListener {
+ ListenerList<TextAreaSelectionListener> implements
TextAreaSelectionListener {
@Override
public void selectionChanged(TextArea textArea, int
previousSelectionStart,
int previousSelectionLength) {
@@ -538,7 +538,7 @@ public class TextArea extends Component
}
private static class TextAreaBindingListenerList extends
- WTKListenerList<TextAreaBindingListener> implements
TextAreaBindingListener {
+ ListenerList<TextAreaBindingListener> implements
TextAreaBindingListener {
@Override
public void textKeyChanged(TextArea textArea, String previousTextKey) {
for (TextAreaBindingListener listener : this) {
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/TextInput.java
URL:
http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/TextInput.java?rev=1795435&r1=1795434&r2=1795435&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/TextInput.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/TextInput.java Wed May 17 17:29:09
2017
@@ -106,7 +106,7 @@ public class TextInput extends Component
}
}
- private static class TextInputListenerList extends
WTKListenerList<TextInputListener> implements
+ private static class TextInputListenerList extends
ListenerList<TextInputListener> implements
TextInputListener {
@Override
public void textSizeChanged(TextInput textInput, int previousTextSize)
{
@@ -166,7 +166,7 @@ public class TextInput extends Component
}
private static class TextInputContentListenerList extends
- WTKListenerList<TextInputContentListener> implements
TextInputContentListener {
+ ListenerList<TextInputContentListener> implements
TextInputContentListener {
@Override
public Vote previewInsertText(TextInput textInput, CharSequence text,
int index) {
Vote vote = Vote.APPROVE;
@@ -226,7 +226,7 @@ public class TextInput extends Component
}
private static class TextInputSelectionListenerList extends
- WTKListenerList<TextInputSelectionListener> implements
TextInputSelectionListener {
+ ListenerList<TextInputSelectionListener> implements
TextInputSelectionListener {
@Override
public void selectionChanged(TextInput textInput, int
previousSelectionStart,
int previousSelectionLength) {
@@ -238,7 +238,7 @@ public class TextInput extends Component
}
private static class TextInputBindingListenerList extends
- WTKListenerList<TextInputBindingListener> implements
TextInputBindingListener {
+ ListenerList<TextInputBindingListener> implements
TextInputBindingListener {
@Override
public void textKeyChanged(TextInput textInput, String
previousTextKey) {
for (TextInputBindingListener listener : this) {
Added: pivot/trunk/wtk/src/org/apache/pivot/wtk/TextInputMethodListener.java
URL:
http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/TextInputMethodListener.java?rev=1795435&view=auto
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/TextInputMethodListener.java
(added)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/TextInputMethodListener.java Wed
May 17 17:29:09 2017
@@ -0,0 +1,115 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.pivot.wtk;
+
+import java.awt.Rectangle;
+import java.awt.event.InputMethodEvent;
+import java.awt.event.InputMethodListener;
+import java.awt.font.TextHitInfo;
+import java.awt.im.InputMethodRequests;
+import java.text.AttributedCharacterIterator;
+
+
+/**
+ * An interface expected to be implemented by every (text) component
+ * that can interace with the Input Method Editors for on-the-spot
+ * editing, esp. of Far Eastern languages (Chinese, Japanese, etc.).
+ * <p> This interface encapsulates both the {@link InputMethodRequests}
+ * and {@link InputMethodListener} standard interfaces to reduce the
+ * number of objects needed.
+ */
+public interface TextInputMethodListener extends InputMethodRequests,
InputMethodListener {
+
+ /**
+ * A default implementation of the {@link TextInputMethodListener}
interface that can be used
+ * to provide the minimum necessary functionality.
+ */
+ public static class Adapter implements TextInputMethodListener {
+ @Override
+ public AttributedCharacterIterator
cancelLatestCommittedText(AttributedCharacterIterator.Attribute[] attributes) {
+System.out.println("TextInputMethodListener.Adapter.cancelLastCommittedText
called");
+ return null;
+ }
+
+ @Override
+ public AttributedCharacterIterator getCommittedText(int beginIndex,
int endIndex, AttributedCharacterIterator.Attribute[] attributes) {
+System.out.println("TextInputMethodListener.Adapter.getCommittedText called");
+ return null;
+ }
+
+ @Override
+ public int getCommittedTextLength() {
+System.out.println("TextInputMethodListener.Adapter.getCommittedTextLength
called");
+ return 0;
+ }
+
+ @Override
+ public int getInsertPositionOffset() {
+System.out.println("TextInputMethodListener.Adapter.getInsertPositionOffset
called");
+ return 0;
+ }
+
+ @Override
+ public TextHitInfo getLocationOffset(int x, int y) {
+System.out.println("TextInputMethodListener.Adapter.getLocationOffset called");
+ return null;
+ }
+
+ @Override
+ public AttributedCharacterIterator
getSelectedText(AttributedCharacterIterator.Attribute[] attributes) {
+System.out.println("TextInputMethodListener.Adapter.getSelectedText called");
+ return null;
+ }
+
+ @Override
+ public Rectangle getTextLocation(TextHitInfo offset) {
+System.out.format("TextInputMethodListener.Adapter.getTextLocation called with
offset %1$s%n", offset);
+ return new Rectangle();
+ }
+
+ @Override
+ public void inputMethodTextChanged(InputMethodEvent event) {
+System.out.println("TextInputMethodListener.Adapter.inputMethodTextChanged
called");
+ // empty block
+ }
+
+ @Override
+ public void caretPositionChanged(InputMethodEvent event) {
+System.out.println("TextInputMethodListener.Adapter.caretPositionChanged
called");
+ // empty block
+ }
+ }
+
+ AttributedCharacterIterator
cancelLatestCommittedText(AttributedCharacterIterator.Attribute[] attributes);
+
+ AttributedCharacterIterator getCommittedText(int beginIndex, int endIndex,
AttributedCharacterIterator.Attribute[] attributes);
+
+ int getCommittedTextLength();
+
+ int getInsertPositionOffset();
+
+ TextHitInfo getLocationOffset(int x, int y);
+
+ AttributedCharacterIterator
getSelectedText(AttributedCharacterIterator.Attribute[] attributes);
+
+ Rectangle getTextLocation(TextHitInfo offset);
+
+ void inputMethodTextChanged(InputMethodEvent event);
+
+ void caretPositionChanged(InputMethodEvent event);
+
+}
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/TextPane.java
URL:
http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/TextPane.java?rev=1795435&r1=1795434&r2=1795435&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/TextPane.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/TextPane.java Wed May 17 17:29:09
2017
@@ -161,7 +161,7 @@ public class TextPane extends Container
}
}
- private static class TextPaneListenerList extends
WTKListenerList<TextPaneListener> implements
+ private static class TextPaneListenerList extends
ListenerList<TextPaneListener> implements
TextPaneListener {
@Override
public void documentChanged(TextPane textPane, Document previousText) {
@@ -179,7 +179,7 @@ public class TextPane extends Container
}
private static class TextPaneCharacterListenerList extends
- WTKListenerList<TextPaneCharacterListener> implements
TextPaneCharacterListener {
+ ListenerList<TextPaneCharacterListener> implements
TextPaneCharacterListener {
/**
* @param index Index into the whole document.
*/
@@ -202,7 +202,7 @@ public class TextPane extends Container
}
private static class TextPaneSelectionListenerList extends
- WTKListenerList<TextPaneSelectionListener> implements
TextPaneSelectionListener {
+ ListenerList<TextPaneSelectionListener> implements
TextPaneSelectionListener {
@Override
public void selectionChanged(TextPane textPane, int
previousSelectionStart,
int previousSelectionLength) {
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/TreeView.java
URL:
http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/TreeView.java?rev=1795435&r1=1795434&r2=1795435&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/TreeView.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/TreeView.java Wed May 17 17:29:09
2017
@@ -209,7 +209,7 @@ public class TreeView extends Component
/**
* Tree view listener list.
*/
- private static class TreeViewListenerList extends
WTKListenerList<TreeViewListener> implements
+ private static class TreeViewListenerList extends
ListenerList<TreeViewListener> implements
TreeViewListener {
@Override
@@ -274,7 +274,7 @@ public class TreeView extends Component
/**
* Tree view branch listener list.
*/
- private static class TreeViewBranchListenerList extends
WTKListenerList<TreeViewBranchListener>
+ private static class TreeViewBranchListenerList extends
ListenerList<TreeViewBranchListener>
implements TreeViewBranchListener {
@Override
public void branchExpanded(TreeView treeView, Path path) {
@@ -312,7 +312,7 @@ public class TreeView extends Component
/**
* Tree view node listener list.
*/
- private static class TreeViewNodeListenerList extends
WTKListenerList<TreeViewNodeListener>
+ private static class TreeViewNodeListenerList extends
ListenerList<TreeViewNodeListener>
implements TreeViewNodeListener {
@Override
public void nodeInserted(TreeView treeView, Path path, int index) {
@@ -354,7 +354,7 @@ public class TreeView extends Component
* Tree view node state listener list.
*/
private static class TreeViewNodeStateListenerList extends
- WTKListenerList<TreeViewNodeStateListener> implements
TreeViewNodeStateListener {
+ ListenerList<TreeViewNodeStateListener> implements
TreeViewNodeStateListener {
@Override
public void nodeCheckStateChanged(TreeView treeView, Path path,
TreeView.NodeCheckState previousCheckState) {
@@ -368,7 +368,7 @@ public class TreeView extends Component
* Tree view selection listener list.
*/
private static class TreeViewSelectionListenerList extends
- WTKListenerList<TreeViewSelectionListener> implements
TreeViewSelectionListener {
+ ListenerList<TreeViewSelectionListener> implements
TreeViewSelectionListener {
@Override
public void selectedPathAdded(TreeView treeView, Path path) {
for (TreeViewSelectionListener listener : this) {
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=1795435&r1=1795434&r2=1795435&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/VFSBrowser.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/VFSBrowser.java Wed May 17
17:29:09 2017
@@ -49,7 +49,7 @@ public class VFSBrowser extends Containe
private static final URI USER_HOME = new
File(System.getProperty("user.home")).toURI();
- private static class FileBrowserListenerList extends
WTKListenerList<VFSBrowserListener>
+ private static class FileBrowserListenerList extends
ListenerList<VFSBrowserListener>
implements VFSBrowserListener {
@Override
public void managerChanged(VFSBrowser fileBrowser, FileSystemManager
previousManager) {
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=1795435&r1=1795434&r2=1795435&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/VFSBrowserSheet.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/VFSBrowserSheet.java Wed May 17
17:29:09 2017
@@ -49,7 +49,7 @@ public class VFSBrowserSheet extends She
private static final String USER_HOME = System.getProperty("user.home");
private static class FileBrowserSheetListenerList extends
- WTKListenerList<VFSBrowserSheetListener> implements
VFSBrowserSheetListener {
+ ListenerList<VFSBrowserSheetListener> implements
VFSBrowserSheetListener {
@Override
public void managerChanged(VFSBrowserSheet fileBrowserSheet,
FileSystemManager previousManager) {
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/Viewport.java
URL:
http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/Viewport.java?rev=1795435&r1=1795434&r2=1795435&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/Viewport.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/Viewport.java Wed May 17 17:29:09
2017
@@ -42,7 +42,7 @@ public abstract class Viewport extends C
public Bounds getViewportBounds();
}
- private static class ViewportListenerList extends
WTKListenerList<ViewportListener> implements
+ private static class ViewportListenerList extends
ListenerList<ViewportListener> implements
ViewportListener {
@Override
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/WTKListenerList.java
URL:
http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/WTKListenerList.java?rev=1795435&r1=1795434&r2=1795435&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/WTKListenerList.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/WTKListenerList.java Wed May 17
17:29:09 2017
@@ -22,6 +22,7 @@ import org.apache.pivot.util.ListenerLis
* This is a customized subclass of ListenerList that adds thread-safety checks
* for the WTK components.
*/
+@Deprecated
public class WTKListenerList<T> extends ListenerList<T> {
// empty block
}
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/Window.java
URL:
http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/Window.java?rev=1795435&r1=1795434&r2=1795435&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/Window.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/Window.java Wed May 17 17:29:09
2017
@@ -281,7 +281,7 @@ public class Window extends Container {
}
}
- private static class WindowListenerList extends
WTKListenerList<WindowListener> implements
+ private static class WindowListenerList extends
ListenerList<WindowListener> implements
WindowListener {
@Override
public void titleChanged(Window window, String previousTitle) {
@@ -333,7 +333,7 @@ public class Window extends Container {
}
}
- private static class WindowStateListenerList extends
WTKListenerList<WindowStateListener>
+ private static class WindowStateListenerList extends
ListenerList<WindowStateListener>
implements WindowStateListener {
@Override
public void windowOpened(Window window) {
@@ -387,7 +387,7 @@ public class Window extends Container {
}
private static class WindowActionMappingListenerList extends
- WTKListenerList<WindowActionMappingListener> implements
WindowActionMappingListener {
+ ListenerList<WindowActionMappingListener> implements
WindowActionMappingListener {
@Override
public void actionMappingAdded(Window window) {
for (WindowActionMappingListener listener : this) {
@@ -419,7 +419,7 @@ public class Window extends Container {
}
}
- private static class WindowClassListenerList extends
WTKListenerList<WindowClassListener>
+ private static class WindowClassListenerList extends
ListenerList<WindowClassListener>
implements WindowClassListener {
@Override
public void activeWindowChanged(Window previousActiveWindow) {
