From: markt Date: Tue, 17 Nov 2009 22:27:58 +0000 (+0000) Subject: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48147 X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=589c6969f5370c43146b1ceeaab714a6808c0ef5;p=tomcat7.0 Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48147 Correct JavaDoc typos. Patch provided by gingyang.xu git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@881575 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/java/org/apache/naming/NamingEntry.java b/java/org/apache/naming/NamingEntry.java index 9ef8ac582..060688662 100644 --- a/java/org/apache/naming/NamingEntry.java +++ b/java/org/apache/naming/NamingEntry.java @@ -53,7 +53,7 @@ public class NamingEntry { /** - * The type instance variable is used to avoid unsing RTTI when doing + * The type instance variable is used to avoid using RTTI when doing * lookups. */ public int type; diff --git a/java/org/apache/naming/NamingService.java b/java/org/apache/naming/NamingService.java index 4e1348bac..b26911a20 100644 --- a/java/org/apache/naming/NamingService.java +++ b/java/org/apache/naming/NamingService.java @@ -93,7 +93,7 @@ public final class NamingService /** - * Retruns the Catalina component name. + * Returns the Catalina component name. */ public String getName() { return NAME; diff --git a/java/org/apache/naming/NamingServiceMBean.java b/java/org/apache/naming/NamingServiceMBean.java index 936c8a8d6..12d312b2f 100644 --- a/java/org/apache/naming/NamingServiceMBean.java +++ b/java/org/apache/naming/NamingServiceMBean.java @@ -59,7 +59,7 @@ public interface NamingServiceMBean { /** - * Retruns the JNDI component name. + * Returns the JNDI component name. */ public String getName(); diff --git a/java/org/apache/naming/ResourceRef.java b/java/org/apache/naming/ResourceRef.java index 922ded038..687b86d23 100644 --- a/java/org/apache/naming/ResourceRef.java +++ b/java/org/apache/naming/ResourceRef.java @@ -72,7 +72,7 @@ public class ResourceRef * * @param resourceClass Resource class * @param scope Resource scope - * @param auth Resource authetication + * @param auth Resource authentication */ public ResourceRef(String resourceClass, String description, String scope, String auth) { @@ -85,7 +85,7 @@ public class ResourceRef * * @param resourceClass Resource class * @param scope Resource scope - * @param auth Resource authetication + * @param auth Resource authentication */ public ResourceRef(String resourceClass, String description, String scope, String auth, String factory, diff --git a/java/org/apache/naming/factory/EjbFactory.java b/java/org/apache/naming/factory/EjbFactory.java index 5a890e24a..fec62500c 100644 --- a/java/org/apache/naming/factory/EjbFactory.java +++ b/java/org/apache/naming/factory/EjbFactory.java @@ -55,7 +55,7 @@ public class EjbFactory /** - * Crete a new EJB instance. + * Create a new EJB instance. * * @param obj The reference object describing the DataSource */ diff --git a/java/org/apache/naming/factory/OpenEjbFactory.java b/java/org/apache/naming/factory/OpenEjbFactory.java index ad7db6e84..4f615e305 100644 --- a/java/org/apache/naming/factory/OpenEjbFactory.java +++ b/java/org/apache/naming/factory/OpenEjbFactory.java @@ -50,7 +50,7 @@ public class OpenEjbFactory implements ObjectFactory { /** - * Crete a new EJB instance using OpenEJB. + * Create a new EJB instance using OpenEJB. * * @param obj The reference object describing the DataSource */ diff --git a/java/org/apache/naming/factory/ResourceEnvFactory.java b/java/org/apache/naming/factory/ResourceEnvFactory.java index 2ebec4b2b..31a2cdf74 100644 --- a/java/org/apache/naming/factory/ResourceEnvFactory.java +++ b/java/org/apache/naming/factory/ResourceEnvFactory.java @@ -54,7 +54,7 @@ public class ResourceEnvFactory /** - * Crete a new Resource env instance. + * Create a new Resource env instance. * * @param obj The reference object describing the DataSource */ diff --git a/java/org/apache/naming/factory/TransactionFactory.java b/java/org/apache/naming/factory/TransactionFactory.java index fefd36aec..f933cf3e1 100644 --- a/java/org/apache/naming/factory/TransactionFactory.java +++ b/java/org/apache/naming/factory/TransactionFactory.java @@ -28,7 +28,7 @@ import javax.naming.spi.ObjectFactory; import org.apache.naming.TransactionRef; /** - * Object factory for User trasactions. + * Object factory for User transactions. * * @author Remy Maucherat * @version $Revision$ $Date$ @@ -54,7 +54,7 @@ public class TransactionFactory /** - * Crete a new User transaction instance. + * Create a new User transaction instance. * * @param obj The reference object describing the DataSource */ diff --git a/java/org/apache/naming/resources/BaseDirContext.java b/java/org/apache/naming/resources/BaseDirContext.java index f96418ff2..f95c3de13 100644 --- a/java/org/apache/naming/resources/BaseDirContext.java +++ b/java/org/apache/naming/resources/BaseDirContext.java @@ -1342,7 +1342,7 @@ public abstract class BaseDirContext implements DirContext { * occurrence of "{i}". If null, equivalent to an empty array. * @param cons the search controls that control the search. If null, the * default search controls are used (equivalent to (new SearchControls())). - * @return an enumeration of SearchResults of the objects that satisy the + * @return an enumeration of SearchResults of the objects that satisfy the * filter; never null * @exception ArrayIndexOutOfBoundsException if filterExpr contains {i} * expressions where i is outside the bounds of the array filterArgs diff --git a/java/org/apache/naming/resources/DirContextURLConnection.java b/java/org/apache/naming/resources/DirContextURLConnection.java index 0421db726..a1e1f0712 100644 --- a/java/org/apache/naming/resources/DirContextURLConnection.java +++ b/java/org/apache/naming/resources/DirContextURLConnection.java @@ -121,7 +121,7 @@ public class DirContextURLConnection /** - * Connect to the DirContext, and retrive the bound object, as well as + * Connect to the DirContext, and retrieve the bound object, as well as * its attributes. If no object is bound with the name specified in the * URL, then an IOException is thrown. * diff --git a/java/org/apache/naming/resources/FileDirContext.java b/java/org/apache/naming/resources/FileDirContext.java index 7b43e6ed1..4da3169aa 100644 --- a/java/org/apache/naming/resources/FileDirContext.java +++ b/java/org/apache/naming/resources/FileDirContext.java @@ -750,7 +750,7 @@ public class FileDirContext extends BaseDirContext { * occurrence of "{i}". If null, equivalent to an empty array. * @param cons the search controls that control the search. If null, the * default search controls are used (equivalent to (new SearchControls())). - * @return an enumeration of SearchResults of the objects that satisy the + * @return an enumeration of SearchResults of the objects that satisfy the * filter; never null * @exception ArrayIndexOutOfBoundsException if filterExpr contains {i} * expressions where i is outside the bounds of the array filterArgs @@ -847,7 +847,7 @@ public class FileDirContext extends BaseDirContext { * List the resources which are members of a collection. * * @param file Collection - * @return Vector containg NamingEntry objects + * @return Vector containing NamingEntry objects */ protected ArrayList list(File file) { diff --git a/java/org/apache/naming/resources/ProxyDirContext.java b/java/org/apache/naming/resources/ProxyDirContext.java index 78ff5741d..e649b310c 100644 --- a/java/org/apache/naming/resources/ProxyDirContext.java +++ b/java/org/apache/naming/resources/ProxyDirContext.java @@ -1544,7 +1544,7 @@ public class ProxyDirContext implements DirContext { } } - // Retriving object + // Retrieving object if ((exists) && (entry.resource == null) && (entry.context == null)) { try { Object object = dirContext.lookup(name); diff --git a/java/org/apache/naming/resources/Resource.java b/java/org/apache/naming/resources/Resource.java index 7dc44dc3a..4a6cec51c 100644 --- a/java/org/apache/naming/resources/Resource.java +++ b/java/org/apache/naming/resources/Resource.java @@ -22,7 +22,7 @@ import java.io.ByteArrayInputStream; import java.io.IOException; /** - * Encapsultes the contents of a resource. + * Encapsulates the contents of a resource. * * @author Remy Maucherat * @version $Revision$ diff --git a/java/org/apache/naming/resources/ResourceCache.java b/java/org/apache/naming/resources/ResourceCache.java index 126c6170d..a3abc3da2 100644 --- a/java/org/apache/naming/resources/ResourceCache.java +++ b/java/org/apache/naming/resources/ResourceCache.java @@ -339,7 +339,7 @@ public class ResourceCache { /** - * Find a map elemnt given its name in a sorted array of map elements. + * Find a map element given its name in a sorted array of map elements. * This will return the index for the closest inferior or equal item in the * given array. */ diff --git a/java/org/apache/naming/resources/WARDirContext.java b/java/org/apache/naming/resources/WARDirContext.java index 5480bd991..1aef0eda8 100644 --- a/java/org/apache/naming/resources/WARDirContext.java +++ b/java/org/apache/naming/resources/WARDirContext.java @@ -729,7 +729,7 @@ public class WARDirContext extends BaseDirContext { * occurrence of "{i}". If null, equivalent to an empty array. * @param cons the search controls that control the search. If null, the * default search controls are used (equivalent to (new SearchControls())). - * @return an enumeration of SearchResults of the objects that satisy the + * @return an enumeration of SearchResults of the objects that satisfy the * filter; never null * @exception ArrayIndexOutOfBoundsException if filterExpr contains {i} * expressions where i is outside the bounds of the array filterArgs