User: vharcq
Date: 02/04/01 13:47:18
Modified: core/src/xdoclet/tags MergeTagsHandler.java
Log:
isGenerationNeeded does not need a merge files db anymore. It runs super fast
because the parsing done on the .j only focuses on finding the merge files and does
not call TagsHandlers at all.
Revision Changes Path
1.16 +22 -21 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.15
retrieving revision 1.16
diff -u -w -r1.15 -r1.16
--- MergeTagsHandler.java 1 Apr 2002 09:30:49 -0000 1.15
+++ MergeTagsHandler.java 1 Apr 2002 21:47:18 -0000 1.16
@@ -25,7 +25,7 @@
/**
* @author Ara Abrahamian ([EMAIL PROTECTED])
* @created Oct 15, 2001
- * @version $Revision: 1.15 $
+ * @version $Revision: 1.16 $
*/
public class MergeTagsHandler extends XDocletTagSupport
{
@@ -108,6 +108,9 @@
{
if( merge_file_pattern.indexOf( "{0}" ) != -1 )
{
+ if( getParser() != null )
+ getParser().addMergeFile( merge_file_pattern );
+ else {
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;
File merge_file = new File(
getDocletContext().getActiveSubTask().getMergeDir(), merge_file_name );
@@ -115,9 +118,6 @@
if( cat.isDebugEnabled() )
cat.debug( "Search for File " + merge_file );
- if( getParser() != null )
- getParser().addMergeFile( merge_file_pattern );
-
if( merge_file.exists() )
{
if( cat.isDebugEnabled() )
@@ -130,6 +130,7 @@
if( cat.isDebugEnabled() )
cat.debug( "Search for File not OK" );
}
+ }
}
else
{
_______________________________________________
Xdoclet-devel mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/xdoclet-devel
