null action result, in which case the doExecute() will not be called,
* or null if the doExecute() method should be called to obtain the action result
- * @throws Exception an unrecoverable exception occured, either checked or unchecked
+ * @throws Exception an unrecoverable exception occurred, either checked or unchecked
*/
protected Event doPreExecute(RequestContext context) throws Exception {
return null;
@@ -225,7 +225,7 @@ protected Event doPreExecute(RequestContext context) throws Exception {
* Template hook method subclasses should override to encapsulate their specific action execution logic.
* @param context the action execution context, for accessing and setting data in "flow scope" or "request scope"
* @return the action result event
- * @throws Exception an unrecoverable exception occured, either checked or unchecked
+ * @throws Exception an unrecoverable exception occurred, either checked or unchecked
*/
protected abstract Event doExecute(RequestContext context) throws Exception;
@@ -235,7 +235,7 @@ protected Event doPreExecute(RequestContext context) throws Exception {
* * This implementation does nothing. * @param context the action execution context, for accessing and setting data in "flow scope" or "request scope" - * @throws Exception an unrecoverable exception occured, either checked or unchecked + * @throws Exception an unrecoverable exception occurred, either checked or unchecked */ protected void doPostExecute(RequestContext context) throws Exception { } diff --git a/spring-webflow/src/main/java/org/springframework/webflow/action/FormAction.java b/spring-webflow/src/main/java/org/springframework/webflow/action/FormAction.java index c80b8cf16..65bad4c0c 100644 --- a/spring-webflow/src/main/java/org/springframework/webflow/action/FormAction.java +++ b/spring-webflow/src/main/java/org/springframework/webflow/action/FormAction.java @@ -507,7 +507,7 @@ public Event bindAndValidate(RequestContext context) throws Exception { * {@link #doBind(RequestContext, DataBinder)} hook. * @param context the action execution context, for accessing and setting data in "flow scope" or "request scope" * @return "success" if there are no binding errors, "error" otherwise - * @throws Exception an unrecoverable exception occured, either checked or unchecked + * @throws Exception an unrecoverable exception occurred, either checked or unchecked */ public Event bind(RequestContext context) throws Exception { if (logger.isDebugEnabled()) { @@ -529,7 +529,7 @@ public Event bind(RequestContext context) throws Exception { * {@link #doValidate(RequestContext, Object, Errors)} hook. * @param context the action execution context, for accessing and setting data in "flow scope" or "request scope" * @return "success" if there are no validation errors, "error" otherwise - * @throws Exception an unrecoverable exception occured, either checked or unchecked + * @throws Exception an unrecoverable exception occurred, either checked or unchecked * @see #getValidator() */ public Event validate(RequestContext context) throws Exception { @@ -561,7 +561,7 @@ public Event validate(RequestContext context) throws Exception { * custom methods as part of a single action chain. * @param context the request context * @return "success" if the reset action completed successfully - * @throws Exception if an exception occured + * @throws Exception if an exception occurred * @see #createFormObject(RequestContext) */ public Event resetForm(RequestContext context) throws Exception { @@ -576,7 +576,7 @@ public Event resetForm(RequestContext context) throws Exception { * Create the new form object and put it in the configured {@link #getFormObjectScope() scope}. * @param context the flow execution request context * @return the new form object - * @throws Exception an exception occured creating the form object + * @throws Exception an exception occurred creating the form object */ private Object initFormObject(RequestContext context) throws Exception { if (logger.isDebugEnabled()) { diff --git a/spring-webflow/src/main/java/org/springframework/webflow/conversation/ConversationManager.java b/spring-webflow/src/main/java/org/springframework/webflow/conversation/ConversationManager.java index f90fcc11f..ee79f0f6f 100644 --- a/spring-webflow/src/main/java/org/springframework/webflow/conversation/ConversationManager.java +++ b/spring-webflow/src/main/java/org/springframework/webflow/conversation/ConversationManager.java @@ -27,7 +27,7 @@ public interface ConversationManager { * Begin a new conversation. * @param conversationParameters descriptive conversation parameters * @return a service interface allowing access to the conversation context - * @throws ConversationException an exception occured + * @throws ConversationException an exception occurred */ Conversation beginConversation(ConversationParameters conversationParameters) throws ConversationException; @@ -67,7 +67,7 @@ public interface ConversationManager { * {@link ConversationId#toString()}. * @param encodedId the encoded id * @return the parsed conversation id - * @throws ConversationException an exception occured parsing the id + * @throws ConversationException an exception occurred parsing the id */ ConversationId parseConversationId(String encodedId) throws ConversationException; } \ No newline at end of file diff --git a/spring-webflow/src/main/java/org/springframework/webflow/engine/NoMatchingTransitionException.java b/spring-webflow/src/main/java/org/springframework/webflow/engine/NoMatchingTransitionException.java index 26a24c4d5..3c96000ba 100644 --- a/spring-webflow/src/main/java/org/springframework/webflow/engine/NoMatchingTransitionException.java +++ b/spring-webflow/src/main/java/org/springframework/webflow/engine/NoMatchingTransitionException.java @@ -21,7 +21,7 @@ /** * Thrown when no transition can be matched given the occurence of an event in the context of a flow execution request. *
- * Typically this happens because there is no "handler" transition for the last event that occured. + * Typically this happens because there is no "handler" transition for the last event that occurred. * * @author Keith Donald * @author Erwin Vervaet @@ -37,7 +37,7 @@ public class NoMatchingTransitionException extends FlowExecutionException { * Create a new no matching transition exception. * @param flowId the current flow * @param stateId the state that could not be transitioned out of - * @param event the event that occured that could not be matched to a transition + * @param event the event that occurred that could not be matched to a transition * @param message the message */ public NoMatchingTransitionException(String flowId, String stateId, Event event, String message) { @@ -49,7 +49,7 @@ public NoMatchingTransitionException(String flowId, String stateId, Event event, * Create a new no matching transition exception. * @param flowId the current flow * @param stateId the state that could not be transitioned out of - * @param event the event that occured that could not be matched to a transition + * @param event the event that occurred that could not be matched to a transition * @param message the message * @param cause the underlying cause */ diff --git a/spring-webflow/src/main/java/org/springframework/webflow/engine/model/builder/xml/DocumentLoader.java b/spring-webflow/src/main/java/org/springframework/webflow/engine/model/builder/xml/DocumentLoader.java index 2d4f1e621..21e4785a9 100644 --- a/spring-webflow/src/main/java/org/springframework/webflow/engine/model/builder/xml/DocumentLoader.java +++ b/spring-webflow/src/main/java/org/springframework/webflow/engine/model/builder/xml/DocumentLoader.java @@ -34,9 +34,9 @@ public interface DocumentLoader { * Load the XML-based document from the external resource. * @param resource the document resource * @return the loaded (parsed) document - * @throws IOException an exception occured accessing the resource input stream - * @throws ParserConfigurationException an exception occured building the document parser - * @throws SAXException a error occured during document parsing + * @throws IOException an exception occurred accessing the resource input stream + * @throws ParserConfigurationException an exception occurred building the document parser + * @throws SAXException a error occurred during document parsing */ Document loadDocument(Resource resource) throws IOException, ParserConfigurationException, SAXException; } \ No newline at end of file diff --git a/spring-webflow/src/main/java/org/springframework/webflow/execution/EnterStateVetoException.java b/spring-webflow/src/main/java/org/springframework/webflow/execution/EnterStateVetoException.java index afa8502e5..6381e41a6 100644 --- a/spring-webflow/src/main/java/org/springframework/webflow/execution/EnterStateVetoException.java +++ b/spring-webflow/src/main/java/org/springframework/webflow/execution/EnterStateVetoException.java @@ -34,7 +34,7 @@ public class EnterStateVetoException extends FlowExecutionException { /** * Create a new enter state veto exception. * @param flowId the active flow - * @param sourceStateId the current state when the veto operation occured + * @param sourceStateId the current state when the veto operation occurred * @param vetoedStateId the state for which entering is vetoed * @param message a descriptive message */ @@ -46,7 +46,7 @@ public EnterStateVetoException(String flowId, String sourceStateId, String vetoe /** * Create a new enter state veto exception. * @param flowId the active flow - * @param sourceStateId the current state when the veto operation occured + * @param sourceStateId the current state when the veto operation occurred * @param vetoedStateId the state for which entering is vetoed * @param message a descriptive message * @param cause the underlying cause diff --git a/spring-webflow/src/main/java/org/springframework/webflow/execution/FlowExecutionException.java b/spring-webflow/src/main/java/org/springframework/webflow/execution/FlowExecutionException.java index 1a8bef53f..c6bb48b3e 100644 --- a/spring-webflow/src/main/java/org/springframework/webflow/execution/FlowExecutionException.java +++ b/spring-webflow/src/main/java/org/springframework/webflow/execution/FlowExecutionException.java @@ -53,8 +53,8 @@ public FlowExecutionException(String flowId, String stateId, String message) { /** * Creates a new flow execution exception. - * @param flowId the flow where the exception occured - * @param stateId the state where the exception occured + * @param flowId the flow where the exception occurred + * @param stateId the state where the exception occurred * @param message a descriptive message * @param cause the root cause */ @@ -65,14 +65,14 @@ public FlowExecutionException(String flowId, String stateId, String message, Thr } /** - * Returns the id of the flow definition that was executing when this exception occured. + * Returns the id of the flow definition that was executing when this exception occurred. */ public String getFlowId() { return flowId; } /** - * Returns the id of the state definition where the exception occured. Could be null if no state was active at the + * Returns the id of the state definition where the exception occurred. Could be null if no state was active at the * time when the exception was thrown. */ public String getStateId() { diff --git a/spring-webflow/src/main/java/org/springframework/webflow/execution/View.java b/spring-webflow/src/main/java/org/springframework/webflow/execution/View.java index b5ae4f7e7..e11bab7e3 100644 --- a/spring-webflow/src/main/java/org/springframework/webflow/execution/View.java +++ b/spring-webflow/src/main/java/org/springframework/webflow/execution/View.java @@ -42,7 +42,7 @@ public interface View { /** * Render this view's content. - * @throws IOException if an IO Exception occured rendering the view + * @throws IOException if an IO Exception occurred rendering the view */ void render() throws IOException; diff --git a/spring-webflow/src/main/java/org/springframework/webflow/execution/repository/FlowExecutionRepositoryException.java b/spring-webflow/src/main/java/org/springframework/webflow/execution/repository/FlowExecutionRepositoryException.java index 30d2533c8..8ac8c0fa1 100644 --- a/spring-webflow/src/main/java/org/springframework/webflow/execution/repository/FlowExecutionRepositoryException.java +++ b/spring-webflow/src/main/java/org/springframework/webflow/execution/repository/FlowExecutionRepositoryException.java @@ -18,7 +18,7 @@ import org.springframework.webflow.core.FlowException; /** - * The root of the {@link FlowExecutionRepository} exception hierarchy. Indicates a problem occured either saving, + * The root of the {@link FlowExecutionRepository} exception hierarchy. Indicates a problem occurred either saving, * restoring, or invalidating a managed flow execution. * * @author Erwin Vervaet diff --git a/spring-webflow/src/main/java/org/springframework/webflow/execution/repository/snapshot/SerializedFlowExecutionSnapshot.java b/spring-webflow/src/main/java/org/springframework/webflow/execution/repository/snapshot/SerializedFlowExecutionSnapshot.java index 8f6aeee56..dfdb12df2 100644 --- a/spring-webflow/src/main/java/org/springframework/webflow/execution/repository/snapshot/SerializedFlowExecutionSnapshot.java +++ b/spring-webflow/src/main/java/org/springframework/webflow/execution/repository/snapshot/SerializedFlowExecutionSnapshot.java @@ -150,7 +150,7 @@ public void readExternal(ObjectInput in) throws IOException, ClassNotFoundExcept /** * Return the flow execution data in its raw byte[] form. Will decompress if necessary. * @return the byte array - * @throws IOException a problem occured with decompression + * @throws IOException a problem occurred with decompression */ protected byte[] getFlowExecutionData() throws IOException { if (isCompressed()) {