diff options
Diffstat (limited to 'libjava/classpath/java/beans')
9 files changed, 18 insertions, 27 deletions
diff --git a/libjava/classpath/java/beans/Beans.java b/libjava/classpath/java/beans/Beans.java index b3b0a422edd..2f6e0a991a5 100644 --- a/libjava/classpath/java/beans/Beans.java +++ b/libjava/classpath/java/beans/Beans.java @@ -309,7 +309,7 @@ public class Beans * Objects. * * @param bean the Bean to cast. - * @param newClass the Class to cast it to. + * @param newBeanClass the Class to cast it to. * * @return whether the Bean can be cast to the class type * in question. diff --git a/libjava/classpath/java/beans/DefaultPersistenceDelegate.java b/libjava/classpath/java/beans/DefaultPersistenceDelegate.java index 08f6174bb6e..c4328e03060 100644 --- a/libjava/classpath/java/beans/DefaultPersistenceDelegate.java +++ b/libjava/classpath/java/beans/DefaultPersistenceDelegate.java @@ -127,7 +127,7 @@ public class DefaultPersistenceDelegate extends PersistenceDelegate { Method readMethod = propertyDescs[i].getReadMethod(); - args[i] = readMethod.invoke(oldInstance, null); + args[i] = readMethod.invoke(oldInstance); } } } @@ -186,7 +186,7 @@ public class DefaultPersistenceDelegate extends PersistenceDelegate if (readMethod != null && writeMethod != null) { - Object oldValue = readMethod.invoke(oldInstance, null); + Object oldValue = readMethod.invoke(oldInstance); if (oldValue != null) out.writeStatement(new Statement(oldInstance, diff --git a/libjava/classpath/java/beans/Encoder.java b/libjava/classpath/java/beans/Encoder.java index cde1735f4fd..6dc36277f99 100644 --- a/libjava/classpath/java/beans/Encoder.java +++ b/libjava/classpath/java/beans/Encoder.java @@ -195,7 +195,7 @@ public class Encoder PersistenceDelegate pd = (PersistenceDelegate) delegates.get(type); - return (pd != null) ? pd : (PersistenceDelegate) defaultPersistenceDelegate; + return (pd != null) ? pd : defaultPersistenceDelegate; } /** diff --git a/libjava/classpath/java/beans/EventHandler.java b/libjava/classpath/java/beans/EventHandler.java index 318b274898a..5efbc8dc6d7 100644 --- a/libjava/classpath/java/beans/EventHandler.java +++ b/libjava/classpath/java/beans/EventHandler.java @@ -173,19 +173,17 @@ public class EventHandler implements InvocationHandler try { // Look for boolean property getter isProperty - getter = o.getClass().getMethod("is" + capitalize(prop), - null); + getter = o.getClass().getMethod("is" + capitalize(prop)); } catch (NoSuchMethodException nsme1) { try { // Look for regular property getter getProperty - getter = o.getClass().getMethod("get" + capitalize(prop), - null); + getter = o.getClass().getMethod("get" + capitalize(prop)); } catch(NoSuchMethodException nsme2) { try { // Finally look for a method of the name prop - getter = o.getClass().getMethod(prop, null); + getter = o.getClass().getMethod(prop); } catch(NoSuchMethodException nsme3) { // Ok, give up with an intelligent hint for the user. throw new RuntimeException("Method not called: Could not find a property or method '" + prop @@ -194,7 +192,7 @@ public class EventHandler implements InvocationHandler } } try { - Object val = getter.invoke(o, null); + Object val = getter.invoke(o); if (rest != null) return getProperty(val, rest); @@ -304,7 +302,7 @@ public class EventHandler implements InvocationHandler // more specification compliant than the JDK itself because this one will fail in such a case. try { - actionMethod = targetClass.getMethod(action, null); + actionMethod = targetClass.getMethod(action); } catch(NoSuchMethodException nsme) { @@ -342,7 +340,7 @@ public class EventHandler implements InvocationHandler throw new ArrayIndexOutOfBoundsException(0); // Invoke target.action(property) - return actionMethod.invoke(target, null); + return actionMethod.invoke(target); } catch(InvocationTargetException ite) { throw new RuntimeException(ite.getCause()); } catch(IllegalAccessException iae) { diff --git a/libjava/classpath/java/beans/PropertyChangeSupport.java b/libjava/classpath/java/beans/PropertyChangeSupport.java index e944e151251..ecadb146fd7 100644 --- a/libjava/classpath/java/beans/PropertyChangeSupport.java +++ b/libjava/classpath/java/beans/PropertyChangeSupport.java @@ -346,8 +346,8 @@ public class PropertyChangeSupport implements Serializable { if (oldVal != newVal) firePropertyChange(new PropertyChangeEvent(source, propertyName, - new Integer(oldVal), - new Integer(newVal))); + Integer.valueOf(oldVal), + Integer.valueOf(newVal))); } /** diff --git a/libjava/classpath/java/beans/VetoableChangeSupport.java b/libjava/classpath/java/beans/VetoableChangeSupport.java index 12051d2ffb0..f2b6a1df84d 100644 --- a/libjava/classpath/java/beans/VetoableChangeSupport.java +++ b/libjava/classpath/java/beans/VetoableChangeSupport.java @@ -349,8 +349,8 @@ public class VetoableChangeSupport implements Serializable { if (oldVal != newVal) fireVetoableChange(new PropertyChangeEvent(source, propertyName, - new Integer(oldVal), - new Integer(newVal))); + Integer.valueOf(oldVal), + Integer.valueOf(newVal))); } /** diff --git a/libjava/classpath/java/beans/XMLDecoder.java b/libjava/classpath/java/beans/XMLDecoder.java index 7618bb8cb0e..131cf3b0464 100644 --- a/libjava/classpath/java/beans/XMLDecoder.java +++ b/libjava/classpath/java/beans/XMLDecoder.java @@ -164,7 +164,7 @@ public class XMLDecoder * * @param in InputStream to read XML data from. * @param owner Owner object which can be accessed and modified while parsing. - * @param exceptionListener ExceptionListener instance to which exception notifications are send. + * @param listener ExceptionListener instance to which exception notifications are send. * @param cl ClassLoader instance that is used for calls to <code>Class.forName(String, boolean, ClassLoader)</code> * @since 1.5 */ diff --git a/libjava/classpath/java/beans/beancontext/BeanContextServicesSupport.java b/libjava/classpath/java/beans/beancontext/BeanContextServicesSupport.java index f354ff47448..1c27f98e57b 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 d57f5f8842a..7572af3f0f9 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) |
