[jboss-cvs] Picketlink SVN: r233 - in console/trunk/picketlink-console/src/main/java/org/picketlink/console: client/widgets and 1 other directories.

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

Author: anil.saldhana at jboss.com
Date: 2010-04-30 17:48:27 -0400 (Fri, 30 Apr 2010)
New Revision: 233

Modified:
   console/trunk/picketlink-console/src/main/java/org/picketlink/console/client/protocol/STSConfigurationParts.java
   console/trunk/picketlink-console/src/main/java/org/picketlink/console/client/widgets/STSWidget.java
   console/trunk/picketlink-console/src/main/java/org/picketlink/console/server/STSConfigurationService.java
Log:
correct server response

Modified: console/trunk/picketlink-console/src/main/java/org/picketlink/console/client/protocol/STSConfigurationParts.java
===================================================================
--- console/trunk/picketlink-console/src/main/java/org/picketlink/console/client/protocol/STSConfigurationParts.java	2010-04-30 21:29:17 UTC (rev 232)
+++ console/trunk/picketlink-console/src/main/java/org/picketlink/console/client/protocol/STSConfigurationParts.java	2010-04-30 21:48:27 UTC (rev 233)
@@ -27,5 +27,5 @@
  */
 public enum STSConfigurationParts 
 {
-   STSConfigObj; 
+   STSConfigObj, STSConfigResult; 
 }
\ No newline at end of file

Modified: console/trunk/picketlink-console/src/main/java/org/picketlink/console/client/widgets/STSWidget.java
===================================================================
--- console/trunk/picketlink-console/src/main/java/org/picketlink/console/client/widgets/STSWidget.java	2010-04-30 21:29:17 UTC (rev 232)
+++ console/trunk/picketlink-console/src/main/java/org/picketlink/console/client/widgets/STSWidget.java	2010-04-30 21:48:27 UTC (rev 233)
@@ -21,7 +21,6 @@
  */
 package org.picketlink.console.client.widgets;
 
-import org.gwt.mosaic.ui.client.WindowPanel;
 import org.gwt.mosaic.ui.client.layout.BoxLayout;
 import org.gwt.mosaic.ui.client.layout.LayoutPanel;
 import org.jboss.errai.bus.client.ErraiBus;
@@ -29,7 +28,9 @@
 import org.jboss.errai.bus.client.api.MessageCallback;
 import org.jboss.errai.bus.client.api.base.MessageBuilder;
 import org.jboss.errai.bus.client.framework.MessageBus;
+import org.jboss.errai.common.client.framework.AcceptsCallback;
 import org.jboss.errai.widgets.client.WSGrid;
+import org.jboss.errai.widgets.client.WSModalDialog;
 import org.jboss.errai.widgets.client.icons.ErraiWidgetsImageBundle;
 import org.jboss.errai.widgets.client.mapping.ErraiWidgetBinding;
 import org.picketlink.console.client.model.STSConfig;
@@ -42,7 +43,6 @@
 import com.google.gwt.user.client.Window;
 import com.google.gwt.user.client.ui.Button;
 import com.google.gwt.user.client.ui.CheckBox;
-import com.google.gwt.user.client.ui.HorizontalPanel;
 import com.google.gwt.user.client.ui.Label;
 import com.google.gwt.user.client.ui.PasswordTextBox;
 import com.google.gwt.user.client.ui.RequiresResize;
@@ -138,37 +138,25 @@
             if( stsConfig == null )
                return;  
 
-            final WindowPanel window = new WindowPanel(" Are you sure you wish to submit ?" ); 
-            HorizontalPanel buttonPanel = new HorizontalPanel();
-            Button okButton = new Button("Yes"); 
-            okButton.addClickHandler(new ClickHandler() 
-            {
-                public void onClick(ClickEvent clickEvent) 
-                {
-                   MessageBuilder.createMessage()
-                   .toSubject("STSConfigurationService")
-                   .command(STSConfigurationCommands.ADD)
-                   .with(STSConfigurationParts.STSConfigObj, stsConfig )
-                   .noErrorHandling().sendNowWith(bus); 
-                   window.hide();
-                }
-            });
-            Button cancelButton = new Button("No"); 
-            cancelButton.addClickHandler(new ClickHandler() 
-            {
-                public void onClick(ClickEvent clickEvent) 
-                {
-                   window.hide();
-                }
-            });
+            final WSModalDialog confirmSubmit = new WSModalDialog("STS Configuration confirmation");
+            confirmSubmit.ask("Are you sure you wish to submit '" + stsConfig.getStsName() + "'?"
+                    , new AcceptsCallback() {
+                        public void callback(Object message, Object data) {
+                            if (AcceptsCallback.MESSAGE_OK.equals(message)) {
+                               MessageBuilder.createMessage()
+                               .toSubject("STSConfigurationService")
+                               .command(STSConfigurationCommands.ADD)
+                               .with(STSConfigurationParts.STSConfigObj, stsConfig )
+                               .noErrorHandling().sendNowWith(bus); 
 
-            buttonPanel.add(okButton);
-            buttonPanel.add(cancelButton);
-            window.add( buttonPanel );
-            
-            window.center();
-            window.pack();
-            window.show(); 
+                                confirmSubmit.hide(); //Hide the modal window
+                            }
+                        }
+                    });
+            confirmSubmit.getOkButton().setText("Yes");
+            confirmSubmit.getCancelButton().setText("No");
+
+            confirmSubmit.showModal(); 
          }
       });
       
@@ -181,8 +169,7 @@
       { 
          public void callback(Message message)
          {
-            STSConfig stsConfig = message.get( STSConfig.class, STSConfigurationParts.STSConfigObj );
-            String resultStr = message.get(String.class, "RESULT" );
+            String resultStr = message.get(String.class, STSConfigurationParts.STSConfigResult ); 
             Window.alert( "Received update from server:" + resultStr );  
          }
       });

Modified: console/trunk/picketlink-console/src/main/java/org/picketlink/console/server/STSConfigurationService.java
===================================================================
--- console/trunk/picketlink-console/src/main/java/org/picketlink/console/server/STSConfigurationService.java	2010-04-30 21:29:17 UTC (rev 232)
+++ console/trunk/picketlink-console/src/main/java/org/picketlink/console/server/STSConfigurationService.java	2010-04-30 21:48:27 UTC (rev 233)
@@ -62,6 +62,7 @@
       {
          return;
       }
+      String resultStr = "SUCCESS";
       
       switch( STSConfigurationCommands.valueOf( commandType ) )
       {
@@ -77,9 +78,9 @@
             catch (Exception e)
             {
                log.error( "Unable to persist STSConfiguration" ); 
-               message.set("RESULT",  "FAILURE" );
+               resultStr = "FAILURE";
             }
-            updateClient( message, stsConfig );
+            updateClient( message, resultStr );
             break;
             
          case UPDATE:
@@ -88,25 +89,24 @@
             handler = new STSConfigurationHandler();  
             try
             {
-               handler.persist( stsConfig );
-               message.set("RESULT",  "SUCCESS" );
+               handler.persist( stsConfig ); 
             }
             catch (Exception e)
             {
                log.error( "Unable to persist STSConfiguration" ); 
-               message.set("RESULT",  "FAILURE" );
+               resultStr = "FAILURE";
             }
-            updateClient( message, stsConfig );
+            updateClient( message, resultStr );
             break; 
       }
    }
    
-   private void updateClient( Message message, STSConfig stsConfig )
+   private void updateClient( Message message, String resultStr )
    {
       MessageBuilder.createConversation(message)
       .toSubject("STSConfigUpdate")
       .signalling()
-      .with(STSConfigurationParts.STSConfigObj ,  stsConfig )
+      .with(STSConfigurationParts.STSConfigResult,  resultStr )
       .noErrorHandling().sendNowWith( requestDispatcher );
    }