From 3a8c7060fd58eb8f33ec0e88a32690d408f7d3dc Mon Sep 17 00:00:00 2001 From: Jan Schatteman Date: Tue, 20 Jan 2015 17:20:05 +0100 Subject: [PATCH] Quick (& dirty) fix for GAVWizardPage.hasParent() (which broke as a result of the fix for BZ-1169622). --- .../projecteditor/client/wizard/GAVWizardPage.java | 8 ++------ .../projecteditor/client/wizard/NewProjectWizard.java | 5 +++-- .../projecteditor/client/wizard/GAVWizardPageTest.java | 4 ++-- 3 files changed, 7 insertions(+), 10 deletions(-) diff --git a/kie-wb-common-screens/kie-wb-common-project-editor/kie-wb-common-project-editor-client/src/main/java/org/kie/workbench/common/screens/projecteditor/client/wizard/GAVWizardPage.java b/kie-wb-common-screens/kie-wb-common-project-editor/kie-wb-common-project-editor-client/src/main/java/org/kie/workbench/common/screens/projecteditor/client/wizard/GAVWizardPage.java index 6e27fe91ff5..b3641f73b45 100644 --- a/kie-wb-common-screens/kie-wb-common-project-editor/kie-wb-common-project-editor-client/src/main/java/org/kie/workbench/common/screens/projecteditor/client/wizard/GAVWizardPage.java +++ b/kie-wb-common-screens/kie-wb-common-project-editor/kie-wb-common-project-editor-client/src/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/kie-wb-common-screens/kie-wb-common-project-editor/kie-wb-common-project-editor-client/src/main/java/org/kie/workbench/common/screens/projecteditor/client/wizard/NewProjectWizard.java b/kie-wb-common-screens/kie-wb-common-project-editor/kie-wb-common-project-editor-client/src/main/java/org/kie/workbench/common/screens/projecteditor/client/wizard/NewProjectWizard.java index b4b9c5bbee4..197a0962e96 100644 --- a/kie-wb-common-screens/kie-wb-common-project-editor/kie-wb-common-project-editor-client/src/main/java/org/kie/workbench/common/screens/projecteditor/client/wizard/NewProjectWizard.java +++ b/kie-wb-common-screens/kie-wb-common-project-editor/kie-wb-common-project-editor-client/src/main/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/kie-wb-common-screens/kie-wb-common-project-editor/kie-wb-common-project-editor-client/src/test/java/org/kie/workbench/common/screens/projecteditor/client/wizard/GAVWizardPageTest.java b/kie-wb-common-screens/kie-wb-common-project-editor/kie-wb-common-project-editor-client/src/test/java/org/kie/workbench/common/screens/projecteditor/client/wizard/GAVWizardPageTest.java index 94761d0d91f..375d3eaa144 100644 --- a/kie-wb-common-screens/kie-wb-common-project-editor/kie-wb-common-project-editor-client/src/test/java/org/kie/workbench/common/screens/projecteditor/client/wizard/GAVWizardPageTest.java +++ b/kie-wb-common-screens/kie-wb-common-project-editor/kie-wb-common-project-editor-client/src/test/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" );