User: vharcq
Date: 02/04/14 23:59:04
Modified: core/src/xdoclet/tags MergeTagsHandler.java
Log:
Merging was not working anymore with templates out of xdoclet.jar
Revision Changes Path
1.22 +15 -1 xdoclet/core/src/xdoclet/tags/MergeTagsHandler.java
Index: MergeTagsHandler.java
===================================================================
RCS file: /cvsroot/xdoclet/xdoclet/core/src/xdoclet/tags/MergeTagsHandler.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -w -r1.21 -r1.22
--- MergeTagsHandler.java 10 Apr 2002 22:52:14 -0000 1.21
+++ MergeTagsHandler.java 15 Apr 2002 06:59:03 -0000 1.22
@@ -30,7 +30,7 @@
/**
* @author Ara Abrahamian ([EMAIL PROTECTED])
* @created Oct 15, 2001
- * @version $Revision: 1.21 $
+ * @version $Revision: 1.22 $
*/
public class MergeTagsHandler extends XDocletTagSupport
{
@@ -69,6 +69,9 @@
if( contents != null )
{
+ if( cat.isDebugEnabled() )
+ cat.debug( "Merge File found" );
+
String generate_merged_file = attributes.getProperty(
"generateMergedFile" );
if( generate_merged_file != null &&
!generate_merged_file.equalsIgnoreCase( "true" ) &&
!generate_merged_file.equalsIgnoreCase( "yes" ) )
@@ -82,6 +85,8 @@
}
else
{
+ if( cat.isDebugEnabled() )
+ cat.debug( "Merge File NOT found" );
//use body of <XDtMerge:merge>
generateUsingMergedFile( ( ( TemplateSubTask )
getDocletContext().getActiveSubTask() ).getTemplateURL().toString(), template );
}
@@ -173,10 +178,19 @@
if( merge_file.exists() )
{
+ if( cat.isDebugEnabled() )
+ cat.debug( "Merge file found
in " + getDocletContext().getActiveSubTask().getMergeDir() );
file = FileManager.getURLContent(
merge_file.toURL() );
}
+ else
+ {
+ if( cat.isDebugEnabled() )
+ cat.debug( "Merge file NOT
found in " + getDocletContext().getActiveSubTask().getMergeDir() );
+ }
}
}
+ if( file != null )
+ return file;
//was not found in mergedir, try the jar
URL jarResource = getClass().getResource( '/' +
merge_file_pattern );
_______________________________________________
Xdoclet-devel mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/xdoclet-devel
