Import GNU Classpath (classpath-0_97_2-release).

libjava/

2008-06-28  Matthias Klose  <doko@ubuntu.com>

        Import GNU Classpath (classpath-0_97_2-release).

        * Regenerate class and header files.
        * Regenerate auto* files.
        * gcj/javaprims.h: Define jobjectRefType.
        * jni.cc (_Jv_JNI_GetObjectRefType): New (stub only).
        (_Jv_JNIFunctions): Initialize GetObjectRefType.
        * gnu/classpath/jdwp/VMVirtualMachine.java,
        java/security/VMSecureRandom.java: Merge from classpath.
        * HACKING: Fix typo.
        * ChangeLog-2007: New file.
        * configure.ac: Set JAVAC, pass --disable-regen-headers to classpath.

libjava/classpath/

2008-06-28  Matthias Klose  <doko@ubuntu.com>

        * m4/ac_prog_javac.m4: Disable check for JAVAC, when
        not configured with --enable-java-maintainer-mode.
        * aclocal.m4, configure: Regenerate.
        * native/jni/gstreamer-peer/Makefile.am: Do not link with
        libclasspathnative.
        * native/jni/gstreamer-peer/Makefile.in: Regenerate.
        * tools/Makefile.am, lib/Makefile.am: Use JAVAC for setting
        JCOMPILER, drop flags not understood by gcj.

From-SVN: r137223

1 files changed, 9 insertions, 9 deletions

diff --git a/libjava/classpath/javax/imageio/ImageReader.java b/libjava/classpath/javax/imageio/ImageReader.java
index c7eed06..269493f 100644
--- a/libjava/classpath/javax/imageio/ImageReader.java
+++ b/libjava/classpath/javax/imageio/ImageReader.java
@@ -429,7 +429,7 @@ public abstract class ImageReader
    * IllegalStateException).  If input is null then the current input
    * source will be removed.
    *
-   * @param input the input source object
+   * @param in the input source object
    * @param seekForwardOnly true if this reader should be allowed to
    * read input from the data stream more than once, false otherwise
    *
@@ -1498,7 +1498,7 @@ public abstract class ImageReader
    * null.  IllegalArgumentException is thrown if either region will
    * contain 0 pixels after clipping.
    *
-   * @param image read parameters, or null
+   * @param param read parameters, or null
    * @param srcWidth the width of the source image
    * @param srcHeight the height of the source image
    * @param image the destination image, or null
@@ -1734,7 +1734,7 @@ public abstract class ImageReader
   public ImageTypeSpecifier getRawImageType (int imageIndex)
     throws IOException
   {
-    return (ImageTypeSpecifier) getImageTypes(imageIndex).next();
+    return getImageTypes(imageIndex).next();
   }
 
   /**
@@ -1828,7 +1828,7 @@ public abstract class ImageReader
    * warning listeners will be notified of read progress, changes in
    * sample sets and warnings respectively.
    *
-   * @param the index of the image frame to read
+   * @param imageIndex the index of the image frame to read
    *
    * @return a buffered image
    *
@@ -1855,8 +1855,8 @@ public abstract class ImageReader
    * The source and destination band settings are checked with a call
    * to checkReadParamBandSettings.
    *
-   * @param the index of the image frame to read
-   * @param the image read parameters
+   * @param imageIndex the index of the image frame to read
+   * @param param the image read parameters
    *
    * @return an IIOImage
    *
@@ -1902,7 +1902,7 @@ public abstract class ImageReader
    * Each set of source and destination band settings are checked with
    * a call to checkReadParamBandSettings.
    *
-   * @param an iterator over the image read parameters
+   * @param params iterator over the image read parameters
    *
    * @return an IIOImage
    *
@@ -1938,8 +1938,8 @@ public abstract class ImageReader
    * before this method returns and so listeners will not necessarily
    * be notified.
    *
-   * @param the index of the image frame to read
-   * @param the image read parameters
+   * @param imageIndex the index of the image frame to read
+   * @param param the image read parameters
    *
    * @return a rendered image
    *