User: ara_e_w
Date: 02/06/08 05:37:26
Modified: core/src/xdoclet/tagshandler MergeTagsHandler.java
TypeTagsHandler.java
Log:
- fixes second-generation-run-fails bug
- fixes isOfType problem (type is comma-separated, code was lost during xjavadoc
transition)
Revision Changes Path
1.3 +9 -6 xdoclet/core/src/xdoclet/tagshandler/MergeTagsHandler.java
Index: MergeTagsHandler.java
===================================================================
RCS file:
/cvsroot/xdoclet/xdoclet/core/src/xdoclet/tagshandler/MergeTagsHandler.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- MergeTagsHandler.java 28 May 2002 21:44:55 -0000 1.2
+++ MergeTagsHandler.java 8 Jun 2002 12:37:26 -0000 1.3
@@ -23,6 +23,7 @@
import xdoclet.XDocletException;
import xdoclet.XDocletTagSupport;
import xdoclet.template.PrettyPrintWriter;
+import xdoclet.template.TemplateParser;
import xdoclet.util.FileManager;
import xdoclet.util.LogUtil;
@@ -30,7 +31,7 @@
* @author Ara Abrahamian ([EMAIL PROTECTED])
* @created Oct 15, 2001
* @xdoclet:taghandler namespace="Merge"
- * @version $Revision: 1.2 $
+ * @version $Revision: 1.3 $
*/
public class MergeTagsHandler extends XDocletTagSupport
{
@@ -115,8 +116,8 @@
try {
if (mergeFilePattern.indexOf("{0}") != -1) {
- if (getParser() != null) {
- getParser().addMergeFile(mergeFilePattern);
+ if (getEngine() instanceof TemplateParser) {
+ ((TemplateParser) getEngine()).addMergeFile(mergeFilePattern);
}
else {
@@ -142,13 +143,15 @@
if (getDocletContext().getActiveSubTask().getMergeDir() != null) {
File mergeFile = new
File(getDocletContext().getActiveSubTask().getMergeDir(), mergeFilePattern);
- if (getParser() != null) {
+ if (getEngine() instanceof TemplateParser) {
+ TemplateParser parser = (TemplateParser) getEngine();
+
// This avoids infinite loop when a merge file merge itself
- if (getParser().hasMergeFile(mergeFilePattern)) {
+ if (parser.hasMergeFile(mergeFilePattern)) {
return null;
}
else {
- getParser().addMergeFile(mergeFilePattern);
+ parser.addMergeFile(mergeFilePattern);
}
}
1.3 +12 -2 xdoclet/core/src/xdoclet/tagshandler/TypeTagsHandler.java
Index: TypeTagsHandler.java
===================================================================
RCS file:
/cvsroot/xdoclet/xdoclet/core/src/xdoclet/tagshandler/TypeTagsHandler.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- TypeTagsHandler.java 28 May 2002 22:35:25 -0000 1.2
+++ TypeTagsHandler.java 8 Jun 2002 12:37:26 -0000 1.3
@@ -22,7 +22,7 @@
* @author Dmitri Colebatch ([EMAIL PROTECTED])
* @created October 12, 2001
* @xdoclet:taghandler namespace="Type"
- * @version $Revision: 1.2 $
+ * @version $Revision: 1.3 $
*/
public class TypeTagsHandler extends XDocletTagSupport
{
@@ -105,7 +105,17 @@
public static boolean isOfType(XClass clazz, String type, int extent)
{
// ignoring the extent parameter. I don't understand what it's for (Aslak)
- return clazz.isA(type);
+
+ StringTokenizer st = new StringTokenizer(type, ",");
+
+ while (st.hasMoreTokens()) {
+ String type_str = st.nextToken();
+
+ if (clazz.isA(type_str))
+ return true;
+ }
+
+ return false;
}
/**
_______________________________________________________________
Don't miss the 2002 Sprint PCS Application Developer's Conference
August 25-28 in Las Vegas -
http://devcon.sprintpcs.com/adp/index.cfm?source=osdntextlink
_______________________________________________
Xdoclet-devel mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/xdoclet-devel
