User: rinkrank
Date: 02/05/30 11:39:06
Modified: modules/web/src/xdoclet/modules/web JspTaglibSubTask.java
WebXmlSubTask.java
Log:
Refactoring which removes redundant subtask names (both in @xdoclet.subtask
name="blabla" and in code)
-Removed the static SUBTASK_NAME and overridden getSubTaskName() from all SubTasks
(it's final now in SubTask)
-DocletTask stores all subtask names in a Class->String Map, using the name from
xdoclet.xml (which in turn comes from @xdoclet.subtask name="blabla"
-All references to SomeSubTask.SUBTASK_NAME replaced by a call to
DocletTask.getSubTaskName(Class subTaskClass)
-Improved error reporting in DocletTask
-Reverted the ejbjarxml/webxml to deploymentdescriptor
-Added omit.docs flag in xdoclet/build.xml set it to true in ANT_OPTS for faster
build
Revision Changes Path
1.4 +1 -18
xdoclet/modules/web/src/xdoclet/modules/web/JspTaglibSubTask.java
Index: JspTaglibSubTask.java
===================================================================
RCS file:
/cvsroot/xdoclet/xdoclet/modules/web/src/xdoclet/modules/web/JspTaglibSubTask.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -w -r1.3 -r1.4
--- JspTaglibSubTask.java 28 May 2002 22:35:19 -0000 1.3
+++ JspTaglibSubTask.java 30 May 2002 18:39:06 -0000 1.4
@@ -16,18 +16,13 @@
* @author Ara Abrahamian ([EMAIL PROTECTED])
* @created July 12, 2001
* @xdoclet:subtask display-name="JSP Taglib" name="jsptaglib"
parent="xdoclet.modules.web.WebDocletTask"
- * @version $Revision: 1.3 $
+ * @version $Revision: 1.4 $
*/
public class JspTaglibSubTask extends XmlSubTask
{
/**
* @todo-javadoc Describe the field
*/
- public final static String SUBTASK_NAME = "jspTagLib";
-
- /**
- * @todo-javadoc Describe the field
- */
private static String DEFAULT_TEMPLATE_FILE = "resources/taglib_tld.xdt";
/**
* @todo-javadoc Describe the field
@@ -110,18 +105,6 @@
setSystemId(TLD_SYSTEMID_1_2);
setDtdURL(getClass().getResource(TLD_DTD_FILE_NAME_1_2));
}
-
-
- /**
- * Gets the SubTaskName attribute of the JspTaglibSubTask object
- *
- * @return The SubTaskName value
- */
- public String getSubTaskName()
- {
- return SUBTASK_NAME;
- }
-
/**
* Gets the Taglibversion attribute of the JspTaglibSubTask object
1.3 +2 -14 xdoclet/modules/web/src/xdoclet/modules/web/WebXmlSubTask.java
Index: WebXmlSubTask.java
===================================================================
RCS file:
/cvsroot/xdoclet/xdoclet/modules/web/src/xdoclet/modules/web/WebXmlSubTask.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- WebXmlSubTask.java 28 May 2002 22:35:19 -0000 1.2
+++ WebXmlSubTask.java 30 May 2002 18:39:06 -0000 1.3
@@ -16,13 +16,11 @@
*
* @author Ara Abrahamian ([EMAIL PROTECTED])
* @created June 19, 2001
- * @xdoclet:subtask display-name="web.xml" name="webxml"
parent="xdoclet.modules.web.WebDocletTask"
- * @version $Revision: 1.2 $
+ * @xdoclet:subtask display-name="web.xml" name="deploymentdescriptor"
parent="xdoclet.modules.web.WebDocletTask"
+ * @version $Revision: 1.3 $
*/
public class WebXmlSubTask extends XmlSubTask
{
- public final static String SUBTASK_NAME = "webxml";
-
private static String DEFAULT_TEMPLATE_FILE = "resources/web_xml.xdt";
private static String GENERATED_FILE_NAME = "web.xml";
@@ -68,16 +66,6 @@
{
setTemplateURL(getClass().getResource(DEFAULT_TEMPLATE_FILE));
setDestinationFile(GENERATED_FILE_NAME);
- }
-
- /**
- * Gets the SubTaskName attribute of the WebXmlSubTask object
- *
- * @return The SubTaskName value
- */
- public String getSubTaskName()
- {
- return SUBTASK_NAME;
}
/**
_______________________________________________________________
Don't miss the 2002 Sprint PCS Application Developer's Conference
August 25-28 in Las Vegas -- http://devcon.sprintpcs.com/adp/index.cfm
_______________________________________________
Xdoclet-devel mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/xdoclet-devel
