Applied changes to the project editor also to the new project wizard …

…(related to BZ-1017886).
kiegroup · Oct 23, 2013 · 5cc16fd · 5cc16fd
1 parent 5e0817a
commit 5cc16fd
Show file tree

Hide file tree

Showing 5 changed files with 54 additions and 22 deletions.
diff --git a/...main/java/org/kie/workbench/common/screens/projecteditor/client/forms/POMEditorPanel.java b/...main/java/org/kie/workbench/common/screens/projecteditor/client/forms/POMEditorPanel.java
@@ -22,7 +22,6 @@
 import com.google.gwt.user.client.ui.Widget;
 import org.guvnor.common.services.project.model.POM;
 import org.kie.workbench.common.screens.projecteditor.client.resources.ProjectEditorResources;
-import org.kie.workbench.common.screens.projecteditor.client.resources.i18n.ProjectEditorConstants;
 
 public class POMEditorPanel
         implements POMEditorPanelView.Presenter,
@@ -64,6 +63,21 @@ private void setTitle(final String titleText) {
         }
     }
 
+    @Override
+    public void addGroupIdChangeHandler( GroupIdChangeHandler changeHandler ) {
+        this.view.addGroupIdChangeHandler(changeHandler);
+    }
+
+    @Override
+    public void addArtifactIdChangeHandler( ArtifactIdChangeHandler changeHandler ) {
+        this.view.addArtifactIdChangeHandler(changeHandler);
+    }
+
+    @Override
+    public void addVersionChangeHandler( VersionChangeHandler changeHandler ) {
+        this.view.addVersionChangeHandler(changeHandler);
+    }
+
     @Override
     public void onNameChange( String name ) {
         this.model.setName( name );

diff --git a/.../java/org/kie/workbench/common/screens/projecteditor/client/forms/POMEditorPanelView.java b/.../java/org/kie/workbench/common/screens/projecteditor/client/forms/POMEditorPanelView.java
@@ -25,13 +25,19 @@ public interface POMEditorPanelView extends HasBusyIndicator,
 
     interface Presenter {
 
-        void onNameChange(String name);
+        void addGroupIdChangeHandler( GroupIdChangeHandler changeHandler );
 
-        void onDescriptionChange(String description);
+        void addArtifactIdChangeHandler( ArtifactIdChangeHandler changeHandler );
+
+        void addVersionChangeHandler( VersionChangeHandler changeHandler );
+
+        void onNameChange( String name );
+
+        void onDescriptionChange( String description );
 
     }
 
-    void setPresenter(Presenter presenter);
+    void setPresenter( Presenter presenter );
 
     String getTitleWidget();
 
@@ -45,7 +51,11 @@ interface Presenter {
 
     void setGAV( GAV gav );
 
+    void addGroupIdChangeHandler( GroupIdChangeHandler changeHandler );
+
     void addArtifactIdChangeHandler( ArtifactIdChangeHandler changeHandler );
 
+    void addVersionChangeHandler( VersionChangeHandler changeHandler );
+
     void setReadOnly();
 }
diff --git a/...a/org/kie/workbench/common/screens/projecteditor/client/forms/POMEditorPanelViewImpl.java b/...a/org/kie/workbench/common/screens/projecteditor/client/forms/POMEditorPanelViewImpl.java
@@ -100,11 +100,21 @@ public void setGAV( GAV gav ) {
         gavEditor.setGAV( gav );
     }
 
+    @Override
+    public void addGroupIdChangeHandler( GroupIdChangeHandler changeHandler ) {
+        gavEditor.addGroupIdChangeHandler(changeHandler);
+    }
+
     @Override
     public void addArtifactIdChangeHandler( ArtifactIdChangeHandler changeHandler ) {
         gavEditor.addArtifactIdChangeHandler( changeHandler );
     }
 
+    @Override
+    public void addVersionChangeHandler( VersionChangeHandler changeHandler ) {
+        gavEditor.addVersionChangeHandler(changeHandler);
+    }
+
     @Override
     public void setReadOnly() {
         gavEditor.setReadOnly();

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
@@ -5,47 +5,45 @@
 
 import com.google.gwt.user.client.ui.Widget;
 import org.guvnor.common.services.project.model.GAV;
-import org.kie.workbench.common.screens.projecteditor.client.forms.ArtifactIdChangeHandler;
-import org.kie.workbench.common.screens.projecteditor.client.forms.GAVEditor;
-import org.kie.workbench.common.screens.projecteditor.client.forms.GroupIdChangeHandler;
-import org.kie.workbench.common.screens.projecteditor.client.forms.VersionChangeHandler;
+import org.guvnor.common.services.project.model.POM;
+import org.kie.workbench.common.screens.projecteditor.client.forms.*;
 import org.kie.workbench.common.screens.projecteditor.client.resources.ProjectEditorResources;
-import org.kie.workbench.common.screens.projecteditor.client.resources.i18n.ProjectEditorConstants;
 import org.uberfire.client.wizards.WizardPage;
 import org.uberfire.client.wizards.WizardPageStatusChangeEvent;
 
 public class GAVWizardPage
         implements WizardPage {
 
     private GAV gav;
-    private final GAVEditor gavEditor;
+    private POMEditorPanel pomEditor;
     private Event<WizardPageStatusChangeEvent> wizardPageStatusChangeEvent;
 
     @Inject
-    public GAVWizardPage( GAVEditor gavEditor,
+    public GAVWizardPage( POMEditorPanel pomEditor,
                           Event<WizardPageStatusChangeEvent> wizardPageStatusChangeEvent ) {
-        this.gavEditor = gavEditor;
+        this.pomEditor = pomEditor;
         this.wizardPageStatusChangeEvent = wizardPageStatusChangeEvent;
     }
 
-    public void setGav( GAV gav ) {
-        this.gav = gav;
-        this.gavEditor.setGAV( gav );
-        this.gavEditor.addGroupIdChangeHandler( new GroupIdChangeHandler() {
+    public void setPom( POM pom ) {
+        this.pomEditor.setPOM( pom, false );
+        this.gav = pom.getGav();
+        // changes are passed on from the pom editor through its view onto the underlying gav editor
+        this.pomEditor.addGroupIdChangeHandler( new GroupIdChangeHandler() {
             @Override
             public void onChange( String newGroupId ) {
                 final WizardPageStatusChangeEvent event = new WizardPageStatusChangeEvent( GAVWizardPage.this );
                 wizardPageStatusChangeEvent.fire( event );
             }
         } );
-        this.gavEditor.addArtifactIdChangeHandler( new ArtifactIdChangeHandler() {
+        this.pomEditor.addArtifactIdChangeHandler( new ArtifactIdChangeHandler() {
             @Override
             public void onChange( String newArtifactId ) {
                 final WizardPageStatusChangeEvent event = new WizardPageStatusChangeEvent( GAVWizardPage.this );
                 wizardPageStatusChangeEvent.fire( event );
             }
         } );
-        this.gavEditor.addVersionChangeHandler( new VersionChangeHandler() {
+        this.pomEditor.addVersionChangeHandler( new VersionChangeHandler() {
             @Override
             public void onChange( String newVersion ) {
                 final WizardPageStatusChangeEvent event = new WizardPageStatusChangeEvent( GAVWizardPage.this );
@@ -79,6 +77,6 @@ public void prepareView() {
 
     @Override
     public Widget asWidget() {
-        return gavEditor.asWidget();
+        return pomEditor.asWidget();
     }
 }
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
@@ -59,7 +59,6 @@ public class NewProjectWizard
 
     @PostConstruct
     public void setupPages() {
-        pom = new POM();
         pages.add( gavWizardPage );
     }
 
@@ -80,7 +79,7 @@ public Widget getPageWidget( int pageNumber ) {
 
     @Override
     public int getPreferredHeight() {
-        return 300;
+        return 550;
     }
 
     @Override
@@ -128,7 +127,8 @@ public void callback( final Project project ) {
 
     public void setProjectName( final String projectName ) {
         this.projectName = projectName;
+        pom = new POM();
         pom.getGav().setArtifactId( projectName );
-        gavWizardPage.setGav( pom.getGav() );
+        gavWizardPage.setPom( pom );
     }
 }