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:09:20 UTC
svn commit: r810838 - /incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/
Author: smartini
Date: Thu Sep 3 09:09:19 2009
New Revision: 810838
URL: http://svn.apache.org/viewvc?rev=810838&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/Menu.java
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/MenuBar.java
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/MenuButton.java
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/MenuHandler.java
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/MenuPopup.java
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/MenuPopupStateListener.java
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/Meter.java
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/MovieView.java
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/Platform.java
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/Prompt.java
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/RemoteManifest.java
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/Rollup.java
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/RollupListener.java
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/RollupStateListener.java
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/Menu.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/Menu.java?rev=810838&r1=810837&r2=810838&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/Menu.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/Menu.java Thu Sep 3 09:09:19 2009
@@ -36,12 +36,14 @@
public static class Item extends Button {
private static class ItemListenerList extends ListenerList<ItemListener>
implements ItemListener {
+ @Override
public void nameChanged(Item item, String previousName) {
for (ItemListener listener : this) {
listener.nameChanged(item, previousName);
}
}
+ @Override
public void menuChanged(Item item, Menu previousMenu) {
for (ItemListener listener : this) {
listener.menuChanged(item, previousMenu);
@@ -196,18 +198,21 @@
public static class Section implements Sequence<Item>, Iterable<Item> {
private static class SectionListenerList extends ListenerList<SectionListener>
implements SectionListener {
+ @Override
public void itemInserted(Menu.Section section, int index) {
for (SectionListener listener : this) {
listener.itemInserted(section, index);
}
}
+ @Override
public void itemsRemoved(Menu.Section section, int index, Sequence<Item> removed) {
for (SectionListener listener : this) {
listener.itemsRemoved(section, index, removed);
}
}
+ @Override
public void nameChanged(Menu.Section section, String previousName) {
for (SectionListener listener : this) {
listener.nameChanged(section, previousName);
@@ -253,6 +258,7 @@
}
}
+ @Override
public int add(Item item) {
int index = getLength();
insert(item, index);
@@ -260,6 +266,7 @@
return index;
}
+ @Override
public void insert(Item item, int index) {
if (item.getSection() != null) {
throw new IllegalArgumentException("item already has a section.");
@@ -274,10 +281,12 @@
}
}
+ @Override
public Item update(int index, Item item) {
throw new UnsupportedOperationException();
}
+ @Override
public int remove(Item item) {
int index = items.indexOf(item);
if (index != -1) {
@@ -287,6 +296,7 @@
return index;
}
+ @Override
public Sequence<Item> remove(int index, int count) {
Sequence<Item> removed = items.remove(index, count);
@@ -305,18 +315,22 @@
return removed;
}
+ @Override
public Item get(int index) {
return items.get(index);
}
+ @Override
public int indexOf(Item item) {
return items.indexOf(item);
}
+ @Override
public int getLength() {
return items.getLength();
}
+ @Override
public Iterator<Item> iterator() {
return new ImmutableIterator<Item>(items.iterator());
}
@@ -363,6 +377,7 @@
private SectionSequence() {
}
+ @Override
public int add(Section section) {
int index = getLength();
insert(section, index);
@@ -370,6 +385,7 @@
return index;
}
+ @Override
public void insert(Section section, int index) {
if (section.menu != null) {
throw new IllegalArgumentException("section already has a menu.");
@@ -406,10 +422,12 @@
menuListeners.sectionInserted(Menu.this, index);
}
+ @Override
public Section update(int index, Section section) {
throw new UnsupportedOperationException();
}
+ @Override
public int remove(Section section) {
int index = sections.indexOf(section);
if (index != -1) {
@@ -419,6 +437,7 @@
return index;
}
+ @Override
public Sequence<Section> remove(int index, int count) {
Sequence<Section> removed = sections.remove(index, count);
@@ -451,18 +470,22 @@
remove(0, sections.getLength());
}
+ @Override
public Section get(int index) {
return sections.get(index);
}
+ @Override
public int indexOf(Section item) {
return sections.indexOf(item);
}
+ @Override
public int getLength() {
return sections.getLength();
}
+ @Override
public Iterator<Section> iterator() {
return new ImmutableIterator<Section>(sections.iterator());
}
@@ -470,12 +493,14 @@
private static class MenuListenerList extends ListenerList<MenuListener>
implements MenuListener {
+ @Override
public void sectionInserted(Menu menu, int index) {
for (MenuListener listener : this) {
listener.sectionInserted(menu, index);
}
}
+ @Override
public void sectionsRemoved(Menu menu, int index, Sequence<Section> removed) {
for (MenuListener listener : this) {
listener.sectionsRemoved(menu, index, removed);
@@ -485,6 +510,7 @@
private static class MenuItemSelectionListenerList extends ListenerList<MenuItemSelectionListener>
implements MenuItemSelectionListener {
+ @Override
public void itemSelected(Menu.Item menuItem) {
for (MenuItemSelectionListener listener : this) {
listener.itemSelected(menuItem);
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/MenuBar.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/MenuBar.java?rev=810838&r1=810837&r2=810838&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/MenuBar.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/MenuBar.java Thu Sep 3 09:09:19 2009
@@ -35,6 +35,7 @@
public static class Item extends Button {
private static class ItemListenerList extends ListenerList<ItemListener>
implements ItemListener {
+ @Override
public void menuChanged(Item item, Menu previousMenu) {
for (ItemListener listener : this) {
listener.menuChanged(item, previousMenu);
@@ -124,6 +125,7 @@
* Item sequence implementation.
*/
public final class ItemSequence implements Sequence<Item>, Iterable<Item> {
+ @Override
public int add(Item item) {
int index = getLength();
insert(item, index);
@@ -131,6 +133,7 @@
return index;
}
+ @Override
public void insert(Item item, int index) {
if (item.getMenuBar() != null) {
throw new IllegalArgumentException("item already has a menu bar.");
@@ -144,10 +147,12 @@
menuBarListeners.itemInserted(MenuBar.this, index);
}
+ @Override
public Item update(int index, Item item) {
throw new UnsupportedOperationException();
}
+ @Override
public int remove(Item item) {
int index = items.indexOf(item);
if (index != -1) {
@@ -157,6 +162,7 @@
return index;
}
+ @Override
public Sequence<Item> remove(int index, int count) {
Sequence<Item> removed = items.remove(index, count);
@@ -172,18 +178,22 @@
return removed;
}
+ @Override
public Item get(int index) {
return items.get(index);
}
+ @Override
public int indexOf(Item item) {
return items.indexOf(item);
}
+ @Override
public int getLength() {
return items.getLength();
}
+ @Override
public Iterator<Item> iterator() {
return new ImmutableIterator<Item>(items.iterator());
}
@@ -191,12 +201,14 @@
private static class MenuBarListenerList extends ListenerList<MenuBarListener>
implements MenuBarListener {
+ @Override
public void itemInserted(MenuBar menuBar, int index) {
for (MenuBarListener listener : this) {
listener.itemInserted(menuBar, index);
}
}
+ @Override
public void itemsRemoved(MenuBar menuBar, int index, Sequence<MenuBar.Item> removed) {
for (MenuBarListener listener : this) {
listener.itemsRemoved(menuBar, index, removed);
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/MenuButton.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/MenuButton.java?rev=810838&r1=810837&r2=810838&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/MenuButton.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/MenuButton.java Thu Sep 3 09:09:19 2009
@@ -33,12 +33,14 @@
public class MenuButton extends Button {
private static class MenuButtonListenerList extends ListenerList<MenuButtonListener>
implements MenuButtonListener {
+ @Override
public void menuChanged(MenuButton menuButton, Menu previousMenu) {
for (MenuButtonListener listener : this) {
listener.menuChanged(menuButton, previousMenu);
}
}
+ @Override
public void repeatableChanged(MenuButton menuButton) {
for (MenuButtonListener listener : this) {
listener.repeatableChanged(menuButton);
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/MenuHandler.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/MenuHandler.java?rev=810838&r1=810837&r2=810838&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/MenuHandler.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/MenuHandler.java Thu Sep 3 09:09:19 2009
@@ -24,12 +24,15 @@
* Menu handler adapter.
*/
public static class Adapter implements MenuHandler {
+ @Override
public void configureMenuBar(Component component, MenuBar menuBar) {
}
+ @Override
public void cleanupMenuBar(Component component, MenuBar menuBar) {
}
+ @Override
public boolean configureContextMenu(Component component, Menu menu, int x, int y) {
return false;
}
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/MenuPopup.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/MenuPopup.java?rev=810838&r1=810837&r2=810838&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/MenuPopup.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/MenuPopup.java Thu Sep 3 09:09:19 2009
@@ -25,6 +25,7 @@
public class MenuPopup extends Window {
private static class MenuPopupListenerList extends ListenerList<MenuPopupListener>
implements MenuPopupListener {
+ @Override
public void menuChanged(MenuPopup menuPopup, Menu previousMenu) {
for (MenuPopupListener listener : this) {
listener.menuChanged(menuPopup, previousMenu);
@@ -34,6 +35,7 @@
private static class MenuPopupStateListenerList extends ListenerList<MenuPopupStateListener>
implements MenuPopupStateListener {
+ @Override
public Vote previewMenuPopupClose(MenuPopup menuPopup, boolean immediate) {
Vote vote = Vote.APPROVE;
@@ -44,12 +46,14 @@
return vote;
}
+ @Override
public void menuPopupCloseVetoed(MenuPopup menuPopup, Vote reason) {
for (MenuPopupStateListener listener : this) {
listener.menuPopupCloseVetoed(menuPopup, reason);
}
}
+ @Override
public void menuPopupClosed(MenuPopup menuPopup) {
for (MenuPopupStateListener listener : this) {
listener.menuPopupClosed(menuPopup);
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/MenuPopupStateListener.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/MenuPopupStateListener.java?rev=810838&r1=810837&r2=810838&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/MenuPopupStateListener.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/MenuPopupStateListener.java Thu Sep 3 09:09:19 2009
@@ -26,13 +26,16 @@
* Menu popup state listener adapter.
*/
public static class Adapter implements MenuPopupStateListener {
+ @Override
public Vote previewMenuPopupClose(MenuPopup menuPopup, boolean immediate) {
return Vote.APPROVE;
}
+ @Override
public void menuPopupCloseVetoed(MenuPopup menuPopup, Vote reason) {
}
+ @Override
public void menuPopupClosed(MenuPopup menuPopup) {
}
}
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/Meter.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/Meter.java?rev=810838&r1=810837&r2=810838&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/Meter.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/Meter.java Thu Sep 3 09:09:19 2009
@@ -24,12 +24,14 @@
public class Meter extends Component {
private static class MeterListenerList extends ListenerList<MeterListener>
implements MeterListener {
+ @Override
public void percentageChanged(Meter meter, double oldPercentage) {
for (MeterListener listener : this) {
listener.percentageChanged(meter, oldPercentage);
}
}
+ @Override
public void textChanged(Meter meter, String oldText) {
for (MeterListener listener : this) {
listener.textChanged(meter, oldText);
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/MovieView.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/MovieView.java?rev=810838&r1=810837&r2=810838&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/MovieView.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/MovieView.java Thu Sep 3 09:09:19 2009
@@ -26,6 +26,7 @@
public class MovieView extends Component {
private static class MovieViewListenerList extends ListenerList<MovieViewListener>
implements MovieViewListener {
+ @Override
public void movieChanged(MovieView movieView, Movie previousMovie) {
for (MovieViewListener listener : this) {
listener.movieChanged(movieView, previousMovie);
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/Platform.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/Platform.java?rev=810838&r1=810837&r2=810838&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/Platform.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/Platform.java Thu Sep 3 09:09:19 2009
@@ -49,6 +49,7 @@
// Listen for changes to the property
toolkit.addPropertyChangeListener("awt.font.desktophints", new PropertyChangeListener() {
+ @Override
public void propertyChange(PropertyChangeEvent event) {
Platform.textAntialiasingHint = null;
}
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/Prompt.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/Prompt.java?rev=810838&r1=810837&r2=810838&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/Prompt.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/Prompt.java Thu Sep 3 09:09:19 2009
@@ -35,6 +35,7 @@
public class Prompt extends Sheet {
private static class PromptListenerList extends ListenerList<PromptListener>
implements PromptListener {
+ @Override
public void selectedOptionChanged(Prompt prompt, int previousSelectedOption) {
for (PromptListener listener : this) {
listener.selectedOptionChanged(prompt, previousSelectedOption);
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/RemoteManifest.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/RemoteManifest.java?rev=810838&r1=810837&r2=810838&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/RemoteManifest.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/RemoteManifest.java Thu Sep 3 09:09:19 2009
@@ -68,6 +68,7 @@
}
}
+ @Override
public String getText() throws IOException {
String text = null;
try {
@@ -79,10 +80,12 @@
return text;
}
+ @Override
public boolean containsText() {
return (textDataFlavor != null);
}
+ @Override
public Image getImage() throws IOException {
Image image = null;
try {
@@ -94,10 +97,12 @@
return image;
}
+ @Override
public boolean containsImage() {
return (imageDataFlavor != null);
}
+ @Override
@SuppressWarnings("unchecked")
public FileList getFileList() throws IOException {
FileList fileList = null;
@@ -110,10 +115,12 @@
return fileList;
}
+ @Override
public boolean containsFileList() {
return (fileListDataFlavor != null);
}
+ @Override
public URL getURL() throws IOException {
URL url = null;
try {
@@ -125,14 +132,17 @@
return url;
}
+ @Override
public boolean containsURL() {
return (urlDataFlavor != null);
}
+ @Override
public Object getValue(String key) {
return null;
}
+ @Override
public boolean containsValue(String key) {
return false;
}
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/Rollup.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/Rollup.java?rev=810838&r1=810837&r2=810838&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/Rollup.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/Rollup.java Thu Sep 3 09:09:19 2009
@@ -29,18 +29,21 @@
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);
@@ -50,6 +53,7 @@
private static class RollupStateListenerList extends ListenerList<RollupStateListener>
implements RollupStateListener {
+ @Override
public Vote previewExpandedChange(Rollup rollup) {
Vote vote = Vote.APPROVE;
@@ -60,12 +64,14 @@
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);
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/RollupListener.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/RollupListener.java?rev=810838&r1=810837&r2=810838&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/RollupListener.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/RollupListener.java Thu Sep 3 09:09:19 2009
@@ -26,12 +26,15 @@
* Rollup listener adapter.
*/
public static class Adapter implements RollupListener {
+ @Override
public void headingChanged(Rollup rollup, Component previousHeading) {
}
+ @Override
public void contentChanged(Rollup rollup, Component previousContent) {
}
+ @Override
public void collapsibleChanged(Rollup rollup) {
}
}
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/RollupStateListener.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/RollupStateListener.java?rev=810838&r1=810837&r2=810838&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/RollupStateListener.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/RollupStateListener.java Thu Sep 3 09:09:19 2009
@@ -28,13 +28,16 @@
* Rollup state listener adapter.
*/
public static class Adapter implements RollupStateListener {
+ @Override
public Vote previewExpandedChange(Rollup rollup) {
return Vote.APPROVE;
}
+ @Override
public void expandedChangeVetoed(Rollup rollup, Vote reason) {
}
+ @Override
public void expandedChanged(Rollup rollup) {
}
}