Update of /cvsroot/xdoclet/xdoclet/modules/apache/src/xdoclet/modules/apache/struts
In directory
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18390/modules/apache/src/xdoclet/modules/apache/struts
Modified Files:
StrutsDynaFormValidationXmlSubTask.java
StrutsValidationXmlSubTask.java
Log Message:
Light refactoring on the StrutsDynaFormValidationXmlSubTask class. When initially
written, it was external to the main XDoclet tree.
Index: StrutsDynaFormValidationXmlSubTask.java
===================================================================
RCS file:
/cvsroot/xdoclet/xdoclet/modules/apache/src/xdoclet/modules/apache/struts/StrutsDynaFormValidationXmlSubTask.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** StrutsDynaFormValidationXmlSubTask.java 30 Aug 2004 21:17:48 -0000 1.1
--- StrutsDynaFormValidationXmlSubTask.java 27 Sep 2004 21:53:57 -0000 1.2
***************
*** 5,10 ****
package xdoclet.modules.apache.struts;
- import xdoclet.XDocletException;
- import xdoclet.XmlSubTask;
/**
--- 5,8 ----
***************
*** 19,35 ****
* containing the global elements for the validation descriptor."
*/
! public class StrutsDynaFormValidationXmlSubTask extends XmlSubTask
{
- private final static String DTD_FILE_NAME_11 = "resources/validation_1_1.dtd";
- private final static String VALIDATION_PUBLICID_11 = "-//Apache Software
Foundation//DTD Commons Validator Rules Configuration 1.0//EN";
- private final static String VALIDATION_SYSTEMID_11 =
"http://jakarta.apache.org/commons/dtds/validator_1_0.dtd";;
-
- private final static String DTD_FILE_NAME_113 = "resources/validation_1_1_3.dtd";
- private final static String VALIDATION_PUBLICID_113 = "-//Apache Software
Foundation//DTD Commons Validator Rules Configuration 1.1.3//EN";
- private final static String VALIDATION_SYSTEMID_113 =
"http://jakarta.apache.org/commons/dtds/validator_1_1_3.dtd";;
private static String DEFAULT_TEMPLATE_FILE =
"resources/dynaform_validation_xml.xdt";
- private static String GENERATED_FILE_NAME = "validation.xml";
- private String validatorVersion = "1.1";
/**
--- 17,24 ----
* containing the global elements for the validation descriptor."
*/
! public class StrutsDynaFormValidationXmlSubTask extends StrutsValidationXmlSubTask
{
private static String DEFAULT_TEMPLATE_FILE =
"resources/dynaform_validation_xml.xdt";
/**
***************
*** 42,86 ****
}
- /**
- * Gets the Version attribute of the StrutsDynaFormValidationXmlSubTask object
- *
- * @return The Version value
- */
- public String getVersion()
- {
- return validatorVersion;
- }
-
- /**
- * Sets the validator version to use. Legal values are "1.1" and "1.1.3".
- *
- * @param version
- * @ant.not-required No. Default is "1.0".
- */
- public void setVersion(String version)
- {
- validatorVersion = version;
- }
-
- /**
- * Describe what the method does
- *
- * @exception XDocletException
- * @todo is this method even needed here?
- */
- public void execute() throws XDocletException
- {
- if (validatorVersion.equals("1.1")) {
- setPublicId(VALIDATION_PUBLICID_11);
- setSystemId(VALIDATION_SYSTEMID_11);
- setDtdURL(getClass().getResource(DTD_FILE_NAME_11));
- }
- else {
- setPublicId(VALIDATION_PUBLICID_113);
- setSystemId(VALIDATION_SYSTEMID_113);
- setDtdURL(getClass().getResource(DTD_FILE_NAME_113));
- }
- startProcess();
- }
-
}
--- 31,33 ----
Index: StrutsValidationXmlSubTask.java
===================================================================
RCS file:
/cvsroot/xdoclet/xdoclet/modules/apache/src/xdoclet/modules/apache/struts/StrutsValidationXmlSubTask.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** StrutsValidationXmlSubTask.java 2 Sep 2004 04:55:49 -0000 1.10
--- StrutsValidationXmlSubTask.java 27 Sep 2004 21:53:57 -0000 1.11
***************
*** 12,15 ****
--- 12,16 ----
*
* @author Erik Hatcher ([EMAIL PROTECTED])
+ * @author Nick Heudecker (nick at systemmobile.com)
* @created August 23, 2002
* @ant.element display-name="validation.xml" name="strutsvalidationxml"
***************
*** 21,33 ****
public class StrutsValidationXmlSubTask extends XmlSubTask
{
! private final static String DTD_FILE_NAME_11 = "resources/validation_1_1.dtd";
! private final static String VALIDATION_PUBLICID_11 = "-//Apache Software
Foundation//DTD Commons Validator Rules Configuration 1.1//EN";
! private final static String VALIDATION_SYSTEMID_11 =
"http://jakarta.apache.org/commons/dtds/validator_1_1.dtd";;
private static String DEFAULT_TEMPLATE_FILE = "resources/validation_xml.xdt";
! private static String GENERATED_FILE_NAME = "validation.xml";
/**
! * Describe what the StrutsValidationXmlSubTask constructor does
*/
public StrutsValidationXmlSubTask()
--- 22,39 ----
public class StrutsValidationXmlSubTask extends XmlSubTask
{
! protected final static String DTD_FILE_NAME_11 = "resources/validation_1_1.dtd";
! protected final static String VALIDATION_PUBLICID_11 = "-//Apache Software
Foundation//DTD Commons Validator Rules Configuration 1.1//EN";
! protected final static String VALIDATION_SYSTEMID_11 =
"http://jakarta.apache.org/commons/dtds/validator_1_1.dtd";;
!
! protected final static String DTD_FILE_NAME_113 =
"resources/validation_1_1_3.dtd";
! protected final static String VALIDATION_PUBLICID_113 = "-//Apache Software
Foundation//DTD Commons Validator Rules Configuration 1.1.3//EN";
! protected final static String VALIDATION_SYSTEMID_113 =
"http://jakarta.apache.org/commons/dtds/validator_1_1_3.dtd";;
! protected static String GENERATED_FILE_NAME = "validation.xml";
private static String DEFAULT_TEMPLATE_FILE = "resources/validation_xml.xdt";
! protected String version = "1.1";
/**
! * Creates a new validation task instance.
*/
public StrutsValidationXmlSubTask()
***************
*** 35,41 ****
setTemplateURL(getClass().getResource(DEFAULT_TEMPLATE_FILE));
setDestinationFile(GENERATED_FILE_NAME);
! setPublicId(VALIDATION_PUBLICID_11);
! setSystemId(VALIDATION_SYSTEMID_11);
! setDtdURL(getClass().getResource(DTD_FILE_NAME_11));
}
--- 41,65 ----
setTemplateURL(getClass().getResource(DEFAULT_TEMPLATE_FILE));
setDestinationFile(GENERATED_FILE_NAME);
! }
!
! /**
! * Gets the Version attribute of the task tag.
! *
! * @return The Version value
! */
! public String getVersion()
! {
! return this.version;
! }
!
! /**
! * Sets the validator version to use. Legal values are "1.1" and "1.1.3".
! *
! * @param version
! * @ant.not-required No. Default is "1.1".
! */
! public void setVersion(String version)
! {
! this.version = version;
}
***************
*** 44,51 ****
*
* @exception XDocletException
- * @todo is this method even needed here?
*/
public void execute() throws XDocletException
{
startProcess();
}
--- 68,84 ----
*
* @exception XDocletException
*/
public void execute() throws XDocletException
{
+ if (version.equals("1.1")) {
+ setPublicId(VALIDATION_PUBLICID_11);
+ setSystemId(VALIDATION_SYSTEMID_11);
+ setDtdURL(getClass().getResource(DTD_FILE_NAME_11));
+ }
+ else {
+ setPublicId(VALIDATION_PUBLICID_113);
+ setSystemId(VALIDATION_SYSTEMID_113);
+ setDtdURL(getClass().getResource(DTD_FILE_NAME_113));
+ }
startProcess();
}
-------------------------------------------------------
This SF.Net email is sponsored by: YOU BE THE JUDGE. Be one of 170
Project Admins to receive an Apple iPod Mini FREE for your judgement on
who ports your project to Linux PPC the best. Sponsored by IBM.
Deadline: Sept. 24. Go here: http://sf.net/ppc_contest.php
_______________________________________________
xdoclet-devel mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/xdoclet-devel
