? .snprj
? libjava.proj
? patch
Index: ChangeLog
===================================================================
RCS file: /cvs/gcc/gcc/libjava/ChangeLog,v
retrieving revision 1.2660.2.20
diff -c -p -u -r1.2660.2.20 ChangeLog
--- ChangeLog	24 Feb 2004 16:16:50 -0000	1.2660.2.20
+++ ChangeLog	24 Feb 2004 22:23:11 -0000
@@ -1,3 +1,20 @@
+2004-02-24  Olga Rodimina  <rodimina@redhat.com>
+
+	* gnu/java/awt/peer/gtk/GdkGraphics2D.java
+	(bimage): New field.
+	(GdkGraphics2D): New Constructor. Constructs Graphics
+	object that can be used to draw into the Buffered Image.
+	* gnu/java/awt/peer/gtk/GdkGraphicsEnvironment.java:
+	(GdkGraphicsEnvironment): Fixed to include public 
+	keyword.
+	(createGraphics): Implemented.
+	* gnu/java/awt/peer/gtk/GtkToolkit.java
+	(getLocalGraphicsEnvironment): Implemented.
+	* java/awt/GraphicsEnvironment.java:
+	(getLocalGraphicsEnvironment): Implemented.
+	* java/awt/image/BufferedImage.java:
+	(createGraphics): Implemented.
+		
 2004-02-24  David Jee  <djee@redhat.com>
 
 	* java/awt/Component.java
Index: gnu/java/awt/peer/gtk/GdkGraphics2D.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/gnu/java/awt/peer/gtk/GdkGraphics2D.java,v
retrieving revision 1.7.2.3
diff -c -p -u -r1.7.2.3 GdkGraphics2D.java
--- gnu/java/awt/peer/gtk/GdkGraphics2D.java	18 Feb 2004 21:10:58 -0000	1.7.2.3
+++ gnu/java/awt/peer/gtk/GdkGraphics2D.java	24 Feb 2004 22:23:12 -0000
@@ -84,6 +84,7 @@ public class GdkGraphics2D extends Graph
   private GtkComponentPeer component;
   private Font font;  
   private RenderingHints hints;
+  private BufferedImage bimage;
 
   private Stack stateStack;
   
@@ -178,6 +179,23 @@ public class GdkGraphics2D extends Graph
     setRenderingHints (getDefaultHints());
 
     stateStack = new Stack ();
+  }
+
+  GdkGraphics2D (BufferedImage bimage)
+  {
+    
+    this.bimage = bimage;    
+    initState (bimage.getWidth(), bimage.getHeight());
+
+    setColor(Color.black);
+    setBackground (Color.black);
+    setPaint (getColor());
+    setFont (new Font("SansSerif", Font.PLAIN, 12));
+    setTransform (new AffineTransform ());
+    setStroke (new BasicStroke ());
+    setRenderingHints (getDefaultHints());
+
+    stateStack = new Stack();
   }
 
 
Index: gnu/java/awt/peer/gtk/GdkGraphicsEnvironment.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/gnu/java/awt/peer/gtk/Attic/GdkGraphicsEnvironment.java,v
retrieving revision 1.1.2.1
diff -c -p -u -r1.1.2.1 GdkGraphicsEnvironment.java
--- gnu/java/awt/peer/gtk/GdkGraphicsEnvironment.java	23 Feb 2004 23:20:45 -0000	1.1.2.1
+++ gnu/java/awt/peer/gtk/GdkGraphicsEnvironment.java	24 Feb 2004 22:23:12 -0000
@@ -47,7 +47,7 @@ import java.util.Locale;
 public class GdkGraphicsEnvironment extends GraphicsEnvironment
 {
   
-  GdkGraphicsEnvironment ()
+  public GdkGraphicsEnvironment ()
   {
   	super();
   }
@@ -64,7 +64,7 @@ public class GdkGraphicsEnvironment exte
 
   public Graphics2D createGraphics (BufferedImage image)
   {
-    throw new java.lang.UnsupportedOperationException ();
+    return new GdkGraphics2D (image);
   }
 
   public Font[] getAllFonts ()
Index: gnu/java/awt/peer/gtk/GtkToolkit.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/gnu/java/awt/peer/gtk/GtkToolkit.java,v
retrieving revision 1.8
diff -c -p -u -r1.8 GtkToolkit.java
--- gnu/java/awt/peer/gtk/GtkToolkit.java	25 Jan 2004 18:29:42 -0000	1.8
+++ gnu/java/awt/peer/gtk/GtkToolkit.java	24 Feb 2004 22:23:12 -0000
@@ -47,6 +47,7 @@ import java.awt.im.InputMethodHighlight;
 import java.awt.image.ColorModel;
 import java.awt.image.ImageObserver;
 import java.awt.image.ImageProducer;
+import java.awt.GraphicsEnvironment;
 import java.awt.peer.*;
 import java.net.URL;
 import java.util.Hashtable;
@@ -431,7 +432,9 @@ public class GtkToolkit extends gnu.java
 
   public GraphicsEnvironment getLocalGraphicsEnvironment()
   {
-    throw new java.lang.UnsupportedOperationException ();
+    GraphicsEnvironment ge;
+    ge = new GdkGraphicsEnvironment();  
+    return ge;
   }
 
   public Font createFont(int format, java.io.InputStream stream)
Index: java/awt/GraphicsEnvironment.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/awt/GraphicsEnvironment.java,v
retrieving revision 1.1
diff -c -p -u -r1.1 GraphicsEnvironment.java
--- java/awt/GraphicsEnvironment.java	9 Aug 2002 04:26:14 -0000	1.1
+++ java/awt/GraphicsEnvironment.java	24 Feb 2004 22:23:12 -0000
@@ -40,6 +40,7 @@ package java.awt;
 
 import java.awt.image.BufferedImage;
 import java.util.Locale;
+import gnu.java.awt.ClasspathToolkit;
 
 /**
  * This descibes the collection of GraphicsDevice and Font objects available
@@ -70,7 +71,9 @@ public abstract class GraphicsEnvironmen
    */
   public static GraphicsEnvironment getLocalGraphicsEnvironment()
   {
-    throw new Error("not implemented");
+    ClasspathToolkit tk;
+    tk = ((ClasspathToolkit)Toolkit.getDefaultToolkit());
+    return tk.getLocalGraphicsEnvironment();
   }
 
   /**
Index: java/awt/image/BufferedImage.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/awt/image/BufferedImage.java,v
retrieving revision 1.9.14.1
diff -c -p -u -r1.9.14.1 BufferedImage.java
--- java/awt/image/BufferedImage.java	17 Feb 2004 17:17:23 -0000	1.9.14.1
+++ java/awt/image/BufferedImage.java	24 Feb 2004 22:23:12 -0000
@@ -39,6 +39,7 @@ package java.awt.image;
 
 import java.awt.Graphics;
 import java.awt.Graphics2D;
+import java.awt.GraphicsEnvironment;
 import java.awt.Image;
 import java.awt.Point;
 import java.awt.Rectangle;
@@ -283,8 +284,9 @@ public class BufferedImage extends Image
 
   public Graphics2D createGraphics()
   {
-    throw new UnsupportedOperationException("not implemented");
-    // will require a lot of effort to implement
+    GraphicsEnvironment env;
+    env = GraphicsEnvironment.getLocalGraphicsEnvironment();
+    return env.createGraphics(this);
   }
 
   public void flush() {