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

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

Author: jervisliu
Date: 2010-07-29 09:46:50 -0400 (Thu, 29 Jul 2010)
New Revision: 34295

Modified:
   labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/decisiontable/GuidedDecisionTableWidget.java
Log:
BRMS-311

Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/decisiontable/GuidedDecisionTableWidget.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/decisiontable/GuidedDecisionTableWidget.java	2010-07-29 12:55:41 UTC (rev 34294)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/decisiontable/GuidedDecisionTableWidget.java	2010-07-29 13:46:50 UTC (rev 34295)
@@ -123,6 +123,7 @@
     private SuggestionCompletionEngine sce;
     private GroupingStore              store;
     private Constants                  constants = ((Constants) GWT.create( Constants.class ));
+    RecordDef recordDef;
 
     public GuidedDecisionTableWidget(RuleAsset asset,
                                      RuleViewer viewer) {
@@ -143,7 +144,9 @@
         config.setBodyBorder( false );
         config.setCollapsed( true );
         config.setCollapsible( true );
+        
 
+
         FieldSet conditions = new FieldSet( constants.ConditionColumns() );
         conditions.setCollapsible( true );
         conditions.add( getConditions() );
@@ -160,9 +163,12 @@
         grouping.add( getGrouping() );
         grouping.add( getAttributes() );
         config.add( grouping );
-
         layout.add( config );
-
+        
+        VerticalPanel buttonPanel = new   VerticalPanel();
+        buttonPanel.add(getToolbarMenuButton());
+        layout.add( buttonPanel);
+        
         refreshGrid();
 
         initWidget( layout );
@@ -695,8 +701,8 @@
     }
 
     private void refreshGrid() {
-        if ( layout.getWidgetCount() > 1 ) {
-            layout.remove( 1 );
+        if ( layout.getWidgetCount() > 2 ) {
+            layout.remove( 2 );
         }
         if ( dt.actionCols.size() == 0 && dt.conditionCols.size() == 0 && dt.actionCols.size() == 0 ) {
             VerticalPanel vp = new VerticalPanel();
@@ -881,7 +887,7 @@
             colCount++;
         }
 
-        final RecordDef recordDef = new RecordDef( fds );
+        recordDef = new RecordDef( fds );
         ArrayReader reader = new ArrayReader( recordDef );
         MemoryProxy proxy = new MemoryProxy( dt.data );
 
@@ -946,8 +952,7 @@
         GroupingView gv = new GroupingView();
 
         //to stretch it out
-        //BRMS-311
-        //gv.setForceFit( true );
+        gv.setForceFit( true );
         gv.setGroupTextTpl( "{text} ({[values.rs.length]} {[values.rs.length > 1 ? \"" //NON-NLS
                             + constants.Items() + "\" : \"" + constants.Item() + "\"]})" );
 
@@ -1009,6 +1014,10 @@
             }
         } );
 
+        return grid;
+    }
+
+    private ToolbarMenuButton getToolbarMenuButton() {
         Toolbar tb = new Toolbar();
         Menu menu = new Menu();
         menu.addItem( new Item( constants.AddRow(),
@@ -1149,16 +1158,11 @@
         //        menu.addItem( new com.gwtext.client.widgets.menu.MenuItem( "Move",
         //                                                                   subMenu ) );
 
-        ToolbarMenuButton tbb = new ToolbarMenuButton( constants.Modify(),
-                                                       menu );
+		ToolbarMenuButton tbb = new ToolbarMenuButton(constants.Modify(), menu);
 
-        tb.addButton( tbb );
-        grid.add( tb );
-
-        return grid;
-
+		return tbb;
     }
-
+    
     /**
      * Show a drop down editor, obviously.
      */