3 files changed, 17 insertions, 17 deletions
diff --git a/libjava/java/beans/PropertyChangeEvent.java b/libjava/java/beans/PropertyChangeEvent.java
index f07577c..f48d5fe 100644
--- a/libjava/java/beans/PropertyChangeEvent.java
+++ b/libjava/java/beans/PropertyChangeEvent.java
@@ -1,5 +1,5 @@
 /* java.beans.PropertyChangeEvent
-   Copyright (C) 1998 Free Software Foundation, Inc.
+   Copyright (C) 1998, 2000 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -50,8 +50,8 @@ package java.beans;
 
 public class PropertyChangeEvent extends java.util.EventObject {
 	String propertyName;
-	Object oldVal;
-	Object newVal;
+	Object oldValue;
+	Object newValue;
 	Object propagationId;
 
 	/** Create a new PropertyChangeEvent.  Remember that if
@@ -60,14 +60,14 @@ public class PropertyChangeEvent extends java.util.EventObject {
 	 ** from the old PropertyChangeEvent.
 	 ** @param source the Bean containing the property.
 	 ** @param propertyName the property's name.
-	 ** @param oldVal the old value of the property.
-	 ** @param newVal the new value of the property.
+	 ** @param oldValue the old value of the property.
+	 ** @param newValue the new value of the property.
 	 **/
 	public PropertyChangeEvent(Object source, String propertyName, Object oldVal, Object newVal) {
 		super(source);
 		this.propertyName = propertyName;
-		this.oldVal = oldVal;
-		this.newVal = newVal;
+		oldValue = oldVal;
+		newValue = newVal;
 	}
 
 	/** Get the property name.
@@ -81,14 +81,14 @@ public class PropertyChangeEvent extends java.util.EventObject {
 	 ** @return the property's old value.
 	 **/
 	public Object getOldValue() {
-		return oldVal;
+		return oldValue;
 	}
 
 	/** Get the property's new value.
 	 ** @return the property's new value.
 	 **/
 	public Object getNewValue() {
-		return newVal;
+		return newValue;
 	}
 
 	/** Set the propagation ID.  This is a way for the event
diff --git a/libjava/java/beans/PropertyVetoException.java b/libjava/java/beans/PropertyVetoException.java
index 51a5642..989b9e0 100644
--- a/libjava/java/beans/PropertyVetoException.java
+++ b/libjava/java/beans/PropertyVetoException.java
@@ -1,5 +1,5 @@
 /* java.beans.PropertyVetoException
-   Copyright (C) 1998 Free Software Foundation, Inc.
+   Copyright (C) 1998, 2000 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -37,7 +37,7 @@ package java.beans;
  **/
 
 public class PropertyVetoException extends Exception {
-	PropertyChangeEvent changeEvent;
+	PropertyChangeEvent evt;
 
 	/** Instantiate this exception with the given message and property change.
 	 ** @param msg the reason for the veto.
@@ -45,11 +45,11 @@ public class PropertyVetoException extends Exception {
 	 **/
 	public PropertyVetoException(String msg, PropertyChangeEvent changeEvent) {
 		super(msg);
-		this.changeEvent = changeEvent;
+		evt = changeEvent;
 	}
 
 	/** Get the PropertyChange event that was vetoed. **/
 	public PropertyChangeEvent getPropertyChangeEvent() {
-		return changeEvent;
+		return evt;
 	}
 }
diff --git a/libjava/java/beans/beancontext/BeanContextServiceRevokedEvent.java b/libjava/java/beans/beancontext/BeanContextServiceRevokedEvent.java
index 32520bc..f19fcda 100644
--- a/libjava/java/beans/beancontext/BeanContextServiceRevokedEvent.java
+++ b/libjava/java/beans/beancontext/BeanContextServiceRevokedEvent.java
@@ -1,5 +1,5 @@
 /* java.beans.beancontext.BeanContextServiceRevokedEvent
-   Copyright (C) 1999 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2000 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -41,7 +41,7 @@ public class BeanContextServiceRevokedEvent extends BeanContextEvent {
 	 * available.
 	 */
 	protected Class serviceClass;
-	private boolean revokeNow;
+	private boolean invalidateRefs;
 
 	/**
 	 * Create a new service revoked event.
@@ -55,7 +55,7 @@ public class BeanContextServiceRevokedEvent extends BeanContextEvent {
 	public BeanContextServiceRevokedEvent(BeanContextServices services, Class serviceClass, boolean revokeNow) {
 		super(services);
 		this.serviceClass = serviceClass;
-		this.revokeNow = revokeNow;
+		invalidateRefs = revokeNow;
 	}
 
 	/**
@@ -94,6 +94,6 @@ public class BeanContextServiceRevokedEvent extends BeanContextEvent {
 	 *         usable.
 	 */
 	public boolean isCurrentServiceInvalidNow() {
-		return revokeNow;
+		return invalidateRefs;
 	}
 }