2008-03-16 Andrew John Hughes <gnu_andrew@member.fsf.org>

	* vm/reference/java/lang/reflect/VMField.java:
	Consistently use 'clazz' as the name of the variable
	containing the declaring class.
	* vm/reference/java/lang/reflect/VMMethod.java:
	Likewise.

2 files changed, 8 insertions, 8 deletions

diff --git a/vm/reference/java/lang/reflect/VMField.java b/vm/reference/java/lang/reflect/VMField.java
index 5d68914b8..53f384749 100644
--- a/vm/reference/java/lang/reflect/VMField.java
+++ b/vm/reference/java/lang/reflect/VMField.java
@@ -42,7 +42,7 @@ import java.lang.annotation.Annotation;
 
 final class VMField
 {
-  Class declaringClass;
+  Class clazz;
   String name;
   int slot;
   
@@ -52,16 +52,16 @@ final class VMField
    */
   Field f;
 
-  VMField(Class declaringClass, String name, int slot)
+  VMField(Class clazz, String name, int slot)
   {
-    this.declaringClass = declaringClass;
+    this.clazz = clazz;
     this.name = name;
     this.slot = slot;
   }
 
   public Class getDeclaringClass()
   {
-    return declaringClass;
+    return clazz;
   }
 
   public String getName()
@@ -513,7 +513,7 @@ final class VMField
     if (!(o instanceof Field))
       return false;
     Field that = (Field)o; 
-    if (declaringClass != that.getDeclaringClass())
+    if (clazz != that.getDeclaringClass())
       return false;
     if (!name.equals(that.getName()))
       return false;
diff --git a/vm/reference/java/lang/reflect/VMMethod.java b/vm/reference/java/lang/reflect/VMMethod.java
index 99c176f10..f8574cd87 100644
--- a/vm/reference/java/lang/reflect/VMMethod.java
+++ b/vm/reference/java/lang/reflect/VMMethod.java
@@ -44,7 +44,7 @@ import java.util.Arrays;
 
 final class VMMethod
 {
-  Class declaringClass;
+  Class clazz;
   String name;
   int slot;
 
@@ -56,7 +56,7 @@ final class VMMethod
 
   public Class getDeclaringClass()
   {
-    return declaringClass;
+    return clazz;
   }
 
   public String getName()
@@ -170,7 +170,7 @@ final class VMMethod
     if (!(o instanceof Method))
       return false;
     Method that = (Method)o;
-    if (declaringClass != that.getDeclaringClass())
+    if (clazz != that.getDeclaringClass())
       return false;
     if (!name.equals(that.getName()))
       return false;