FORGE-1219: createMain now is respected if the project has

JavaSourceFacet enabled
forge · Sep 19, 2013 · 25f486f · 25f486f
1 parent ce0a965
commit 25f486f
Showing 1 changed file with 13 additions and 13 deletions.
diff --git a/shell/src/main/java/org/jboss/forge/shell/plugins/builtin/NewProjectPlugin.java b/shell/src/main/java/org/jboss/forge/shell/plugins/builtin/NewProjectPlugin.java
@@ -248,22 +248,22 @@ else if (type.equals(PackagingType.WAR))
       DependencyFacet deps = project.getFacet(DependencyFacet.class);
       deps.addRepository(KnownRepository.JBOSS_NEXUS);
 
-      if (packaging.getPackagingType().equals(PackagingType.JAR) && createMain)
-      {
-         project.getFacet(JavaSourceFacet.class).saveJavaSource(JavaParser
-                  .create(JavaClass.class)
-                  .setPackage(javaPackage)
-                  .setName("Main")
-                  .addMethod("public static void main(String[] args) {}")
-                  .setBody("System.out.println(\"Hi there! I was forged as part of the project you call " + name
-                           + ".\");")
-                  .getOrigin());
-      }
-
       if (project.hasFacet(JavaSourceFacet.class))
       {
-         DirectoryResource sourceFolder = project.getFacet(JavaSourceFacet.class).getSourceFolder();
+         JavaSourceFacet facet = project.getFacet(JavaSourceFacet.class);
+         DirectoryResource sourceFolder = facet.getSourceFolder();
          createTopLevelPackage(sourceFolder, javaPackage);
+         if (createMain)
+         {
+            facet.saveJavaSource(JavaParser
+                     .create(JavaClass.class)
+                     .setPackage(javaPackage)
+                     .setName("Main")
+                     .addMethod("public static void main(String[] args) {}")
+                     .setBody("System.out.println(\"Hi there! I was forged as part of the project you call " + name
+                              + ".\");")
+                     .getOrigin());
+         }
       }
 
       if (finalName != null)