User: vharcq
Date: 02/03/17 09:46:58
Modified: core/src/xdoclet Tag: XJAVADOC_REFACTORING
XDocletTagSupport.java
Log:
Home interfaces compiles now
Revision Changes Path
No revision
No revision
1.24.2.5 +30 -14 xdoclet/core/src/xdoclet/XDocletTagSupport.java
Index: XDocletTagSupport.java
===================================================================
RCS file: /cvsroot/xdoclet/xdoclet/core/src/xdoclet/XDocletTagSupport.java,v
retrieving revision 1.24.2.4
retrieving revision 1.24.2.5
diff -u -w -r1.24.2.4 -r1.24.2.5
--- XDocletTagSupport.java 17 Mar 2002 13:21:46 -0000 1.24.2.4
+++ XDocletTagSupport.java 17 Mar 2002 17:46:58 -0000 1.24.2.5
@@ -32,7 +32,7 @@
*
* @author Dmitri Colebatch ([EMAIL PROTECTED])
* @created October 12, 2001
- * @version $Revision: 1.24.2.4 $
+ * @version $Revision: 1.24.2.5 $
*/
public abstract class XDocletTagSupport extends TemplateTagHandler
{
@@ -414,6 +414,7 @@
superclasses,
is_mandatory
);
+
tagValue = delimit(tagValue,attributes);
return tagValue;
}
@@ -475,12 +476,18 @@
{
String value = null;
- if( param_name == null ) {
+ if( param_name == null )
+ {
// the value of the tag is requested
XTag tag = doc.tag( tag_name, superclasses );
+ if (getCurrentTag() != null)
+ tag = getCurrentTag();
if( tag != null )
value = tag.value();
} else {
+ if (getCurrentTag() != null)
+ value = getCurrentTag().attributeValue(param_name);
+ else
// the value of a tag attribute is requested
value = doc.tagAttributeValue( tag_name, param_name,
superclasses );
}
@@ -541,7 +548,8 @@
// lookup to the surrounding current class or method.
String tag_name = attributes.getProperty( "tagName" );
String param_name = attributes.getProperty( "paramName" );
- if( getCurrentTag() != null && getCurrentTag().name().equals( "@" +
tag_name ) )
+
+ if( getCurrentTag() != null && getCurrentTag().name().equals( tag_name
) )
{
attribute_value = getCurrentTag().attributeValue( param_name );
}
@@ -640,6 +648,9 @@
new String[]{programElement.toString()} ) );
}
+ /**
+ * @todo fix the () equals test, it is not nice. Test : finder Home definition
on AccountBean
+ */
protected static String delimit(String attribute_value,Properties attributes){
// Optional Parameter
String delim = attributes.getProperty("delimiter");
@@ -649,6 +660,10 @@
tokenNumber = Integer.parseInt(tokenNumberStr);
if (delim != null)
{
+ if (delim.equals("()") && attribute_value.indexOf(delim) != -1)
+ attribute_value = "";
+ else
+ {
StringTokenizer st = new StringTokenizer(attribute_value,delim);
String tok = "";
for (int i = 0; i <= tokenNumber; i ++)
@@ -657,6 +672,7 @@
else tok = "";
}
attribute_value = tok;
+ }
}
return attribute_value;
}
_______________________________________________
Xdoclet-devel mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/xdoclet-devel
