--- old/src/share/classes/java/security/Provider.java 2013-06-27 23:05:30.517546153 -0700 +++ new/src/share/classes/java/security/Provider.java 2013-06-27 23:05:30.357546156 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1996, 2011, 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 @@ -62,20 +62,20 @@ * security token. A {@link ProviderException} should be used to indicate * such errors. * - *
The service type Provider
is reserved for use by the
+ *
The service type {@code Provider} is reserved for use by the * security framework. Services of this type cannot be added, removed, * or modified by applications. * The following attributes are automatically placed in each Provider object: *
Name | Value | - *
---|---|
Provider.id name |
- * String.valueOf(provider.getName()) |
- *
Provider.id version |
- * String.valueOf(provider.getVersion()) |
- *
Provider.id info |
- String.valueOf(provider.getInfo()) |
- *
Provider.id className |
- * provider.getClass().getName() |
+ *
{@code Provider.id name} | + *{@code String.valueOf(provider.getName())} | + *
{@code Provider.id version} | + *{@code String.valueOf(provider.getVersion())} | + *
{@code Provider.id info} | +{@code String.valueOf(provider.getInfo())} | + *
{@code Provider.id className} | + *{@code provider.getClass().getName()} | *
First, if there is a security manager, its
- * checkSecurityAccess
method is called with the string
- * "clearProviderProperties."+name
(where name
+ * {@code checkSecurityAccess} method is called with the string
+ * {@code "clearProviderProperties."+name} (where {@code name}
* is the provider name) to see if it's ok to clear this provider.
- * If the default implementation of checkSecurityAccess
+ * If the default implementation of {@code checkSecurityAccess}
* is used (that is, that method is not overriden), then this results in
- * a call to the security manager's checkPermission
method
- * with a SecurityPermission("clearProviderProperties."+name)
+ * a call to the security manager's {@code checkPermission} method
+ * with a {@code SecurityPermission("clearProviderProperties."+name)}
* permission.
*
* @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 clear this provider
*
* @since 1.2
@@ -292,17 +292,17 @@
}
/**
- * Sets the key
property to have the specified
- * value
.
+ * Sets the {@code key} property to have the specified
+ * {@code value}.
*
*
First, if there is a security manager, its
- * checkSecurityAccess
method is called with the string
- * "putProviderProperty."+name
, where name
is the
+ * {@code checkSecurityAccess} method is called with the string
+ * {@code "putProviderProperty."+name}, where {@code name} is the
* provider name, to see if it's ok to set this provider's property values.
- * If the default implementation of checkSecurityAccess
+ * If the default implementation of {@code checkSecurityAccess}
* is used (that is, that method is not overriden), then this results in
- * a call to the security manager's checkPermission
method
- * with a SecurityPermission("putProviderProperty."+name)
+ * a call to the security manager's {@code checkPermission} method
+ * with a {@code SecurityPermission("putProviderProperty."+name)}
* permission.
*
* @param key the property key.
@@ -310,11 +310,11 @@
* @param value the property value.
*
* @return the previous value of the specified property
- * (key
), or null if it did not have one.
+ * ({@code key}), or null if it did not have one.
*
* @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 set property values.
*
* @since 1.2
@@ -329,18 +329,18 @@
}
/**
- * Removes the key
property (and its corresponding
- * value
).
+ * Removes the {@code key} property (and its corresponding
+ * {@code value}).
*
*
First, if there is a security manager, its
- * checkSecurityAccess
method is called with the string
- * "removeProviderProperty."+name
, where name
is
+ * {@code checkSecurityAccess} method is called with the string
+ * {@code "removeProviderProperty."+name}, where {@code name} is
* the provider name, to see if it's ok to remove this provider's
* properties. If the default implementation of
- * checkSecurityAccess
is used (that is, that method is not
+ * {@code checkSecurityAccess} is used (that is, that method is not
* overriden), then this results in a call to the security manager's
- * checkPermission
method with a
- * SecurityPermission("removeProviderProperty."+name)
+ * {@code checkPermission} method with a
+ * {@code SecurityPermission("removeProviderProperty."+name)}
* permission.
*
* @param key the key for the property to be removed.
@@ -349,8 +349,8 @@
* or null if the key did not have a mapping.
*
* @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 this provider's properties.
*
* @since 1.2
@@ -662,9 +662,9 @@
* the service added via {@link #putService putService()} is returned.
*
* @param type the type of {@link Service service} requested
- * (for example, MessageDigest
)
+ * (for example, {@code MessageDigest})
* @param algorithm the case insensitive algorithm name (or alternate
- * alias) of the service requested (for example, SHA-1
)
+ * alias) of the service requested (for example, {@code SHA-1})
*
* @return the service describing this Provider's matching service
* or null if no such service exists
@@ -739,20 +739,20 @@
* Java Cryptography Architecture API Specification & Reference .
*
*
Also, if there is a security manager, its
- * checkSecurityAccess
method is called with the string
- * "putProviderProperty."+name
, where name
is
+ * {@code checkSecurityAccess} method is called with the string
+ * {@code "putProviderProperty."+name}, where {@code name} is
* the provider name, to see if it's ok to set this provider's property
- * values. If the default implementation of checkSecurityAccess
+ * values. If the default implementation of {@code checkSecurityAccess}
* is used (that is, that method is not overriden), then this results in
- * a call to the security manager's checkPermission
method with
- * a SecurityPermission("putProviderProperty."+name)
+ * a call to the security manager's {@code checkPermission} method with
+ * a {@code SecurityPermission("putProviderProperty."+name)}
* permission.
*
* @param s the Service to add
*
* @throws SecurityException
- * if a security manager exists and its {@link
- * java.lang.SecurityManager#checkSecurityAccess}
method denies
+ * if a security manager exists and its {@link
+ * java.lang.SecurityManager#checkSecurityAccess} method denies
* access to set property values.
* @throws NullPointerException if s is null
*
@@ -830,21 +830,21 @@
* from this provider's Hashtable.
*
*
Also, if there is a security manager, its
- * checkSecurityAccess
method is called with the string
- * "removeProviderProperty."+name
, where name
is
+ * {@code checkSecurityAccess} method is called with the string
+ * {@code "removeProviderProperty."+name}, where {@code name} is
* the provider name, to see if it's ok to remove this provider's
* properties. If the default implementation of
- * checkSecurityAccess
is used (that is, that method is not
+ * {@code checkSecurityAccess} is used (that is, that method is not
* overriden), then this results in a call to the security manager's
- * checkPermission
method with a
- * SecurityPermission("removeProviderProperty."+name)
+ * {@code checkPermission} method with a
+ * {@code SecurityPermission("removeProviderProperty."+name)}
* permission.
*
* @param s the Service to be removed
*
* @throws SecurityException
- * if a security manager exists and its {@link
- * java.lang.SecurityManager#checkSecurityAccess}
method denies
+ * if a security manager exists and its {@link
+ * java.lang.SecurityManager#checkSecurityAccess} method denies
* access to remove this provider's properties.
* @throws NullPointerException if s is null
*
@@ -1122,7 +1122,7 @@
}
/**
- * Get the type of this service. For example, MessageDigest
.
+ * Get the type of this service. For example, {@code MessageDigest}.
*
* @return the type of this service
*/
@@ -1132,7 +1132,7 @@
/**
* Return the name of the algorithm of this service. For example,
- * SHA-1
.
+ * {@code SHA-1}.
*
* @return the algorithm of this service
*/