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.


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

5 files changed, 1 insertions, 9 deletions

diff --git a/libjava/classpath/gnu/javax/imageio/png/PNGChunk.java b/libjava/classpath/gnu/javax/imageio/png/PNGChunk.java
index 6b53810c89d..8efbeea7259 100644
--- a/libjava/classpath/gnu/javax/imageio/png/PNGChunk.java
+++ b/libjava/classpath/gnu/javax/imageio/png/PNGChunk.java
@@ -40,7 +40,6 @@ package gnu.javax.imageio.png;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.io.IOException;
-import java.io.UnsupportedEncodingException;
 
 /**
  * Class to load and validate a generic PNG chunk.
diff --git a/libjava/classpath/gnu/javax/imageio/png/PNGDecoder.java b/libjava/classpath/gnu/javax/imageio/png/PNGDecoder.java
index 20fc32ce371..652f59d35b5 100644
--- a/libjava/classpath/gnu/javax/imageio/png/PNGDecoder.java
+++ b/libjava/classpath/gnu/javax/imageio/png/PNGDecoder.java
@@ -140,7 +140,7 @@ public class PNGDecoder
 
   /**
    * Parse the appropriate color type and create an AWT raster for it.
-   * @param raster - the file header.
+   * @param header - the file header.
    */
   public WritableRaster getRaster( PNGHeader header )
   {
diff --git a/libjava/classpath/gnu/javax/imageio/png/PNGEncoder.java b/libjava/classpath/gnu/javax/imageio/png/PNGEncoder.java
index c0a30a7baef..b8441c4e3f0 100644
--- a/libjava/classpath/gnu/javax/imageio/png/PNGEncoder.java
+++ b/libjava/classpath/gnu/javax/imageio/png/PNGEncoder.java
@@ -40,7 +40,6 @@ package gnu.javax.imageio.png;
 import java.util.Vector;
 import java.util.zip.Deflater;
 import java.awt.color.ColorSpace;
-import java.awt.color.ICC_Profile;
 import java.awt.color.ICC_ColorSpace;
 import java.awt.image.BufferedImage;
 import java.awt.image.ColorModel;
@@ -48,7 +47,6 @@ import java.awt.image.DataBuffer;
 import java.awt.image.DataBufferByte;
 import java.awt.image.DataBufferUShort;
 import java.awt.image.IndexColorModel;
-import java.awt.image.Raster;
 import java.awt.image.WritableRaster;
 
 public class PNGEncoder 
diff --git a/libjava/classpath/gnu/javax/imageio/png/PNGFile.java b/libjava/classpath/gnu/javax/imageio/png/PNGFile.java
index cc0ca297fcb..96e8f9ce78f 100644
--- a/libjava/classpath/gnu/javax/imageio/png/PNGFile.java
+++ b/libjava/classpath/gnu/javax/imageio/png/PNGFile.java
@@ -44,7 +44,6 @@ import java.util.Vector;
 import java.awt.image.BufferedImage;
 import java.awt.image.WritableRaster;
 import java.awt.image.ColorModel;
-import java.awt.image.IndexColorModel;
 import java.awt.color.ColorSpace;
 
 public class PNGFile 
diff --git a/libjava/classpath/gnu/javax/imageio/png/PNGGamma.java b/libjava/classpath/gnu/javax/imageio/png/PNGGamma.java
index af777d9b4f6..d9cacea4609 100644
--- a/libjava/classpath/gnu/javax/imageio/png/PNGGamma.java
+++ b/libjava/classpath/gnu/javax/imageio/png/PNGGamma.java
@@ -37,10 +37,6 @@ exception statement from your version. */
 
 package gnu.javax.imageio.png;
 
-import java.awt.color.ICC_ProfileGray;
-import java.awt.color.ICC_ProfileRGB;
-import java.awt.color.ICC_Profile;
-import java.awt.color.ICC_ColorSpace;
 import java.awt.color.ColorSpace;
 
 /**