User: ara_e_w
Date: 02/02/28 12:22:47
Modified: core/src/xdoclet/tags AbstractProgramElementTagsHandler.java
ClassTagsHandler.java ConstructorTagsHandler.java
FieldTagsHandler.java MethodTagsHandler.java
Log:
sad but true: other than the @namespace:tag we have to support @namespace.tag
notation too because of JDK1.4's strictness with unknown @tags
I made all neccessary changes (mini changes alctually, and changed CustomerBMPBean
for test).
PLEASE DON'T USE Doc.tags() methods directly, use DocletUtil.getTagsByName.
Revision Changes Path
1.20 +1 -2
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.19
retrieving revision 1.20
diff -u -w -r1.19 -r1.20
--- AbstractProgramElementTagsHandler.java 6 Feb 2002 00:22:53 -0000 1.19
+++ AbstractProgramElementTagsHandler.java 28 Feb 2002 20:22:47 -0000 1.20
@@ -23,7 +23,7 @@
/**
* @author Ara Abrahamian ([EMAIL PROTECTED])
* @created Oct 15, 2001
- * @version $Revision: 1.19 $
+ * @version $Revision: 1.20 $
*/
public abstract class AbstractProgramElementTagsHandler extends XDocletTagSupport
{
@@ -271,7 +271,6 @@
String param_num = attributes.getProperty( "paramNum" );
String superClassesStr = attributes.getProperty( "superclasses" );
boolean superClasses = TypeConversionUtil.stringToBoolean(
superClassesStr, true );
- String value = null;
int param_int = -1;
if( param_num != null )
1.21 +5 -3 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.20
retrieving revision 1.21
diff -u -w -r1.20 -r1.21
--- ClassTagsHandler.java 28 Feb 2002 16:15:50 -0000 1.20
+++ ClassTagsHandler.java 28 Feb 2002 20:22:47 -0000 1.21
@@ -21,7 +21,7 @@
/**
* @author Ara Abrahamian ([EMAIL PROTECTED])
* @created Oct 14, 2001
- * @version $Revision: 1.20 $
+ * @version $Revision: 1.21 $
*/
public class ClassTagsHandler extends AbstractProgramElementTagsHandler
{
@@ -688,8 +688,10 @@
for( int i = 0; i < class_tags.length; i++ )
{
- //omit ejbdoclet-specific tags, which all have a ":"
- if( class_tags[i].name().lastIndexOf( ':' ) == -1 )
+ //omit ejbdoclet-specific tags, which all have a ":" or "."
+ String class_tag = class_tags[i].name();
+
+ if( class_tag.lastIndexOf( ':' ) == -1 &&
class_tag.lastIndexOf( '.' ) == -1 )
{
result.append( spaces ).append( " * " ).append(
class_tags[i].name() ).append( ' ' );
1.3 +5 -3 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.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- ConstructorTagsHandler.java 5 Feb 2002 00:35:59 -0000 1.2
+++ ConstructorTagsHandler.java 28 Feb 2002 20:22:47 -0000 1.3
@@ -18,7 +18,7 @@
/**
* @author Jerome Bernard ([EMAIL PROTECTED])
* @created Jan 18, 2002
- * @version $Revision: 1.2 $
+ * @version $Revision: 1.3 $
*/
public class ConstructorTagsHandler extends AbstractProgramElementTagsHandler
{
@@ -161,8 +161,10 @@
for( int i = 0; i < constructor_tags.length; i++ )
{
- //all of our xdoclet-specific tags have a ":"
- if( constructor_tags[i].name().lastIndexOf(
':' ) == -1 )
+ //all of our xdoclet-specific tags have a ":"
or "."
+ String constructor_tag_name =
constructor_tags[i].name();
+
+ if( constructor_tag_name.lastIndexOf( ':' ) ==
-1 && constructor_tag_name.lastIndexOf( '.' ) == -1 )
{
result.append( spaces ).append( " * " )
.append(
constructor_tags[i].name() ).append( ' ' )
1.7 +4 -4 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.6
retrieving revision 1.7
diff -u -w -r1.6 -r1.7
--- FieldTagsHandler.java 12 Feb 2002 20:29:50 -0000 1.6
+++ FieldTagsHandler.java 28 Feb 2002 20:22:47 -0000 1.7
@@ -17,7 +17,7 @@
/**
* @author <a href="mailto:[EMAIL PROTECTED]";>Aslak Helles�y</a>
* @created 13. januar 2002
- * @version $Revision: 1.6 $
+ * @version $Revision: 1.7 $
*/
public class FieldTagsHandler extends AbstractProgramElementTagsHandler
{
@@ -109,7 +109,7 @@
if( getCurrentField() == null )
throw new XDocletException( Translator.getString(
"only_call_field_not_null", new String[]{"forAllFieldTags"} ) );
- Tag[] tags = getCurrentField().tags( attributes.getProperty( "tagName"
) );
+ Tag[] tags = DocletUtil.getTagsByName( getCurrentField(),
attributes.getProperty( "tagName" ) );
for( int i = 0; i < tags.length; i++ )
{
1.25 +6 -4 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.24
retrieving revision 1.25
diff -u -w -r1.24 -r1.25
--- MethodTagsHandler.java 26 Feb 2002 17:37:57 -0000 1.24
+++ MethodTagsHandler.java 28 Feb 2002 20:22:47 -0000 1.25
@@ -18,7 +18,7 @@
/**
* @author Ara Abrahamian ([EMAIL PROTECTED])
* @created Oct 15, 2001
- * @version $Revision: 1.24 $
+ * @version $Revision: 1.25 $
*/
public class MethodTagsHandler extends AbstractProgramElementTagsHandler
{
@@ -275,8 +275,10 @@
for( int i = 0; i < method_tags.length; i++ )
{
- //all of our xdoclet-specific tags have a ":"
- if( method_tags[i].name().lastIndexOf( ':' )
== -1 )
+ //all of our xdoclet-specific tags have a ":"
or "."
+ String method_tag_name = method_tags[i].name();
+
+ if( method_tag_name.lastIndexOf( ':' ) == -1
&& method_tag_name.lastIndexOf( '.' ) == -1 )
{
result.append( spaces ).append( " * " )
.append( method_tags[i].name()
).append( ' ' )
@@ -712,7 +714,7 @@
if( getCurrentMethod() == null )
throw new XDocletException( Translator.getString(
"only_call_method_not_null", new String[]{"forAllMethodTags"} ) );
- Tag[] tags = getCurrentMethod().tags( attributes.getProperty(
"tagName" ) );
+ Tag[] tags = DocletUtil.getTagsByName( getCurrentMethod(),
attributes.getProperty( "tagName" ) );
for( int i = 0; i < tags.length; i++ )
{
_______________________________________________
Xdoclet-devel mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/xdoclet-devel
