This patch removes some @Overrides from interface implementation
methods. This has broken compilation with pre 1.6 compilers.
2007-06-22 Roman Kennke <[EMAIL PROTECTED]>
* gnu/java/awt/peer/GLightweightPeer.java
* gnu/java/awt/peer/gtk/GdkRobotPeer.java
* gnu/java/awt/peer/gtk/GtkComponentPeer.java
* gnu/java/awt/peer/gtk/GtkFramePeer.java
* gnu/java/awt/peer/gtk/GtkWindowPeer.java
* gnu/java/awt/peer/qt/QtComponentPeer.java
* gnu/java/awt/peer/qt/QtFramePeer.java
* gnu/java/awt/peer/qt/QtWindowPeer.java
* gnu/java/awt/peer/swing/SwingComponentPeer.java
* gnu/java/awt/peer/swing/SwingWindowPeer.java
* gnu/java/awt/peer/x/XFramePeer.java:
Removed @Override annotations from some interface implementation
methods to ensure 1.5 compatibility.
/Roman
--
Dipl.-Inform. (FH) Roman Kennke, Software Engineer, http://kennke.org
aicas Allerton Interworks Computer Automated Systems GmbH
Haid-und-Neu-Straße 18 * D-76131 Karlsruhe * Germany
http://www.aicas.com * Tel: +49-721-663 968-0
USt-Id: DE216375633, Handelsregister HRB 109481, AG Karlsruhe
Geschäftsführer: Dr. James J. Hunt
Index: gnu/java/awt/peer/GLightweightPeer.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/awt/peer/GLightweightPeer.java,v
retrieving revision 1.12
diff -u -1 -0 -r1.12 GLightweightPeer.java
--- gnu/java/awt/peer/GLightweightPeer.java 22 Jun 2007 09:52:06 -0000 1.12
+++ gnu/java/awt/peer/GLightweightPeer.java 22 Jun 2007 14:27:07 -0000
@@ -443,20 +443,19 @@
{
// Nothing to do here for lightweights.
return true;
}
public void layout()
{
// Nothing to do here for lightweights.
}
- @Override
public boolean requestFocus(Component lightweightChild, boolean temporary,
boolean focusedWindowChangeAllowed,
long time, sun.awt.CausedFocusEvent.Cause cause)
{
// Always grant focus request.
return true;
}
}
Index: gnu/java/awt/peer/gtk/GdkRobotPeer.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/awt/peer/gtk/GdkRobotPeer.java,v
retrieving revision 1.5
diff -u -1 -0 -r1.5 GdkRobotPeer.java
--- gnu/java/awt/peer/gtk/GdkRobotPeer.java 22 Jun 2007 09:52:06 -0000 1.5
+++ gnu/java/awt/peer/gtk/GdkRobotPeer.java 22 Jun 2007 14:27:07 -0000
@@ -85,16 +85,15 @@
{
int[] gdk_pixels = nativeGetRGBPixels (r.x, r.y, r.width, r.height);
int[] pixels = new int[r.width * r.height];
for (int i = 0; i < r.width * r.height; i++)
pixels[i] = cm.getRGB (gdk_pixels[i]);
return pixels;
}
- @Override
public void dispose()
{
// Nothing to do here yet.
}
}
Index: gnu/java/awt/peer/gtk/GtkComponentPeer.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/awt/peer/gtk/GtkComponentPeer.java,v
retrieving revision 1.126
diff -u -1 -0 -r1.126 GtkComponentPeer.java
--- gnu/java/awt/peer/gtk/GtkComponentPeer.java 22 Jun 2007 09:52:06 -0000 1.126
+++ gnu/java/awt/peer/gtk/GtkComponentPeer.java 22 Jun 2007 14:27:07 -0000
@@ -893,21 +893,20 @@
// FIXME: implement
return false;
}
public void layout()
{
// FIXME: implement
}
- @Override
public boolean requestFocus(Component lightweightChild, boolean temporary,
boolean focusedWindowChangeAllowed,
long time, sun.awt.CausedFocusEvent.Cause cause)
{
// TODO: Implement this properly and remove the other requestFocus()
// methods.
return true;
}
}
Index: gnu/java/awt/peer/gtk/GtkFramePeer.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/awt/peer/gtk/GtkFramePeer.java,v
retrieving revision 1.52
diff -u -1 -0 -r1.52 GtkFramePeer.java
--- gnu/java/awt/peer/gtk/GtkFramePeer.java 22 Jun 2007 09:52:07 -0000 1.52
+++ gnu/java/awt/peer/gtk/GtkFramePeer.java 22 Jun 2007 14:27:07 -0000
@@ -238,20 +238,19 @@
// TODO Auto-generated method stub
}
public boolean requestWindowFocus()
{
// TODO Auto-generated method stub
return false;
}
- @Override
public Rectangle getBoundsPrivate()
{
// TODO: Implement this properly.
throw new InternalError("Not yet implemented");
}
}
Index: gnu/java/awt/peer/gtk/GtkWindowPeer.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/awt/peer/gtk/GtkWindowPeer.java,v
retrieving revision 1.60
diff -u -1 -0 -r1.60 GtkWindowPeer.java
--- gnu/java/awt/peer/gtk/GtkWindowPeer.java 22 Jun 2007 09:52:07 -0000 1.60
+++ gnu/java/awt/peer/gtk/GtkWindowPeer.java 22 Jun 2007 14:27:07 -0000
@@ -392,40 +392,35 @@
clickCount, popupTrigger);
}
// We override this to keep it in sync with our internal
// representation.
public Rectangle getBounds()
{
return new Rectangle(x, y, width, height);
}
- @Override
public void updateIconImages()
{
// TODO: Implement properly.
}
- @Override
public void updateMinimumSize()
{
// TODO: Implement properly.
}
- @Override
public void setModalBlocked(java.awt.Dialog d, boolean b)
{
// TODO: Implement properly.
}
- @Override
public void updateFocusableWindowState()
{
// TODO: Implement properly.
}
- @Override
public void setAlwaysOnTop(boolean b)
{
// TODO: Implement properly.
}
}
Index: gnu/java/awt/peer/qt/QtComponentPeer.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/awt/peer/qt/QtComponentPeer.java,v
retrieving revision 1.10
diff -u -1 -0 -r1.10 QtComponentPeer.java
--- gnu/java/awt/peer/qt/QtComponentPeer.java 22 Jun 2007 09:52:07 -0000 1.10
+++ gnu/java/awt/peer/qt/QtComponentPeer.java 22 Jun 2007 14:27:07 -0000
@@ -815,21 +815,20 @@
{
return true;
}
// What does this do, anyway?
public void layout()
{
// TODO Auto-generated method stub
}
- @Override
public boolean requestFocus(Component lightweightChild, boolean temporary,
boolean focusedWindowChangeAllowed,
long time, sun.awt.CausedFocusEvent.Cause cause)
{
// TODO: Implement this properly and remove the other requestFocus()
// methods.
return true;
}
}
Index: gnu/java/awt/peer/qt/QtFramePeer.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/awt/peer/qt/QtFramePeer.java,v
retrieving revision 1.7
diff -u -1 -0 -r1.7 QtFramePeer.java
--- gnu/java/awt/peer/qt/QtFramePeer.java 22 Jun 2007 09:52:07 -0000 1.7
+++ gnu/java/awt/peer/qt/QtFramePeer.java 22 Jun 2007 14:27:07 -0000
@@ -148,18 +148,17 @@
// TODO Auto-generated method stub
}
public boolean requestWindowFocus()
{
// TODO Auto-generated method stub
return false;
}
- @Override
public Rectangle getBoundsPrivate()
{
// TODO: Implement this properly.
throw new InternalError("Not yet implemented");
}
}
Index: gnu/java/awt/peer/qt/QtWindowPeer.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/awt/peer/qt/QtWindowPeer.java,v
retrieving revision 1.4
diff -u -1 -0 -r1.4 QtWindowPeer.java
--- gnu/java/awt/peer/qt/QtWindowPeer.java 22 Jun 2007 09:52:07 -0000 1.4
+++ gnu/java/awt/peer/qt/QtWindowPeer.java 22 Jun 2007 14:27:07 -0000
@@ -58,55 +58,48 @@
public native void toBack();
public native void toFront();
/*
* Belongs to Frame and Dialog, but no sense in duplicating code.
*/
public native void setTitle(String title);
- @Override
public void updateAlwaysOnTop()
{
// TODO Auto-generated method stub
}
- @Override
public boolean requestWindowFocus()
{
// TODO Auto-generated method stub
return false;
}
- @Override
public void updateIconImages()
{
// TODO: Implement properly.
}
- @Override
public void updateMinimumSize()
{
// TODO: Implement properly.
}
- @Override
public void setModalBlocked(java.awt.Dialog d, boolean b)
{
// TODO: Implement properly.
}
- @Override
public void updateFocusableWindowState()
{
// TODO: Implement properly.
}
- @Override
public void setAlwaysOnTop(boolean b)
{
// TODO: Implement properly.
}
}
Index: gnu/java/awt/peer/swing/SwingComponentPeer.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/awt/peer/swing/SwingComponentPeer.java,v
retrieving revision 1.9
diff -u -1 -0 -r1.9 SwingComponentPeer.java
--- gnu/java/awt/peer/swing/SwingComponentPeer.java 22 Jun 2007 09:52:07 -0000 1.9
+++ gnu/java/awt/peer/swing/SwingComponentPeer.java 22 Jun 2007 14:27:07 -0000
@@ -1119,19 +1119,18 @@
/**
* Returns the AWT component for this peer.
*
* @return the AWT component for this peer
*/
public Component getComponent()
{
return awtComponent;
}
- @Override
public boolean requestFocus(Component lightweightChild, boolean temporary,
boolean focusedWindowChangeAllowed,
long time, sun.awt.CausedFocusEvent.Cause cause)
{
return true;
}
}
Index: gnu/java/awt/peer/swing/SwingWindowPeer.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/awt/peer/swing/SwingWindowPeer.java,v
retrieving revision 1.4
diff -u -1 -0 -r1.4 SwingWindowPeer.java
--- gnu/java/awt/peer/swing/SwingWindowPeer.java 22 Jun 2007 09:52:07 -0000 1.4
+++ gnu/java/awt/peer/swing/SwingWindowPeer.java 22 Jun 2007 14:27:07 -0000
@@ -65,40 +65,35 @@
* Creates a new instance of WindowPeer.
*
* @param window the AWT window
*/
public SwingWindowPeer(Window window)
{
super(window);
init(window, null);
}
- @Override
public void updateIconImages()
{
// TODO: Implement properly.
}
- @Override
public void updateMinimumSize()
{
// TODO: Implement properly.
}
- @Override
public void setModalBlocked(java.awt.Dialog d, boolean b)
{
// TODO: Implement properly.
}
- @Override
public void updateFocusableWindowState()
{
// TODO: Implement properly.
}
- @Override
public void setAlwaysOnTop(boolean b)
{
// TODO: Implement properly.
}
}
Index: gnu/java/awt/peer/x/XFramePeer.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/awt/peer/x/XFramePeer.java,v
retrieving revision 1.3
diff -u -1 -0 -r1.3 XFramePeer.java
--- gnu/java/awt/peer/x/XFramePeer.java 22 Jun 2007 09:52:07 -0000 1.3
+++ gnu/java/awt/peer/x/XFramePeer.java 22 Jun 2007 14:27:07 -0000
@@ -130,18 +130,17 @@
* @param width the new width
* @param height the new height
* @since 1.5
*/
public void setBoundsPrivate(int x, int y, int width, int height)
{
// TODO: Implement this.
throw new UnsupportedOperationException("Not yet implemented.");
}
- @Override
public Rectangle getBoundsPrivate()
{
// TODO: Implement this properly.
throw new InternalError("Not yet implemented");
}
}
