[jboss-svn-commits] JBL Code SVN: r9383 - in labs/jbossrules/trunk/drools-jbrms/src: main/java/org/drools/brms/client/common and 4 other directories.

jboss-svn-commits at lists.jboss.org jboss-svn-commits at lists.jboss.org
Tue Feb 6 20:45:24 EST 2007


Author: michael.neale at jboss.com
Date: 2007-02-06 20:45:23 -0500 (Tue, 06 Feb 2007)
New Revision: 9383

Added:
   labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rulelist/AssetItemListViewer.java
Removed:
   labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rulelist/RuleItemListViewer.java
Modified:
   labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/RulesFeature.java
   labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/common/AssetFormats.java
   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/ruleeditor/MetaDataWidget.java
   labs/jbossrules/trunk/drools-jbrms/src/test/java/org/drools/brms/server/ServiceImplementationTest.java
Log:
JBRULES-634 asset listing in package management

Modified: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/RulesFeature.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/RulesFeature.java	2007-02-07 00:59:56 UTC (rev 9382)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/RulesFeature.java	2007-02-07 01:45:23 UTC (rev 9383)
@@ -6,15 +6,18 @@
 import org.drools.brms.client.categorynav.CategoryExplorerWidget;
 import org.drools.brms.client.categorynav.CategorySelectHandler;
 import org.drools.brms.client.common.ErrorPopup;
+import org.drools.brms.client.common.GenericCallback;
 import org.drools.brms.client.common.LoadingPopup;
 import org.drools.brms.client.rpc.RepositoryServiceFactory;
 import org.drools.brms.client.rpc.RuleAsset;
+import org.drools.brms.client.rpc.TableDataResult;
 import org.drools.brms.client.ruleeditor.NewRuleWizard;
 import org.drools.brms.client.ruleeditor.RuleViewer;
 import org.drools.brms.client.rulelist.EditItemEvent;
-import org.drools.brms.client.rulelist.RuleItemListViewer;
+import org.drools.brms.client.rulelist.AssetItemListViewer;
 
 import com.google.gwt.user.client.Command;
+import com.google.gwt.user.client.DeferredCommand;
 import com.google.gwt.user.client.rpc.AsyncCallback;
 import com.google.gwt.user.client.ui.ClickListener;
 import com.google.gwt.user.client.ui.FlexTable;
@@ -34,8 +37,9 @@
     public static final int       EDITOR_TAB         = 1;
     private TabPanel tab;
     private Map openedViewers = new HashMap();
+    private AssetItemListViewer list;
+
     
-    
 	public static ComponentInfo init() {
 		return new ComponentInfo("Rules", "Find and edit rules.") {
 			public JBRMSFeature createInstance() {
@@ -68,24 +72,27 @@
         final RulesFeature parent = this;
         //and the the delegate to open an editor for a rule resource when
         //chosen to
-        final RuleItemListViewer list = new RuleItemListViewer(new EditItemEvent() {
-            
-
+        list = new AssetItemListViewer(new EditItemEvent() {
             public void open(String key,
                              String name) {                  
                 showLoadEditor( key );
                 
             }
-            
         });    
+        //list.loadTableData( null );
         
         //setup the nav, which will drive the list
 		CategoryExplorerWidget nav = new CategoryExplorerWidget(new CategorySelectHandler() {
-            public void selected(String selectedPath) {
-                list.loadRulesForCategoryPath(selectedPath);
+            public void selected(final String selectedPath) {
+                Command load = getRuleListLoadingCommand( list,
+                                           selectedPath );
+                DeferredCommand.add( load );
+                list.setRefreshCommand(load);                
             }
+
         });		
         
+        
         FlexCellFormatter formatter = table.getFlexCellFormatter();
         
         table.setWidget( 0, 0, nav );
@@ -126,8 +133,24 @@
 		return table;
 	}
 
+    private Command getRuleListLoadingCommand(final AssetItemListViewer list,
+                                              final String selectedPath) {
+        return new Command() {
+            public void execute() {
+              RepositoryServiceFactory.getService().loadRuleListForCategories( selectedPath,
+              new GenericCallback() {
+                      public void onSuccess(Object o) {
+                          TableDataResult result = (TableDataResult) o;
+                          list.loadTableData( result );                                                                                 
+                      }
 
+                  } );                    
+              }                    
+        };
+    }
 
+    
+
     /**
      * This will show the rule viewer. If it was previously opened, it will show that dialog instead
      * of opening it again.

Modified: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/common/AssetFormats.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/common/AssetFormats.java	2007-02-07 00:59:56 UTC (rev 9382)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/common/AssetFormats.java	2007-02-07 01:45:23 UTC (rev 9383)
@@ -8,6 +8,11 @@
  */
 public class AssetFormats {
 
+    /** For functions */
+    public static final String FUNCTION = "function";
+
+    public static final String MODEL = "model";
+
     /** Vanilla DRL "file" */
     public static String DRL = "drl";
     

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-02-07 00:59:56 UTC (rev 9382)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/packages/PackageExplorerWidget.java	2007-02-07 01:45:23 UTC (rev 9383)
@@ -1,12 +1,17 @@
 package org.drools.brms.client.packages;
 
+import org.drools.brms.client.common.AssetFormats;
 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;
 import org.drools.brms.client.rpc.RepositoryServiceFactory;
+import org.drools.brms.client.rpc.TableDataResult;
+import org.drools.brms.client.rulelist.AssetItemListViewer;
+import org.drools.brms.client.table.SortableTable;
 
 import com.google.gwt.user.client.Command;
+import com.google.gwt.user.client.DeferredCommand;
 import com.google.gwt.user.client.ui.Button;
 import com.google.gwt.user.client.ui.ClickListener;
 import com.google.gwt.user.client.ui.Composite;
@@ -34,6 +39,8 @@
     private final Tree exTree;
     private final FlexTable layout;
     private final TreeListener treeListener;
+    private String currentPackage;
+    private AssetItemListViewer listView;
     
     
     public PackageExplorerWidget() {
@@ -44,8 +51,10 @@
         treeListener = new TreeListener() {
 
             public void onTreeItemSelected(TreeItem selected) {
-                Command selectEvent = (Command) selected.getUserObject();
-                selectEvent.execute();
+                PackageTreeItem event = (PackageTreeItem) selected.getUserObject();
+                currentPackage = event.name;
+                Command selectEvent = event.command;
+                DeferredCommand.add( selectEvent );                
             }
 
             public void onTreeItemStateChanged(TreeItem arg0) {
@@ -67,7 +76,7 @@
         });
         
         layout.setWidget( 0, 1, new HTML("<i>Please choose a package to edit, explore, or create a new package.</i>") );
-        layout.getFlexCellFormatter().setAlignment( 0, 1, HasHorizontalAlignment.ALIGN_CENTER, HasVerticalAlignment.ALIGN_MIDDLE );
+        //layout.getFlexCellFormatter().setAlignment( 0, 1, HasHorizontalAlignment.ALIGN_CENTER, HasVerticalAlignment.ALIGN_MIDDLE );
         
         layout.setWidget( 1, 0, newPackage );
         
@@ -75,6 +84,8 @@
         layout.getCellFormatter().setStyleName( 1, 0, "new-asset-Icons" );
         layout.getCellFormatter().setAlignment( 1, 0, HasHorizontalAlignment.ALIGN_CENTER, HasVerticalAlignment.ALIGN_MIDDLE );
         
+        listView = new AssetItemListViewer(null);
+        
         initWidget( layout );
     }
 
@@ -160,37 +171,68 @@
      */
     private void addPackage(final String name) {
         
-        TreeItem pkg = makeItem(name, "images/package.gif");
-        
-        pkg.setUserObject( new Command() {
+        TreeItem pkg = makeItem(name, "images/package.gif", new PackageTreeItem(name,new Command() {
             public void execute() {
                 loadPackageConfig(name);
             }
-        });
+        }));
+
         
-        pkg.addItem( makeItem("Business rules", "images/rule_asset.gif") );
-        pkg.addItem( makeItem("Technical rules", "images/technical_rule_assets.gif") );
-        pkg.addItem( makeItem("Functions", "images/function_assets.gif") );
-        pkg.addItem( makeItem("Model", "images/model_asset.gif") );
+        pkg.addItem( makeItem("Business rules", "images/rule_asset.gif", showListEvent(name, AssetFormats.BUSINESS_RULE)) );
+        pkg.addItem( makeItem("Technical rules", "images/technical_rule_assets.gif", showListEvent(name, AssetFormats.TECHNICAL_RULE)) );
+        pkg.addItem( makeItem("Functions", "images/function_assets.gif", showListEvent(name, AssetFormats.FUNCTION)) );
+        pkg.addItem( makeItem("Model", "images/model_asset.gif", showListEvent(name, AssetFormats.MODEL) ) );
 
         
         exTree.addItem( pkg );
 
     }
 
+
+
+
+
+
+
+
     /**
+     * This will create a "show list" event to be attached to the tree.
+     */
+    private PackageTreeItem showListEvent(final String name, final String format) {
+        final GenericCallback cb = new GenericCallback() {
+            public void onSuccess(Object data) {
+                final TableDataResult table = (TableDataResult) data;                
+                listView.loadTableData( table );      
+                listView.setWidth( "100%" );
+                listView.setHeight( "100%" );
+                layout.setWidget( 0, 1, listView );
+            }
+        };
+        
+        return new PackageTreeItem(name, new Command() {
+            public void execute() {
+                RepositoryServiceFactory.getService().listAssetsByFormat( currentPackage, format, 
+                                                                          -1, -1, cb);                
+            }            
+        });
+    }
+
+
+
+
+    /**
      * Load up the package config data and display it.
      */
     private void loadPackageConfig(String name) {
+        this.currentPackage = name;
         RepositoryServiceFactory.getService().loadPackage( name, new GenericCallback() {
 
             public void onSuccess(Object data) {
                 PackageConfigData conf = (PackageConfigData) data;
                 PackageEditor ed = new PackageEditor(conf);
-                ed.setWidth( "100%" );
-                ed.setHeight( "100%" );
-                layout.setWidget( 0, 1, ed );
-                layout.setWidget( 0, 1, ed );                
+//                ed.setWidth( "100%" );
+//                ed.setHeight( "100%" );
+                layout.setWidget( 0, 1, ed );              
             }            
         });
         
@@ -199,10 +241,21 @@
 
 
 
-    private TreeItem makeItem(String name, String icon) {
+    private TreeItem makeItem(String name, String icon, Object command) {
         TreeItem item = new TreeItem();
         item.setHTML( "<img src=\""+ icon + "\">" + name + "</a>" );
+        item.setUserObject( command );
         return item;
     }
     
+    static class PackageTreeItem {
+        Command command;
+        String name;   
+        public PackageTreeItem(String name, Command com) {
+            this.command = com;
+            this.name = name;
+        }
+                
+    }
+    
 }

Modified: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/ruleeditor/MetaDataWidget.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/ruleeditor/MetaDataWidget.java	2007-02-07 00:59:56 UTC (rev 9382)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/ruleeditor/MetaDataWidget.java	2007-02-07 01:45:23 UTC (rev 9383)
@@ -53,6 +53,8 @@
         addAttribute("Created by:", readOnlyText(data.creator));
         addAttribute("Version number:", getVersionNumberLabel());
         addAttribute("Package:", readOnlyText(data.packageName));
+        addAttribute("Format:", readOnlyText( data.format ));
+        
         if (!readOnly) {
             addAttribute("Created on:", readOnlyDate( data.createdDate ));
         }

Copied: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rulelist/AssetItemListViewer.java (from rev 9365, labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rulelist/RuleItemListViewer.java)
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rulelist/AssetItemListViewer.java	                        (rev 0)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rulelist/AssetItemListViewer.java	2007-02-07 01:45:23 UTC (rev 9383)
@@ -0,0 +1,183 @@
+package org.drools.brms.client.rulelist;
+
+import org.drools.brms.client.common.ErrorPopup;
+import org.drools.brms.client.common.GenericCallback;
+import org.drools.brms.client.common.LoadingPopup;
+import org.drools.brms.client.rpc.RepositoryServiceAsync;
+import org.drools.brms.client.rpc.RepositoryServiceFactory;
+import org.drools.brms.client.rpc.TableConfig;
+import org.drools.brms.client.rpc.TableDataResult;
+import org.drools.brms.client.rpc.TableDataRow;
+import org.drools.brms.client.table.SortableTable;
+
+import com.google.gwt.user.client.Command;
+import com.google.gwt.user.client.ui.ClickListener;
+import com.google.gwt.user.client.ui.Composite;
+import com.google.gwt.user.client.ui.FlexTable;
+import com.google.gwt.user.client.ui.HasHorizontalAlignment;
+import com.google.gwt.user.client.ui.HasVerticalAlignment;
+import com.google.gwt.user.client.ui.HorizontalPanel;
+import com.google.gwt.user.client.ui.Image;
+import com.google.gwt.user.client.ui.Label;
+import com.google.gwt.user.client.ui.Widget;
+import com.google.gwt.user.client.ui.FlexTable.FlexCellFormatter;
+
+/**
+ * This is a viewer for viewing a list of rules for editing/selection.
+ * This uses the sortable table widget, and can be re-used with different data sets.
+ * (ie no need to throw is away). 
+ */
+public class AssetItemListViewer extends Composite {
+
+    /** The number of rows to "fill out" */
+    private static final int FILLER_ROWS = 100;
+    public static final String RULE_LIST_TABLE_ID = "ruleList";
+    
+    private FlexTable     outer = new FlexTable();
+    private SortableTable table;
+    private static TableConfig   tableConfig;
+    private EditItemEvent openItemEvent;
+
+    private Image refreshIcon = new Image("images/refresh.gif");
+    private Command refresh;
+    private static RepositoryServiceAsync service = RepositoryServiceFactory.getService();
+
+    public AssetItemListViewer(EditItemEvent event) {
+
+        init();
+        
+        if (tableConfig == null) {
+            loadTableConfig();
+        }
+        this.refreshIcon.setVisible( false );
+        this.openItemEvent = event;
+        this.refreshIcon.setTitle( "Refresh current list. Will show any changes." );
+        this.refreshIcon.addClickListener( new ClickListener() {
+            public void onClick(Widget w) {
+                refresh.execute();
+            }            
+        });
+        
+    }
+
+    /**
+     * Optionally set the refresh command to repopulate the list on demand.
+     * @param refreshCom
+     */
+    public void setRefreshCommand(Command refreshCom) {
+        this.refresh = refreshCom;
+        this.refreshIcon.setVisible( true );
+        
+    }
+    
+    private void loadTableConfig() {
+        service.loadTableConfig( "ruleList",
+                                                               new GenericCallback() {
+                                                                   public void onSuccess(Object o) {
+                                                                       tableConfig = (TableConfig) o;
+                                                                       loadTableData( null );
+                                                                   }
+                                                               } );
+    }
+
+    /**
+     * Initialise the widget goodness.
+     */
+    private void init() {
+        FlexCellFormatter formatter = outer.getFlexCellFormatter();
+
+        //outer.setStyleName( SortableTable.styleList );
+        outer.setWidth( "100%" );
+
+        formatter.setAlignment( 0,
+                                0,
+                                HasHorizontalAlignment.ALIGN_LEFT,
+                                HasVerticalAlignment.ALIGN_MIDDLE );
+
+        Image openIcon = new Image( "images/open_item.gif" );
+        openIcon.addClickListener( new ClickListener() {
+            public void onClick(Widget w) {
+                LoadingPopup.showMessage( "Loading item, please wait ..." );
+                openItemEvent.open( TableDataRow.getId( table.getSelectedKey()), table.getText( table.getSelectedRow(), 1 ) );
+                
+            }
+        } );
+        openIcon.setTitle( "Open item" );
+
+        outer.setWidget( 0,
+                         1,
+                         openIcon );
+        formatter.setAlignment( 0,
+                                1,
+                                HasHorizontalAlignment.ALIGN_RIGHT,
+                                HasVerticalAlignment.ALIGN_MIDDLE );
+
+        initWidget( outer );
+    }
+
+    /** 
+     * This will create a table, and load the data, wrapping it in a scrolling area.
+     * If the data is null, it will just fill it in with something empty
+     * so it looks busy.
+     * 
+     * This could probably clear the table, but I just throw it away
+     * let the garbage collector do the hard work.
+     */
+    public void loadTableData(TableDataResult data) {
+        FlexCellFormatter formatter = outer.getFlexCellFormatter();
+        outer.setWidget( 1,
+                         0,
+                         null );
+
+        //if no data, just fill it out
+        if ( data == null || data.data.length == 0) {
+            
+            table = SortableTable.createTableWidget( new TableDataRow[0], tableConfig.headers, FILLER_ROWS );
+            
+        } else {
+            table = SortableTable.createTableWidget( data.data, this.tableConfig.headers, FILLER_ROWS );
+
+            
+            HorizontalPanel panel = new HorizontalPanel();
+            panel.add( refreshIcon );
+            panel.add( new Label( "  " + data.data.length + " items." ));
+            
+            outer.setWidget( 0, 0, panel);
+        }
+
+        table.setWidth( "100%" );
+        outer.setWidget( 1, 0, table );
+        formatter.setColSpan( 1, 0, 2 );
+
+    }
+    
+
+//    /**
+//     * This is called to tell the widget to reload itself for the given cat path.
+//     */
+//    public void loadRulesForCategoryPath(final String selectedPath) {
+//
+//        //this.currentSelectedPath = selectedPath;
+//        
+//
+//        
+//        service .loadRuleListForCategories( selectedPath,
+//                                                                         new AsyncCallback() {
+//
+//                                                                             public void onFailure(Throwable t) {
+//                                                                                 ErrorPopup.showMessage( t.getMessage() );
+//                                                                             }
+//
+//                                                                             public void onSuccess(Object o) {
+//                                                                                 TableDataResult result = (TableDataResult) o;
+//                                                                                 loadTableData( result );                                                                                 
+//                                                                             }
+//
+//                                                                         } );
+//
+//        
+//    }
+
+
+    
+}

Deleted: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rulelist/RuleItemListViewer.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rulelist/RuleItemListViewer.java	2007-02-07 00:59:56 UTC (rev 9382)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rulelist/RuleItemListViewer.java	2007-02-07 01:45:23 UTC (rev 9383)
@@ -1,215 +0,0 @@
-package org.drools.brms.client.rulelist;
-
-import org.drools.brms.client.common.LoadingPopup;
-import org.drools.brms.client.common.ErrorPopup;
-import org.drools.brms.client.rpc.RepositoryServiceAsync;
-import org.drools.brms.client.rpc.RepositoryServiceFactory;
-import org.drools.brms.client.rpc.TableConfig;
-import org.drools.brms.client.rpc.TableDataResult;
-import org.drools.brms.client.rpc.TableDataRow;
-import org.drools.brms.client.table.SortableTable;
-
-import com.google.gwt.user.client.rpc.AsyncCallback;
-import com.google.gwt.user.client.ui.ClickListener;
-import com.google.gwt.user.client.ui.Composite;
-import com.google.gwt.user.client.ui.FlexTable;
-import com.google.gwt.user.client.ui.HasHorizontalAlignment;
-import com.google.gwt.user.client.ui.HasVerticalAlignment;
-import com.google.gwt.user.client.ui.HorizontalPanel;
-import com.google.gwt.user.client.ui.Image;
-import com.google.gwt.user.client.ui.Label;
-import com.google.gwt.user.client.ui.Widget;
-import com.google.gwt.user.client.ui.FlexTable.FlexCellFormatter;
-
-/**
- * This is a viewer for viewing a list of rules for editing/selection.
- * This uses the sortable table widget, and 
- */
-public class RuleItemListViewer extends Composite {
-
-    /** The number of rows to "fill out" */
-    private static final int FILLER_ROWS = 100;
-    public static final String RULE_LIST_TABLE_ID = "ruleList";
-    
-    private FlexTable     outer = new FlexTable();
-    private SortableTable table;
-    private TableConfig   tableConfig;
-    private EditItemEvent openItemEvent;
-    private String currentSelectedPath;
-    private Image refreshIcon;
-    private static RepositoryServiceAsync service = RepositoryServiceFactory.getService();
-
-    public RuleItemListViewer(EditItemEvent event) {
-
-        init();
-
-        service.loadTableConfig( "ruleList",
-                                                               new AsyncCallback() {
-
-                                                                   public void onFailure(Throwable w) {
-                                                                       ErrorPopup.showMessage( w.getMessage() );
-                                                                   }
-
-                                                                   public void onSuccess(Object o) {
-                                                                       tableConfig = (TableConfig) o;
-                                                                       doTable( null );
-                                                                   }
-
-                                                               } );
-
-        this.openItemEvent = event;
-
-    }
-
-    /**
-     * Initialise the widget goodness.
-     */
-    private void init() {
-        FlexCellFormatter formatter = outer.getFlexCellFormatter();
-
-        //outer.setStyleName( SortableTable.styleList );
-        outer.setWidth( "100%" );
-
-        formatter.setAlignment( 0,
-                                0,
-                                HasHorizontalAlignment.ALIGN_LEFT,
-                                HasVerticalAlignment.ALIGN_MIDDLE );
-
-        Image openIcon = new Image( "images/open_item.gif" );
-        openIcon.addClickListener( new ClickListener() {
-            public void onClick(Widget w) {
-                LoadingPopup.showMessage( "Loading item, please wait ..." );
-                openItemEvent.open( TableDataRow.getId( table.getSelectedKey()), table.getText( table.getSelectedRow(), 1 ) );
-                
-            }
-        } );
-        openIcon.setTitle( "Open item" );
-
-        outer.setWidget( 0,
-                         1,
-                         openIcon );
-        formatter.setAlignment( 0,
-                                1,
-                                HasHorizontalAlignment.ALIGN_RIGHT,
-                                HasVerticalAlignment.ALIGN_MIDDLE );
-
-        initWidget( outer );
-    }
-
-    /** 
-     * This will create a table, and load the data, wrapping it in a scrolling area.
-     * If the data is null, it will just fill it in with something empty
-     * so it looks busy.
-     * 
-     * This could probably clear the table, but I just throw it away
-     * let the garbage collector do the hard work.
-     * 
-     */
-    private void doTable(TableDataResult data) {
-        FlexCellFormatter formatter = outer.getFlexCellFormatter();
-        outer.setWidget( 1,
-                         0,
-                         null );
-
-        //if no data, just fill it out
-        if ( data == null || data.data.length == 0) {
-            
-
-            table = SortableTable.createTableWidget( new TableDataRow[0], tableConfig.headers, FILLER_ROWS );
-            
-//            table = new SortableTable( FILLER_ROWS,
-//                                       this.tableConfig.headers.length + 1 );
-//            
-//            table.setValue( 1,
-//                            1,
-//                            "" );
-        } else {
-//            int maxRows = data.data.length;
-//            if (maxRows < FILLER_ROWS) {
-//                maxRows = FILLER_ROWS;
-//            }
-            table = SortableTable.createTableWidget( data.data, this.tableConfig.headers, FILLER_ROWS );
-//            table = new SortableTable( maxRows,
-//                                       this.tableConfig.headers.length + 1 );
-//            for ( int i = 0; i < data.data.length; i++ ) {
-//                TableDataRow row = data.data[i];
-//                table.setValue( i + 1,
-//                                0,
-//                                row.getKeyValue() ); //this is the key
-//                for ( int j = 0; j < row.values.length; j++ ) {
-//                    String val = row.values[j];
-//                    table.setValue( i + 1,
-//                                    j + 1,
-//                                    val );
-//                }
-//            }
-            
-            //now the refresh icon and the number of rows.
-            refreshIcon = new Image("images/refresh.gif");
-            refreshIcon.addClickListener( new ClickListener() {
-                public void onClick(Widget w) {                    
-                    loadRulesForCategoryPath( currentSelectedPath );
-                }                
-            });
-            refreshIcon.setTitle( "Refresh current list. Will show any changes." );
-            
-            
-            HorizontalPanel panel = new HorizontalPanel();
-            panel.add( refreshIcon );
-            panel.add( new Label( "  " + data.data.length + " items." ));
-            
-            outer.setWidget( 0,
-                             0,
-                              panel);
-        }
-
-//        //setup the "key" column
-//        table.setHiddenColumn( 0 );
-//        table.setColumnHeader( "",
-//                               0 );
-        table.setWidth( "100%" );
-
-//        //add the headers
-//        for ( int i = 0; i < this.tableConfig.headers.length; i++ ) {
-//            table.setColumnHeader( this.tableConfig.headers[i],
-//                                   i + 1 );
-//        }
-
-        outer.setWidget( 1,
-                         0,
-                         table );
-        formatter.setColSpan( 1,
-                              0,
-                              2 );
-
-    }
-
-    /**
-     * This is called to tell the widget to reload itself for the given cat path.
-     */
-    public void loadRulesForCategoryPath(final String selectedPath) {
-
-        this.currentSelectedPath = selectedPath;
-        
-
-        
-        service .loadRuleListForCategories( selectedPath,
-                                                                         new AsyncCallback() {
-
-                                                                             public void onFailure(Throwable t) {
-                                                                                 ErrorPopup.showMessage( t.getMessage() );
-                                                                             }
-
-                                                                             public void onSuccess(Object o) {
-                                                                                 TableDataResult result = (TableDataResult) o;
-                                                                                 doTable( result );                                                                                 
-                                                                             }
-
-                                                                         } );
-
-        
-    }
-
-
-    
-}

Modified: labs/jbossrules/trunk/drools-jbrms/src/test/java/org/drools/brms/server/ServiceImplementationTest.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/test/java/org/drools/brms/server/ServiceImplementationTest.java	2007-02-07 00:59:56 UTC (rev 9382)
+++ labs/jbossrules/trunk/drools-jbrms/src/test/java/org/drools/brms/server/ServiceImplementationTest.java	2007-02-07 01:45:23 UTC (rev 9383)
@@ -12,7 +12,7 @@
 import org.drools.brms.client.rpc.TableConfig;
 import org.drools.brms.client.rpc.TableDataResult;
 import org.drools.brms.client.rpc.TableDataRow;
-import org.drools.brms.client.rulelist.RuleItemListViewer;
+import org.drools.brms.client.rulelist.AssetItemListViewer;
 import org.drools.brms.server.util.TableDisplayHandler;
 import org.drools.repository.AssetItem;
 import org.drools.repository.AssetItemIterator;
@@ -102,7 +102,7 @@
   
   public void testRuleTableLoad() throws Exception {
       MockJBRMSServiceServlet impl = new MockJBRMSServiceServlet();
-      TableConfig conf = impl.loadTableConfig( RuleItemListViewer.RULE_LIST_TABLE_ID );
+      TableConfig conf = impl.loadTableConfig( AssetItemListViewer.RULE_LIST_TABLE_ID );
       assertNotNull(conf.headers);
       
       CategoryItem cat = impl.repo.loadCategory( "/" );




More information about the jboss-svn-commits mailing list