User: rinkrank
Date: 02/05/30 11:39:03
Modified: modules/ejb/src/xdoclet/modules/ejb/home
HomeInterfaceSubTask.java HomeTagsHandler.java
LocalHomeInterfaceSubTask.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 -14
xdoclet/modules/ejb/src/xdoclet/modules/ejb/home/HomeInterfaceSubTask.java
Index: HomeInterfaceSubTask.java
===================================================================
RCS file:
/cvsroot/xdoclet/xdoclet/modules/ejb/src/xdoclet/modules/ejb/home/HomeInterfaceSubTask.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -w -r1.3 -r1.4
--- HomeInterfaceSubTask.java 28 May 2002 22:58:08 -0000 1.3
+++ HomeInterfaceSubTask.java 30 May 2002 18:39:03 -0000 1.4
@@ -27,12 +27,10 @@
* @author Ara Abrahamian ([EMAIL PROTECTED])
* @created Oct 15, 2001
* @xdoclet:subtask display-name="Home Interface" name="homeinterface"
parent="xdoclet.modules.ejb.EjbDocletTask"
- * @version $Revision: 1.3 $
+ * @version $Revision: 1.4 $
*/
public class HomeInterfaceSubTask extends AbstractEjbCodeGeneratorSubTask
{
- public final static String SUBTASK_NAME = "homeInterface";
-
public final static String DEFAULT_HOMEINTERFACE_CLASS_PATTERN = "{0}Home";
protected static String DEFAULT_TEMPLATE_FILE = "resources/home.xdt";
@@ -55,17 +53,6 @@
setDestinationFile(getHomeClassPattern() + ".java");
addOfType("javax.ejb.EntityBean");
addOfType("javax.ejb.SessionBean");
- }
-
-
- /**
- * Gets the SubTaskName attribute of the HomeInterfaceSubTask object
- *
- * @return The SubTaskName value
- */
- public String getSubTaskName()
- {
- return SUBTASK_NAME;
}
1.3 +7 -6
xdoclet/modules/ejb/src/xdoclet/modules/ejb/home/HomeTagsHandler.java
Index: HomeTagsHandler.java
===================================================================
RCS file:
/cvsroot/xdoclet/xdoclet/modules/ejb/src/xdoclet/modules/ejb/home/HomeTagsHandler.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- HomeTagsHandler.java 28 May 2002 21:30:18 -0000 1.2
+++ HomeTagsHandler.java 30 May 2002 18:39:03 -0000 1.3
@@ -15,8 +15,9 @@
import xjavadoc.XClass;
import xjavadoc.XMethod;
import xjavadoc.XTag;
-
import xdoclet.DocletContext;
+
+import xdoclet.DocletTask;
import xdoclet.XDocletException;
import xdoclet.modules.ejb.EjbTagsHandler;
import xdoclet.modules.ejb.entity.CmpTagsHandler;
@@ -33,7 +34,7 @@
* @author Ara Abrahamian ([EMAIL PROTECTED])
* @created Oct 15, 2001
* @xdoclet:taghandler namespace="EjbHome"
- * @version $Revision: 1.2 $
+ * @version $Revision: 1.3 $
*/
public class HomeTagsHandler extends EjbTagsHandler
{
@@ -112,10 +113,10 @@
String subtask_name = null;
if (type.equals("remote")) {
- subtask_name = HomeInterfaceSubTask.SUBTASK_NAME;
+ subtask_name = DocletTask.getSubTaskName(HomeInterfaceSubTask.class);
}
else {
- subtask_name = LocalHomeInterfaceSubTask.SUBTASK_NAME;
+ subtask_name =
DocletTask.getSubTaskName(LocalHomeInterfaceSubTask.class);
}
// Fix package name
@@ -348,7 +349,7 @@
*/
protected static String getLocalHomeClassPattern()
{
- LocalHomeInterfaceSubTask localhomeintf_subtask =
((LocalHomeInterfaceSubTask)
DocletContext.getInstance().getSubTaskBy(LocalHomeInterfaceSubTask.SUBTASK_NAME));
+ LocalHomeInterfaceSubTask localhomeintf_subtask =
((LocalHomeInterfaceSubTask)
DocletContext.getInstance().getSubTaskBy(DocletTask.getSubTaskName(LocalHomeInterfaceSubTask.class)));
if (localhomeintf_subtask != null) {
return localhomeintf_subtask.getLocalHomeClassPattern();
@@ -365,7 +366,7 @@
*/
protected static String getHomeClassPattern()
{
- HomeInterfaceSubTask homeintf_subtask = ((HomeInterfaceSubTask)
DocletContext.getInstance().getSubTaskBy(HomeInterfaceSubTask.SUBTASK_NAME));
+ HomeInterfaceSubTask homeintf_subtask = ((HomeInterfaceSubTask)
DocletContext.getInstance().getSubTaskBy(DocletTask.getSubTaskName(HomeInterfaceSubTask.class)));
if (homeintf_subtask != null) {
return homeintf_subtask.getHomeClassPattern();
1.4 +3 -14
xdoclet/modules/ejb/src/xdoclet/modules/ejb/home/LocalHomeInterfaceSubTask.java
Index: LocalHomeInterfaceSubTask.java
===================================================================
RCS file:
/cvsroot/xdoclet/xdoclet/modules/ejb/src/xdoclet/modules/ejb/home/LocalHomeInterfaceSubTask.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -w -r1.3 -r1.4
--- LocalHomeInterfaceSubTask.java 28 May 2002 22:35:19 -0000 1.3
+++ LocalHomeInterfaceSubTask.java 30 May 2002 18:39:03 -0000 1.4
@@ -25,13 +25,12 @@
/**
* @author Ara Abrahamian ([EMAIL PROTECTED])
* @created Oct 15, 2001
- * @xdoclet:subtask display-name="Local Home Interface" name="localhomeinterface"
parent="xdoclet.modules.ejb.EjbDocletTask"
- * @version $Revision: 1.3 $
+ * @xdoclet:subtask display-name="Local Home Interface" name="localhomeinterface"
+ * parent="xdoclet.modules.ejb.EjbDocletTask"
+ * @version $Revision: 1.4 $
*/
public class LocalHomeInterfaceSubTask extends AbstractEjbCodeGeneratorSubTask
{
- public final static String SUBTASK_NAME = "localHomeInterface";
-
public final static String DEFAULT_LOCALHOMEINTERFACE_CLASS_PATTERN =
"{0}LocalHome";
protected static String DEFAULT_TEMPLATE_FILE = "resources/home-local.xdt";
@@ -54,16 +53,6 @@
setDestinationFile(getLocalHomeClassPattern() + ".java");
addOfType("javax.ejb.EntityBean");
addOfType("javax.ejb.SessionBean");
- }
-
- /**
- * Gets the SubTaskName attribute of the LocalHomeInterfaceSubTask 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
