[kaffe] CVS kaffe (robilad): Resynced with GNU Classpath: awt fixes
Kaffe CVS
cvs-commits at kaffe.org
Sun Aug 21 11:35:56 PDT 2005
PatchSet 6861
Date: 2005/08/21 18:30:58
Author: robilad
Branch: HEAD
Tag: (none)
Log:
Resynced with GNU Classpath: awt fixes
Members:
ChangeLog:1.4383->1.4384
libraries/javalib/gnu/java/awt/ClasspathToolkit.java:1.13->1.14
libraries/javalib/gnu/java/awt/peer/GLightweightPeer.java:1.4->1.5
libraries/javalib/gnu/java/awt/peer/gtk/GdkGraphicsConfiguration.java:1.4->1.5
libraries/javalib/gnu/java/awt/peer/gtk/GdkGraphicsEnvironment.java:1.9->1.10
libraries/javalib/gnu/java/awt/peer/gtk/GdkScreenGraphicsDevice.java:1.5->1.6
libraries/javalib/gnu/java/awt/peer/gtk/GtkComponentPeer.java:1.21->1.22
libraries/javalib/gnu/java/awt/peer/gtk/GtkContainerPeer.java:1.7->1.8
libraries/javalib/gnu/java/awt/peer/gtk/GtkFramePeer.java:1.13->1.14
libraries/javalib/gnu/java/awt/peer/gtk/GtkMenuComponentPeer.java:1.4->1.5
libraries/javalib/gnu/java/awt/peer/gtk/GtkTextAreaPeer.java:1.5->1.6
libraries/javalib/gnu/java/awt/peer/gtk/GtkTextFieldPeer.java:1.6->1.7
libraries/javalib/gnu/java/awt/peer/gtk/GtkToolkit.java:1.22->1.23
libraries/javalib/gnu/java/awt/peer/gtk/GtkWindowPeer.java:1.13->1.14
libraries/javalib/gnu/java/awt/peer/qt/QtComponentPeer.java:1.2->1.3
libraries/javalib/gnu/java/awt/peer/qt/QtContainerPeer.java:1.2->1.3
libraries/javalib/gnu/java/awt/peer/qt/QtFramePeer.java:1.2->1.3
libraries/javalib/gnu/java/awt/peer/qt/QtMenuComponentPeer.java:1.1->1.2
libraries/javalib/gnu/java/awt/peer/qt/QtScreenDeviceConfiguration.java:1.1->1.2
libraries/javalib/gnu/java/awt/peer/qt/QtTextAreaPeer.java:1.2->1.3
libraries/javalib/gnu/java/awt/peer/qt/QtTextFieldPeer.java:1.2->1.3
libraries/javalib/gnu/java/awt/peer/qt/QtWindowPeer.java:1.2->1.3
libraries/javalib/java/awt/Font.java:1.27->1.28
libraries/javalib/java/awt/GraphicsConfiguration.java:1.3->1.4
libraries/javalib/java/awt/Window.java:1.36->1.37
libraries/javalib/java/awt/image/DirectColorModel.java:1.15->1.16
libraries/javalib/java/awt/peer/ComponentPeer.java:1.4->1.5
libraries/javalib/java/awt/peer/ContainerPeer.java:1.3->1.4
libraries/javalib/java/awt/peer/FramePeer.java:1.3->1.4
libraries/javalib/java/awt/peer/MenuComponentPeer.java:1.3->1.4
libraries/javalib/java/awt/peer/TextComponentPeer.java:1.3->1.4
libraries/javalib/java/awt/peer/WindowPeer.java:1.3->1.4
libraries/javalib/javax/swing/tree/DefaultTreeModel.java:1.8->1.9
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.4383 kaffe/ChangeLog:1.4384
--- kaffe/ChangeLog:1.4383 Sun Aug 21 18:00:51 2005
+++ kaffe/ChangeLog Sun Aug 21 18:30:58 2005
@@ -1,5 +1,83 @@
2005-08-21 Dalibor Topic <robilad at kaffe.org>
+ Resynced with GNU Classpath.
+
+ 2005-08-19 Lillian Angel <langel at redhat.com>
+
+ * javax/swing/tree/DefaultTreeModel.java
+ (setAsksAllowsChildren): Removed comment, unneeded.
+ (setRoot): Formatting.
+ (getIndexOfChild): Formatting.
+ (reload): Added API documentation.
+ (reload): Likewise.
+ (valueForPathChanged): Implemented.
+ (insertNodeInto): Implemented.
+ (removeNodeFromParent): Implemented.
+ (nodeChanged): Implemented.
+ (nodesWereInserted): Implemented.
+ (nodesWereRemoved): Implemented.
+ (nodesChanged): Implemented.
+ (nodeStructureChanged): Added API documentation.
+ (getPathToRoot): Implemented.
+ (getPathToRoot): Implemented.
+ (fireTreeNodesChanged): Added API documentation.
+
+ 2005-08-19 Roman Kennke <roman at kennke.org>
+
+ * java/awt/image/DirectColorModel.java
+ (createCompatibleWritableRaster): Added API documentation.
+
+ 2005-08-18 Thomas Fitzsimmons <fitzsim at redhat.com>
+
+ * java/awt/Font.java (Font(String,Map)): Make package private.
+ * gnu/java/awt/ClasspathToolkit.java (getFont): Access
+ package-private Font.Font(String,Map) constructor using
+ reflection.
+
+ 2005-08-18 Thomas Fitzsimmons <fitzsim at redhat.com>
+
+ * 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.
+
+2005-08-21 Dalibor Topic <robilad at kaffe.org>
+
Fixed Eclipse 3.1 startup.
* Makefile.am (BUILD_ENVIRONMENT) Adapted LD_LIBRARY_PATH to
Index: kaffe/libraries/javalib/gnu/java/awt/ClasspathToolkit.java
diff -u kaffe/libraries/javalib/gnu/java/awt/ClasspathToolkit.java:1.13 kaffe/libraries/javalib/gnu/java/awt/ClasspathToolkit.java:1.14
--- kaffe/libraries/javalib/gnu/java/awt/ClasspathToolkit.java:1.13 Wed Aug 17 22:38:28 2005
+++ kaffe/libraries/javalib/gnu/java/awt/ClasspathToolkit.java Sun Aug 21 18:31:01 2005
@@ -42,8 +42,10 @@
import gnu.java.awt.peer.ClasspathFontPeer;
import gnu.java.awt.peer.EmbeddedWindowPeer;
import gnu.java.awt.peer.ClasspathTextLayoutPeer;
+import gnu.java.security.action.SetAccessibleAction;
import java.awt.AWTException;
+import java.awt.Component;
import java.awt.Dimension;
import java.awt.DisplayMode;
import java.awt.Font;
@@ -58,11 +60,14 @@
import java.awt.peer.RobotPeer;
import java.io.File;
import java.io.InputStream;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
import java.net.MalformedURLException;
import java.net.URL;
import java.text.AttributedString;
import java.util.HashMap;
import java.util.Map;
+import java.security.AccessController;
import javax.imageio.spi.IIORegistry;
@@ -129,7 +134,35 @@
*/
public Font getFont (String name, Map attrs)
{
- return new Font (name, attrs);
+ Font f = null;
+
+ // Circumvent the package-privateness of the
+ // java.awt.Font.Font(String,Map) constructor.
+ try
+ {
+ Constructor fontConstructor = Component.class.getConstructor
+ (new Class[] { String.class, Map.class });
+ AccessController.doPrivileged
+ (new SetAccessibleAction(fontConstructor));
+ f = (Font) fontConstructor.newInstance(new Object[] { name, attrs });
+ }
+ catch (IllegalAccessException e)
+ {
+ // This should never happen.
+ }
+ catch (NoSuchMethodException e)
+ {
+ // This should never happen.
+ }
+ catch (InstantiationException e)
+ {
+ // This should never happen.
+ }
+ catch (InvocationTargetException e)
+ {
+ // This should never happen.
+ }
+ return f;
}
/**
Index: kaffe/libraries/javalib/gnu/java/awt/peer/GLightweightPeer.java
diff -u kaffe/libraries/javalib/gnu/java/awt/peer/GLightweightPeer.java:1.4 kaffe/libraries/javalib/gnu/java/awt/peer/GLightweightPeer.java:1.5
--- kaffe/libraries/javalib/gnu/java/awt/peer/GLightweightPeer.java:1.4 Mon Jul 4 00:05:21 2005
+++ kaffe/libraries/javalib/gnu/java/awt/peer/GLightweightPeer.java Sun Aug 21 18:31:02 2005
@@ -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: kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GdkGraphicsConfiguration.java
diff -u kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GdkGraphicsConfiguration.java:1.4 kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GdkGraphicsConfiguration.java:1.5
--- kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GdkGraphicsConfiguration.java:1.4 Mon Jul 4 00:05:22 2005
+++ kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GdkGraphicsConfiguration.java Sun Aug 21 18:31:02 2005
@@ -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: kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GdkGraphicsEnvironment.java
diff -u kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GdkGraphicsEnvironment.java:1.9 kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GdkGraphicsEnvironment.java:1.10
--- kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GdkGraphicsEnvironment.java:1.9 Mon Jul 4 00:05:22 2005
+++ kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GdkGraphicsEnvironment.java Sun Aug 21 18:31:02 2005
@@ -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: kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GdkScreenGraphicsDevice.java
diff -u kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GdkScreenGraphicsDevice.java:1.5 kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GdkScreenGraphicsDevice.java:1.6
--- kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GdkScreenGraphicsDevice.java:1.5 Mon Jul 4 00:05:22 2005
+++ kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GdkScreenGraphicsDevice.java Sun Aug 21 18:31:02 2005
@@ -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: kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GtkComponentPeer.java
diff -u kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GtkComponentPeer.java:1.21 kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GtkComponentPeer.java:1.22
--- kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GtkComponentPeer.java:1.21 Sun Aug 14 17:06:53 2005
+++ kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GtkComponentPeer.java Sun Aug 21 18:31:02 2005
@@ -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: kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GtkContainerPeer.java
diff -u kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GtkContainerPeer.java:1.7 kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GtkContainerPeer.java:1.8
--- kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GtkContainerPeer.java:1.7 Wed Aug 17 22:38:29 2005
+++ kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GtkContainerPeer.java Sun Aug 21 18:31:02 2005
@@ -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: kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GtkFramePeer.java
diff -u kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GtkFramePeer.java:1.13 kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GtkFramePeer.java:1.14
--- kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GtkFramePeer.java:1.13 Fri Aug 19 01:27:58 2005
+++ kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GtkFramePeer.java Sun Aug 21 18:31:02 2005
@@ -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: kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GtkMenuComponentPeer.java
diff -u kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GtkMenuComponentPeer.java:1.4 kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GtkMenuComponentPeer.java:1.5
--- kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GtkMenuComponentPeer.java:1.4 Mon Jul 4 00:05:25 2005
+++ kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GtkMenuComponentPeer.java Sun Aug 21 18:31:02 2005
@@ -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: kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GtkTextAreaPeer.java
diff -u kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GtkTextAreaPeer.java:1.5 kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GtkTextAreaPeer.java:1.6
--- kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GtkTextAreaPeer.java:1.5 Wed Jul 6 02:26:23 2005
+++ kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GtkTextAreaPeer.java Sun Aug 21 18:31:02 2005
@@ -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: kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GtkTextFieldPeer.java
diff -u kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GtkTextFieldPeer.java:1.6 kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GtkTextFieldPeer.java:1.7
--- kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GtkTextFieldPeer.java:1.6 Wed Jul 6 02:26:23 2005
+++ kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GtkTextFieldPeer.java Sun Aug 21 18:31:02 2005
@@ -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: kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GtkToolkit.java
diff -u kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GtkToolkit.java:1.22 kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GtkToolkit.java:1.23
--- kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GtkToolkit.java:1.22 Fri Aug 19 01:27:59 2005
+++ kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GtkToolkit.java Sun Aug 21 18:31:03 2005
@@ -643,7 +643,7 @@
public GraphicsEnvironment getLocalGraphicsEnvironment()
{
- return new GdkGraphicsEnvironment(this);
+ return new GdkGraphicsEnvironment();
}
public Font createFont(int format, InputStream stream)
Index: kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GtkWindowPeer.java
diff -u kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GtkWindowPeer.java:1.13 kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GtkWindowPeer.java:1.14
--- kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GtkWindowPeer.java:1.13 Fri Aug 19 01:27:59 2005
+++ kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GtkWindowPeer.java Sun Aug 21 18:31:03 2005
@@ -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: kaffe/libraries/javalib/gnu/java/awt/peer/qt/QtComponentPeer.java
diff -u kaffe/libraries/javalib/gnu/java/awt/peer/qt/QtComponentPeer.java:1.2 kaffe/libraries/javalib/gnu/java/awt/peer/qt/QtComponentPeer.java:1.3
--- kaffe/libraries/javalib/gnu/java/awt/peer/qt/QtComponentPeer.java:1.2 Wed Aug 17 22:38:29 2005
+++ kaffe/libraries/javalib/gnu/java/awt/peer/qt/QtComponentPeer.java Sun Aug 21 18:31:03 2005
@@ -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: kaffe/libraries/javalib/gnu/java/awt/peer/qt/QtContainerPeer.java
diff -u kaffe/libraries/javalib/gnu/java/awt/peer/qt/QtContainerPeer.java:1.2 kaffe/libraries/javalib/gnu/java/awt/peer/qt/QtContainerPeer.java:1.3
--- kaffe/libraries/javalib/gnu/java/awt/peer/qt/QtContainerPeer.java:1.2 Wed Aug 17 22:38:29 2005
+++ kaffe/libraries/javalib/gnu/java/awt/peer/qt/QtContainerPeer.java Sun Aug 21 18:31:03 2005
@@ -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: kaffe/libraries/javalib/gnu/java/awt/peer/qt/QtFramePeer.java
diff -u kaffe/libraries/javalib/gnu/java/awt/peer/qt/QtFramePeer.java:1.2 kaffe/libraries/javalib/gnu/java/awt/peer/qt/QtFramePeer.java:1.3
--- kaffe/libraries/javalib/gnu/java/awt/peer/qt/QtFramePeer.java:1.2 Wed Aug 17 22:38:29 2005
+++ kaffe/libraries/javalib/gnu/java/awt/peer/qt/QtFramePeer.java Sun Aug 21 18:31:03 2005
@@ -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: kaffe/libraries/javalib/gnu/java/awt/peer/qt/QtMenuComponentPeer.java
diff -u kaffe/libraries/javalib/gnu/java/awt/peer/qt/QtMenuComponentPeer.java:1.1 kaffe/libraries/javalib/gnu/java/awt/peer/qt/QtMenuComponentPeer.java:1.2
--- kaffe/libraries/javalib/gnu/java/awt/peer/qt/QtMenuComponentPeer.java:1.1 Sat Aug 13 15:43:07 2005
+++ kaffe/libraries/javalib/gnu/java/awt/peer/qt/QtMenuComponentPeer.java Sun Aug 21 18:31:03 2005
@@ -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: kaffe/libraries/javalib/gnu/java/awt/peer/qt/QtScreenDeviceConfiguration.java
diff -u kaffe/libraries/javalib/gnu/java/awt/peer/qt/QtScreenDeviceConfiguration.java:1.1 kaffe/libraries/javalib/gnu/java/awt/peer/qt/QtScreenDeviceConfiguration.java:1.2
--- kaffe/libraries/javalib/gnu/java/awt/peer/qt/QtScreenDeviceConfiguration.java:1.1 Sat Aug 13 15:43:07 2005
+++ kaffe/libraries/javalib/gnu/java/awt/peer/qt/QtScreenDeviceConfiguration.java Sun Aug 21 18:31:03 2005
@@ -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: kaffe/libraries/javalib/gnu/java/awt/peer/qt/QtTextAreaPeer.java
diff -u kaffe/libraries/javalib/gnu/java/awt/peer/qt/QtTextAreaPeer.java:1.2 kaffe/libraries/javalib/gnu/java/awt/peer/qt/QtTextAreaPeer.java:1.3
--- kaffe/libraries/javalib/gnu/java/awt/peer/qt/QtTextAreaPeer.java:1.2 Wed Aug 17 22:38:29 2005
+++ kaffe/libraries/javalib/gnu/java/awt/peer/qt/QtTextAreaPeer.java Sun Aug 21 18:31:03 2005
@@ -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: kaffe/libraries/javalib/gnu/java/awt/peer/qt/QtTextFieldPeer.java
diff -u kaffe/libraries/javalib/gnu/java/awt/peer/qt/QtTextFieldPeer.java:1.2 kaffe/libraries/javalib/gnu/java/awt/peer/qt/QtTextFieldPeer.java:1.3
--- kaffe/libraries/javalib/gnu/java/awt/peer/qt/QtTextFieldPeer.java:1.2 Wed Aug 17 22:38:29 2005
+++ kaffe/libraries/javalib/gnu/java/awt/peer/qt/QtTextFieldPeer.java Sun Aug 21 18:31:03 2005
@@ -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: kaffe/libraries/javalib/gnu/java/awt/peer/qt/QtWindowPeer.java
diff -u kaffe/libraries/javalib/gnu/java/awt/peer/qt/QtWindowPeer.java:1.2 kaffe/libraries/javalib/gnu/java/awt/peer/qt/QtWindowPeer.java:1.3
--- kaffe/libraries/javalib/gnu/java/awt/peer/qt/QtWindowPeer.java:1.2 Wed Aug 17 22:38:29 2005
+++ kaffe/libraries/javalib/gnu/java/awt/peer/qt/QtWindowPeer.java Sun Aug 21 18:31:03 2005
@@ -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: kaffe/libraries/javalib/java/awt/Font.java
diff -u kaffe/libraries/javalib/java/awt/Font.java:1.27 kaffe/libraries/javalib/java/awt/Font.java:1.28
--- kaffe/libraries/javalib/java/awt/Font.java:1.27 Mon Jul 4 00:06:04 2005
+++ kaffe/libraries/javalib/java/awt/Font.java Sun Aug 21 18:31:05 2005
@@ -353,9 +353,11 @@
this(null, attrs);
}
- /* This extra constructor is here to permit ClasspathToolkit and to build
- a font with a "logical name" as well as attrs. */
- public Font (String name, Map attrs)
+ /* This extra constructor is here to permit ClasspathToolkit and to
+ build a font with a "logical name" as well as attrs.
+ ClasspathToolkit.getFont(String,Map) uses reflection to call this
+ package-private constructor. */
+ Font (String name, Map attrs)
{
// If attrs is null, setting it to an empty HashMap will give this
// Font default attributes.
Index: kaffe/libraries/javalib/java/awt/GraphicsConfiguration.java
diff -u kaffe/libraries/javalib/java/awt/GraphicsConfiguration.java:1.3 kaffe/libraries/javalib/java/awt/GraphicsConfiguration.java:1.4
--- kaffe/libraries/javalib/java/awt/GraphicsConfiguration.java:1.3 Mon Jul 4 00:06:05 2005
+++ kaffe/libraries/javalib/java/awt/GraphicsConfiguration.java Sun Aug 21 18:31:05 2005
@@ -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: kaffe/libraries/javalib/java/awt/Window.java
diff -u kaffe/libraries/javalib/java/awt/Window.java:1.36 kaffe/libraries/javalib/java/awt/Window.java:1.37
--- kaffe/libraries/javalib/java/awt/Window.java:1.36 Wed Aug 17 22:38:30 2005
+++ kaffe/libraries/javalib/java/awt/Window.java Sun Aug 21 18:31:05 2005
@@ -155,6 +155,9 @@
}
}
});
+
+ GraphicsEnvironment g = GraphicsEnvironment.getLocalGraphicsEnvironment();
+ graphicsConfiguration = g.getDefaultScreenDevice().getDefaultConfiguration();
}
Window(GraphicsConfiguration gc)
Index: kaffe/libraries/javalib/java/awt/image/DirectColorModel.java
diff -u kaffe/libraries/javalib/java/awt/image/DirectColorModel.java:1.15 kaffe/libraries/javalib/java/awt/image/DirectColorModel.java:1.16
--- kaffe/libraries/javalib/java/awt/image/DirectColorModel.java:1.15 Mon Jul 4 00:06:20 2005
+++ kaffe/libraries/javalib/java/awt/image/DirectColorModel.java Sun Aug 21 18:31:06 2005
@@ -348,7 +348,17 @@
{
return getComponents(getPixelFromArray(pixel), components, offset);
}
-
+
+ /**
+ * Creates a <code>WriteableRaster</code> that has a <code>SampleModel</code>
+ * that is compatible with this <code>ColorModel</code>.
+ *
+ * @param w the width of the writeable raster to create
+ * @param h the height of the writeable raster to create
+ *
+ * @throws IllegalArgumentException if <code>w</code> or <code>h</code>
+ * is less than or equal to zero
+ */
public final WritableRaster createCompatibleWritableRaster(int w, int h)
{
SampleModel sm = createCompatibleSampleModel(w, h);
Index: kaffe/libraries/javalib/java/awt/peer/ComponentPeer.java
diff -u kaffe/libraries/javalib/java/awt/peer/ComponentPeer.java:1.4 kaffe/libraries/javalib/java/awt/peer/ComponentPeer.java:1.5
--- kaffe/libraries/javalib/java/awt/peer/ComponentPeer.java:1.4 Mon Jul 4 00:06:23 2005
+++ kaffe/libraries/javalib/java/awt/peer/ComponentPeer.java Sun Aug 21 18:31:06 2005
@@ -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: kaffe/libraries/javalib/java/awt/peer/ContainerPeer.java
diff -u kaffe/libraries/javalib/java/awt/peer/ContainerPeer.java:1.3 kaffe/libraries/javalib/java/awt/peer/ContainerPeer.java:1.4
--- kaffe/libraries/javalib/java/awt/peer/ContainerPeer.java:1.3 Mon Jul 4 00:06:23 2005
+++ kaffe/libraries/javalib/java/awt/peer/ContainerPeer.java Sun Aug 21 18:31:06 2005
@@ -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: kaffe/libraries/javalib/java/awt/peer/FramePeer.java
diff -u kaffe/libraries/javalib/java/awt/peer/FramePeer.java:1.3 kaffe/libraries/javalib/java/awt/peer/FramePeer.java:1.4
--- kaffe/libraries/javalib/java/awt/peer/FramePeer.java:1.3 Mon Jul 4 00:06:23 2005
+++ kaffe/libraries/javalib/java/awt/peer/FramePeer.java Sun Aug 21 18:31:06 2005
@@ -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: kaffe/libraries/javalib/java/awt/peer/MenuComponentPeer.java
diff -u kaffe/libraries/javalib/java/awt/peer/MenuComponentPeer.java:1.3 kaffe/libraries/javalib/java/awt/peer/MenuComponentPeer.java:1.4
--- kaffe/libraries/javalib/java/awt/peer/MenuComponentPeer.java:1.3 Mon Jul 4 00:06:23 2005
+++ kaffe/libraries/javalib/java/awt/peer/MenuComponentPeer.java Sun Aug 21 18:31:06 2005
@@ -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);
*** Patch too long, truncated ***
More information about the kaffe
mailing list