Anonymous avatar Anonymous committed d3fb496

Jalopy and javadoc update.

git-svn-id: http://svn.opensymphony.com/svn/xwork/trunk@225 e221344d-f017-0410-9bd5-d282ab1896d7

Comments (0)

Files changed (5)

src/java/com/opensymphony/xwork/XworkException.java

     /**
     * Returns a short description of this throwable object.
     * If this <code>Throwable</code> object was
-    * {@link #Throwable(String) created} with an error message string,
+    * {@link #XworkException(String) created} with an error message string,
     * then the result is the concatenation of three strings:
     * <ul>
     * <li>The name of the actual class of this object
     * <li>": " (a colon and a space)
     * <li>The result of the {@link #getMessage} method for this object
     * </ul>
-    * If this <code>Throwable</code> object was {@link #Throwable() created}
+    * If this <code>Throwable</code> object was {@link #XworkException() created}
     * with no error message string, then the name of the actual class of
     * this object is returned.
     *

src/java/com/opensymphony/xwork/interceptor/Interceptor.java

 
 
 /**
- * An interceptor is a stateless class that follows the interceptor pattern, as found in {@link  javax.filter.Filter}
- * and in AOP languages.
+ * An interceptor is a stateless class that follows the interceptor pattern, as
+ * found in {@link  javax.servlet.Filter} and in AOP languages.
  * <p/>
  * Interceptors <b>must</b> be stateless and not assume that a new instance will be created for each request or Action.
  * Interceptors may choose to either short-circuit the {@link ActionInvocation} execution and return a return code
- * (such as {@link com.opensymphony.xwork.Action.SUCCESS}), or it may choose to do some processing before
+ * (such as {@link com.opensymphony.xwork.Action#SUCCESS}), or it may choose to do some processing before
  * and/or after delegating the rest of the procesing using {@link ActionInvocation#invoke()}.
  *
  * @author Jason Carreira

src/java/com/opensymphony/xwork/util/OgnlValueStack.java

 import ognl.OgnlException;
 import ognl.OgnlRuntime;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
 import java.io.ObjectStreamException;
 import java.io.Serializable;
 
 import java.util.Iterator;
 import java.util.Map;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
 
 /**
  * OgnlValueStack allows multiple beans to be pushed in and dynamic Ognl expressions to be evaluated against it. When
         this.defaultType = defaultType;
     }
 
+    public void setExprOverrides(Map overrides) {
+        this.overrides = overrides;
+    }
+
     /**
      * Get the CompoundRoot which holds the objects pushed onto the stack
      * @return
                 return null;
             }
 
-            if (overrides != null && overrides.containsKey(expr)) {
+            if ((overrides != null) && overrides.containsKey(expr)) {
                 expr = (String) overrides.get(expr);
             }
 
             return null;
         } catch (Exception e) {
             LOG.warn("Caught an exception while evaluating expression '" + expr + "' against value stack", e);
+
             return null;
         }
     }
                 return null;
             }
 
-            if (overrides != null && overrides.containsKey(expr)) {
+            if ((overrides != null) && overrides.containsKey(expr)) {
                 expr = (String) overrides.get(expr);
             }
 
             return null;
         } catch (Exception e) {
             LOG.warn("Caught an exception while evaluating expression '" + expr + "' against value stack", e);
+
             return null;
         }
     }
 
     /**
      * Get the object on the top of the stack without changing the stack.
-     * @see {@link com.opensymphony.xwork.util.CompoundRoot#peek()}
+     * @see com.opensymphony.xwork.util.CompoundRoot#peek()
      */
     public Object peek() {
         return root.peek();
 
     /**
      * Get the object on the top of the stack and remove it from the stack.
-     * @see {@link com.opensymphony.xwork.util.CompoundRoot#pop()}
-     * @return
+     * @see com.opensymphony.xwork.util.CompoundRoot#pop()
+     * @return the object on the top of the stack
      */
     public Object pop() {
         return root.pop();
     /**
      * Put this object onto the top of the stack
      * @param o the object to be pushed onto the stack
-     * @see {@link com.opensymphony.xwork.util.CompoundRoot#push(java.lang.Object)}
+     * @see com.opensymphony.xwork.util.CompoundRoot#push(java.lang.Object)
      */
     public void push(Object o) {
         root.push(o);
 
     /**
      * Get the number of objects in the stack
-     * @return
+     * @return the number of objects in the stack
      */
     public int size() {
         return root.size();
 
         return aStack;
     }
-
-    public void setExprOverrides(Map overrides) {
-        this.overrides = overrides;
-    }
 }

src/test/com/opensymphony/xwork/config/impl/MockConfiguration.java

         throw new UnsupportedOperationException();
     }
 
-    public void reload() throws ConfigurationException {
+    public void rebuildRuntimeConfiguration() {
         throw new UnsupportedOperationException();
     }
 
-    public void rebuildRuntimeConfiguration() {
+    public void reload() throws ConfigurationException {
         throw new UnsupportedOperationException();
     }
 

src/test/com/opensymphony/xwork/validator/VisitorValidatorModelAction.java

+/*
+ * Copyright (c) 2002-2003 by OpenSymphony
+ * All rights reserved.
+ */
 package com.opensymphony.xwork.validator;
 
 import com.opensymphony.xwork.ModelDriven;
 
+
 /**
  * VisitorValidatorModelAction
  * @author Jason Carreira
  * Date: Mar 18, 2004 11:26:46 AM
  */
 public class VisitorValidatorModelAction extends VisitorValidatorTestAction implements ModelDriven {
+    //~ Methods ////////////////////////////////////////////////////////////////
+
     /**
      * @return the model to be pushed onto the ValueStack instead of the Action itself
      */
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.