[jboss-svn-commits] JBL Code SVN: r24448 - labs/jbossbuild/buildmagic/trunk/tasks/src/main/org/jboss/tools/buildmagic/task/module.

[jboss-svn-commits at lists.jboss.org]

Author: pgier
Date: 2008-12-19 16:28:01 -0500 (Fri, 19 Dec 2008)
New Revision: 24448

Modified:
   labs/jbossbuild/buildmagic/trunk/tasks/src/main/org/jboss/tools/buildmagic/task/module/ExecuteModules.java
Log:
[JBBUILD-508] Minor refactoring.

Modified: labs/jbossbuild/buildmagic/trunk/tasks/src/main/org/jboss/tools/buildmagic/task/module/ExecuteModules.java
===================================================================
--- labs/jbossbuild/buildmagic/trunk/tasks/src/main/org/jboss/tools/buildmagic/task/module/ExecuteModules.java	2008-12-19 21:08:39 UTC (rev 24447)
+++ labs/jbossbuild/buildmagic/trunk/tasks/src/main/org/jboss/tools/buildmagic/task/module/ExecuteModules.java	2008-12-19 21:28:01 UTC (rev 24448)
@@ -89,15 +89,15 @@
 
    private List beforeHooks = new LinkedList();
 
-   protected List afterHooks = new LinkedList();
+   private List afterHooks = new LinkedList();
 
-   protected ModuleBuildListener listener = new ModuleBuildListener();
+   private ModuleBuildListener listener = new ModuleBuildListener();
 
-   protected List exportProperties = new LinkedList();
+   private List exportProperties = new LinkedList();
 
-   protected String module;
+   private String module;
 
-   protected boolean threading = false;
+   private boolean threading = false;
 
    public void setThreading(boolean flag)
    {
@@ -274,25 +274,11 @@
       ant.init();
 
       // add a property for the name of the module (our name that is)
-      /*Property p = createProperty(null);
-
-      p.setName(moduleProperty);
-      p.setValue(module);
-      copy(p, ant.createProperty());
-      System.out.println("Setting propery - " + moduleProperty + ":" + module);
-      p.execute();*/
-      // project.setUserProperty(moduleProperty, module);
       internalProject.setProperty(moduleProperty, module);
 
       // add a property for the target of the module (our name that is)
       String tempTargetName = (target == null) ? "<default>" : target;
       evaluateExpression(tempTargetName);
-      /*p = createProperty(null);
-      p.setName(targetProperty);
-      p.setValue(tempTargetName);
-      copy(p, ant.createProperty());
-      p.execute();*/
-      // project.setUserProperty(targetProperty, tempTargetName);
       internalProject.setProperty(targetProperty, tempTargetName);
 
       ant.setLocation(getLocation());
@@ -326,7 +312,7 @@
          antCoreLib.setValue(props.get("ant.core.lib").toString());
          antCoreLib.execute();
       }
-      // End hack
+      // End workaround
 
       // see if this is a valid ant file
       try
@@ -384,16 +370,16 @@
          public void run()
          {
             // execute the task
-            printHeading(headers);
+            printMessages(headers);
             log.verbose("Executing " + targetName + " in module '" + module + "'...");
 
             if ( externalBuild )
             {
-               Echo skipNotification = new Echo( );
-               skipNotification.setProject( getProject() );
-               skipNotification.setTaskName("echo");
-               skipNotification.setMessage("Skipping module build due to externalBuild setting.");
-               skipNotification.execute();
+               Echo skipMessage = new Echo( );
+               skipMessage.setProject( getProject() );
+               skipMessage.setTaskName("echo");
+               skipMessage.setMessage("Skipping module build due to externalBuild setting.");
+               skipMessage.execute();
             }
             else
             {
@@ -401,7 +387,7 @@
             }
 
             log.verbose("Finished with " + targetName + " in module '" + module + "'...");
-            printHeading(footers);
+            printMessages(footers);
 
             runHooks(afterHooks);
          }
@@ -428,9 +414,9 @@
       // }
    }
 
-   protected void printHeading(List headers)
+   protected void printMessages(List messages)
    {
-      Iterator iter = headers.iterator();
+      Iterator iter = messages.iterator();
       while (iter.hasNext())
       {
          MyEcho header = (MyEcho) iter.next();