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
2008-06-28 13:29:13 +00:00
parent 15c151967d
commit e0441a5bfb
1429 changed files with 32837 additions and 18119 deletions
@@ -45,7 +45,6 @@ import java.io.IOException;
 import java.math.BigDecimal;
 import java.math.BigInteger;

-import org.omg.CORBA.TypeCode;
 import org.omg.CORBA.TypeCodePackage.BadKind;

 /**
@@ -128,9 +127,6 @@ public class BigDecimalHelper
   * 
   * @param out a stream to write into.
   * @param x a big decimal to write.
-   * @param digits a number of the decimal digits in the record
-   * being written. For the smaller
-   * numbers, zeroes are added to the left.
   *
   * @throws IOException if the stream write method throws one.
   * @throws BadKind if this BigDecimal has more digits than
@@ -38,7 +38,6 @@ exception statement from your version. */

 package gnu.CORBA;

-import java.util.Arrays;
 import java.util.Comparator;

 /**
@@ -195,9 +195,9 @@ public abstract class AbstractCdrInput
   * Set the Big Endian or Little Endian encoding. The stream reads Big Endian
   * by default.
   * 
-   * @param use_little_endian if true, the stream expect the multi-byte data in
-   * the form "less significant byte first" (Little Endian). This is the
-   * opposite to the java standard (Big Endian).
+   * @param use_big_endian if true, the stream expect the multi-byte data in
+   * the form "most significant byte first" (Big Endian). This is the
+   * java standard.
   */
  public void setBigEndian(boolean use_big_endian)
  {
@@ -208,7 +208,7 @@ public abstract class AbstractCdrInput
  /**
   * Get the used encoding.
   * 
-   * @param true for Big Endian, false for Little Endian.
+   * @return true for Big Endian, false for Little Endian.
   */
  public boolean isBigEndian()
  {
@@ -654,7 +654,7 @@ public abstract class AbstractCdrInput

        byte[] r = new byte[l];
        int n = 0;
-        reading: while (n < r.length)
+        while (n < r.length)
          {
            n += read(r, n, r.length - n);
          }
@@ -291,7 +291,7 @@ public abstract class AbstractCdrOutput

  /**
   * Write a single byte.
-   * @param a byte to write (low 8 bits are written).
+   * @param n byte to write (low 8 bits are written).
   */
  public void write(int n)
  {
@@ -497,7 +497,7 @@ public abstract class AbstractCdrOutput
   * Writes the lower bytes of the passed array members.
   *
   * @param chars an array
-   * @param offsets offset
+   * @param offset offset
   * @param length length
   */
  public void write_char_array(char[] chars, int offset, int length)
@@ -104,7 +104,7 @@ public class HeadlessInput
  /**
   * Create an instance, reading from the given buffer.
   * 
-   * @param a_stram a stream from where the data will be read.
+   * @param a_stream a stream from where the data will be read.
   * @param inheritSettings a stream from that endian and other settings are
   * inherited.
   */
@@ -151,7 +151,7 @@ public class HeadlessInput
    else
      {
        subsequentCalls = true;
-        Serializable value = (Serializable) Vio.readValue(this, NONE, null,
+        Serializable value = Vio.readValue(this, NONE, null,
          null, repository_id, null, null);
        return value;
      }
@@ -167,7 +167,7 @@ public class HeadlessInput
    else
      {
        subsequentCalls = true;
-        value = (Serializable) Vio.readValue(this, NONE, value, null, null,
+        value = Vio.readValue(this, NONE, value, null, null,
          null, null);
        return value;
      }
@@ -186,7 +186,7 @@ public class HeadlessInput
          {
            subsequentCalls = true;
            Serializable value = (Serializable) Vio.instantiateAnyWay(clz);
-            value = (Serializable) Vio.readValue(this, NONE, value, null, null,
+            value = Vio.readValue(this, NONE, value, null, null,
              null, null);
            return value;
          }
@@ -38,7 +38,6 @@ exception statement from your version. */

 package gnu.CORBA.CDR;

-import java.io.DataInput;
 import java.io.EOFException;
 import java.io.FilterInputStream;
 import java.io.IOException;
@@ -637,7 +637,7 @@ public abstract class Vio
              r = new byte[chunk_size + 256];

            n = 0;
-            reading: while (n < chunk_size)
+            while (n < chunk_size)
              n += input.read(r, n, chunk_size - n);
            output.write(r, 0, n);
          }
@@ -167,7 +167,7 @@ public class gnuRuntime
   * @param a_id a repository Id, if only one Id was specified in the stream.
   * @param a_ids a repository Ids, if the multiple Ids were specified in te
   * stream.
-   * @param a_codabase a codebase, if it was specified in the stream.
+   * @param a_codebase a codebase, if it was specified in the stream.
   */
  public gnuRuntime(String a_codebase, Object a_target)
  {
@@ -44,10 +44,6 @@ import java.net.InetAddress;
 import java.net.UnknownHostException;
 import java.util.ArrayList;

-import org.omg.CORBA.LocalObject;
-import org.omg.CORBA.portable.Delegate;
-import org.omg.CORBA.portable.ObjectImpl;
-
 /**
 * This class provides support for the direct method invocations without
 * involving the network in the case when both ORBs run on the same java
@@ -109,7 +109,7 @@ public class Connected_objects
  /**
   * Get the record of the stored object.
   *
-   * @param object the stored object
+   * @param stored_object the stored object
   *
   * @return the record about the stored object, null if
   * this object is not stored here.
@@ -141,7 +141,7 @@ public class Connected_objects
   * generated automatically.
   *
   * @param object the object to add.
-   * @param port, on that the ORB will be listening to the remote
+   * @param port on that the ORB will be listening to the remote
   * invocations.
   *
   * @return the newly created object record.
@@ -38,8 +38,6 @@ exception statement from your version. */

 package gnu.CORBA.DynAn;

-import gnu.CORBA.TypeKindNamer;
-
 import org.omg.CORBA.Any;
 import org.omg.CORBA.CompletionStatus;
 import org.omg.CORBA.ORB;
@@ -46,7 +46,6 @@ import org.omg.CORBA.BAD_PARAM;
 import org.omg.CORBA.ORB;
 import org.omg.CORBA.TCKind;
 import org.omg.CORBA.TypeCode;
-import org.omg.CORBA.TypeCodePackage.BadKind;
 import org.omg.CORBA.portable.Streamable;
 import org.omg.DynamicAny.DynAny;
 import org.omg.DynamicAny.DynAnyFactoryPackage.InconsistentTypeCode;
@@ -271,7 +271,6 @@ public class gnuDynUnion


        // Get the discriminator variant.
-        Variants:
        for (int i = 0; i < final_type.member_count(); i++)
          {
            if (final_type.member_label(i).equal(da))
@@ -392,7 +391,6 @@ public class gnuDynUnion


        // Get the discriminator variant.
-        Variants:
        for (int i = 0; i < final_type.member_count(); i++)
          {
            if (final_type.member_label(i).equal(da))
@@ -39,10 +39,8 @@ exception statement from your version. */
 package gnu.CORBA;

 import org.omg.CORBA.BAD_OPERATION;
-import org.omg.CORBA.NO_IMPLEMENT;
 import org.omg.CORBA.TypeCode;
 import org.omg.CORBA.UNKNOWN;
-import org.omg.CORBA.UnknownUserException;
 import org.omg.CORBA.portable.InputStream;
 import org.omg.CORBA.portable.OutputStream;
 import org.omg.CORBA.portable.Streamable;
@@ -55,16 +55,16 @@ public abstract class CancelHeader
  public int request_id;

  /**
-   * Write the header.
+   * Read the header.
   *
-   * @param out a stream to write to.
+   * @param input a stream to read from.
   */
  public abstract void read(InputStream input);

  /**
   * Write the header.
   *
-   * @param out a stream to write to.
+   * @param output a stream to write to.
   */
  public abstract void write(OutputStream output);
 }
@@ -41,8 +41,6 @@ package gnu.CORBA.GIOP;
 import gnu.CORBA.CDR.AbstractCdrInput;
 import gnu.CORBA.CDR.AbstractCdrOutput;
 import gnu.CORBA.IOR;
-import gnu.CORBA.IOR.CodeSets_profile;
-
 import java.io.IOException;

 /**
@@ -398,7 +398,7 @@ public class MessageHeader
        if (service != null)
          service.setSoTimeout(to_read);

-        reading: while (n < r.length)
+        while (n < r.length)
          {
            n += source.read(r, n, r.length - n);
          }
@@ -426,7 +426,7 @@ public class MessageHeader
                int dn;

                n = 0;
-                reading: while (n < h2.message_size)
+                while (n < h2.message_size)
                  {
                    dn = source.read(r, 0, h2.message_size - n);

@@ -51,9 +51,9 @@ public class CancelHeader
  extends gnu.CORBA.GIOP.CancelHeader
 {
  /**
-   * Write the header.
+   * Read the header.
   *
-   * @param out a stream to write to.
+   * @param input a stream to read from.
   */
  public void read(InputStream input)
  {
@@ -63,7 +63,7 @@ public class CancelHeader
  /**
   * Write the header.
   *
-   * @param out a stream to write to.
+   * @param output a stream to write to.
   */
  public void write(OutputStream output)
  {
@@ -385,7 +385,7 @@ public class IOR
  /**
   * Parse the provided stringifed reference.
   *
-   * @param stringified_reference, in the form of IOR:nnnnnn.....
+   * @param stringified_reference in the form of IOR:nnnnnn.....
   *
   * @return the parsed IOR
   *
@@ -42,7 +42,6 @@ import org.omg.CORBA.OBJ_ADAPTER;
 import org.omg.CORBA.OMGVMCID;
 import org.omg.PortableInterceptor.IORInfo;
 import org.omg.PortableInterceptor.IORInterceptor;
-import org.omg.PortableInterceptor.IORInterceptorOperations;
 import org.omg.PortableInterceptor.IORInterceptor_3_0Operations;
 import org.omg.PortableInterceptor.ObjectReferenceTemplate;

@@ -142,7 +142,7 @@ public class Registrator extends LocalObject implements ORBInitInfo
   * Create the interceptor collection from the given properties, using the
   * agreed naming convention.
   *
-   * @param orb the ORB being initialised.
+   * @param an_orb the ORB being initialised.
   * @param props the cumulated set of properties where the orb initializer
   * pattern is searched.
   * @param an_args the argument string array, passed to ORB.init.
@@ -58,8 +58,6 @@ import org.omg.PortableInterceptor.ForwardRequest;

 import java.io.IOException;

-import java.net.Socket;
-
 /**
 * The Classpath implementation of the {@link Delegate} functionality in the
 * case, when the object was constructed from an IOR object. The IOR can be
@@ -87,8 +85,6 @@ public class IorDelegate extends SimpleDelegate
   * @param operation the method name
   * @param parameters the method parameters
   * @param returns the return value holder
-   * @param exceptions the exceptions that can be thrown by the method
-   * @param ctx_list the context list (null allowed)
   *
   * @return the created request.
   */
@@ -175,7 +171,7 @@ public class IorDelegate extends SimpleDelegate
    throws ApplicationException, RemarshalException
  {
    StreamBasedRequest request = (StreamBasedRequest) output;
-    Forwardings: while (true)
+    while (true)
      {
        try
          {
@@ -62,7 +62,6 @@ import java.io.UnsupportedEncodingException;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.net.URLDecoder;
-import java.util.ArrayList;
 import java.util.StringTokenizer;

 /**
@@ -63,7 +63,7 @@ public class NameTransformer
   * representation. See {@link #toString(NameComponent)} for the
   * description of this format.
   *
-   * @param name the string form of the name.
+   * @param a_name the string form of the name.
   *
   * @return the array form of the name.
   *
@@ -111,7 +111,7 @@ public class ObjectCreator
   * mapped to the local java class. The omg.org domain must be mapped into the
   * object in either org/omg or gnu/CORBA namespace.
   * 
-   * @param IDL name
+   * @param idl name
   * @return instantiated object instance or null if no such available.
   */
  public static java.lang.Object createObject(String idl, String suffix)
@@ -185,7 +185,7 @@ public class OrbFocused
            p = (portServer) portServers.get(i);
            if (p.s_port == port)
              {
-                return (portServer) p;
+                return p;
              }
          }
        // The server is not yet instantiated. Instantiate.
@@ -855,7 +855,7 @@ public class OrbFunctional extends OrbRestricted
   * internet address and port. With this information, the object can be found
   * by another ORB, possibly located on remote computer.
   *
-   * @param the CORBA object
+   * @param forObject CORBA object
   * @return the object IOR representation.
   *
   * @throws BAD_PARAM if the object has not been previously connected to this
@@ -1040,7 +1040,7 @@ public class OrbFunctional extends OrbRestricted
   * computer, possibly running a different (not necessary java) CORBA
   * implementation.
   * 
-   * @param ior the object IOR representation string.
+   * @param an_ior the object IOR representation string.
   * 
   * @return the found CORBA object.
   * @see object_to_string(org.omg.CORBA.Object)
@@ -65,7 +65,6 @@ import org.omg.CORBA.UnionMember;
 import org.omg.CORBA.portable.OutputStream;
 import org.omg.CORBA.portable.ValueFactory;
 import org.omg.PortableInterceptor.ClientRequestInterceptorOperations;
-import org.omg.PortableInterceptor.IORInterceptorOperations;
 import org.omg.PortableInterceptor.IORInterceptor_3_0Operations;
 import org.omg.PortableInterceptor.ServerRequestInterceptorOperations;

@@ -163,7 +163,7 @@ public class AOM
   * Get the record of the stored object. If the object is mapped several times
   * under the different keys, one of the mappings is used.
   * 
-   * @param object the stored object
+   * @param stored_object the stored object
   * 
   * @return the record about the stored object, null if this object is not
   * stored here.
@@ -421,7 +421,7 @@ public class gnuPOA
   * or adding the returned instance to any possible table.
   *
   * @param child_name the name of the poa being created.
-   * @param manager the poa manager (never null).
+   * @param a_manager the poa manager (never null).
   * @param policies the array of policies.
   * @param an_orb the ORB for this POA.
   *
@@ -1239,7 +1239,7 @@ public class gnuPOA
   * @param x the aom entry, where the object is replaced by value, returned by
   * servant activator (if not null).
   * 
-   * @param key the object key.
+   * @param object_key the object key.
   * 
   * @param a_servant the servant that was passed as a parameter in the
   * activation method.
@@ -1317,7 +1317,7 @@ public class gnuPOA
  /**
  * Set the adapter activator for this POA.
  *
-  * @param the activator being set.
+  * @param an_activator the activator being set.
  */
  public void the_activator(AdapterActivator an_activator)
  {
@@ -41,7 +41,6 @@ package gnu.CORBA.Poa;
 import org.omg.CORBA.BAD_INV_ORDER;
 import org.omg.CORBA.LocalObject;
 import org.omg.PortableInterceptor.NON_EXISTENT;
-import org.omg.PortableInterceptor.ObjectReferenceTemplate;
 import org.omg.PortableServer.POAManager;
 import org.omg.PortableServer.POAManagerPackage.AdapterInactive;
 import org.omg.PortableServer.POAManagerPackage.State;
@@ -89,9 +88,9 @@ public class gnuPOAManager
   * Turns the associated POAs into active state, allowing them to receive
   * and process requests.
   *
-   * @throws if the POAs are in the inactive state. If once inactivated,
-   * the POA cannot be activated again. This method can only be called
-   * to leave the holding or discarding state.
+   * @throws AdapterInactive if the POAs are in the inactive state.
+   * If once inactivated, the POA cannot be activated again. This
+   * method can only be called to leave the holding or discarding state.
   */
  public void activate()
                throws AdapterInactive
@@ -785,7 +785,7 @@ public class gnuServantObject extends ObjectImpl
   * assumed equal if they are connected to the same orb and poa under the same
   * Id, regardless of they delegates.
   *
-   * @param another instance to check.
+   * @param other instance to check.
   * @return
   */
  public boolean _is_equivalent(org.omg.CORBA.Object other)
@@ -41,7 +41,6 @@ package gnu.CORBA;
 import gnu.CORBA.CDR.BufferedCdrOutput;

 import org.omg.CORBA.ARG_IN;
-import org.omg.CORBA.ARG_INOUT;
 import org.omg.CORBA.ARG_OUT;
 import org.omg.CORBA.Any;
 import org.omg.CORBA.Bounds;
@@ -38,8 +38,6 @@ exception statement from your version. */

 package gnu.CORBA;

-import java.util.ArrayList;
-
 import org.omg.CORBA.Bounds;
 import org.omg.CORBA.ContextList;

@@ -38,8 +38,6 @@ exception statement from your version. */

 package gnu.CORBA;

-import java.util.ArrayList;
-
 import org.omg.CORBA.Bounds;
 import org.omg.CORBA.ExceptionList;
 import org.omg.CORBA.TypeCode;
@@ -83,12 +83,10 @@ import org.omg.PortableInterceptor.ClientRequestInterceptorOperations;
 import org.omg.PortableInterceptor.ForwardRequest;
 import org.omg.PortableInterceptor.InvalidSlot;

-import java.io.EOFException;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;

-import java.net.BindException;
 import java.net.Socket;

 import java.util.ArrayList;
@@ -109,7 +109,7 @@ public class FixedTypeCode
  /**
   * Get the number of digits in thid BigDecimal
   *
-   * @param x a BigDecimal to check.
+   * @param number a BigDecimal to check.
   */
  public static int countDigits(BigDecimal number)
  {
@@ -63,7 +63,7 @@ public class RecursiveTypeCode
   * Create a typecode that serves as a placeholder for
   * the typecode with the given id.
   *
-   * @param id the Id of the type for that this type serves as a
+   * @param an_id the Id of the type for that this type serves as a
   * placeholder.
   */
  public RecursiveTypeCode(String an_id)