User: rinkrank
Date: 02/05/30 11:39:03
Modified: modules/ejb/src/xdoclet/modules/ejb/entity
BmpTagsHandler.java CmpTagsHandler.java
DaoSubTask.java DaoTagsHandler.java
DataObjectSubTask.java DataObjectTagsHandler.java
EntityBmpSubTask.java EntityCmpSubTask.java
EntityPkSubTask.java PkTagsHandler.java
ValueObjectSubTask.java ValueObjectTagsHandler.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 +5 -4
xdoclet/modules/ejb/src/xdoclet/modules/ejb/entity/BmpTagsHandler.java
Index: BmpTagsHandler.java
===================================================================
RCS file:
/cvsroot/xdoclet/xdoclet/modules/ejb/src/xdoclet/modules/ejb/entity/BmpTagsHandler.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- BmpTagsHandler.java 28 May 2002 21:14:12 -0000 1.2
+++ BmpTagsHandler.java 30 May 2002 18:39:02 -0000 1.3
@@ -10,9 +10,10 @@
import xjavadoc.XJavaDoc;
import xjavadoc.XJavaDocException;
import xjavadoc.XTag;
-
import xdoclet.DocletContext;
import xdoclet.DocletSupport;
+
+import xdoclet.DocletTask;
import xdoclet.XDocletException;
import xdoclet.XDocletTagSupport;
import xdoclet.modules.ejb.EjbTagsHandler;
@@ -24,7 +25,7 @@
* @author Ara Abrahamian ([EMAIL PROTECTED])
* @created Oct 16, 2001
* @xdoclet:taghandler namespace="EjbBmp"
- * @version $Revision: 1.2 $
+ * @version $Revision: 1.3 $
*/
public class BmpTagsHandler extends EntityTagsHandler
{
@@ -42,7 +43,7 @@
String entity_name = MessageFormat.format(getEntityBmpClassPattern(), new
Object[]{EjbTagsHandler.getShortEjbNameFor(clazz)});
// Fix package name
- fileName = choosePackage(fileName, null, EntityBmpSubTask.SUBTASK_NAME);
+ fileName = choosePackage(fileName, null,
DocletTask.getSubTaskName(EntityBmpSubTask.class));
if (fileName.length() > 0) {
fileName += ".";
}
@@ -113,7 +114,7 @@
*/
protected static String getEntityBmpClassPattern()
{
- EntityBmpSubTask entitybmp_subtask = ((EntityBmpSubTask)
DocletContext.getInstance().getSubTaskBy(EntityBmpSubTask.SUBTASK_NAME));
+ EntityBmpSubTask entitybmp_subtask = ((EntityBmpSubTask)
DocletContext.getInstance().getSubTaskBy(DocletTask.getSubTaskName(EntityBmpSubTask.class)));
if (entitybmp_subtask != null) {
return entitybmp_subtask.getEntityBmpClassPattern();
1.3 +6 -5
xdoclet/modules/ejb/src/xdoclet/modules/ejb/entity/CmpTagsHandler.java
Index: CmpTagsHandler.java
===================================================================
RCS file:
/cvsroot/xdoclet/xdoclet/modules/ejb/src/xdoclet/modules/ejb/entity/CmpTagsHandler.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- CmpTagsHandler.java 28 May 2002 21:20:42 -0000 1.2
+++ CmpTagsHandler.java 30 May 2002 18:39:02 -0000 1.3
@@ -13,9 +13,10 @@
import xjavadoc.XJavaDocException;
import xjavadoc.XMethod;
import xjavadoc.XTag;
-
import xdoclet.DocletContext;
import xdoclet.DocletSupport;
+
+import xdoclet.DocletTask;
import xdoclet.XDocletException;
import xdoclet.XDocletTagSupport;
import xdoclet.modules.ejb.EjbDocletTask;
@@ -28,7 +29,7 @@
* @author Ara Abrahamian ([EMAIL PROTECTED])
* @created Oct 16, 2001
* @xdoclet:taghandler namespace="EjbCmp"
- * @version $Revision: 1.2 $
+ * @version $Revision: 1.3 $
*/
public class CmpTagsHandler extends EntityTagsHandler
{
@@ -45,7 +46,7 @@
String entityName = MessageFormat.format(getEntityCmpClassPattern(), new
Object[]{EjbTagsHandler.getShortEjbNameFor(clazz)});
// Fix package name
- fileName = choosePackage(fileName, null, EntityCmpSubTask.SUBTASK_NAME);
+ fileName = choosePackage(fileName, null,
DocletTask.getSubTaskName(EntityCmpSubTask.class));
if (fileName.length() > 0) {
fileName += ".";
}
@@ -135,7 +136,7 @@
);
if (cmp == null) {
- EntityCmpSubTask entityCmpSubtask = ((EntityCmpSubTask)
DocletContext.getInstance().getSubTaskBy(EntityCmpSubTask.SUBTASK_NAME));
+ EntityCmpSubTask entityCmpSubtask = ((EntityCmpSubTask)
DocletContext.getInstance().getSubTaskBy(DocletTask.getSubTaskName(EntityCmpSubTask.class)));
cmp = entityCmpSubtask.getCmpSpec();
}
@@ -150,7 +151,7 @@
*/
protected static String getEntityCmpClassPattern()
{
- EntityCmpSubTask entityCmpSubtask = ((EntityCmpSubTask)
DocletContext.getInstance().getSubTaskBy(EntityCmpSubTask.SUBTASK_NAME));
+ EntityCmpSubTask entityCmpSubtask = ((EntityCmpSubTask)
DocletContext.getInstance().getSubTaskBy(DocletTask.getSubTaskName(EntityCmpSubTask.class)));
if (entityCmpSubtask != null) {
return entityCmpSubtask.getEntityCmpClassPattern();
1.4 +1 -14
xdoclet/modules/ejb/src/xdoclet/modules/ejb/entity/DaoSubTask.java
Index: DaoSubTask.java
===================================================================
RCS file:
/cvsroot/xdoclet/xdoclet/modules/ejb/src/xdoclet/modules/ejb/entity/DaoSubTask.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -w -r1.3 -r1.4
--- DaoSubTask.java 28 May 2002 22:58:07 -0000 1.3
+++ DaoSubTask.java 30 May 2002 18:39:02 -0000 1.4
@@ -25,12 +25,10 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Andrew
Stevens</a>
* @created February 8, 2002
* @xdoclet:subtask display-name="Data Access Object" name="dao"
parent="xdoclet.modules.ejb.EjbDocletTask"
- * @version $Revision: 1.3 $
+ * @version $Revision: 1.4 $
*/
public class DaoSubTask extends AbstractEjbCodeGeneratorSubTask
{
- public final static String SUBTASK_NAME = "dao";
-
public final static String DEFAULT_DAO_CLASS_PATTERN = "{0}DAO";
private static String DEFAULT_TEMPLATE_FILE = "resources/dao.xdt";
@@ -54,17 +52,6 @@
addOfType("javax.ejb.EntityBean");
addOfType("javax.ejb.SessionBean");
setHavingClassTag("ejb:dao");
- }
-
-
- /**
- * Gets the SubTaskName attribute of the DaoSubTask object
- *
- * @return The SubTaskName value
- */
- public String getSubTaskName()
- {
- return SUBTASK_NAME;
}
1.3 +6 -5
xdoclet/modules/ejb/src/xdoclet/modules/ejb/entity/DaoTagsHandler.java
Index: DaoTagsHandler.java
===================================================================
RCS file:
/cvsroot/xdoclet/xdoclet/modules/ejb/src/xdoclet/modules/ejb/entity/DaoTagsHandler.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- DaoTagsHandler.java 28 May 2002 21:24:59 -0000 1.2
+++ DaoTagsHandler.java 30 May 2002 18:39:02 -0000 1.3
@@ -10,8 +10,9 @@
import org.apache.commons.logging.Log;
import xjavadoc.XClass;
-
import xdoclet.DocletContext;
+
+import xdoclet.DocletTask;
import xdoclet.XDocletException;
import xdoclet.XDocletTagSupport;
import xdoclet.modules.ejb.EjbTagsHandler;
@@ -23,7 +24,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Andrew
Stevens</a>
* @created February 8, 2002
* @xdoclet:taghandler namespace="EjbDao"
- * @version $Revision: 1.2 $
+ * @version $Revision: 1.3 $
*/
public class DaoTagsHandler extends EjbTagsHandler
{
@@ -72,7 +73,7 @@
}
// Fix package name
- fileName = choosePackage(fileName, package_pattern,
DaoSubTask.SUBTASK_NAME);
+ fileName = choosePackage(fileName, package_pattern,
DocletTask.getSubTaskName(DaoSubTask.class));
fileName += "." + ejb_name;
return fileName;
@@ -86,7 +87,7 @@
*/
protected static String getDaoClassPattern()
{
- DaoSubTask dao_subtask = ((DaoSubTask)
DocletContext.getInstance().getSubTaskBy(DaoSubTask.SUBTASK_NAME));
+ DaoSubTask dao_subtask = ((DaoSubTask)
DocletContext.getInstance().getSubTaskBy(DocletTask.getSubTaskName(DaoSubTask.class)));
if (dao_subtask != null) {
return dao_subtask.getDaoClassPattern();
@@ -104,7 +105,7 @@
*/
private static boolean isDaoSubTaskActive()
{
- return
DocletContext.getInstance().isSubTaskDefined(DaoSubTask.SUBTASK_NAME);
+ return
DocletContext.getInstance().isSubTaskDefined(DocletTask.getSubTaskName(DaoSubTask.class));
}
/**
1.4 +1 -13
xdoclet/modules/ejb/src/xdoclet/modules/ejb/entity/DataObjectSubTask.java
Index: DataObjectSubTask.java
===================================================================
RCS file:
/cvsroot/xdoclet/xdoclet/modules/ejb/src/xdoclet/modules/ejb/entity/DataObjectSubTask.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -w -r1.3 -r1.4
--- DataObjectSubTask.java 28 May 2002 22:58:07 -0000 1.3
+++ DataObjectSubTask.java 30 May 2002 18:39:02 -0000 1.4
@@ -24,12 +24,10 @@
* @author Ara Abrahamian ([EMAIL PROTECTED])
* @created Oct 15, 2001
* @xdoclet:subtask display-name="Data Object" name="dataobject"
parent="xdoclet.modules.ejb.EjbDocletTask"
- * @version $Revision: 1.3 $
+ * @version $Revision: 1.4 $
*/
public class DataObjectSubTask extends AbstractEjbCodeGeneratorSubTask
{
- public final static String SUBTASK_NAME = "dataobject";
-
public final static String DEFAULT_DATAOBJECT_CLASS_PATTERN = "{0}Data";
protected static String DEFAULT_TEMPLATE_FILE = "resources/dataobject.xdt";
@@ -52,16 +50,6 @@
setTemplateURL(getClass().getResource(DEFAULT_TEMPLATE_FILE));
setDestinationFile(getDataObjectClassPattern() + ".java");
addOfType("javax.ejb.EntityBean");
- }
-
- /**
- * Gets the SubTaskName attribute of the DataObjectSubTask object
- *
- * @return The SubTaskName value
- */
- public String getSubTaskName()
- {
- return SUBTASK_NAME;
}
/**
1.3 +7 -6
xdoclet/modules/ejb/src/xdoclet/modules/ejb/entity/DataObjectTagsHandler.java
Index: DataObjectTagsHandler.java
===================================================================
RCS file:
/cvsroot/xdoclet/xdoclet/modules/ejb/src/xdoclet/modules/ejb/entity/DataObjectTagsHandler.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- DataObjectTagsHandler.java 28 May 2002 21:24:59 -0000 1.2
+++ DataObjectTagsHandler.java 30 May 2002 18:39:02 -0000 1.3
@@ -19,8 +19,9 @@
import xjavadoc.XJavaDoc;
import xjavadoc.XMethod;
import xjavadoc.XParameter;
-
import xdoclet.DocletContext;
+
+import xdoclet.DocletTask;
import xdoclet.XDocletException;
import xdoclet.XDocletTagSupport;
import xdoclet.modules.ejb.EjbTagsHandler;
@@ -37,7 +38,7 @@
* @author Ara Abrahamian ([EMAIL PROTECTED])
* @created Oct 15, 2001
* @xdoclet:taghandler namespace="EjbDataObj"
- * @version $Revision: 1.2 $
+ * @version $Revision: 1.3 $
*/
public class DataObjectTagsHandler extends EjbTagsHandler
{
@@ -146,7 +147,7 @@
}
// Fix package name
- fileName = choosePackage(fileName, package_pattern,
DataObjectSubTask.SUBTASK_NAME);
+ fileName = choosePackage(fileName, package_pattern,
DocletTask.getSubTaskName(DataObjectSubTask.class));
if (fileName.length() > 0) {
fileName += ".";
}
@@ -238,7 +239,7 @@
}
// Fix package name
- fileName = choosePackage(fileName, package_pattern,
DataObjectSubTask.SUBTASK_NAME);
+ fileName = choosePackage(fileName, package_pattern,
DocletTask.getSubTaskName(DataObjectSubTask.class));
fileName += "." + dataobject_name;
return fileName;
@@ -269,7 +270,7 @@
*/
protected static String getDataObjectClassPattern()
{
- final DataObjectSubTask dataobject_subtask = ((DataObjectSubTask)
DocletContext.getInstance().getSubTaskBy(DataObjectSubTask.SUBTASK_NAME));
+ final DataObjectSubTask dataobject_subtask = ((DataObjectSubTask)
DocletContext.getInstance().getSubTaskBy(DocletTask.getSubTaskName(DataObjectSubTask.class)));
if (dataobject_subtask != null) {
return dataobject_subtask.getDataObjectClassPattern();
@@ -318,7 +319,7 @@
*/
private static boolean isDataObjectSubTaskActive()
{
- return
DocletContext.getInstance().isSubTaskDefined(DataObjectSubTask.SUBTASK_NAME);
+ return
DocletContext.getInstance().isSubTaskDefined(DocletTask.getSubTaskName(DataObjectSubTask.class));
}
/**
1.4 +1 -14
xdoclet/modules/ejb/src/xdoclet/modules/ejb/entity/EntityBmpSubTask.java
Index: EntityBmpSubTask.java
===================================================================
RCS file:
/cvsroot/xdoclet/xdoclet/modules/ejb/src/xdoclet/modules/ejb/entity/EntityBmpSubTask.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -w -r1.3 -r1.4
--- EntityBmpSubTask.java 28 May 2002 22:58:07 -0000 1.3
+++ EntityBmpSubTask.java 30 May 2002 18:39:02 -0000 1.4
@@ -24,12 +24,10 @@
* @author Ara Abrahamian ([EMAIL PROTECTED])
* @created Oct 15, 2001
* @xdoclet:subtask display-name="BMP" name="entitybmp"
parent="xdoclet.modules.ejb.EjbDocletTask"
- * @version $Revision: 1.3 $
+ * @version $Revision: 1.4 $
*/
public class EntityBmpSubTask extends AbstractEjbCodeGeneratorSubTask
{
- public final static String SUBTASK_NAME = "entitybmp";
-
public final static String DEFAULT_ENTITYBMP_CLASS_PATTERN = "{0}BMP";
protected static String DEFAULT_TEMPLATE_FILE = "resources/entitybmp.xdt";
@@ -53,17 +51,6 @@
setDestinationFile(getEntityBmpClassPattern() + ".java");
addOfType("javax.ejb.EntityBean");
setPackageSubstitutionInheritanceSupported(false);
- }
-
-
- /**
- * Gets the SubTaskName attribute of the EntityBmpSubTask object
- *
- * @return The SubTaskName value
- */
- public String getSubTaskName()
- {
- return SUBTASK_NAME;
}
1.4 +1 -13
xdoclet/modules/ejb/src/xdoclet/modules/ejb/entity/EntityCmpSubTask.java
Index: EntityCmpSubTask.java
===================================================================
RCS file:
/cvsroot/xdoclet/xdoclet/modules/ejb/src/xdoclet/modules/ejb/entity/EntityCmpSubTask.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -w -r1.3 -r1.4
--- EntityCmpSubTask.java 28 May 2002 22:58:07 -0000 1.3
+++ EntityCmpSubTask.java 30 May 2002 18:39:02 -0000 1.4
@@ -24,12 +24,10 @@
* @author Ara Abrahamian ([EMAIL PROTECTED])
* @created Oct 15, 2001
* @xdoclet:subtask display-name="CMP" name="entitycmp"
parent="xdoclet.modules.ejb.EjbDocletTask"
- * @version $Revision: 1.3 $
+ * @version $Revision: 1.4 $
*/
public class EntityCmpSubTask extends AbstractEjbCodeGeneratorSubTask
{
- public final static String SUBTASK_NAME = "entitycmp";
-
public final static String DEFAULT_ENTITYCMP_CLASS_PATTERN = "{0}CMP";
protected static String DEFAULT_TEMPLATE_FILE = "resources/entitycmp.xdt";
@@ -54,16 +52,6 @@
setDestinationFile(getEntityCmpClassPattern() + ".java");
addOfType("javax.ejb.EntityBean");
setPackageSubstitutionInheritanceSupported(false);
- }
-
- /**
- * Gets the SubTaskName attribute of the EntityCmpSubTask object
- *
- * @return The SubTaskName value
- */
- public String getSubTaskName()
- {
- return SUBTASK_NAME;
}
/**
1.4 +1 -13
xdoclet/modules/ejb/src/xdoclet/modules/ejb/entity/EntityPkSubTask.java
Index: EntityPkSubTask.java
===================================================================
RCS file:
/cvsroot/xdoclet/xdoclet/modules/ejb/src/xdoclet/modules/ejb/entity/EntityPkSubTask.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -w -r1.3 -r1.4
--- EntityPkSubTask.java 28 May 2002 22:58:07 -0000 1.3
+++ EntityPkSubTask.java 30 May 2002 18:39:02 -0000 1.4
@@ -19,12 +19,10 @@
* @author Ara Abrahamian ([EMAIL PROTECTED])
* @created Oct 15, 2001
* @xdoclet:subtask display-name="PK Class" name="entitypk"
parent="xdoclet.modules.ejb.EjbDocletTask"
- * @version $Revision: 1.3 $
+ * @version $Revision: 1.4 $
*/
public class EntityPkSubTask extends AbstractEjbCodeGeneratorSubTask
{
- public final static String SUBTASK_NAME = "entitypk";
-
public final static String DEFAULT_ENTITY_PK_CLASS_PATTERN = "{0}PK";
protected static String DEFAULT_TEMPLATE_FILE = "resources/entitypk.xdt";
@@ -46,16 +44,6 @@
setTemplateURL(getClass().getResource(DEFAULT_TEMPLATE_FILE));
setDestinationFile(getEntityPkClassPattern() + ".java");
addOfType("javax.ejb.EntityBean");
- }
-
- /**
- * Gets the SubTaskName attribute of the EntityPkSubTask object
- *
- * @return The SubTaskName value
- */
- public String getSubTaskName()
- {
- return SUBTASK_NAME;
}
/**
1.3 +4 -3
xdoclet/modules/ejb/src/xdoclet/modules/ejb/entity/PkTagsHandler.java
Index: PkTagsHandler.java
===================================================================
RCS file:
/cvsroot/xdoclet/xdoclet/modules/ejb/src/xdoclet/modules/ejb/entity/PkTagsHandler.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- PkTagsHandler.java 28 May 2002 22:13:49 -0000 1.2
+++ PkTagsHandler.java 30 May 2002 18:39:02 -0000 1.3
@@ -19,6 +19,7 @@
import xjavadoc.XField;
import xjavadoc.XMethod;
import xdoclet.DocletContext;
+import xdoclet.DocletTask;
import xdoclet.XDocletException;
import xdoclet.modules.ejb.EjbTagsHandler;
import xdoclet.modules.ejb.entity.EntityPkSubTask;
@@ -34,7 +35,7 @@
* @author Ara Abrahamian ([EMAIL PROTECTED])
* @created Oct 16, 2001
* @xdoclet:taghandler namespace="EjbPk"
- * @version $Revision: 1.2 $
+ * @version $Revision: 1.3 $
*/
public class PkTagsHandler extends EjbTagsHandler
{
@@ -177,7 +178,7 @@
}
// Fix package name
- fileName = choosePackage(fileName, package_pattern,
EntityPkSubTask.SUBTASK_NAME);
+ fileName = choosePackage(fileName, package_pattern,
DocletTask.getSubTaskName(EntityPkSubTask.class));
if (fileName.length() > 0) {
fileName += ".";
}
@@ -239,7 +240,7 @@
*/
protected static String getEntityPkClassPattern()
{
- EntityPkSubTask entitypk_subtask = ((EntityPkSubTask)
DocletContext.getInstance().getSubTaskBy(EntityPkSubTask.SUBTASK_NAME));
+ EntityPkSubTask entitypk_subtask = ((EntityPkSubTask)
DocletContext.getInstance().getSubTaskBy(DocletTask.getSubTaskName(EntityPkSubTask.class)));
if (entitypk_subtask != null) {
return entitypk_subtask.getEntityPkClassPattern();
1.3 +1 -15
xdoclet/modules/ejb/src/xdoclet/modules/ejb/entity/ValueObjectSubTask.java
Index: ValueObjectSubTask.java
===================================================================
RCS file:
/cvsroot/xdoclet/xdoclet/modules/ejb/src/xdoclet/modules/ejb/entity/ValueObjectSubTask.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- ValueObjectSubTask.java 28 May 2002 22:35:30 -0000 1.2
+++ ValueObjectSubTask.java 30 May 2002 18:39:02 -0000 1.3
@@ -22,12 +22,10 @@
* @author Vincent Harcq ([EMAIL PROTECTED])
* @created Feb 5, 2002
* @xdoclet:subtask display-name="Value Object" name="valueobject"
parent="xdoclet.modules.ejb.EjbDocletTask"
- * @version $Revision: 1.2 $
+ * @version $Revision: 1.3 $
*/
public class ValueObjectSubTask extends AbstractEjbCodeGeneratorSubTask
{
- public final static String SUBTASK_NAME = "valueobject";
-
public final static String DEFAULT_DATAOBJECT_CLASS_PATTERN = "{0}Value";
protected static String DEFAULT_TEMPLATE_FILE = "resources/valueobject.xdt";
@@ -94,18 +92,6 @@
{
return currentValueObjectMatch;
}
-
-
- /**
- * Gets the SubTaskName attribute of the ValueObjectSubTask object
- *
- * @return The SubTaskName value
- */
- public String getSubTaskName()
- {
- return SUBTASK_NAME;
- }
-
/**
* Returns the configuration parameter for specifying the data object class
name pattern. By default the value is
1.3 +6 -4
xdoclet/modules/ejb/src/xdoclet/modules/ejb/entity/ValueObjectTagsHandler.java
Index: ValueObjectTagsHandler.java
===================================================================
RCS file:
/cvsroot/xdoclet/xdoclet/modules/ejb/src/xdoclet/modules/ejb/entity/ValueObjectTagsHandler.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- ValueObjectTagsHandler.java 28 May 2002 22:35:30 -0000 1.2
+++ ValueObjectTagsHandler.java 30 May 2002 18:39:02 -0000 1.3
@@ -25,6 +25,8 @@
import xjavadoc.XMethod;
import xjavadoc.XTag;
import xdoclet.DocletContext;
+
+import xdoclet.DocletTask;
import xdoclet.XDocletException;
import xdoclet.XDocletTagSupport;
import xdoclet.modules.ejb.EjbTagsHandler;
@@ -39,7 +41,7 @@
* @author Vincent Harcq ([EMAIL PROTECTED])
* @created Feb 5, 2002
* @xdoclet:taghandler namespace="EjbValueObj"
- * @version $Revision: 1.2 $
+ * @version $Revision: 1.3 $
*/
public class ValueObjectTagsHandler
extends EjbTagsHandler
@@ -159,7 +161,7 @@
String packageName = clazz.getContainingPackage().getName();
- packageName = choosePackage(packageName, null,
ValueObjectSubTask.SUBTASK_NAME);
+ packageName = choosePackage(packageName, null,
DocletTask.getSubTaskName(ValueObjectSubTask.class));
_currentValueObjectClass = packageName + '.' + _currentValueObjectClass;
@@ -228,7 +230,7 @@
*/
private static ValueObjectSubTask getSubTask()
{
- ValueObjectSubTask subtask = ((ValueObjectSubTask)
DocletContext.getInstance().getSubTaskBy(ValueObjectSubTask.SUBTASK_NAME));
+ ValueObjectSubTask subtask = ((ValueObjectSubTask)
DocletContext.getInstance().getSubTaskBy(DocletTask.getSubTaskName(ValueObjectSubTask.class)));
return subtask;
}
@@ -534,7 +536,7 @@
*/
public void ifUsingValueObject(String template) throws XDocletException
{
- if
(DocletContext.getInstance().isSubTaskDefined(ValueObjectSubTask.SUBTASK_NAME)) {
+ if
(DocletContext.getInstance().isSubTaskDefined(DocletTask.getSubTaskName(ValueObjectSubTask.class)))
{
generate(template);
}
}
_______________________________________________________________
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
