User: vharcq
Date: 02/04/10 15:52:14
Modified: core/src/xdoclet GenerationManager.java
Log:
Do not try to merge when mergedir have not been specified for {0} merge files
Revision Changes Path
1.11 +5 -3 xdoclet/core/src/xdoclet/GenerationManager.java
Index: GenerationManager.java
===================================================================
RCS file: /cvsroot/xdoclet/xdoclet/core/src/xdoclet/GenerationManager.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -w -r1.10 -r1.11
--- GenerationManager.java 7 Apr 2002 11:24:10 -0000 1.10
+++ GenerationManager.java 10 Apr 2002 22:52:14 -0000 1.11
@@ -34,7 +34,7 @@
*
* @author Vincent Harcq ([EMAIL PROTECTED])
* @created March 30, 2002
- * @version $Revision: 1.10 $
+ * @version $Revision: 1.11 $
*/
public class GenerationManager implements java.io.Serializable
{
@@ -467,11 +467,13 @@
String ejb_name = MessageFormat.format(
merge_file_pattern, new Object[]{AbstractProgramElementTagsHandler.getClassNameFor(
aClass )} );
String merge_file_name =
PackageTagsHandler.packageNameAsPathFor( aClass.containingPackage() ) + File.separator
+ ejb_name;
+ if( subTask.getMergeDir() != null )
merge_files.add( new File(
subTask.getMergeDir(), merge_file_name ) );
}
}
else
{
+ if( subTask.getMergeDir() != null )
merge_files.add( new File( subTask.getMergeDir(),
merge_file_pattern ) );
}
for( Iterator iterator = merge_files.iterator();
iterator.hasNext(); )
_______________________________________________
Xdoclet-devel mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/xdoclet-devel
