You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pivot.apache.org by sm...@apache.org on 2009/09/03 11:01:07 UTC
svn commit: r810835 - /incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/
Author: smartini
Date: Thu Sep 3 09:01:06 2009
New Revision: 810835
URL: http://svn.apache.org/viewvc?rev=810835&view=rev
Log:
add some missing override, in some cases on methods of inner classes (not shown in eclipse warnings)
Modified:
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/ImageView.java
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/Label.java
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/ListButton.java
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/ListSelection.java
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/ListSelectionSequence.java
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/ListView.java
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/ListViewItemListener.java
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/ListViewListener.java
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/ListViewSelectionListener.java
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/LocalManifest.java
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/ImageView.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/ImageView.java?rev=810835&r1=810834&r2=810835&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/ImageView.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/ImageView.java Thu Sep 3 09:01:06 2009
@@ -30,6 +30,7 @@
public class ImageView extends Component {
private static class ImageViewListenerList extends ListenerList<ImageViewListener>
implements ImageViewListener {
+ @Override
public void imageChanged(ImageView imageView, Image previousImage) {
for (ImageViewListener listener : this) {
listener.imageChanged(imageView, previousImage);
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/Label.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/Label.java?rev=810835&r1=810834&r2=810835&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/Label.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/Label.java Thu Sep 3 09:01:06 2009
@@ -26,12 +26,14 @@
public class Label extends Component {
private static class LabelListenerList extends ListenerList<LabelListener>
implements LabelListener {
+ @Override
public void textChanged(Label label, String previousText) {
for (LabelListener listener : this) {
listener.textChanged(label, previousText);
}
}
+ @Override
public void textKeyChanged(Label label, String previousTextKey) {
for (LabelListener listener : this) {
listener.textKeyChanged(label, previousTextKey);
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/ListButton.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/ListButton.java?rev=810835&r1=810834&r2=810835&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/ListButton.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/ListButton.java Thu Sep 3 09:01:06 2009
@@ -37,24 +37,28 @@
*/
private static class ListButtonListenerList extends ListenerList<ListButtonListener>
implements ListButtonListener {
+ @Override
public void listDataChanged(ListButton listButton, List<?> previousListData) {
for (ListButtonListener listener : this) {
listener.listDataChanged(listButton, previousListData);
}
}
+ @Override
public void itemRendererChanged(ListButton listButton, ListView.ItemRenderer previousItemRenderer) {
for (ListButtonListener listener : this) {
listener.itemRendererChanged(listButton, previousItemRenderer);
}
}
+ @Override
public void disabledItemFilterChanged(ListButton listButton, Filter<?> previousDisabledItemFilter) {
for (ListButtonListener listener : this) {
listener.disabledItemFilterChanged(listButton, previousDisabledItemFilter);
}
}
+ @Override
public void selectedItemKeyChanged(ListButton listButton, String previousSelectedItemKey) {
for (ListButtonListener listener : this) {
listener.selectedItemKeyChanged(listButton, previousSelectedItemKey);
@@ -67,6 +71,7 @@
*/
private static class ListButtonSelectionListenerList extends ListenerList<ListButtonSelectionListener>
implements ListButtonSelectionListener {
+ @Override
public void selectedIndexChanged(ListButton listButton, int previousSelectedIndex) {
for (ListButtonSelectionListener listener : this) {
listener.selectedIndexChanged(listButton, previousSelectedIndex);
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/ListSelection.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/ListSelection.java?rev=810835&r1=810834&r2=810835&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/ListSelection.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/ListSelection.java Thu Sep 3 09:01:06 2009
@@ -31,6 +31,7 @@
* Comparator that determines the index of the first intersecting range.
*/
public static final Comparator<Span> START_COMPARATOR = new Comparator<Span>() {
+ @Override
public int compare(Span range1, Span range2) {
return (range1.end - range2.start);
}
@@ -40,6 +41,7 @@
* Comparator that determines the index of the last intersecting range.
*/
public static final Comparator<Span> END_COMPARATOR = new Comparator<Span>() {
+ @Override
public int compare(Span range1, Span range2) {
return (range1.start - range2.end);
}
@@ -49,6 +51,7 @@
* Comparator that determines if two ranges intersect.
*/
public static final Comparator<Span> INTERSECTION_COMPARATOR = new Comparator<Span>() {
+ @Override
public int compare(Span range1, Span range2) {
return (range1.start > range2.end) ? 1 : (range2.start > range1.end) ? -1 : 0;
}
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/ListSelectionSequence.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/ListSelectionSequence.java?rev=810835&r1=810834&r2=810835&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/ListSelectionSequence.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/ListSelectionSequence.java Thu Sep 3 09:01:06 2009
@@ -28,34 +28,42 @@
this.listSelection = listSelection;
}
+ @Override
public int add(Span span) {
throw new UnsupportedOperationException();
}
+ @Override
public void insert(Span span, int index) {
throw new UnsupportedOperationException();
}
+ @Override
public Span update(int index, Span span) {
throw new UnsupportedOperationException();
}
+ @Override
public int remove(Span span) {
throw new UnsupportedOperationException();
}
+ @Override
public Sequence<Span> remove(int index, int count) {
throw new UnsupportedOperationException();
}
+ @Override
public Span get(int index) {
return listSelection.get(index);
}
+ @Override
public int indexOf(Span span) {
return listSelection.indexOf(span);
}
+ @Override
public int getLength() {
return listSelection.getLength();
}
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/ListView.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/ListView.java?rev=810835&r1=810834&r2=810835&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/ListView.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/ListView.java Thu Sep 3 09:01:06 2009
@@ -119,12 +119,14 @@
*/
private static class ListViewListenerList extends ListenerList<ListViewListener> implements
ListViewListener {
+ @Override
public void listDataChanged(ListView listView, List<?> previousListData) {
for (ListViewListener listener : this) {
listener.listDataChanged(listView, previousListData);
}
}
+ @Override
public void itemRendererChanged(ListView listView,
ListView.ItemRenderer previousItemRenderer) {
for (ListViewListener listener : this) {
@@ -132,6 +134,7 @@
}
}
+ @Override
public void itemEditorChanged(ListView listView,
ListView.ItemEditor previousItemEditor) {
for (ListViewListener listener : this) {
@@ -139,6 +142,7 @@
}
}
+ @Override
public void selectModeChanged(ListView listView,
ListView.SelectMode previousSelectMode) {
for (ListViewListener listener : this) {
@@ -146,24 +150,28 @@
}
}
+ @Override
public void checkmarksEnabledChanged(ListView listView) {
for (ListViewListener listener : this) {
listener.checkmarksEnabledChanged(listView);
}
}
+ @Override
public void disabledItemFilterChanged(ListView listView, Filter<?> previousDisabledItemFilter) {
for (ListViewListener listener : this) {
listener.disabledItemFilterChanged(listView, previousDisabledItemFilter);
}
}
+ @Override
public void selectedItemKeyChanged(ListView listView, String previousSelectedItemKey) {
for (ListViewListener listener : this) {
listener.selectedItemKeyChanged(listView, previousSelectedItemKey);
}
}
+ @Override
public void selectedItemsKeyChanged(ListView listView, String previousSelectedItemsKey) {
for (ListViewListener listener : this) {
listener.selectedItemsKeyChanged(listView, previousSelectedItemsKey);
@@ -176,30 +184,35 @@
*/
private static class ListViewItemListenerList extends ListenerList<ListViewItemListener>
implements ListViewItemListener {
+ @Override
public void itemInserted(ListView listView, int index) {
for (ListViewItemListener listener : this) {
listener.itemInserted(listView, index);
}
}
+ @Override
public void itemsRemoved(ListView listView, int index, int count) {
for (ListViewItemListener listener : this) {
listener.itemsRemoved(listView, index, count);
}
}
+ @Override
public void itemUpdated(ListView listView, int index) {
for (ListViewItemListener listener : this) {
listener.itemUpdated(listView, index);
}
}
+ @Override
public void itemsCleared(ListView listView) {
for (ListViewItemListener listener : this) {
listener.itemsCleared(listView);
}
}
+ @Override
public void itemsSorted(ListView listView) {
for (ListViewItemListener listener : this) {
listener.itemsSorted(listView);
@@ -212,6 +225,7 @@
*/
private static class ListViewItemStateListenerList extends ListenerList<ListViewItemStateListener>
implements ListViewItemStateListener {
+ @Override
public void itemCheckedChanged(ListView listView, int index) {
for (ListViewItemStateListener listener : this) {
listener.itemCheckedChanged(listView, index);
@@ -224,18 +238,21 @@
*/
private static class ListViewSelectionListenerList extends ListenerList<ListViewSelectionListener>
implements ListViewSelectionListener {
+ @Override
public void selectedRangeAdded(ListView listView, int rangeStart, int rangeEnd) {
for (ListViewSelectionListener listener : this) {
listener.selectedRangeAdded(listView, rangeStart, rangeEnd);
}
}
+ @Override
public void selectedRangeRemoved(ListView listView, int rangeStart, int rangeEnd) {
for (ListViewSelectionListener listener : this) {
listener.selectedRangeRemoved(listView, rangeStart, rangeEnd);
}
}
+ @Override
public void selectedRangesChanged(ListView listView, Sequence<Span> previousSelection) {
for (ListViewSelectionListener listener : this) {
listener.selectedRangesChanged(listView, previousSelection);
@@ -246,6 +263,7 @@
private List<?> listData = null;
private ListListener<Object> listDataListener = new ListListener<Object>() {
+ @Override
public void itemInserted(List<Object> list, int index) {
// Increment selected ranges
selectedRanges.insertIndex(index);
@@ -268,6 +286,7 @@
listViewItemListeners.itemInserted(ListView.this, index);
}
+ @Override
public void itemsRemoved(List<Object> list, int index, Sequence<Object> items) {
int count = items.getLength();
@@ -299,10 +318,12 @@
listViewItemListeners.itemsRemoved(ListView.this, index, count);
}
+ @Override
public void itemUpdated(List<Object> list, int index, Object previousItem) {
listViewItemListeners.itemUpdated(ListView.this, index);
}
+ @Override
public void listCleared(List<Object> list) {
// All items were removed; clear the selection and notify
// listeners
@@ -312,6 +333,7 @@
listViewItemListeners.itemsCleared(ListView.this);
}
+ @Override
public void comparatorChanged(List<Object> list,
Comparator<Object> previousComparator) {
if (list.getComparator() != null) {
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/ListViewItemListener.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/ListViewItemListener.java?rev=810835&r1=810834&r2=810835&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/ListViewItemListener.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/ListViewItemListener.java Thu Sep 3 09:01:06 2009
@@ -24,18 +24,23 @@
* List view item listener adapter.
*/
public static class Adapter implements ListViewItemListener {
+ @Override
public void itemInserted(ListView listView, int index) {
}
+ @Override
public void itemsRemoved(ListView listView, int index, int count) {
}
+ @Override
public void itemUpdated(ListView listView, int index) {
}
+ @Override
public void itemsCleared(ListView listView) {
}
+ @Override
public void itemsSorted(ListView listView) {
}
}
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/ListViewListener.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/ListViewListener.java?rev=810835&r1=810834&r2=810835&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/ListViewListener.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/ListViewListener.java Thu Sep 3 09:01:06 2009
@@ -27,27 +27,35 @@
* List view listener adapter.
*/
public static class Adapter implements ListViewListener {
+ @Override
public void listDataChanged(ListView listView, List<?> previousListData) {
}
+ @Override
public void itemRendererChanged(ListView listView, ListView.ItemRenderer previousItemRenderer) {
}
+ @Override
public void itemEditorChanged(ListView listView, ListView.ItemEditor previousItemEditor) {
}
+ @Override
public void selectModeChanged(ListView listView, ListView.SelectMode previousSelectMode) {
}
+ @Override
public void checkmarksEnabledChanged(ListView listView) {
}
+ @Override
public void disabledItemFilterChanged(ListView listView, Filter<?> previousDisabledItemFilter) {
}
+ @Override
public void selectedItemKeyChanged(ListView listView, String previousSelectedItemKey) {
}
+ @Override
public void selectedItemsKeyChanged(ListView listView, String previousSelectedItemsKey) {
}
}
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/ListViewSelectionListener.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/ListViewSelectionListener.java?rev=810835&r1=810834&r2=810835&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/ListViewSelectionListener.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/ListViewSelectionListener.java Thu Sep 3 09:01:06 2009
@@ -26,12 +26,15 @@
* List view selection listener adapter.
*/
public static class Adapter implements ListViewSelectionListener {
+ @Override
public void selectedRangeAdded(ListView listView, int rangeStart, int rangeEnd) {
}
+ @Override
public void selectedRangeRemoved(ListView listView, int rangeStart, int rangeEnd) {
}
+ @Override
public void selectedRangesChanged(ListView listView, Sequence<Span> previousSelectedRanges) {
}
}
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/LocalManifest.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/LocalManifest.java?rev=810835&r1=810834&r2=810835&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/LocalManifest.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/LocalManifest.java Thu Sep 3 09:01:06 2009
@@ -39,6 +39,7 @@
protected URL url = null;
protected HashMap<String, Object> values = new HashMap<String, Object>();
+ @Override
public String getText() {
return text;
}
@@ -51,10 +52,12 @@
this.text = text;
}
+ @Override
public boolean containsText() {
return (text != null);
}
+ @Override
public Image getImage() {
return image;
}
@@ -67,10 +70,12 @@
this.image = image;
}
+ @Override
public boolean containsImage() {
return image != null;
}
+ @Override
public FileList getFileList() {
return fileList;
}
@@ -83,10 +88,12 @@
this.fileList = fileList;
}
+ @Override
public boolean containsFileList() {
return fileList != null;
}
+ @Override
public URL getURL() {
return url;
}
@@ -99,10 +106,12 @@
this.url = url;
}
+ @Override
public boolean containsURL() {
return url != null;
}
+ @Override
public Object getValue(String key) {
return values.get(key);
}
@@ -111,6 +120,7 @@
return values.put(key, value);
}
+ @Override
public boolean containsValue(String key) {
return values.containsKey(key);
}
@@ -140,6 +150,7 @@
}
}
+ @Override
public Object getTransferData(DataFlavor dataFlavor)
throws UnsupportedFlavorException {
Object transferData = null;
@@ -180,10 +191,12 @@
return transferData;
}
+ @Override
public DataFlavor[] getTransferDataFlavors() {
return transferDataFlavors.toArray(DataFlavor[].class);
}
+ @Override
public boolean isDataFlavorSupported(DataFlavor dataFlavor) {
return (transferDataFlavors.indexOf(dataFlavor) != -1);
}