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

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

Author: jervisliu
Date: 2010-09-25 13:33:02 -0400 (Sat, 25 Sep 2010)
New Revision: 35298

Modified:
   labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/RuleFlowWrapper.java
   labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rulelist/QueryWidget.java
Log:
GUVNOR-643: Replace whatever GWTExt codes left in RuleFlowWrapper


Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/RuleFlowWrapper.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/RuleFlowWrapper.java	2010-09-25 15:35:09 UTC (rev 35297)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/RuleFlowWrapper.java	2010-09-25 17:33:02 UTC (rev 35298)
@@ -27,16 +27,15 @@
 import org.drools.guvnor.client.messages.Constants;
 
 import com.google.gwt.user.client.Window;
+import com.google.gwt.user.client.ui.Button;
 import com.google.gwt.user.client.ui.Composite;
+import com.google.gwt.user.client.ui.DisclosurePanel;
 import com.google.gwt.user.client.ui.ScrollPanel;
 import com.google.gwt.user.client.ui.VerticalPanel;
 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.gwtext.client.core.EventObject;
-import com.gwtext.client.widgets.Panel;
-import com.gwtext.client.widgets.Toolbar;
-import com.gwtext.client.widgets.ToolbarButton;
-import com.gwtext.client.widgets.event.ButtonListenerAdapter;
 
 /**
  * 
@@ -50,7 +49,7 @@
 	private RuleAsset asset;
 
 	private RuleFlowViewer ruleFlowViewer;
-	private Panel parameterPanel;
+	private DisclosurePanel parameterPanel;
 	private Constants constants = ((Constants) GWT.create(Constants.class));
 
 	public RuleFlowWrapper(final RuleAsset asset, final RuleViewer viewer) {
@@ -71,23 +70,17 @@
 			initRuleflowViewer();
 
 			if (ruleFlowViewer != null && parameterPanel != null) {
-				Toolbar tb = new Toolbar();
-
-				ToolbarButton viewSource = new ToolbarButton();
+				Button viewSource = new Button();
 				viewSource.setText(constants.OpenEditorInNewWindow());
-				viewSource.addListener(new ButtonListenerAdapter() {
-					public void onClick(
-							com.gwtext.client.widgets.Button button,
-							EventObject e) {
+				viewSource.addClickHandler(new ClickHandler() {
+					public void onClick(ClickEvent arg0) {
 						doViewDiagram();
 
 						ruleFlowViewer.update();
 					}
 				});
 
-				tb.addButton(viewSource);
-				panel.add(tb);
-
+				panel.add(viewSource);
 			}
 		}
 
@@ -121,17 +114,19 @@
 
 		if (rfcm != null && rfcm.getXml() != null && rfcm.getNodes() != null) {
 			try {
+				parameterPanel = new DisclosurePanel(
+						constants.Parameters());
+				parameterPanel.setAnimationEnabled(true);
+				parameterPanel.ensureDebugId("cwDisclosurePanel");
+				parameterPanel.addStyleName("my-DisclosurePanel");
+				parameterPanel.setWidth("100%");
+				parameterPanel.setOpen(false);
 
-				parameterPanel = new Panel();
-				parameterPanel.setCollapsible(true);
-				parameterPanel.setTitle(constants.Parameters());
-
 				FormStyleLayout parametersForm = new FormStyleLayout();
-				parametersForm.setHeight("120px"); // NON-NLS
-				parameterPanel.add(parametersForm);
+				parametersForm.setHeight("120px"); 
+				parameterPanel.setContent(parametersForm);
 
 				ruleFlowViewer = new RuleFlowViewer(rfcm, parametersForm);
-
 			} catch (Exception e) {
 				Window.alert(e.toString());
 			}

Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rulelist/QueryWidget.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rulelist/QueryWidget.java	2010-09-25 15:35:09 UTC (rev 35297)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rulelist/QueryWidget.java	2010-09-25 17:33:02 UTC (rev 35298)
@@ -193,7 +193,6 @@
         fm.addRow( resultsP );
         advancedDisclosure.setContent(fm);
         
-        //p.add( fm );
         layout.add(advancedDisclosure);
     }
 
@@ -217,13 +216,7 @@
         advancedDisclosure.addStyleName("my-DisclosurePanel");
         advancedDisclosure.setWidth("100%");        
         advancedDisclosure.setOpen(true);
-            
-/*        Panel p = new Panel();
-        p.setCollapsible( true );
-        p.setTitle( constants.TextSearch() );
 
-        p.setCollapsed( true );*/
-
         FormStyleLayout ts = new FormStyleLayout();
         final TextBox tx = new TextBox();
         ts.addAttribute( constants.SearchFor(),
@@ -234,7 +227,6 @@
                          go );
         ts.setWidth( "100%" );
         advancedDisclosure.setContent(ts);
-
         
         final SimplePanel resultsP = new SimplePanel();
         final ClickHandler cl = new ClickHandler() {