User: rinkrank
Date: 02/02/22 08:28:22
Modified: core/src/xdoclet/tags MergeTagsHandler.java
Log:
-renamed the setTemplateFile(URL) to setTemplateURL(URL)
-changed File getTemplateFile() to URL getTemplateURL()
This was needed for backwards compatibility. The TemplateSubTask still has
a setTemplateURL that is called from Ant, and this method converts the File to an URL
and calls setTemplateURL.
Revision Changes Path
1.12 +7 -7 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.11
retrieving revision 1.12
diff -u -w -r1.11 -r1.12
--- MergeTagsHandler.java 20 Feb 2002 00:13:54 -0000 1.11
+++ MergeTagsHandler.java 22 Feb 2002 16:28:22 -0000 1.12
@@ -23,7 +23,7 @@
/**
* @author Ara Abrahamian ([EMAIL PROTECTED])
* @created Oct 15, 2001
- * @version $Revision: 1.11 $
+ * @version $Revision: 1.12 $
*/
public class MergeTagsHandler extends XDocletTagSupport
{
@@ -69,7 +69,7 @@
else
{
//use body of <XDtMerge:merge>
- generateUsingMergedFile( ( ( TemplateSubTask )
getDocletContext().getActiveSubTask() ).getTemplateFile().toString(), template );
+ generateUsingMergedFile( ( ( TemplateSubTask )
getDocletContext().getActiveSubTask() ).getTemplateURL().toString(), template );
}
}
else
@@ -177,14 +177,14 @@
try
{
int line_num = getEngine().getCurrentLineNum();
- URL prev_template_file = ( ( TemplateSubTask )
getDocletContext().getActiveSubTask() ).getTemplateFile();
+ URL prev_template_url = ( ( TemplateSubTask )
getDocletContext().getActiveSubTask() ).getTemplateURL();
- getEngine().setTemplateFile( new File( merge_file ).toURL() );
+ getEngine().setTemplateURL( new File( merge_file ).toURL() );
getEngine().setCurrentLineNum( 0 );
generate( contents );
- getEngine().setTemplateFile( prev_template_file );
+ getEngine().setTemplateURL( prev_template_url );
getEngine().setCurrentLineNum( line_num );
}
catch( MalformedURLException e )
@@ -223,9 +223,9 @@
try
{
- getEngine().setTemplateFile( new File( template_file_name
).toURL() );
+ getEngine().setTemplateURL( new File( template_file_name
).toURL() );
- String content = FileManager.getURLContent( ( (
TemplateSubTask ) getDocletContext().getActiveSubTask() ).getTemplateFile() );
+ String content = FileManager.getURLContent( ( (
TemplateSubTask ) getDocletContext().getActiveSubTask() ).getTemplateURL() );
if( content != null )
{
_______________________________________________
Xdoclet-devel mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/xdoclet-devel
