2002-08-09 Mark Wielaard <mark@klomp.org>

        * java/awt/image/MemoryImageSource.java: Change constructor to take
        int[] not byte[].
        * java/awt/Graphics2D.java: Uncomment methods that can now be
        compiled.
        * java/awt/GridBagLayout.java: New stub implementation.
        * javax/swing/text/html/HTML.java: Stub implementation.
        * javax/swing/text/html/parser/ParserDelegator.java: New stub
        implementation.

2002-08-09  Bryce McKinlay  <bryce@waitaki.otago.ac.nz>

        * gnu/awt/j2d/Graphics2DImpl.java: Implement stubs for new abstract
        methods in Graphics2D.

        * Makefile.am: Add new files.
        * Makefile.in: Rebuilt.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@56152 138bc75d-0d04-0410-961f-82ee72b054a4

7 files changed, 203 insertions, 28 deletions

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 24aca7373e0..9dea65081b6 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,22 @@
+2002-08-09  Mark Wielaard  <mark@klomp.org>
+
+	* java/awt/image/MemoryImageSource.java: Change constructor to take
+	int[] not byte[].
+	* java/awt/Graphics2D.java: Uncomment methods that can now be
+	compiled.
+	* java/awt/GridBagLayout.java: New stub implementation.
+	* javax/swing/text/html/HTML.java: Stub implementation.
+	* javax/swing/text/html/parser/ParserDelegator.java: New stub
+	implementation.
+
+	* Makefile.am: Add new files.
+	* Makefile.in: Rebuilt.
+
+2002-08-09  Bryce McKinlay  <bryce@waitaki.otago.ac.nz>
+
+	* gnu/awt/j2d/Graphics2DImpl.java: Implement stubs for new abstract
+	methods in Graphics2D.
+	
 2002-08-09  Bryce McKinlay  <bryce@waitaki.otago.ac.nz>
 
 	AWT/Swing merge from GNU Classpath.
diff --git a/libjava/Makefile.am b/libjava/Makefile.am
index b954a531103..dcf08ad5554 100644
--- a/libjava/Makefile.am
+++ b/libjava/Makefile.am
@@ -629,6 +629,7 @@ java/awt/Graphics.java \
 java/awt/Graphics2D.java \
 java/awt/GraphicsConfiguration.java \
 java/awt/GridBagConstraints.java \
+java/awt/GridBagLayout.java \
 java/awt/GridLayout.java \
 java/awt/IllegalComponentStateException.java \
 java/awt/Image.java \
@@ -1122,6 +1123,8 @@ javax/swing/text/MutableAttributeSet.java \
 javax/swing/text/StyledDocument.java \
 javax/swing/text/StyledEditorKit.java \
 javax/swing/text/TextAction.java \
+javax/swing/text/html/HTML.java \
+javax/swing/text/html/parser/ParserDelegator.java \
 javax/swing/tree/TreeNode.java \
 javax/swing/tree/AbstractLayoutCache.java \
 javax/swing/tree/DefaultMutableTreeNode.java \
diff --git a/libjava/Makefile.in b/libjava/Makefile.in
index 34389bd0135..9fecd1ff93a 100644
--- a/libjava/Makefile.in
+++ b/libjava/Makefile.in
@@ -398,6 +398,7 @@ java/awt/Graphics.java \
 java/awt/Graphics2D.java \
 java/awt/GraphicsConfiguration.java \
 java/awt/GridBagConstraints.java \
+java/awt/GridBagLayout.java \
 java/awt/GridLayout.java \
 java/awt/IllegalComponentStateException.java \
 java/awt/Image.java \
@@ -891,6 +892,8 @@ javax/swing/text/MutableAttributeSet.java \
 javax/swing/text/StyledDocument.java \
 javax/swing/text/StyledEditorKit.java \
 javax/swing/text/TextAction.java \
+javax/swing/text/html/HTML.java \
+javax/swing/text/html/parser/ParserDelegator.java \
 javax/swing/tree/TreeNode.java \
 javax/swing/tree/AbstractLayoutCache.java \
 javax/swing/tree/DefaultMutableTreeNode.java \
@@ -2171,7 +2174,7 @@ libgcj-test.spec.in libgcj.spec.in
 
 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 
-TAR = tar
+TAR = gtar
 GZIP_ENV = --best
 DIST_SUBDIRS =  @DIRLTDL@ testsuite gcj include @DIRLTDL@ gcj include
 DEP_FILES =  .deps/$(srcdir)/$(CONVERT_DIR)/gen-from-JIS.P \
@@ -2482,8 +2485,8 @@ DEP_FILES =  .deps/$(srcdir)/$(CONVERT_DIR)/gen-from-JIS.P \
 .deps/java/awt/Graphics2D.P .deps/java/awt/GraphicsConfigTemplate.P \
 .deps/java/awt/GraphicsConfiguration.P .deps/java/awt/GraphicsDevice.P \
 .deps/java/awt/GraphicsEnvironment.P \
-.deps/java/awt/GridBagConstraints.P .deps/java/awt/GridLayout.P \
-.deps/java/awt/HeadlessException.P \
+.deps/java/awt/GridBagConstraints.P .deps/java/awt/GridBagLayout.P \
+.deps/java/awt/GridLayout.P .deps/java/awt/HeadlessException.P \
 .deps/java/awt/IllegalComponentStateException.P .deps/java/awt/Image.P \
 .deps/java/awt/ImageCapabilities.P .deps/java/awt/Insets.P \
 .deps/java/awt/ItemSelectable.P .deps/java/awt/JobAttributes.P \
@@ -3390,7 +3393,8 @@ DEP_FILES =  .deps/$(srcdir)/$(CONVERT_DIR)/gen-from-JIS.P \
 .deps/javax/swing/text/Style.P .deps/javax/swing/text/StyledDocument.P \
 .deps/javax/swing/text/StyledEditorKit.P \
 .deps/javax/swing/text/TextAction.P .deps/javax/swing/text/View.P \
-.deps/javax/swing/text/ViewFactory.P \
+.deps/javax/swing/text/ViewFactory.P .deps/javax/swing/text/html/HTML.P \
+.deps/javax/swing/text/html/parser/ParserDelegator.P \
 .deps/javax/swing/tree/AbstractLayoutCache.P \
 .deps/javax/swing/tree/DefaultMutableTreeNode.P \
 .deps/javax/swing/tree/DefaultTreeCellEditor.P \
diff --git a/libjava/gnu/awt/j2d/Graphics2DImpl.java b/libjava/gnu/awt/j2d/Graphics2DImpl.java
index 7c08295c027..ef4d742c056 100644
--- a/libjava/gnu/awt/j2d/Graphics2DImpl.java
+++ b/libjava/gnu/awt/j2d/Graphics2DImpl.java
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000  Free Software Foundation
+/* Copyright (C) 2000, 2002  Free Software Foundation
 
    This file is part of libgcj.
 
@@ -9,6 +9,7 @@ details.  */
 package gnu.awt.j2d;
 
 import java.awt.Color;
+import java.awt.Composite;
 import java.awt.Image;
 import java.awt.Shape;
 import java.awt.Rectangle;
@@ -19,8 +20,14 @@ import java.awt.Font;
 import java.awt.FontMetrics;
 import java.awt.Paint;
 import java.awt.RenderingHints;
+import java.awt.Stroke;
 import java.awt.geom.AffineTransform;
 import java.awt.image.ImageObserver;
+import java.awt.image.BufferedImage;
+import java.awt.image.RenderedImage;
+import java.awt.image.renderable.RenderableImage;
+import java.text.AttributedCharacterIterator;
+import java.util.Map;
 
 /**
  * Delegates almost all work to a state object, that allows us to
@@ -451,4 +458,61 @@ public class Graphics2DImpl extends Graphics2D implements Cloneable
       "has not been implemented yet";
     throw new UnsupportedOperationException(msg);
   }
+  
+  public void drawImage(BufferedImage image, BufferedImage op, int x, int y)
+  {
+    throw new UnsupportedOperationException("not implemented yet");  
+  }
+
+  public void drawRenderedImage(RenderedImage image, AffineTransform xform)
+  {
+    throw new UnsupportedOperationException("not implemented yet");  
+  }
+
+  public void drawRenderableImage(RenderableImage image, AffineTransform xform)
+  {
+    throw new UnsupportedOperationException("not implemented yet");
+  }
+
+  public void drawString(AttributedCharacterIterator iterator,
+                		  int x, int y)
+  {
+    throw new UnsupportedOperationException("not implemented yet");  
+  }
+
+  public void drawString(AttributedCharacterIterator iterator, float x, 
+			 float y)
+  {
+    throw new UnsupportedOperationException("not implemented yet");
+  }
+
+  public void setComposite(Composite comp)
+  {
+    throw new UnsupportedOperationException("not implemented yet");
+  }
+
+  public void setStroke(Stroke stroke)
+  {
+    throw new UnsupportedOperationException("not implemented yet");
+  }
+
+  public void setRenderingHints(Map hints)
+  {
+    throw new UnsupportedOperationException("not implemented yet");
+  }
+
+  public void addRenderingHints(Map hints)
+  {
+    throw new UnsupportedOperationException("not implemented yet");
+  }
+
+  public Composite getComposite()
+  {
+    throw new UnsupportedOperationException("not implemented yet");
+  }
+
+  public Stroke getStroke()
+  {
+    throw new UnsupportedOperationException("not implemented yet");
+  }
 }
diff --git a/libjava/java/awt/Graphics2D.java b/libjava/java/awt/Graphics2D.java
index aa662fc7907..879fae5ad51 100644
--- a/libjava/java/awt/Graphics2D.java
+++ b/libjava/java/awt/Graphics2D.java
@@ -37,9 +37,14 @@ exception statement from your version. */
 package java.awt;
 
 import java.awt.geom.AffineTransform;
+import java.awt.image.BufferedImage;
+import java.awt.image.RenderedImage;
 import java.awt.image.ImageObserver;
+import java.awt.image.renderable.RenderableImage;
 
-//import java.util.Map;
+import java.text.AttributedCharacterIterator;
+
+import java.util.Map;
 
 /**
  * @author Rolf W. Rasmussen <rolfwr@ii.uib.no>
@@ -68,40 +73,28 @@ public abstract class Graphics2D extends Graphics
   public abstract boolean drawImage(Image image, AffineTransform xform,
 				    ImageObserver obs);
 
-  /*
   public abstract void drawImage(BufferedImage image,
-				 BufferedImageOp op,
+				 BufferedImage op,
 				 int x,
 				 int y);
-  */
 
-  /*
   public abstract void drawRenderedImage(RenderedImage image,
 					 AffineTransform xform);
-  */
 
-  /*
   public abstract void drawRenderableImage(RenderableImage image,
                                            AffineTransform xform);
-  */
 
   public abstract void drawString(String text, int x, int y);
 
   public abstract void drawString(String text, float x, float y);
     
-  /*
   public abstract void drawString(AttributedCharacterIterator iterator,
                                   int x, int y);
-  */
 
-  /*
   public abstract void drawString(AttributedCharacterIterator iterator,
 				  float x, float y);
-  */
 
-  /*
-  public abstract void drawGlyphVector(GlyphVector g, float x, float y);
-  */
+  // public abstract void drawGlyphVector(GlyphVector g, float x, float y);
 
   public abstract void fill(Shape shape);
     
@@ -110,20 +103,20 @@ public abstract class Graphics2D extends Graphics
 
   public abstract GraphicsConfiguration getDeviceConfiguration();
 
-  //public abstract void setComposite(Composite comp);
+  public abstract void setComposite(Composite comp);
     
   public abstract void setPaint(Paint paint);
 
-  //public abstract void setStroke(Stroke stroke)
+  public abstract void setStroke(Stroke stroke);
 
   public abstract void setRenderingHint(RenderingHints.Key hintKey,
                                         Object hintValue);
 
   public abstract Object getRenderingHint(RenderingHints.Key hintKey);
   
-  //public abstract void setRenderingHints(Map hints);
+  public abstract void setRenderingHints(Map hints);
 
-  //public abstract void addRenderingHints(Map hints);
+  public abstract void addRenderingHints(Map hints);
 
   public abstract RenderingHints getRenderingHints();
 
@@ -147,15 +140,15 @@ public abstract class Graphics2D extends Graphics
 
   public abstract Paint getPaint();
 
-  //public abstract Composite getComposite();
+  public abstract Composite getComposite();
 
   public abstract void setBackground(Color color);
 
   public abstract Color getBackground();
 
-  //public abstract Stroke getStroke();    
+  public abstract Stroke getStroke();    
 
   public abstract void clip(Shape s);
 
-  //public abstract FontRenderContext getFontRenderContext()
+  // public abstract FontRenderContext getFontRenderContext();
 }
diff --git a/libjava/java/awt/GridBagLayout.java b/libjava/java/awt/GridBagLayout.java
new file mode 100644
index 00000000000..29e1beac43d
--- /dev/null
+++ b/libjava/java/awt/GridBagLayout.java
@@ -0,0 +1,92 @@
+/* GridBagLayout - Layout manager for components according to GridBagConstraints
+   Copyright (C) 2002 Free Software Foundation, Inc.
+
+This file is part of GNU Classpath.
+
+GNU Classpath is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+GNU Classpath is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+02111-1307 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package java.awt;
+
+import java.io.Serializable;
+
+/**
+ * Stub implementeation.
+ */
+public class GridBagLayout
+  implements Serializable, LayoutManager2
+{
+  public void addLayoutComponent(String name, Component component)
+  {
+  }
+
+  public void removeLayoutComponent(Component component)
+  {
+  }
+
+  public Dimension preferredLayoutSize(Container parent)
+  {
+    return null;
+  }
+
+  public Dimension minimumLayoutSize(Container parent)
+  {
+    return null;
+  }
+
+  public void layoutContainer(Container parent)
+  {
+  }
+
+  public void addLayoutComponent(Component component, Object contraint)
+  {
+  }
+
+  public Dimension maximumLayoutSize(Container target)
+  {
+    return null;
+  }
+
+  public float getLayoutAlignmentX(Container target)
+  {
+    return 0.0f;
+  }
+
+  public float getLayoutAlignmentY(Container target)
+  {
+    return 0.0f;
+  }
+
+  public void invalidateLayout(Container target)
+  {
+  }
+}
diff --git a/libjava/java/awt/image/MemoryImageSource.java b/libjava/java/awt/image/MemoryImageSource.java
index fce112a0656..0e8d4620672 100644
--- a/libjava/java/awt/image/MemoryImageSource.java
+++ b/libjava/java/awt/image/MemoryImageSource.java
@@ -116,7 +116,7 @@ public class MemoryImageSource implements ImageProducer
        Constructs an ImageProducer from memory using the default RGB ColorModel
     */
     public MemoryImageSource(int w, int h,
-			     byte pix[], int off, int scan)
+			     int pix[], int off, int scan)
     {
 	this ( w, h, ColorModel.getRGBdefault(), pix, off, scan, null);
     }