User: vharcq
Date: 02/04/01 03:19:44
Modified: core/src/xdoclet GenerationManager.java TemplateSubTask.java
Log:
Avoid to have an empty list of merge files
Revision Changes Path
1.5 +3 -3 xdoclet/core/src/xdoclet/GenerationManager.java
Index: GenerationManager.java
===================================================================
RCS file: /cvsroot/xdoclet/xdoclet/core/src/xdoclet/GenerationManager.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -w -r1.4 -r1.5
--- GenerationManager.java 1 Apr 2002 09:30:46 -0000 1.4
+++ GenerationManager.java 1 Apr 2002 11:19:44 -0000 1.5
@@ -30,7 +30,7 @@
*
* @author Vincent Harcq ([EMAIL PROTECTED])
* @created March 30, 2002
- * @version $Revision: 1.4 $
+ * @version $Revision: 1.5 $
*/
public class GenerationManager
{
@@ -268,7 +268,7 @@
}
files = subTask.getParser().getMergeFiles();
- updateParserDb(templateURL, files);
+ if (files != null) updateParserDb(templateURL, files);
}
else
{
@@ -387,7 +387,7 @@
throws XDocletException{
// Merge existing list with new list
String[] mergeFiles = (String[])getParserDb().get(new
File(templateURL.getFile()).getName());
- List complete = Arrays.asList(files);
+ List complete = new ArrayList(Arrays.asList(files));
if (mergeFiles != null)
{
for (int j = 0; j < mergeFiles.length; j++) {
1.36 +1 -3 xdoclet/core/src/xdoclet/TemplateSubTask.java
Index: TemplateSubTask.java
===================================================================
RCS file: /cvsroot/xdoclet/xdoclet/core/src/xdoclet/TemplateSubTask.java,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -w -r1.35 -r1.36
--- TemplateSubTask.java 1 Apr 2002 09:30:47 -0000 1.35
+++ TemplateSubTask.java 1 Apr 2002 11:19:44 -0000 1.36
@@ -29,7 +29,7 @@
*
* @author Ara Abrahamian ([EMAIL PROTECTED])
* @created Sep 25, 2001
- * @version $Revision: 1.35 $
+ * @version $Revision: 1.36 $
*/
public class TemplateSubTask extends SubTask
{
@@ -424,8 +424,6 @@
throw new XDocletException( e,
Translator.getString( "running_failed" ) );
}
}
-
- GenerationManager.updateParserDb(getTemplateURL(),
getParser().getMergeFiles());
}
}
_______________________________________________
Xdoclet-devel mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/xdoclet-devel
