User: vharcq
Date: 02/04/10 15:52:14
Modified: core/src/xdoclet/tags MergeTagsHandler.java
Log:
Do not try to merge when mergedir have not been specified for {0} merge files
Revision Changes Path
1.21 +29 -22 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.20
retrieving revision 1.21
diff -u -w -r1.20 -r1.21
--- MergeTagsHandler.java 8 Apr 2002 21:30:27 -0000 1.20
+++ MergeTagsHandler.java 10 Apr 2002 22:52:14 -0000 1.21
@@ -30,7 +30,7 @@
/**
* @author Ara Abrahamian ([EMAIL PROTECTED])
* @created Oct 15, 2001
- * @version $Revision: 1.20 $
+ * @version $Revision: 1.21 $
*/
public class MergeTagsHandler extends XDocletTagSupport
{
@@ -131,6 +131,9 @@
{
String ejb_name = MessageFormat.format(
merge_file_pattern, new Object[]{AbstractProgramElementTagsHandler.getClassNameFor(
getCurrentClass() )} );
String merge_file_name =
PackageTagsHandler.packageNameAsPathFor( getCurrentClass().containingPackage() ) +
File.separator + ejb_name;
+
+ if(
getDocletContext().getActiveSubTask().getMergeDir() != null )
+ {
File merge_file = new File(
getDocletContext().getActiveSubTask().getMergeDir(), merge_file_name );
if( cat.isDebugEnabled() )
@@ -156,8 +159,11 @@
}
}
}
+ }
else
{
+ if(
getDocletContext().getActiveSubTask().getMergeDir() != null )
+ {
File merge_file = new File(
getDocletContext().getActiveSubTask().getMergeDir(), merge_file_pattern );
if( getParser() != null )
@@ -168,6 +174,7 @@
if( merge_file.exists() )
{
file = FileManager.getURLContent(
merge_file.toURL() );
+ }
}
}
_______________________________________________
Xdoclet-devel mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/xdoclet-devel
