From e0441a5bfb29083a532307ba2b1fd6d6d13944ba Mon Sep 17 00:00:00 2001 From: Matthias Klose Date: Sat, 28 Jun 2008 13:29:13 +0000 Subject: Import GNU Classpath (classpath-0_97_2-release). 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. From-SVN: r137223 --- .../java/beans/beancontext/BeanContextServicesSupport.java | 9 +-------- libjava/classpath/java/beans/beancontext/BeanContextSupport.java | 4 ++-- 2 files changed, 3 insertions(+), 10 deletions(-) (limited to 'libjava/classpath/java/beans/beancontext') diff --git a/libjava/classpath/java/beans/beancontext/BeanContextServicesSupport.java b/libjava/classpath/java/beans/beancontext/BeanContextServicesSupport.java index f354ff4..1c27f98 100644 --- a/libjava/classpath/java/beans/beancontext/BeanContextServicesSupport.java +++ b/libjava/classpath/java/beans/beancontext/BeanContextServicesSupport.java @@ -38,8 +38,6 @@ exception statement from your version. */ package java.beans.beancontext; -import gnu.classpath.NotImplementedException; - import java.io.IOException; import java.io.ObjectInputStream; import java.io.ObjectOutputStream; @@ -88,11 +86,6 @@ public class BeanContextServicesSupport private BeanContextServiceProvider provider; - private BCSSProxyServiceProvider(BeanContextServiceProvider p) - { - provider = p; - } - public Iterator getCurrentServiceSelectors (BeanContextServices bcs, Class serviceClass) { @@ -427,7 +420,7 @@ public class BeanContextServicesSupport * Subclasses may envelope its behaviour in order to read further * serialized data to the stream. * - * @param oos the stream from which data is being deserialized. + * @param ois the stream from which data is being deserialized. * @throws IOException if an I/O error occurs. * @throws ClassNotFoundException if the class of a deserialized object * can not be found. diff --git a/libjava/classpath/java/beans/beancontext/BeanContextSupport.java b/libjava/classpath/java/beans/beancontext/BeanContextSupport.java index d57f5f8..7572af3 100644 --- a/libjava/classpath/java/beans/beancontext/BeanContextSupport.java +++ b/libjava/classpath/java/beans/beancontext/BeanContextSupport.java @@ -794,12 +794,12 @@ public class BeanContextSupport extends BeanContextChildSupport } /** - * Deerializes the children using the + * Deserializes the children using the * {@link #deserialize(ObjectInputStream, Collection} method * and then calls {@link childDeserializedHook(Object, BCSChild)} * for each child deserialized. * - * @param oos the output stream. + * @param ois the input stream. * @throws IOException if an I/O error occurs. */ public final void readChildren (ObjectInputStream ois) -- cgit v1.1