[jboss-svn-commits] JBL Code SVN: r24427 - 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-18 14:49:33 -0500 (Thu, 18 Dec 2008)
New Revision: 24427

Modified:
   labs/jbossbuild/buildmagic/trunk/tasks/src/main/org/jboss/tools/buildmagic/task/module/ModuleConfig.java
Log:
[JBBUILD-508] Add externalBuild parameter to Module.

Modified: labs/jbossbuild/buildmagic/trunk/tasks/src/main/org/jboss/tools/buildmagic/task/module/ModuleConfig.java
===================================================================
--- labs/jbossbuild/buildmagic/trunk/tasks/src/main/org/jboss/tools/buildmagic/task/module/ModuleConfig.java	2008-12-18 19:32:01 UTC (rev 24426)
+++ labs/jbossbuild/buildmagic/trunk/tasks/src/main/org/jboss/tools/buildmagic/task/module/ModuleConfig.java	2008-12-18 19:49:33 UTC (rev 24427)
@@ -191,17 +191,26 @@
    /////////////////////////////////////////////////////////////////////////
 
    /**
-    * An abstract element which has a name.
+    * A module element.
     */
-   protected abstract class NamedElement
+   protected class Module implements NamedElement
    {
-      protected Task parent;
+      private String name;
+      
+      private Task parentTask;
+      
+      private List depends = new LinkedList();
+      
+      private boolean externalBuild;
 
-      protected String name;
+      public Module( Task parentTask )
+      {
+         parentTask = parentTask;
+      }
 
-      protected NamedElement(Task parent)
+      public String getName()
       {
-         this.parent = parent;
+         return name;
       }
 
       public void setName(String name)
@@ -209,22 +218,14 @@
          this.name = name;
       }
 
-      public String getName()
+      public boolean isExternalBuild()
       {
-         return this.name;
+         return externalBuild;
       }
-   }
 
-   /**
-    * A module element.
-    */
-   protected class Module extends NamedElement
-   {
-      protected List depends = new LinkedList();
-
-      public Module(Task parent)
+      public void setExternalBuild(boolean externalBuild)
       {
-         super(parent);
+         this.externalBuild = externalBuild;
       }
 
       public void addDependency(String name)
@@ -250,18 +251,22 @@
    /**
     * A group element.
     */
-   protected class Group extends NamedElement
+   protected class Group implements NamedElement
    {
       /** The list of includes. */
       protected List includes = new LinkedList();
 
       /** The conditional execution helper. */
       protected ConditionalExecution cond;
+      
+      private Task parentTask;
+      
+      private String name;
 
-      public Group(Task parent)
+      public Group(Task parentTask)
       {
-         super(parent);
-         cond = new ConditionalExecution(parent);
+         this.parentTask = parentTask;
+         cond = new ConditionalExecution( parentTask );
       }
 
       /** Create a condition. */
@@ -270,6 +275,16 @@
          return cond.createCondition();
       }
 
+      public String getName()
+      {
+         return name;
+      }
+
+      public void setName(String name)
+      {
+         this.name = name;
+      }
+
       public Include createInclude()
       {
          Include inc = new Include(this);
@@ -321,16 +336,16 @@
          /** The conditional execution helper. */
          protected ConditionalExecution cond;
 
-         protected Group parent;
+         protected Group parentGroup;
 
          protected String modules = "";
 
          protected String groups = "";
 
-         public Include(Group parent)
+         public Include(Group parentGroup)
          {
-            this.parent = parent;
-            cond = new ConditionalExecution(parent.parent);
+            this.parentGroup = parentGroup;
+            cond = new ConditionalExecution(parentGroup.parentTask);
          }
 
          /** Create a condition. */