Patch: FYI: Classpath AWT re-merge

[Tom Tromey]

>>>>> "Tom" == Tom Tromey <tromey@redhat.com> writes:

Tom> This pulls in some recent Classpath AWT changes: some reindentations,
Tom> a couple new files, some API conformance fixes, and a few peer
Tom> additions.

I sent this too soon.  The appended is also required.

Tom

Index: ChangeLog
from  Tom Tromey  <tromey@redhat.com>

	* gnu/awt/xlib/XPanelPeer.java (beginLayout, endLayout,
	isPaintPending): New methods.
	* gnu/awt/xlib/XFramePeer.java (getState, setState,
	setMaximizedBounds): New methods.
	(beginLayout, endLayout, isPaintPending): Likewise.
	* gnu/awt/xlib/XCanvasPeer.java (isFocusable): New method.
	(requestFocus): Likewise.
	(isObscured): Likewise.
	(canDetermineObscurity): Likewise.
	(coalescePaintEvent): Likewise.
	(updateCursorImmediately): Likewise.
	(createVolatileImage): Likewise.
	(handlesWheelScrolling): Likewise.
	(createBuffers): Likewise.
	(getBackBuffer): Likewise.
	(flip): Likewise.
	(destroyBuffers): Likewise.

Index: gnu/awt/xlib/XCanvasPeer.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/gnu/awt/xlib/XCanvasPeer.java,v
retrieving revision 1.2
diff -u -r1.2 XCanvasPeer.java
--- gnu/awt/xlib/XCanvasPeer.java 22 Jan 2002 22:03:00 -0000 1.2
+++ gnu/awt/xlib/XCanvasPeer.java 1 Mar 2003 22:11:05 -0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000, 2002  Free Software Foundation
+/* Copyright (C) 2000, 2002, 2003  Free Software Foundation
 
    This file is part of libgcj.
 
@@ -9,6 +9,7 @@
 package gnu.awt.xlib;
 
 import java.awt.Dimension;
+import java.awt.BufferCapabilities;
 import java.awt.Component;
 import java.awt.EventQueue;
 import java.awt.Rectangle;
@@ -409,6 +410,64 @@
   public void hide ()
   {
     setVisible (false);
+  }
+
+  public boolean isFocusable ()
+  {
+    return false;
+  }
+
+  public boolean requestFocus (Component source, boolean b1, 
+                               boolean b2, long x)
+  {
+    return false;
+  }
+
+  public boolean isObscured ()
+  {
+    return false;
+  }
+
+  public boolean canDetermineObscurity ()
+  {
+    return false;
+  }
+
+  public void coalescePaintEvent (PaintEvent e)
+  {
+  }
+
+  public void updateCursorImmediately ()
+  {
+  }
+
+  public VolatileImage createVolatileImage (int width, int height)
+  {
+    return null;
+  }
+
+  public boolean handlesWheelScrolling ()
+  {
+    return false;
+  }
+
+  public void createBuffers (int x, BufferCapabilities capabilities)
+    throws java.awt.AWTException
+
+  {
+  }
+
+  public Image getBackBuffer ()
+  {
+    return null;
+  }
+
+  public void flip (BufferCapabilities.FlipContents contents)
+  {
+  }
+
+  public void destroyBuffers ()
+  {
   }
 
   static class DoMap implements Runnable 
Index: gnu/awt/xlib/XFramePeer.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/gnu/awt/xlib/XFramePeer.java,v
retrieving revision 1.2
diff -u -r1.2 XFramePeer.java
--- gnu/awt/xlib/XFramePeer.java 22 Jan 2002 22:03:01 -0000 1.2
+++ gnu/awt/xlib/XFramePeer.java 1 Mar 2003 22:11:05 -0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000, 2002  Free Software Foundation
+/* Copyright (C) 2000, 2002, 2003  Free Software Foundation
 
    This file is part of libgcj.
 
@@ -176,4 +176,21 @@
       }
     sizeHints.applyNormalHints(window);
   }
+
+  public int getState ()
+  {
+    return 0;
+  }
+
+  public void setState (int state)
+  {
+  }
+
+  public void setMaximizedBounds (Rectangle r)
+  {
+  }
+
+  public void beginLayout () { }
+  public void endLayout () { }
+  public boolean isPaintPending () { return false; }
 }
Index: gnu/awt/xlib/XPanelPeer.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/gnu/awt/xlib/XPanelPeer.java,v
retrieving revision 1.2
diff -u -r1.2 XPanelPeer.java
--- gnu/awt/xlib/XPanelPeer.java 22 Jan 2002 22:03:01 -0000 1.2
+++ gnu/awt/xlib/XPanelPeer.java 1 Mar 2003 22:11:05 -0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000, 2002  Free Software Foundation
+/* Copyright (C) 2000, 2002, 2003  Free Software Foundation
 
    This file is part of libgcj.
 
@@ -54,4 +54,8 @@
   {
     // NOP
   }
+
+  public void beginLayout () { }
+  public void endLayout () { }
+  public boolean isPaintPending () { return false; }
 }