From 4a46e93012f0a635dec763d1b59eecd4f45fc348 Mon Sep 17 00:00:00 2001
From: George Gastaldi <gegastaldi@gmail.com>
Date: Fri, 6 Mar 2015 13:41:00 -0300
Subject: [PATCH] Resolved IDE warnings

---
 .../maven/MavenWebResourceFacetTest.java      |  8 ++++----
 .../facets/MavenResourceFacetTest.java        | 20 +++++++++----------
 .../facets/MavenWebResourceFacetTest.java     |  6 +++---
 .../impl/ui/ScaffoldGenerateCommandImpl.java  |  1 -
 4 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/maven/tests/src/test/java/org/jboss/forge/addon/maven/MavenWebResourceFacetTest.java b/maven/tests/src/test/java/org/jboss/forge/addon/maven/MavenWebResourceFacetTest.java
index 530918c676..9aada7f61e 100644
--- a/maven/tests/src/test/java/org/jboss/forge/addon/maven/MavenWebResourceFacetTest.java
+++ b/maven/tests/src/test/java/org/jboss/forge/addon/maven/MavenWebResourceFacetTest.java
@@ -71,7 +71,7 @@ public void setUp()
    public void tearDown()
    {
       if (project != null)
-         project.getRootDirectory().delete(true);
+         project.getRoot().reify(DirectoryResource.class).delete(true);
    }
 
    @Test
@@ -86,7 +86,7 @@ public void testWebResourceFacet()
    public void testDefaultWebappFolder() throws Exception
    {
       WebResourcesFacet facet = facetFactory.install(project, WebResourcesFacet.class);
-      DirectoryResource expected = project.getRootDirectory().getChildDirectory(
+      DirectoryResource expected = project.getRoot().reify(DirectoryResource.class).getChildDirectory(
                "src" + File.separator + "main" + File.separator + "webapp");
       Assert.assertEquals(expected.getFullyQualifiedName(), facet.getWebRootDirectory().getFullyQualifiedName());
    }
@@ -95,9 +95,9 @@ public void testDefaultWebappFolder() throws Exception
    public void testCustomWebappFolder() throws Exception
    {
       WebResourcesFacet facet = facetFactory.install(project, WebResourcesFacet.class);
-      MavenModelResource pom = project.getRootDirectory().getChild("pom.xml").reify(MavenModelResource.class);
+      MavenModelResource pom = project.getRoot().reify(DirectoryResource.class).getChild("pom.xml").reify(MavenModelResource.class);
       pom.setContents("<project><modelVersion>4.0.0.</modelVersion><groupId>com.test</groupId><artifactId>testme</artifactId><version>1.0</version><build><plugins><plugin><artifactId>maven-war-plugin</artifactId><version>2.4</version><configuration><warSourceDirectory>WebContent</warSourceDirectory><failOnMissingWebXml>false</failOnMissingWebXml></configuration></plugin></plugins></build></project>");
-      DirectoryResource expected = project.getRootDirectory().getChildDirectory(
+      DirectoryResource expected = project.getRoot().reify(DirectoryResource.class).getChildDirectory(
                "WebContent");
       Assert.assertEquals(expected.getFullyQualifiedName(), facet.getWebRootDirectory().getFullyQualifiedName());
    }
diff --git a/maven/tests/src/test/java/org/jboss/forge/addon/maven/projects/facets/MavenResourceFacetTest.java b/maven/tests/src/test/java/org/jboss/forge/addon/maven/projects/facets/MavenResourceFacetTest.java
index f3c191d378..5d3c624b34 100644
--- a/maven/tests/src/test/java/org/jboss/forge/addon/maven/projects/facets/MavenResourceFacetTest.java
+++ b/maven/tests/src/test/java/org/jboss/forge/addon/maven/projects/facets/MavenResourceFacetTest.java
@@ -86,7 +86,7 @@ public void testResourceDirectoryNotNull() throws Exception
    public void testDefaultResourceDirectory() throws Exception
    {
       ResourcesFacet facet = project.getFacet(ResourcesFacet.class);
-      DirectoryResource expected = project.getRootDirectory().getChildDirectory(
+      DirectoryResource expected = project.getRoot().reify(DirectoryResource.class).getChildDirectory(
                "src" + File.separator + "main" + File.separator + "resources");
       Assert.assertEquals(expected.getFullyQualifiedName(), facet.getResourceDirectory().getFullyQualifiedName());
    }
@@ -95,7 +95,7 @@ public void testDefaultResourceDirectory() throws Exception
    public void testDefaultTestResourceDirectory() throws Exception
    {
       ResourcesFacet facet = project.getFacet(ResourcesFacet.class);
-      DirectoryResource expected = project.getRootDirectory().getChildDirectory(
+      DirectoryResource expected = project.getRoot().reify(DirectoryResource.class).getChildDirectory(
                "src" + File.separator + "test" + File.separator + "resources");
       Assert.assertEquals(expected.getFullyQualifiedName(), facet.getTestResourceDirectory().getFullyQualifiedName());
    }
@@ -103,12 +103,12 @@ public void testDefaultTestResourceDirectory() throws Exception
    @Test
    public void testCustomResourceDirectory() throws Exception
    {
-      MavenModelResource pom = project.getRootDirectory().getChild("pom.xml").reify(MavenModelResource.class);
+      MavenModelResource pom = project.getRoot().reify(DirectoryResource.class).getChild("pom.xml").reify(MavenModelResource.class);
 
       pom.setContents("<project><modelVersion>4.0.0</modelVersion><groupId>com.test</groupId><artifactId>testme</artifactId><version>1.0</version><build><resources><resource><directory>foo</directory></resource></resources></build></project>");
 
       ResourcesFacet facet = project.getFacet(ResourcesFacet.class);
-      DirectoryResource expected = project.getRootDirectory().getChildDirectory(
+      DirectoryResource expected = project.getRoot().reify(DirectoryResource.class).getChildDirectory(
                "foo");
       Assert.assertEquals(expected.getFullyQualifiedName(), facet.getResourceDirectory().getFullyQualifiedName());
    }
@@ -117,13 +117,13 @@ public void testCustomResourceDirectory() throws Exception
    @Ignore("https://issues.jboss.org/browse/FORGE-1218")
    public void testCustomResourceDirectoryWithProperty() throws Exception
    {
-      MavenModelResource pom = project.getRootDirectory().getChild("pom.xml").reify(MavenModelResource.class);
+      MavenModelResource pom = project.getRoot().reify(DirectoryResource.class).getChild("pom.xml").reify(MavenModelResource.class);
 
       pom.setContents("<project><modelVersion>4.0.0</modelVersion><groupId>com.test</groupId><artifactId>testme</artifactId><version>1.0</version><build><resources><resource><directory>${project.basedir}"
                + File.separator + "foo</directory></resource></resources></build></project>");
 
       ResourcesFacet facet = project.getFacet(ResourcesFacet.class);
-      DirectoryResource expected = project.getRootDirectory().getChildDirectory(
+      DirectoryResource expected = project.getRoot().reify(DirectoryResource.class).getChildDirectory(
                "foo");
       Assert.assertEquals(expected.getFullyQualifiedName(), facet.getResourceDirectory().getFullyQualifiedName());
    }
@@ -131,12 +131,12 @@ public void testCustomResourceDirectoryWithProperty() throws Exception
    @Test
    public void testCustomTestSourceDirectory() throws Exception
    {
-      MavenModelResource pom = project.getRootDirectory().getChild("pom.xml").reify(MavenModelResource.class);
+      MavenModelResource pom = project.getRoot().reify(DirectoryResource.class).getChild("pom.xml").reify(MavenModelResource.class);
 
       pom.setContents("<project><modelVersion>4.0.0</modelVersion><groupId>com.test</groupId><artifactId>testme</artifactId><version>1.0</version><build><testResources><testResource><directory>foo</directory></testResource></testResources></build></project>");
 
       ResourcesFacet facet = project.getFacet(ResourcesFacet.class);
-      DirectoryResource expected = project.getRootDirectory().getChildDirectory(
+      DirectoryResource expected = project.getRoot().reify(DirectoryResource.class).getChildDirectory(
                "foo");
       Assert.assertEquals(expected.getFullyQualifiedName(), facet.getTestResourceDirectory().getFullyQualifiedName());
    }
@@ -145,13 +145,13 @@ public void testCustomTestSourceDirectory() throws Exception
    @Ignore("https://issues.jboss.org/browse/FORGE-1218")
    public void testCustomTestSourceDirectoryWithProperty() throws Exception
    {
-      MavenModelResource pom = project.getRootDirectory().getChild("pom.xml").reify(MavenModelResource.class);
+      MavenModelResource pom = project.getRoot().reify(DirectoryResource.class).getChild("pom.xml").reify(MavenModelResource.class);
 
       pom.setContents("<project><modelVersion>4.0.0</modelVersion><groupId>com.test</groupId><artifactId>testme</artifactId><version>1.0</version><build><testResources><testResource><directory>${project.basedir}"
                + File.separator + "foo</directory></testResource></testResources></build></project>");
 
       ResourcesFacet facet = project.getFacet(ResourcesFacet.class);
-      DirectoryResource expected = project.getRootDirectory().getChildDirectory(
+      DirectoryResource expected = project.getRoot().reify(DirectoryResource.class).getChildDirectory(
                "foo");
       Assert.assertEquals(expected.getFullyQualifiedName(), facet.getTestResourceDirectory().getFullyQualifiedName());
    }
diff --git a/maven/tests/src/test/java/org/jboss/forge/addon/maven/projects/facets/MavenWebResourceFacetTest.java b/maven/tests/src/test/java/org/jboss/forge/addon/maven/projects/facets/MavenWebResourceFacetTest.java
index 607617d886..6ecb82f8b3 100644
--- a/maven/tests/src/test/java/org/jboss/forge/addon/maven/projects/facets/MavenWebResourceFacetTest.java
+++ b/maven/tests/src/test/java/org/jboss/forge/addon/maven/projects/facets/MavenWebResourceFacetTest.java
@@ -91,7 +91,7 @@ public void testWebResourceFolderNotNull() throws Exception
    public void testDefaultWebResourceFolder() throws Exception
    {
       WebResourcesFacet facet = project.getFacet(WebResourcesFacet.class);
-      DirectoryResource expected = project.getRootDirectory().getChildDirectory(
+      DirectoryResource expected = project.getRoot().reify(DirectoryResource.class).getChildDirectory(
                "src" + File.separator + "main" + File.separator + "webapp");
       Assert.assertEquals(expected.getFullyQualifiedName(), facet.getWebRootDirectory().getFullyQualifiedName());
    }
@@ -99,14 +99,14 @@ public void testDefaultWebResourceFolder() throws Exception
    @Test
    public void testCustomWebResourceFolder() throws Exception
    {
-      MavenModelResource pom = project.getRootDirectory().getChild("pom.xml").reify(MavenModelResource.class);
+      MavenModelResource pom = project.getRoot().reify(DirectoryResource.class).getChild("pom.xml").reify(MavenModelResource.class);
 
       pom.setContents("<project><modelVersion>4.0.0</modelVersion><groupId>com.test</groupId><artifactId>testme</artifactId><version>1.0</version><build><plugins><plugin><groupId>org.apache.maven.plugins</groupId><artifactId>maven-war-plugin</artifactId><version>2.1-beta-1</version><configuration>"
                + "<warSourceDirectory>foo</warSourceDirectory>"
                + "</configuration></plugin></plugins></build></project>");
 
       WebResourcesFacet facet = project.getFacet(WebResourcesFacet.class);
-      DirectoryResource expected = project.getRootDirectory().getChildDirectory("foo");
+      DirectoryResource expected = project.getRoot().reify(DirectoryResource.class).getChildDirectory("foo");
       Assert.assertEquals(expected.getFullyQualifiedName(), facet.getWebRootDirectory().getFullyQualifiedName());
    }
 }
diff --git a/scaffold/impl/src/main/java/org/jboss/forge/addon/scaffold/impl/ui/ScaffoldGenerateCommandImpl.java b/scaffold/impl/src/main/java/org/jboss/forge/addon/scaffold/impl/ui/ScaffoldGenerateCommandImpl.java
index 68c7cd0a50..299795b375 100644
--- a/scaffold/impl/src/main/java/org/jboss/forge/addon/scaffold/impl/ui/ScaffoldGenerateCommandImpl.java
+++ b/scaffold/impl/src/main/java/org/jboss/forge/addon/scaffold/impl/ui/ScaffoldGenerateCommandImpl.java
@@ -114,7 +114,6 @@ public NavigationResult next(UINavigationContext context) throws Exception
       attributeMap.put(ScaffoldGenerationContext.class, generationContext);
 
       NavigationResult setupFlow = null;
-      Project project = getSelectedProject(uiContext);
 
       // Verify if the selected provider is installed
       // If not, add the setup flow and inform the generation step to setup the scaffold.