Anonymous avatar Anonymous committed 4a46f5c

Make Jalopy happy.

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

Comments (0)

Files changed (7)

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

 package com.opensymphony.xwork.util;
 
 import ognl.*;
+
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
 import java.beans.IntrospectionException;
+
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Iterator;
             if (o == null) {
                 continue;
             }
+
             Class clazz = o.getClass();
             Class[] argTypes = getArgTypes(objects);
 

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

 import com.opensymphony.xwork.Action;
 import com.opensymphony.xwork.ActionContext;
 import com.opensymphony.xwork.ModelDriven;
+
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
+
 import java.text.MessageFormat;
+
 import java.util.*;
 
 
         }
 
         // nothing still? alright, search the package hierarchy now
-        for (clazz = aClass; clazz != null && !clazz.equals(Object.class); clazz = clazz.getSuperclass()) {
+        for (clazz = aClass; (clazz != null) && !clazz.equals(Object.class);
+                clazz = clazz.getSuperclass()) {
             if (clazz.getPackage() != null) {
                 try {
                     String packageName = clazz.getPackage().getName();

src/java/com/opensymphony/xwork/validator/ActionValidatorManager.java

  */
 package com.opensymphony.xwork.validator;
 
+import com.opensymphony.util.FileManager;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
 import java.io.IOException;
 import java.io.InputStream;
+
 import java.util.*;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import com.opensymphony.util.FileManager;
 
 
 /**
         } else if (checked.contains(clazz.getName())) {
             return validators;
         }
+
         if (!clazz.equals(Object.class)) {
             validators.addAll(buildValidators(clazz.getSuperclass(), context, checkFile, checked));
         }
             }
 
             validators.addAll(buildClassValidators(interfaces[x], checkFile));
+
             if (context != null) {
                 validators.addAll(buildAliasValidators(interfaces[x], context, checkFile));
             }
+
             checked.add(interfaces[x].getName());
         }
 
         if (context != null) {
             validators.addAll(buildAliasValidators(clazz, context, checkFile));
         }
+
         checked.add(clazz.getName());
 
         return validators;

src/test/PackagelessAction.java

-
+/*
+ * Copyright (c) 2002-2003 by OpenSymphony
+ * All rights reserved.
+ */
 import com.opensymphony.xwork.ActionSupport;
 
 
  * @author Mark Woon
  */
 public class PackagelessAction extends ActionSupport {
+    //~ Constructors ///////////////////////////////////////////////////////////
 
     /**
      * Default constructor.
     public PackagelessAction() {
     }
 
+    //~ Methods ////////////////////////////////////////////////////////////////
+
     public String execute() {
         // from action's bundle
         System.out.println(getText("actionProperty"));
+
         // from default bundle
         System.out.println(getText("foo.range"));
+
         // nonexistant
         System.out.println(getText("non.existant"));
+
         return NONE;
     }
 }

src/test/com/opensymphony/xwork/dispatcher/ObjectDispatcherTest.java

 
 /**
  * test the object dispatcher
- * @authorPeter Kelley
+ * @author Peter Kelley
  */
 public class ObjectDispatcherTest extends TestCase implements MappingFactory, ResultObjectFactory {
     //~ Instance fields ////////////////////////////////////////////////////////
     //~ Constructors ///////////////////////////////////////////////////////////
 
     /**
-* default constructor
-* @param name The name of the test fixture
-*/
+     * default constructor
+     * @param name The name of the test fixture
+     */
     public ObjectDispatcherTest(String name) {
         super(name);
     }
     //~ Methods ////////////////////////////////////////////////////////////////
 
     /**
-* Setter for property bar.
-* @param newBar the new value for field bar
-*/
+     * Setter for property bar.
+     * @param newBar the new value for field bar
+     */
     public void setBar(String newBar) {
         bar = newBar;
     }
 
     /**
-* Getter for property bar.
-* @return the value of field bar
-*/
+     * Getter for property bar.
+     * @return the value of field bar
+     */
     public String getBar() {
         return bar;
     }
 
     /**
-* Setter for property foo.
-* @param newFoo the new value for field foo
-*/
+     * Setter for property foo.
+     * @param newFoo the new value for field foo
+     */
     public void setFoo(String newFoo) {
         foo = newFoo;
     }
 
     /**
-* Getter for property foo.
-* @return the value of field foo
-*/
+     * Getter for property foo.
+     * @return the value of field foo
+     */
     public String getFoo() {
         return foo;
     }
 
     /**
-* Setter for property foobar.
-* @param newFoobar the new value for field foobar
-*/
+     * Setter for property foobar.
+     * @param newFoobar the new value for field foobar
+     */
     public void setFoobar(String newFoobar) {
         foobar = newFoobar;
     }
 
     /**
-* Getter for property foobar.
-* @return the value of field foobar
-*/
+     * Getter for property foobar.
+     * @return the value of field foobar
+     */
     public String getFoobar() {
         return foobar;
     }
 
     /**
-* Get a mapping set with the given name.
-*
-* @param name The name of the mapping set to get
-* @return Either the mapping set with the given name or <code>null</code> if no mapping set
-*   exists with that name
-*/
+     * Get a mapping set with the given name.
+     *
+     * @param name The name of the mapping set to get
+     * @return Either the mapping set with the given name or <code>null</code> if no mapping set
+     *   exists with that name
+     */
     public MappingSet getMappingSet(String name) {
         MappingSet mappingSet = new MappingSet(name);
 
     }
 
     /**
-* Get the result object
-* @param key The key of the object to get (ignored)
-* @return this
-*/
+     * Get the result object
+     * @param key The key of the object to get (ignored)
+     * @return this
+     */
     public Object getResultObject(String key) {
         return this;
     }
 
     /**
-* Test dispatching from an object
-* @throws Exception
-*/
+     * Test dispatching from an object
+     * @throws Exception
+     */
     public void testDispatch() throws Exception {
         String namespace = "";
         String action = "TestObjectDispatcher";
     }
 
     /**
-* set up for a test
-* @throws Exception if something bad happens
-*/
+     * set up for a test
+     * @throws Exception if something bad happens
+     */
     protected void setUp() throws Exception {
         super.setUp();
         objectDispatcher = new ObjectDispatcher(this);
     }
 
     /**
-* clean up after a test
-* @throws Exception if something bad happens
-*/
+     * clean up after a test
+     * @throws Exception if something bad happens
+     */
     protected void tearDown() throws Exception {
         objectDispatcher = null;
         super.tearDown();

src/test/com/opensymphony/xwork/dispatcher/ObjectTestAction.java

     //~ Methods ////////////////////////////////////////////////////////////////
 
     /**
- * Setter for property blah.
- * @param newBlah the new value for field blah
- */
+     * Setter for property blah.
+     * @param newBlah the new value for field blah
+     */
     public void setBlah(String newBlah) {
         blah = newBlah;
     }
 
     /**
- * Getter for property blah.
- * @return the value of field blah
- */
+     * Getter for property blah.
+     * @return the value of field blah
+     */
     public String getBlah() {
         return blah;
     }
 
     /**
- * This methodName is where the logic of the action is executed.
- *
- * @return a string representing the logical result of the execution. See constants in this
- *   interface for a list of standard result values.
- * @throws Exception thrown if a system level exception occurs. Application level exceptions
- *   should be handled by returning an error value, such as Action.ERROR.
- * @todo Implement this com.opensymphony.xwork.Action method
- */
+     * This methodName is where the logic of the action is executed.
+     *
+     * @return a string representing the logical result of the execution. See constants in this
+     *   interface for a list of standard result values.
+     * @throws Exception thrown if a system level exception occurs. Application level exceptions
+     *   should be handled by returning an error value, such as Action.ERROR.
+     * @todo Implement this com.opensymphony.xwork.Action method
+     */
     public String execute() throws Exception {
         if (log.isDebugEnabled()) {
             log.debug("Blah was " + getBlah());

src/test/com/opensymphony/xwork/util/LocalizedTextUtilTest.java

 import com.opensymphony.xwork.Action;
 import com.opensymphony.xwork.ActionContext;
 import com.opensymphony.xwork.ActionInvocation;
-import com.opensymphony.xwork.XWorkMessages;
-import com.opensymphony.xwork.ActionProxyFactory;
 import com.opensymphony.xwork.ActionProxy;
+import com.opensymphony.xwork.ActionProxyFactory;
+import com.opensymphony.xwork.XWorkMessages;
 import com.opensymphony.xwork.config.ConfigurationManager;
 import com.opensymphony.xwork.test.ModelDrivenAction2;
 
 import junit.framework.TestCase;
 
+import java.util.Collections;
 import java.util.Locale;
 import java.util.MissingResourceException;
-import java.util.Collections;
 
 
 /**
     }
 
     public void testAddDefaultResourceBundle2() {
-
         LocalizedTextUtil.addDefaultResourceBundle("com/opensymphony/xwork/SimpleAction");
 
         try {
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.