User: vharcq
Date: 02/04/03 13:03:38
Modified: core/src/xdoclet XDocletTagSupport.java
Log:
There were still some problems with jboss:jdbc-type,... tags that still works
witjout an attribute name
Revision Changes Path
1.31 +2 -16 xdoclet/core/src/xdoclet/XDocletTagSupport.java
Index: XDocletTagSupport.java
===================================================================
RCS file: /cvsroot/xdoclet/xdoclet/core/src/xdoclet/XDocletTagSupport.java,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -w -r1.30 -r1.31
--- XDocletTagSupport.java 29 Mar 2002 17:08:02 -0000 1.30
+++ XDocletTagSupport.java 3 Apr 2002 21:03:38 -0000 1.31
@@ -32,7 +32,7 @@
*
* @author Dmitri Colebatch ([EMAIL PROTECTED])
* @created October 12, 2001
- * @version $Revision: 1.30 $
+ * @version $Revision: 1.31 $
*/
public abstract class XDocletTagSupport extends TemplateTagHandler
{
@@ -423,10 +423,9 @@
XProgramElement prg_elem = getPrgElem(for_type);
XDoc doc = prg_elem.doc();
XTag tag = doc.tag( tag_name, superclasses );
- if (getCurrentTag() != null)
- tag = getCurrentTag();
if( tag != null )
tagValue = tag.value();
+ if (tagValue != null && tagValue.trim().length() == 0) tagValue =
null;
if (tagValue != null && tagValue.startsWith("\"")) tagValue =
tagValue.substring(1,tagValue.length() - 1);
}
}
@@ -559,8 +558,6 @@
*/
protected static boolean isTagValueEqual( Properties attributes, int for_type
) throws XDocletException
{
- checkLegacy(attributes);
-
// the value to check for
String value = attributes.getProperty( "value" );
if( value == null ) {
@@ -601,18 +598,7 @@
*/
protected static boolean hasTag( Properties attributes, int for_type ) throws
XDocletException
{
- checkLegacy(attributes);
-
return getTagValue(attributes, for_type) != null;
- }
-
- /**
- * @todo remove this method after xjavadoc refactoring
- */
- private static void checkLegacy(Properties attributes) throws XDocletException
{
- // this is just a check to get rid of legacy functionality in the
templates
- String param_num = attributes.getProperty( "paramNum" );
- if( param_num != null ) throw new XDocletException("paramNum is
deprecated. Fix the template to use attributes");
}
/**
_______________________________________________
Xdoclet-devel mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/xdoclet-devel
