Author: markt
Date: Fri Jul 29 14:23:44 2016
New Revision: 1754532
URL: http://svn.apache.org/viewvc?rev=1754532&view=rev
Log:
Clarify / correct Javadoc
Modified:
tomcat/trunk/java/org/apache/naming/ContextAccessController.java
tomcat/trunk/java/org/apache/naming/NamingContext.java
Modified: tomcat/trunk/java/org/apache/naming/ContextAccessController.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/ContextAccessController.java?rev=1754532&r1=1754531&r2=1754532&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/naming/ContextAccessController.java (original)
+++ tomcat/trunk/java/org/apache/naming/ContextAccessController.java Fri Jul 29
14:23:44 2016
@@ -42,9 +42,9 @@ public class ContextAccessController {
// --------------------------------------------------------- Public Methods
/**
- * Set a security token for a context. Can be set only once.
+ * Set a security token for a Catalina context. Can be set only once.
*
- * @param name Name of the context
+ * @param name Name of the Catalina context
* @param token Security token
*/
public static void setSecurityToken(Object name, Object token) {
@@ -63,7 +63,7 @@ public class ContextAccessController {
/**
* Remove a security token for a context.
*
- * @param name Name of the context
+ * @param name Name of the Catalina context
* @param token Security token
*/
public static void unsetSecurityToken(Object name, Object token) {
@@ -76,7 +76,7 @@ public class ContextAccessController {
/**
* Check a submitted security token.
*
- * @param name Name of the context
+ * @param name Name of the Catalina context
* @param token Submitted security token
*
* @return <code>true</code> if the submitted token is equal to the token
@@ -93,7 +93,7 @@ public class ContextAccessController {
/**
* Allow writing to a context.
*
- * @param name Name of the context
+ * @param name Name of the Catalina context
* @param token Security token
*/
public static void setWritable(Object name, Object token) {
@@ -103,9 +103,9 @@ public class ContextAccessController {
/**
- * Set whether or not a context is writable.
+ * Set whether or not a Catalina context is writable.
*
- * @param name Name of the context
+ * @param name Name of the Catalina context
*/
public static void setReadOnly(Object name) {
readOnlyContexts.put(name, name);
@@ -115,7 +115,7 @@ public class ContextAccessController {
/**
* Is the context is writable?
*
- * @param name Name of the context
+ * @param name Name of the Catalina context
*
* @return <code>true</code> if it is writable, otherwise
<code>false</code>
*/
Modified: tomcat/trunk/java/org/apache/naming/NamingContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/NamingContext.java?rev=1754532&r1=1754531&r2=1754532&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/naming/NamingContext.java (original)
+++ tomcat/trunk/java/org/apache/naming/NamingContext.java Fri Jul 29 14:23:44
2016
@@ -70,7 +70,7 @@ public class NamingContext implements Co
* Builds a naming context.
*
* @param env The environment to use to construct the naming context
- * @param name The name to use for the naming context
+ * @param name The name of the associated Catalina Context
*/
public NamingContext(Hashtable<String,Object> env, String name) {
this(env, name, new HashMap<String,NamingEntry>());
@@ -81,7 +81,7 @@ public class NamingContext implements Co
* Builds a naming context.
*
* @param env The environment to use to construct the naming context
- * @param name The name to use for the naming context
+ * @param name The name of the associated Catalina Context
* @param bindings The initial bindings for the naming context
*/
public NamingContext(Hashtable<String,Object> env, String name,
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
