From 1020ce5944edde4364baef4d371cd4f9b0dae721 Mon Sep 17 00:00:00 2001 From: doko Date: Sat, 28 Jun 2008 13:29:13 +0000 Subject: libjava/ 2008-06-28 Matthias Klose 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 * 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 --- libjava/classpath/gnu/CORBA/Poa/gnuPOA.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'libjava/classpath/gnu/CORBA/Poa/gnuPOA.java') diff --git a/libjava/classpath/gnu/CORBA/Poa/gnuPOA.java b/libjava/classpath/gnu/CORBA/Poa/gnuPOA.java index 0dbca7cfbde..82e520904f1 100644 --- a/libjava/classpath/gnu/CORBA/Poa/gnuPOA.java +++ b/libjava/classpath/gnu/CORBA/Poa/gnuPOA.java @@ -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) { -- cgit v1.2.3