--- old/src/share/classes/java/security/Permission.java 2013-06-28 10:31:48.494376867 -0700 +++ new/src/share/classes/java/security/Permission.java 2013-06-28 10:31:48.338376871 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -33,17 +33,17 @@ * *

Most Permission objects also include an "actions" list that tells the actions * that are permitted for the object. For example, - * for a java.io.FilePermission object, the permission name is + * for a {@code java.io.FilePermission} object, the permission name is * the pathname of a file (or directory), and the actions list * (such as "read, write") specifies which actions are granted for the * specified file (or for files in the specified directory). * The actions list is optional for Permission objects, such as - * java.lang.RuntimePermission, + * {@code java.lang.RuntimePermission}, * that don't need such a list; you either have the named permission (such * as "system.exit") or you don't. * *

An important method that must be implemented by each subclass is - * the implies method to compare Permissions. Basically, + * the {@code implies} method to compare Permissions. Basically, * "permission p1 implies permission p2" means that * if one is granted permission p1, one is naturally granted permission p2. * Thus, this is not an equality test, but rather more of a @@ -81,7 +81,7 @@ /** * Implements the guard interface for a permission. The - * SecurityManager.checkPermission method is called, + * {@code SecurityManager.checkPermission} method is called, * passing this permission object as the permission to check. * Returns silently if access is granted. Otherwise, throws * a SecurityException. @@ -90,7 +90,7 @@ * * @throws SecurityException * if a security manager exists and its - * checkPermission method doesn't allow access. + * {@code checkPermission} method doesn't allow access. * * @see Guard * @see GuardedObject @@ -109,7 +109,7 @@ * This must be implemented by subclasses of Permission, as they are the * only ones that can impose semantics on a Permission object. * - *

The implies method is used by the AccessController to determine + *

The {@code implies} method is used by the AccessController to determine * whether or not a requested permission is implied by another permission that * is known to be valid in the current execution context. * @@ -124,8 +124,8 @@ /** * Checks two Permission objects for equality. *

- * Do not use the equals method for making access control - * decisions; use the implies method. + * Do not use the {@code equals} method for making access control + * decisions; use the {@code implies} method. * * @param obj the object we are testing for equality with this object. * @@ -137,18 +137,18 @@ /** * Returns the hash code value for this Permission object. *

- * The required hashCode behavior for Permission Objects is + * The required {@code hashCode} behavior for Permission Objects is * the following:

*

* @@ -159,7 +159,7 @@ /** * Returns the name of this Permission. - * For example, in the case of a java.io.FilePermission, + * For example, in the case of a {@code java.io.FilePermission}, * the name will be a pathname. * * @return the name of this Permission. @@ -184,7 +184,7 @@ * * * both return - * "read,write" when the getActions method is invoked. + * "read,write" when the {@code getActions} method is invoked. * * @return the actions of this Permission. * @@ -197,7 +197,7 @@ * one is not defined. Subclasses of class Permission should * override this if they need to store their permissions in a particular * PermissionCollection object in order to provide the correct semantics - * when the PermissionCollection.implies method is called. + * when the {@code PermissionCollection.implies} method is called. * If null is returned, * then the caller of this method is free to store permissions of this * type in any PermissionCollection they choose (one that uses a Hashtable,