[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[cp-patches] add 1.5 peer methods
|
From: |
Thomas Fitzsimmons |
|
Subject: |
[cp-patches] add 1.5 peer methods |
|
Date: |
Thu, 18 Aug 2005 21:32:42 -0400 |
Hi,
I needed to add these methods to the GTK peers so that they would
compile with Sun's 1.5 javac. I extended the peer interfaces and the Qt
peers accordingly. This patch also contains some minor fixes to
GraphicsEnvironment and Window.
Tom
2005-08-18 Thomas Fitzsimmons <address@hidden>
* gnu/java/awt/peer/GLightweightPeer.java,
gnu/java/awt/peer/gtk/GtkComponentPeer.java,
gnu/java/awt/peer/gtk/GtkContainerPeer.java,
gnu/java/awt/peer/gtk/GtkFramePeer.java,
gnu/java/awt/peer/gtk/GtkMenuComponentPeer.java,
gnu/java/awt/peer/gtk/GtkTextAreaPeer.java,
gnu/java/awt/peer/gtk/GtkTextFieldPeer.java,
gnu/java/awt/peer/gtk/GtkToolkit.java,
gnu/java/awt/peer/gtk/GtkWindowPeer.java,
gnu/java/awt/peer/qt/QtComponentPeer.java,
gnu/java/awt/peer/qt/QtContainerPeer.java,
gnu/java/awt/peer/qt/QtFramePeer.java,
gnu/java/awt/peer/qt/QtMenuComponentPeer.java,
gnu/java/awt/peer/qt/QtScreenDeviceConfiguration.java,
gnu/java/awt/peer/qt/QtTextAreaPeer.java,
gnu/java/awt/peer/qt/QtTextFieldPeer.java,
gnu/java/awt/peer/qt/QtWindowPeer.java,
java/awt/peer/ComponentPeer.java,
java/awt/peer/ContainerPeer.java, java/awt/peer/FramePeer.java,
java/awt/peer/MenuComponentPeer.java,
java/awt/peer/TextComponentPeer.java,
java/awt/peer/WindowPeer.java: Add new 1.5 methods.
* java/awt/Window.java (Window()): Initialize
graphicsConfiguration.
* java/awt/GraphicsConfiguration.java
(createCompatibleVolatileImage(int,int,int)): New method.
* java/awt/Font.java (Font(String,Map)): Add FIXME.
* gnu/java/awt/peer/gtk/GtkToolkit.java
(getLocalGraphicsEnvironment): Call new constructor.
* gnu/java/awt/peer/gtk/GdkScreenGraphicsDevice.java (getToolkit):
Remove method.
* gnu/java/awt/peer/gtk/GdkGraphicsEnvironment.java
(GdkGraphicsEnvironment(GtkToolkit)): Remove method.
(GdkGraphicsEnvironment()): New constructor.
(getToolkit): Remove method.
* gnu/java/awt/peer/gtk/GdkGraphicsConfiguration.java
(getToolkit): Remove method.
(createCompatibleVolatileImage): New method.
* gnu/java/awt/ClasspathToolkit.java (getFont): Add FIXME.
Index: gnu/java/awt/ClasspathToolkit.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/awt/ClasspathToolkit.java,v
retrieving revision 1.14
diff -u -r1.14 ClasspathToolkit.java
--- gnu/java/awt/ClasspathToolkit.java 15 Aug 2005 18:32:38 -0000 1.14
+++ gnu/java/awt/ClasspathToolkit.java 19 Aug 2005 01:24:54 -0000
@@ -129,6 +129,7 @@
*/
public Font getFont (String name, Map attrs)
{
+ // FIXME: use reflection to get at this non-standard constructor.
return new Font (name, attrs);
}
Index: gnu/java/awt/peer/GLightweightPeer.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/awt/peer/GLightweightPeer.java,v
retrieving revision 1.5
diff -u -r1.5 GLightweightPeer.java
--- gnu/java/awt/peer/GLightweightPeer.java 2 Jul 2005 20:32:11 -0000
1.5
+++ gnu/java/awt/peer/GLightweightPeer.java 19 Aug 2005 01:24:54 -0000
@@ -52,6 +52,7 @@
import java.awt.Image;
import java.awt.Insets;
import java.awt.Point;
+import java.awt.Rectangle;
import java.awt.Toolkit;
import java.awt.event.PaintEvent;
import java.awt.image.ColorModel;
@@ -295,4 +296,44 @@
public void flip(BufferCapabilities.FlipContents contents) { }
public void destroyBuffers() { }
+
+ public boolean isRestackSupported()
+ {
+ return false;
+ }
+
+ public void cancelPendingPaint(int x, int y, int width, int height)
+ {
+
+ }
+
+ public void restack()
+ {
+
+ }
+
+ public Rectangle getBounds()
+ {
+ return null;
+ }
+
+ public void reparent(ContainerPeer parent)
+ {
+
+ }
+
+ public void setBounds(int x, int y, int z, int width, int height)
+ {
+
+ }
+
+ public boolean isReparentSupported()
+ {
+ return false;
+ }
+
+ public void layout()
+ {
+
+ }
}
Index: gnu/java/awt/peer/gtk/GdkGraphicsConfiguration.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/gnu/java/awt/peer/gtk/GdkGraphicsConfiguration.java,v
retrieving revision 1.4
diff -u -r1.4 GdkGraphicsConfiguration.java
--- gnu/java/awt/peer/gtk/GdkGraphicsConfiguration.java 2 Jul 2005 20:32:11
-0000 1.4
+++ gnu/java/awt/peer/gtk/GdkGraphicsConfiguration.java 19 Aug 2005 01:24:54
-0000
@@ -42,6 +42,7 @@
import java.awt.GraphicsDevice;
import java.awt.ImageCapabilities;
import java.awt.Rectangle;
+import java.awt.Toolkit;
import java.awt.geom.AffineTransform;
@@ -56,16 +57,11 @@
ColorModel cm;
Rectangle bounds;
- public GtkToolkit getToolkit()
- {
- return gdkScreenGraphicsDevice.getToolkit();
- }
-
public GdkGraphicsConfiguration(GdkScreenGraphicsDevice dev)
{
this.gdkScreenGraphicsDevice = dev;
cm = new BufferedImage(1, 1, BufferedImage.TYPE_INT_ARGB).getColorModel();
- bounds = getToolkit().getBounds();
+ bounds = ((GtkToolkit) Toolkit.getDefaultToolkit()).getBounds();
}
public GraphicsDevice getDevice()
@@ -133,6 +129,12 @@
public ImageCapabilities getImageCapabilities()
{
return new ImageCapabilities(false);
+ }
+
+ public VolatileImage createCompatibleVolatileImage(int width, int height,
int transparency)
+ {
+ // FIXME: implement
+ return null;
}
}
Index: gnu/java/awt/peer/gtk/GdkGraphicsEnvironment.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/gnu/java/awt/peer/gtk/GdkGraphicsEnvironment.java,v
retrieving revision 1.9
diff -u -r1.9 GdkGraphicsEnvironment.java
--- gnu/java/awt/peer/gtk/GdkGraphicsEnvironment.java 2 Jul 2005 20:32:11
-0000 1.9
+++ gnu/java/awt/peer/gtk/GdkGraphicsEnvironment.java 19 Aug 2005 01:24:54
-0000
@@ -43,22 +43,14 @@
import java.awt.GraphicsDevice;
import java.awt.GraphicsEnvironment;
import java.awt.HeadlessException;
+import java.awt.Toolkit;
import java.awt.image.BufferedImage;
import java.util.Locale;
public class GdkGraphicsEnvironment extends GraphicsEnvironment
{
- GtkToolkit gtkToolkit;
-
- public GtkToolkit getToolkit()
- {
- return gtkToolkit;
- }
-
- public GdkGraphicsEnvironment (GtkToolkit tk)
+ public GdkGraphicsEnvironment ()
{
- super();
- gtkToolkit = tk;
}
public GraphicsDevice[] getScreenDevices ()
Index: gnu/java/awt/peer/gtk/GdkScreenGraphicsDevice.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/gnu/java/awt/peer/gtk/GdkScreenGraphicsDevice.java,v
retrieving revision 1.5
diff -u -r1.5 GdkScreenGraphicsDevice.java
--- gnu/java/awt/peer/gtk/GdkScreenGraphicsDevice.java 2 Jul 2005 20:32:12
-0000 1.5
+++ gnu/java/awt/peer/gtk/GdkScreenGraphicsDevice.java 19 Aug 2005 01:24:54
-0000
@@ -42,16 +42,12 @@
import java.awt.DisplayMode;
import java.awt.GraphicsConfiguration;
import java.awt.GraphicsDevice;
+import java.awt.Toolkit;
public class GdkScreenGraphicsDevice extends GraphicsDevice
{
GdkGraphicsEnvironment env;
- public GtkToolkit getToolkit()
- {
- return env.getToolkit();
- }
-
public GdkScreenGraphicsDevice (GdkGraphicsEnvironment e)
{
super ();
@@ -94,7 +90,7 @@
public DisplayMode getDisplayMode()
{
// determine display mode
- Dimension dim = getToolkit().getScreenSize();
+ Dimension dim = Toolkit.getDefaultToolkit().getScreenSize();
DisplayMode mode = new DisplayMode(dim.width, dim.height, 0,
DisplayMode.REFRESH_RATE_UNKNOWN);
return mode;
Index: gnu/java/awt/peer/gtk/GtkComponentPeer.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/gnu/java/awt/peer/gtk/GtkComponentPeer.java,v
retrieving revision 1.93
diff -u -r1.93 GtkComponentPeer.java
--- gnu/java/awt/peer/gtk/GtkComponentPeer.java 14 Aug 2005 01:53:16 -0000
1.93
+++ gnu/java/awt/peer/gtk/GtkComponentPeer.java 19 Aug 2005 01:24:54 -0000
@@ -70,6 +70,7 @@
import java.awt.image.ImageProducer;
import java.awt.image.VolatileImage;
import java.awt.peer.ComponentPeer;
+import java.awt.peer.ContainerPeer;
import java.util.Timer;
import java.util.TimerTask;
@@ -682,5 +683,32 @@
public String toString ()
{
return "peer of " + awtComponent.toString();
+ }
+ public Rectangle getBounds()
+ {
+ // FIXME: implement
+ return null;
+ }
+ public void reparent(ContainerPeer parent)
+ {
+ // FIXME: implement
+
+ }
+ public void setBounds(int x, int y, int width, int height, int z)
+ {
+ // FIXME: implement
+ setBounds (x, y, width, height);
+
+ }
+ public boolean isReparentSupported()
+ {
+ // FIXME: implement
+
+ return false;
+ }
+ public void layout()
+ {
+ // FIXME: implement
+
}
}
Index: gnu/java/awt/peer/gtk/GtkContainerPeer.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/gnu/java/awt/peer/gtk/GtkContainerPeer.java,v
retrieving revision 1.31
diff -u -r1.31 GtkContainerPeer.java
--- gnu/java/awt/peer/gtk/GtkContainerPeer.java 17 Aug 2005 04:24:38 -0000
1.31
+++ gnu/java/awt/peer/gtk/GtkContainerPeer.java 19 Aug 2005 01:24:54 -0000
@@ -149,4 +149,21 @@
comp.getPeer().setBackground(c);
}
}
+
+ public boolean isRestackSupported()
+ {
+ // FIXME: implement
+ return false;
+ }
+
+ public void cancelPendingPaint(int x, int y, int width, int height)
+ {
+ // FIXME: implement
+ }
+
+ public void restack()
+ {
+ //FIXME: implement
+
+ }
}
Index: gnu/java/awt/peer/gtk/GtkFramePeer.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/awt/peer/gtk/GtkFramePeer.java,v
retrieving revision 1.39
diff -u -r1.39 GtkFramePeer.java
--- gnu/java/awt/peer/gtk/GtkFramePeer.java 18 Aug 2005 01:22:00 -0000
1.39
+++ gnu/java/awt/peer/gtk/GtkFramePeer.java 19 Aug 2005 01:24:54 -0000
@@ -264,6 +264,21 @@
{
}
+ public void setBoundsPrivate(int x, int y, int width, int height)
+ {
+ // TODO Auto-generated method stub
+
+ }
+ public void updateAlwaysOnTop()
+ {
+ // TODO Auto-generated method stub
+
+ }
+ public boolean requestWindowFocus()
+ {
+ // TODO Auto-generated method stub
+ return false;
+ }
}
Index: gnu/java/awt/peer/gtk/GtkMenuComponentPeer.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/gnu/java/awt/peer/gtk/GtkMenuComponentPeer.java,v
retrieving revision 1.10
diff -u -r1.10 GtkMenuComponentPeer.java
--- gnu/java/awt/peer/gtk/GtkMenuComponentPeer.java 2 Jul 2005 20:32:12
-0000 1.10
+++ gnu/java/awt/peer/gtk/GtkMenuComponentPeer.java 19 Aug 2005 01:24:54
-0000
@@ -38,6 +38,7 @@
package gnu.java.awt.peer.gtk;
+import java.awt.Font;
import java.awt.peer.MenuComponentPeer;
public class GtkMenuComponentPeer extends GtkGenericPeer
@@ -60,4 +61,9 @@
}
public native void dispose();
+
+ public void setFont(Font font)
+ {
+ // FIXME: implement
+ }
}
Index: gnu/java/awt/peer/gtk/GtkTextAreaPeer.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/gnu/java/awt/peer/gtk/GtkTextAreaPeer.java,v
retrieving revision 1.25
diff -u -r1.25 GtkTextAreaPeer.java
--- gnu/java/awt/peer/gtk/GtkTextAreaPeer.java 4 Jul 2005 23:56:36 -0000
1.25
+++ gnu/java/awt/peer/gtk/GtkTextAreaPeer.java 19 Aug 2005 01:24:54 -0000
@@ -43,6 +43,7 @@
import java.awt.FontMetrics;
import java.awt.Rectangle;
import java.awt.TextArea;
+import java.awt.im.InputMethodRequests;
import java.awt.peer.TextAreaPeer;
import java.awt.peer.TextComponentPeer;
@@ -208,5 +209,11 @@
public void insertText (String str, int pos)
{
insert (str, pos);
+ }
+
+ public InputMethodRequests getInputMethodRequests()
+ {
+ // FIXME: implement
+ return null;
}
}
Index: gnu/java/awt/peer/gtk/GtkTextFieldPeer.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/gnu/java/awt/peer/gtk/GtkTextFieldPeer.java,v
retrieving revision 1.30
diff -u -r1.30 GtkTextFieldPeer.java
--- gnu/java/awt/peer/gtk/GtkTextFieldPeer.java 4 Jul 2005 23:56:36 -0000
1.30
+++ gnu/java/awt/peer/gtk/GtkTextFieldPeer.java 19 Aug 2005 01:24:54 -0000
@@ -45,6 +45,7 @@
import java.awt.Rectangle;
import java.awt.TextField;
import java.awt.event.KeyEvent;
+import java.awt.im.InputMethodRequests;
import java.awt.peer.TextFieldPeer;
import java.awt.peer.TextComponentPeer;
@@ -192,5 +193,10 @@
}
super.handleEvent (e);
+ }
+ public InputMethodRequests getInputMethodRequests()
+ {
+ // FIXME: implement
+ return null;
}
}
Index: gnu/java/awt/peer/gtk/GtkToolkit.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/awt/peer/gtk/GtkToolkit.java,v
retrieving revision 1.75
diff -u -r1.75 GtkToolkit.java
--- gnu/java/awt/peer/gtk/GtkToolkit.java 18 Aug 2005 01:22:00 -0000
1.75
+++ gnu/java/awt/peer/gtk/GtkToolkit.java 19 Aug 2005 01:24:54 -0000
@@ -643,7 +643,7 @@
public GraphicsEnvironment getLocalGraphicsEnvironment()
{
- return new GdkGraphicsEnvironment(this);
+ return new GdkGraphicsEnvironment();
}
public Font createFont(int format, InputStream stream)
Index: gnu/java/awt/peer/gtk/GtkWindowPeer.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/gnu/java/awt/peer/gtk/GtkWindowPeer.java,v
retrieving revision 1.38
diff -u -r1.38 GtkWindowPeer.java
--- gnu/java/awt/peer/gtk/GtkWindowPeer.java 18 Aug 2005 01:22:00 -0000
1.38
+++ gnu/java/awt/peer/gtk/GtkWindowPeer.java 19 Aug 2005 01:24:55 -0000
@@ -239,4 +239,14 @@
else
q().postEvent (new WindowEvent ((Window) awtComponent, id, opposite));
}
+ public void updateAlwaysOnTop()
+ {
+ // TODO Auto-generated method stub
+
+ }
+ public boolean requestWindowFocus()
+ {
+ // TODO Auto-generated method stub
+ return false;
+ }
}
Index: gnu/java/awt/peer/qt/QtComponentPeer.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/gnu/java/awt/peer/qt/QtComponentPeer.java,v
retrieving revision 1.3
diff -u -r1.3 QtComponentPeer.java
--- gnu/java/awt/peer/qt/QtComponentPeer.java 16 Aug 2005 23:22:09 -0000
1.3
+++ gnu/java/awt/peer/qt/QtComponentPeer.java 19 Aug 2005 01:24:55 -0000
@@ -58,6 +58,7 @@
import java.awt.Toolkit;
import java.awt.Window;
import java.awt.peer.ComponentPeer;
+import java.awt.peer.ContainerPeer;
import java.awt.image.ColorModel;
import java.awt.image.VolatileImage;
import java.awt.image.ImageObserver;
@@ -710,6 +711,36 @@
{
QtUpdateArea(x, y, w, h);
}
+ }
+
+ public Rectangle getBounds()
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public void reparent(ContainerPeer parent)
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+ public void setBounds(int x, int y, int width, int height, int z)
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+ public boolean isReparentSupported()
+ {
+ // TODO Auto-generated method stub
+ return false;
+ }
+
+ public void layout()
+ {
+ // TODO Auto-generated method stub
+
}
}
Index: gnu/java/awt/peer/qt/QtContainerPeer.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/gnu/java/awt/peer/qt/QtContainerPeer.java,v
retrieving revision 1.2
diff -u -r1.2 QtContainerPeer.java
--- gnu/java/awt/peer/qt/QtContainerPeer.java 16 Aug 2005 23:22:09 -0000
1.2
+++ gnu/java/awt/peer/qt/QtContainerPeer.java 19 Aug 2005 01:24:55 -0000
@@ -92,6 +92,24 @@
// FIXME etc.
return false;
}
+
+ public boolean isRestackSupported()
+ {
+ // TODO Auto-generated method stub
+ return false;
+ }
+
+ public void cancelPendingPaint(int x, int y, int width, int height)
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+ public void restack()
+ {
+ // TODO Auto-generated method stub
+
+ }
}
Index: gnu/java/awt/peer/qt/QtFramePeer.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/awt/peer/qt/QtFramePeer.java,v
retrieving revision 1.3
diff -u -r1.3 QtFramePeer.java
--- gnu/java/awt/peer/qt/QtFramePeer.java 17 Aug 2005 10:50:33 -0000
1.3
+++ gnu/java/awt/peer/qt/QtFramePeer.java 19 Aug 2005 01:24:55 -0000
@@ -142,4 +142,22 @@
// FIXME
}
+ public void setBoundsPrivate(int x, int y, int width, int height)
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+ public void updateAlwaysOnTop()
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+ public boolean requestWindowFocus()
+ {
+ // TODO Auto-generated method stub
+ return false;
+ }
+
}
Index: gnu/java/awt/peer/qt/QtMenuComponentPeer.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/gnu/java/awt/peer/qt/QtMenuComponentPeer.java,v
retrieving revision 1.1
diff -u -r1.1 QtMenuComponentPeer.java
--- gnu/java/awt/peer/qt/QtMenuComponentPeer.java 11 Aug 2005 17:06:48
-0000 1.1
+++ gnu/java/awt/peer/qt/QtMenuComponentPeer.java 19 Aug 2005 01:24:55
-0000
@@ -37,6 +37,7 @@
package gnu.java.awt.peer.qt;
+import java.awt.Font;
import java.awt.MenuComponent;
import java.awt.peer.MenuComponentPeer;
@@ -73,5 +74,11 @@
// ************ Public methods *********************
public native void dispose();
+
+ public void setFont(Font font)
+ {
+ // TODO Auto-generated method stub
+
+ }
}
Index: gnu/java/awt/peer/qt/QtScreenDeviceConfiguration.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/gnu/java/awt/peer/qt/QtScreenDeviceConfiguration.java,v
retrieving revision 1.1
diff -u -r1.1 QtScreenDeviceConfiguration.java
--- gnu/java/awt/peer/qt/QtScreenDeviceConfiguration.java 11 Aug 2005
17:06:48 -0000 1.1
+++ gnu/java/awt/peer/qt/QtScreenDeviceConfiguration.java 19 Aug 2005
01:24:55 -0000
@@ -138,4 +138,10 @@
nTrans.scale( 72.0 / dpiX, 72.0 / dpiY );
return nTrans;
}
+
+ public VolatileImage createCompatibleVolatileImage(int width, int height,
int transparency)
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
}
Index: gnu/java/awt/peer/qt/QtTextAreaPeer.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/gnu/java/awt/peer/qt/QtTextAreaPeer.java,v
retrieving revision 1.2
diff -u -r1.2 QtTextAreaPeer.java
--- gnu/java/awt/peer/qt/QtTextAreaPeer.java 16 Aug 2005 23:22:09 -0000
1.2
+++ gnu/java/awt/peer/qt/QtTextAreaPeer.java 19 Aug 2005 01:24:55 -0000
@@ -41,6 +41,7 @@
import java.awt.Rectangle;
import java.awt.TextArea;
import java.awt.event.TextEvent;
+import java.awt.im.InputMethodRequests;
import java.awt.peer.TextAreaPeer;
public class QtTextAreaPeer extends QtComponentPeer implements TextAreaPeer
@@ -169,5 +170,11 @@
public native void setEditable(boolean editable);
public native void setCaretPosition(int pos);
+
+ public InputMethodRequests getInputMethodRequests()
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
}
Index: gnu/java/awt/peer/qt/QtTextFieldPeer.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/gnu/java/awt/peer/qt/QtTextFieldPeer.java,v
retrieving revision 1.2
diff -u -r1.2 QtTextFieldPeer.java
--- gnu/java/awt/peer/qt/QtTextFieldPeer.java 16 Aug 2005 23:22:09 -0000
1.2
+++ gnu/java/awt/peer/qt/QtTextFieldPeer.java 19 Aug 2005 01:24:55 -0000
@@ -41,6 +41,7 @@
import java.awt.Rectangle;
import java.awt.TextField;
import java.awt.event.TextEvent;
+import java.awt.im.InputMethodRequests;
import java.awt.peer.TextFieldPeer;
public class QtTextFieldPeer extends QtComponentPeer implements TextFieldPeer
@@ -149,5 +150,11 @@
public native void setEditable(boolean editable);
public native void setText(String l);
+
+ public InputMethodRequests getInputMethodRequests()
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
}
Index: gnu/java/awt/peer/qt/QtWindowPeer.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/awt/peer/qt/QtWindowPeer.java,v
retrieving revision 1.2
diff -u -r1.2 QtWindowPeer.java
--- gnu/java/awt/peer/qt/QtWindowPeer.java 16 Aug 2005 23:22:09 -0000
1.2
+++ gnu/java/awt/peer/qt/QtWindowPeer.java 19 Aug 2005 01:24:55 -0000
@@ -65,4 +65,16 @@
*/
public native void setTitle(String title);
+ public void updateAlwaysOnTop()
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+ public boolean requestWindowFocus()
+ {
+ // TODO Auto-generated method stub
+ return false;
+ }
+
}
Index: java/awt/Font.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/awt/Font.java,v
retrieving revision 1.27
diff -u -r1.27 Font.java
--- java/awt/Font.java 2 Jul 2005 20:32:24 -0000 1.27
+++ java/awt/Font.java 19 Aug 2005 01:24:55 -0000
@@ -355,6 +355,8 @@
/* This extra constructor is here to permit ClasspathToolkit and to build
a font with a "logical name" as well as attrs. */
+ // FIXME: make this package-private and use reflection in
+ // ClasspathToolkit to get at it.
public Font (String name, Map attrs)
{
// If attrs is null, setting it to an empty HashMap will give this
Index: java/awt/GraphicsConfiguration.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/awt/GraphicsConfiguration.java,v
retrieving revision 1.6
diff -u -r1.6 GraphicsConfiguration.java
--- java/awt/GraphicsConfiguration.java 2 Jul 2005 20:32:24 -0000 1.6
+++ java/awt/GraphicsConfiguration.java 19 Aug 2005 01:24:55 -0000
@@ -126,6 +126,22 @@
}
/**
+ * Returns a buffered volatile image optimized to this device, and
+ * with the given transparency. Because the buffer is volatile, it
+ * can be optimized by native graphics accelerators.
+ *
+ * @param w the width of the buffer
+ * @param h the height of the buffer
+ * @param transparency the transparency value for the buffer
+ * @return the buffered image, or null if none is supported
+ * @throws AWTException if the capabilities cannot be met
+ * @since 1.5
+ */
+ public abstract VolatileImage createCompatibleVolatileImage(int width,
+ int height,
+ int
transparency);
+
+ /**
* Returns a buffered image optimized to this device, and with the specified
* transparency, so that blitting can be supported in the buffered image.
*
Index: java/awt/Window.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/awt/Window.java,v
retrieving revision 1.51
diff -u -r1.51 Window.java
--- java/awt/Window.java 17 Aug 2005 04:24:38 -0000 1.51
+++ java/awt/Window.java 19 Aug 2005 01:24:55 -0000
@@ -155,6 +155,9 @@
}
}
});
+
+ GraphicsEnvironment g = GraphicsEnvironment.getLocalGraphicsEnvironment();
+ graphicsConfiguration =
g.getDefaultScreenDevice().getDefaultConfiguration();
}
Window(GraphicsConfiguration gc)
Index: java/awt/peer/ComponentPeer.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/awt/peer/ComponentPeer.java,v
retrieving revision 1.14
diff -u -r1.14 ComponentPeer.java
--- java/awt/peer/ComponentPeer.java 2 Jul 2005 20:32:36 -0000 1.14
+++ java/awt/peer/ComponentPeer.java 19 Aug 2005 01:24:55 -0000
@@ -51,6 +51,7 @@
import java.awt.GraphicsConfiguration;
import java.awt.Image;
import java.awt.Point;
+import java.awt.Rectangle;
import java.awt.Toolkit;
import java.awt.event.PaintEvent;
import java.awt.image.ColorModel;
@@ -184,4 +185,48 @@
* @since 1.2
*/
void destroyBuffers();
+
+ /**
+ * Get the bounds of this component peer.
+ *
+ * @return component peer bounds
+ * @since 1.5
+ */
+ Rectangle getBounds();
+
+ /**
+ * Reparent this component under another container.
+ *
+ * @param parent
+ * @since 1.5
+ */
+ void reparent(ContainerPeer parent);
+
+ /**
+ * Set the bounds of this component peer.
+ *
+ * @param x the new x co-ordinate
+ * @param y the new y co-ordinate
+ * @param width the new width
+ * @param height the new height
+ * @param z the new stacking level
+ * @since 1.5
+ */
+ void setBounds (int x, int y, int width, int height, int z);
+
+ /**
+ * Check if this component supports being reparented.
+ *
+ * @return true if this component can be reparented,
+ * false otherwise.
+ * @since 1.5
+ */
+ boolean isReparentSupported();
+
+ /**
+ * Layout this component peer.
+ *
+ * @since 1.5
+ */
+ void layout();
}
Index: java/awt/peer/ContainerPeer.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/awt/peer/ContainerPeer.java,v
retrieving revision 1.10
diff -u -r1.10 ContainerPeer.java
--- java/awt/peer/ContainerPeer.java 2 Jul 2005 20:32:36 -0000 1.10
+++ java/awt/peer/ContainerPeer.java 19 Aug 2005 01:24:55 -0000
@@ -54,6 +54,31 @@
void endLayout();
boolean isPaintPending();
+
+ /**
+ * Check if this container peer can be restacked.
+ *
+ * @return true if this container peer supports being restacked, false
otherwise
+ * @since 1.5
+ */
+ boolean isRestackSupported();
+ /**
+ * Cancel a pending paint event on a region of this container.
+ *
+ * @param x the x co-ordinate of the region
+ * @param y the y co-ordinate of the region
+ * @param width the width of the region
+ * @param height the height of the region
+ * @since 1.5
+ */
+ void cancelPendingPaint(int x, int y, int width, int height);
+
+ /**
+ * Restack the component peers in this container peer.
+ *
+ * @since 1.5
+ */
+ void restack();
} // interface ContainerPeer
Index: java/awt/peer/FramePeer.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/awt/peer/FramePeer.java,v
retrieving revision 1.9
diff -u -r1.9 FramePeer.java
--- java/awt/peer/FramePeer.java 2 Jul 2005 20:32:36 -0000 1.9
+++ java/awt/peer/FramePeer.java 19 Aug 2005 01:24:55 -0000
@@ -51,5 +51,25 @@
int getState();
void setState(int state);
void setMaximizedBounds(Rectangle r);
+
+ /**
+ * Check if this frame peer supports being restacked.
+ *
+ * @return true if this frame peer can be restacked,
+ * false otherwise
+ * @since 1.5
+ */
+ boolean isRestackSupported();
+
+ /**
+ * Sets the bounds of this frame peer.
+ *
+ * @param x the new x co-ordinate
+ * @param y the new y co-ordinate
+ * @param width the new width
+ * @param height the new height
+ * @since 1.5
+ */
+ void setBoundsPrivate(int x, int y, int width, int height);
} // interface FramePeer
Index: java/awt/peer/MenuComponentPeer.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/awt/peer/MenuComponentPeer.java,v
retrieving revision 1.7
diff -u -r1.7 MenuComponentPeer.java
--- java/awt/peer/MenuComponentPeer.java 2 Jul 2005 20:32:36 -0000
1.7
+++ java/awt/peer/MenuComponentPeer.java 19 Aug 2005 01:24:55 -0000
@@ -38,8 +38,18 @@
package java.awt.peer;
+import java.awt.Font;
+
public interface MenuComponentPeer
{
void dispose();
+
+ /**
+ * Set the font on this menu component peer.
+ *
+ * @param font the new font
+ * @since 1.5
+ */
+ void setFont (Font font);
} // interface MenuComponentPeer
Index: java/awt/peer/TextComponentPeer.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/awt/peer/TextComponentPeer.java,v
retrieving revision 1.10
diff -u -r1.10 TextComponentPeer.java
--- java/awt/peer/TextComponentPeer.java 2 Jul 2005 20:32:36 -0000
1.10
+++ java/awt/peer/TextComponentPeer.java 19 Aug 2005 01:24:56 -0000
@@ -39,6 +39,7 @@
package java.awt.peer;
import java.awt.Rectangle;
+import java.awt.im.InputMethodRequests;
public interface TextComponentPeer extends ComponentPeer
{
@@ -53,5 +54,13 @@
int getIndexAtPoint(int x, int y);
Rectangle getCharacterBounds(int pos);
long filterEvents(long filter);
+
+ /**
+ * Retrieve this text component peer's input method requests.
+ *
+ * @return the input method requests made by this text component peer
+ * @since 1.5
+ */
+ InputMethodRequests getInputMethodRequests();
} // interface TextComponentPeer
Index: java/awt/peer/WindowPeer.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/awt/peer/WindowPeer.java,v
retrieving revision 1.9
diff -u -r1.9 WindowPeer.java
--- java/awt/peer/WindowPeer.java 2 Jul 2005 20:32:36 -0000 1.9
+++ java/awt/peer/WindowPeer.java 19 Aug 2005 01:24:56 -0000
@@ -42,5 +42,19 @@
{
void toBack();
void toFront();
+
+ /**
+ * FIXME: unknown.
+ * @since 1.5
+ */
+ void updateAlwaysOnTop();
+
+ /**
+ * Request that this window peer be given the window focus.
+ *
+ * @return true if the window received focus, false otherwise
+ * @since 1.5
+ */
+ boolean requestWindowFocus();
} // interface WindowPeer
- [cp-patches] add 1.5 peer methods,
Thomas Fitzsimmons <=