Mercurial > hg > shenandoah-preopenjdk-archive > openjdk8 > jdk
changeset 266:4d62bebb22ea
Merge
author | valeriep |
---|---|
date | Fri, 25 Apr 2008 15:32:27 -0700 |
parents | 01dbd203d40e (current diff) 44700b433be2 (diff) |
children | 27719467fb93 |
files | |
diffstat | 1 files changed, 2 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/classes/java/security/BasicPermission.java Fri Apr 25 15:24:48 2008 -0700 +++ b/src/share/classes/java/security/BasicPermission.java Fri Apr 25 15:32:27 2008 -0700 @@ -27,12 +27,10 @@ import java.security.*; import java.util.Enumeration; -import java.util.Iterator; import java.util.Map; import java.util.HashMap; import java.util.Hashtable; import java.util.Collections; -import java.util.StringTokenizer; import java.io.ObjectStreamField; import java.io.ObjectOutputStream; import java.io.ObjectInputStream; @@ -64,14 +62,8 @@ * @see java.security.Permission * @see java.security.Permissions * @see java.security.PermissionCollection - * @see java.lang.RuntimePermission - * @see java.security.SecurityPermission - * @see java.util.PropertyPermission - * @see java.awt.AWTPermission - * @see java.net.NetPermission * @see java.lang.SecurityManager * - * * @author Marianne Mueller * @author Roland Schemers */ @@ -95,7 +87,6 @@ * initialize a BasicPermission object. Common to all constructors. * */ - private void init(String name) { if (name == null) @@ -213,8 +204,8 @@ * and has the same name as this object. * <P> * @param obj the object we are testing for equality with this object. - * @return true if <i>obj</i> is a BasicPermission, and has the same name - * as this BasicPermission object, false otherwise. + * @return true if <i>obj</i>'s class is the same as this object's class + * and has the same name as this BasicPermission object, false otherwise. */ public boolean equals(Object obj) { if (obj == this) @@ -237,7 +228,6 @@ * * @return a hash code value for this object. */ - public int hashCode() { return this.getName().hashCode(); } @@ -266,7 +256,6 @@ * @return a new PermissionCollection object suitable for * storing BasicPermissions. */ - public PermissionCollection newPermissionCollection() { return new BasicPermissionCollection(this.getClass()); }