User: rinkrank
Date: 02/05/30 11:39:02
Modified: modules/ejb/src/xdoclet/modules/ejb EjbTagsHandler.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 +19 -18 xdoclet/modules/ejb/src/xdoclet/modules/ejb/EjbTagsHandler.java
Index: EjbTagsHandler.java
===================================================================
RCS file:
/cvsroot/xdoclet/xdoclet/modules/ejb/src/xdoclet/modules/ejb/EjbTagsHandler.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- EjbTagsHandler.java 28 May 2002 21:30:16 -0000 1.2
+++ EjbTagsHandler.java 30 May 2002 18:39:01 -0000 1.3
@@ -16,9 +16,10 @@
import xjavadoc.XJavaDoc;
import xjavadoc.XJavaDocException;
import xjavadoc.XTag;
-
import xdoclet.DocletContext;
import xdoclet.DocletSupport;
+
+import xdoclet.DocletTask;
import xdoclet.SubTask;
import xdoclet.XDocletException;
import xdoclet.XDocletTagSupport;
@@ -44,7 +45,7 @@
* @author Ara Abrahamian ([EMAIL PROTECTED])
* @created Oct 15, 2001
* @xdoclet:taghandler namespace="Ejb"
- * @version $Revision: 1.2 $
+ * @version $Revision: 1.3 $
*/
public class EjbTagsHandler extends XDocletTagSupport
{
@@ -141,14 +142,14 @@
else {
// if <entitycmp/bmp/> is on, then it's an error or not specify the
class abstract, except for <session/> that non-abstract is also legal
if (subtask != null &&
DocletContext.getInstance().isSubTaskDefined(subtask.getSubTaskName())) {
- if (subtask.getSubTaskName().equals(SessionSubTask.SUBTASK_NAME)) {
+ if
(subtask.getSubTaskName().equals(DocletTask.getSubTaskName(SessionSubTask.class))) {
return true;
}
String currentClassName = clazz.getQualifiedName();
throw new
XDocletException(Translator.getString("xdoclet.modules.ejb.Messages",
"class_not_abstract",
- new String[]{currentClassName, SessionSubTask.SUBTASK_NAME}));
+ new String[]{currentClassName,
DocletTask.getSubTaskName(SessionSubTask.class)}));
}
else {
return true;
@@ -389,13 +390,13 @@
private static SubTask getSubTaskClassForClass(XClass clazz) throws
XDocletException
{
if (CmpTagsHandler.isEntityCmp(clazz)) {
- return
DocletContext.getInstance().getSubTaskBy(EntityCmpSubTask.SUBTASK_NAME);
+ return
DocletContext.getInstance().getSubTaskBy(DocletTask.getSubTaskName(EntityCmpSubTask.class));
}
else if (BmpTagsHandler.isEntityBmp(clazz)) {
- return
DocletContext.getInstance().getSubTaskBy(EntityBmpSubTask.SUBTASK_NAME);
+ return
DocletContext.getInstance().getSubTaskBy(DocletTask.getSubTaskName(EntityBmpSubTask.class));
}
else if (SessionTagsHandler.isSession(clazz)) {
- return
DocletContext.getInstance().getSubTaskBy(SessionSubTask.SUBTASK_NAME);
+ return
DocletContext.getInstance().getSubTaskBy(DocletTask.getSubTaskName(SessionSubTask.class));
}
else {
return null;
@@ -627,7 +628,7 @@
public String concreteFullClassName() throws XDocletException
{
if (SessionTagsHandler.isSession(getCurrentClass())) {
- if
(DocletContext.getInstance().isSubTaskDefined(SessionSubTask.SUBTASK_NAME)) {
+ if
(DocletContext.getInstance().isSubTaskDefined(DocletTask.getSubTaskName(SessionSubTask.class)))
{
return SessionTagsHandler.getSessionClassFor(getCurrentClass());
}
else {
@@ -635,7 +636,7 @@
}
}
else if (BmpTagsHandler.isEntityBmp(getCurrentClass())) {
- if
(DocletContext.getInstance().isSubTaskDefined(EntityBmpSubTask.SUBTASK_NAME)) {
+ if
(DocletContext.getInstance().isSubTaskDefined(DocletTask.getSubTaskName(EntityBmpSubTask.class)))
{
return BmpTagsHandler.getEntityBmpClassFor(getCurrentClass());
}
else {
@@ -643,7 +644,7 @@
}
}
else if (CmpTagsHandler.isEntityCmp(getCurrentClass())) {
- if
(DocletContext.getInstance().isSubTaskDefined(EntityCmpSubTask.SUBTASK_NAME)) {
+ if
(DocletContext.getInstance().isSubTaskDefined(DocletTask.getSubTaskName(EntityCmpSubTask.class)))
{
return CmpTagsHandler.getEntityCmpClassFor(getCurrentClass());
}
else {
@@ -751,22 +752,22 @@
protected String getDependentClassTagName()
{
//it's too much dependency, we should find a better way
- if
(getDocletContext().getActiveSubTask().getSubTaskName().equals(DataObjectSubTask.SUBTASK_NAME))
{
+ if
(getDocletContext().getActiveSubTask().getSubTaskName().equals(DocletTask.getSubTaskName(DataObjectSubTask.class)))
{
return "ejb:data-object";
}
- else if
(getDocletContext().getActiveSubTask().getSubTaskName().equals(EntityBmpSubTask.SUBTASK_NAME)
||
-
getDocletContext().getActiveSubTask().getSubTaskName().equals(EntityBmpSubTask.SUBTASK_NAME))
{
+ else if
(getDocletContext().getActiveSubTask().getSubTaskName().equals(DocletTask.getSubTaskName(EntityBmpSubTask.class))
||
+
getDocletContext().getActiveSubTask().getSubTaskName().equals(DocletTask.getSubTaskName(EntityCmpSubTask.class)))
{
return "ejb:bean";
}
- else if
(getDocletContext().getActiveSubTask().getSubTaskName().equals(RemoteInterfaceSubTask.SUBTASK_NAME)
||
-
getDocletContext().getActiveSubTask().getSubTaskName().equals(LocalInterfaceSubTask.SUBTASK_NAME))
{
+ else if
(getDocletContext().getActiveSubTask().getSubTaskName().equals(DocletTask.getSubTaskName(RemoteInterfaceSubTask.class))
||
+
getDocletContext().getActiveSubTask().getSubTaskName().equals(DocletTask.getSubTaskName(LocalInterfaceSubTask.class)))
{
return "ejb:interface";
}
- else if
(getDocletContext().getActiveSubTask().getSubTaskName().equals(HomeInterfaceSubTask.SUBTASK_NAME)
||
-
getDocletContext().getActiveSubTask().getSubTaskName().equals(LocalHomeInterfaceSubTask.SUBTASK_NAME))
{
+ else if
(getDocletContext().getActiveSubTask().getSubTaskName().equals(DocletTask.getSubTaskName(HomeInterfaceSubTask.class))
||
+
getDocletContext().getActiveSubTask().getSubTaskName().equals(DocletTask.getSubTaskName(LocalHomeInterfaceSubTask.class)))
{
return "ejb:interface";
}
- else if
(getDocletContext().getActiveSubTask().getSubTaskName().equals(EntityPkSubTask.SUBTASK_NAME))
{
+ else if
(getDocletContext().getActiveSubTask().getSubTaskName().equals(DocletTask.getSubTaskName(EntityPkSubTask.class)))
{
return "ejb:pk";
}
else {
_______________________________________________________________
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
