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

11 files changed, 18 insertions, 21 deletions

diff --git a/libjava/classpath/org/ietf/jgss/GSSContext.java b/libjava/classpath/org/ietf/jgss/GSSContext.java
index 6f469e235a3..c3962214519 100644
--- a/libjava/classpath/org/ietf/jgss/GSSContext.java
+++ b/libjava/classpath/org/ietf/jgss/GSSContext.java
@@ -562,7 +562,7 @@ public interface GSSContext
    * @param inStream  Input stream containing the message to generate
    *                  the MIC over.
    * @param outStream Output stream to write the GSS-API output token to.
-   * @param msgProp   Instance of MessageProp that is used by the
+   * @param mgProp    Instance of MessageProp that is used by the
    *                  application to set the desired QOP.  Set the desired
    *                  QOP to 0 in msgProp to request the default QOP.
    *                  Alternatively pass in <code>null</code> for msgProp
diff --git a/libjava/classpath/org/omg/CORBA/PolicyErrorHelper.java b/libjava/classpath/org/omg/CORBA/PolicyErrorHelper.java
index 213acafc7e5..e665197b107 100644
--- a/libjava/classpath/org/omg/CORBA/PolicyErrorHelper.java
+++ b/libjava/classpath/org/omg/CORBA/PolicyErrorHelper.java
@@ -128,7 +128,7 @@ public abstract class PolicyErrorHelper
   public static PolicyError read(InputStream input)
   {
     // Read the exception repository id.
-    String id = input.read_string();
+    input.read_string();
     PolicyError value = new PolicyError();
 
     value.reason = input.read_short();
@@ -147,4 +147,4 @@ public abstract class PolicyErrorHelper
     output.write_string(id());
     output.write_short(value.reason);
   }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/CORBA/UnknownUserExceptionHelper.java b/libjava/classpath/org/omg/CORBA/UnknownUserExceptionHelper.java
index 0ca50cb88c2..086641e5c82 100644
--- a/libjava/classpath/org/omg/CORBA/UnknownUserExceptionHelper.java
+++ b/libjava/classpath/org/omg/CORBA/UnknownUserExceptionHelper.java
@@ -127,7 +127,7 @@ public abstract class UnknownUserExceptionHelper
   public static UnknownUserException read(InputStream input)
   {
     // Read the exception repository id.
-    String id = input.read_string();
+    input.read_string();
     UnknownUserException value = new UnknownUserException();
 
     value.except = input.read_any();
@@ -146,4 +146,4 @@ public abstract class UnknownUserExceptionHelper
     output.write_string(id());
     output.write_any(value.except);
   }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/CosNaming/NamingContextExtPOA.java b/libjava/classpath/org/omg/CosNaming/NamingContextExtPOA.java
index cf5d7b3d808..f3c93aab344 100644
--- a/libjava/classpath/org/omg/CosNaming/NamingContextExtPOA.java
+++ b/libjava/classpath/org/omg/CosNaming/NamingContextExtPOA.java
@@ -84,7 +84,7 @@ public abstract class NamingContextExtPOA
   /** @inheritDoc */
   public OutputStream _invoke(String method, InputStream in, ResponseHandler rh)
   {
-    Integer call_method = (Integer) _NamingContextExtImplBase._methods.get(method);
+    Integer call_method = _NamingContextExtImplBase._methods.get(method);
 
     if (call_method == null)
       // The older methods are handled separately.
@@ -189,7 +189,7 @@ public abstract class NamingContextExtPOA
   OutputStream super_invoke(String method, InputStream in, ResponseHandler rh)
   {
     OutputStream out = null;
-    Integer call_method = (Integer) _NamingContextImplBase.methods.get(method);
+    Integer call_method = _NamingContextImplBase.methods.get(method);
     if (call_method == null)
       throw new BAD_OPERATION(Minor.Method, CompletionStatus.COMPLETED_MAYBE);
 
diff --git a/libjava/classpath/org/omg/CosNaming/NamingContextPOA.java b/libjava/classpath/org/omg/CosNaming/NamingContextPOA.java
index a9788827642..a4f8b1cb6d9 100644
--- a/libjava/classpath/org/omg/CosNaming/NamingContextPOA.java
+++ b/libjava/classpath/org/omg/CosNaming/NamingContextPOA.java
@@ -92,7 +92,7 @@ public abstract class NamingContextPOA
   public OutputStream _invoke(String method, InputStream in, ResponseHandler rh)
   {
     OutputStream out = null;
-    Integer call_method = (Integer) _NamingContextImplBase.methods.get(method);
+    Integer call_method = _NamingContextImplBase.methods.get(method);
     if (call_method == null)
       throw new BAD_OPERATION(Minor.Method, CompletionStatus.COMPLETED_MAYBE);
 
diff --git a/libjava/classpath/org/omg/CosNaming/_NamingContextExtImplBase.java b/libjava/classpath/org/omg/CosNaming/_NamingContextExtImplBase.java
index 617f7aec4ab..387e27e6894 100644
--- a/libjava/classpath/org/omg/CosNaming/_NamingContextExtImplBase.java
+++ b/libjava/classpath/org/omg/CosNaming/_NamingContextExtImplBase.java
@@ -96,7 +96,7 @@ public abstract class _NamingContextExtImplBase
 
   public OutputStream _invoke(String method, InputStream in, ResponseHandler rh)
   {
-    Integer call_method = (Integer) _methods.get(method);
+    Integer call_method = _methods.get(method);
 
     if (call_method == null)
 
@@ -206,7 +206,7 @@ public abstract class _NamingContextExtImplBase
   {
     Streamable result = null;
 
-    Integer call_method = (Integer) _methods.get(request.operation());
+    Integer call_method = _methods.get(request.operation());
 
     if (call_method == null)
       {
diff --git a/libjava/classpath/org/omg/CosNaming/_NamingContextImplBase.java b/libjava/classpath/org/omg/CosNaming/_NamingContextImplBase.java
index 1c2a56be60a..115ef74c361 100644
--- a/libjava/classpath/org/omg/CosNaming/_NamingContextImplBase.java
+++ b/libjava/classpath/org/omg/CosNaming/_NamingContextImplBase.java
@@ -123,7 +123,7 @@ public abstract class _NamingContextImplBase
   public OutputStream _invoke(String method, InputStream in, ResponseHandler rh)
   {
     OutputStream out = null;
-    Integer call_method = (Integer) methods.get(method);
+    Integer call_method = methods.get(method);
     if (call_method == null)
       throw new BAD_OPERATION(Minor.Method, CompletionStatus.COMPLETED_MAYBE);
 
@@ -389,7 +389,7 @@ public abstract class _NamingContextImplBase
     Streamable result = null;
 
     // The server request contains no required result type.
-    Integer call_method = (Integer) methods.get(request.operation());
+    Integer call_method = methods.get(request.operation());
     if (call_method == null)
       throw new BAD_OPERATION(Minor.Method, CompletionStatus.COMPLETED_MAYBE);
 
diff --git a/libjava/classpath/org/omg/IOP/TaggedComponentHelper.java b/libjava/classpath/org/omg/IOP/TaggedComponentHelper.java
index 55090c74673..bc4445fcd57 100644
--- a/libjava/classpath/org/omg/IOP/TaggedComponentHelper.java
+++ b/libjava/classpath/org/omg/IOP/TaggedComponentHelper.java
@@ -43,7 +43,6 @@ import gnu.CORBA.OrbRestricted;
 
 import org.omg.CORBA.Any;
 import org.omg.CORBA.BAD_OPERATION;
-import org.omg.CORBA.MARSHAL;
 import org.omg.CORBA.ORB;
 import org.omg.CORBA.StructMember;
 import org.omg.CORBA.TCKind;
@@ -51,8 +50,6 @@ import org.omg.CORBA.TypeCode;
 import org.omg.CORBA.portable.InputStream;
 import org.omg.CORBA.portable.OutputStream;
 
-import java.io.IOException;
-
 /**
  * A helper operations for the {@link TaggedComponent}.
  *
diff --git a/libjava/classpath/org/omg/PortableInterceptor/ORBInitInfoPackage/DuplicateNameHelper.java b/libjava/classpath/org/omg/PortableInterceptor/ORBInitInfoPackage/DuplicateNameHelper.java
index 2d9740a855e..37d66a6d75f 100644
--- a/libjava/classpath/org/omg/PortableInterceptor/ORBInitInfoPackage/DuplicateNameHelper.java
+++ b/libjava/classpath/org/omg/PortableInterceptor/ORBInitInfoPackage/DuplicateNameHelper.java
@@ -123,7 +123,7 @@ public abstract class DuplicateNameHelper
   public static DuplicateName read(InputStream input)
   {
     // Read the exception repository id.
-    String id = input.read_string();
+    input.read_string();
     DuplicateName value = new DuplicateName();
 
     value.name = input.read_string();
@@ -142,4 +142,4 @@ public abstract class DuplicateNameHelper
     output.write_string(id());
     output.write_string(value.name);
   }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/PortableServer/ForwardRequestHelper.java b/libjava/classpath/org/omg/PortableServer/ForwardRequestHelper.java
index d5d5751b9e7..0ebbc7e41b1 100644
--- a/libjava/classpath/org/omg/PortableServer/ForwardRequestHelper.java
+++ b/libjava/classpath/org/omg/PortableServer/ForwardRequestHelper.java
@@ -114,7 +114,7 @@ public abstract class ForwardRequestHelper
   public static ForwardRequest read(InputStream input)
   {
     // Read the exception repository id.
-    String id = input.read_string();
+    input.read_string();
     ForwardRequest value = new ForwardRequest();
 
     value.forward_reference = input.read_Object();
@@ -151,4 +151,4 @@ public abstract class ForwardRequestHelper
     output.write_string(id());
     output.write_Object(value.forward_reference);
   }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/PortableServer/POAPackage/InvalidPolicyHelper.java b/libjava/classpath/org/omg/PortableServer/POAPackage/InvalidPolicyHelper.java
index 32ddae8586f..cb3c6702442 100644
--- a/libjava/classpath/org/omg/PortableServer/POAPackage/InvalidPolicyHelper.java
+++ b/libjava/classpath/org/omg/PortableServer/POAPackage/InvalidPolicyHelper.java
@@ -136,7 +136,7 @@ public abstract class InvalidPolicyHelper
   public static InvalidPolicy read(InputStream input)
   {
     // Read the exception repository id.
-    String id = input.read_string();
+    input.read_string();
     InvalidPolicy value = new InvalidPolicy();
 
     value.index = input.read_short();
@@ -155,4 +155,4 @@ public abstract class InvalidPolicyHelper
     output.write_string(id());
     output.write_short(value.index);
   }
-}
\ No newline at end of file
+}