User: vharcq
Date: 02/04/08 14:30:27
Modified: core/src/xdoclet/tags MergeTagsHandler.java
Log:
Cache of merge files content is already made in FileManager
Revision Changes Path
1.20 +50 -67 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.19
retrieving revision 1.20
diff -u -w -r1.19 -r1.20
--- MergeTagsHandler.java 7 Apr 2002 13:53:17 -0000 1.19
+++ MergeTagsHandler.java 8 Apr 2002 21:30:27 -0000 1.20
@@ -30,13 +30,11 @@
/**
* @author Ara Abrahamian ([EMAIL PROTECTED])
* @created Oct 15, 2001
- * @version $Revision: 1.19 $
+ * @version $Revision: 1.20 $
*/
public class MergeTagsHandler extends XDocletTagSupport
{
- private static HashMap fileCache;
-
/**
* Merge contents of the file designated by the file parameter and evaluates
* the body if the file is not found. It searches for the file in the directory
@@ -119,20 +117,8 @@
{
Category cat = Log.getCategory( MergeTagsHandler.class, "merge" );
- if( fileCache == null )
- fileCache = new HashMap();
-
- String cacheFile = null;
+ String file = null;
- if( merge_file_pattern.indexOf( "{0}" ) == -1 &&
fileCache.containsKey( merge_file_pattern ) )
- {
- cacheFile = ( String ) fileCache.get( merge_file_pattern );
- return cacheFile;
- }
- else
- {
- if( cat.isDebugEnabled() )
- cat.debug( "not cached " + merge_file_pattern );
try
{
if( merge_file_pattern.indexOf( "{0}" ) != -1 )
@@ -159,7 +145,7 @@
cat.debug( "Search for
File OK" );
}
- cacheFile =
FileManager.getURLContent( merge_file.toURL() );
+ file = FileManager.getURLContent(
merge_file.toURL() );
}
else
{
@@ -181,7 +167,7 @@
if( merge_file.exists() )
{
- cacheFile = FileManager.getURLContent(
merge_file.toURL() );
+ file = FileManager.getURLContent(
merge_file.toURL() );
}
}
@@ -190,12 +176,12 @@
if( jarResource != null )
{
- cacheFile = FileManager.getURLContent(
jarResource );
+ file = FileManager.getURLContent( jarResource );
}
else
{
// not found on file system or in jar.
- cacheFile = null;
+ file = null;
}
}
catch( MalformedURLException e )
@@ -203,10 +189,7 @@
cat.error( e.getMessage() );
return null;
}
- }
- if( merge_file_pattern.indexOf( "{0}" ) == -1 )
- fileCache.put( merge_file_pattern, cacheFile );
- return cacheFile;
+ return file;
}
/**
_______________________________________________
Xdoclet-devel mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/xdoclet-devel
Sponsored by http://www.ThinkGeek.com/
