BZ#1315341: Registered the right event handler

kiegroup · Mar 8, 2016 · 4172a6b · 4172a6b
1 parent 8bea1ed
commit 4172a6b
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 21 deletions.
diff --git a/...repo-editor-client/src/main/java/org/guvnor/m2repo/client/upload/UploadFormPresenter.java b/...repo-editor-client/src/main/java/org/guvnor/m2repo/client/upload/UploadFormPresenter.java
@@ -24,6 +24,7 @@
 import org.gwtbootstrap3.client.shared.event.ModalHideEvent;
 import org.gwtbootstrap3.client.shared.event.ModalHideHandler;
 import org.gwtbootstrap3.client.ui.base.form.AbstractForm;
+import org.gwtbootstrap3.client.ui.gwt.FormPanel;
 import org.jboss.errai.ioc.client.container.SyncBeanManager;
 
 import static org.guvnor.m2repo.model.HTMLFileManagerFields.*;
@@ -80,8 +81,12 @@ public void handleSubmitComplete( final AbstractForm.SubmitCompleteEvent event )
         }
     }
 
+    /*
+     * After upgrade of GWT-BOOTSTRAP3 version, will be needed to handle
+     * org.gwtbootstrap3.client.ui.Form.SubmitEvent
+     */
     @Override
-    public void handleSubmit( final AbstractForm.SubmitEvent event ) {
+    public void handleSubmit( final FormPanel.SubmitEvent event ) {
         String fileName = view.getFileName();
         if ( fileName == null || "".equals( fileName ) ) {
             view.showSelectFileUploadWarning();

diff --git a/...or-m2repo-editor-client/src/main/java/org/guvnor/m2repo/client/upload/UploadFormView.java b/...or-m2repo-editor-client/src/main/java/org/guvnor/m2repo/client/upload/UploadFormView.java
@@ -17,11 +17,9 @@
 
 import com.google.web.bindery.event.shared.HandlerRegistration;
 import org.guvnor.m2repo.client.upload.UploadFormView.Presenter;
-import org.gwtbootstrap3.client.shared.event.ModalHiddenEvent;
-import org.gwtbootstrap3.client.shared.event.ModalHiddenHandler;
-import org.gwtbootstrap3.client.shared.event.ModalHideEvent;
 import org.gwtbootstrap3.client.shared.event.ModalHideHandler;
 import org.gwtbootstrap3.client.ui.base.form.AbstractForm;
+import org.gwtbootstrap3.client.ui.gwt.FormPanel;
 import org.uberfire.client.mvp.UberView;
 
 public interface UploadFormView extends UberView<Presenter> {
@@ -30,7 +28,11 @@ interface Presenter {
 
         void handleSubmitComplete( AbstractForm.SubmitCompleteEvent event );
 
-        void handleSubmit( AbstractForm.SubmitEvent event );
+        /*
+         * After upgrade of GWT-BOOTSTRAP3 version, will be needed to handle
+         * org.gwtbootstrap3.client.ui.Form.SubmitEvent
+         */
+        void handleSubmit( FormPanel.SubmitEvent event );
     }
 
     String getFileName();

diff --git a/...2repo-editor-client/src/main/java/org/guvnor/m2repo/client/upload/UploadFormViewImpl.java b/...2repo-editor-client/src/main/java/org/guvnor/m2repo/client/upload/UploadFormViewImpl.java
@@ -20,14 +20,14 @@
 import com.google.gwt.event.dom.client.ClickEvent;
 import com.google.gwt.event.dom.client.ClickHandler;
 import com.google.gwt.user.client.Window;
-import com.google.gwt.user.client.ui.FormPanel;
 import org.guvnor.m2repo.client.resources.i18n.M2RepoEditorConstants;
 import org.guvnor.m2repo.model.HTMLFileManagerFields;
 import org.gwtbootstrap3.client.ui.Button;
 import org.gwtbootstrap3.client.ui.Form;
 import org.gwtbootstrap3.client.ui.ModalFooter;
 import org.gwtbootstrap3.client.ui.TextBox;
 import org.gwtbootstrap3.client.ui.constants.FormType;
+import org.gwtbootstrap3.client.ui.gwt.FormPanel;
 import org.uberfire.ext.widgets.common.client.common.BusyPopup;
 import org.uberfire.ext.widgets.common.client.common.FileUpload;
 import org.uberfire.ext.widgets.common.client.common.FormStyleItem;
@@ -50,7 +50,7 @@ public class UploadFormViewImpl
 
     private Presenter presenter;
 
-    private FileUpload uploader;
+    protected FileUpload uploader;
 
     public UploadFormViewImpl() {
         this.setTitle( M2RepoEditorConstants.INSTANCE.ArtifactUpload() );
@@ -73,10 +73,20 @@ private Form doUploadForm() {
         form.setMethod( FormPanel.METHOD_POST );
         form.setType( FormType.HORIZONTAL );
 
-        form.addSubmitHandler( new Form.SubmitHandler() {
+        /*
+         * After upgrade of GWT-BOOTSTRAP3 version, will be needed to register
+         * org.gwtbootstrap3.client.ui.Form.SubmitHandler
+         */
+        form.addHandler(new FormPanel.SubmitHandler() {
             @Override
-            public void onSubmit( final Form.SubmitEvent event ) {
-                presenter.handleSubmit( event );
+            public void onSubmit(com.google.gwt.user.client.ui.FormPanel.SubmitEvent submitEvent) {
+                presenter.handleSubmit(submitEvent);
+            }
+        } , FormPanel.SubmitEvent.getType());
+
+        form.addSubmitCompleteHandler( new Form.SubmitCompleteHandler() {
+            public void onSubmitComplete( final Form.SubmitCompleteEvent event ) {
+                presenter.handleSubmitComplete( event );
             }
         } );
 
@@ -89,12 +99,6 @@ public void execute() {
 
         uploader.setName( HTMLFileManagerFields.UPLOAD_FIELD_NAME_ATTACH );
 
-        form.addSubmitCompleteHandler( new Form.SubmitCompleteHandler() {
-            public void onSubmitComplete( final Form.SubmitCompleteEvent event ) {
-                presenter.handleSubmitComplete( event );
-            }
-        } );
-
         hiddenGroupIdField.setName( HTMLFileManagerFields.GROUP_ID );
         hiddenArtifactIdField.setName( HTMLFileManagerFields.ARTIFACT_ID );
         hiddenVersionIdField.setName( HTMLFileManagerFields.VERSION_ID );
@@ -206,5 +210,4 @@ private void showMessage( final String message ) {
     private void showErrorMessage( final String message ) {
         ErrorPopup.showMessage( message );
     }
-
 }
diff --git a/...or-m2repo-editor-client/src/test/java/org/guvnor/m2repo/client/upload/UploadFormTest.java b/...or-m2repo-editor-client/src/test/java/org/guvnor/m2repo/client/upload/UploadFormTest.java
@@ -22,6 +22,7 @@
 import org.gwtbootstrap3.client.shared.event.ModalHideEvent;
 import org.gwtbootstrap3.client.shared.event.ModalHideHandler;
 import org.gwtbootstrap3.client.ui.base.form.AbstractForm;
+import org.gwtbootstrap3.client.ui.gwt.FormPanel;
 import org.jboss.errai.ioc.client.container.SyncBeanManager;
 import org.junit.Before;
 import org.junit.Test;
@@ -67,7 +68,7 @@ public void before() {
     @Test
     public void emptyFilenameTest() {
         when( view.getFileName() ).thenReturn( null );
-        uploadFormPresenter.handleSubmit( new AbstractForm.SubmitEvent() );
+        uploadFormPresenter.handleSubmit( new FormPanel.SubmitEvent() );
 
         verify( view ).showSelectFileUploadWarning();
         verify( view, never() ).showUploadingBusy();
@@ -76,7 +77,7 @@ public void emptyFilenameTest() {
     @Test
     public void nullFilenameTest() {
         when( view.getFileName() ).thenReturn( "" );
-        uploadFormPresenter.handleSubmit( new AbstractForm.SubmitEvent() );
+        uploadFormPresenter.handleSubmit( new FormPanel.SubmitEvent() );
 
         verify( view ).showSelectFileUploadWarning();
         verify( view, never() ).showUploadingBusy();
@@ -85,7 +86,7 @@ public void nullFilenameTest() {
     @Test
     public void unsupportedFilenameTest() {
         when( view.getFileName() ).thenReturn( "//!#@%^&*()\\23\\(0" );
-        uploadFormPresenter.handleSubmit( new AbstractForm.SubmitEvent() );
+        uploadFormPresenter.handleSubmit( new FormPanel.SubmitEvent() );
 
         verify( view ).showUnsupportedFileTypeWarning();
         verify( view, never() ).showUploadingBusy();
@@ -94,7 +95,7 @@ public void unsupportedFilenameTest() {
     @Test
     public void correctFilenameTest() {
         when( view.getFileName() ).thenReturn( "/home/user/something/pom.xml" );
-        uploadFormPresenter.handleSubmit( new AbstractForm.SubmitEvent() );
+        uploadFormPresenter.handleSubmit( new FormPanel.SubmitEvent() );
 
         verify( view ).showUploadingBusy();
     }