User: rinkrank
Date: 02/03/24 09:44:18
Modified: core/src/xdoclet/doc/info InfoSubTask.java
InfoTagsHandler.java
Log:
Merging changes from XJAVADOC_REFACTORING branch back to main branch
Revision Changes Path
1.17 +6 -6 xdoclet/core/src/xdoclet/doc/info/InfoSubTask.java
Index: InfoSubTask.java
===================================================================
RCS file: /cvsroot/xdoclet/xdoclet/core/src/xdoclet/doc/info/InfoSubTask.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -w -r1.16 -r1.17
--- InfoSubTask.java 22 Feb 2002 16:28:22 -0000 1.16
+++ InfoSubTask.java 24 Mar 2002 17:44:18 -0000 1.17
@@ -1,7 +1,7 @@
package xdoclet.doc.info;
-import com.sun.javadoc.ClassDoc;
-import com.sun.javadoc.PackageDoc;
+import xjavadoc.XClass;
+import xjavadoc.XPackage;
import org.apache.log4j.Category;
@@ -28,7 +28,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Aslak Helles�y</a>
* @created September 18, 2001
- * @version $Revision: 1.16 $
+ * @version $Revision: 1.17 $
*/
public class InfoSubTask extends TemplateSubTask
{
@@ -115,17 +115,17 @@
startProcess();
// now loop over all packages and classes
- ClassDoc[] classes = AbstractProgramElementTagsHandler.getAllClasses();
+ XClass[] classes = AbstractProgramElementTagsHandler.getAllClasses();
SortedSet packages = new TreeSet();
for( int i = 0; i < classes.length; i++ )
packages.add( classes[i].containingPackage() );
- PackageDoc cur_package = null;
+ XPackage cur_package = null;
for( Iterator packageIterator = packages.iterator();
packageIterator.hasNext(); )
{
- cur_package = ( PackageDoc ) packageIterator.next();
+ cur_package = ( XPackage ) packageIterator.next();
setCurrentPackage( cur_package );
File oldDestDir = getDestDir();
1.9 +15 -15 xdoclet/core/src/xdoclet/doc/info/InfoTagsHandler.java
Index: InfoTagsHandler.java
===================================================================
RCS file: /cvsroot/xdoclet/xdoclet/core/src/xdoclet/doc/info/InfoTagsHandler.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -w -r1.8 -r1.9
--- InfoTagsHandler.java 6 Feb 2002 00:17:04 -0000 1.8
+++ InfoTagsHandler.java 24 Mar 2002 17:44:18 -0000 1.9
@@ -1,9 +1,9 @@
package xdoclet.doc.info;
-import com.sun.javadoc.ClassDoc;
-import com.sun.javadoc.MethodDoc;
-import com.sun.javadoc.PackageDoc;
-import com.sun.javadoc.Tag;
+import xjavadoc.XClass;
+import xjavadoc.XMethod;
+import xjavadoc.XPackage;
+import xjavadoc.XTag;
import xdoclet.XDocletException;
import xdoclet.XDocletTagSupport;
@@ -13,7 +13,7 @@
import xdoclet.tags.PackageTagsHandler;
import xdoclet.tags.ConstructorTagsHandler;
import xdoclet.template.TemplateException;
-import xdoclet.util.DocletUtil;
+
import xdoclet.util.Translator;
import java.util.*;
@@ -21,7 +21,7 @@
/**
* @author <a href="mailto:[EMAIL PROTECTED]";>Aslak Helles�y</a>
* @created Oct 15, 2001
- * @version $Revision: 1.8 $
+ * @version $Revision: 1.9 $
*/
public class InfoTagsHandler extends XDocletTagSupport
{
@@ -224,7 +224,7 @@
int tagCount = 0;
String tag_name = attributes.getProperty( "tagName" );
- ClassDoc[] classes = AbstractProgramElementTagsHandler.getAllClasses();
+ XClass[] classes = AbstractProgramElementTagsHandler.getAllClasses();
SortedSet packages = new TreeSet();
for( int i = 0; i < classes.length; i++ )
@@ -232,23 +232,23 @@
packages.add( classes[i].containingPackage() );
}
- PackageDoc cur_package = null;
+ XPackage cur_package = null;
for( Iterator packageIterator = packages.iterator();
packageIterator.hasNext(); )
{
- cur_package = ( PackageDoc ) packageIterator.next();
+ cur_package = ( XPackage ) packageIterator.next();
tagCount += tagCountInClassesAndMethodsInAPackage_Impl(
attributes, cur_package );
}
return tagCount;
}
- private int tagCountInClassesAndMethodsInAPackage_Impl( Properties attributes,
PackageDoc packageDoc ) throws XDocletException
+ private int tagCountInClassesAndMethodsInAPackage_Impl( Properties attributes,
XPackage pakkage ) throws XDocletException
{
int tagCount = 0;
String tag_name = attributes.getProperty( "tagName" );
- ClassDoc[] classes = packageDoc.allClasses();
+ XClass[] classes = pakkage.classes();
for( int i = 0; i < classes.length; i++ )
{
@@ -258,12 +258,12 @@
return tagCount;
}
- private int tagCountInClass_Impl( Properties attributes, ClassDoc classDoc,
boolean countMethods ) throws XDocletException
+ private int tagCountInClass_Impl( Properties attributes, XClass clazz, boolean
countMethods ) throws XDocletException
{
int tagCount = 0;
String tag_name = attributes.getProperty( "tagName" );
- Tag[] classTags = DocletUtil.getTagsByName( classDoc, tag_name, false
);
+ XTag[] classTags = clazz.doc().tags( tag_name, false );
if( classTags != null )
{
@@ -272,11 +272,11 @@
if( countMethods )
{
- MethodDoc[] methods = classDoc.methods();
+ XMethod[] methods = clazz.methods();
for( int i = 0; i < methods.length; i++ )
{
- Tag[] methodTags = DocletUtil.getTagsByName(
methods[i], tag_name );
+ XTag[] methodTags = methods[i].doc().tags( tag_name );
if( methodTags != null )
{
_______________________________________________
Xdoclet-devel mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/xdoclet-devel
