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/01 12:23:52 UTC
svn commit: r809958 - in
/incubator/pivot/trunk/demos/src/org/apache/pivot/demos: clock/Clock.java
clock/ClockDemo.java decorator/DecoratorDemo.java dnd/DragAndDropDemo.java
dnd/FileDropTargetDemo.java
Author: smartini
Date: Tue Sep 1 10:23:51 2009
New Revision: 809958
URL: http://svn.apache.org/viewvc?rev=809958&view=rev
Log:
add some missing override, in some cases on methods of inner classes (not shown in eclipse warnings)
Modified:
incubator/pivot/trunk/demos/src/org/apache/pivot/demos/clock/Clock.java
incubator/pivot/trunk/demos/src/org/apache/pivot/demos/clock/ClockDemo.java
incubator/pivot/trunk/demos/src/org/apache/pivot/demos/decorator/DecoratorDemo.java
incubator/pivot/trunk/demos/src/org/apache/pivot/demos/dnd/DragAndDropDemo.java
incubator/pivot/trunk/demos/src/org/apache/pivot/demos/dnd/FileDropTargetDemo.java
Modified: incubator/pivot/trunk/demos/src/org/apache/pivot/demos/clock/Clock.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/demos/src/org/apache/pivot/demos/clock/Clock.java?rev=809958&r1=809957&r2=809958&view=diff
==============================================================================
--- incubator/pivot/trunk/demos/src/org/apache/pivot/demos/clock/Clock.java (original)
+++ incubator/pivot/trunk/demos/src/org/apache/pivot/demos/clock/Clock.java Tue Sep 1 10:23:51 2009
@@ -43,10 +43,12 @@
}
image.getImageListeners().add(new ImageListener() {
+ @Override
public void sizeChanged(Image image, int previousWidth, int previousHeight) {
movieListeners.sizeChanged(Clock.this, previousWidth, previousHeight);
}
+ @Override
public void regionUpdated(Image image, int x, int y, int width, int height) {
movieListeners.regionUpdated(Clock.this, x, y, width, height);
}
@@ -56,6 +58,7 @@
setFrameRate(1);
}
+ @Override
public void setCurrentFrame(int currentFrame) {
Shape.Rotate secondsRotation = (Shape.Rotate)wtkxSerializer.get("secondsRotation");
Shape.Rotate minutesRotation = (Shape.Rotate)wtkxSerializer.get("minutesRotation");
@@ -74,18 +77,22 @@
super.setCurrentFrame(currentFrame);
}
+ @Override
public int getWidth() {
return image.getWidth();
}
+ @Override
public int getHeight() {
return image.getHeight();
}
+ @Override
public void paint(Graphics2D graphics) {
image.paint(graphics);
}
+ @Override
public int getTotalFrames() {
return 60;
}
Modified: incubator/pivot/trunk/demos/src/org/apache/pivot/demos/clock/ClockDemo.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/demos/src/org/apache/pivot/demos/clock/ClockDemo.java?rev=809958&r1=809957&r2=809958&view=diff
==============================================================================
--- incubator/pivot/trunk/demos/src/org/apache/pivot/demos/clock/ClockDemo.java (original)
+++ incubator/pivot/trunk/demos/src/org/apache/pivot/demos/clock/ClockDemo.java Tue Sep 1 10:23:51 2009
@@ -30,6 +30,7 @@
private Window window;
private Clock clock = new Clock();
+ @Override
public void startup(Display display, Map<String, String> properties) {
window = new Window(new MovieView(clock));
window.setMaximized(true);
@@ -37,6 +38,7 @@
clock.play();
}
+ @Override
public boolean shutdown(boolean optional) {
if (window != null) {
window.close();
@@ -45,9 +47,11 @@
return false;
}
+ @Override
public void suspend() {
}
+ @Override
public void resume() {
}
Modified: incubator/pivot/trunk/demos/src/org/apache/pivot/demos/decorator/DecoratorDemo.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/demos/src/org/apache/pivot/demos/decorator/DecoratorDemo.java?rev=809958&r1=809957&r2=809958&view=diff
==============================================================================
--- incubator/pivot/trunk/demos/src/org/apache/pivot/demos/decorator/DecoratorDemo.java (original)
+++ incubator/pivot/trunk/demos/src/org/apache/pivot/demos/decorator/DecoratorDemo.java Tue Sep 1 10:23:51 2009
@@ -31,6 +31,7 @@
private Window reflectionWindow = null;
private Frame translucentFrame = null;
+ @Override
public void startup(Display display, Map<String, String> properties)
throws Exception {
WTKXSerializer wtkxSerializer = new WTKXSerializer();
@@ -41,11 +42,13 @@
translucentFrame.getDecorators().insert(fadeDecorator, 0);
translucentFrame.getComponentMouseListeners().add(new ComponentMouseListener.Adapter() {
+ @Override
public void mouseOver(Component component) {
fadeDecorator.setOpacity(0.9f);
component.repaint();
}
+ @Override
public void mouseOut(Component component) {
fadeDecorator.setOpacity(0.5f);
component.repaint();
@@ -56,6 +59,7 @@
translucentFrame.open(display);
}
+ @Override
public boolean shutdown(boolean optional) {
if (reflectionWindow != null) {
reflectionWindow.close();
@@ -68,9 +72,11 @@
return false;
}
+ @Override
public void suspend() {
}
+ @Override
public void resume() {
}
Modified: incubator/pivot/trunk/demos/src/org/apache/pivot/demos/dnd/DragAndDropDemo.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/demos/src/org/apache/pivot/demos/dnd/DragAndDropDemo.java?rev=809958&r1=809957&r2=809958&view=diff
==============================================================================
--- incubator/pivot/trunk/demos/src/org/apache/pivot/demos/dnd/DragAndDropDemo.java (original)
+++ incubator/pivot/trunk/demos/src/org/apache/pivot/demos/dnd/DragAndDropDemo.java Tue Sep 1 10:23:51 2009
@@ -56,6 +56,7 @@
@WTKX private PushButton copyFilesButton;
@WTKX private PushButton pasteFilesButton;
+ @Override
public void startup(Display display, Map<String, String> properties)
throws Exception {
WTKXSerializer wtkxSerializer = new WTKXSerializer();
@@ -66,6 +67,7 @@
label.setDragSource(new DragSource() {
private LocalManifest content = null;
+ @Override
public boolean beginDrag(Component component, int x, int y) {
String text = label.getText();
if (text != null) {
@@ -76,32 +78,39 @@
return (content != null);
}
+ @Override
public void endDrag(Component component, DropAction dropAction) {
content = null;
}
+ @Override
public boolean isNative() {
return true;
}
+ @Override
public LocalManifest getContent() {
return content;
}
+ @Override
public Visual getRepresentation() {
return null;
}
+ @Override
public Point getOffset() {
return null;
}
+ @Override
public int getSupportedDropActions() {
return DropAction.COPY.getMask();
}
});
label.setDropTarget(new DropTarget() {
+ @Override
public DropAction dragEnter(Component component, Manifest dragContent,
int supportedDropActions, DropAction userDropAction) {
DropAction dropAction = null;
@@ -114,19 +123,23 @@
return dropAction;
}
+ @Override
public void dragExit(Component component) {
}
+ @Override
public DropAction dragMove(Component component, Manifest dragContent,
int supportedDropActions, int x, int y, DropAction userDropAction) {
return (dragContent.containsText() ? DropAction.COPY : null);
}
+ @Override
public DropAction userDropActionChange(Component component, Manifest dragContent,
int supportedDropActions, int x, int y, DropAction userDropAction) {
return (dragContent.containsText() ? DropAction.COPY : null);
}
+ @Override
public DropAction drop(Component component, Manifest dragContent,
int supportedDropActions, int x, int y, DropAction userDropAction) {
DropAction dropAction = null;
@@ -147,6 +160,7 @@
});
copyTextButton.getButtonPressListeners().add(new ButtonPressListener() {
+ @Override
public void buttonPressed(Button button) {
String text = label.getText();
LocalManifest clipboardContent = new LocalManifest();
@@ -156,6 +170,7 @@
});
pasteTextButton.getButtonPressListeners().add(new ButtonPressListener() {
+ @Override
public void buttonPressed(Button button) {
Manifest clipboardContent = Clipboard.getContent();
@@ -174,6 +189,7 @@
imageView.setDragSource(new DragSource() {
private LocalManifest content = null;
+ @Override
public boolean beginDrag(Component component, int x, int y) {
Image image = imageView.getImage();
@@ -185,32 +201,39 @@
return (content != null);
}
+ @Override
public void endDrag(Component component, DropAction dropAction) {
content = null;
}
+ @Override
public boolean isNative() {
return true;
}
+ @Override
public LocalManifest getContent() {
return content;
}
+ @Override
public Visual getRepresentation() {
return null;
}
+ @Override
public Point getOffset() {
return null;
}
+ @Override
public int getSupportedDropActions() {
return DropAction.COPY.getMask();
}
});
imageView.setDropTarget(new DropTarget() {
+ @Override
public DropAction dragEnter(Component component, Manifest dragContent,
int supportedDropActions, DropAction userDropAction) {
DropAction dropAction = null;
@@ -223,19 +246,23 @@
return dropAction;
}
+ @Override
public void dragExit(Component component) {
}
+ @Override
public DropAction dragMove(Component component, Manifest dragContent,
int supportedDropActions, int x, int y, DropAction userDropAction) {
return (dragContent.containsImage() ? DropAction.COPY : null);
}
+ @Override
public DropAction userDropActionChange(Component component, Manifest dragContent,
int supportedDropActions, int x, int y, DropAction userDropAction) {
return (dragContent.containsImage() ? DropAction.COPY : null);
}
+ @Override
public DropAction drop(Component component, Manifest dragContent,
int supportedDropActions, int x, int y, DropAction userDropAction) {
DropAction dropAction = null;
@@ -256,6 +283,7 @@
});
copyImageButton.getButtonPressListeners().add(new ButtonPressListener() {
+ @Override
public void buttonPressed(Button button) {
Image image = imageView.getImage();
if (image != null) {
@@ -267,6 +295,7 @@
});
pasteImageButton.getButtonPressListeners().add(new ButtonPressListener() {
+ @Override
public void buttonPressed(Button button) {
Manifest clipboardContent = Clipboard.getContent();
@@ -287,6 +316,7 @@
listView.setDragSource(new DragSource() {
private LocalManifest content = null;
+ @Override
public boolean beginDrag(Component component, int x, int y) {
ListView listView = (ListView)component;
FileList fileList = (FileList)listView.getListData();
@@ -299,32 +329,39 @@
return (content != null);
}
+ @Override
public void endDrag(Component component, DropAction dropAction) {
content = null;
}
+ @Override
public boolean isNative() {
return true;
}
+ @Override
public LocalManifest getContent() {
return content;
}
+ @Override
public Visual getRepresentation() {
return null;
}
+ @Override
public Point getOffset() {
return null;
}
+ @Override
public int getSupportedDropActions() {
return DropAction.COPY.getMask();
}
});
listView.setDropTarget(new DropTarget() {
+ @Override
public DropAction dragEnter(Component component, Manifest dragContent,
int supportedDropActions, DropAction userDropAction) {
DropAction dropAction = null;
@@ -337,19 +374,23 @@
return dropAction;
}
+ @Override
public void dragExit(Component component) {
}
+ @Override
public DropAction dragMove(Component component, Manifest dragContent,
int supportedDropActions, int x, int y, DropAction userDropAction) {
return (dragContent.containsFileList() ? DropAction.COPY : null);
}
+ @Override
public DropAction userDropActionChange(Component component, Manifest dragContent,
int supportedDropActions, int x, int y, DropAction userDropAction) {
return (dragContent.containsFileList() ? DropAction.COPY : null);
}
+ @Override
public DropAction drop(Component component, Manifest dragContent,
int supportedDropActions, int x, int y, DropAction userDropAction) {
DropAction dropAction = null;
@@ -370,12 +411,14 @@
});
copyFilesButton.getButtonPressListeners().add(new ButtonPressListener() {
+ @Override
public void buttonPressed(Button button) {
// TODO
}
});
pasteFilesButton.getButtonPressListeners().add(new ButtonPressListener() {
+ @Override
public void buttonPressed(Button button) {
// TODO
}
@@ -384,6 +427,7 @@
window.open(display);
}
+ @Override
public boolean shutdown(boolean optional) {
if (window != null) {
window.close();
@@ -392,9 +436,11 @@
return false;
}
+ @Override
public void suspend() {
}
+ @Override
public void resume() {
}
Modified: incubator/pivot/trunk/demos/src/org/apache/pivot/demos/dnd/FileDropTargetDemo.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/demos/src/org/apache/pivot/demos/dnd/FileDropTargetDemo.java?rev=809958&r1=809957&r2=809958&view=diff
==============================================================================
--- incubator/pivot/trunk/demos/src/org/apache/pivot/demos/dnd/FileDropTargetDemo.java (original)
+++ incubator/pivot/trunk/demos/src/org/apache/pivot/demos/dnd/FileDropTargetDemo.java Tue Sep 1 10:23:51 2009
@@ -52,6 +52,7 @@
private FileList fileList = null;
+ @Override
public void startup(Display display, Map<String, String> properties)
throws Exception {
WTKXSerializer wtkxSerializer = new WTKXSerializer();
@@ -62,10 +63,12 @@
fileTableView.setTableData(fileList);
fileList.getListListeners().add(new ListListener.Adapter<File>() {
+ @Override
public void itemInserted(List<File> list, int index) {
uploadButton.setEnabled(list.getLength() > 0);
}
+ @Override
public void itemsRemoved(List<File> list, int index, Sequence<File> files) {
uploadButton.setEnabled(list.getLength() > 0);
@@ -77,6 +80,7 @@
});
fileTableView.getComponentKeyListeners().add(new ComponentKeyListener.Adapter() {
+ @Override
public boolean keyPressed(Component component, int keyCode, Keyboard.KeyLocation keyLocation) {
if (keyCode == Keyboard.KeyCode.DELETE
|| keyCode == Keyboard.KeyCode.BACKSPACE) {
@@ -95,6 +99,7 @@
});
fileTableView.setDropTarget(new DropTarget() {
+ @Override
public DropAction dragEnter(Component component, Manifest dragContent,
int supportedDropActions, DropAction userDropAction) {
DropAction dropAction = null;
@@ -107,19 +112,23 @@
return dropAction;
}
+ @Override
public void dragExit(Component component) {
}
+ @Override
public DropAction dragMove(Component component, Manifest dragContent,
int supportedDropActions, int x, int y, DropAction userDropAction) {
return (dragContent.containsFileList() ? DropAction.COPY : null);
}
+ @Override
public DropAction userDropActionChange(Component component, Manifest dragContent,
int supportedDropActions, int x, int y, DropAction userDropAction) {
return (dragContent.containsFileList() ? DropAction.COPY : null);
}
+ @Override
public DropAction drop(Component component, Manifest dragContent,
int supportedDropActions, int x, int y, DropAction userDropAction) {
DropAction dropAction = null;
@@ -149,6 +158,7 @@
});
uploadButton.getButtonPressListeners().add(new ButtonPressListener() {
+ @Override
public void buttonPressed(Button button) {
Prompt.prompt(MessageType.INFO, "Pretending to upload...", window);
}
@@ -157,6 +167,7 @@
window.open(display);
}
+ @Override
public boolean shutdown(boolean optional) throws Exception {
if (window != null) {
window.close();
@@ -165,9 +176,11 @@
return false;
}
+ @Override
public void suspend() {
}
+ @Override
public void resume() {
}