summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoman Kennke <roman@kennke.org>2007-06-22 14:27:56 +0000
committerRoman Kennke <roman@kennke.org>2007-06-22 14:27:56 +0000
commit148a527123b5b5bb5ec304654edf642d8ae6736d (patch)
tree5710a77d642c9b13dc903c29fdebaaaaf8c7cb10
parenteb16df932637ca3c7c37532b87e5276099b3a6dc (diff)
downloadclasspath-148a527123b5b5bb5ec304654edf642d8ae6736d.tar.gz
2007-06-22 Roman Kennke <roman@kennke.org>
* 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.
-rw-r--r--ChangeLog16
-rw-r--r--gnu/java/awt/peer/GLightweightPeer.java1
-rw-r--r--gnu/java/awt/peer/gtk/GdkRobotPeer.java1
-rw-r--r--gnu/java/awt/peer/gtk/GtkComponentPeer.java1
-rw-r--r--gnu/java/awt/peer/gtk/GtkFramePeer.java1
-rw-r--r--gnu/java/awt/peer/gtk/GtkWindowPeer.java5
-rw-r--r--gnu/java/awt/peer/qt/QtComponentPeer.java1
-rw-r--r--gnu/java/awt/peer/qt/QtFramePeer.java1
-rw-r--r--gnu/java/awt/peer/qt/QtWindowPeer.java7
-rw-r--r--gnu/java/awt/peer/swing/SwingComponentPeer.java1
-rw-r--r--gnu/java/awt/peer/swing/SwingWindowPeer.java5
-rw-r--r--gnu/java/awt/peer/x/XFramePeer.java1
12 files changed, 16 insertions, 25 deletions
diff --git a/ChangeLog b/ChangeLog
index 8b0617f4a..a5f734f1f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+2007-06-22 Roman Kennke <roman@kennke.org>
+
+ * 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.
+
2007-06-22 Christian Thalinger <twisti@complang.tuwien.ac.at>
* include/jni.h (JNINativeInterface): Renamed to
diff --git a/gnu/java/awt/peer/GLightweightPeer.java b/gnu/java/awt/peer/GLightweightPeer.java
index 262b74e69..bf40bf379 100644
--- a/gnu/java/awt/peer/GLightweightPeer.java
+++ b/gnu/java/awt/peer/GLightweightPeer.java
@@ -450,7 +450,6 @@ public class GLightweightPeer
// Nothing to do here for lightweights.
}
- @Override
public boolean requestFocus(Component lightweightChild, boolean temporary,
boolean focusedWindowChangeAllowed,
long time, sun.awt.CausedFocusEvent.Cause cause)
diff --git a/gnu/java/awt/peer/gtk/GdkRobotPeer.java b/gnu/java/awt/peer/gtk/GdkRobotPeer.java
index 185a74c95..d3e9774da 100644
--- a/gnu/java/awt/peer/gtk/GdkRobotPeer.java
+++ b/gnu/java/awt/peer/gtk/GdkRobotPeer.java
@@ -92,7 +92,6 @@ public class GdkRobotPeer implements RobotPeer
return pixels;
}
- @Override
public void dispose()
{
// Nothing to do here yet.
diff --git a/gnu/java/awt/peer/gtk/GtkComponentPeer.java b/gnu/java/awt/peer/gtk/GtkComponentPeer.java
index 5733959b1..a270c6e3f 100644
--- a/gnu/java/awt/peer/gtk/GtkComponentPeer.java
+++ b/gnu/java/awt/peer/gtk/GtkComponentPeer.java
@@ -900,7 +900,6 @@ public class GtkComponentPeer extends GtkGenericPeer
}
- @Override
public boolean requestFocus(Component lightweightChild, boolean temporary,
boolean focusedWindowChangeAllowed,
long time, sun.awt.CausedFocusEvent.Cause cause)
diff --git a/gnu/java/awt/peer/gtk/GtkFramePeer.java b/gnu/java/awt/peer/gtk/GtkFramePeer.java
index 3b7fce577..4278a4579 100644
--- a/gnu/java/awt/peer/gtk/GtkFramePeer.java
+++ b/gnu/java/awt/peer/gtk/GtkFramePeer.java
@@ -245,7 +245,6 @@ public class GtkFramePeer extends GtkWindowPeer
return false;
}
- @Override
public Rectangle getBoundsPrivate()
{
// TODO: Implement this properly.
diff --git a/gnu/java/awt/peer/gtk/GtkWindowPeer.java b/gnu/java/awt/peer/gtk/GtkWindowPeer.java
index e671d9f40..d8054150d 100644
--- a/gnu/java/awt/peer/gtk/GtkWindowPeer.java
+++ b/gnu/java/awt/peer/gtk/GtkWindowPeer.java
@@ -399,31 +399,26 @@ public class GtkWindowPeer extends GtkContainerPeer
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.
diff --git a/gnu/java/awt/peer/qt/QtComponentPeer.java b/gnu/java/awt/peer/qt/QtComponentPeer.java
index b3df57a1e..334f59088 100644
--- a/gnu/java/awt/peer/qt/QtComponentPeer.java
+++ b/gnu/java/awt/peer/qt/QtComponentPeer.java
@@ -822,7 +822,6 @@ public class QtComponentPeer extends NativeWrapper implements ComponentPeer
// TODO Auto-generated method stub
}
- @Override
public boolean requestFocus(Component lightweightChild, boolean temporary,
boolean focusedWindowChangeAllowed,
long time, sun.awt.CausedFocusEvent.Cause cause)
diff --git a/gnu/java/awt/peer/qt/QtFramePeer.java b/gnu/java/awt/peer/qt/QtFramePeer.java
index 1a6e77dfe..e3b578933 100644
--- a/gnu/java/awt/peer/qt/QtFramePeer.java
+++ b/gnu/java/awt/peer/qt/QtFramePeer.java
@@ -155,7 +155,6 @@ public class QtFramePeer extends QtWindowPeer implements FramePeer
return false;
}
- @Override
public Rectangle getBoundsPrivate()
{
// TODO: Implement this properly.
diff --git a/gnu/java/awt/peer/qt/QtWindowPeer.java b/gnu/java/awt/peer/qt/QtWindowPeer.java
index 70579e76a..e0a9e8c55 100644
--- a/gnu/java/awt/peer/qt/QtWindowPeer.java
+++ b/gnu/java/awt/peer/qt/QtWindowPeer.java
@@ -65,45 +65,38 @@ public class QtWindowPeer extends QtContainerPeer implements WindowPeer
*/
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.
diff --git a/gnu/java/awt/peer/swing/SwingComponentPeer.java b/gnu/java/awt/peer/swing/SwingComponentPeer.java
index ebf635869..71a7bac4d 100644
--- a/gnu/java/awt/peer/swing/SwingComponentPeer.java
+++ b/gnu/java/awt/peer/swing/SwingComponentPeer.java
@@ -1126,7 +1126,6 @@ public class SwingComponentPeer
return awtComponent;
}
- @Override
public boolean requestFocus(Component lightweightChild, boolean temporary,
boolean focusedWindowChangeAllowed,
long time, sun.awt.CausedFocusEvent.Cause cause)
diff --git a/gnu/java/awt/peer/swing/SwingWindowPeer.java b/gnu/java/awt/peer/swing/SwingWindowPeer.java
index 23858b301..bdc494e95 100644
--- a/gnu/java/awt/peer/swing/SwingWindowPeer.java
+++ b/gnu/java/awt/peer/swing/SwingWindowPeer.java
@@ -72,31 +72,26 @@ public abstract class SwingWindowPeer
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.
diff --git a/gnu/java/awt/peer/x/XFramePeer.java b/gnu/java/awt/peer/x/XFramePeer.java
index b6cfdbd14..74e47bc28 100644
--- a/gnu/java/awt/peer/x/XFramePeer.java
+++ b/gnu/java/awt/peer/x/XFramePeer.java
@@ -137,7 +137,6 @@ public class XFramePeer
throw new UnsupportedOperationException("Not yet implemented.");
}
- @Override
public Rectangle getBoundsPrivate()
{
// TODO: Implement this properly.