I'm checking this in on the generics branch.
After checking in my VM changes for the jsr166 code last night, I
downloaded a new drop of this code from the RI site and found that
they now use different methods. This patch adds those.
Tom
2006-06-16 Tom Tromey <[EMAIL PROTECTED]>
* vm/reference/sun/reflect/Reflection.java (verifyMemberAccess):
Removed.
(getCallerClass): Now static.
* vm/reference/sun/reflect/misc/ReflectUtil.java: New file.
Index: vm/reference/sun/reflect/Reflection.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/vm/reference/sun/reflect/Attic/Reflection.java,v
retrieving revision 1.1.2.1
diff -u -r1.1.2.1 Reflection.java
--- vm/reference/sun/reflect/Reflection.java 16 Jun 2006 01:44:14 -0000
1.1.2.1
+++ vm/reference/sun/reflect/Reflection.java 16 Jun 2006 15:03:43 -0000
@@ -39,60 +39,13 @@
import gnu.classpath.VMStackWalker;
-import java.lang.reflect.Modifier;
-
public class Reflection
{
/**
* A stack-walking wrapper method used by the JSR 166 RI.
*/
- public Class getCallerClass(int depth)
+ public static Class getCallerClass(int depth)
{
return VMStackWalker.getClassContext()[depth];
}
-
- // We use this inaccessible inner class as an argument type
- // in verifyMemberAccess. All current users of this method
- // in the JSR 166 RI pass 'null' for this argument, and
- // consequently we don't know what it means. Using a funny
- // type like this for the argument means that if the RI changes,
- // we will see a compilation error.
- private static class MustBeNull
- {
- }
-
- /**
- * Perform access checks on a member of a class. This API is
- * derived from the public domain code in the JSR 166 reference
- * implementation.
- * @param caller the class requesting access to the member
- * @param declarer the declaring class of the member
- * @param ignored unknown parameter; always null
- * @param modifiers the modifiers on the member
- * @return true if access is granted, false otherwise
- */
- public static boolean verifyMemberAccess(Class caller,
- Class declarer,
- MustBeNull ignored,
- int modifiers)
- {
- // Same class, always ok.
- if (caller == declarer)
- return true;
- // Public access is ok.
- if ((modifiers & Modifier.PUBLIC) != 0)
- return true;
- // Protected access and request comes from
- // a subclass of the declarer -- ok.
- if ((modifiers & Modifier.PROTECTED) != 0
- && declarer.isAssignableFrom(caller))
- return true;
- // Package-private access, or protected access,
- // and the packages are the same --ok.
- if ((modifiers & Modifier.PRIVATE) == 0
- && caller.getPackage() == declarer.getPackage())
- return true;
- // Otherwise, no.
- return false;
- }
}
Index: vm/reference/sun/reflect/misc/ReflectUtil.java
===================================================================
RCS file: vm/reference/sun/reflect/misc/ReflectUtil.java
diff -N vm/reference/sun/reflect/misc/ReflectUtil.java
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ vm/reference/sun/reflect/misc/ReflectUtil.java 1 Jan 1970 00:00:00
-0000
@@ -0,0 +1,93 @@
+/* ReflectUtil.java - JSR 166 reflection hooks
+ Copyright (C) 2006 Free Software Foundation
+
+This file is part of GNU Classpath.
+
+GNU Classpath is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+GNU Classpath is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; see the file COPYING. If not, write to the
+Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library. Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module. An independent module is a module which is not derived from
+or based on this library. If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so. If you do not wish to do so, delete this
+exception statement from your version. */
+
+package sun.reflect.misc;
+
+import java.lang.reflect.Modifier;
+
+public class ReflectUtil
+{
+ // We use this inaccessible inner class as an argument type
+ // in verifyMemberAccess. All current users of this method
+ // in the JSR 166 RI pass 'null' for this argument, and
+ // consequently we don't know what it means. Using a funny
+ // type like this for the argument means that if the RI changes,
+ // we will see a compilation error.
+ private static class MustBeNull
+ {
+ }
+
+ public static void checkPackageAccess(Class declaringClass)
+ {
+ // FIXME: not sure what to check here.
+ }
+
+ /**
+ * Perform access checks on a member of a class. This API is
+ * derived from the public domain code in the JSR 166 reference
+ * implementation.
+ * @param caller the class requesting access to the member
+ * @param declarer the declaring class of the member
+ * @param ignored unknown parameter; always null
+ * @param modifiers the modifiers on the member
+ * @return true if access is granted, false otherwise
+ */
+ public static void ensureMemberAccess(Class caller,
+ Class declarer,
+ MustBeNull ignored,
+ int modifiers)
+ {
+ // Same class, always ok.
+ if (caller == declarer)
+ return;
+ // Public access is ok.
+ if ((modifiers & Modifier.PUBLIC) != 0)
+ return;
+ // Protected access and request comes from
+ // a subclass of the declarer -- ok.
+ if ((modifiers & Modifier.PROTECTED) != 0
+ && declarer.isAssignableFrom(caller))
+ return;
+ // Package-private access, or protected access,
+ // and the packages are the same --ok.
+ if ((modifiers & Modifier.PRIVATE) == 0
+ && caller.getPackage() == declarer.getPackage())
+ return;
+ // Otherwise, no.
+ throw new IllegalAccessError();
+ }
+}
