dion 02/05/27 05:40:58
Modified: src/java/org/apache/maven/struts Struts10WarFile.java
Struts10WarValidator.java StrutsEntityResolver.java
FormBean.java Action.java
Log:
Fix checkstyle issues
Revision Changes Path
1.9 +5 -3
jakarta-turbine-maven/src/java/org/apache/maven/struts/Struts10WarFile.java
Index: Struts10WarFile.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/struts/Struts10WarFile.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Struts10WarFile.java 23 May 2002 08:33:19 -0000 1.8
+++ Struts10WarFile.java 27 May 2002 12:40:58 -0000 1.9
@@ -52,6 +52,8 @@
* individuals on behalf of the Apache Software Foundation. For more
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
+ *
+ * ====================================================================
*/
import java.io.File;
@@ -67,14 +69,13 @@
import org.dom4j.Document;
import org.dom4j.DocumentException;
import org.dom4j.Element;
-import org.dom4j.Node;
import org.dom4j.io.SAXReader;
/**
* Encapsulates a Struts 1.0 War File. Holds functionality to access Struts
* specific resources and data in the war.
* @author dion
- * @version $Id: Struts10WarFile.java,v 1.8 2002/05/23 08:33:19 dion Exp $
+ * @version $Id: Struts10WarFile.java,v 1.9 2002/05/27 12:40:58 dion Exp $
*/
public class Struts10WarFile extends WarFile
{
@@ -220,7 +221,8 @@
return formBeans;
}
- /** retrieves the actions defined in the struts configuration file
+ /** retrieve the actions defined in the struts configuration file
+ * @return a {@link List] of {@link Action actions}
* @throws IOException when there are problems reading from the war
*/
public List getActions() throws IOException
1.7 +11 -6
jakarta-turbine-maven/src/java/org/apache/maven/struts/Struts10WarValidator.java
Index: Struts10WarValidator.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/struts/Struts10WarValidator.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Struts10WarValidator.java 23 May 2002 08:33:19 -0000 1.6
+++ Struts10WarValidator.java 27 May 2002 12:40:58 -0000 1.7
@@ -52,16 +52,15 @@
* individuals on behalf of the Apache Software Foundation. For more
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
+ *
+ * ====================================================================
*/
import java.io.IOException;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.List;
import java.util.Map;
-
-import org.apache.maven.j2ee.ValidationEvent;
import org.apache.maven.j2ee.WarValidator;
import org.apache.maven.j2ee.WarClassLoader;
@@ -74,7 +73,7 @@
* </ol>
*
* @author dion
- * @version $Id: Struts10WarValidator.java,v 1.6 2002/05/23 08:33:19 dion Exp $
+ * @version $Id: Struts10WarValidator.java,v 1.7 2002/05/27 12:40:58 dion Exp $
*/
public class Struts10WarValidator extends WarValidator
{
@@ -169,7 +168,7 @@
}
/** validations for the actions in the config
- * @param strutsWar - the struts web app being validated
+ * @param war the struts web app being validated
* @throws IOException when there are problems reading the war
*/
private void validateActions(Struts10WarFile war) throws IOException
@@ -197,6 +196,7 @@
} // end method
/** validate a string that must contain a boolean value or be null
+ * @param value the string to be validated
* @return true if the provided string is true, false or null
*/
private boolean isBoolean(String value)
@@ -204,7 +204,11 @@
return value == null || value.equals("true") || value.equals("false");
}
- /** validate the provided action object */
+ /** validate the provided action object
+ * @param action the action to be validated
+ * @param formBeans the form beans for the war that the actions came from
+ * @param loader a {@link ClassLoader} to verify classes are from the war
+ */
private void validateAction(Action action, Map formBeans, ClassLoader
loader)
{
@@ -246,6 +250,7 @@
}
/** validate the global forwards in the configuration
+ * @param war the war file to be used for validating
* @throws IOException when there are problems reading the war
*/
private void validateForwards(Struts10WarFile war) throws IOException
1.2 +3 -1
jakarta-turbine-maven/src/java/org/apache/maven/struts/StrutsEntityResolver.java
Index: StrutsEntityResolver.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/struts/StrutsEntityResolver.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- StrutsEntityResolver.java 21 May 2002 05:58:38 -0000 1.1
+++ StrutsEntityResolver.java 27 May 2002 12:40:58 -0000 1.2
@@ -52,6 +52,8 @@
* individuals on behalf of the Apache Software Foundation. For more
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
+ *
+ * ====================================================================
*/
import org.apache.maven.j2ee.J2EEEntityResolver;
@@ -60,7 +62,7 @@
* A class to resolve external entity definitions for struts artifacts.
*
* @author dion
- * @version $Id: StrutsEntityResolver.java,v 1.1 2002/05/21 05:58:38 dion Exp $
+ * @version $Id: StrutsEntityResolver.java,v 1.2 2002/05/27 12:40:58 dion Exp $
*/
public class StrutsEntityResolver extends J2EEEntityResolver
{
1.3 +3 -1
jakarta-turbine-maven/src/java/org/apache/maven/struts/FormBean.java
Index: FormBean.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/struts/FormBean.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- FormBean.java 22 May 2002 06:55:28 -0000 1.2
+++ FormBean.java 27 May 2002 12:40:58 -0000 1.3
@@ -52,12 +52,14 @@
* individuals on behalf of the Apache Software Foundation. For more
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
+ *
+ * ====================================================================
*/
/**
* A class to hold data about a Struts form bean as found in the configuration
* @author dion
- * @version $Id: FormBean.java,v 1.2 2002/05/22 06:55:28 dion Exp $
+ * @version $Id: FormBean.java,v 1.3 2002/05/27 12:40:58 dion Exp $
*/
public class FormBean
{
1.3 +3 -1
jakarta-turbine-maven/src/java/org/apache/maven/struts/Action.java
Index: Action.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/struts/Action.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Action.java 22 May 2002 09:48:29 -0000 1.2
+++ Action.java 27 May 2002 12:40:58 -0000 1.3
@@ -52,6 +52,8 @@
* individuals on behalf of the Apache Software Foundation. For more
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
+ *
+ * ====================================================================
*/
/**
@@ -59,7 +61,7 @@
* configuration file
*
* @author dion
- * @version $Id: Action.java,v 1.2 2002/05/22 09:48:29 dion Exp $
+ * @version $Id: Action.java,v 1.3 2002/05/27 12:40:58 dion Exp $
*/
public class Action
{
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
