Refactor GradleModel.getProjectDirectory() -> getProjectPath()

forge · Aug 23, 2013 · 2791ec8 · 2791ec8
1 parent d366aac
commit 2791ec8
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/api/src/main/java/org/jboss/forge/addon/gradle/projects/model/GradleModel.java b/api/src/main/java/org/jboss/forge/addon/gradle/projects/model/GradleModel.java
@@ -30,7 +30,7 @@ public interface GradleModel
 
    String getProjectPath();
 
-   String getRootProjectDirectory();
+   String getRootProjectPath();
 
    String getPackaging();
 

diff --git a/impl-projects/src/main/java/org/jboss/forge/addon/gradle/projects/GradleFacetImpl.java b/impl-projects/src/main/java/org/jboss/forge/addon/gradle/projects/GradleFacetImpl.java
@@ -163,7 +163,7 @@ public FileResource<?> getBuildScriptResource()
    public FileResource<?> getSettingsScriptResource()
    {
       return (FileResource<?>) resourceFactory.create(FileResource.class, new File(
-               getModel().getRootProjectDirectory(), "settings.gradle"));
+               getModel().getRootProjectPath(), "settings.gradle"));
    }
 
    private void loadModel()

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
@@ -30,7 +30,7 @@ public class GradleModelImpl implements GradleModel
    private String name;
    private String version;
    private String projectPath;
-   private String rootProjectDirectory;
+   private String rootProjectPath;
    private String packaging;
    private String archivePath;
    private List<GradleTask> tasks;
@@ -51,7 +51,7 @@ public GradleModelImpl()
       this.group = "";
       this.name = "";
       this.projectPath = "";
-      this.rootProjectDirectory = "";
+      this.rootProjectPath = "";
       this.version = "";
       this.packaging = "";
       this.archivePath = "";
@@ -81,7 +81,7 @@ public GradleModelImpl(String group, String name, String version,
       this.group = group;
       this.name = name;
       this.projectPath = projectPath;
-      this.rootProjectDirectory = rootProjectDirectory;
+      this.rootProjectPath = rootProjectDirectory;
       this.version = version;
       this.packaging = packaging;
       this.archivePath = archivePath;
@@ -104,7 +104,7 @@ public GradleModelImpl(GradleModel original)
       this.group = original.getGroup();
       this.name = original.getName();
       this.projectPath = original.getProjectPath();
-      this.rootProjectDirectory = original.getRootProjectDirectory();
+      this.rootProjectPath = original.getRootProjectPath();
       this.version = original.getVersion();
       this.packaging = original.getPackaging();
       this.archivePath = original.getArchivePath();
@@ -163,9 +163,9 @@ public String getProjectPath()
    }
 
    @Override
-   public String getRootProjectDirectory()
+   public String getRootProjectPath()
    {
-      return rootProjectDirectory;
+      return rootProjectPath;
    }
 
    @Override

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
@@ -58,10 +58,10 @@ public void testProjectPath()
    }
 
    @Test
-   public void testRootProjectDirectory()
+   public void testRootProjectPath()
    {
       // No idea for a better test
-      assertTrue(model.getRootProjectDirectory().replace('\\', '/').endsWith("src/test/resources/loader"));
+      assertTrue(model.getRootProjectPath().replace('\\', '/').endsWith("src/test/resources/loader"));
    }
 
    @Test