FORGE-1316 - Rename 'Folder' to 'Directory' on Facet APIs

forge · Nov 19, 2013 · 44a2cd0 · 44a2cd0
1 parent d156373
commit 44a2cd0
Show file tree

Hide file tree

Showing 12 changed files with 59 additions and 60 deletions.
diff --git a/addons/impl/src/main/java/org/jboss/forge/addon/addons/NewUICommandWizard.java b/addons/impl/src/main/java/org/jboss/forge/addon/addons/NewUICommandWizard.java
@@ -93,7 +93,7 @@ public void initializeUI(UIBuilder builder) throws Exception
       else if (project.hasFacet(JavaSourceFacet.class))
       {
          JavaSourceFacet facet = project.getFacet(JavaSourceFacet.class);
-         targetLocation.setDefaultValue(facet.getSourceFolder()).setEnabled(false);
+         targetLocation.setDefaultValue(facet.getSourceDirectory()).setEnabled(false);
          targetPackage.setValue(calculateModelPackage(project));
       }
       builder.add(targetLocation);

diff --git a/javaee/impl/src/main/java/org/jboss/forge/addon/javaee/cdi/AbstractCDIFacetImpl.java b/javaee/impl/src/main/java/org/jboss/forge/addon/javaee/cdi/AbstractCDIFacetImpl.java
@@ -101,7 +101,7 @@ public FileResource<?> getConfigFile()
       }
       else
       {
-         DirectoryResource root = project.getFacet(ResourcesFacet.class).getResourceFolder();
+         DirectoryResource root = project.getFacet(ResourcesFacet.class).getResourceDirectory();
          return (FileResource<?>) root.getChild("META-INF" + File.separator + "beans.xml");
       }
    }

diff --git a/javaee/impl/src/main/java/org/jboss/forge/addon/javaee/faces/AbstractFacesFacetImpl.java b/javaee/impl/src/main/java/org/jboss/forge/addon/javaee/faces/AbstractFacesFacetImpl.java
@@ -141,7 +141,7 @@ public FileResource<?> getConfigFile()
       }
       else
       {
-         DirectoryResource root = project.getFacet(ResourcesFacet.class).getResourceFolder();
+         DirectoryResource root = project.getFacet(ResourcesFacet.class).getResourceDirectory();
          return (FileResource<?>) root.getChild("META-INF" + File.separator + "faces-config.xml");
       }
    }

diff --git a/javaee/impl/src/main/java/org/jboss/forge/addon/javaee/faces/ui/NewConverterCommand.java b/javaee/impl/src/main/java/org/jboss/forge/addon/javaee/faces/ui/NewConverterCommand.java
@@ -84,7 +84,7 @@ public void initializeUI(UIBuilder builder) throws Exception
       else if (project.hasFacet(JavaSourceFacet.class))
       {
          JavaSourceFacet facet = project.getFacet(JavaSourceFacet.class);
-         targetLocation.setDefaultValue(facet.getSourceFolder()).setEnabled(false);
+         targetLocation.setDefaultValue(facet.getSourceDirectory()).setEnabled(false);
          targetPackage.setValue(calculateConverterPackage(project));
       }
       builder.add(targetLocation);

diff --git a/javaee/impl/src/main/java/org/jboss/forge/addon/javaee/faces/ui/NewValidatorCommand.java b/javaee/impl/src/main/java/org/jboss/forge/addon/javaee/faces/ui/NewValidatorCommand.java
@@ -84,7 +84,7 @@ public void initializeUI(UIBuilder builder) throws Exception
       else if (project.hasFacet(JavaSourceFacet.class))
       {
          JavaSourceFacet facet = project.getFacet(JavaSourceFacet.class);
-         targetLocation.setDefaultValue(facet.getSourceFolder()).setEnabled(false);
+         targetLocation.setDefaultValue(facet.getSourceDirectory()).setEnabled(false);
          targetPackage.setValue(calculateValidatorPackage(project));
       }
       builder.add(targetLocation);

diff --git a/javaee/impl/src/main/java/org/jboss/forge/addon/javaee/jpa/AbstractJPAFacetImpl.java b/javaee/impl/src/main/java/org/jboss/forge/addon/javaee/jpa/AbstractJPAFacetImpl.java
@@ -78,7 +78,7 @@ public DirectoryResource getEntityPackageDir()
    {
       JavaSourceFacet sourceFacet = getFaceted().getFacet(JavaSourceFacet.class);
 
-      DirectoryResource entityRoot = sourceFacet.getBasePackageResource().getChildDirectory(DEFAULT_ENTITY_PACKAGE);
+      DirectoryResource entityRoot = sourceFacet.getBasePackageDirectory().getChildDirectory(DEFAULT_ENTITY_PACKAGE);
       if (!entityRoot.exists())
       {
          entityRoot.mkdirs();
@@ -91,7 +91,7 @@ public DirectoryResource getEntityPackageDir()
    public FileResource<?> getConfigFile()
    {
       ResourcesFacet resources = getFaceted().getFacet(ResourcesFacet.class);
-      return (FileResource<?>) resources.getResourceFolder().getChild("META-INF" + File.separator + "persistence.xml");
+      return (FileResource<?>) resources.getResourceDirectory().getChild("META-INF" + File.separator + "persistence.xml");
    }
 
    @Override

diff --git a/javaee/impl/src/main/java/org/jboss/forge/addon/javaee/jpa/ui/NewEntityCommand.java b/javaee/impl/src/main/java/org/jboss/forge/addon/javaee/jpa/ui/NewEntityCommand.java
@@ -90,7 +90,7 @@ public void initializeUI(UIBuilder builder) throws Exception
       else if (project.hasFacet(JavaSourceFacet.class))
       {
          JavaSourceFacet facet = project.getFacet(JavaSourceFacet.class);
-         targetLocation.setDefaultValue(facet.getSourceFolder()).setEnabled(false);
+         targetLocation.setDefaultValue(facet.getSourceDirectory()).setEnabled(false);
          targetPackage.setValue(calculateModelPackage(project));
       }
       builder.add(targetLocation);

diff --git a/...jects/src/main/java/org/jboss/forge/addon/maven/projects/facets/MavenJavaSourceFacet.java b/...jects/src/main/java/org/jboss/forge/addon/maven/projects/facets/MavenJavaSourceFacet.java
@@ -36,11 +36,11 @@
 public class MavenJavaSourceFacet extends AbstractFacet<Project> implements JavaSourceFacet
 {
    @Override
-   public List<DirectoryResource> getSourceFolders()
+   public List<DirectoryResource> getSourceDirectories()
    {
       List<DirectoryResource> result = new ArrayList<DirectoryResource>();
-      result.add(getSourceFolder());
-      result.add(getTestSourceFolder());
+      result.add(getSourceDirectory());
+      result.add(getTestSourceDirectory());
       return result;
    }
 
@@ -57,7 +57,7 @@ public String calculateName(final JavaResource resource)
    @Override
    public String calculatePackage(final JavaResource resource)
    {
-      List<DirectoryResource> folders = getSourceFolders();
+      List<DirectoryResource> folders = getSourceDirectories();
       String pkg = null;
       for (DirectoryResource folder : folders)
       {
@@ -81,13 +81,13 @@ public String getBasePackage()
    }
 
    @Override
-   public DirectoryResource getBasePackageResource()
+   public DirectoryResource getBasePackageDirectory()
    {
-      return getSourceFolder().getChildDirectory(Packages.toFileSyntax(getBasePackage()));
+      return getSourceDirectory().getChildDirectory(Packages.toFileSyntax(getBasePackage()));
    }
 
    @Override
-   public DirectoryResource getSourceFolder()
+   public DirectoryResource getSourceDirectory()
    {
       MavenFacet mavenFacet = getFaceted().getFacet(MavenFacet.class);
       Build build = mavenFacet.getPOM().getBuild();
@@ -105,7 +105,7 @@ public DirectoryResource getSourceFolder()
    }
 
    @Override
-   public DirectoryResource getTestSourceFolder()
+   public DirectoryResource getTestSourceDirectory()
    {
       MavenFacet mavenFacet = getFaceted().getFacet(MavenFacet.class);
       Build build = mavenFacet.getPOM().getBuild();
@@ -125,15 +125,15 @@ public DirectoryResource getTestSourceFolder()
    @Override
    public boolean isInstalled()
    {
-      return getSourceFolder().exists();
+      return getSourceDirectory().exists();
    }
 
    @Override
    public boolean install()
    {
       if (!this.isInstalled())
       {
-         for (DirectoryResource folder : this.getSourceFolders())
+         for (DirectoryResource folder : this.getSourceDirectories())
          {
             folder.mkdirs();
          }
@@ -158,13 +158,13 @@ public JavaResource getTestJavaResource(final JavaSource<?> javaClass) throws Fi
    @Override
    public JavaResource getJavaResource(final String relativePath) throws FileNotFoundException
    {
-      return getJavaResource(getSourceFolder(), relativePath);
+      return getJavaResource(getSourceDirectory(), relativePath);
    }
 
    @Override
    public JavaResource getTestJavaResource(final String relativePath) throws FileNotFoundException
    {
-      return getJavaResource(getTestSourceFolder(), relativePath);
+      return getJavaResource(getTestSourceDirectory(), relativePath);
    }
 
    private JavaResource getJavaResource(final DirectoryResource sourceDir, final String relativePath)
@@ -192,13 +192,13 @@ public JavaResource saveTestJavaSource(final JavaSource<?> source) throws FileNo
    @Override
    public void visitJavaSources(final JavaResourceVisitor visitor)
    {
-      visitSources(getSourceFolder(), visitor);
+      visitSources(getSourceDirectory(), visitor);
    }
 
    @Override
    public void visitJavaTestSources(final JavaResourceVisitor visitor)
    {
-      visitSources(getTestSourceFolder(), visitor);
+      visitSources(getTestSourceDirectory(), visitor);
    }
 
    private void visitSources(final Resource<?> searchFolder, final JavaResourceVisitor visitor)

diff --git a/...ojects/src/main/java/org/jboss/forge/addon/maven/projects/facets/MavenResourcesFacet.java b/...ojects/src/main/java/org/jboss/forge/addon/maven/projects/facets/MavenResourcesFacet.java
@@ -32,16 +32,16 @@
 public class MavenResourcesFacet extends AbstractFacet<Project> implements ResourcesFacet
 {
    @Override
-   public List<DirectoryResource> getResourceFolders()
+   public List<DirectoryResource> getResourceDirectories()
    {
       List<DirectoryResource> result = new ArrayList<DirectoryResource>();
-      result.add(getResourceFolder());
-      result.add(getTestResourceFolder());
+      result.add(getResourceDirectory());
+      result.add(getTestResourceDirectory());
       return result;
    }
 
    @Override
-   public DirectoryResource getResourceFolder()
+   public DirectoryResource getResourceDirectory()
    {
       MavenFacet mavenFacet = getFaceted().getFacet(MavenFacet.class);
       Build build = mavenFacet.getPOM().getBuild();
@@ -59,7 +59,7 @@ public DirectoryResource getResourceFolder()
    }
 
    @Override
-   public DirectoryResource getTestResourceFolder()
+   public DirectoryResource getTestResourceDirectory()
    {
       MavenFacet mavenFacet = getFaceted().getFacet(MavenFacet.class);
       Build build = mavenFacet.getPOM().getBuild();
@@ -86,15 +86,15 @@ public void setFaceted(Project origin)
    @Override
    public boolean isInstalled()
    {
-      return getResourceFolder().exists();
+      return getResourceDirectory().exists();
    }
 
    @Override
    public boolean install()
    {
       if (!this.isInstalled())
       {
-         for (DirectoryResource folder : getResourceFolders())
+         for (DirectoryResource folder : getResourceDirectories())
          {
             folder.mkdirs();
          }
@@ -105,27 +105,27 @@ public boolean install()
    @Override
    public FileResource<?> getResource(final String relativePath)
    {
-      return (FileResource<?>) getResourceFolder().getChild(relativePath);
+      return (FileResource<?>) getResourceDirectory().getChild(relativePath);
    }
 
    @Override
    public FileResource<?> getTestResource(final String relativePath)
    {
-      return (FileResource<?>) getTestResourceFolder().getChild(relativePath);
+      return (FileResource<?>) getTestResourceDirectory().getChild(relativePath);
    }
 
    @Override
    public FileResource<?> createResource(final char[] bytes, final String relativeFilename)
    {
-      FileResource<?> file = (FileResource<?>) getResourceFolder().getChild(relativeFilename);
+      FileResource<?> file = (FileResource<?>) getResourceDirectory().getChild(relativeFilename);
       file.setContents(bytes);
       return file;
    }
 
    @Override
    public FileResource<?> createTestResource(final char[] bytes, final String relativeFilename)
    {
-      FileResource<?> file = (FileResource<?>) getTestResourceFolder().getChild(relativeFilename);
+      FileResource<?> file = (FileResource<?>) getTestResourceDirectory().getChild(relativeFilename);
       file.setContents(bytes);
       return file;
    }

diff --git a/...sts/src/test/java/org/jboss/forge/addon/maven/projects/facets/MavenResourceFacetTest.java b/...sts/src/test/java/org/jboss/forge/addon/maven/projects/facets/MavenResourceFacetTest.java
@@ -79,7 +79,7 @@ public void testHasFacet() throws Exception
    public void testResourceFolderNotNull() throws Exception
    {
       final ResourcesFacet facet = project.getFacet(ResourcesFacet.class);
-      Assert.assertNotNull("Resource folder is null", facet.getResourceFolder());
+      Assert.assertNotNull("Resource folder is null", facet.getResourceDirectory());
    }
 
    @Test
@@ -88,7 +88,7 @@ public void testDefaultResourceFolder() throws Exception
       MavenResourcesFacet facet = project.getFacet(MavenResourcesFacet.class);
       DirectoryResource expected = project.getProjectRoot().getChildDirectory(
                "src" + File.separator + "main" + File.separator + "resources");
-      Assert.assertEquals(expected.getFullyQualifiedName(), facet.getResourceFolder().getFullyQualifiedName());
+      Assert.assertEquals(expected.getFullyQualifiedName(), facet.getResourceDirectory().getFullyQualifiedName());
    }
 
    @Test
@@ -97,7 +97,7 @@ public void testDefaultTestResourceFolder() throws Exception
       MavenResourcesFacet facet = project.getFacet(MavenResourcesFacet.class);
       DirectoryResource expected = project.getProjectRoot().getChildDirectory(
                "src" + File.separator + "test" + File.separator + "resources");
-      Assert.assertEquals(expected.getFullyQualifiedName(), facet.getTestResourceFolder().getFullyQualifiedName());
+      Assert.assertEquals(expected.getFullyQualifiedName(), facet.getTestResourceDirectory().getFullyQualifiedName());
    }
 
    @Test
@@ -110,7 +110,7 @@ public void testCustomResourceFolder() throws Exception
       MavenResourcesFacet facet = project.getFacet(MavenResourcesFacet.class);
       DirectoryResource expected = project.getProjectRoot().getChildDirectory(
                "foo");
-      Assert.assertEquals(expected.getFullyQualifiedName(), facet.getResourceFolder().getFullyQualifiedName());
+      Assert.assertEquals(expected.getFullyQualifiedName(), facet.getResourceDirectory().getFullyQualifiedName());
    }
 
    @Test
@@ -125,7 +125,7 @@ public void testCustomResourceFolderWithProperty() throws Exception
       MavenResourcesFacet facet = project.getFacet(MavenResourcesFacet.class);
       DirectoryResource expected = project.getProjectRoot().getChildDirectory(
                "foo");
-      Assert.assertEquals(expected.getFullyQualifiedName(), facet.getResourceFolder().getFullyQualifiedName());
+      Assert.assertEquals(expected.getFullyQualifiedName(), facet.getResourceDirectory().getFullyQualifiedName());
    }
 
    @Test
@@ -138,7 +138,7 @@ public void testCustomTestSourceFolder() throws Exception
       MavenResourcesFacet facet = project.getFacet(MavenResourcesFacet.class);
       DirectoryResource expected = project.getProjectRoot().getChildDirectory(
                "foo");
-      Assert.assertEquals(expected.getFullyQualifiedName(), facet.getTestResourceFolder().getFullyQualifiedName());
+      Assert.assertEquals(expected.getFullyQualifiedName(), facet.getTestResourceDirectory().getFullyQualifiedName());
    }
 
    @Test
@@ -153,7 +153,7 @@ public void testCustomTestSourceFolderWithProperty() throws Exception
       MavenResourcesFacet facet = project.getFacet(MavenResourcesFacet.class);
       DirectoryResource expected = project.getProjectRoot().getChildDirectory(
                "foo");
-      Assert.assertEquals(expected.getFullyQualifiedName(), facet.getTestResourceFolder().getFullyQualifiedName());
+      Assert.assertEquals(expected.getFullyQualifiedName(), facet.getTestResourceDirectory().getFullyQualifiedName());
    }
 
 }