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, 6 insertions, 25 deletions

diff --git a/libjava/classpath/gnu/javax/imageio/jpeg/JPEGComponent.java b/libjava/classpath/gnu/javax/imageio/jpeg/JPEGComponent.java
index d5799fd412b..d07bb34e939 100644
--- a/libjava/classpath/gnu/javax/imageio/jpeg/JPEGComponent.java
+++ b/libjava/classpath/gnu/javax/imageio/jpeg/JPEGComponent.java
@@ -336,7 +336,7 @@ public class JPEGComponent
           {
             k += r;
             r = (int) JPEGStream.readBits(s);
-            s = (int) HuffmanTable.extend(r, s);
+            s = HuffmanTable.extend(r, s);
             zz[k] = s;
           }
         else
diff --git a/libjava/classpath/gnu/javax/imageio/jpeg/JPEGDecoder.java b/libjava/classpath/gnu/javax/imageio/jpeg/JPEGDecoder.java
index 3610ebe874f..0f2a3f2b949 100644
--- a/libjava/classpath/gnu/javax/imageio/jpeg/JPEGDecoder.java
+++ b/libjava/classpath/gnu/javax/imageio/jpeg/JPEGDecoder.java
@@ -40,16 +40,12 @@ package gnu.javax.imageio.jpeg;
 import java.io.IOException;
 import java.nio.ByteOrder;
 
-import javax.imageio.*;
 import javax.imageio.plugins.jpeg.JPEGHuffmanTable;
 import javax.imageio.plugins.jpeg.JPEGQTable;
-import javax.imageio.spi.*;
-import javax.imageio.metadata.*;
 import javax.imageio.stream.ImageInputStream;
 
 import java.util.ArrayList;
 import java.util.Hashtable;
-import java.util.Iterator;
 import java.awt.Point;
 import java.awt.Transparency;
 import java.awt.color.ColorSpace;
@@ -391,7 +387,7 @@ public class JPEGDecoder
                     // read in how much they need
                     for (int compIndex = 0; compIndex < numberOfComponents; compIndex++)
                       {
-                        JPEGComponent comp = (JPEGComponent) frame.components.getComponentByID(componentSelector[compIndex]);
+                        JPEGComponent comp = frame.components.getComponentByID(componentSelector[compIndex]);
                         comp.readComponentMCU(jpegStream);
                       }
                     mcuIndex++;
@@ -420,7 +416,7 @@ public class JPEGDecoder
                       {
                         for (int compIndex = 0; compIndex < numberOfComponents; compIndex++)
                           {
-                            JPEGComponent comp = (JPEGComponent) frame.components.getComponentByID(componentSelector[compIndex]);
+                            JPEGComponent comp = frame.components.getComponentByID(componentSelector[compIndex]);
                             if (compIndex > 1)
                               comp.padMCU(mcuTotalIndex, resetInterval - mcuIndex);
                             comp.resetInterval();
@@ -485,8 +481,7 @@ public class JPEGDecoder
                 // Unencode the data.
                 for (int i = 0; i < frame.getComponentCount(); i++)
                   {
-                    JPEGComponent comp =
-                      (JPEGComponent) frame.components.get(i);
+                    JPEGComponent comp = frame.components.get(i);
                     comp.setQuantizationTable(qTables[comp.quant_id].getTable());
                     comp.quantitizeData();
                     comp.idctData(myDCT);
@@ -494,7 +489,7 @@ public class JPEGDecoder
                 // Scale the image and write the data to the raster.
                 for (int i = 0; i < frame.getComponentCount(); i++)
                   {
-                    JPEGComponent comp = (JPEGComponent) frame.components.get(i);
+                    JPEGComponent comp = frame.components.get(i);
                     comp.scaleByFactors();
                     comp.writeData(raster, i);
                     // Ensure garbage collection.
diff --git a/libjava/classpath/gnu/javax/imageio/jpeg/JPEGException.java b/libjava/classpath/gnu/javax/imageio/jpeg/JPEGException.java
index b684069ccb6..a2c06e27e04 100644
--- a/libjava/classpath/gnu/javax/imageio/jpeg/JPEGException.java
+++ b/libjava/classpath/gnu/javax/imageio/jpeg/JPEGException.java
@@ -37,14 +37,7 @@ exception statement from your version. */
 
 package gnu.javax.imageio.jpeg;
 
-// FIXME: change to IIOException
-import java.io.IOException;
 import javax.imageio.*;
-import javax.imageio.spi.*;
-import javax.imageio.metadata.*;
-import javax.imageio.stream.ImageInputStream;
-import java.util.Iterator;
-import java.awt.image.BufferedImage;
 
 public class JPEGException extends IIOException
 {
diff --git a/libjava/classpath/gnu/javax/imageio/jpeg/JPEGFrame.java b/libjava/classpath/gnu/javax/imageio/jpeg/JPEGFrame.java
index 9b958f98f2c..35aed728a4d 100644
--- a/libjava/classpath/gnu/javax/imageio/jpeg/JPEGFrame.java
+++ b/libjava/classpath/gnu/javax/imageio/jpeg/JPEGFrame.java
@@ -101,7 +101,7 @@ public class JPEGFrame
   public void setHuffmanTables(byte componentID, JPEGHuffmanTable ACTable,
                                JPEGHuffmanTable DCTable)
   {
-    JPEGComponent comp = (JPEGComponent)components.getComponentByID(componentID);
+    JPEGComponent comp = components.getComponentByID(componentID);
     comp.setACTable(ACTable);
     comp.setDCTable(DCTable);
   }
diff --git a/libjava/classpath/gnu/javax/imageio/jpeg/JPEGImageInputStream.java b/libjava/classpath/gnu/javax/imageio/jpeg/JPEGImageInputStream.java
index 4ae909baf15..29a12f346cf 100644
--- a/libjava/classpath/gnu/javax/imageio/jpeg/JPEGImageInputStream.java
+++ b/libjava/classpath/gnu/javax/imageio/jpeg/JPEGImageInputStream.java
@@ -37,17 +37,10 @@ exception statement from your version. */
 
 package gnu.javax.imageio.jpeg;
 
-import java.io.EOFException;
 import java.io.IOException;
-import javax.imageio.*;
-import javax.imageio.spi.*;
-import javax.imageio.metadata.*;
 import javax.imageio.stream.ImageInputStream;
 import javax.imageio.stream.ImageInputStreamImpl;
 
-import java.util.Iterator;
-import java.awt.image.BufferedImage;
-
 public class JPEGImageInputStream
   extends ImageInputStreamImpl
 {