Refactor GradleTask.dependsOn: set -> list

forge · Aug 23, 2013 · 481c908 · 481c908
1 parent 9994571
commit 481c908
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 13 deletions.
diff --git a/api/src/main/java/org/jboss/forge/addon/gradle/projects/model/GradleTask.java b/api/src/main/java/org/jboss/forge/addon/gradle/projects/model/GradleTask.java
@@ -6,7 +6,7 @@
  */
 package org.jboss.forge.addon.gradle.projects.model;
 
-import java.util.Set;
+import java.util.List;
 
 /**
  * @author Adam Wyłuda
@@ -15,5 +15,5 @@ public interface GradleTask
 {
    String getName();
 
-   Set<GradleTask> getDependsOn();
+   List<GradleTask> getDependsOn();
 }
diff --git a/impl/src/main/java/org/jboss/forge/addon/gradle/projects/model/GradleModelImpl.java b/impl/src/main/java/org/jboss/forge/addon/gradle/projects/model/GradleModelImpl.java
@@ -9,11 +9,9 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
 
 import org.gradle.jarjar.com.google.common.collect.Lists;
 import org.gradle.jarjar.com.google.common.collect.Maps;
-import org.gradle.jarjar.com.google.common.collect.Sets;
 import org.jboss.forge.addon.gradle.parser.GradleSourceUtil;
 import org.jboss.forge.addon.gradle.projects.exceptions.UnremovableElementException;
 import org.jboss.forge.addon.resource.FileResource;
@@ -370,7 +368,7 @@ public void createTask(GradleTaskBuilder builder)
    {
       script = GradleSourceUtil.insertTask(script,
                builder.getName(), builder.getDependsOn(), builder.getType(), builder.getCode());
-      Set<GradleTask> dependsOn = Sets.newHashSet();
+      List<GradleTask> dependsOn = Lists.newArrayList();
       for (String dependsOnString : builder.getDependsOn())
       {
          for (GradleTask task : tasks)

diff --git a/impl/src/main/java/org/jboss/forge/addon/gradle/projects/model/GradleModelLoader.java b/impl/src/main/java/org/jboss/forge/addon/gradle/projects/model/GradleModelLoader.java
@@ -8,10 +8,10 @@
 
 import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 
+import org.gradle.jarjar.com.google.common.collect.Lists;
 import org.gradle.jarjar.com.google.common.collect.Maps;
 import org.jboss.forge.parser.xml.Node;
 import org.jboss.forge.parser.xml.XMLParser;
@@ -121,7 +121,7 @@ private static List<GradleTask> tasksFromNode(Node projectNode)
             String text = dependsOnNode.getText().trim();
             taskDeps.add(text);
          }
-         GradleTask task = new GradleTaskImpl(name, new HashSet<GradleTask>());
+         GradleTask task = new GradleTaskImpl(name, Lists.<GradleTask> newArrayList());
          tasks.add(task);
          taskDepsMap.put(task, taskDeps);
          taskByNameMap.put(task.getName(), task);

diff --git a/impl/src/main/java/org/jboss/forge/addon/gradle/projects/model/GradleTaskImpl.java b/impl/src/main/java/org/jboss/forge/addon/gradle/projects/model/GradleTaskImpl.java
@@ -6,17 +6,17 @@
  */
 package org.jboss.forge.addon.gradle.projects.model;
 
-import java.util.Set;
+import java.util.List;
 
 /**
  * @author Adam Wyłuda
  */
 public class GradleTaskImpl implements GradleTask
 {
    private final String name;
-   private final Set<GradleTask> dependsOn;
+   private final List<GradleTask> dependsOn;
 
-   public GradleTaskImpl(String name, Set<GradleTask> dependsOn)
+   public GradleTaskImpl(String name, List<GradleTask> dependsOn)
    {
       this.name = name;
       this.dependsOn = dependsOn;
@@ -29,7 +29,7 @@ public String getName()
    }
 
    @Override
-   public Set<GradleTask> getDependsOn()
+   public List<GradleTask> getDependsOn()
    {
       return dependsOn;
    }

diff --git a/impl/src/test/java/org/jboss/forge/addon/gradle/projects/model/GradleModelLoaderTest.java b/impl/src/test/java/org/jboss/forge/addon/gradle/projects/model/GradleModelLoaderTest.java
@@ -10,8 +10,8 @@
 import static org.junit.Assert.assertTrue;
 
 import java.io.IOException;
+import java.util.List;
 import java.util.Map;
-import java.util.Set;
 
 import org.jboss.forge.furnace.util.Streams;
 import org.junit.BeforeClass;
@@ -97,7 +97,7 @@ public void testTasks()
          if (task.getName().equals("zxyz"))
          {
             zxyzSet = true;
-            Set<GradleTask> dependsOnSet = task.getDependsOn();
+            List<GradleTask> dependsOnSet = task.getDependsOn();
 
             boolean buildSet = false, testSet = false;
             for (GradleTask dependsOn : dependsOnSet)