Skip to content

Commit

Permalink
Fix various typos
Browse files Browse the repository at this point in the history
Fix a variety of typos throughout the project, primarily in
comments (javadoc or otherwise) but also in a handful of log messages
and a couple exception messages.

ISSUE: SPR-11123
  • Loading branch information
ericdahl authored and Phillip Webb committed Nov 25, 2013
1 parent 4e82416 commit e9f78f6
Show file tree
Hide file tree
Showing 37 changed files with 55 additions and 55 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ public class DelegatePerTargetObjectIntroductionInterceptor extends Introduction
public DelegatePerTargetObjectIntroductionInterceptor(Class<?> defaultImplType, Class<?> interfaceType) {
this.defaultImplType = defaultImplType;
this.interfaceType = interfaceType;
// cCeate a new delegate now (but don't store it in the map).
// Create a new delegate now (but don't store it in the map).
// We do this for two reasons:
// 1) to fail early if there is a problem instantiating delegates
// 2) to populate the interface map once and once only
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
* it encounters a custom tag directly under a {@code &lt;bean&gt;} tag.
*
* <p>Developers writing their own custom element extensions typically will
* not implement this interface drectly, but rather make use of the provided
* not implement this interface directly, but rather make use of the provided
* {@link NamespaceHandlerSupport} class.
*
* @author Rob Harrop
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -585,7 +585,7 @@ private void push(final int type) {
}
// pushes the type on the output stack
outputStack[outputStackTop++] = type;
// updates the maximun height reached by the output stack, if needed
// updates the maximum height reached by the output stack, if needed
int top = owner.inputStackTop + outputStackTop;
if (top > owner.outputStackMax) {
owner.outputStackMax = top;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -276,7 +276,7 @@ private static class ReflectiveElementFactory<E> implements ElementFactory<E>, S
private final Class<? extends E> elementClass;

public ReflectiveElementFactory(Class<? extends E> elementClass) {
Assert.notNull(elementClass, "Element clas must not be null");
Assert.notNull(elementClass, "Element class must not be null");
Assert.isTrue(!elementClass.isInterface(), "Element class must not be an interface type");
Assert.isTrue(!Modifier.isAbstract(elementClass.getModifiers()), "Element class cannot be an abstract class");
this.elementClass = elementClass;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ public E next() {
return iterator.next();
}
}
throw new NoSuchElementException("Exhaused all iterators");
throw new NoSuchElementException("Exhausted all iterators");
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@ public static String trimWhitespace(String str) {

/**
* Trim <i>all</i> whitespace from the given String:
* leading, trailing, and inbetween characters.
* leading, trailing, and in between characters.
* @param str the String to check
* @return the trimmed String
* @see java.lang.Character#isWhitespace
Expand Down Expand Up @@ -265,7 +265,7 @@ public static String trimTrailingWhitespace(String str) {
}

/**
* Trim all occurences of the supplied leading character from the given String.
* Trim all occurrences of the supplied leading character from the given String.
* @param str the String to check
* @param leadingCharacter the leading character to be trimmed
* @return the trimmed String
Expand All @@ -282,7 +282,7 @@ public static String trimLeadingCharacter(String str, char leadingCharacter) {
}

/**
* Trim all occurences of the supplied trailing character from the given String.
* Trim all occurrences of the supplied trailing character from the given String.
* @param str the String to check
* @param trailingCharacter the trailing character to be trimmed
* @return the trimmed String
Expand Down Expand Up @@ -381,7 +381,7 @@ public static int countOccurrencesOf(String str, String sub) {
}

/**
* Replace all occurences of a substring within a string with
* Replace all occurrences of a substring within a string with
* another string.
* @param inString String to examine
* @param oldPattern String to replace
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ public interface CallMetaDataProvider {

/**
* Initialize the database specific management of procedure column meta data.
* This is only called for databases that are supported. This initalization
* This is only called for databases that are supported. This initialization
* can be turned off by specifying that column meta data should not be used.
* @param databaseMetaData used to retrieve database specific information
* @param catalogName name of catalog to use or null
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,9 +61,9 @@ public class CallMetaDataProviderFactory {
);

/**
* Create a CallMetaDataProvider based on the database metedata
* @param dataSource used to retrieve metedata
* @param context the class that holds configuration and metedata
* Create a CallMetaDataProvider based on the database metadata
* @param dataSource used to retrieve metadata
* @param context the class that holds configuration and metadata
* @return instance of the CallMetaDataProvider implementation to be used
*/
static public CallMetaDataProvider createMetaDataProvider(DataSource dataSource, final CallMetaDataContext context) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -340,7 +340,7 @@ private void locateTableAndProcessMetaData(DatabaseMetaData databaseMetaData, St
try {
tables.close();
} catch (SQLException e) {
logger.warn("Error while closing table meta data reults" + e.getMessage());
logger.warn("Error while closing table meta data results" + e.getMessage());
}
}
}
Expand Down Expand Up @@ -379,7 +379,7 @@ private void locateTableAndProcessMetaData(DatabaseMetaData databaseMetaData, St
}

/**
* Method supporting the metedata processing for a table's columns
* Method supporting the metadata processing for a table's columns
*/
private void processTableColumns(DatabaseMetaData databaseMetaData, TableMetaData tmd) {
ResultSet tableColumns = null;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ void addNamedParameter(String parameterName, int startIndex, int endIndex) {

/**
* Return all of the parameters (bind variables) in the parsed SQL statement.
* Repeated occurences of the same parameter name are included here.
* Repeated occurrences of the same parameter name are included here.
*/
List<String> getParameterNames() {
return this.parameterNames;
Expand All @@ -89,15 +89,15 @@ int[] getParameterIndexes(int parameterPosition) {

/**
* Set the count of named parameters in the SQL statement.
* Each parameter name counts once; repeated occurences do not count here.
* Each parameter name counts once; repeated occurrences do not count here.
*/
void setNamedParameterCount(int namedParameterCount) {
this.namedParameterCount = namedParameterCount;
}

/**
* Return the count of named parameters in the SQL statement.
* Each parameter name counts once; repeated occurences do not count here.
* Each parameter name counts once; repeated occurrences do not count here.
*/
int getNamedParameterCount() {
return this.namedParameterCount;
Expand All @@ -119,15 +119,15 @@ int getUnnamedParameterCount() {

/**
* Set the total count of all of the parameters in the SQL statement.
* Repeated occurences of the same parameter name do count here.
* Repeated occurrences of the same parameter name do count here.
*/
void setTotalParameterCount(int totalParameterCount) {
this.totalParameterCount = totalParameterCount;
}

/**
* Return the total count of all of the parameters in the SQL statement.
* Repeated occurences of the same parameter name do count here.
* Repeated occurrences of the same parameter name do count here.
*/
int getTotalParameterCount() {
return this.totalParameterCount;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -311,7 +311,7 @@ protected void checkCompiled() {
}

/**
* Method to check whether we are allowd to make any configuration changes at this time.
* Method to check whether we are allowed to make any configuration changes at this time.
* If the class has been compiled, then no further changes to the configuration are allowed.
*/
protected void checkIfConfigurationModificationIsAllowed() {
Expand Down Expand Up @@ -450,12 +450,12 @@ public PreparedStatement createPreparedStatement(Connection con) throws SQLExcep
"The getGeneratedKeys feature is not supported by this database");
}
if (getGeneratedKeyNames().length < 1) {
throw new InvalidDataAccessApiUsageException("Generated Key Name(s) not specificed. " +
throw new InvalidDataAccessApiUsageException("Generated Key Name(s) not specified. " +
"Using the generated keys features requires specifying the name(s) of the generated column(s)");
}
if (getGeneratedKeyNames().length > 1) {
throw new InvalidDataAccessApiUsageException(
"Current database only supports retreiving the key for a single column. There are " +
"Current database only supports retrieving the key for a single column. There are " +
getGeneratedKeyNames().length + " columns specified: " + Arrays.asList(getGeneratedKeyNames()));
}
// This is a hack to be able to get the generated key from a database that doesn't support
Expand Down Expand Up @@ -615,9 +615,9 @@ private void setParameterValues(PreparedStatement preparedStatement, List<Object
}

/**
* Match the provided in parameter values with regitered parameters and parameters defined
* Match the provided in parameter values with registered parameters and parameters defined
* via metadata processing.
* @param parameterSource the parameter vakues provided as a {@link SqlParameterSource}
* @param parameterSource the parameter values provided as a {@link SqlParameterSource}
* @return Map with parameter names and values
*/
protected List<Object> matchInParameterValuesWithInsertColumns(SqlParameterSource parameterSource) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ public interface SimpleJdbcInsertOperations {
SimpleJdbcInsertOperations withTableName(String tableName);

/**
* Specify the shema name, if any, to be used for the insert.
* Specify the schema name, if any, to be used for the insert.
* @param schemaName the name of the schema
* @return the instance of this SimpleJdbcInsert
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
*
* <p>This listener container variant is built for repeated polling attempts,
* each invoking the {@link #receiveAndExecute} method. The MessageConsumer used
* may be reobtained fo reach attempt or cached inbetween attempts; this is up
* may be reobtained fo reach attempt or cached in between attempts; this is up
* to the concrete implementation. The receive timeout for each attempt can be
* configured through the {@link #setReceiveTimeout "receiveTimeout"} property.
*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ protected void handleMessageInternal(Message<?> message) {

if (!checkDestinationPrefix(destination)) {
if (logger.isTraceEnabled()) {
logger.trace("Ingoring message to destination=" + destination);
logger.trace("Ignoring message to destination=" + destination);
}
return;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -782,7 +782,7 @@ private Object doUnmarshal(HierarchicalStreamReader streamReader, DataHolder dat
* {@code org.springframework.oxm} hierarchy.
* <p>A boolean flag is used to indicate whether this exception occurs during marshalling or
* unmarshalling, since XStream itself does not make this distinction in its exception hierarchy.
* @param ex XStream exception that occured
* @param ex XStream exception that occurred
* @param marshalling indicates whether the exception occurs during marshalling ({@code true}),
* or unmarshalling ({@code false})
* @return the corresponding {@code XmlMappingException}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ public interface CallableProcessingInterceptor {
* <p>
* This is useful for capturing the state of the current thread just prior to
* invoking the {@link Callable}. Once the state is captured, it can then be
* transfered to the new {@link Thread} in
* transferred to the new {@link Thread} in
* {@link #preProcess(NativeWebRequest, Callable)}. Capturing the state of
* Spring Security's SecurityContextHolder and migrating it to the new Thread
* is a concrete example of where this is useful.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ public class ServletContextAwareProcessor implements BeanPostProcessor {
/**
* Create a new ServletContextAwareProcessor without an initial context or config.
* When this constructor is used the {@link #getServletContext()} and/or
* {@link #getServletConfig()} methods should be overriden.
* {@link #getServletConfig()} methods should be overridden.
*/
protected ServletContextAwareProcessor() {
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
* should be involved in async dispatches. However, in some cases servlet
* containers assume different default configuration. Therefore sub-classes can
* override the method {@link #shouldNotFilterAsyncDispatch()} to declare
* statically if they shouuld indeed be invoked, <em>once</em>, during both types
* statically if they should indeed be invoked, <em>once</em>, during both types
* of dispatches in order to provide thread initialization, logging, security,
* and so on. This mechanism complements and does not replace the need to
* configure a filter in {@code web.xml} with dispatcher types.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ public abstract void handleNavigation(
* <p>If no decorated NavigationHandler specified as constructor argument,
* this instance is the last element in the chain. Hence, this method will
* call the original NavigationHandler as passed into this method. If no
* original NavigantionHandler has been passed in (for example if this
* original NavigationHandler has been passed in (for example if this
* instance is the last element in a chain with standard NavigationHandlers
* as earlier elements), this method corresponds to a no-op.
* @param facesContext the current JSF context
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
* parameter at the servlet context level (i.e. context-param in web.xml),
* the default key is "webapp.root".
*
* <p>Can be used for toolkits that support substition with system properties
* <p>Can be used for toolkits that support substitution with system properties
* (i.e. System.getProperty values), like log4j's "${key}" syntax within log
* file locations.
*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -295,7 +295,7 @@ private void doInclude(HttpServletRequest request, HttpServletResponse response,
* to allow for message resolution etc that influences JSP contents,
* assuming that those background resources might have changed on restart.
* <p>Returns the startup time of this servlet if the file that corresponds
* to the target resource URL coudln't be resolved (for example, because
* to the target resource URL couldn't be resolved (for example, because
* the WAR is not expanded).
* @see #determineResourceUrl
* @see #getFileTimestamp
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ protected void logException(Exception ex, HttpServletRequest request) {
}

/**
* Build a log message for the given exception, occured during processing the given request.
* Build a log message for the given exception, occurred during processing the given request.
* @param ex the exception that got thrown during handler execution
* @param request current HTTP request (useful for obtaining metadata)
* @return the log message to use
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -513,7 +513,7 @@ protected HttpInputMessage createHttpInputMessage(HttpServletRequest servletRequ
}

/**
* Template method for creating a new HttpOuputMessage instance.
* Template method for creating a new HttpOutputMessage instance.
* <p>The default implementation creates a standard {@link ServletServerHttpResponse}.
* This can be overridden for custom {@code HttpOutputMessage} implementations
* @param servletResponse current HTTP response
Expand Down Expand Up @@ -1197,7 +1197,7 @@ public String bestMatchedPattern() {
* sorting a list with this comparator will result in:
* <ul>
* <li>RHIs with {@linkplain AnnotationMethodHandlerAdapter.RequestSpecificMappingInfo#matchedPatterns better matched paths}
* take prescedence over those with a weaker match (as expressed by the {@linkplain PathMatcher#getPatternComparator(String)
* take precedence over those with a weaker match (as expressed by the {@linkplain PathMatcher#getPatternComparator(String)
* path pattern comparator}.) Typically, this means that patterns without wild cards and uri templates
* will be ordered before those without.</li>
* <li>RHIs with one single {@linkplain RequestMappingInfo#methods request method} will be
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ public static ServletUriComponentsBuilder fromServletMapping(HttpServletRequest

/**
* Prepare a builder from the host, port, scheme, and path of
* an HttpSevletRequest.
* an HttpServletRequest.
*/
public static ServletUriComponentsBuilder fromRequestUri(HttpServletRequest request) {
ServletUriComponentsBuilder builder = fromRequest(request);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,7 @@ public void setAlwaysMustRevalidate(boolean mustRevalidate) {
}

/**
* Return whether 'must-revaliate' is added to every Cache-Control header.
* Return whether 'must-revalidate' is added to every Cache-Control header.
*/
public boolean isAlwaysMustRevalidate() {
return alwaysMustRevalidate;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
* application beans - such a separation will make this clear.
*
* <p>This ViewResolver does not support internationalization.
* Conside ResourceBundleViewResolver if you need to apply different
* Consider ResourceBundleViewResolver if you need to apply different
* view resources per locale.
*
* <p>Note: This ViewResolver implements the Ordered interface to allow for
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
* with the view's {@linkplain View#getContentType() content type}). The most compatible view is returned.
*
* <p>Additionally, this view resolver exposes the {@link #setDefaultViews(List) defaultViews} property, allowing you to
* override the views provided by the view resolvers. Note that these default views are offered as candicates, and
* override the views provided by the view resolvers. Note that these default views are offered as candidates, and
* still need have the content type requested (via file extension, parameter, or {@code Accept} header, described above).
* You can also set the {@linkplain #setDefaultContentType(MediaType) default content type} directly, which will be
* returned when the other mechanisms ({@code Accept} header, file extension or parameter) do not result in a match.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ protected PdfReader readPdfResource() throws IOException {
* e.g. setting the "formFlattening" property.
* @param request in case we need locale etc. Shouldn't look at attributes.
* @param response in case we need to set cookies. Shouldn't write to it.
* @throws Exception any exception that occured during document building
* @throws Exception any exception that occurred during document building
*/
protected abstract void mergePdfDocument(Map<String, Object> model, PdfStamper stamper,
HttpServletRequest request, HttpServletResponse response) throws Exception;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ protected void buildPdfMetadata(Map<String, Object> model, Document document, Ht
* @param writer the PdfWriter to use
* @param request in case we need locale etc. Shouldn't look at attributes.
* @param response in case we need to set cookies. Shouldn't write to it.
* @throws Exception any exception that occured during document building
* @throws Exception any exception that occurred during document building
* @see com.lowagie.text.Document#open()
* @see com.lowagie.text.Document#close()
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ protected final void buildFeedEntries(Map<String, Object> model, Feed feed,
* @param request in case we need locale etc. Shouldn't look at attributes.
* @param response in case we need to set cookies. Shouldn't write to it.
* @return the feed entries to be added to the feed
* @throws Exception any exception that occured during document building
* @throws Exception any exception that occurred during document building
* @see Entry
*/
protected abstract List<Entry> buildFeedEntries(
Expand Down
Loading

0 comments on commit e9f78f6

Please sign in to comment.