Quick (& dirty) fix for GAVWizardPage.hasParent() (which broke as a r…

…esult of the fix for BZ-1169622).
kiegroup · Jan 20, 2015 · 3a8c706 · 3a8c706
1 parent 736ddeb
commit 3a8c706
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 10 deletions.
diff --git a/...main/java/org/kie/workbench/common/screens/projecteditor/client/wizard/GAVWizardPage.java b/...main/java/org/kie/workbench/common/screens/projecteditor/client/wizard/GAVWizardPage.java
@@ -89,11 +89,11 @@ public void onChange( String newVersion ) {
         } );
     }
 
-    public void setPom( final POM pom ) {
+    public void setPom( final POM pom, boolean hasParent ) {
         this.pomEditor.setPOM( pom,
                                false );
 
-        if ( hasParent( pom ) ) {
+        if ( hasParent ) {
             pomEditor.disableGroupID( view.InheritedFromAParentPOM() );
             pomEditor.disableVersion( view.InheritedFromAParentPOM() );
             validateArtifactId( pom.getGav().getArtifactId() );
@@ -131,10 +131,6 @@ public void callback( final Boolean result ) {
         } ).validateVersion( version );
     }
 
-    private boolean hasParent( POM pom ) {
-        return pom.getGav() != null && pom.getGav().getGroupId() != null && !pom.getGav().getGroupId().trim().isEmpty();
-    }
-
     @Override
     public String getTitle() {
         return ProjectEditorResources.CONSTANTS.NewProjectWizard();

diff --git a/...n/java/org/kie/workbench/common/screens/projecteditor/client/wizard/NewProjectWizard.java b/...n/java/org/kie/workbench/common/screens/projecteditor/client/wizard/NewProjectWizard.java
@@ -109,9 +109,10 @@ public void setContent( final String projectName ) {
         pom.getGav().setGroupId( context.getActiveOrganizationalUnit().getDefaultGroupId() );
         pom.getGav().setArtifactId( sanitizeProjectName( projectName ) );
         pom.getGav().setVersion( "1.0" );
-        gavWizardPage.setPom( pom );
+        gavWizardPage.setPom( pom, false );
     }
 
+    // TODO refactor this ( e.g. pass in parent GAV instead of Strings ) ?
     public void setContent( final String projectName,
                             final String groupId,
                             final String version ) {
@@ -124,7 +125,7 @@ public void setContent( final String projectName,
         pom.getGav().setGroupId( groupId );
         pom.getGav().setArtifactId( sanitizeProjectName( projectName ) );
         pom.getGav().setVersion( version );
-        gavWizardPage.setPom( pom );
+        gavWizardPage.setPom( pom, true );
     }
 
     //The projectName has been validated as a FileSystem folder name, which may not be consistent with Maven ArtifactID

diff --git a/.../java/org/kie/workbench/common/screens/projecteditor/client/wizard/GAVWizardPageTest.java b/.../java/org/kie/workbench/common/screens/projecteditor/client/wizard/GAVWizardPageTest.java
@@ -50,7 +50,7 @@ public void setUp() throws Exception {
 
     @Test
     public void testPomsWithParentDataDisableFieldsParentNotSet() throws Exception {
-        page.setPom( new POM() );
+        page.setPom( new POM(), false );
 
         verify( pomEditor, never() ).disableGroupID( anyString() );
         verify( pomEditor, never() ).disableVersion( anyString() );
@@ -61,7 +61,7 @@ public void testPomsWithParentDataDisableFieldsParentSet() throws Exception {
         when( view.InheritedFromAParentPOM() ).thenReturn( "InheritedFromAParentPOM" );
         POM pom = new POM();
         pom.getGav().setGroupId( "supergroup" );
-        page.setPom( pom );
+        page.setPom( pom, true );
 
         verify( pomEditor ).disableGroupID( "InheritedFromAParentPOM" );
         verify( pomEditor ).disableVersion( "InheritedFromAParentPOM" );