User: ara_e_w
Date: 02/05/26 13:29:52
Modified: core/src/xdoclet/tagshandler Tag: MODULE_REFACTORING_BRANCH
AbstractProgramElementTagsHandler.java
ClassTagsHandler.java ConstructorTagsHandler.java
FieldTagsHandler.java MergeTagsHandler.java
MethodTagsHandler.java PackageTagsHandler.java
ParameterTagsHandler.java PropertyTagsHandler.java
TypeTagsHandler.java
Log:
xjavadoc javabeaninifiction refactoring
Revision Changes Path
No revision
No revision
1.1.2.5 +35 -35
xdoclet/core/src/xdoclet/tagshandler/Attic/AbstractProgramElementTagsHandler.java
Index: AbstractProgramElementTagsHandler.java
===================================================================
RCS file:
/cvsroot/xdoclet/xdoclet/core/src/xdoclet/tagshandler/Attic/AbstractProgramElementTagsHandler.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
--- AbstractProgramElementTagsHandler.java 20 May 2002 11:13:34 -0000 1.1.2.4
+++ AbstractProgramElementTagsHandler.java 26 May 2002 20:29:51 -0000 1.1.2.5
@@ -35,7 +35,7 @@
/**
* @author Ara Abrahamian ([EMAIL PROTECTED])
* @created Oct 15, 2001
- * @version $Revision: 1.1.2.4 $
+ * @version $Revision: 1.1.2.5 $
*/
public abstract class AbstractProgramElementTagsHandler extends XDocletTagSupport
{
@@ -65,7 +65,7 @@
XMember m1 = (XMember) o1;
XMember m2 = (XMember) o2;
- return m1.name().compareTo(m2.name());
+ return m1.getName().compareTo(m2.getName());
}
public boolean equals(Object obj)
@@ -84,7 +84,7 @@
*/
public static String getClassNameFor(XClass clazz)
{
- return clazz.name();
+ return clazz.getName();
}
/**
@@ -96,7 +96,7 @@
*/
public static String getFullClassNameFor(XClass clazz)
{
- return clazz.qualifiedName();
+ return clazz.getQualifiedName();
}
/**
@@ -108,8 +108,8 @@
*/
public static String getFullSuperclassNameFor(XClass clazz)
{
- if (clazz.superclass() != null) {
- return clazz.superclass().qualifiedName();
+ if (clazz.getSuperclass() != null) {
+ return clazz.getSuperclass().getQualifiedName();
}
else {
return "java.lang.Object";
@@ -128,10 +128,10 @@
try {
if (DocletContext.getInstance().getActiveSubTask().getCurrentPackage()
== null) {
// not in a forAllPackages context
- return XJavaDoc.getInstance().sourceClasses();
+ return XJavaDoc.getInstance().getSourceClasses();
}
else {
- return
DocletContext.getInstance().getActiveSubTask().getCurrentPackage().classes();
+ return
DocletContext.getInstance().getActiveSubTask().getCurrentPackage().getClasses();
}
}
catch (XJavaDocException e) {
@@ -160,10 +160,10 @@
switch (forType) {
case FOR_CONSTRUCTOR:
- executableMembers = clazz.constructors();
+ executableMembers = clazz.getConstructors();
break;
case FOR_METHOD:
- executableMembers = clazz.methods();
+ executableMembers = clazz.getMethods();
break;
default:
throw new XDocletException("Bad type: " + forType);
@@ -171,22 +171,22 @@
loop :
for (int i = 0; i < executableMembers.length; i++) {
- if (executableMembers[i].name().equals(executableMemberName)) {
+ if (executableMembers[i].getName().equals(executableMemberName)) {
// All parameters must be equal to have "constructor equality"
if (parameters != null) {
- XParameter[] params = executableMembers[i].parameters();
+ XParameter[] params = executableMembers[i].getParameters();
log.debug("params.length=" + params.length);
for (int j = 0; j < params.length; j++) {
if (log.isDebugEnabled()) {
- log.debug("params[j].type().qualifiedName()=" +
params[j].type().qualifiedName());
+ log.debug("params[j].type().qualifiedName()=" +
params[j].getType().getQualifiedName());
log.debug("parameters[j]=" + parameters[j]);
}
StringBuffer sbuf = new StringBuffer();
-
sbuf.append(params[j].type().qualifiedName()).append(params[j].dimensionAsString());
+
sbuf.append(params[j].getType().getQualifiedName()).append(params[j].getDimensionAsString());
if (parameters == null ||
!sbuf.toString().equals(parameters[j])) {
continue loop;
}
@@ -211,7 +211,7 @@
}
// Check super class info
- clazz = clazz.superclass();
+ clazz = clazz.getSuperclass();
}
return false;
@@ -318,7 +318,7 @@
return getXExecutableMemberForMemberName(memberName, forType);
}
- for (XClass clazz = getCurrentClass(); clazz != null; clazz =
clazz.superclass()) {
+ for (XClass clazz = getCurrentClass(); clazz != null; clazz =
clazz.getSuperclass()) {
XExecutableMember member = extractXExecutableMember(clazz, memberName,
forType);
if (member != null) {
@@ -386,7 +386,7 @@
}
if (memberName == null) {
- exceptions = executableMember.thrownExceptions();
+ exceptions = executableMember.getThrownExceptions();
}
else {
executableMember = getXExecutableMemberForMemberName(memberName, true,
forType);
@@ -396,7 +396,7 @@
return "";
}
- exceptions = executableMember.thrownExceptions();
+ exceptions = executableMember.getThrownExceptions();
}
StringBuffer sbuf = new StringBuffer();
@@ -508,7 +508,7 @@
throw new XDocletException(Translator.getString(resourceKey,
arguments));
}
- XTag[] tags = member.doc().tags(attributes.getProperty("tagName"),
superclasses);
+ XTag[] tags = member.getDoc().getTags(attributes.getProperty("tagName"),
superclasses);
for (int i = 0; i < tags.length; i++) {
@@ -517,7 +517,7 @@
String m = getTagValue(attributes, forType);
if (log.isDebugEnabled()) {
- log.debug(getCurrentMethod().name() + " ** Tag/Param = "
+ log.debug(getCurrentMethod().getName() + " ** Tag/Param = "
+ attributes.getProperty("tagName") + '/' +
attributes.getProperty("paramName")
+ " ** Value = " + m
+ " MatchPattern = " + matchPattern);
@@ -563,17 +563,17 @@
}
if (noCommentSigns != null && noCommentSigns.equalsIgnoreCase("true")) {
- return member.doc().commentText();
+ return member.getDoc().getCommentText();
}
char[] spaces = getIndentChars(attributes);
- XTag[] memberTags = member.doc().tags();
+ XTag[] memberTags = member.getDoc().getTags();
if (memberTags.length > 0) {
StringBuffer sbuf = new StringBuffer();
// add user comments
- StringTokenizer st = new
StringTokenizer(member.doc().commentText().trim(), "\n", false);
+ StringTokenizer st = new
StringTokenizer(member.getDoc().getCommentText().trim(), "\n", false);
if (st.countTokens() > 0) {
sbuf.append(spaces).append("/**").append(PrettyPrintWriter.LINE_SEPARATOR);
@@ -583,13 +583,13 @@
for (int i = 0; i < memberTags.length; i++) {
// all of our xdoclet-specific tags have a ":" or "."
- String memberTagName = memberTags[i].name();
+ String memberTagName = memberTags[i].getName();
if (memberTagName.indexOf(':') == -1 &&
memberTagName.indexOf('.') == -1
&&
getDocletContext().getExcludedTags().indexOf(memberTagName) == -1) {
sbuf.append(spaces).append(" * ")
- .append(memberTags[i].name()).append(' ')
- .append(memberTags[i].value());
+ .append(memberTags[i].getName()).append(' ')
+ .append(memberTags[i].getValue());
// for all lines but not the last line
if (i < memberTags.length - 1) {
@@ -616,7 +616,7 @@
*/
protected String firstSentenceDescriptionOfCurrentMember(XMember member) throws
XDocletException
{
- return member.doc().firstSentence() != null ? member.doc().firstSentence()
: "";
+ return member.getDoc().getFirstSentence() != null ?
member.getDoc().getFirstSentence() : "";
}
/**
@@ -639,13 +639,13 @@
switch (forType) {
case FOR_FIELD:
- members = currentClass.fields();
+ members = currentClass.getFields();
break;
case FOR_CONSTRUCTOR:
- members = currentClass.constructors();
+ members = currentClass.getConstructors();
break;
case FOR_METHOD:
- members = currentClass.methods();
+ members = currentClass.getMethods();
break;
default:
throw new XDocletException("Bad type: " + forType);
@@ -661,7 +661,7 @@
// otherwisee (most cases), follow these rules:
// a) if superclasses == true -> handle it anyway
// b) if superclasses == false -> only handle it if it's defined in
the current class
- if ((superclasses || (!superclasses &&
members[j].containingClass().equals(currentClass))) &&
!"<clinit>".equals(members[j].name())) {
+ if ((superclasses || (!superclasses &&
members[j].getContainingClass().equals(currentClass))) &&
!"<clinit>".equals(members[j].getName())) {
if (already.contains(members[j]) == false) {
switch (forType) {
case FOR_FIELD:
@@ -684,7 +684,7 @@
}
if (superclasses) {
- currentClass = currentClass.superclass();
+ currentClass = currentClass.getSuperclass();
}
else {
break;
@@ -782,17 +782,17 @@
switch (forType) {
case FOR_CONSTRUCTOR:
- executableMembers = clazz.constructors();
+ executableMembers = clazz.getConstructors();
break;
case FOR_METHOD:
- executableMembers = clazz.methods();
+ executableMembers = clazz.getMethods();
break;
default:
throw new XDocletException("Bad type: " + forType);
}
for (int i = 0; i < executableMembers.length; i++) {
- if (executableMembers[i].name().equals(memberName)) {
+ if (executableMembers[i].getName().equals(memberName)) {
return executableMembers[i];
}
}
1.1.2.6 +20 -20 xdoclet/core/src/xdoclet/tagshandler/Attic/ClassTagsHandler.java
Index: ClassTagsHandler.java
===================================================================
RCS file:
/cvsroot/xdoclet/xdoclet/core/src/xdoclet/tagshandler/Attic/ClassTagsHandler.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
--- ClassTagsHandler.java 13 May 2002 22:24:15 -0000 1.1.2.5
+++ ClassTagsHandler.java 26 May 2002 20:29:51 -0000 1.1.2.6
@@ -27,7 +27,7 @@
* @author Ara Abrahamian ([EMAIL PROTECTED])
* @created Oct 14, 2001
* @xdoclet:taghandler namespace="Class"
- * @version $Revision: 1.1.2.5 $
+ * @version $Revision: 1.1.2.6 $
*/
public class ClassTagsHandler extends AbstractProgramElementTagsHandler
{
@@ -49,7 +49,7 @@
*/
public static String getClassNameFor(XClass clazz)
{
- return clazz.name();
+ return clazz.getName();
}
/**
@@ -62,10 +62,10 @@
*/
public static String getFullClassNameFor(XClass clazz)
{
- if (clazz.containingClass() != null) {
- return clazz.containingClass().qualifiedName();
+ if (clazz.getContainingClass() != null) {
+ return clazz.getContainingClass().getQualifiedName();
}
- return clazz.qualifiedName();
+ return clazz.getQualifiedName();
}
/**
@@ -77,7 +77,7 @@
*/
public String className() throws XDocletException
{
- return getCurrentClass().name();
+ return getCurrentClass().getName();
}
/**
@@ -281,7 +281,7 @@
public String symbolicClassName() throws XDocletException
{
// (Aslak) not sure if this is correct
- return getCurrentClass().name();
+ return getCurrentClass().getName();
}
/**
@@ -472,7 +472,7 @@
public void forAllClassTags(String template, Properties attributes) throws
XDocletException
{
boolean superclasses =
TypeConversionUtil.stringToBoolean(attributes.getProperty("superclasses"), true);
- XTag[] tags =
getCurrentClass().doc().tags(attributes.getProperty("tagName"), superclasses);
+ XTag[] tags =
getCurrentClass().getDoc().getTags(attributes.getProperty("tagName"), superclasses);
Set done = new HashSet();
matchPattern = null;
@@ -481,7 +481,7 @@
for (int i = 0; i < tags.length; i++) {
if (tagKey != null) {
- String key = tags[i].attributeValue(tagKey);
+ String key = tags[i].getAttributeValue(tagKey);
if (!done.add(key)) {
// no change to set, therefore we must have already done this
tag
@@ -539,7 +539,7 @@
boolean noCommentSigns =
TypeConversionUtil.stringToBoolean(attributes.getProperty("no-comment-signs"), false);
if (noCommentSigns) {
- return getCurrentClass().doc().commentText();
+ return getCurrentClass().getDoc().getCommentText();
}
char[] spaces = getIndentChars(attributes);
@@ -570,13 +570,13 @@
boolean noCommentSigns =
TypeConversionUtil.stringToBoolean(attributes.getProperty("no-comment-signs"), false);
if (noCommentSigns) {
- return getCurrentClass().doc().commentText();
+ return getCurrentClass().getDoc().getCommentText();
}
char[] spaces = getIndentChars(attributes);
StringBuffer sbuf = new StringBuffer();
- sbuf.append(spaces).append(" *
").append(getCurrentClass().doc().commentText()).append(PrettyPrintWriter.LINE_SEPARATOR);
+ sbuf.append(spaces).append(" *
").append(getCurrentClass().getDoc().getCommentText()).append(PrettyPrintWriter.LINE_SEPARATOR);
return sbuf.toString();
}
@@ -594,19 +594,19 @@
public String classCommentTags(Properties attributes) throws XDocletException
{
char[] spaces = getIndentChars(attributes);
- XTag[] classTags = getCurrentClass().doc().tags();
+ XTag[] classTags = getCurrentClass().getDoc().getTags();
StringBuffer sbuf = new StringBuffer();
for (int i = 0; i < classTags.length; i++) {
- String classTag = classTags[i].name();
+ String classTag = classTags[i].getName();
// omit ejbdoclet-specific tags, which all have a ":" or "."
if (classTag.indexOf(':') == -1 && classTag.indexOf('.') == -1) {
// omit excluded tags
if (getDocletContext().getExcludedTags().indexOf(classTag) == -1) {
sbuf.append(spaces).append(" * @").append(classTag).append(' ');
-
sbuf.append(classTags[i].value()).append(PrettyPrintWriter.LINE_SEPARATOR);
+
sbuf.append(classTags[i].getValue()).append(PrettyPrintWriter.LINE_SEPARATOR);
}
}
}
@@ -634,7 +634,7 @@
*/
public String firstSentenceDescription(Properties attributes) throws
XDocletException
{
- String desc = getCurrentClass().doc().firstSentence();
+ String desc = getCurrentClass().getDoc().getFirstSentence();
if (desc == null) {
String noDescriptionIfLackingStr =
attributes.getProperty("no-description-if-lacking");
@@ -670,12 +670,12 @@
String currentPackage = PackageTagsHandler.getPackageNameFor(currentClass);
StringBuffer sbuf = new StringBuffer();
- XPackage[] packages = getCurrentClass().importedPackages();
- XClass[] classes = getCurrentClass().importedClasses();
+ XPackage[] packages = getCurrentClass().getImportedPackages();
+ XClass[] classes = getCurrentClass().getImportedClasses();
for (int i = 0; i < packages.length; i++) {
- if (!packages[i].name().equals(currentPackage)) {
- sbuf.append("import
").append(packages[i].name()).append(".*;").append(PrettyPrintWriter.LINE_SEPARATOR);
+ if (!packages[i].getName().equals(currentPackage)) {
+ sbuf.append("import
").append(packages[i].getName()).append(".*;").append(PrettyPrintWriter.LINE_SEPARATOR);
}
}
1.1.2.6 +6 -6
xdoclet/core/src/xdoclet/tagshandler/Attic/ConstructorTagsHandler.java
Index: ConstructorTagsHandler.java
===================================================================
RCS file:
/cvsroot/xdoclet/xdoclet/core/src/xdoclet/tagshandler/Attic/ConstructorTagsHandler.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
--- ConstructorTagsHandler.java 13 May 2002 22:24:15 -0000 1.1.2.5
+++ ConstructorTagsHandler.java 26 May 2002 20:29:51 -0000 1.1.2.6
@@ -21,7 +21,7 @@
* @author Jerome Bernard ([EMAIL PROTECTED])
* @created Jan 18, 2002
* @xdoclet:taghandler namespace="Constructor"
- * @version $Revision: 1.1.2.5 $
+ * @version $Revision: 1.1.2.6 $
*/
public class ConstructorTagsHandler extends AbstractProgramElementTagsHandler
{
@@ -146,7 +146,7 @@
for (int i = 0; i < classes.length; i++) {
if (typeName == null || TypeTagsHandler.isOfType(classes[i], typeName,
extent)) {
- XConstructor[] classConstructors = classes[i].constructors();
+ XConstructor[] classConstructors = classes[i].getConstructors();
for (int j = 0; j < classConstructors.length; j++) {
constructors.add(classConstructors[j]);
@@ -160,7 +160,7 @@
while (constructorsIterator.hasNext()) {
XConstructor current = (XConstructor) constructorsIterator.next();
- setCurrentClass(current.containingClass());
+ setCurrentClass(current.getContainingClass());
setCurrentConstructor(current);
generate(template);
@@ -387,7 +387,7 @@
String value = (String) attributes.get("value");
if (value != null) {
- String m =
getCurrentConstructor().name().substring(Integer.parseInt(value));
+ String m =
getCurrentConstructor().getName().substring(Integer.parseInt(value));
// replace first character to lowercase
char firstU = m.charAt(0);
char firstL = Character.toLowerCase(firstU);
@@ -395,7 +395,7 @@
return firstL + m.substring(1);
}
}
- return getCurrentConstructor() != null ? getCurrentConstructor().name() :
"";
+ return getCurrentConstructor() != null ? getCurrentConstructor().getName()
: "";
}
/**
@@ -406,7 +406,7 @@
*/
public String currentConstructorName() throws XDocletException
{
- return getCurrentConstructor().name();
+ return getCurrentConstructor().getName();
}
/**
1.1.2.5 +3 -3 xdoclet/core/src/xdoclet/tagshandler/Attic/FieldTagsHandler.java
Index: FieldTagsHandler.java
===================================================================
RCS file:
/cvsroot/xdoclet/xdoclet/core/src/xdoclet/tagshandler/Attic/FieldTagsHandler.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
--- FieldTagsHandler.java 13 May 2002 22:24:15 -0000 1.1.2.4
+++ FieldTagsHandler.java 26 May 2002 20:29:51 -0000 1.1.2.5
@@ -14,7 +14,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Aslak
Helles�y</a>
* @created 13. januar 2002
* @xdoclet:taghandler namespace="Field"
- * @version $Revision: 1.1.2.4 $
+ * @version $Revision: 1.1.2.5 $
*/
public class FieldTagsHandler extends AbstractProgramElementTagsHandler
{
@@ -28,7 +28,7 @@
*/
public static String getFieldTypeFor(XField field) throws XDocletException
{
- return field.type().qualifiedName() + field.dimensionAsString();
+ return field.getType().getQualifiedName() + field.getDimensionAsString();
}
/**
@@ -80,7 +80,7 @@
*/
public String fieldName() throws XDocletException
{
- return getCurrentField().name();
+ return getCurrentField().getName();
}
/**
1.1.2.6 +3 -3 xdoclet/core/src/xdoclet/tagshandler/Attic/MergeTagsHandler.java
Index: MergeTagsHandler.java
===================================================================
RCS file:
/cvsroot/xdoclet/xdoclet/core/src/xdoclet/tagshandler/Attic/MergeTagsHandler.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
--- MergeTagsHandler.java 22 May 2002 20:08:05 -0000 1.1.2.5
+++ MergeTagsHandler.java 26 May 2002 20:29:51 -0000 1.1.2.6
@@ -30,7 +30,7 @@
* @author Ara Abrahamian ([EMAIL PROTECTED])
* @created Oct 15, 2001
* @xdoclet:taghandler namespace="Merge"
- * @version $Revision: 1.1.2.5 $
+ * @version $Revision: 1.1.2.6 $
*/
public class MergeTagsHandler extends XDocletTagSupport
{
@@ -121,7 +121,7 @@
else {
String ejb_name = MessageFormat.format(mergeFilePattern, new
Object[]{AbstractProgramElementTagsHandler.getClassNameFor(getCurrentClass())});
- String merge_file_name =
PackageTagsHandler.packageNameAsPathWithoutSubstitutionFor(getCurrentClass().containingPackage())
+ File.separator + ejb_name;
+ String merge_file_name =
PackageTagsHandler.packageNameAsPathWithoutSubstitutionFor(getCurrentClass().getContainingPackage())
+ File.separator + ejb_name;
if (getDocletContext().getActiveSubTask().getMergeDir() !=
null) {
File mergeFile = new
File(getDocletContext().getActiveSubTask().getMergeDir(), merge_file_name);
@@ -224,7 +224,7 @@
XClass[] classes = null;
try {
- XJavaDoc.getInstance().sourceClasses();
+ XJavaDoc.getInstance().getSourceClasses();
}
catch (XJavaDocException e) {
throw new XDocletException(e, e.getMessage());
1.1.2.5 +12 -12
xdoclet/core/src/xdoclet/tagshandler/Attic/MethodTagsHandler.java
Index: MethodTagsHandler.java
===================================================================
RCS file:
/cvsroot/xdoclet/xdoclet/core/src/xdoclet/tagshandler/Attic/MethodTagsHandler.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
--- MethodTagsHandler.java 13 May 2002 22:24:15 -0000 1.1.2.4
+++ MethodTagsHandler.java 26 May 2002 20:29:51 -0000 1.1.2.5
@@ -22,7 +22,7 @@
* @author Ara Abrahamian ([EMAIL PROTECTED])
* @created Oct 15, 2001
* @xdoclet:taghandler namespace="Method"
- * @version $Revision: 1.1.2.4 $
+ * @version $Revision: 1.1.2.5 $
*/
public class MethodTagsHandler extends AbstractProgramElementTagsHandler
{
@@ -35,7 +35,7 @@
*/
public static String getMethodTypeFor(XMethod method) throws XDocletException
{
- return method.returnType().qualifiedName() +
method.returnDimensionAsString();
+ return method.getReturnType().getQualifiedName() +
method.getReturnDimensionAsString();
}
/**
@@ -46,7 +46,7 @@
*/
public static String getMethodNameWithoutPrefixFor(XMethod currentMethod)
{
- String name = currentMethod.name();
+ String name = currentMethod.getName();
if (name.startsWith("get") || name.startsWith("set")) {
return name.substring(3);
@@ -127,15 +127,15 @@
*/
public String getterPrefix() throws XDocletException
{
- if (getCurrentMethod().name().startsWith("get")) {
+ if (getCurrentMethod().getName().startsWith("get")) {
return "get";
}
- else if (getCurrentMethod().name().startsWith("is")) {
+ else if (getCurrentMethod().getName().startsWith("is")) {
return "is";
}
- else if (getCurrentMethod().name().startsWith("set")) {
+ else if (getCurrentMethod().getName().startsWith("set")) {
// for boolean here we don't know if it is get or is, lets find it
- String[] params = {getCurrentMethod().returnType().qualifiedName()};
+ String[] params =
{getCurrentMethod().getReturnType().getQualifiedName()};
if (hasMethod(getCurrentClass(), "is" + methodNameWithoutPrefix(),
params, false)) {
return "is";
@@ -327,7 +327,7 @@
for (int i = 0; i < classes.length; i++) {
if (typeName == null || TypeTagsHandler.isOfType(classes[i], typeName,
extent)) {
- XMethod[] classMethods = classes[i].methods();
+ XMethod[] classMethods = classes[i].getMethods();
for (int j = 0; j < classMethods.length; j++) {
methods.add(classMethods[j]);
@@ -341,7 +341,7 @@
while (methodsIterator.hasNext()) {
XMethod current = (XMethod) methodsIterator.next();
- setCurrentClass(current.containingClass());
+ setCurrentClass(current.getContainingClass());
setCurrentMethod(current);
generate(template);
@@ -569,7 +569,7 @@
String value = (String) attributes.get("value");
if (value != null) {
- String m =
getCurrentMethod().name().substring(Integer.parseInt(value));
+ String m =
getCurrentMethod().getName().substring(Integer.parseInt(value));
// replace first character to lowercase
char firstU = m.charAt(0);
char firstL = Character.toLowerCase(firstU);
@@ -578,7 +578,7 @@
}
}
- return getCurrentMethod() != null ? getCurrentMethod().name() : "";
+ return getCurrentMethod() != null ? getCurrentMethod().getName() : "";
}
/**
@@ -602,7 +602,7 @@
*/
public String currentMethodName() throws XDocletException
{
- return getCurrentMethod().name();
+ return getCurrentMethod().getName();
}
/**
1.1.2.5 +6 -6
xdoclet/core/src/xdoclet/tagshandler/Attic/PackageTagsHandler.java
Index: PackageTagsHandler.java
===================================================================
RCS file:
/cvsroot/xdoclet/xdoclet/core/src/xdoclet/tagshandler/Attic/PackageTagsHandler.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
--- PackageTagsHandler.java 13 May 2002 22:24:15 -0000 1.1.2.4
+++ PackageTagsHandler.java 26 May 2002 20:29:51 -0000 1.1.2.5
@@ -26,7 +26,7 @@
* @author Ara Abrahamian ([EMAIL PROTECTED])
* @created Oct 14, 2001
* @xdoclet:taghandler namespace="Package"
- * @version $Revision: 1.1.2.4 $
+ * @version $Revision: 1.1.2.5 $
*/
public class PackageTagsHandler extends AbstractProgramElementTagsHandler
{
@@ -40,7 +40,7 @@
*/
public static String getPackageNameFor(XPackage pak, boolean withSubstitution)
{
- return getPackageNameFor(pak.name(), withSubstitution);
+ return getPackageNameFor(pak.getName(), withSubstitution);
}
public static String getPackageNameFor(String packageName)
@@ -152,10 +152,10 @@
{
if (getCurrentPackage() != null) {
// first try to get the name from current package. It exists if
- return getCurrentPackage().name();
+ return getCurrentPackage().getName();
}
else {
- return getCurrentClass().containingPackage().name();
+ return getCurrentClass().getContainingPackage().getName();
}
}
@@ -197,11 +197,11 @@
public void forAllPackages(String template, Properties attributes) throws
XDocletException
{
try {
- XClass[] classes = XJavaDoc.getInstance().sourceClasses();
+ XClass[] classes = XJavaDoc.getInstance().getSourceClasses();
SortedSet packages = new TreeSet();
for (int i = 0; i < classes.length; i++) {
- packages.add(classes[i].containingPackage());
+ packages.add(classes[i].getContainingPackage());
}
XPackage currentPackage = null;
1.1.2.5 +13 -13
xdoclet/core/src/xdoclet/tagshandler/Attic/ParameterTagsHandler.java
Index: ParameterTagsHandler.java
===================================================================
RCS file:
/cvsroot/xdoclet/xdoclet/core/src/xdoclet/tagshandler/Attic/ParameterTagsHandler.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
--- ParameterTagsHandler.java 13 May 2002 22:24:15 -0000 1.1.2.4
+++ ParameterTagsHandler.java 26 May 2002 20:29:51 -0000 1.1.2.5
@@ -18,7 +18,7 @@
* @author Ara Abrahamian ([EMAIL PROTECTED])
* @created Oct 15, 2001
* @xdoclet:taghandler namespace="Parameter"
- * @version $Revision: 1.1.2.4 $
+ * @version $Revision: 1.1.2.5 $
*/
public class ParameterTagsHandler extends AbstractProgramElementTagsHandler
{
@@ -47,7 +47,7 @@
*/
public String methodParamType() throws XDocletException
{
- return currentMethodParameter.type().qualifiedName() +
currentMethodParameter.dimensionAsString();
+ return currentMethodParameter.getType().getQualifiedName() +
currentMethodParameter.getDimensionAsString();
}
/**
@@ -65,7 +65,7 @@
}
// end of if ()
- return currentMethodParamTag.value();
+ return currentMethodParamTag.getValue();
}
/**
@@ -78,7 +78,7 @@
*/
public String methodParamName() throws XDocletException
{
- return currentMethodParameter.name();
+ return currentMethodParameter.getName();
}
/**
@@ -146,17 +146,17 @@
{
String incl = (String) attributes.get("includeDefinition");
- XParameter[] parameters = getCurrentMethod().parameters();
+ XParameter[] parameters = getCurrentMethod().getParameters();
StringBuffer sbuf = new StringBuffer();
String type = null;
String name = null;
for (int i = 0; i < parameters.length; i++) {
- type = parameters[i].type().qualifiedName();
+ type = parameters[i].getType().getQualifiedName();
- String methodDimension = parameters[i].dimensionAsString();
+ String methodDimension = parameters[i].getDimensionAsString();
- name = parameters[i].name();
+ name = parameters[i].getName();
if (i > 0) {
sbuf.append(',');
@@ -186,7 +186,7 @@
public void forAllParameterTypes(String template, Properties attributes) throws
XDocletException
{
String paramName = attributes.getProperty("paramName");
- String value = getCurrentClassTag().attributeValue(paramName);
+ String value = getCurrentClassTag().getAttributeValue(paramName);
String oldToken = currentToken;
// findAll(int p1, int p2) -> int p1, int p2
@@ -220,15 +220,15 @@
*/
private void forAllParams(XExecutableMember member, String template) throws
XDocletException
{
- XParameter[] parameters = member.parameters();
- XTag[] paramTags = member.doc().tags("param");
+ XParameter[] parameters = member.getParameters();
+ XTag[] paramTags = member.getDoc().getTags("param");
for (int k = 0; k < parameters.length; k++) {
currentMethodParameter = parameters[k];
currentMethodParamTag = null;
for (int j = 0; j < paramTags.length; j++) {
// find @param xxx
- String paramTagValue = paramTags[j].value();
+ String paramTagValue = paramTags[j].getValue();
StringTokenizer st = new StringTokenizer(paramTagValue);
String paramTagParam = null;
@@ -236,7 +236,7 @@
paramTagParam = st.nextToken();
}
- if (currentMethodParameter.name().equals(paramTagParam)) {
+ if (currentMethodParameter.getName().equals(paramTagParam)) {
currentMethodParamTag = paramTags[j];
break;
}
1.1.2.6 +16 -16
xdoclet/core/src/xdoclet/tagshandler/Attic/PropertyTagsHandler.java
Index: PropertyTagsHandler.java
===================================================================
RCS file:
/cvsroot/xdoclet/xdoclet/core/src/xdoclet/tagshandler/Attic/PropertyTagsHandler.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
--- PropertyTagsHandler.java 24 May 2002 20:07:53 -0000 1.1.2.5
+++ PropertyTagsHandler.java 26 May 2002 20:29:51 -0000 1.1.2.6
@@ -22,7 +22,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>David
Jencks</a>
* @created Wed Feb 27 21:53:15 2002
* @xdoclet:taghandler namespace="Property"
- * @version $Revision: 1.1.2.5 $
+ * @version $Revision: 1.1.2.6 $
*/
public class PropertyTagsHandler extends AbstractProgramElementTagsHandler
{
@@ -52,10 +52,10 @@
*/
private static XMethod extractXMethod(XClass clazz, String methodName)
{
- XMethod[] methods = clazz.methods();
+ XMethod[] methods = clazz.getMethods();
for (int i = 0; i < methods.length; i++) {
- if (methods[i].name().equals(methodName)) {
+ if (methods[i].getName().equals(methodName)) {
return methods[i];
}
}
@@ -96,14 +96,14 @@
// loop over superclasses
do {
- XMethod[] methods = getCurrentClass().methods();
+ XMethod[] methods = getCurrentClass().getMethods();
XMethod oldCurrentMethod = getCurrentMethod();
for (int j = 0; j < methods.length; j++) {
XMethod currentMethod = methods[j];
- log.debug("looking at method " + currentMethod.name());
- if (currentMethod.doc().hasTag(requiredTag)) {
+ log.debug("looking at method " + currentMethod.getName());
+ if (currentMethod.getDoc().hasTag(requiredTag)) {
setCurrentMethod(currentMethod);
String propertyName =
MethodTagsHandler.getMethodNameWithoutPrefixFor(currentMethod);
@@ -120,7 +120,7 @@
setCurrentMethod(oldCurrentMethod);
}
// Add super class info
- pushCurrentClass(getCurrentClass().superclass());
+ pushCurrentClass(getCurrentClass().getSuperclass());
} while (superclasses && getCurrentClass() != null);
setCurrentClass(oldClass);
@@ -207,9 +207,9 @@
XMethod setter = getSetMethodWithTag(attributes);
if (setter != null) {
- XParameter parameter = setter.parameters()[0];
+ XParameter parameter = setter.getParameters()[0];
- return parameter.type().qualifiedName();
+ return parameter.getType().getQualifiedName();
}
throw new XDocletException("no current property found");
}
@@ -231,8 +231,8 @@
XMethod currentMethod = getCurrentMethod();
- if (currentMethod.name().startsWith("get") ||
currentMethod.name().startsWith("is")) {
- if (currentMethod.doc().hasTag(requiredTag)) {
+ if (currentMethod.getName().startsWith("get") ||
currentMethod.getName().startsWith("is")) {
+ if (currentMethod.getDoc().hasTag(requiredTag)) {
return currentMethod;
}
@@ -243,7 +243,7 @@
XMethod getter = getXMethodForMethodName("get" + attributeName);
if (getter != null) {
- if (getter.doc().hasTag(requiredTag)) {
+ if (getter.getDoc().hasTag(requiredTag)) {
return getter;
}
@@ -253,7 +253,7 @@
getter = getXMethodForMethodName("is" + attributeName);
// not too safe.. should check it's boolean.
- if (getter != null && getter.doc().hasTag(requiredTag)) {
+ if (getter != null && getter.getDoc().hasTag(requiredTag)) {
return getter;
}
return null;
@@ -276,8 +276,8 @@
XMethod currentMethod = getCurrentMethod();
- if (currentMethod.name().startsWith("set")) {
- if (currentMethod.doc().hasTag(requiredTag)) {
+ if (currentMethod.getName().startsWith("set")) {
+ if (currentMethod.getDoc().hasTag(requiredTag)) {
return currentMethod;
}
@@ -287,7 +287,7 @@
String attributeName =
MethodTagsHandler.getMethodNameWithoutPrefixFor(currentMethod);
XMethod setter = getXMethodForMethodName("set" + attributeName);
- if (setter != null && setter.doc().hasTag(requiredTag)) {
+ if (setter != null && setter.getDoc().hasTag(requiredTag)) {
return setter;
}
1.1.2.6 +10 -10 xdoclet/core/src/xdoclet/tagshandler/Attic/TypeTagsHandler.java
Index: TypeTagsHandler.java
===================================================================
RCS file:
/cvsroot/xdoclet/xdoclet/core/src/xdoclet/tagshandler/Attic/TypeTagsHandler.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
--- TypeTagsHandler.java 13 May 2002 22:24:15 -0000 1.1.2.5
+++ TypeTagsHandler.java 26 May 2002 20:29:51 -0000 1.1.2.6
@@ -22,7 +22,7 @@
* @author Dmitri Colebatch ([EMAIL PROTECTED])
* @created October 12, 2001
* @xdoclet:taghandler namespace="Type"
- * @version $Revision: 1.1.2.5 $
+ * @version $Revision: 1.1.2.6 $
*/
public class TypeTagsHandler extends XDocletTagSupport
{
@@ -125,18 +125,18 @@
do {
//if cur_class is one of the classes in the derived-from list
- if (isInTypeList(type, cur_class.qualifiedName()) == true) {
+ if (isInTypeList(type, cur_class.getQualifiedName()) == true) {
return true;
}
else if (extent != TYPE_CONCRETE_TYPE) {
//if cur_class's direct baseclass is one of the classes in the
derived-from list
- if (cur_class.superclass() != null &&
- isInTypeList(type, cur_class.superclass().qualifiedName())
== true) {
+ if (cur_class.getSuperclass() != null &&
+ isInTypeList(type,
cur_class.getSuperclass().getQualifiedName()) == true) {
return true;
}
else {
// if one of implemented interfaces implements somewhere in
its hierarchy ...
- XClass[] interfaces = cur_class.interfaces();
+ XClass[] interfaces = cur_class.getInterfaces();
for (int j = 0; j < interfaces.length; j++) {
if (isInterfaceDerivedFrom(interfaces[j], type) ==
true) {
@@ -147,7 +147,7 @@
}
if (extent == TYPE_HIERARCHY) {
- cur_class = cur_class.superclass();
+ cur_class = cur_class.getSuperclass();
}
else {
break;
@@ -229,12 +229,12 @@
private static boolean isInterfaceDerivedFrom(XClass cur_interface, String
derived_from)
{
//if cur_interface is one of the classes in the derived-from list
- if (isInTypeList(derived_from, cur_interface.qualifiedName()) == true) {
+ if (isInTypeList(derived_from, cur_interface.getQualifiedName()) == true) {
return true;
}
else {
// parents
- XClass[] interfaces = cur_interface.interfaces();
+ XClass[] interfaces = cur_interface.getInterfaces();
for (int i = 0; i < interfaces.length; i++) {
if (isInterfaceDerivedFrom(interfaces[i], derived_from) == true) {
@@ -465,8 +465,8 @@
currentType = getCurrentClass();
}
else if (value.equalsIgnoreCase("return-type")) {
- currentType = getCurrentMethod().returnType();
- curDimStr = getCurrentMethod().returnDimensionAsString();
+ currentType = getCurrentMethod().getReturnType();
+ curDimStr = getCurrentMethod().getReturnDimensionAsString();
}
else {
//full class name literally specified
_______________________________________________________________
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
