User: rinkrank
  Date: 02/02/22 08:28:21

  Modified:    core/src/xdoclet TemplateSubTask.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.24      +15 -15    xdoclet/core/src/xdoclet/TemplateSubTask.java
  
  Index: TemplateSubTask.java
  ===================================================================
  RCS file: /cvsroot/xdoclet/xdoclet/core/src/xdoclet/TemplateSubTask.java,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -w -r1.23 -r1.24
  --- TemplateSubTask.java      15 Feb 2002 17:57:51 -0000      1.23
  +++ TemplateSubTask.java      22 Feb 2002 16:28:21 -0000      1.24
  @@ -30,7 +30,7 @@
    *
    * @author    Ara Abrahamian ([EMAIL PROTECTED])
    * @created   Sep 25, 2001
  - * @version   $Revision: 1.23 $
  + * @version   $Revision: 1.24 $
    */
   public class TemplateSubTask extends SubTask
   {
  @@ -120,7 +120,7 @@
                return parser;
        }
   
  -     public URL getTemplateFile()
  +     public URL getTemplateURL()
        {
                return templateFile;
        }
  @@ -186,7 +186,7 @@
         *
         * @param templateFile  the URL of the template file
         */
  -     public void setTemplateFile( URL templateFile )
  +     public void setTemplateURL( URL templateFile )
        {
                this.templateFile = templateFile;
        }
  @@ -203,7 +203,7 @@
                {
                        try
                        {
  -                             setTemplateFile( templateFile.toURL() );
  +                             setTemplateURL( templateFile.toURL() );
                        }
                        catch( MalformedURLException e )
                        {
  @@ -235,7 +235,7 @@
        {
                setPrefixWithPackageStructure( src.isPrefixWithPackageStructure() );
                setDestinationFile( src.getDestinationFile() );
  -             setTemplateFile( src.getTemplateFile() );
  +             setTemplateURL( src.getTemplateURL() );
                setOfType( src.getOfType() );
                setExtentValue( src.getExtent() );
                setHavingClassTag( src.getHavingClassTag() );
  @@ -265,7 +265,7 @@
        {
                super.validateOptions();
   
  -             if( getTemplateFile() == null )
  +             if( getTemplateURL() == null )
                        throw new XDocletException( Translator.getString( 
"template_parameter_missing", new String[]{"templateFile"} ) );
   
                if( getDestinationFile() == null )
  @@ -315,7 +315,7 @@
                if( cat.isDebugEnabled() )
                {
                        cat.debug( "destDir.toString()=" + getDestDir() );
  -                     cat.debug( "getTemplateFile()=" + getTemplateFile() );
  +                     cat.debug( "getTemplateURL()=" + getTemplateURL() );
                        cat.debug( "getDestinationfile()=" + getDestinationFile() );
                        cat.debug( "getOfType()=" + getOfType() );
                        cat.debug( "getExtent()=" + getExtent() );
  @@ -343,7 +343,7 @@
                {
                        if( cat.isDebugEnabled() )
                                cat.debug( "Not per class." );
  -                     getEngine().setTemplateFile( getTemplateFile() );
  +                     getEngine().setTemplateURL( getTemplateURL() );
   
                        File output_file = new File( getDestDir(), 
getDestinationFile() );
   
  @@ -351,7 +351,7 @@
                        {
                                if( isGenerationNeeded( output_file ) )
                                {
  -                                     startEngine( getTemplateFile(), output_file );
  +                                     startEngine( getTemplateURL(), output_file );
                                }
                        }
                        catch( TemplateException e )
  @@ -447,7 +447,7 @@
   
                try
                {
  -                     startEngine( getTemplateFile(), new File( getDestDir(), 
getGeneratedFileName( clazz ) ) );
  +                     startEngine( getTemplateURL(), new File( getDestDir(), 
getGeneratedFileName( clazz ) ) );
                }
                catch( TemplateException e )
                {
  @@ -467,9 +467,9 @@
                Category cat = Log.getCategory( TemplateSubTask.class, "engineStarted" 
);
   
                if( isGenerationPerClass() )
  -                     System.out.println( Translator.getString( 
"generating_template_output_per_class", new 
String[]{getCurrentClass().qualifiedName(), getTemplateFile().toString()} ) );
  +                     System.out.println( Translator.getString( 
"generating_template_output_per_class", new 
String[]{getCurrentClass().qualifiedName(), getTemplateURL().toString()} ) );
                else
  -                     System.out.println( Translator.getString( 
"generating_template_output_single_file", new String[]{getDestinationFile(), 
getTemplateFile().toString()} ) );
  +                     System.out.println( Translator.getString( 
"generating_template_output_single_file", new String[]{getDestinationFile(), 
getTemplateURL().toString()} ) );
   
                if( cat.isDebugEnabled() )
                {
  @@ -505,7 +505,7 @@
                throw new IllegalStateException( Translator.getString( 
"couldnt_find_bean", new String[]{ClassTagsHandler.getFullClassNameFor( clazz ), 
tokenizedSourcePath} ) );
        }
   
  -     protected void startEngine( URL template_file, File output_file ) throws 
TemplateException
  +     protected void startEngine( URL templateURL, File output_file ) throws 
TemplateException
        {
                //Category cat = Log.getCategory( TemplateSubTask.class, "startEngine" 
);
   
  @@ -515,7 +515,7 @@
                engineStarted();
   
                getEngine().setOutput( output_file );
  -             getEngine().setTemplateFile( template_file );
  +             getEngine().setTemplateURL( templateURL );
   
                getEngine().start();
   
  @@ -629,7 +629,7 @@
                }
   
                getParser().setOutput( file );
  -             getParser().setTemplateFile( getTemplateFile() );
  +             getParser().setTemplateURL( getTemplateURL() );
   
                try
                {
  
  
  

_______________________________________________
Xdoclet-devel mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/xdoclet-devel

Reply via email to