[Xdoclet-devel] CVS update: xdoclet/core/src/xdoclet TemplateSubTask.java

[Aslak Helles?y]

  User: rinkrank
  Date: 02/06/07 07:15:04

  Modified:    core/src/xdoclet TemplateSubTask.java
  Log:
  Small tidy-up. No functional changes
  
  Revision  Changes    Path
  1.48      +19 -23    xdoclet/core/src/xdoclet/TemplateSubTask.java
  
  Index: TemplateSubTask.java
  ===================================================================
  RCS file: /cvsroot/xdoclet/xdoclet/core/src/xdoclet/TemplateSubTask.java,v
  retrieving revision 1.47
  retrieving revision 1.48
  diff -u -w -r1.47 -r1.48
  --- TemplateSubTask.java      3 Jun 2002 08:13:36 -0000       1.47
  +++ TemplateSubTask.java      7 Jun 2002 14:15:04 -0000       1.48
  @@ -36,7 +36,7 @@
    * @author            Ara Abrahamian ([EMAIL PROTECTED])
    * @created           Sep 25, 2001
    * @xdoclet:subtask   name="template" parent="xdoclet.DocletTask"
  - * @version           $Revision: 1.47 $
  + * @version           $Revision: 1.48 $
    */
   public class TemplateSubTask extends SubTask
   {
  @@ -506,16 +506,6 @@
       }
   
       /**
  -     * Gets the GenerationPerClass attribute of the TemplateSubTask object
  -     *
  -     * @return   The GenerationPerClass value
  -     */
  -    protected boolean isGenerationPerClass()
  -    {
  -        return getDestinationFile().indexOf("{0}") != -1;
  -    }
  -
  -    /**
        * Sets the ExtentValue attribute of the TemplateSubTask object
        *
        * @param extent  The new ExtentValue value
  @@ -543,9 +533,7 @@
               log.debug("getHavingClassTag()=" + getHavingClassTag());
           }
   
  -        boolean perClass = isGenerationPerClass();
  -
  -        if (perClass) {
  +        if (isGenerationPerClass()) {
               startProcessPerClass();
           }
           else {
  @@ -605,7 +593,7 @@
               if (log.isDebugEnabled())
                   log.debug("Working on " + classes[i]);
               setCurrentClass(classes[i]);
  -            if (matchesGenerationRules(classes[i]) == true) {
  +            if (matchesGenerationRules(classes[i])) {
                   generateForClass(classes[i]);
               }
           }
  @@ -672,7 +660,7 @@
        */
       protected void generateForClass(XClass clazz) throws XDocletException
       {
  -        Log log = LogUtil.getLog(TemplateSubTask.class, "generateForClass");
  +        Log log = LogUtil.getLog(getClass(), "generateForClass");
   
           File file = new File(getDestDir().toString(), getGeneratedFileName(clazz));
   
  @@ -687,7 +675,10 @@
   
               // Check modification timestamps
               setGenerationManager(new GenerationManager(this));
  -            if (!generationManager.isGenerationNeeded(clazz, file, true)) {
  +
  +            boolean isGenerationNeeded = 
generationManager.isGenerationNeeded(clazz, file, true);
  +
  +            if (!isGenerationNeeded) {
                   return;
               }
           }
  @@ -696,7 +687,7 @@
   
           try {
               setCurrentClass(clazz);
  -            doGenerateForClass(clazz);
  +            startEngine(getTemplateURL(), new File(getDestDir(), 
getGeneratedFileName(clazz)));
           }
           catch (TemplateException e) {
               if (e instanceof XDocletException) {
  @@ -709,11 +700,6 @@
           }
       }
   
  -    protected void doGenerateForClass(XClass clazz) throws TemplateException
  -    {
  -        startEngine(getTemplateURL(), new File(getDestDir(), 
getGeneratedFileName(clazz)));
  -    }
  -
       /**
        * Describe what the method does
        *
  @@ -762,6 +748,16 @@
           getEngine().start();
   
           engineFinished();
  +    }
  +
  +    /**
  +     * Gets the GenerationPerClass attribute of the TemplateSubTask object
  +     *
  +     * @return   The GenerationPerClass value
  +     */
  +    private boolean isGenerationPerClass()
  +    {
  +        return getDestinationFile().indexOf("{0}") != -1;
       }
   
       /**
  
  
  

_______________________________________________________________

Don't miss the 2002 Sprint PCS Application Developer's Conference
August 25-28 in Las Vegas -- http://devcon.sprintpcs.com/adp/index.cfm

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