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

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

Author: fmeyer
Date: 2007-05-21 18:58:23 -0400 (Mon, 21 May 2007)
New Revision: 12044

Modified:
   labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/packages/PackageEditor.java
   labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/packages/PackageExplorerWidget.java
Log:
JBRULES-864 Archive package pop up don't close on ok

Modified: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/packages/PackageEditor.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/packages/PackageEditor.java	2007-05-21 22:47:49 UTC (rev 12043)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/packages/PackageEditor.java	2007-05-21 22:58:23 UTC (rev 12044)
@@ -41,11 +41,13 @@
     private PackageConfigData conf;
     private HTML status;
     protected ValidatedResponse previousResponse;
+    private Command refreshCommand;
 
-    public PackageEditor(PackageConfigData data, Command dCommand, Command cCommand) {
+    public PackageEditor(PackageConfigData data, Command dCommand, Command cCommand, Command command) {
         this.conf = data;
         this.dirtyCommand = dCommand;
         this.cleanCommand = cCommand;
+        this.refreshCommand = command;
         
         setStyleName( "package-Editor" );
         setWidth( "100%" );
@@ -164,21 +166,14 @@
             Button archive = new Button("Archive");
             archive.addClickListener(new ClickListener() {
                 public void onClick(Widget w) {
-                    YesNoDialog diag = new YesNoDialog("Are you sure you want to archive (remove) this package?", new Command() {
-                        public void execute() {
-                            conf.archived = true;
-                            doSaveAction();
-                            PackageExplorerWidget local = (PackageExplorerWidget) getParent().getParent();
-                            local.refreshTreeView();
-                        }                        
-                    });
-                    diag.setPopupPosition(Window.getClientWidth() / 2, Window.getClientHeight() / 2);
-                    diag.show();
+                    if ( Window.confirm( "Are you sure you want to archive (remove) this package?" ) ) {
+                        conf.archived = true;
+                        doSaveAction();
+                        refreshCommand.execute();
+                    }
                 }
             });
             horiz.add(archive);
-        
-                
         return horiz;
     }
 

Modified: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/packages/PackageExplorerWidget.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/packages/PackageExplorerWidget.java	2007-05-21 22:47:49 UTC (rev 12043)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/packages/PackageExplorerWidget.java	2007-05-21 22:58:23 UTC (rev 12044)
@@ -4,7 +4,6 @@
 import org.drools.brms.client.common.DirtyableComposite;
 import org.drools.brms.client.common.DirtyableFlexTable;
 import org.drools.brms.client.common.FormStyleLayout;
-import org.drools.brms.client.common.FormStylePopup;
 import org.drools.brms.client.common.GenericCallback;
 import org.drools.brms.client.common.LoadingPopup;
 import org.drools.brms.client.rpc.PackageConfigData;
@@ -27,8 +26,6 @@
 import com.google.gwt.user.client.ui.Image;
 import com.google.gwt.user.client.ui.Label;
 import com.google.gwt.user.client.ui.StackPanel;
-import com.google.gwt.user.client.ui.TextArea;
-import com.google.gwt.user.client.ui.TextBox;
 import com.google.gwt.user.client.ui.Tree;
 import com.google.gwt.user.client.ui.TreeItem;
 import com.google.gwt.user.client.ui.TreeListener;
@@ -397,10 +394,10 @@
                 
                 sp.add( infoLayout, "<img src='images/information.gif'/>Info", true );
                 if (!conf.isSnapshot) {
-                    sp.add( new PackageEditor(conf, makeDirtyCommand, cleanDirtyCommand ), "<img src='images/package.gif'/>Edit Package configuration", true);
+                    sp.add( new PackageEditor(conf, makeDirtyCommand, cleanDirtyCommand, refreshCommand), "<img src='images/package.gif'/>Edit Package configuration", true);
                     sp.add( new PackageBuilderWidget(conf, editEvent), "<img src='images/package_build.gif'/>Build, validate and deploy", true );
                 } else {
-                    sp.add(new PackageEditor(conf, makeDirtyCommand, cleanDirtyCommand)
+                    sp.add(new PackageEditor(conf, makeDirtyCommand, cleanDirtyCommand, refreshCommand)
                     ,  "<img src='images/package.gif'/>View Package configuration", true);
                     
                 }
@@ -412,6 +409,12 @@
         });
         
     }
+    
+    Command refreshCommand =  new Command () {
+            public void execute() {
+                refreshTreeView();
+            }
+    };