User: rinkrank
Date: 02/03/25 16:01:11
Modified: core/src/xdoclet/tags AbstractProgramElementTagsHandler.java
ClassTagsHandler.java ConstructorTagsHandler.java
FieldTagsHandler.java MethodTagsHandler.java
PackageTagsHandler.java
Log:
-Added Field and Constructor-level support to info/todo
-Restructured layout for todo task (with gifs)
-Added a method to FileManager for writing out binary files from jar resources
-Some ArrayList -> List refactorings
Revision Changes Path
1.26 +3 -5
xdoclet/core/src/xdoclet/tags/AbstractProgramElementTagsHandler.java
Index: AbstractProgramElementTagsHandler.java
===================================================================
RCS file:
/cvsroot/xdoclet/xdoclet/core/src/xdoclet/tags/AbstractProgramElementTagsHandler.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -w -r1.25 -r1.26
--- AbstractProgramElementTagsHandler.java 24 Mar 2002 17:44:17 -0000 1.25
+++ AbstractProgramElementTagsHandler.java 26 Mar 2002 00:01:10 -0000 1.26
@@ -32,7 +32,7 @@
/**
* @author Ara Abrahamian ([EMAIL PROTECTED])
* @created Oct 15, 2001
- * @version $Revision: 1.25 $
+ * @version $Revision: 1.26 $
*/
public abstract class AbstractProgramElementTagsHandler extends XDocletTagSupport
{
@@ -446,6 +446,7 @@
protected void forAllMemberTags( String template, Properties attributes, int
for_type, String resourceKey, String[] arguments ) throws XDocletException
{
+ boolean superclasses = TypeConversionUtil.stringToBoolean(
attributes.getProperty( "superclasses" ), true );
XMember member = null;
switch ( for_type )
@@ -466,8 +467,7 @@
if( member == null )
throw new XDocletException( Translator.getString( resourceKey,
arguments ) );
- XTag[] tags = member.doc().tags( attributes.getProperty( "tagName" ) );
-
+ XTag[] tags = member.doc().tags( attributes.getProperty( "tagName" ),
superclasses );
for( int i = 0; i < tags.length; i++ )
{
setCurrentTag( tags[i] );
@@ -571,10 +571,8 @@
{
boolean superclasses = TypeConversionUtil.stringToBoolean(
attributes.getProperty( "superclasses" ), true );
boolean sort = TypeConversionUtil.stringToBoolean(
attributes.getProperty( "sort" ), true );
-
XClass cur_class = getCurrentClass();
HashSet already = new HashSet();
-
do
{
XMember[] members = null;
1.25 +5 -2 xdoclet/core/src/xdoclet/tags/ClassTagsHandler.java
Index: ClassTagsHandler.java
===================================================================
RCS file: /cvsroot/xdoclet/xdoclet/core/src/xdoclet/tags/ClassTagsHandler.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -w -r1.24 -r1.25
--- ClassTagsHandler.java 24 Mar 2002 17:44:16 -0000 1.24
+++ ClassTagsHandler.java 26 Mar 2002 00:01:10 -0000 1.25
@@ -20,7 +20,7 @@
/**
* @author Ara Abrahamian ([EMAIL PROTECTED])
* @created Oct 14, 2001
- * @version $Revision: 1.24 $
+ * @version $Revision: 1.25 $
*/
public class ClassTagsHandler extends AbstractProgramElementTagsHandler
{
@@ -242,7 +242,6 @@
{
cur_class = classes[i];
setCurrentClass( cur_class );
-
if( cat.isDebugEnabled() )
cat.debug( "cur_class=" + cur_class );
@@ -272,6 +271,10 @@
generate( template );
}
}
+ }
+
+ public String modifiers() throws XDocletException {
+ return modifiers(FOR_CLASS);
}
/**
1.6 +5 -2 xdoclet/core/src/xdoclet/tags/ConstructorTagsHandler.java
Index: ConstructorTagsHandler.java
===================================================================
RCS file:
/cvsroot/xdoclet/xdoclet/core/src/xdoclet/tags/ConstructorTagsHandler.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -w -r1.5 -r1.6
--- ConstructorTagsHandler.java 24 Mar 2002 17:44:16 -0000 1.5
+++ ConstructorTagsHandler.java 26 Mar 2002 00:01:11 -0000 1.6
@@ -19,7 +19,7 @@
/**
* @author Jerome Bernard ([EMAIL PROTECTED])
* @created Jan 18, 2002
- * @version $Revision: 1.5 $
+ * @version $Revision: 1.6 $
*/
public class ConstructorTagsHandler extends AbstractProgramElementTagsHandler
{
@@ -398,6 +398,10 @@
return
firstSentenceDescriptionOfCurrentMember(getCurrentConstructor());
}
+ public String modifiers() throws XDocletException {
+ return modifiers(FOR_CONSTRUCTOR);
+ }
+
/**
* Returns the name of the current constructor.
*
@@ -422,7 +426,6 @@
return firstL + m.substring( 1 );
}
}
-
return getCurrentConstructor() != null ?
getCurrentConstructor().name() : "";
}
1.10 +5 -1 xdoclet/core/src/xdoclet/tags/FieldTagsHandler.java
Index: FieldTagsHandler.java
===================================================================
RCS file: /cvsroot/xdoclet/xdoclet/core/src/xdoclet/tags/FieldTagsHandler.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -w -r1.9 -r1.10
--- FieldTagsHandler.java 24 Mar 2002 17:44:17 -0000 1.9
+++ FieldTagsHandler.java 26 Mar 2002 00:01:11 -0000 1.10
@@ -17,7 +17,7 @@
/**
* @author <a href="mailto:[EMAIL PROTECTED]";>Aslak Helles�y</a>
* @created 13. januar 2002
- * @version $Revision: 1.9 $
+ * @version $Revision: 1.10 $
*/
public class FieldTagsHandler extends AbstractProgramElementTagsHandler
{
@@ -43,6 +43,10 @@
public void forAllFields( String template, Properties attributes ) throws
XDocletException
{
forAllMembers( template, attributes, FOR_FIELD );
+ }
+
+ public String modifiers() throws XDocletException {
+ return modifiers(FOR_FIELD);
}
/**
1.29 +6 -3 xdoclet/core/src/xdoclet/tags/MethodTagsHandler.java
Index: MethodTagsHandler.java
===================================================================
RCS file: /cvsroot/xdoclet/xdoclet/core/src/xdoclet/tags/MethodTagsHandler.java,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -w -r1.28 -r1.29
--- MethodTagsHandler.java 24 Mar 2002 17:44:17 -0000 1.28
+++ MethodTagsHandler.java 26 Mar 2002 00:01:11 -0000 1.29
@@ -19,7 +19,7 @@
/**
* @author Ara Abrahamian ([EMAIL PROTECTED])
* @created Oct 15, 2001
- * @version $Revision: 1.28 $
+ * @version $Revision: 1.29 $
*/
public class MethodTagsHandler extends AbstractProgramElementTagsHandler
{
@@ -28,6 +28,10 @@
return method.returnType().qualifiedName() +
method.returnDimensionAsString();
}
+ public String modifiers() throws XDocletException {
+ return modifiers(FOR_METHOD);
+ }
+
/**
* Merge with modified SubTask.methodNameWithoutPrefix
*
@@ -694,8 +698,7 @@
//no method with the specified name found in class
if( method_doc == null )
- throw new Error( "GRRR:" );
-// throw new XDocletException( Translator.getString(
"method_not_found", new String[]{method_name} ) );
+ throw new XDocletException( Translator.getString(
"method_not_found", new String[]{method_name} ) );
return method_doc.isAbstract();
}
1.10 +2 -2 xdoclet/core/src/xdoclet/tags/PackageTagsHandler.java
Index: PackageTagsHandler.java
===================================================================
RCS file: /cvsroot/xdoclet/xdoclet/core/src/xdoclet/tags/PackageTagsHandler.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -w -r1.9 -r1.10
--- PackageTagsHandler.java 24 Mar 2002 17:44:17 -0000 1.9
+++ PackageTagsHandler.java 26 Mar 2002 00:01:11 -0000 1.10
@@ -16,7 +16,7 @@
/**
* @author Ara Abrahamian ([EMAIL PROTECTED])
* @created Oct 14, 2001
- * @version $Revision: 1.9 $
+ * @version $Revision: 1.10 $
*/
public class PackageTagsHandler extends AbstractProgramElementTagsHandler
{
@@ -188,7 +188,7 @@
generate( template );
}
// restore current package to null, so subsequent class iterations can
- // perform outside the context of a current packages
+ // perform outside the context of a current package
setCurrentPackage( null );
} catch( XJavaDocException e ) {
throw new XDocletException( e, e.getMessage() );
_______________________________________________
Xdoclet-devel mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/xdoclet-devel
