diff options
| author | Matthias Klose <doko@gcc.gnu.org> | 2008-06-28 13:29:13 +0000 |
|---|---|---|
| committer | Matthias Klose <doko@gcc.gnu.org> | 2008-06-28 13:29:13 +0000 |
| commit | e0441a5bfb29083a532307ba2b1fd6d6d13944ba (patch) | |
| tree | 602cd7aa7c947386134690d8e0f6b53abcdeacb9 /libjava/classpath/javax/imageio | |
| parent | 15c151967dd1cde61b79d26374f608f63a29d411 (diff) | |
| download | gcc-e0441a5bfb29083a532307ba2b1fd6d6d13944ba.zip gcc-e0441a5bfb29083a532307ba2b1fd6d6d13944ba.tar.gz gcc-e0441a5bfb29083a532307ba2b1fd6d6d13944ba.tar.bz2 | |
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
Diffstat (limited to 'libjava/classpath/javax/imageio')
8 files changed, 20 insertions, 27 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 * diff --git a/libjava/classpath/javax/imageio/ImageTypeSpecifier.java b/libjava/classpath/javax/imageio/ImageTypeSpecifier.java index 05b3a26..3faa3c9 100644 --- a/libjava/classpath/javax/imageio/ImageTypeSpecifier.java +++ b/libjava/classpath/javax/imageio/ImageTypeSpecifier.java @@ -119,7 +119,7 @@ public class ImageTypeSpecifier * @param colorSpace the color space * @param bankIndices the bank indices at which each band will be * stored - * @param bandOffsets the starting band offset for each band within + * @param bankOffsets the starting band offset for each band within * its bank * @param dataType the data type, a DataBuffer constant * @param hasAlpha true if this image type specifier should have an @@ -168,8 +168,8 @@ public class ImageTypeSpecifier * Create a buffered image with the given dimensions using that has * the characteristics specified by this image type specifier. * - * @param the width of the buffered image, in pixels - * @param the height of the buffered image, in pixels + * @param width width of the buffered image, in pixels + * @param height the height of the buffered image, in pixels * * @return a buffered image * diff --git a/libjava/classpath/javax/imageio/ImageWriter.java b/libjava/classpath/javax/imageio/ImageWriter.java index b49e081..78d792c 100644 --- a/libjava/classpath/javax/imageio/ImageWriter.java +++ b/libjava/classpath/javax/imageio/ImageWriter.java @@ -899,7 +899,7 @@ public abstract class ImageWriter * IllegalStateException). If input is null then the current input * source will be removed. * - * @param input the output destination object + * @param output the output destination object * * @exception IllegalArgumentException if input is not a valid input * source for this writer and is not an ImageInputStream @@ -1338,7 +1338,7 @@ public abstract class ImageWriter * @param imageIndex the frame index at which to insert the image * @param image the image data, metadata and thumbnails to be * inserted - * @param the image write parameters, or null + * @param param image write parameters, or null * * @exception IllegalStateException if output is null * @exception UnsupportedOperationException if image insertion is diff --git a/libjava/classpath/javax/imageio/metadata/IIOMetadataFormatImpl.java b/libjava/classpath/javax/imageio/metadata/IIOMetadataFormatImpl.java index 78fad1a..444497d 100644 --- a/libjava/classpath/javax/imageio/metadata/IIOMetadataFormatImpl.java +++ b/libjava/classpath/javax/imageio/metadata/IIOMetadataFormatImpl.java @@ -39,18 +39,13 @@ exception statement from your version. */ package javax.imageio.metadata; import org.w3c.dom.Attr; -import org.w3c.dom.DOMException; -import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.NamedNodeMap; -import org.w3c.dom.Node; import org.w3c.dom.NodeList; import org.w3c.dom.TypeInfo; -import org.w3c.dom.UserDataHandler; import java.util.ArrayList; import java.util.HashMap; import java.util.Map; -import java.util.Iterator; import java.util.List; import java.util.Locale; import java.util.ResourceBundle; diff --git a/libjava/classpath/javax/imageio/metadata/IIOMetadataNode.java b/libjava/classpath/javax/imageio/metadata/IIOMetadataNode.java index 2d52e46..37269f5 100644 --- a/libjava/classpath/javax/imageio/metadata/IIOMetadataNode.java +++ b/libjava/classpath/javax/imageio/metadata/IIOMetadataNode.java @@ -334,7 +334,7 @@ public class IIOMetadataNode */ public void setAttribute(String name, String value) { - Attr attr = (Attr) getAttributeNode(name); + Attr attr = getAttributeNode(name); if (attr != null) attr.setValue(value); else diff --git a/libjava/classpath/javax/imageio/spi/ServiceRegistry.java b/libjava/classpath/javax/imageio/spi/ServiceRegistry.java index 3051a81..170ea00 100644 --- a/libjava/classpath/javax/imageio/spi/ServiceRegistry.java +++ b/libjava/classpath/javax/imageio/spi/ServiceRegistry.java @@ -787,10 +787,10 @@ public class ServiceRegistry * @param category the service category to which an ordering * constraint is to be added. * - * @param first the provider which is supposed to come before + * @param firstProvider the provider which is supposed to come before * <code>second</code>. * - * @param second the provider which is supposed to come after + * @param secondProvider the provider which is supposed to come after * <code>first</code>. * * @throws IllegalArgumentException if <code>first</code> and @@ -815,10 +815,10 @@ public class ServiceRegistry * @param category the service category from which an ordering * constraint is to be removed. * - * @param first the provider which is supposed to come before + * @param firstProvider the provider which is supposed to come before * <code>second</code>. * - * @param second the provider which is supposed to come after + * @param secondProvider the provider which is supposed to come after * <code>first</code>. * * @throws IllegalArgumentException if <code>first</code> and diff --git a/libjava/classpath/javax/imageio/stream/ImageInputStream.java b/libjava/classpath/javax/imageio/stream/ImageInputStream.java index a2af6c3..4d1b5d5 100644 --- a/libjava/classpath/javax/imageio/stream/ImageInputStream.java +++ b/libjava/classpath/javax/imageio/stream/ImageInputStream.java @@ -469,7 +469,7 @@ public interface ImageInputStream * @param offset the index of the first element in <code>i</code> * that will hold read data. * - * @param numLongs the number of signed 32-bit integers to read + * @param numInts the number of signed 32-bit integers to read * (which is one fourth of the number of bytes). * * @throws IndexOutOfBoundsException if <code>offset</code> or diff --git a/libjava/classpath/javax/imageio/stream/MemoryCacheImageInputStream.java b/libjava/classpath/javax/imageio/stream/MemoryCacheImageInputStream.java index da8a958..72aa5e8 100644 --- a/libjava/classpath/javax/imageio/stream/MemoryCacheImageInputStream.java +++ b/libjava/classpath/javax/imageio/stream/MemoryCacheImageInputStream.java @@ -39,10 +39,8 @@ exception statement from your version. */ package javax.imageio.stream; import java.io.BufferedInputStream; -import java.io.BufferedReader; import java.io.IOException; import java.io.InputStream; -import java.io.InputStreamReader; /** * @author Michael Koch (konqueror@gmx.de) |