Update of /cvsroot/xdoclet/xdoclet/core/src/xdoclet
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20912/core/src/xdoclet
Modified Files:
TemplateSubTask.java
Log Message:
XDT-1061: patch from Peilin Zhang to allow hibernate mapping files to be
generated when only a @hibernate.query tag is present in a java source file
Index: TemplateSubTask.java
===================================================================
RCS file: /cvsroot/xdoclet/xdoclet/core/src/xdoclet/TemplateSubTask.java,v
retrieving revision 1.79
retrieving revision 1.80
diff -C2 -r1.79 -r1.80
*** TemplateSubTask.java 6 Apr 2005 23:56:18 -0000 1.79
--- TemplateSubTask.java 18 Apr 2005 21:59:07 -0000 1.80
***************
*** 20,23 ****
--- 20,24 ----
import xdoclet.template.TemplateException;
import xdoclet.template.XDocletTemplateMessages;
+ import xdoclet.util.DocletUtil;
import xdoclet.util.LogUtil;
import xdoclet.util.Translator;
***************
*** 86,90 ****
* @see #getHavingClassTag()
*/
! private String havingClassTag = null;
/**
--- 87,91 ----
* @see #getHavingClassTag()
*/
! private String[] havingClassTags = null;
/**
***************
*** 223,233 ****
/**
! * Gets the HavingClassTag attribute of the TemplateSubTask object
*
* @return The HavingClassTag value
*/
! public String getHavingClassTag()
{
! return havingClassTag;
}
--- 224,234 ----
/**
! * Gets the HavingClassTags attribute of the TemplateSubTask object
*
* @return The HavingClassTag value
*/
! public String[] getHavingClassTags()
{
! return havingClassTags;
}
***************
*** 384,388 ****
/**
! * Sets the HavingClassTag attribute of the TemplateSubTask object
*
* @param havingClassTag The new HavingClassTag value
--- 385,389 ----
/**
! * Sets the HavingClassTags attribute of the TemplateSubTask object
*
* @param havingClassTag The new HavingClassTag value
***************
*** 390,394 ****
public void setHavingClassTag(String havingClassTag)
{
! this.havingClassTag = havingClassTag;
}
--- 391,405 ----
public void setHavingClassTag(String havingClassTag)
{
! setHavingClassTags(new String[]{havingClassTag});
! }
!
! /**
! * Sets the HavingClassTags attribute of the TemplateSubTask object
! *
! * @param havingClassTags The new HavingClassTag value
! */
! public void setHavingClassTags(String[] havingClassTags)
! {
! this.havingClassTags = havingClassTags;
}
***************
*** 438,442 ****
}
setExtentValue(src.getExtent());
! setHavingClassTag(src.getHavingClassTag());
setSubTaskClassName(src.getSubTaskClassName());
for (int i = 0; i < src.packageSubstitutions.size(); i++) {
--- 449,453 ----
}
setExtentValue(src.getExtent());
! setHavingClassTags(src.getHavingClassTags());
setSubTaskClassName(src.getSubTaskClassName());
for (int i = 0; i < src.packageSubstitutions.size(); i++) {
***************
*** 590,594 ****
log.debug("getOfType()=" + getOfType());
log.debug("getExtent()=" + getExtent());
! log.debug("getHavingClassTag()=" + getHavingClassTag());
}
--- 601,605 ----
log.debug("getOfType()=" + getOfType());
log.debug("getExtent()=" + getExtent());
! log.debug("getHavingClassTag()=" +
DocletUtil.arrayToDelimitedString(getHavingClassTags(), ", "));
}
***************
*** 724,731 ****
return false;
! if (getHavingClassTag() != null) {
! if (!clazz.getDoc().hasTag(getHavingClassTag(), false)) {
if (log.isDebugEnabled()) {
! log.debug("Reject class '" + clazz.getQualifiedName() +
"' because it doesn't have class tag '" + getHavingClassTag() + "'.");
}
return false;
--- 735,754 ----
return false;
! String[] havingClassTags = getHavingClassTags();
!
! if (havingClassTags != null && havingClassTags.length > 0) {
!
! XDoc xdoc = clazz.getDoc();
! boolean foundClassTag = false;
!
! for (int i = 0; i < havingClassTags.length; i++) {
! if (xdoc.hasTag(havingClassTags[i])) {
! foundClassTag = true;
! break;
! }
! }
! if (!foundClassTag) {
if (log.isDebugEnabled()) {
! log.debug("Reject class '" + clazz.getQualifiedName() +
"' because it doesn't have at least one of class tags '" +
DocletUtil.arrayToDelimitedString(havingClassTags, ", ") + "'.");
}
return false;
***************
*** 733,737 ****
else {
if (log.isDebugEnabled()) {
! log.debug("Accept class '" + clazz.getQualifiedName() +
"' because it has class tag '" + getHavingClassTag() + "'.");
}
}
--- 756,760 ----
else {
if (log.isDebugEnabled()) {
! log.debug("Accept class '" + clazz.getQualifiedName() +
"' because it has at least one of class tags '" +
DocletUtil.arrayToDelimitedString(havingClassTags, ", ") + "'.");
}
}
-------------------------------------------------------
This SF.Net email is sponsored by: New Crystal Reports XI.
Version 11 adds new functionality designed to reduce time involved in
creating, integrating, and deploying reporting solutions. Free runtime info,
new features, or free trial, at: http://www.businessobjects.com/devxi/728
_______________________________________________
xdoclet-devel mailing list
xdoclet-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/xdoclet-devel
