procyberian/gcc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Re-merges with Classpath, from various people:

Browse source 
* java/lang/reflect/Modifier.java: Reindented.
	(toString): Only trim trailing space if text was added to
	StringBuffer.
	* java/lang/reflect/ReflectPermission: Reindented.

From-SVN: r47028
This commit is contained in:
Tom Tromey 2001-11-14 22:42:42 +00:00 • committed by Tom Tromey
parent 0f7a7be7ce
commit 81bc01c265
3 changed files with 168 additions and 102 deletions
Download patch file Download diff file Expand all files Collapse all files

9
libjava/ChangeLog
View file

@ -1,13 +1,16 @@
2001-11-14 Tom Tromey <tromey@redhat.com> 2001-11-14 Tom Tromey <tromey@redhat.com>
Re-merges with Classpath, from various people:
* java/lang/reflect/Modifier.java: Reindented.
(toString): Only trim trailing space if text was added to
StringBuffer.
* java/lang/reflect/ReflectPermission: Reindented.
Re-merges with Classpath, from various people: Re-merges with Classpath, from various people:
* java/lang/Double.java (parseDouble): Fixed ordering of * java/lang/Double.java (parseDouble): Fixed ordering of
modifiers. modifiers.
* java/lang/reflect/AccessibleObject.java: Javadoc, reindented. * java/lang/reflect/AccessibleObject.java: Javadoc, reindented.
* java/lang/reflect/Member.java: Reindented. * java/lang/reflect/Member.java: Reindented.
* java/lang/reflect/Modifier.java: Reindented.
(toString): Only trim trailing space if text was added to
StringBuffer.
* java/util/ConcurrentModificationException.java: Javadoc * java/util/ConcurrentModificationException.java: Javadoc
updates. updates.
* java/util/EmptyStackException.java: Likewise. * java/util/EmptyStackException.java: Likewise.

212
libjava/java/lang/reflect/Modifier.java
View file

@ -27,12 +27,6 @@ executable file might be covered by the GNU General Public License. */
package java.lang.reflect; package java.lang.reflect;
/* Written using "Java Class Libraries", 2nd edition, ISBN 0-201-31002-3
* "The Java Language Specification", ISBN 0-201-63451-1
* plus online API docs for JDK 1.2 beta from http://www.javasoft.com.
* Status: Believed complete and correct to version 1.2.
*/
/** /**
* Modifier is a helper class with static methods to determine whether an * Modifier is a helper class with static methods to determine whether an
* int returned from getModifiers() represents static, public, protected, * int returned from getModifiers() represents static, public, protected,
@ -46,12 +40,13 @@ package java.lang.reflect;
* *
* @author John Keiser * @author John Keiser
* @author Tom Tromey <tromey@cygnus.com> * @author Tom Tromey <tromey@cygnus.com>
* * @author Eric Blake <ebb9@email.byu.edu>
* @see Member#getModifiers() * @see Member#getModifiers()
* @see Method#getModifiers() * @see Method#getModifiers()
* @see Field#getModifiers() * @see Field#getModifiers()
* @see Constructor#getModifiers() * @see Constructor#getModifiers()
* @see Class#getModifiers() * @see Class#getModifiers()
* @since 1.1
*/ */
public class Modifier public class Modifier
{ {
@ -60,226 +55,267 @@ public class Modifier
* worthless. However, this function is in the 1.1 spec, so it is added * worthless. However, this function is in the 1.1 spec, so it is added
* for completeness.</STRONG> * for completeness.</STRONG>
*/ */
public Modifier() {} public Modifier()
{
}
/** Public: accessible from any other class. **/ /**
* Public: accessible from any other class.
*/
public static final int PUBLIC = 0x0001; public static final int PUBLIC = 0x0001;
/** Private: accessible only from the declaring class. **/ /**
* Private: accessible only from the same enclosing class.
*/
public static final int PRIVATE = 0x0002; public static final int PRIVATE = 0x0002;
/** Protected: accessible only to subclasses. **/ /**
* Protected: accessible only to subclasses, or within the package.
*/
public static final int PROTECTED = 0x0004; public static final int PROTECTED = 0x0004;
/** Static: field or method - can be accessed or invoked without an /**
instance of the declaring class. **/ * Static:<br><ul>
* <li>Class: no enclosing instance for nested class.</li>
* <li>Field or Method: can be accessed or invoked without an
* instance of the declaring class.</li>
* </ul>
*/
public static final int STATIC = 0x0008; public static final int STATIC = 0x0008;
/** Final:<BR> /**
* <UL> * Final:<br><ul>
* <LI> Class: no subclasses allowed. </LI> * <li>Class: no subclasses allowed.</li>
* <LI> Field: cannot be changed. </LI> * <li>Field: cannot be changed.</li>
* <LI> Method: cannot be overriden. </LI> * <li>Method: cannot be overriden.</li>
* </UL> * </ul>
*/ */
public static final int FINAL = 0x0010; public static final int FINAL = 0x0010;
/** Synchronized: lock the class while calling this method. **/ /**
* Synchronized: Method: lock the class while calling this method.
*/
public static final int SYNCHRONIZED = 0x0020; public static final int SYNCHRONIZED = 0x0020;
/** Volatile: cannot be cached.<P> **/ /**
* Volatile: Field: cannot be cached.
*/
public static final int VOLATILE = 0x0040; public static final int VOLATILE = 0x0040;
/** Transient: not serialized or deserialized. **/ /**
* Transient: Field: not serialized or deserialized.
*/
public static final int TRANSIENT = 0x0080; public static final int TRANSIENT = 0x0080;
/** Native: use JNI to call this method. **/ /**
* Native: Method: use JNI to call this method.
*/
public static final int NATIVE = 0x0100; public static final int NATIVE = 0x0100;
/** Interface: is an interface. **/ /**
* Interface: Class: is an interface.
*/
public static final int INTERFACE = 0x0200; public static final int INTERFACE = 0x0200;
/** Abstract: class - may not be instantiated; /**
method - may not be called. **/ * Abstract:<br><ul>
* <li>Class: may not be instantiated.</li>
* <li>Method: may not be called.</li>
* </ul>
*/
public static final int ABSTRACT = 0x0400; public static final int ABSTRACT = 0x0400;
/** Class or method - expressions are FP-strict. **/ /**
* Strictfp: Method: expressions are FP-strict.<p>
* Also used as a modifier for classes, to mean that all initializers
* and constructors are FP-strict, but does not show up in
* Class.getModifiers.
*/
public static final int STRICT = 0x0800; public static final int STRICT = 0x0800;
/* NOTE: THIS IS HERE BECAUSE IT IS IN THE VM SPEC. /**
I INCLUDE IT FOR COMPLETENESS. IT ATTACHES TO A CLASS AND MEANS * Super - treat invokespecial as polymorphic so that super.foo() works
"Treat superclasses specially in invokespecial". Note that it is the * according to the JLS. This is a reuse of the synchronized constant
same as synchronized. Reuse of the constant. *shudder* */ * to patch a hole in JDK 1.0. *shudder*.
private static final int SUPER = 0x0020; */
static final int SUPER = 0x0020;
// This can only used by other code in this package, so it is not public. /**
* All the flags, only used by code in this package.
*/
static final int ALL_FLAGS = 0xfff; static final int ALL_FLAGS = 0xfff;
/** Check whether the given modifier is abstract. /**
* Check whether the given modifier is abstract.
* @param mod the modifier. * @param mod the modifier.
* @return <code>true</code> if abstract, <code>false</code> otherwise. * @return <code>true</code> if abstract, <code>false</code> otherwise.
*/ */
public static boolean isAbstract (int mod) public static boolean isAbstract(int mod)
{ {
return (mod & ABSTRACT) != 0; return (mod & ABSTRACT) != 0;
} }
/** Check whether the given modifier is final. /**
* Check whether the given modifier is final.
* @param mod the modifier. * @param mod the modifier.
* @return <code>true</code> if final, <code>false</code> otherwise. * @return <code>true</code> if final, <code>false</code> otherwise.
*/ */
public static boolean isFinal (int mod) public static boolean isFinal(int mod)
{ {
return (mod & FINAL) != 0; return (mod & FINAL) != 0;
} }
/** Check whether the given modifier is an interface. /**
* Check whether the given modifier is an interface.
* @param mod the modifier. * @param mod the modifier.
* @return <code>true</code> if an interface, <code>false</code> otherwise. * @return <code>true</code> if an interface, <code>false</code> otherwise.
*/ */
public static boolean isInterface (int mod) public static boolean isInterface(int mod)
{ {
return (mod & INTERFACE) != 0; return (mod & INTERFACE) != 0;
} }
/** Check whether the given modifier is native. /**
* Check whether the given modifier is native.
* @param mod the modifier. * @param mod the modifier.
* @return <code>true</code> if native, <code>false</code> otherwise. * @return <code>true</code> if native, <code>false</code> otherwise.
*/ */
public static boolean isNative (int mod) public static boolean isNative(int mod)
{ {
return (mod & NATIVE) != 0; return (mod & NATIVE) != 0;
} }
/** Check whether the given modifier is private. /**
* Check whether the given modifier is private.
* @param mod the modifier. * @param mod the modifier.
* @return <code>true</code> if private, <code>false</code> otherwise. * @return <code>true</code> if private, <code>false</code> otherwise.
*/ */
public static boolean isPrivate (int mod) public static boolean isPrivate(int mod)
{ {
return (mod & PRIVATE) != 0; return (mod & PRIVATE) != 0;
} }
/** Check whether the given modifier is protected. /**
* Check whether the given modifier is protected.
* @param mod the modifier. * @param mod the modifier.
* @return <code>true</code> if protected, <code>false</code> otherwise. * @return <code>true</code> if protected, <code>false</code> otherwise.
*/ */
public static boolean isProtected (int mod) public static boolean isProtected(int mod)
{ {
return (mod & PROTECTED) != 0; return (mod & PROTECTED) != 0;
} }
/** Check whether the given modifier is public. /**
* Check whether the given modifier is public.
* @param mod the modifier. * @param mod the modifier.
* @return <code>true</code> if public, <code>false</code> otherwise. * @return <code>true</code> if public, <code>false</code> otherwise.
*/ */
public static boolean isPublic (int mod) public static boolean isPublic(int mod)
{ {
return (mod & PUBLIC) != 0; return (mod & PUBLIC) != 0;
} }
/** Check whether the given modifier is static. /**
* Check whether the given modifier is static.
* @param mod the modifier. * @param mod the modifier.
* @return <code>true</code> if static, <code>false</code> otherwise. * @return <code>true</code> if static, <code>false</code> otherwise.
*/ */
public static boolean isStatic (int mod) public static boolean isStatic(int mod)
{ {
return (mod & STATIC) != 0; return (mod & STATIC) != 0;
} }
/** Check whether the given modifier is strictfp. /**
* Check whether the given modifier is strictfp.
* @param mod the modifier. * @param mod the modifier.
* @return <code>true</code> if strictfp, <code>false</code> otherwise. * @return <code>true</code> if strictfp, <code>false</code> otherwise.
*/ */
public static boolean isStrict (int mod) public static boolean isStrict(int mod)
{ {
return (mod & STRICT) != 0; return (mod & STRICT) != 0;
} }
/** Check whether the given modifier is synchronized. /**
* Check whether the given modifier is synchronized.
* @param mod the modifier. * @param mod the modifier.
* @return <code>true</code> if synchronized, <code>false</code> otherwise. * @return <code>true</code> if synchronized, <code>false</code> otherwise.
*/ */
public static boolean isSynchronized (int mod) public static boolean isSynchronized(int mod)
{ {
return (mod & SYNCHRONIZED) != 0; return (mod & SYNCHRONIZED) != 0;
} }
/** Check whether the given modifier is transient. /**
* Check whether the given modifier is transient.
* @param mod the modifier. * @param mod the modifier.
* @return <code>true</code> if transient, <code>false</code> otherwise. * @return <code>true</code> if transient, <code>false</code> otherwise.
*/ */
public static boolean isTransient (int mod) public static boolean isTransient(int mod)
{ {
return (mod & TRANSIENT) != 0; return (mod & TRANSIENT) != 0;
} }
/** Check whether the given modifier is volatile. /**
* Check whether the given modifier is volatile.
* @param mod the modifier. * @param mod the modifier.
* @return <code>true</code> if volatile, <code>false</code> otherwise. * @return <code>true</code> if volatile, <code>false</code> otherwise.
*/ */
public static boolean isVolatile (int mod) public static boolean isVolatile(int mod)
{ {
return (mod & VOLATILE) != 0; return (mod & VOLATILE) != 0;
} }
/** Get a string representation of all the modifiers represented by the /**
* given int. * Get a string representation of all the modifiers represented by the
* The keywords are printed in this order: * given int. The keywords are printed in this order:
* <code>&lt;public|private|protected&gt; abstract static final transient * <code>&lt;public|private|protected&gt; abstract static final transient
* volatile native synchronized interface strictfp</code><P> * volatile native synchronized interface strictfp</code>.
*
* <STRONG>This is, near as I can tell, the "canonical order" of modifiers
* mentioned by Sun in the reference implementation. I have inferred this
* from the order of printing in the Field, Method and Constructor
* classes.</STRONG>
* *
* @param mod the modifier. * @param mod the modifier.
* @return the String representing the modifiers. * @return the String representing the modifiers.
*/ */
public static String toString (int mod) public static String toString(int mod)
{ {
StringBuffer r = new StringBuffer (); return toString(mod, new StringBuffer()).toString();
toString(mod, r);
return r.toString();
} }
/** /**
* Package private helper toString() method that can take a StringBuffer. * Package helper method that can take a StringBuffer.
* @param mod the modifier * @param mod the modifier
* @param r the StringBuffer to which the String representation is appended * @param r the StringBuffer to which the String representation is appended
* @return r, with information appended
*/ */
static void toString (int mod, StringBuffer r) static StringBuffer toString(int mod, StringBuffer r)
{ {
if (isPublic (mod)) if (isPublic(mod))
r.append("public "); r.append("public ");
if (isProtected (mod)) if (isPrivate(mod))
r.append("protected ");
if (isPrivate (mod))
r.append("private "); r.append("private ");
if (isAbstract (mod)) if (isProtected(mod))
r.append("protected ");
if (isAbstract(mod))
r.append("abstract "); r.append("abstract ");
if (isStatic (mod)) if (isStatic(mod))
r.append("static "); r.append("static ");
if (isFinal (mod)) if (isFinal(mod))
r.append("final "); r.append("final ");
if (isTransient (mod)) if (isTransient(mod))
r.append("transient "); r.append("transient ");
if (isVolatile (mod)) if (isVolatile(mod))
r.append("volatile "); r.append("volatile ");
if (isNative (mod)) if (isNative(mod))
r.append("native "); r.append("native ");
if (isSynchronized (mod)) if (isSynchronized(mod))
r.append("synchronized "); r.append("synchronized ");
if (isInterface (mod)) if (isInterface(mod))
r.append("interface "); r.append("interface ");
if (isStrict (mod)) if (isStrict(mod))
r.append("strictfp "); r.append("strictfp ");
// Trim trailing space. // Trim trailing space.
int l = r.length(); if ((mod & ALL_FLAGS) != 0)
if (l > 0) r.setLength(r.length() - 1);
r.setLength(l - 1); return r;
} }
} }

49
libjava/java/lang/reflect/ReflectPermission.java
View file

@ -1,5 +1,5 @@
/* ReflectPermission.java - named permission for reflaction /* ReflectPermission.java - named permission for reflaction
Copyright (C) 2000, 2001 Free Software Foundation Copyright (C) 2000, 2001 Free Software Foundation, Inc.
This file is part of GNU Classpath. This file is part of GNU Classpath.
@ -7,7 +7,7 @@ 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 it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2, or (at your option) the Free Software Foundation; either version 2, or (at your option)
any later version. any later version.
GNU Classpath is distributed in the hope that it will be useful, but GNU Classpath is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
@ -27,7 +27,6 @@ executable file might be covered by the GNU General Public License. */
/* Written using "Java Class Libraries", 2nd edition, ISBN 0-201-31002-3 /* Written using "Java Class Libraries", 2nd edition, ISBN 0-201-31002-3
* "The Java Language Specification", ISBN 0-201-63451-1 * "The Java Language Specification", ISBN 0-201-63451-1
* plus online API docs for JDK 1.2 beta from http://www.javasoft.com. * plus online API docs for JDK 1.2 beta from http://www.javasoft.com.
* Status: Believed complete and correct to version 1.2.
*/ */
package java.lang.reflect; package java.lang.reflect;
@ -36,29 +35,57 @@ import java.security.BasicPermission;
/** /**
* This class implements permissions for reflection. This is a named * This class implements permissions for reflection. This is a named
* permission, and the only defined name is suppressAccessChecks. * permission, and the only defined name is suppressAccessChecks, which
* allows suppression of normal Java objects when using reflection.
*
* <table>
* <tr>
* <th>Permission Target Name</th>
* <th>What Permission Allows</th>
* <th>Risk of Allowing Permission</th>
* </tr>
* <tr>
* <td><code>suppressAccessChecks</code></td>
* <td>Ability to access fields, invoke methods, and construct objects
* via reflection, including non-public members in contexts where
* such access is not legal at compile-time.</td>
* <td>This is dangerous. It exposes possibly confidential information,
* and malicious code could interfere with the internals of the Virtual
* Machine by corrupting private data.</td>
* </tr>
* </table>
* *
* @author Tom Tromey <tromey@redhat.com> * @author Tom Tromey <tromey@redhat.com>
* @date November 18, 2000 * @author Eric Blake <ebb9@email.byu.edu>
* @since 1.2
* @status updated to 1.4
*/ */
public final class ReflectPermission extends BasicPermission public final class ReflectPermission
extends BasicPermission
{ {
/**
* Compatible with JDK 1.2.
*/
private static final long serialVersionUID = 7412737110241507485L;
/** /**
* Construct a ReflectPermission with the given name. * Construct a ReflectPermission with the given name.
*
* @param name The permission name * @param name The permission name
*/ */
public ReflectPermission (String name) public ReflectPermission(String name)
{ {
super (name); super(name);
} }
/** /**
* Construct a ReflectPermission with the given name. * Construct a ReflectPermission with the given name.
*
* @param name The permission name * @param name The permission name
* @param actions The actions; this is ignored and should be null. * @param actions The actions; this is ignored and should be null
*/ */
public ReflectPermission (String name, String actions) public ReflectPermission(String name, String actions)
{ {
super (name, actions); super(name, actions);
} }
} }