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

2 files changed, 13 insertions, 13 deletions

diff --git a/libjava/classpath/gnu/javax/naming/giop/ContextContinuation.java b/libjava/classpath/gnu/javax/naming/giop/ContextContinuation.java
index 7d7a785fd2f..05023840ba3 100644
--- a/libjava/classpath/gnu/javax/naming/giop/ContextContinuation.java
+++ b/libjava/classpath/gnu/javax/naming/giop/ContextContinuation.java
@@ -129,14 +129,14 @@ public class ContextContinuation implements Context
    * Creates a new naming context that uses naming service, represented by the
    * given CORBA object.
    * 
-   * @param namingService
+   * @param nsObject
    *          the naming service object. It must be possible to narrow it into
    *          the NamingContextExt.
    * @param props
    *          the environment table.
-   * @param orb
+   * @param anOrb
    *          the associated ORB. This reference is used during cleanup.
-   * @param the
+   * @param aFactory
    *          parent factory. This reference is used during cleanup.
    */
   public ContextContinuation(org.omg.CORBA.Object nsObject,
@@ -293,7 +293,7 @@ public class ContextContinuation implements Context
    * context. The returned object will wrap around the newly created CORBA
    * subcontext
    * 
-   * @param name
+   * @param subContext
    *          the name of the new context being created
    * @return the newly created context, bound to the instance of the context on
    *         that the method has been called
@@ -336,7 +336,7 @@ public class ContextContinuation implements Context
    * context. The returned object will wrap around the newly created CORBA
    * subcontext
    * 
-   * @param name
+   * @param subContext
    *          the name of the new context being created
    * @return the newly created context, bound to the instance of the context on
    *         that the method has been called
@@ -380,7 +380,7 @@ public class ContextContinuation implements Context
    * action if such subcontext does not exist. The context being destroyed must
    * be empty.
    * 
-   * @param name
+   * @param subContext
    *          the name of the subcontext beig removed.
    * @throws ContextNotEmptyException
    *           if the named context is not empty.
@@ -396,7 +396,7 @@ public class ContextContinuation implements Context
    * action if such subcontext does not exist. The context being destroyed must
    * be empty.
    * 
-   * @param name
+   * @param subContext
    *          the name of the subcontext beig removed.
    * @throws ContextNotEmptyException
    *           if the named context is not empty.
@@ -868,9 +868,9 @@ public class ContextContinuation implements Context
    * and value of the new property must not be null. If the property is already
    * defined, is current value is replaced by the propVal.
    * 
-   * @param propName
+   * @param key
    *          the name of the new property
-   * @param propVal
+   * @param value
    *          the value of the new property
    * @return the previous value of this property or null if the property has not
    *         been previously defined
diff --git a/libjava/classpath/gnu/javax/naming/jndi/url/rmi/ContextContinuation.java b/libjava/classpath/gnu/javax/naming/jndi/url/rmi/ContextContinuation.java
index de79b93c3dc..ee8c7791419 100644
--- a/libjava/classpath/gnu/javax/naming/jndi/url/rmi/ContextContinuation.java
+++ b/libjava/classpath/gnu/javax/naming/jndi/url/rmi/ContextContinuation.java
@@ -97,9 +97,9 @@ public class ContextContinuation implements Context
    * the registry. The new registry will be lazily instantiated on the first
    * call.
    * 
-   * @param propName
+   * @param key
    *          the name of the new property
-   * @param propVal
+   * @param value
    *          the value of the new property
    * @return the previous value of this property or null if the property has not
    *         been previously defined
@@ -426,7 +426,7 @@ public class ContextContinuation implements Context
    * @param name
    *          the object name (.toString()) is used to convert into string
    *          representation.
-   * @param the
+   * @param obj
    *          object (must be an instance of Remote).
    */
   public void rebind(Name name, Object obj) throws NamingException
@@ -439,7 +439,7 @@ public class ContextContinuation implements Context
    * 
    * @param name
    *          the object name.
-   * @param the
+   * @param obj
    *          object (must be an instance of Remote).
    */
   public void rebind(String name, Object obj) throws NamingException