Author: jmitchell
Date: Fri Aug 26 18:58:39 2005
New Revision: 240373
URL: http://svn.apache.org/viewcvs?rev=240373&view=rev
Log:
No functional changes, all are javadoc or style fixes....with one exception.
In ActionServlet#addServletMapping, the debug statement should have been part
of the condition below it.
Modified:
struts/core/trunk/src/share/org/apache/struts/action/Action.java
struts/core/trunk/src/share/org/apache/struts/action/ActionForm.java
struts/core/trunk/src/share/org/apache/struts/action/ActionMapping.java
struts/core/trunk/src/share/org/apache/struts/action/ActionMessages.java
struts/core/trunk/src/share/org/apache/struts/action/ActionRedirect.java
struts/core/trunk/src/share/org/apache/struts/action/ActionServlet.java
Modified: struts/core/trunk/src/share/org/apache/struts/action/Action.java
URL:
http://svn.apache.org/viewcvs/struts/core/trunk/src/share/org/apache/struts/action/Action.java?rev=240373&r1=240372&r2=240373&view=diff
==============================================================================
--- struts/core/trunk/src/share/org/apache/struts/action/Action.java (original)
+++ struts/core/trunk/src/share/org/apache/struts/action/Action.java Fri Aug 26
18:58:39 2005
@@ -399,7 +399,6 @@
* @param request The servlet request we are processing
* @return <code>true</code> if the cancel button was pressed;
* <code>false</code> otherwise.
- * @see org.apache.struts.taglib.html.CancelTag
*/
protected boolean isCancelled(HttpServletRequest request) {
Modified: struts/core/trunk/src/share/org/apache/struts/action/ActionForm.java
URL:
http://svn.apache.org/viewcvs/struts/core/trunk/src/share/org/apache/struts/action/ActionForm.java?rev=240373&r1=240372&r2=240373&view=diff
==============================================================================
--- struts/core/trunk/src/share/org/apache/struts/action/ActionForm.java
(original)
+++ struts/core/trunk/src/share/org/apache/struts/action/ActionForm.java Fri
Aug 26 18:58:39 2005
@@ -95,7 +95,8 @@
/**
* <p>Return the controller servlet instance to which we are attached.
* as an <code>ActionServletWrapper</code>.</p>
- *
+ *
+ * @return An instance of [EMAIL PROTECTED]
org.apache.struts.action.ActionServletWrapper}
* @see org.apache.struts.action.ActionServletWrapper
* @since Struts 1.0.1
*/
@@ -115,6 +116,7 @@
* <code>null</code> if this form's enctype is not
* "multipart/form-data".</p>
*
+ * @return The [EMAIL PROTECTED]
org.apache.struts.upload.MultipartRequestHandler} for this form.
* @see org.apache.struts.upload.MultipartRequestHandler
*/
public MultipartRequestHandler getMultipartRequestHandler() {
Modified:
struts/core/trunk/src/share/org/apache/struts/action/ActionMapping.java
URL:
http://svn.apache.org/viewcvs/struts/core/trunk/src/share/org/apache/struts/action/ActionMapping.java?rev=240373&r1=240372&r2=240373&view=diff
==============================================================================
--- struts/core/trunk/src/share/org/apache/struts/action/ActionMapping.java
(original)
+++ struts/core/trunk/src/share/org/apache/struts/action/ActionMapping.java Fri
Aug 26 18:58:39 2005
@@ -65,19 +65,19 @@
* specified forwarding configuration. If no forwarding configuration
* can be found, return <code>null</code>.</p>
*
- * @param name Logical name of the forwarding instance to be returned
+ * @param forwardName Logical name of the forwarding instance to be
returned
*
* @return The local or global forward with the specified name.
*/
- public ActionForward findForward(String name) {
+ public ActionForward findForward(String forwardName) {
- ForwardConfig config = findForwardConfig(name);
+ ForwardConfig config = findForwardConfig(forwardName);
if (config == null) {
- config = getModuleConfig().findForwardConfig(name);
+ config = getModuleConfig().findForwardConfig(forwardName);
}
if (config == null) {
if (log.isWarnEnabled()) {
- log.warn("Unable to find '" + name + "' forward.");
+ log.warn("Unable to find '" + forwardName + "' forward.");
}
}
return ((ActionForward) config);
Modified:
struts/core/trunk/src/share/org/apache/struts/action/ActionMessages.java
URL:
http://svn.apache.org/viewcvs/struts/core/trunk/src/share/org/apache/struts/action/ActionMessages.java?rev=240373&r1=240372&r2=240373&view=diff
==============================================================================
--- struts/core/trunk/src/share/org/apache/struts/action/ActionMessages.java
(original)
+++ struts/core/trunk/src/share/org/apache/struts/action/ActionMessages.java
Fri Aug 26 18:58:39 2005
@@ -158,23 +158,23 @@
* to the end of the list for that property. If a message's property is not
* in the current list it is added to the end of the properties.</p>
*
- * @param messages The <code>ActionMessages</code> object to be added.
+ * @param actionMessages The <code>ActionMessages</code> object to be
added.
* This parameter can be <code>null</code>.
* @since Struts 1.1
*/
- public void add(ActionMessages messages) {
+ public void add(ActionMessages actionMessages) {
- if (messages == null) {
+ if (actionMessages == null) {
return;
}
// loop over properties
- Iterator props = messages.properties();
+ Iterator props = actionMessages.properties();
while (props.hasNext()) {
String property = (String) props.next();
// loop over messages for each property
- Iterator msgs = messages.get(property);
+ Iterator msgs = actionMessages.get(property);
while (msgs.hasNext()) {
ActionMessage msg = (ActionMessage) msgs.next();
this.add(property, msg);
@@ -239,9 +239,9 @@
for (Iterator i = actionItems.iterator(); i.hasNext();) {
ActionMessageItem ami = (ActionMessageItem) i.next();
- for (Iterator messages = ami.getList().iterator();
- messages.hasNext();) {
- results.add(messages.next());
+ for (Iterator msgsIter = ami.getList().iterator();
+ msgsIter.hasNext();) {
+ results.add(msgsIter.next());
}
}
Modified:
struts/core/trunk/src/share/org/apache/struts/action/ActionRedirect.java
URL:
http://svn.apache.org/viewcvs/struts/core/trunk/src/share/org/apache/struts/action/ActionRedirect.java?rev=240373&r1=240372&r2=240373&view=diff
==============================================================================
--- struts/core/trunk/src/share/org/apache/struts/action/ActionRedirect.java
(original)
+++ struts/core/trunk/src/share/org/apache/struts/action/ActionRedirect.java
Fri Aug 26 18:58:39 2005
@@ -264,14 +264,14 @@
Iterator iterator = parameterValues.keySet().iterator();
while (iterator.hasNext()) {
// get the parameter name
- String name = (String) iterator.next();
+ String paramName = (String) iterator.next();
// get the value for this parameter
- Object value = parameterValues.get(name);
+ Object value = parameterValues.get(paramName);
if (value instanceof String) {
// just one value for this param
- strParam.append(name)
+ strParam.append(paramName)
.append("=")
.append(value);
@@ -279,7 +279,7 @@
// loop through all values for this param
String[] values = (String[]) value;
for (int i = 0; i < values.length; i++) {
- strParam.append(name)
+ strParam.append(paramName)
.append("=")
.append(values[i]);
if (i < values.length - 1) {
Modified:
struts/core/trunk/src/share/org/apache/struts/action/ActionServlet.java
URL:
http://svn.apache.org/viewcvs/struts/core/trunk/src/share/org/apache/struts/action/ActionServlet.java?rev=240373&r1=240372&r2=240373&view=diff
==============================================================================
--- struts/core/trunk/src/share/org/apache/struts/action/ActionServlet.java
(original)
+++ struts/core/trunk/src/share/org/apache/struts/action/ActionServlet.java Fri
Aug 26 18:58:39 2005
@@ -461,14 +461,14 @@
*/
public void addServletMapping(String servletName, String urlPattern) {
- if (log.isDebugEnabled()) {
- log.debug("Process servletName=" + servletName
- + ", urlPattern=" + urlPattern);
- }
if (servletName == null) {
return;
}
if (servletName.equals(this.servletName)) {
+ if (log.isDebugEnabled()) {
+ log.debug("Process servletName=" + servletName
+ + ", urlPattern=" + urlPattern);
+ }
this.servletMapping = urlPattern;
}
@@ -599,8 +599,10 @@
* @return The [EMAIL PROTECTED] RequestProcessor} responsible for the
* specified module,
*
- * @exception ServletException if we cannot instantiate a RequestProcessor
- * instance
+ * @exception ServletException If we cannot instantiate a RequestProcessor
+ * instance a [EMAIL PROTECTED]
UnavailableException} is
+ * thrown, meaning your application is not
loaded
+ * and will not be available.
*
* @since Struts 1.1
*/
@@ -608,8 +610,6 @@
ModuleConfig config)
throws ServletException {
- // :FIXME: Document UnavailableException?
-
RequestProcessor processor = this.getProcessorForModule(config);
if (processor == null) {
@@ -682,9 +682,6 @@
protected ModuleConfig initModuleConfig(String prefix, String paths)
throws ServletException {
- // :FIXME: Document UnavailableException? (Doesn't actually throw
- // anything)
-
if (log.isDebugEnabled()) {
log.debug(
"Initializing module path '"
@@ -1293,7 +1290,7 @@
* @return The exception config using the correct class as determined
* by the config's ancestor and its own overridden value.
*
- * @throws UnavailableException if an instance of the exception config
+ * @throws ServletException if an instance of the exception config
* class cannot be created.
*/
protected ExceptionConfig processExceptionConfigClass(
@@ -1443,7 +1440,7 @@
* @return The config object using the correct class as determined
* by the config's ancestor and its own overridden value.
*
- * @throws UnavailableException if an instance of the action config
+ * @throws ServletException if an instance of the action config
* class cannot be created.
*/
protected ActionConfig processActionConfigClass(
@@ -1684,7 +1681,7 @@
/**
* <p>Parse the configuration documents specified by the
* <code>chainConfig</code> init-param to configure the default
- * [EMAIL PROTECTED] Catalog} that is registered in the [EMAIL PROTECTED]
CatalogFactory}
+ * [EMAIL PROTECTED] org.apache.commons.chain.Catalog} that is registered
in the [EMAIL PROTECTED] CatalogFactory}
* instance for this application.</p>
*
* @throws ServletException if an error occurs.
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
