User: rinkrank
Date: 02/05/30 11:39:03
Modified: modules/ejb/src/xdoclet/modules/ejb/intf
InterfaceTagsHandler.java
LocalInterfaceSubTask.java
RemoteInterfaceSubTask.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.3 +7 -6
xdoclet/modules/ejb/src/xdoclet/modules/ejb/intf/InterfaceTagsHandler.java
Index: InterfaceTagsHandler.java
===================================================================
RCS file:
/cvsroot/xdoclet/xdoclet/modules/ejb/src/xdoclet/modules/ejb/intf/InterfaceTagsHandler.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- InterfaceTagsHandler.java 28 May 2002 21:35:40 -0000 1.2
+++ InterfaceTagsHandler.java 30 May 2002 18:39:03 -0000 1.3
@@ -14,8 +14,9 @@
import xjavadoc.XJavaDocException;
import xjavadoc.XMethod;
import xjavadoc.XTag;
-
import xdoclet.DocletContext;
+
+import xdoclet.DocletTask;
import xdoclet.TemplateSubTask;
import xdoclet.XDocletException;
import xdoclet.XDocletTagSupport;
@@ -33,7 +34,7 @@
* @author Ara Abrahamian ([EMAIL PROTECTED])
* @created Oct 15, 2001
* @xdoclet:taghandler namespace="EjbIntf"
- * @version $Revision: 1.2 $
+ * @version $Revision: 1.3 $
*/
public class InterfaceTagsHandler extends EjbTagsHandler
{
@@ -104,10 +105,10 @@
String subtask_name = null;
if (type.equals("remote")) {
- subtask_name = RemoteInterfaceSubTask.SUBTASK_NAME;
+ subtask_name = DocletTask.getSubTaskName(RemoteInterfaceSubTask.class);
}
else {
- subtask_name = LocalInterfaceSubTask.SUBTASK_NAME;
+ subtask_name = DocletTask.getSubTaskName(LocalInterfaceSubTask.class);
}
// Fix package name
@@ -234,7 +235,7 @@
*/
protected static String getRemoteClassPattern()
{
- RemoteInterfaceSubTask remoteintf_subtask = ((RemoteInterfaceSubTask)
DocletContext.getInstance().getSubTaskBy(RemoteInterfaceSubTask.SUBTASK_NAME));
+ RemoteInterfaceSubTask remoteintf_subtask = ((RemoteInterfaceSubTask)
DocletContext.getInstance().getSubTaskBy(DocletTask.getSubTaskName(RemoteInterfaceSubTask.class)));
if (remoteintf_subtask != null) {
return remoteintf_subtask.getRemoteClassPattern();
@@ -251,7 +252,7 @@
*/
protected static String getLocalClassPattern()
{
- LocalInterfaceSubTask localintf_subtask = ((LocalInterfaceSubTask)
DocletContext.getInstance().getSubTaskBy(LocalInterfaceSubTask.SUBTASK_NAME));
+ LocalInterfaceSubTask localintf_subtask = ((LocalInterfaceSubTask)
DocletContext.getInstance().getSubTaskBy(DocletTask.getSubTaskName(LocalInterfaceSubTask.class)));
if (localintf_subtask != null) {
return localintf_subtask.getLocalClassPattern();
1.4 +1 -15
xdoclet/modules/ejb/src/xdoclet/modules/ejb/intf/LocalInterfaceSubTask.java
Index: LocalInterfaceSubTask.java
===================================================================
RCS file:
/cvsroot/xdoclet/xdoclet/modules/ejb/src/xdoclet/modules/ejb/intf/LocalInterfaceSubTask.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -w -r1.3 -r1.4
--- LocalInterfaceSubTask.java 28 May 2002 22:35:20 -0000 1.3
+++ LocalInterfaceSubTask.java 30 May 2002 18:39:03 -0000 1.4
@@ -26,12 +26,10 @@
* @author Ara Abrahamian ([EMAIL PROTECTED])
* @created Oct 15, 2001
* @xdoclet:subtask display-name="Local Interface" name="localinterface"
parent="xdoclet.modules.ejb.EjbDocletTask"
- * @version $Revision: 1.3 $
+ * @version $Revision: 1.4 $
*/
public class LocalInterfaceSubTask extends AbstractEjbCodeGeneratorSubTask
{
- public final static String SUBTASK_NAME = "localInterface";
-
public final static String DEFAULT_LOCAL_CLASS_PATTERN = "{0}Local";
protected static String DEFAULT_TEMPLATE_FILE = "resources/local.xdt";
@@ -55,18 +53,6 @@
addOfType("javax.ejb.EntityBean");
addOfType("javax.ejb.SessionBean");
}
-
-
- /**
- * Gets the SubTaskName attribute of the LocalInterfaceSubTask object
- *
- * @return The SubTaskName value
- */
- public String getSubTaskName()
- {
- return SUBTASK_NAME;
- }
-
/**
* Returns the configuration parameter for specifying the local interface name
pattern. By default the value is used
1.4 +1 -13
xdoclet/modules/ejb/src/xdoclet/modules/ejb/intf/RemoteInterfaceSubTask.java
Index: RemoteInterfaceSubTask.java
===================================================================
RCS file:
/cvsroot/xdoclet/xdoclet/modules/ejb/src/xdoclet/modules/ejb/intf/RemoteInterfaceSubTask.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -w -r1.3 -r1.4
--- RemoteInterfaceSubTask.java 28 May 2002 22:35:20 -0000 1.3
+++ RemoteInterfaceSubTask.java 30 May 2002 18:39:03 -0000 1.4
@@ -26,12 +26,10 @@
* @author Ara Abrahamian ([EMAIL PROTECTED])
* @created Oct 15, 2001
* @xdoclet:subtask display-name="Remote Interface" name="remoteinterface"
parent="xdoclet.modules.ejb.EjbDocletTask"
- * @version $Revision: 1.3 $
+ * @version $Revision: 1.4 $
*/
public class RemoteInterfaceSubTask extends AbstractEjbCodeGeneratorSubTask
{
- public final static String SUBTASK_NAME = "remoteinterface";
-
public static String DEFAULT_REMOTE_CLASS_PATTERN = "{0}";
protected static String DEFAULT_TEMPLATE_FILE = "resources/remote.xdt";
@@ -54,16 +52,6 @@
setDestinationFile(getRemoteClassPattern() + ".java");
addOfType("javax.ejb.EntityBean");
addOfType("javax.ejb.SessionBean");
- }
-
- /**
- * Gets the SubTaskName attribute of the RemoteInterfaceSubTask 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
