--- old/src/share/classes/java/security/Security.java 2013-06-27 23:05:33.397546094 -0700
+++ new/src/share/classes/java/security/Security.java 2013-06-27 23:05:33.233546097 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 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
@@ -298,7 +298,7 @@
* property in the master file of the "SUN" Cryptographic Service
* Provider in order to determine how to parse algorithm-specific
* parameters. Use the new provider-based and algorithm-independent
- * AlgorithmParameters
and KeyFactory
engine
+ * {@code AlgorithmParameters} and {@code KeyFactory} engine
* classes (introduced in the J2SE version 1.2 platform) instead.
*/
@Deprecated
@@ -321,21 +321,21 @@
*
*
If the given provider is installed at the requested position,
* the provider that used to be at that position, and all providers
- * with a position greater than position
, are shifted up
+ * with a position greater than {@code position}, are shifted up
* one position (towards the end of the list of installed providers).
*
*
A provider cannot be added if it is already installed. * *
First, if there is a security manager, its
- * checkSecurityAccess
+ * {@code checkSecurityAccess}
* method is called with the string
- * "insertProvider."+provider.getName()
+ * {@code "insertProvider."+provider.getName()}
* to see if it's ok to add a new provider.
- * If the default implementation of checkSecurityAccess
+ * If the default implementation of {@code checkSecurityAccess}
* is used (i.e., that method is not overriden), then this will result in
- * a call to the security manager's checkPermission
method
+ * a call to the security manager's {@code checkPermission} method
* with a
- * SecurityPermission("insertProvider."+provider.getName())
+ * {@code SecurityPermission("insertProvider."+provider.getName())}
* permission.
*
* @param provider the provider to be added.
@@ -349,8 +349,8 @@
*
* @throws NullPointerException if provider is null
* @throws SecurityException
- * if a security manager exists and its {@link
- * java.lang.SecurityManager#checkSecurityAccess}
method
+ * if a security manager exists and its {@link
+ * java.lang.SecurityManager#checkSecurityAccess} method
* denies access to add a new provider
*
* @see #getProvider
@@ -374,15 +374,15 @@
* Adds a provider to the next position available.
*
*
First, if there is a security manager, its
- * checkSecurityAccess
+ * {@code checkSecurityAccess}
* method is called with the string
- * "insertProvider."+provider.getName()
+ * {@code "insertProvider."+provider.getName()}
* to see if it's ok to add a new provider.
- * If the default implementation of checkSecurityAccess
+ * If the default implementation of {@code checkSecurityAccess}
* is used (i.e., that method is not overriden), then this will result in
- * a call to the security manager's checkPermission
method
+ * a call to the security manager's {@code checkPermission} method
* with a
- * SecurityPermission("insertProvider."+provider.getName())
+ * {@code SecurityPermission("insertProvider."+provider.getName())}
* permission.
*
* @param provider the provider to be added.
@@ -393,8 +393,8 @@
*
* @throws NullPointerException if provider is null
* @throws SecurityException
- * if a security manager exists and its {@link
- * java.lang.SecurityManager#checkSecurityAccess}
method
+ * if a security manager exists and its {@link
+ * java.lang.SecurityManager#checkSecurityAccess} method
* denies access to add a new provider
*
* @see #getProvider
@@ -423,20 +423,20 @@
* if name is null.
*
*
First, if there is a security manager, its
- * checkSecurityAccess
- * method is called with the string "removeProvider."+name
+ * {@code checkSecurityAccess}
+ * method is called with the string {@code "removeProvider."+name}
* to see if it's ok to remove the provider.
- * If the default implementation of checkSecurityAccess
+ * If the default implementation of {@code checkSecurityAccess}
* is used (i.e., that method is not overriden), then this will result in
- * a call to the security manager's checkPermission
method
- * with a SecurityPermission("removeProvider."+name)
+ * a call to the security manager's {@code checkPermission} method
+ * with a {@code SecurityPermission("removeProvider."+name)}
* permission.
*
* @param name the name of the provider to remove.
*
* @throws SecurityException
- * if a security manager exists and its {@link
- * java.lang.SecurityManager#checkSecurityAccess}
method
+ * if a security manager exists and its {@link
+ * java.lang.SecurityManager#checkSecurityAccess} method
* denies
* access to remove the provider
*
@@ -689,7 +689,7 @@
* an instance of an implementation of the requested algorithm
* and type, and the second object in the array identifies the provider
* of that implementation.
- * The provider
argument can be null, in which case all
+ * The {@code provider} argument can be null, in which case all
* configured providers will be searched in order of preference.
*/
static Object[] getImpl(String algorithm, String type, String provider)
@@ -720,7 +720,7 @@
* an instance of an implementation of the requested algorithm
* and type, and the second object in the array identifies the provider
* of that implementation.
- * The provider
argument cannot be null.
+ * The {@code provider} argument cannot be null.
*/
static Object[] getImpl(String algorithm, String type, Provider provider)
throws NoSuchAlgorithmException {
@@ -739,8 +739,8 @@
* Gets a security property value.
*
*
First, if there is a security manager, its
- * checkPermission
method is called with a
- * java.security.SecurityPermission("getProperty."+key)
+ * {@code checkPermission} method is called with a
+ * {@code java.security.SecurityPermission("getProperty."+key)}
* permission to see if it's ok to retrieve the specified
* security property value..
*
@@ -749,8 +749,8 @@
* @return the value of the security property corresponding to key.
*
* @throws SecurityException
- * if a security manager exists and its {@link
- * java.lang.SecurityManager#checkPermission}
method
+ * if a security manager exists and its {@link
+ * java.lang.SecurityManager#checkPermission} method
* denies
* access to retrieve the specified security property value
* @throws NullPointerException is key is null
@@ -774,8 +774,8 @@
* Sets a security property value.
*
*
First, if there is a security manager, its
- * checkPermission
method is called with a
- * java.security.SecurityPermission("setProperty."+key)
+ * {@code checkPermission} method is called with a
+ * {@code java.security.SecurityPermission("setProperty."+key)}
* permission to see if it's ok to set the specified
* security property value.
*
@@ -784,8 +784,8 @@
* @param datum the value of the property to be set.
*
* @throws SecurityException
- * if a security manager exists and its {@link
- * java.lang.SecurityManager#checkPermission}
method
+ * if a security manager exists and its {@link
+ * java.lang.SecurityManager#checkPermission} method
* denies access to set the specified security property value
* @throws NullPointerException if key or datum is null
*