Re: [cp-patches] FYI: VM Interface Reflection Changes - Switch Data Storage

[Andrew John Hughes]

On 15/03/2008, Christian Thalinger <[EMAIL PROTECTED]> wrote:
> On Mon, 2008-03-03 at 21:21 +0000, Andrew John Hughes wrote:
>
>  Sorry for the late response.  Could we use a consistent class variable
>  name?
>
>  >  final class VMConstructor
>  >  {
>  > +  Class clazz;
>  > +  int slot;
>
>  >  final class VMField
>  >  {
>  > +  Class declaringClass;
>  > +  String name;
>  > +  int slot;
>
>  >  final class VMMethod
>  >  {
>  > +  Class declaringClass;
>  > +  String name;
>  > +  int slot;
>
>  I'd vote for clazz.
>
>  - twisti
>
>

Done.

ChangeLog:

2008-03-16  Andrew John Hughes  <[EMAIL PROTECTED]>

        * 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.

-- 
Andrew :-)

Document Freedom Day - March 26th
http://documentfreedom.org

Support Free Java!
Contribute to GNU Classpath and the OpenJDK
http://www.gnu.org/software/classpath
http://openjdk.java.net

PGP Key: 94EFD9D8 (http://subkeys.pgp.net)
Fingerprint: F8EF F1EA 401E 2E60 15FA  7927 142C 2591 94EF D9D8

Index: vm/reference/java/lang/reflect/VMField.java
===================================================================
RCS file: /sources/classpath/classpath/vm/reference/java/lang/reflect/VMField.java,v
retrieving revision 1.4
diff -u -3 -p -u -r1.4 VMField.java
--- vm/reference/java/lang/reflect/VMField.java	6 Mar 2008 20:22:19 -0000	1.4
+++ vm/reference/java/lang/reflect/VMField.java	16 Mar 2008 20:00:31 -0000
@@ -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;
Index: vm/reference/java/lang/reflect/VMMethod.java
===================================================================
RCS file: /sources/classpath/classpath/vm/reference/java/lang/reflect/VMMethod.java,v
retrieving revision 1.4
diff -u -3 -p -u -r1.4 VMMethod.java
--- vm/reference/java/lang/reflect/VMMethod.java	6 Mar 2008 20:22:19 -0000	1.4
+++ vm/reference/java/lang/reflect/VMMethod.java	16 Mar 2008 20:00:31 -0000
@@ -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;