AWT/Swing merge from GNU Classpath.

From-SVN: r56147

2 files changed, 59 insertions, 17 deletions

diff --git a/libjava/gnu/awt/xlib/XGraphicsConfiguration.java b/libjava/gnu/awt/xlib/XGraphicsConfiguration.java
index 69cc6e2..9ae12d6 100644
--- a/libjava/gnu/awt/xlib/XGraphicsConfiguration.java
+++ b/libjava/gnu/awt/xlib/XGraphicsConfiguration.java
@@ -12,6 +12,7 @@ import java.awt.GraphicsConfiguration;
 import java.awt.Rectangle;
 import java.awt.Graphics2D;
 import java.awt.Graphics;
+import java.awt.GraphicsDevice;
 import java.awt.Point;
 import java.awt.Color;
 import java.awt.color.ColorSpace;
@@ -128,7 +129,8 @@ public class XGraphicsConfiguration extends GraphicsConfiguration
    * maybe be moved to a different location.]
    *
    * @param offset Offset to data. The given offset does not include
-   * data buffer offset, which will also be added.  */
+   * data buffer offset, which will also be added.  
+   */
   static void attachData(XImage ximage, DataBuffer dataB, int offset)
   {
     offset += dataB.getOffset();
@@ -236,13 +238,47 @@ public class XGraphicsConfiguration extends GraphicsConfiguration
 				  rmap, gmap, bmap, amap);
   }
 
+  /**
+   * Gets the associated device that this configuration describes.
+   *
+   * @return the device
+   */
+  public GraphicsDevice getDevice()
+  {
+    throw new UnsupportedOperationException("not implemented");  
+  }
+
+  /**
+   * Returns a buffered image optimized to this device, so that blitting can
+   * be supported in the buffered image.
+   *
+   * @param w the width of the buffer
+   * @param h the height of the buffer
+   * @return the buffered image, or null if none is supported
+   */
   public BufferedImage createCompatibleImage(int width,
 					     int height,
 					     int transparency)
   {
     throw new UnsupportedOperationException("not implemented");
   }
-    
+
+  /**
+   * Returns a buffered volatile image optimized to this device, so that
+   * blitting can be supported in the buffered image. 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
+   * @return the buffered image, or null if none is supported
+   * @see Component#createVolatileImage(int, int)
+   * @since 1.4
+   */
+  public VolatileImage createCompatibleVolatileImage(int w, int h)
+  {
+    throw new UnsupportedOperationException("not implemented");
+  }
+
   /**
    * FIXME: I'm not sure which color model that should be returned here.
    */
diff --git a/libjava/gnu/awt/xlib/XToolkit.java b/libjava/gnu/awt/xlib/XToolkit.java
index 80b3a96..0c199b2 100644
--- a/libjava/gnu/awt/xlib/XToolkit.java
+++ b/libjava/gnu/awt/xlib/XToolkit.java
@@ -9,12 +9,16 @@ details.  */
 package gnu.awt.xlib;
 
 import java.awt.*;
+import java.awt.dnd.*;
+import java.awt.dnd.peer.*;
+import java.awt.im.*;
 import java.awt.peer.*;
 import java.awt.image.ImageProducer;
 import java.awt.image.ImageObserver;
 import java.net.*;
 import java.awt.datatransfer.Clipboard;
 import java.util.Properties;
+import java.util.Map;
 
 import gnu.gcj.xlib.Display;
 import gnu.gcj.xlib.Screen;
@@ -318,22 +322,24 @@ public class XToolkit extends Toolkit
     return defaultConfig;
   }
 
+  public DragSourceContextPeer
+    createDragSourceContextPeer(DragGestureEvent dge)
+    throws InvalidDnDOperationException
+  {
+    throw new UnsupportedOperationException("not implemented");  
+  }
 
-    /*
-    public DragSourceContextPeer
-	createDragSourceContextPeer(DragGestureEvent dge)
-	throws InvalidDnDOperationException;
-
-    public DragGestureRecognizer
-	createDragGestureRecognizer(Class abstractRecognizerClass,
-				    DragSource ds, Component c,
-				    int srcActions, DragGestureListener dgl) {
-	throw new UnsupportedOperationException("not implemented");
-    }
-    */
+  public DragGestureRecognizer
+    createDragGestureRecognizer(Class abstractRecognizerClass,
+				DragSource ds, Component c,
+				int srcActions, DragGestureListener dgl)
+  {
+    throw new UnsupportedOperationException("not implemented");
+  }
 
     
-    /*
-    public Map mapInputMethodHighlight(InputMethodHighlight highlight);
-    */
+  public Map mapInputMethodHighlight(InputMethodHighlight highlight)
+  {
+    throw new UnsupportedOperationException("not implemented");
+  }
 }