diff options
author | doko <doko@138bc75d-0d04-0410-961f-82ee72b054a4> | 2008-06-28 13:29:13 +0000 |
---|---|---|
committer | doko <doko@138bc75d-0d04-0410-961f-82ee72b054a4> | 2008-06-28 13:29:13 +0000 |
commit | 1020ce5944edde4364baef4d371cd4f9b0dae721 (patch) | |
tree | 602cd7aa7c947386134690d8e0f6b53abcdeacb9 /libjava/classpath/javax/rmi/CORBA | |
parent | 9f41ce98ce6f4f7c8ac5e2c4b6e5d27e10201015 (diff) | |
download | gcc-1020ce5944edde4364baef4d371cd4f9b0dae721.tar.gz |
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
Diffstat (limited to 'libjava/classpath/javax/rmi/CORBA')
4 files changed, 7 insertions, 7 deletions
diff --git a/libjava/classpath/javax/rmi/CORBA/PortableRemoteObjectDelegate.java b/libjava/classpath/javax/rmi/CORBA/PortableRemoteObjectDelegate.java index 2849707632b..f376bedfe80 100644 --- a/libjava/classpath/javax/rmi/CORBA/PortableRemoteObjectDelegate.java +++ b/libjava/classpath/javax/rmi/CORBA/PortableRemoteObjectDelegate.java @@ -84,7 +84,7 @@ public interface PortableRemoteObjectDelegate * unexported. Also, such object cannot be collected by garbage collector. * This is usually impemented via {@link Util#unexportObject} * - * @param object the object to export. + * @param obj the object to export. * * @throws RemoteException */ @@ -113,7 +113,7 @@ public interface PortableRemoteObjectDelegate * returned stub is also connected to the same ORB. If the target is * unconnected, the returned stub is unconnected. * - * @param target a server side object. + * @param obj a server side object. * @return a stub object that can be used to access that server object. * * @throws NoSuchObjectException if a stub cannot be located for the given @@ -127,7 +127,7 @@ public interface PortableRemoteObjectDelegate * object to becomes available for garbage collection. This is usually * impemented via {@link Util#unexportObject} * - * @param object the object to unexport. + * @param obj the object to unexport. * * @throws NoSuchObjectException if the passed object is not currently * exported. diff --git a/libjava/classpath/javax/rmi/CORBA/Util.java b/libjava/classpath/javax/rmi/CORBA/Util.java index cfd3d7bd686..04b6f63a6fb 100644 --- a/libjava/classpath/javax/rmi/CORBA/Util.java +++ b/libjava/classpath/javax/rmi/CORBA/Util.java @@ -332,7 +332,7 @@ public class Util * </tr> * </table> * - * @param ex an exception that was thrown on a server side implementation. + * @param exception an exception that was thrown on a server side implementation. * * @return the corresponding RemoteException unless it is a RuntimeException. * diff --git a/libjava/classpath/javax/rmi/CORBA/UtilDelegate.java b/libjava/classpath/javax/rmi/CORBA/UtilDelegate.java index cacb925810b..79d740e7b0a 100644 --- a/libjava/classpath/javax/rmi/CORBA/UtilDelegate.java +++ b/libjava/classpath/javax/rmi/CORBA/UtilDelegate.java @@ -243,7 +243,7 @@ public interface UtilDelegate * </tr> * </table> * - * @param ex an exception that was thrown on a server side implementation. + * @param e an exception that was thrown on a server side implementation. * * @return the corresponding RemoteException unless it is a RuntimeException. * @@ -266,7 +266,7 @@ public interface UtilDelegate * * @param output a stream to write to, must be * org.omg.CORBA_2_3.portable.OutputStream - * @param object an object to write. + * @param obj an object to write. */ void writeRemoteObject(OutputStream output, Object obj); diff --git a/libjava/classpath/javax/rmi/CORBA/ValueHandler.java b/libjava/classpath/javax/rmi/CORBA/ValueHandler.java index c4213efdcfb..acc44aa2f4a 100644 --- a/libjava/classpath/javax/rmi/CORBA/ValueHandler.java +++ b/libjava/classpath/javax/rmi/CORBA/ValueHandler.java @@ -114,7 +114,7 @@ public interface ValueHandler * When the value provides the writeReplace method, the result of this method * is written. Otherwise, the value itself is written. * - * @param the value that should be written to the stream. + * @param value the value that should be written to the stream. * * @return the value that will be actually written to the stream. */ |