[jboss-svn-commits] JBL Code SVN: r35492 - in labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client: ruleeditor and 1 other directory.

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

Author: Rikkola
Date: 2010-10-12 06:18:56 -0400 (Tue, 12 Oct 2010)
New Revision: 35492

Modified:
   labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/common/FormStyleLayout.java
   labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/common/Popup.java
   labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/CheckinPopup.java
Log:
GUVNOR-599 - Replace gwtext codes used by Popup related widgets
-Fixing the FormStylePopup style

Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/common/FormStyleLayout.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/common/FormStyleLayout.java	2010-10-12 10:04:44 UTC (rev 35491)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/common/FormStyleLayout.java	2010-10-12 10:18:56 UTC (rev 35492)
@@ -45,6 +45,7 @@
                            String title) {
         addHeader( image,
                    title );
+        
         initWidget( layout );
     }
 

Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/common/Popup.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/common/Popup.java	2010-10-12 10:04:44 UTC (rev 35491)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/common/Popup.java	2010-10-12 10:18:56 UTC (rev 35492)
@@ -58,8 +58,8 @@
             afterShowEvent.execute();
         }
 
-        VerticalPanel p = new VerticalPanel();
-        p.setHorizontalAlignment( VerticalPanel.ALIGN_RIGHT );
+        VerticalPanel verticalPanel = new VerticalPanel();
+        verticalPanel.setHorizontalAlignment( VerticalPanel.ALIGN_RIGHT );
 
         final PopupTitleBar titleBar = new PopupTitleBar( getTitle() );
 
@@ -94,11 +94,14 @@
             }
         } );
 
-        p.add( titleBar );
+        verticalPanel.add( titleBar );
 
-        p.add( getContent() );
-        add( p );
+        Widget content = getContent();
 
+        content.setWidth( "100%" );
+        verticalPanel.add( content );
+        add( verticalPanel );
+
         super.show();
 
         if ( !fixedLocation ) {

Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/CheckinPopup.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/CheckinPopup.java	2010-10-12 10:04:44 UTC (rev 35491)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/CheckinPopup.java	2010-10-12 10:18:56 UTC (rev 35492)
@@ -20,13 +20,14 @@
 import org.drools.guvnor.client.messages.Constants;
 
 import com.google.gwt.core.client.GWT;
+import com.google.gwt.event.dom.client.ClickEvent;
+import com.google.gwt.event.dom.client.ClickHandler;
+import com.google.gwt.event.dom.client.KeyCodes;
+import com.google.gwt.event.dom.client.KeyUpEvent;
+import com.google.gwt.event.dom.client.KeyUpHandler;
 import com.google.gwt.user.client.Command;
 import com.google.gwt.user.client.ui.Button;
-import com.google.gwt.user.client.ui.ClickListener;
-import com.google.gwt.user.client.ui.KeyboardListener;
-import com.google.gwt.user.client.ui.KeyboardListenerAdapter;
 import com.google.gwt.user.client.ui.TextArea;
-import com.google.gwt.user.client.ui.Widget;
 
 /**
  *
@@ -35,53 +36,57 @@
  * @author Michael Neale
  *
  */
-public class CheckinPopup {
+public class CheckinPopup extends FormStylePopup {
 
-    private TextArea       comment;
-    private Button         save;
-    private FormStylePopup pop;
-    private Constants      constants = ((Constants) GWT.create( Constants.class ));
+    private Constants constants = ((Constants) GWT.create( Constants.class ));
 
+    private TextArea  comment;
+    private Button    save;
+
+    private Command   checkin;
+
     public CheckinPopup(String message) {
-        pop = new FormStylePopup();
-        pop.setTitle( message );
+        setTitle( message );
         comment = new TextArea();
         comment.setWidth( "100%" );
         comment.setTitle( constants.AddAnOptionalCheckInComment() );
 
         save = new Button( constants.CheckIn() );
-        pop.addRow( comment );
-        pop.addRow( save );
+        addRow( comment );
+        addRow( save );
 
     }
 
     public void setCommand(final Command checkin) {
-        final ClickListener cl = new ClickListener() {
-            public void onClick(Widget w) {
-                checkin.execute();
-                pop.hide();
+        this.checkin = checkin;
+
+        save.addClickHandler( new ClickHandler() {
+            public void onClick(ClickEvent event) {
+                checkIn();
             }
-        };
-        save.addClickListener( cl );
-        comment.addKeyboardListener( new KeyboardListenerAdapter() {
-            @Override
-            public void onKeyUp(Widget sender,
-                                char keyCode,
-                                int modifiers) {
-                if ( keyCode == KeyboardListener.KEY_ENTER ) {
-                    cl.onClick( null );
+        } );
+
+        comment.addKeyUpHandler( new KeyUpHandler() {
+            public void onKeyUp(KeyUpEvent event) {
+                if ( event.getNativeKeyCode() == KeyCodes.KEY_ENTER ) {
+                    checkIn();
                 }
             }
         } );
     }
 
+    private void checkIn() {
+        checkin.execute();
+        hide();
+    }
+
     public void show() {
-        pop.setAfterShow( new Command() {
+        setAfterShow( new Command() {
             public void execute() {
                 comment.setFocus( true );
             }
         } );
-        pop.show();
+        super.show();
         comment.setFocus( true );
 
     }