[jboss-svn-commits] JBL Code SVN: r36297 - labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/packages.

[jboss-svn-commits at lists.jboss.org]

Author: jervisliu
Date: 2010-12-09 01:30:09 -0500 (Thu, 09 Dec 2010)
New Revision: 36297

Modified:
   labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/packages/NewPackageWizard.java
Log:
GUVNOR-249: User is presented with dialogs that include OK button - in situations where pressing OK is not a valid action - no error is raised

Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/packages/NewPackageWizard.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/packages/NewPackageWizard.java	2010-12-09 06:23:31 UTC (rev 36296)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/packages/NewPackageWizard.java	2010-12-09 06:30:09 UTC (rev 36297)
@@ -21,7 +21,6 @@
 import org.drools.guvnor.client.common.FormStylePopup;
 import org.drools.guvnor.client.common.GenericCallback;
 import org.drools.guvnor.client.common.HTMLFileManagerFields;
-import org.drools.guvnor.client.common.ImageButton;
 import org.drools.guvnor.client.common.LoadingPopup;
 import org.drools.guvnor.client.common.RulePackageSelector;
 import org.drools.guvnor.client.messages.Constants;
@@ -124,6 +123,7 @@
         importLayout.addRow( new HTML( constants.ImportDRLDesc2() ) );
         importLayout.addRow( new HTML( constants.ImportDRLDesc3() ) );
 
+        HorizontalPanel hp = new HorizontalPanel();        
         Button create = new Button( constants.CreatePackage() );
         create.addClickHandler( new ClickHandler() {
             public void onClick(ClickEvent arg0) {
@@ -138,9 +138,18 @@
                 }
             }
         } );
+        hp.add(create);
 
+        Button cancel = new Button( constants.Cancel() );
+        cancel.addClickHandler( new ClickHandler() {
+            public void onClick(ClickEvent arg0) {
+            	hide();
+            }
+        } );
+        hp.add(cancel);
+        
         newPackageLayout.addAttribute( "",
-                                       create );
+        		hp );
 
     }
 
@@ -167,17 +176,16 @@
         uploadFormPanel.setEncoding( FormPanel.ENCODING_MULTIPART );
         uploadFormPanel.setMethod( FormPanel.METHOD_POST );
 
-        HorizontalPanel panel = new HorizontalPanel();
+        VerticalPanel panel = new VerticalPanel();
         uploadFormPanel.setWidget( panel );
 
         final FileUpload upload = new FileUpload();
         upload.setName( HTMLFileManagerFields.CLASSIC_DRL_IMPORT );
         panel.add( upload );
 
-        panel.add( new Label( constants.upload() ) );
-        ImageButton ok = new ImageButton( images.upload(),
-                                          constants.Import() );
 
+        HorizontalPanel hp = new HorizontalPanel();        
+        Button create = new Button( constants.Import() );
         ClickHandler okClickHandler = new ClickHandler() {
             public void onClick(ClickEvent arg0) {
                 if ( Window.confirm( constants.ImportMergeWarning() ) ) {
@@ -185,10 +193,19 @@
                 }
             }
         };
-        ok.addClickHandler( okClickHandler );
+        create.addClickHandler(okClickHandler);
+        hp.add(create);
 
-        panel.add( ok );
+        Button cancel = new Button( constants.Cancel() );        
+        cancel.addClickHandler( new ClickHandler() {
+            public void onClick(ClickEvent arg0) {
+            	parent.hide();
+            }
+        } );
+        hp.add(cancel);
+        panel.add( hp );
 
+
         final FormStylePopup packageNamePopup = new FormStylePopup( images.packageLarge(),
                                                                     constants.PackageName() );
         HorizontalPanel packageNamePanel = new HorizontalPanel();