Imported GNU Classpath 0.19 + gcj-import-20051115.

       * sources.am: Regenerated.
       * Makefile.in: Likewise.
       * scripts/makemake.tcl: Use glob -nocomplain.

From-SVN: r107049

7 files changed, 26 insertions, 15 deletions

diff --git a/libjava/classpath/java/awt/image/AreaAveragingScaleFilter.java b/libjava/classpath/java/awt/image/AreaAveragingScaleFilter.java
index 194d483..6333ce9 100644
--- a/libjava/classpath/java/awt/image/AreaAveragingScaleFilter.java
+++ b/libjava/classpath/java/awt/image/AreaAveragingScaleFilter.java
@@ -45,7 +45,7 @@ package java.awt.image;
  * points should give the desired results although Sun does not 
  * specify what the exact algorithm should be.
  * <br>
- * Currently this filter does nothing and needs to be implemented.
+ * FIXME: Currently this filter does nothing and needs to be implemented.
  *
  * @author C. Brian Jones (cbj@gnu.org) 
  */
diff --git a/libjava/classpath/java/awt/image/BufferedImage.java b/libjava/classpath/java/awt/image/BufferedImage.java
index 124b813..3cabfbd 100644
--- a/libjava/classpath/java/awt/image/BufferedImage.java
+++ b/libjava/classpath/java/awt/image/BufferedImage.java
@@ -1,5 +1,5 @@
 /* BufferedImage.java --
-   Copyright (C) 2000, 2002, 2003, 2004  Free Software Foundation
+   Copyright (C) 2000, 2002, 2003, 2004, 2005  Free Software Foundation
 
 This file is part of GNU Classpath.
 
@@ -48,9 +48,7 @@ import java.awt.Point;
 import java.awt.Rectangle;
 import java.awt.Transparency;
 import java.awt.color.ColorSpace;
-import java.util.HashSet;
 import java.util.Hashtable;
-import java.util.Iterator;
 import java.util.Vector;
 
 /**
@@ -64,7 +62,7 @@ import java.util.Vector;
  * @author Rolf W. Rasmussen (rolfwr@ii.uib.no)
  */
 public class BufferedImage extends Image
-  implements WritableRenderedImage
+  implements WritableRenderedImage, Transparency
 {
   public static final int TYPE_CUSTOM         =  0,
                           TYPE_INT_RGB        =  1,
@@ -690,4 +688,16 @@ public class BufferedImage extends Image
 	
     observers.remove (to);
   }
+
+  /**
+   * Return the transparency type.
+   *
+   * @return One of {@link #OPAQUE}, {@link #BITMASK}, or {@link #TRANSLUCENT}.
+   * @see Transparency#getTransparency()
+   * @since 1.5
+   */
+  public int getTransparency()
+  {
+    return colorModel.getTransparency();
+  }
 }
diff --git a/libjava/classpath/java/awt/image/ColorModel.java b/libjava/classpath/java/awt/image/ColorModel.java
index 1ebcb98..1ced2a0 100644
--- a/libjava/classpath/java/awt/image/ColorModel.java
+++ b/libjava/classpath/java/awt/image/ColorModel.java
@@ -609,7 +609,7 @@ public abstract class ColorModel implements Transparency
    * @param obj Array of TransferType or null.
    *
    * @return pixel value encoded according to the color model.
-   * @throws ArrayIndexOutOfBounds
+   * @throws ArrayIndexOutOfBoundsException
    * @throws ClassCastException
    * @since 1.4
    */
diff --git a/libjava/classpath/java/awt/image/ComponentSampleModel.java b/libjava/classpath/java/awt/image/ComponentSampleModel.java
index 953f63c..5cf06e4 100644
--- a/libjava/classpath/java/awt/image/ComponentSampleModel.java
+++ b/libjava/classpath/java/awt/image/ComponentSampleModel.java
@@ -63,8 +63,11 @@ public class ComponentSampleModel extends SampleModel
   protected int[] bandOffsets;
   protected int[] bankIndices;
   
-  // FIXME: Should we really shadow the numBands in the superclass?
-  //protected int numBands;
+  /** 
+   * Number of bands in the image described.
+   * @specnote This field shadows the protected numBands in SampleModel.
+   */
+  protected int numBands;
   
   /** Used when creating data buffers. */
   protected int numBanks;
@@ -100,6 +103,7 @@ public class ComponentSampleModel extends SampleModel
     
     this.bandOffsets = bandOffsets;
     this.bankIndices = bankIndices;
+    this.numBands = bandOffsets.length;
 
     this.numBanks = 0;
     for (int b=0; b<bankIndices.length; b++)
diff --git a/libjava/classpath/java/awt/image/ImageConsumer.java b/libjava/classpath/java/awt/image/ImageConsumer.java
index e1834c3..fc5ed11 100644
--- a/libjava/classpath/java/awt/image/ImageConsumer.java
+++ b/libjava/classpath/java/awt/image/ImageConsumer.java
@@ -75,7 +75,7 @@ public interface ImageConsumer
      * most one call to <code>setPixels</code> for any single pixel.
      *
      * @see #setHints
-     * @see #setPixels 
+     * @see #setPixels(int, int, int, int, ColorModel, int[], int, int) 
      */
     int SINGLEPASS = 8;
 
diff --git a/libjava/classpath/java/awt/image/PackedColorModel.java b/libjava/classpath/java/awt/image/PackedColorModel.java
index 894e6e6..b60230f 100644
--- a/libjava/classpath/java/awt/image/PackedColorModel.java
+++ b/libjava/classpath/java/awt/image/PackedColorModel.java
@@ -90,11 +90,7 @@ public abstract class PackedColorModel extends ColorModel
     return bitsPerComponent;
   }
 
-  /** Initializes the masks.
-   *
-   * @return an array containing the number of bits per color
-   * component.
-   */
+  /** Initializes the masks.  */
   private void initMasks(int[] colorMaskArray, int alphaMask)
   {
     int numComponents = colorMaskArray.length;
diff --git a/libjava/classpath/java/awt/image/SampleModel.java b/libjava/classpath/java/awt/image/SampleModel.java
index 257e30a..1159662 100644
--- a/libjava/classpath/java/awt/image/SampleModel.java
+++ b/libjava/classpath/java/awt/image/SampleModel.java
@@ -47,7 +47,8 @@ public abstract class SampleModel
   /** Height of image described. */
   protected int height;
   
-  /** Number of bands in the image described. */
+  /** Number of bands in the image described.  Package-private here,
+      shadowed by ComponentSampleModel. */
   protected int numBands;
 
   /**