User: ara_e_w
Date: 02/05/26 13:29:53
Modified: modules/ejb/src/xdoclet/modules/ejb/entity Tag:
MODULE_REFACTORING_BRANCH BmpTagsHandler.java
CmpTagsHandler.java DaoSubTask.java
DaoTagsHandler.java DataObjectSubTask.java
DataObjectTagsHandler.java EntityBmpSubTask.java
EntityCmpSubTask.java EntityPkSubTask.java
EntityTagsHandler.java PersistentTagsHandler.java
PkTagsHandler.java ValueObjectSubTask.java
ValueObjectTagsHandler.java
Log:
xjavadoc javabeaninifiction refactoring
Revision Changes Path
No revision
No revision
1.1.2.5 +10 -12
xdoclet/modules/ejb/src/xdoclet/modules/ejb/entity/Attic/BmpTagsHandler.java
Index: BmpTagsHandler.java
===================================================================
RCS file:
/cvsroot/xdoclet/xdoclet/modules/ejb/src/xdoclet/modules/ejb/entity/Attic/BmpTagsHandler.java,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -w -r1.1.2.4 -r1.1.2.5
--- BmpTagsHandler.java 12 May 2002 13:53:28 -0000 1.1.2.4
+++ BmpTagsHandler.java 26 May 2002 20:29:53 -0000 1.1.2.5
@@ -24,7 +24,7 @@
* @author Ara Abrahamian ([EMAIL PROTECTED])
* @created Oct 16, 2001
* @xdoclet:taghandler namespace="EjbBmp"
- * @version $Revision: 1.1.2.4 $
+ * @version $Revision: 1.1.2.5 $
*/
public class BmpTagsHandler extends EntityTagsHandler
{
@@ -38,7 +38,7 @@
*/
public static String getEntityBmpClassFor(XClass clazz) throws XDocletException
{
- String fileName = clazz.containingPackage().name();
+ String fileName = clazz.getContainingPackage().getName();
String entity_name = MessageFormat.format(getEntityBmpClassPattern(), new
Object[]{EjbTagsHandler.getShortEjbNameFor(clazz)});
// Fix package name
@@ -54,8 +54,8 @@
/**
- * Returns true if clazz is an BMP entity bean, false otherwise. Entity type
- * is determined by looking at the ejb:bean's type parameter.
+ * Returns true if clazz is an BMP entity bean, false otherwise. Entity type is
determined by looking at the
+ * ejb:bean's type parameter.
*
* @param clazz Description of Parameter
* @return The EntityBmp value
@@ -67,14 +67,14 @@
return false;
}
- XTag beanTag = clazz.doc().tag("ejb:bean");
+ XTag beanTag = clazz.getDoc().getTag("ejb:bean");
//assume CMP if not specified
if (beanTag == null) {
return false;
}
- String value = beanTag.attributeValue("type");
+ String value = beanTag.getAttributeValue("type");
//assume CMP if not specified
if (value == null) {
@@ -99,7 +99,7 @@
*/
public static boolean useSoftLocking(XClass clazz) throws XDocletException
{
- String soft_locking_str = clazz.doc().tagAttributeValue("ejb:bean",
"use-soft-locking", false);
+ String soft_locking_str = clazz.getDoc().getTagAttributeValue("ejb:bean",
"use-soft-locking", false);
boolean soft_locking = TypeConversionUtil.stringToBoolean(soft_locking_str,
false);
return soft_locking;
@@ -152,8 +152,7 @@
/**
- * Evaluates the body block for each EJBean derived from EntityBean which is
- * BMP.
+ * Evaluates the body block for each EJBean derived from EntityBean which is
BMP.
*
* @param template The body of the block tag
* @exception XDocletException
@@ -163,7 +162,7 @@
public void forAllBmpEntityBeans(String template) throws XDocletException
{
try {
- XClass[] classes = XJavaDoc.getInstance().sourceClasses();
+ XClass[] classes = XJavaDoc.getInstance().getSourceClasses();
for (int i = 0; i < classes.length; i++) {
XDocletTagSupport.setCurrentClass(classes[i]);
@@ -184,8 +183,7 @@
/**
- * Evaluates the body block if ejb:use-soft-locking is set for current
- * class.
+ * Evaluates the body block if ejb:use-soft-locking is set for current class.
*
* @param template The body of the block tag
* @exception XDocletException
1.1.2.7 +12 -12
xdoclet/modules/ejb/src/xdoclet/modules/ejb/entity/Attic/CmpTagsHandler.java
Index: CmpTagsHandler.java
===================================================================
RCS file:
/cvsroot/xdoclet/xdoclet/modules/ejb/src/xdoclet/modules/ejb/entity/Attic/CmpTagsHandler.java,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -w -r1.1.2.6 -r1.1.2.7
--- CmpTagsHandler.java 15 May 2002 16:15:29 -0000 1.1.2.6
+++ CmpTagsHandler.java 26 May 2002 20:29:53 -0000 1.1.2.7
@@ -28,7 +28,7 @@
* @author Ara Abrahamian ([EMAIL PROTECTED])
* @created Oct 16, 2001
* @xdoclet:taghandler namespace="EjbCmp"
- * @version $Revision: 1.1.2.6 $
+ * @version $Revision: 1.1.2.7 $
*/
public class CmpTagsHandler extends EntityTagsHandler
{
@@ -41,7 +41,7 @@
*/
public static String getEntityCmpClassFor(XClass clazz) throws XDocletException
{
- String fileName = clazz.containingPackage().name();
+ String fileName = clazz.getContainingPackage().getName();
String entityName = MessageFormat.format(getEntityCmpClassPattern(), new
Object[]{EjbTagsHandler.getShortEjbNameFor(clazz)});
// Fix package name
@@ -70,14 +70,14 @@
return false;
}
- XTag beanTag = clazz.doc().tag("ejb:bean");
+ XTag beanTag = clazz.getDoc().getTag("ejb:bean");
// assume CMP if not specified
if (beanTag == null) {
return false;
}
- String value = beanTag.attributeValue("type");
+ String value = beanTag.getAttributeValue("type");
// assume CMP if not specified
if (value == null) {
@@ -104,7 +104,7 @@
{
String bmp = getTagValue(
XDocletTagSupport.FOR_CLASS,
- clazz.doc(),
+ clazz.getDoc(),
"ejb:bean",
"type",
"CMP,BMP",
@@ -125,7 +125,7 @@
String cmp = getTagValue(
XDocletTagSupport.FOR_CLASS,
- clazz.doc(),
+ clazz.getDoc(),
"ejb:bean",
"cmp-version",
EntityCmpSubTask.CmpSpecVersion.getVersions(),
@@ -229,7 +229,7 @@
public void forAllCmpEntityBeans(String template) throws XDocletException
{
try {
- XClass[] classes = XJavaDoc.getInstance().sourceClasses();
+ XClass[] classes = XJavaDoc.getInstance().getSourceClasses();
for (int i = 0; i < classes.length; i++) {
XDocletTagSupport.setCurrentClass(classes[i]);
@@ -266,27 +266,27 @@
List already = new ArrayList();
do {
- XMethod[] methods = XDocletTagSupport.getCurrentClass().methods();
+ XMethod[] methods =
XDocletTagSupport.getCurrentClass().getMethods();
XMethod oldCurrentMethod = XDocletTagSupport.getCurrentMethod();
for (int j = 0; j < methods.length; j++) {
XMethod currentMethod = methods[j];
- if (!already.contains(currentMethod.name())) {
+ if (!already.contains(currentMethod.getName())) {
XDocletTagSupport.setCurrentMethod(currentMethod);
- if (PersistentTagsHandler.isPersistentField(currentMethod)
&& MethodTagsHandler.isGetter(currentMethod.name())) {
+ if (PersistentTagsHandler.isPersistentField(currentMethod)
&& MethodTagsHandler.isGetter(currentMethod.getName())) {
generate(template);
}
- already.add(currentMethod.name());
+ already.add(currentMethod.getName());
}
}
XDocletTagSupport.setCurrentMethod(oldCurrentMethod);
// Add super class info
-
XDocletTagSupport.pushCurrentClass(XDocletTagSupport.getCurrentClass().superclass());
+
XDocletTagSupport.pushCurrentClass(XDocletTagSupport.getCurrentClass().getSuperclass());
} while (XDocletTagSupport.getCurrentClass() != null);
XDocletTagSupport.setCurrentClass(oldClass);
1.1.2.10 +5 -5
xdoclet/modules/ejb/src/xdoclet/modules/ejb/entity/Attic/DaoSubTask.java
Index: DaoSubTask.java
===================================================================
RCS file:
/cvsroot/xdoclet/xdoclet/modules/ejb/src/xdoclet/modules/ejb/entity/Attic/DaoSubTask.java,v
retrieving revision 1.1.2.9
retrieving revision 1.1.2.10
diff -u -w -r1.1.2.9 -r1.1.2.10
--- DaoSubTask.java 21 May 2002 19:21:30 -0000 1.1.2.9
+++ DaoSubTask.java 26 May 2002 20:29:53 -0000 1.1.2.10
@@ -25,7 +25,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Andrew
Stevens</a>
* @created February 8, 2002
* @xdoclet:subtask name="dao" parent="xdoclet.modules.ejb.EjbDocletTask"
- * @version $Revision: 1.1.2.9 $
+ * @version $Revision: 1.1.2.10 $
*/
public class DaoSubTask extends AbstractEjbCodeGeneratorSubTask
{
@@ -136,7 +136,7 @@
protected void engineStarted() throws XDocletException
{
System.out.println(Translator.getString("xdoclet.modules.ejb.Messages",
"generating_dao_for",
- new String[]{getCurrentClass().qualifiedName()}));
+ new String[]{getCurrentClass().getQualifiedName()}));
}
/**
@@ -151,14 +151,14 @@
Log log = LogUtil.getLog(DaoSubTask.class, "matchesGenerationRules");
if (super.matchesGenerationRules(clazz) == false) {
- log.debug("Skip bean " + clazz.qualifiedName() + " because
super.matchesGenerationRules() returned false.");
+ log.debug("Skip bean " + clazz.getQualifiedName() + " because
super.matchesGenerationRules() returned false.");
return false;
}
- String generate = clazz.doc().tagAttributeValue("ejb:dao", "generate",
false);
+ String generate = clazz.getDoc().getTagAttributeValue("ejb:dao",
"generate", false);
if ((generate != null) && (generate.equals("false") ||
generate.equals("no"))) {
- log.debug("Skip DAO class for " + clazz.qualifiedName() + " because of
generate=" + generate + " flag.");
+ log.debug("Skip DAO class for " + clazz.getQualifiedName() + " because
of generate=" + generate + " flag.");
return false;
}
1.1.2.4 +11 -16
xdoclet/modules/ejb/src/xdoclet/modules/ejb/entity/Attic/DaoTagsHandler.java
Index: DaoTagsHandler.java
===================================================================
RCS file:
/cvsroot/xdoclet/xdoclet/modules/ejb/src/xdoclet/modules/ejb/entity/Attic/DaoTagsHandler.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -w -r1.1.2.3 -r1.1.2.4
--- DaoTagsHandler.java 12 May 2002 13:53:28 -0000 1.1.2.3
+++ DaoTagsHandler.java 26 May 2002 20:29:53 -0000 1.1.2.4
@@ -20,24 +20,20 @@
import xdoclet.util.LogUtil;
/**
- * @author <a href="mailto:[EMAIL PROTECTED]";>Andrew
- * Stevens</a>
+ * @author <a href="mailto:[EMAIL PROTECTED]";>Andrew
Stevens</a>
* @created February 8, 2002
* @xdoclet:taghandler namespace="EjbDao"
- * @version $Revision: 1.1.2.3 $
+ * @version $Revision: 1.1.2.4 $
*/
public class DaoTagsHandler extends EjbTagsHandler
{
/**
- * Similar to {@link
src.xdoclet.modules.ejb.intf.InterfaceTagsHandler#getComponentInterface}.
- * Relies on the ejb:dao tag, which has the following relevant properties:
- *
+ * Similar to {@link
src.xdoclet.modules.ejb.intf.InterfaceTagsHandler#getComponentInterface}. Relies on
the ejb:dao
+ * tag, which has the following relevant properties:
* <ul>
- * <li> class: The fully qualified name of the DAO class - overrides all
- * set patterns
- * <li> pattern: The pattern to be used to determine the unqualified name
- * of the DAO class
+ * <li> class: The fully qualified name of the DAO class - overrides all set
patterns
+ * <li> pattern: The pattern to be used to determine the unqualified name of
the DAO class
* <li> package: The package the DAO is to be placed in
* </ul>
*
@@ -50,16 +46,16 @@
{
Log log = LogUtil.getLog(DaoTagsHandler.class, "daoClassName");
- String fileName = clazz.containingPackage().name();
+ String fileName = clazz.getContainingPackage().getName();
String dao_pattern = null;
if (log.isDebugEnabled()) {
- log.debug("dao for " + clazz.qualifiedName());
+ log.debug("dao for " + clazz.getQualifiedName());
}
dao_pattern = getDaoClassPattern();
- String daoClass = clazz.doc().tagAttributeValue("ejb:dao", "class", false);
+ String daoClass = clazz.getDoc().getTagAttributeValue("ejb:dao", "class",
false);
if (daoClass != null) {
return daoClass;
@@ -126,8 +122,7 @@
/**
- * Evaluate the body block if ejb:dao tag present and DAO subtask being
- * used.
+ * Evaluate the body block if ejb:dao tag present and DAO subtask being used.
*
* @param template
* @exception XDocletException
@@ -135,7 +130,7 @@
*/
public void ifUsingDao(String template) throws XDocletException
{
- if (isDaoSubTaskActive() && getCurrentClass().doc().hasTag("ejb:dao",
false)) {
+ if (isDaoSubTaskActive() && getCurrentClass().getDoc().hasTag("ejb:dao",
false)) {
generate(template);
}
}
1.1.2.9 +6 -6
xdoclet/modules/ejb/src/xdoclet/modules/ejb/entity/Attic/DataObjectSubTask.java
Index: DataObjectSubTask.java
===================================================================
RCS file:
/cvsroot/xdoclet/xdoclet/modules/ejb/src/xdoclet/modules/ejb/entity/Attic/DataObjectSubTask.java,v
retrieving revision 1.1.2.8
retrieving revision 1.1.2.9
diff -u -w -r1.1.2.8 -r1.1.2.9
--- DataObjectSubTask.java 14 May 2002 20:41:28 -0000 1.1.2.8
+++ DataObjectSubTask.java 26 May 2002 20:29:53 -0000 1.1.2.9
@@ -24,7 +24,7 @@
* @author Ara Abrahamian ([EMAIL PROTECTED])
* @created Oct 15, 2001
* @xdoclet:subtask name="dataobject" parent="xdoclet.modules.ejb.EjbDocletTask"
- * @version $Revision: 1.1.2.8 $
+ * @version $Revision: 1.1.2.9 $
*/
public class DataObjectSubTask extends AbstractEjbCodeGeneratorSubTask
{
@@ -156,15 +156,15 @@
if (DataObjectTagsHandler.hasCustomBulkData(getCurrentClass())) {
// Don't make a new DataObject class; use the custom one instead
- XTag bdo = getCurrentClass().doc().tag("ejb:bulk-data");
- StringTokenizer enum = new StringTokenizer(bdo.value(), " ");
+ XTag bdo = getCurrentClass().getDoc().getTag("ejb:bulk-data");
+ StringTokenizer enum = new StringTokenizer(bdo.getValue(), " ");
DataObjectTagsHandler.setCurrentDataObjectClassname(enum.nextToken().trim());
-
DataObjectTagsHandler.putDataObjectClassnames(getCurrentClass().qualifiedName(),
DataObjectTagsHandler.getCurrentDataObjectClassname());
+
DataObjectTagsHandler.putDataObjectClassnames(getCurrentClass().getQualifiedName(),
DataObjectTagsHandler.getCurrentDataObjectClassname());
}
else {
DataObjectTagsHandler.setCurrentDataObjectClassname(DataObjectTagsHandler.generateDataObjectClass(clazz));
-
DataObjectTagsHandler.putDataObjectClassnames(getCurrentClass().qualifiedName(),
DataObjectTagsHandler.getCurrentDataObjectClassname());
+
DataObjectTagsHandler.putDataObjectClassnames(getCurrentClass().getQualifiedName(),
DataObjectTagsHandler.getCurrentDataObjectClassname());
}
super.generateForClass(clazz);
@@ -178,6 +178,6 @@
protected void engineStarted() throws XDocletException
{
System.out.println(Translator.getString("xdoclet.modules.ejb.Messages",
"generating_dataobject_for",
- new String[]{getCurrentClass().qualifiedName()}));
+ new String[]{getCurrentClass().getQualifiedName()}));
}
}
1.1.2.7 +52 -64
xdoclet/modules/ejb/src/xdoclet/modules/ejb/entity/Attic/DataObjectTagsHandler.java
Index: DataObjectTagsHandler.java
===================================================================
RCS file:
/cvsroot/xdoclet/xdoclet/modules/ejb/src/xdoclet/modules/ejb/entity/Attic/DataObjectTagsHandler.java,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -w -r1.1.2.6 -r1.1.2.7
--- DataObjectTagsHandler.java 13 May 2002 11:19:25 -0000 1.1.2.6
+++ DataObjectTagsHandler.java 26 May 2002 20:29:53 -0000 1.1.2.7
@@ -37,7 +37,7 @@
* @author Ara Abrahamian ([EMAIL PROTECTED])
* @created Oct 15, 2001
* @xdoclet:taghandler namespace="EjbDataObj"
- * @version $Revision: 1.1.2.6 $
+ * @version $Revision: 1.1.2.7 $
*/
public class DataObjectTagsHandler extends EjbTagsHandler
{
@@ -52,7 +52,7 @@
*/
public static String getDataMostSuperObjectClass(XClass clazz) throws
XDocletException
{
- String currentDataClass = (String) dataObjectClassnames.get(clazz.name());
+ String currentDataClass = (String)
dataObjectClassnames.get(clazz.getName());
// Begin at the first super class
XClass cur_clazz = clazz;
@@ -62,11 +62,11 @@
loopa :
do {
// Find if we have an abstract data class definition to generate
- XMethod[] methods = cur_clazz.methods();
+ XMethod[] methods = cur_clazz.getMethods();
boolean found = false;
for (int i = 0; i < methods.length; i++) {
- if (methods[i].name().equals("getData")) {
+ if (methods[i].getName().equals("getData")) {
found = true;
currentDataClass = generateDataObjectClass(cur_clazz);
}
@@ -75,7 +75,7 @@
break loopa;
}
}
- cur_clazz = cur_clazz.superclass();
+ cur_clazz = cur_clazz.getSuperclass();
} while (cur_clazz != null);
if (currentDataClass == null) {
@@ -93,7 +93,7 @@
*/
public static boolean isDataObjectMethod(XMethod method) throws XDocletException
{
- if (EntityTagsHandler.isEntity(method.containingClass()) == false) {
+ if (EntityTagsHandler.isEntity(method.getContainingClass()) == false) {
return false;
}
@@ -114,27 +114,27 @@
*/
public static String getDataObjectClassFor(XClass clazz) throws XDocletException
{
- if (dataObjectClassnames.get(clazz.qualifiedName()) != null) {
- return (String) dataObjectClassnames.get(clazz.qualifiedName());
+ if (dataObjectClassnames.get(clazz.getQualifiedName()) != null) {
+ return (String) dataObjectClassnames.get(clazz.getQualifiedName());
}
- String fileName = clazz.containingPackage().name();
+ String fileName = clazz.getContainingPackage().getName();
String name_pattern = null;
String package_pattern = null;
- String dataObjectClass = clazz.doc().tagAttributeValue("ejb:data-object",
"class", false);
+ String dataObjectClass =
clazz.getDoc().getTagAttributeValue("ejb:data-object", "class", false);
if (dataObjectClass != null) {
return dataObjectClass;
}
- name_pattern = clazz.doc().tagAttributeValue("ejb:data-object", "pattern",
false);
+ name_pattern = clazz.getDoc().getTagAttributeValue("ejb:data-object",
"pattern", false);
if (name_pattern == null) {
name_pattern = getDataObjectClassPattern();
}
- package_pattern = clazz.doc().tagAttributeValue("ejb:data-object",
"package", false);
+ package_pattern = clazz.getDoc().getTagAttributeValue("ejb:data-object",
"package", false);
String dataObjectClass_name = null;
@@ -165,8 +165,7 @@
}
/**
- * Returns true if ejb:data-object defined and generate param is true, false
- * if not true.
+ * Returns true if ejb:data-object defined and generate param is true, false if
not true.
*
* @param clazz Description of Parameter
* @return Description of the Returned Value
@@ -179,8 +178,8 @@
}
// When the tag is there and is set to "false" then return false
- if (clazz.doc().hasTag("ejb:data-object")) {
- String generate_str = clazz.doc().tagAttributeValue("ejb:data-object",
"generate", false);
+ if (clazz.getDoc().hasTag("ejb:data-object")) {
+ String generate_str =
clazz.getDoc().getTagAttributeValue("ejb:data-object", "generate", false);
boolean generate = TypeConversionUtil.stringToBoolean(generate_str,
true);
return generate;
@@ -208,9 +207,8 @@
}
/**
- * Used by dataMostSuperObjectClass() to get the data object's full
- * qualified class name. If name and package parameters of ejb:data-object
- * defined, theire values are used, otherwise defaults are used.
+ * Used by dataMostSuperObjectClass() to get the data object's full qualified
class name. If name and package
+ * parameters of ejb:data-object defined, theire values are used, otherwise
defaults are used.
*
* @param clazz Description of Parameter
* @return Description of the Returned Value
@@ -219,16 +217,16 @@
*/
public static String generateDataObjectClass(XClass clazz) throws
XDocletException
{
- String fileName = clazz.containingPackage().name();
+ String fileName = clazz.getContainingPackage().getName();
String name_pattern = null;
String package_pattern = null;
- name_pattern = clazz.doc().tagAttributeValue("ejb:data-object", "name",
false);
+ name_pattern = clazz.getDoc().getTagAttributeValue("ejb:data-object",
"name", false);
if (name_pattern == null) {
name_pattern = getDataObjectClassPattern();
}
- package_pattern = clazz.doc().tagAttributeValue("ejb:data-object",
"package", false);
+ package_pattern = clazz.getDoc().getTagAttributeValue("ejb:data-object",
"package", false);
String dataobject_name = null;
@@ -263,7 +261,7 @@
return false;
}
- return clazz.doc().hasTag("ejb:bulk-data");
+ return clazz.getDoc().hasTag("ejb:bulk-data");
}
/**
@@ -283,8 +281,8 @@
/**
* @param clazz
- * @return True if there is a Data Container equals()
- * needed because user set tag "data-equals" to true or ommitted it
+ * @return True if there is a Data Container equals()
needed because user set tag "data-equals"
+ * to true or ommitted it
* @exception XDocletException
*/
protected static boolean hasDataEquals(XClass clazz) throws XDocletException
@@ -292,7 +290,7 @@
Log log = LogUtil.getLog(DataObjectSubTask.class, "hasDataEquals");
if (log.isDebugEnabled()) {
- log.debug("Searching @ejb:data-object equals for Class " +
clazz.qualifiedName());
+ log.debug("Searching @ejb:data-object equals for Class " +
clazz.getQualifiedName());
}
if (isDataObjectSubTaskActive() == false) {
@@ -301,7 +299,7 @@
String value = getTagValue(
FOR_CLASS,
- clazz.doc(),
+ clazz.getDoc(),
"ejb:data-object",
"equals",
"true,false",
@@ -314,8 +312,7 @@
}
/**
- * Gets the DataObjectSubTaskActive attribute of the DataObjectTagsHandler
- * class
+ * Gets the DataObjectSubTaskActive attribute of the DataObjectTagsHandler class
*
* @return The DataObjectSubTaskActive value
*/
@@ -337,7 +334,7 @@
return false;
}
- return method.isAbstract() && method.equals("getData") &&
DataObjectTagsHandler.getDataMostSuperObjectClass(method.containingClass()).equals(method.returnType());
+ return method.isAbstract() && method.equals("getData") &&
DataObjectTagsHandler.getDataMostSuperObjectClass(method.getContainingClass()).equals(method.getReturnType());
}
/**
@@ -354,10 +351,10 @@
}
if (method.isAbstract() && method.equals("setData")) {
- XParameter[] params = method.parameters();
+ XParameter[] params = method.getParameters();
if (params.length == 1 &&
-
params[0].type().qualifiedName().equals(DataObjectTagsHandler.getDataObjectClassFor(method.containingClass()))
+
params[0].getType().getQualifiedName().equals(DataObjectTagsHandler.getDataObjectClassFor(method.getContainingClass()))
) {
return true;
}
@@ -371,8 +368,7 @@
}
/**
- * Returns true if ejb:data-object defined and setdata param is true, false
- * if not true.
+ * Returns true if ejb:data-object defined and setdata param is true, false if
not true.
*
* @param clazz
* @return Description of the Returned Value
@@ -386,7 +382,7 @@
String value = getTagValue(
FOR_CLASS,
- clazz.doc(),
+ clazz.getDoc(),
"ejb:data-object",
"setdata",
"true,false",
@@ -424,14 +420,11 @@
}
/**
- * Returns the data-object class name highest in the hierarchy of derived
- * beans. Because of possible inheritance between entity bean, the type of
- * the generated getData method must be the one of the most super class of
- * the current entity bean. The current Data class must extend the
- * corresponding super Data class.
+ * Returns the data-object class name highest in the hierarchy of derived
beans. Because of possible inheritance
+ * between entity bean, the type of the generated getData method must be the
one of the most super class of the
+ * current entity bean. The current Data class must extend the corresponding
super Data class.
*
- * @return The data-object class name highest in the
- * hierarchy of derived beans.
+ * @return The data-object class name highest in the
hierarchy of derived beans.
* @exception XDocletException
* @doc:tag type="content"
*/
@@ -451,8 +444,7 @@
}
/**
- * Evaluate the body block if ejb:data-object setdata="true". If not defined
- * then default is true.
+ * Evaluate the body block if ejb:data-object setdata="true". If not defined
then default is true.
*
* @param pTemplate Description of Parameter
* @exception XDocletException
@@ -467,8 +459,7 @@
}
/**
- * Evaluate the body block if ejb:data-object container="true". If not
- * defined then default is true.
+ * Evaluate the body block if ejb:data-object container="true". If not defined
then default is true.
*
* @param pTemplate Description of Parameter
* @exception XDocletException
@@ -484,7 +475,7 @@
else {
String hasClass = getTagValue(
FOR_CLASS,
- getCurrentClass().doc(),
+ getCurrentClass().getDoc(),
"ejb:data-object",
"class",
null,
@@ -500,9 +491,8 @@
}
/**
- * Evaluate the body block if ejb:aggregate is defined for current getter
- * method, denoting that the specified getter method returns an aggregated
- * object.
+ * Evaluate the body block if ejb:aggregate is defined for current getter
method, denoting that the specified getter
+ * method returns an aggregated object.
*
* @param template The body of the block tag
* @exception XDocletException
@@ -518,8 +508,7 @@
}
/**
- * Evaluate the body block if ejb:aggregate is not defined for current
- * getter method.
+ * Evaluate the body block if ejb:aggregate is not defined for current getter
method.
*
* @param template The body of the block tag
* @exception XDocletException
@@ -556,17 +545,17 @@
Log log = LogUtil.getLog(DataObjectSubTask.class, "parentDataObjectClass");
if (log.isDebugEnabled()) {
- log.debug("Searching for @ejb:data-object in Current/Super Class " +
getCurrentClass().name());
+ log.debug("Searching for @ejb:data-object in Current/Super Class " +
getCurrentClass().getName());
}
- if (getCurrentClass().doc().hasTag("ejb:data-object", false)) {
- String extends_class =
getCurrentClass().doc().tagAttributeValue("ejb:data-object", "extends", false);
+ if (getCurrentClass().getDoc().hasTag("ejb:data-object", false)) {
+ String extends_class =
getCurrentClass().getDoc().getTagAttributeValue("ejb:data-object", "extends", false);
return extends_class != null ? extends_class : "java.lang.Object";
}
- if (getCurrentClass().superclass() != null &&
isEjb(getCurrentClass().superclass())) {
- pushCurrentClass(getCurrentClass().superclass());
+ if (getCurrentClass().getSuperclass() != null &&
isEjb(getCurrentClass().getSuperclass())) {
+ pushCurrentClass(getCurrentClass().getSuperclass());
String clazz = dataObjectClass();
@@ -627,7 +616,7 @@
if (return_type == null) {
throw new
XDocletException(Translator.getString("xdoclet.modules.ejb.Messages",
- "interface_not_found", new String[]{getCurrentMethod().name()}));
+ "interface_not_found", new String[]{getCurrentMethod().getName()}));
}
String bean_class_name =
InterfaceTagsHandler.getBeanClassNameFromInterfaceNameFor(return_type);
@@ -667,7 +656,7 @@
return false;
}
- return method.doc().hasTag("ejb:aggregate");
+ return method.getDoc().hasTag("ejb:aggregate");
}
/**
@@ -684,8 +673,7 @@
}
/**
- * Browse all super classes and search for a special method to generate it
- * in the current CMP/BMP class.
+ * Browse all super classes and search for a special method to generate it in
the current CMP/BMP class.
*
* @param template The body of the block tag
* @param methodName Description of Parameter
@@ -701,11 +689,11 @@
do {
// Find if we have an abstract data class definition to generate
- XMethod[] methods = getCurrentClass().methods();
+ XMethod[] methods = getCurrentClass().getMethods();
XMethod methodFound = null;
for (int i = 0; i < methods.length; i++) {
- if (methods[i].name().equals(methodName)) {
+ if (methods[i].getName().equals(methodName)) {
methodFound = methods[i];
}
@@ -736,7 +724,7 @@
}
}
- pushCurrentClass(getCurrentClass().superclass());
+ pushCurrentClass(getCurrentClass().getSuperclass());
} while (getCurrentClass() != null);
setCurrentClass(oldClass);
1.1.2.9 +7 -7
xdoclet/modules/ejb/src/xdoclet/modules/ejb/entity/Attic/EntityBmpSubTask.java
Index: EntityBmpSubTask.java
===================================================================
RCS file:
/cvsroot/xdoclet/xdoclet/modules/ejb/src/xdoclet/modules/ejb/entity/Attic/EntityBmpSubTask.java,v
retrieving revision 1.1.2.8
retrieving revision 1.1.2.9
diff -u -w -r1.1.2.8 -r1.1.2.9
--- EntityBmpSubTask.java 14 May 2002 20:41:28 -0000 1.1.2.8
+++ EntityBmpSubTask.java 26 May 2002 20:29:53 -0000 1.1.2.9
@@ -24,7 +24,7 @@
* @author Ara Abrahamian ([EMAIL PROTECTED])
* @created Oct 15, 2001
* @xdoclet:subtask name="entitybmp" parent="xdoclet.modules.ejb.EjbDocletTask"
- * @version $Revision: 1.1.2.8 $
+ * @version $Revision: 1.1.2.9 $
*/
public class EntityBmpSubTask extends AbstractEjbCodeGeneratorSubTask
{
@@ -142,19 +142,19 @@
Log log = LogUtil.getLog(EntityBmpSubTask.class, "matchesGenerationRules");
if (super.matchesGenerationRules(clazz) == false) {
- log.debug("Skip bean " + clazz.qualifiedName() + " because
super.matchesGenerationRules() returned false.");
+ log.debug("Skip bean " + clazz.getQualifiedName() + " because
super.matchesGenerationRules() returned false.");
return false;
}
if (!BmpTagsHandler.isEntityBmp(getCurrentClass())) {
- log.debug("Skip bean " + clazz.qualifiedName() + " because of it's not
BMP.");
+ log.debug("Skip bean " + clazz.getQualifiedName() + " because of it's
not BMP.");
return false;
}
- String generate = clazz.doc().tagAttributeValue("ejb:bean", "generate",
false);
+ String generate = clazz.getDoc().getTagAttributeValue("ejb:bean",
"generate", false);
if ((generate != null) && (generate.equals("false") ||
generate.equals("no"))) {
- log.debug("Skip entity bmp class for " + clazz.qualifiedName() + "
because of generate=" + generate + " flag.");
+ log.debug("Skip entity bmp class for " + clazz.getQualifiedName() + "
because of generate=" + generate + " flag.");
return false;
}
@@ -162,7 +162,7 @@
return true;
}
else {
- log.debug("Skip bean " + clazz.qualifiedName() + " because it's not a
concrete bean.");
+ log.debug("Skip bean " + clazz.getQualifiedName() + " because it's not
a concrete bean.");
return false;
}
}
@@ -176,7 +176,7 @@
protected void engineStarted() throws XDocletException
{
System.out.println(Translator.getString("xdoclet.modules.ejb.Messages",
"generating_bmp_for",
- new String[]{getCurrentClass().qualifiedName()}));
+ new String[]{getCurrentClass().getQualifiedName()}));
}
}
1.1.2.10 +7 -7
xdoclet/modules/ejb/src/xdoclet/modules/ejb/entity/Attic/EntityCmpSubTask.java
Index: EntityCmpSubTask.java
===================================================================
RCS file:
/cvsroot/xdoclet/xdoclet/modules/ejb/src/xdoclet/modules/ejb/entity/Attic/EntityCmpSubTask.java,v
retrieving revision 1.1.2.9
retrieving revision 1.1.2.10
diff -u -w -r1.1.2.9 -r1.1.2.10
--- EntityCmpSubTask.java 15 May 2002 19:19:27 -0000 1.1.2.9
+++ EntityCmpSubTask.java 26 May 2002 20:29:53 -0000 1.1.2.10
@@ -24,7 +24,7 @@
* @author Ara Abrahamian ([EMAIL PROTECTED])
* @created Oct 15, 2001
* @xdoclet:subtask name="entitycmp" parent="xdoclet.modules.ejb.EjbDocletTask"
- * @version $Revision: 1.1.2.9 $
+ * @version $Revision: 1.1.2.10 $
*/
public class EntityCmpSubTask extends AbstractEjbCodeGeneratorSubTask
{
@@ -157,19 +157,19 @@
Log log = LogUtil.getLog(EntityCmpSubTask.class, "matchesGenerationRules");
if (super.matchesGenerationRules(clazz) == false) {
- log.debug("Skip bean " + clazz.qualifiedName() + " because
super.matchesGenerationRules() returned false.");
+ log.debug("Skip bean " + clazz.getQualifiedName() + " because
super.matchesGenerationRules() returned false.");
return false;
}
if (CmpTagsHandler.isEntityCmp(getCurrentClass()) == false) {
- log.debug("Skip bean " + clazz.qualifiedName() + " because of it's not
BMP.");
+ log.debug("Skip bean " + clazz.getQualifiedName() + " because of it's
not BMP.");
return false;
}
- String generate = clazz.doc().tagAttributeValue("ejb:bean", "generate",
false);
+ String generate = clazz.getDoc().getTagAttributeValue("ejb:bean",
"generate", false);
if ((generate != null) && (generate.equals("false") ||
generate.equals("no"))) {
- log.debug("Skip entity cmp class for " + clazz.qualifiedName() + "
because of generate=" + generate + " flag.");
+ log.debug("Skip entity cmp class for " + clazz.getQualifiedName() + "
because of generate=" + generate + " flag.");
return false;
}
@@ -177,7 +177,7 @@
return true;
}
else {
- log.debug("Skip bean " + clazz.qualifiedName() + " because it's not a
concrete bean.");
+ log.debug("Skip bean " + clazz.getQualifiedName() + " because it's not
a concrete bean.");
return false;
}
}
@@ -190,7 +190,7 @@
protected void engineStarted() throws XDocletException
{
System.out.println(Translator.getString("xdoclet.modules.ejb.Messages",
"generating_cmp_for",
- new String[]{getCurrentClass().qualifiedName()}));
+ new String[]{getCurrentClass().getQualifiedName()}));
}
1.1.2.10 +5 -5
xdoclet/modules/ejb/src/xdoclet/modules/ejb/entity/Attic/EntityPkSubTask.java
Index: EntityPkSubTask.java
===================================================================
RCS file:
/cvsroot/xdoclet/xdoclet/modules/ejb/src/xdoclet/modules/ejb/entity/Attic/EntityPkSubTask.java,v
retrieving revision 1.1.2.9
retrieving revision 1.1.2.10
diff -u -w -r1.1.2.9 -r1.1.2.10
--- EntityPkSubTask.java 15 May 2002 19:19:27 -0000 1.1.2.9
+++ EntityPkSubTask.java 26 May 2002 20:29:53 -0000 1.1.2.10
@@ -19,7 +19,7 @@
* @author Ara Abrahamian ([EMAIL PROTECTED])
* @created Oct 15, 2001
* @xdoclet:subtask name="entitypk" parent="xdoclet.modules.ejb.EjbDocletTask"
- * @version $Revision: 1.1.2.9 $
+ * @version $Revision: 1.1.2.10 $
*/
public class EntityPkSubTask extends AbstractEjbCodeGeneratorSubTask
{
@@ -136,13 +136,13 @@
log.debug("clazz=" + clazz);
}
- if ("false".equalsIgnoreCase(clazz.doc().tagAttributeValue("ejb:pk",
"generate", false))) {
- log.debug("Skip primary key for " + clazz.qualifiedName() + " because
of false generate flag");
+ if ("false".equalsIgnoreCase(clazz.getDoc().getTagAttributeValue("ejb:pk",
"generate", false))) {
+ log.debug("Skip primary key for " + clazz.getQualifiedName() + "
because of false generate flag");
return false;
}
if (PkTagsHandler.classHasPrimkeyField(clazz)) {
- log.debug("Skip primary key for " + clazz.qualifiedName() + " because
it has a PK Field.");
+ log.debug("Skip primary key for " + clazz.getQualifiedName() + "
because it has a PK Field.");
return false;
}
@@ -157,7 +157,7 @@
protected void engineStarted() throws XDocletException
{
System.out.println(Translator.getString("xdoclet.modules.ejb.Messages",
"generating_pk_for",
- new String[]{getCurrentClass().qualifiedName()}));
+ new String[]{getCurrentClass().getQualifiedName()}));
}
}
1.1.2.5 +4 -4
xdoclet/modules/ejb/src/xdoclet/modules/ejb/entity/Attic/EntityTagsHandler.java
Index: EntityTagsHandler.java
===================================================================
RCS file:
/cvsroot/xdoclet/xdoclet/modules/ejb/src/xdoclet/modules/ejb/entity/Attic/EntityTagsHandler.java,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -w -r1.1.2.4 -r1.1.2.5
--- EntityTagsHandler.java 12 May 2002 13:53:28 -0000 1.1.2.4
+++ EntityTagsHandler.java 26 May 2002 20:29:53 -0000 1.1.2.5
@@ -23,7 +23,7 @@
* @author Ara Abrahamian ([EMAIL PROTECTED])
* @created Oct 16, 2001
* @xdoclet:taghandler namespace="EjbEntity"
- * @version $Revision: 1.1.2.4 $
+ * @version $Revision: 1.1.2.5 $
*/
public class EntityTagsHandler extends EjbTagsHandler
{
@@ -88,7 +88,7 @@
public void forAllEntityBeans(String template) throws XDocletException
{
try {
- XClass[] classes = XJavaDoc.getInstance().sourceClasses();
+ XClass[] classes = XJavaDoc.getInstance().getSourceClasses();
for (int i = 0; i < classes.length; i++) {
setCurrentClass(classes[i]);
@@ -109,8 +109,8 @@
/**
- * Returns True if ejb:bean reentrant is true, False otherwise. It does the
- * case conversion trick from true to True and false to False.
+ * Returns True if ejb:bean reentrant is true, False otherwise. It does the
case conversion trick from true to True
+ * and false to False.
*
* @return Description of the Returned Value
* @exception XDocletException
1.1.2.6 +40 -40
xdoclet/modules/ejb/src/xdoclet/modules/ejb/entity/Attic/PersistentTagsHandler.java
Index: PersistentTagsHandler.java
===================================================================
RCS file:
/cvsroot/xdoclet/xdoclet/modules/ejb/src/xdoclet/modules/ejb/entity/Attic/PersistentTagsHandler.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -w -r1.1.2.5 -r1.1.2.6
--- PersistentTagsHandler.java 22 May 2002 20:36:17 -0000 1.1.2.5
+++ PersistentTagsHandler.java 26 May 2002 20:29:53 -0000 1.1.2.6
@@ -27,7 +27,7 @@
* @author Ara Abrahamian ([EMAIL PROTECTED])
* @created Oct 16, 2001
* @xdoclet:taghandler namespace="EjbPersistent"
- * @version $Revision: 1.1.2.5 $
+ * @version $Revision: 1.1.2.6 $
*/
public class PersistentTagsHandler extends CmpTagsHandler
{
@@ -42,7 +42,7 @@
*/
public static boolean isPersistentField(XMethod method) throws XDocletException
{
- return method.doc().hasTag("ejb:persistent-field");
+ return method.getDoc().hasTag("ejb:persistent-field");
}
@@ -58,11 +58,11 @@
public static boolean isValueObjectField(XClass clazz, XMethod method, String
valueObject) throws XDocletException
{
Log log = LogUtil.getLog(PersistentTagsHandler.class, "valueobject");
- boolean ret = method.doc().hasTag("ejb:value-object");
+ boolean ret = method.getDoc().hasTag("ejb:value-object");
log.debug("hasTag " + ret);
if (ret) {
- XTag[] tags = method.doc().tags("ejb:value-object");
+ XTag[] tags = method.getDoc().getTags("ejb:value-object");
if (tags.length == 0 && !"*".equals(valueObject)) {
ret = false;
@@ -73,9 +73,9 @@
boolean excluded = true;
for (int i = 0; i < tags.length; i++) {
- String exclude = tags[i].attributeValue("exclude");
- String aggreg = tags[i].attributeValue("aggregate");
- String comp = tags[i].attributeValue("compose");
+ String exclude = tags[i].getAttributeValue("exclude");
+ String aggreg = tags[i].getAttributeValue("aggregate");
+ String comp = tags[i].getAttributeValue("compose");
if ("true".equals(exclude) || aggreg != null || comp != null) {
excluded = true;
@@ -83,9 +83,9 @@
break;
}
- String value = tags[i].attributeValue("match");
+ String value = tags[i].getAttributeValue("match");
- log.debug(method.name() + " " + value + "==" + valueObject);
+ log.debug(method.getName() + " " + value + "==" + valueObject);
if (value.equals(valueObject) || value.equals("*") ||
"*".equals(valueObject)) {
ret = true;
break;
@@ -97,7 +97,7 @@
}
}
else if ("*".equals(valueObject)) {
- log.debug("All Fields VO " + method.name() + " " +
isPersistentField(method));
+ log.debug("All Fields VO " + method.getName() + " " +
isPersistentField(method));
if (isPersistentField(method)) {
ret = true;
}
@@ -119,7 +119,7 @@
*/
public static boolean isPkField(XMethod method) throws XDocletException
{
- return method.doc().hasTag("ejb:pk-field");
+ return method.getDoc().hasTag("ejb:pk-field");
}
/**
@@ -131,7 +131,7 @@
*/
public static boolean isPkFieldInHeader(XClass clazz) throws XDocletException
{
- return clazz.doc().hasTag("ejb:pk-field");
+ return clazz.getDoc().hasTag("ejb:pk-field");
}
/**
@@ -168,22 +168,22 @@
String name = null;
//do {
- XMethod[] methods = clazz.methods();
+ XMethod[] methods = clazz.getMethods();
for (int j = 0; j < methods.length; j++) {
- if ((isPersistentField(methods[j]) &&
MethodTagsHandler.isGetter(methods[j].name()) &&
!foundFields.containsKey(methods[j].name()) && (valueObject == null ||
isValueObjectField(clazz, methods[j], valueObject)))
- || (MethodTagsHandler.isGetter(methods[j].name()) &&
!foundFields.containsKey(methods[j].name()) && valueObject != null &&
isValueObjectField(clazz, methods[j], valueObject))) {
+ if ((isPersistentField(methods[j]) &&
MethodTagsHandler.isGetter(methods[j].getName()) &&
!foundFields.containsKey(methods[j].getName()) && (valueObject == null ||
isValueObjectField(clazz, methods[j], valueObject)))
+ || (MethodTagsHandler.isGetter(methods[j].getName()) &&
!foundFields.containsKey(methods[j].getName()) && valueObject != null &&
isValueObjectField(clazz, methods[j], valueObject))) {
if ((inclTag == null && exclTag == null)
- || ((inclTag != null) && (methods[j].doc().hasTag(inclTag)))
- || ((exclTag != null) && (!methods[j].doc().hasTag(exclTag)))) {
+ || ((inclTag != null) && (methods[j].getDoc().hasTag(inclTag)))
+ || ((exclTag != null) &&
(!methods[j].getDoc().hasTag(exclTag)))) {
// Store that we found this field so we don't add it twice
- foundFields.put(methods[j].name(), methods[j]);
+ foundFields.put(methods[j].getName(), methods[j]);
name = MethodTagsHandler.getPropertyNameFor(methods[j]);
- String methodDimension = methods[j].returnDimensionAsString();
+ String methodDimension =
methods[j].getReturnDimensionAsString();
- methodType = methods[j].returnType().qualifiedName();
+ methodType = methods[j].getReturnType().getQualifiedName();
switch (type) {
case 0:
@@ -206,7 +206,7 @@
if (foundFields.size() > 1) {
st.append(',');
}
- st.append(methods[j].name()).append("()");
+ st.append(methods[j].getName()).append("()");
break;
}
}
@@ -232,17 +232,17 @@
XClass clazz = getCurrentClass();
do {
- XMethod[] methods = clazz.methods();
+ XMethod[] methods = clazz.getMethods();
for (int j = 0; j < methods.length; j++) {
- if (isPkField(methods[j]) &&
MethodTagsHandler.isGetter(methods[j].name())) {
+ if (isPkField(methods[j]) &&
MethodTagsHandler.isGetter(methods[j].getName())) {
generate(template);
return;
}
}
// Add super class info
- clazz = clazz.superclass();
+ clazz = clazz.getSuperclass();
} while (clazz != null);
}
@@ -259,17 +259,17 @@
XClass clazz = getCurrentClass();
do {
- XMethod[] methods = clazz.methods();
+ XMethod[] methods = clazz.getMethods();
for (int j = 0; j < methods.length; j++) {
- if (isPersistentField(methods[j]) &&
MethodTagsHandler.isGetter(methods[j].name())) {
+ if (isPersistentField(methods[j]) &&
MethodTagsHandler.isGetter(methods[j].getName())) {
generate(template);
return;
}
}
// Add super class info
- clazz = clazz.superclass();
+ clazz = clazz.getSuperclass();
} while (clazz != null);
}
@@ -381,10 +381,10 @@
protected String[] getPkFieldsInHeader() throws XDocletException
{
ArrayList lPKs = new ArrayList();
- XTag[] lTags = getCurrentClass().doc().tags("ejb:pk-field");
+ XTag[] lTags = getCurrentClass().getDoc().getTags("ejb:pk-field");
for (int i = 0; i < lTags.length; i++) {
- lPKs.add(lTags[i].value());
+ lPKs.add(lTags[i].getValue());
}
return (String[]) lPKs.toArray(new String[0]);
@@ -421,22 +421,22 @@
log.debug("getCurrentClass()=" + getCurrentClass());
}
- XMethod[] methods = getCurrentClass().methods();
+ XMethod[] methods = getCurrentClass().getMethods();
for (int j = 0; j < methods.length; j++) {
setCurrentMethod(methods[j]);
- if ((isPersistentField(getCurrentMethod()) &&
MethodTagsHandler.isGetter(getCurrentMethod().name()) &&
!foundFields.containsKey(getCurrentMethod().name()) && (valueObject == null ||
isValueObjectField(getCurrentClass(), getCurrentMethod(), valueObject)))
- || (MethodTagsHandler.isGetter(getCurrentMethod().name()) &&
!foundFields.containsKey(getCurrentMethod().name()) && valueObject != null &&
isValueObjectField(getCurrentClass(), getCurrentMethod(), valueObject))) {
+ if ((isPersistentField(getCurrentMethod()) &&
MethodTagsHandler.isGetter(getCurrentMethod().getName()) &&
!foundFields.containsKey(getCurrentMethod().getName()) && (valueObject == null ||
isValueObjectField(getCurrentClass(), getCurrentMethod(), valueObject)))
+ || (MethodTagsHandler.isGetter(getCurrentMethod().getName()) &&
!foundFields.containsKey(getCurrentMethod().getName()) && valueObject != null &&
isValueObjectField(getCurrentClass(), getCurrentMethod(), valueObject))) {
if ((include_tags == null && exclude_tags == null)
- || ((include_tags != null) &&
(getCurrentMethod().doc().hasTag(include_tags)))
- || ((exclude_tags != null) &&
(!getCurrentMethod().doc().hasTag(exclude_tags)))) {
+ || ((include_tags != null) &&
(getCurrentMethod().getDoc().hasTag(include_tags)))
+ || ((exclude_tags != null) &&
(!getCurrentMethod().getDoc().hasTag(exclude_tags)))) {
if (log.isDebugEnabled()) {
- log.debug("METHOD(I=" + include_tags + " - E=" +
exclude_tags + "=" + getCurrentMethod().name());
+ log.debug("METHOD(I=" + include_tags + " - E=" +
exclude_tags + "=" + getCurrentMethod().getName());
}
// Store that we found this field so we don't add it twice
- foundFields.put(getCurrentMethod().name(),
getCurrentMethod().name());
+ foundFields.put(getCurrentMethod().getName(),
getCurrentMethod().getName());
generate(template);
}
@@ -444,7 +444,7 @@
}
// Add super class info
- if
(getCurrentClass().superclass().qualifiedName().equals("java.lang.Object")) {
+ if
(getCurrentClass().getSuperclass().getQualifiedName().equals("java.lang.Object")) {
popCurrentClass();
break;
}
@@ -453,11 +453,11 @@
//superclasses is true for *CMP/BMP/Session
if (superclasses == true) {
- cur_class = cur_class.superclass();
+ cur_class = cur_class.getSuperclass();
}
else {
- if
(shouldTraverseSuperclassForDependentClass(cur_class.superclass(),
getDependentClassTagName())) {
- cur_class = cur_class.superclass();
+ if
(shouldTraverseSuperclassForDependentClass(cur_class.getSuperclass(),
getDependentClassTagName())) {
+ cur_class = cur_class.getSuperclass();
}
else {
break;
1.1.2.6 +9 -9
xdoclet/modules/ejb/src/xdoclet/modules/ejb/entity/Attic/PkTagsHandler.java
Index: PkTagsHandler.java
===================================================================
RCS file:
/cvsroot/xdoclet/xdoclet/modules/ejb/src/xdoclet/modules/ejb/entity/Attic/PkTagsHandler.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -w -r1.1.2.5 -r1.1.2.6
--- PkTagsHandler.java 24 May 2002 20:07:53 -0000 1.1.2.5
+++ PkTagsHandler.java 26 May 2002 20:29:53 -0000 1.1.2.6
@@ -34,7 +34,7 @@
* @author Ara Abrahamian ([EMAIL PROTECTED])
* @created Oct 16, 2001
* @xdoclet:taghandler namespace="EjbPk"
- * @version $Revision: 1.1.2.5 $
+ * @version $Revision: 1.1.2.6 $
*/
public class PkTagsHandler extends EjbTagsHandler
{
@@ -47,7 +47,7 @@
*/
public static String getPrimkeyFieldFor(XClass clazz) throws XDocletException
{
- String pkField = clazz.doc().tagAttributeValue("ejb:bean", "primkey-field",
false);
+ String pkField = clazz.getDoc().getTagAttributeValue("ejb:bean",
"primkey-field", false);
return pkField;
}
@@ -148,24 +148,24 @@
throw new XDocletException("Could not find method " + getter + "
that is supposed to return the PrimKeyField.");
}
- return method.returnType().toString();
+ return method.getReturnType().toString();
}
- String fileName = clazz.containingPackage().name();
+ String fileName = clazz.getContainingPackage().getName();
- String pkClass = clazz.doc().tagAttributeValue("ejb:pk", "class", false);
+ String pkClass = clazz.getDoc().getTagAttributeValue("ejb:pk", "class",
false);
if (pkClass != null) {
return pkClass;
}
- String name_pattern = clazz.doc().tagAttributeValue("ejb:pk", "pattern",
false);
+ String name_pattern = clazz.getDoc().getTagAttributeValue("ejb:pk",
"pattern", false);
if (name_pattern == null) {
name_pattern = getEntityPkClassPattern();
}
- String package_pattern = clazz.doc().tagAttributeValue("ejb:pk", "package",
false);
+ String package_pattern = clazz.getDoc().getTagAttributeValue("ejb:pk",
"package", false);
String pkclass_name = null;
@@ -198,9 +198,9 @@
public static String getPkClassForEjbJarXmlFor(XClass clazz) throws
XDocletException
{
XMethod create_method = HomeTagsHandler.findFirstCreateMethodFor(clazz);
- String create_method_return_type = create_method != null ?
create_method.returnType().qualifiedName() : null;
+ String create_method_return_type = create_method != null ?
create_method.getReturnType().getQualifiedName() : null;
- String generate_str = clazz.doc().tagAttributeValue("ejb:pk", "generate",
false);
+ String generate_str = clazz.getDoc().getTagAttributeValue("ejb:pk",
"generate", false);
boolean generate = TypeConversionUtil.stringToBoolean(generate_str, true);
if (isPkClassGenerateable(create_method_return_type) == false) {
1.1.2.8 +2 -2
xdoclet/modules/ejb/src/xdoclet/modules/ejb/entity/Attic/ValueObjectSubTask.java
Index: ValueObjectSubTask.java
===================================================================
RCS file:
/cvsroot/xdoclet/xdoclet/modules/ejb/src/xdoclet/modules/ejb/entity/Attic/ValueObjectSubTask.java,v
retrieving revision 1.1.2.7
retrieving revision 1.1.2.8
diff -u -w -r1.1.2.7 -r1.1.2.8
--- ValueObjectSubTask.java 14 May 2002 20:41:28 -0000 1.1.2.7
+++ ValueObjectSubTask.java 26 May 2002 20:29:53 -0000 1.1.2.8
@@ -22,7 +22,7 @@
* @author Vincent Harcq ([EMAIL PROTECTED])
* @created Feb 5, 2002
* @xdoclet:subtask name="valueobject" parent="xdoclet.modules.ejb.EjbDocletTask"
- * @version $Revision: 1.1.2.7 $
+ * @version $Revision: 1.1.2.8 $
*/
public class ValueObjectSubTask extends AbstractEjbCodeGeneratorSubTask
{
@@ -200,7 +200,7 @@
protected void generateForClass(XClass clazz) throws XDocletException
{
- XTag[] dos = getCurrentClass().doc().tags("ejb:value-object");
+ XTag[] dos = getCurrentClass().getDoc().getTags("ejb:value-object");
// System.out.println( "Generating Value Object classes for '" +
getCurrentClass().qualifiedName() + "'." );
1.1.2.7 +43 -43
xdoclet/modules/ejb/src/xdoclet/modules/ejb/entity/Attic/ValueObjectTagsHandler.java
Index: ValueObjectTagsHandler.java
===================================================================
RCS file:
/cvsroot/xdoclet/xdoclet/modules/ejb/src/xdoclet/modules/ejb/entity/Attic/ValueObjectTagsHandler.java,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -w -r1.1.2.6 -r1.1.2.7
--- ValueObjectTagsHandler.java 24 May 2002 21:00:56 -0000 1.1.2.6
+++ ValueObjectTagsHandler.java 26 May 2002 20:29:53 -0000 1.1.2.7
@@ -39,7 +39,7 @@
* @author Vincent Harcq ([EMAIL PROTECTED])
* @created Feb 5, 2002
* @xdoclet:taghandler namespace="EjbValueObj"
- * @version $Revision: 1.1.2.6 $
+ * @version $Revision: 1.1.2.7 $
*/
public class ValueObjectTagsHandler
extends EjbTagsHandler
@@ -73,12 +73,12 @@
public static boolean isValueObjectRelation(XClass clazz, XMethod method,
String valueObject) throws XDocletException
{
Log log = LogUtil.getLog(ValueObjectTagsHandler.class,
"isValueObjectRelation");
- boolean ret = method.doc().hasTag("ejb:value-object");
+ boolean ret = method.getDoc().hasTag("ejb:value-object");
if (log.isDebugEnabled())
- log.debug(method.name() + " has a ejb:value-object Tag " + ret);
+ log.debug(method.getName() + " has a ejb:value-object Tag " + ret);
if (ret) {
- XTag[] tags = method.doc().tags("ejb:value-object");
+ XTag[] tags = method.getDoc().getTags("ejb:value-object");
if (tags.length == 0 && !"*".equals(valueObject)) {
ret = false;
@@ -89,9 +89,9 @@
boolean excluded = true;
for (int i = 0; i < tags.length; i++) {
- String exclude = tags[i].attributeValue("exclude");
- String aggreg = tags[i].attributeValue("aggregate");
- String comp = tags[i].attributeValue("compose");
+ String exclude = tags[i].getAttributeValue("exclude");
+ String aggreg = tags[i].getAttributeValue("aggregate");
+ String comp = tags[i].getAttributeValue("compose");
if ("true".equals(exclude) || (aggreg == null && comp == null))
{
excluded = true;
@@ -99,10 +99,10 @@
break;
}
- String value = tags[i].attributeValue("match");
+ String value = tags[i].getAttributeValue("match");
if (log.isDebugEnabled())
- log.debug(method.name() + " Match=" + value + "==" +
valueObject);
+ log.debug(method.getName() + " Match=" + value + "==" +
valueObject);
if (value == null) {
if ("*".equals(valueObject))
ret = true;
@@ -146,7 +146,7 @@
public static String getCurrentValueObjectClass(XClass clazz, XTag tag)
throws XDocletException
{
- String name = tag.attributeValue("name");
+ String name = tag.getAttributeValue("name");
String _currentValueObjectClass;
@@ -157,7 +157,7 @@
_currentValueObjectClass =
MessageFormat.format(getSubTask().getValueObjectClassPattern(), new Object[]{name});
}
- String packageName = clazz.containingPackage().name();
+ String packageName = clazz.getContainingPackage().getName();
packageName = choosePackage(packageName, null,
ValueObjectSubTask.SUBTASK_NAME);
@@ -176,7 +176,7 @@
public static String getCurrentValueObjectName(XTag tag)
throws XDocletException
{
- return tag.attributeValue("name");
+ return tag.getAttributeValue("name");
}
/**
@@ -189,7 +189,7 @@
public static String getCurrentValueObjectAttribute(XTag tag)
throws XDocletException
{
- String name = tag.attributeValue("name");
+ String name = tag.getAttributeValue("name");
String _currentValueObjectAttribute;
@@ -213,7 +213,7 @@
public static String getCurrentValueObjectMatch(XTag tag)
throws XDocletException
{
- String match = tag.attributeValue("match");
+ String match = tag.getAttributeValue("match");
if (match == null) {
match = "*";
@@ -243,15 +243,15 @@
String currentDataClass = currentValueObjectClass;
// Begin at the first super class
- XClass cur_clazz = clazz.superclass();
+ XClass cur_clazz = clazz.getSuperclass();
do {
// Find if we have an abstract data class definition to generate
- XMethod[] methods = cur_clazz.methods();
+ XMethod[] methods = cur_clazz.getMethods();
boolean found = false;
for (int i = 0; i < methods.length; i++) {
- if (methods[i].name().equals("get" + currentValueObjectAttribute)) {
+ if (methods[i].getName().equals("get" +
currentValueObjectAttribute)) {
found = true;
currentDataClass = getCurrentValueObjectClass(cur_clazz,
currentTag);
}
@@ -260,7 +260,7 @@
break;
}
}
- cur_clazz = cur_clazz.superclass();
+ cur_clazz = cur_clazz.getSuperclass();
} while (cur_clazz != null);
return currentDataClass;
@@ -337,7 +337,7 @@
public void forAllValueObjects(String pTemplate) throws XDocletException
{
Log log = LogUtil.getLog(ValueObjectTagsHandler.class,
"forAllValueObjects");
- XTag[] dos = getCurrentClass().doc().tags("ejb:value-object", true);
+ XTag[] dos = getCurrentClass().getDoc().getTags("ejb:value-object", true);
if (log.isDebugEnabled()) {
log.debug("Number of tags ejb:value-object in " + getCurrentClass() + "
= " + dos.length);
@@ -455,7 +455,7 @@
List already = new ArrayList();
do {
- XTag[] dos = getCurrentClass().doc().tags("ejb:value-object", false);
+ XTag[] dos = getCurrentClass().getDoc().getTags("ejb:value-object",
false);
for (int i = 0; i < dos.length; i++) {
currentTag = dos[i];
@@ -466,7 +466,7 @@
forAllSetters(template, "set" + currentValueObjectAttribute);
}
- pushCurrentClass(getCurrentClass().superclass());
+ pushCurrentClass(getCurrentClass().getSuperclass());
} while (getCurrentClass() != null);
setCurrentClass(oldClass);
@@ -563,11 +563,11 @@
// do
// {
// Find if we have an abstract data class definition to generate
- XMethod[] methods = getCurrentClass().methods();
+ XMethod[] methods = getCurrentClass().getMethods();
XMethod methodFound = null;
for (int i = 0; i < methods.length; i++) {
- if (methods[i].name().equals(methodName)) {
+ if (methods[i].getName().equals(methodName)) {
methodFound = methods[i];
}
@@ -685,7 +685,7 @@
XMethod oldMethod = getCurrentMethod();
if (log.isDebugEnabled())
- log.debug("*** forAllRelations on class=" + currentClass.name() + "
valueobject=" + valueObject);
+ log.debug("*** forAllRelations on class=" + currentClass.getName() + "
valueobject=" + valueObject);
do {
pushCurrentClass(currentClass);
@@ -693,38 +693,38 @@
log.debug("****** CurrentClass=" + getCurrentClass());
}
- XMethod[] methods = getCurrentClass().methods();
+ XMethod[] methods = getCurrentClass().getMethods();
for (int j = 0; j < methods.length; j++) {
setCurrentMethod(methods[j]);
- if (MethodTagsHandler.isGetter(getCurrentMethod().name()) &&
- !foundFields.containsKey(getCurrentMethod().name()) &&
+ if (MethodTagsHandler.isGetter(getCurrentMethod().getName()) &&
+ !foundFields.containsKey(getCurrentMethod().getName()) &&
isValueObjectRelation(getCurrentClass(), getCurrentMethod(),
valueObject)) {
- boolean ret =
getCurrentMethod().doc().hasTag("ejb:value-object");
+ boolean ret =
getCurrentMethod().getDoc().hasTag("ejb:value-object");
if (log.isDebugEnabled())
- log.debug("****** Method " + getCurrentMethod().name() + "
has VO tag : " + ret);
+ log.debug("****** Method " + getCurrentMethod().getName() +
" has VO tag : " + ret);
if (ret) {
- XTag[] tags =
getCurrentMethod().doc().tags("ejb:value-object");
+ XTag[] tags =
getCurrentMethod().getDoc().getTags("ejb:value-object");
for (int i = 0; i < tags.length; i++) {
- String aggreg = tags[i].attributeValue(type);
- String aggregName = tags[i].attributeValue(type +
"-name");
+ String aggreg = tags[i].getAttributeValue(type);
+ String aggregName = tags[i].getAttributeValue(type +
"-name");
if (log.isDebugEnabled()) {
- log.debug("********* " + methods[j].name() + "
ejb:value-object Tag - Type = " + type + " - Value = " + aggreg + " - Name = " +
aggregName);
+ log.debug("********* " + methods[j].getName() + "
ejb:value-object Tag - Type = " + type + " - Value = " + aggreg + " - Name = " +
aggregName);
}
if (aggreg != null) {
if (log.isDebugEnabled()) {
- log.debug("********* METHOD=" +
getCurrentMethod().name() + " " + getCurrentMethod().returnType().qualifiedName());
+ log.debug("********* METHOD=" +
getCurrentMethod().getName() + " " +
getCurrentMethod().getReturnType().getQualifiedName());
}
// Store that we found this field so we don't add
it twice
- foundFields.put(getCurrentMethod().name(),
getCurrentMethod().name());
- if
(getCurrentMethod().returnType().qualifiedName().equals("java.util.Collection")) {
+ foundFields.put(getCurrentMethod().getName(),
getCurrentMethod().getName());
+ if
(getCurrentMethod().getReturnType().getQualifiedName().equals("java.util.Collection"))
{
if (log.isDebugEnabled()) {
log.debug("********* Type Collection");
}
@@ -732,7 +732,7 @@
currentAggregateName = aggregName;
currentIsCollection = "true";
- String relationInterface =
tags[i].attributeValue("members");
+ String relationInterface =
tags[i].getAttributeValue("members");
if (log.isDebugEnabled()) {
log.debug(relationInterface);
@@ -743,12 +743,12 @@
}
else {
if (log.isDebugEnabled()) {
- log.debug("********* Type " +
getCurrentMethod().returnType().toString());
+ log.debug("********* Type " +
getCurrentMethod().getReturnType().toString());
}
currentAggregateType = aggreg;
currentAggregateName = aggregName;
currentIsCollection = "false";
- currentRelationBeanClass =
InterfaceTagsHandler.getBeanClassNameFromInterfaceNameFor(getCurrentMethod().returnType().toString());
+ currentRelationBeanClass =
InterfaceTagsHandler.getBeanClassNameFromInterfaceNameFor(getCurrentMethod().getReturnType().toString());
}
generate(template);
currentAggregateType = null;
@@ -763,7 +763,7 @@
}
// Add super class info
- if
(getCurrentClass().superclass().qualifiedName().equals("java.lang.Object")) {
+ if
(getCurrentClass().getSuperclass().getQualifiedName().equals("java.lang.Object")) {
popCurrentClass();
break;
}
@@ -772,11 +772,11 @@
// superclasses is true for *CMP/BMP/Session
if (superclasses == true) {
- currentClass = currentClass.superclass();
+ currentClass = currentClass.getSuperclass();
}
else {
- if
(shouldTraverseSuperclassForDependentClass(currentClass.superclass(),
getDependentClassTagName())) {
- currentClass = currentClass.superclass();
+ if
(shouldTraverseSuperclassForDependentClass(currentClass.getSuperclass(),
getDependentClassTagName())) {
+ currentClass = currentClass.getSuperclass();
}
else {
break;
_______________________________________________________________
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
