[jboss-svn-commits] JBL Code SVN: r35650 - 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: ge0ffrey
Date: 2010-10-21 11:03:42 -0400 (Thu, 21 Oct 2010)
New Revision: 35650

Modified:
   labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/BrowseTree.java
   labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rulelist/AssetItemGrid.java
Log:
small refactor to make the code clearer

Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/BrowseTree.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/BrowseTree.java	2010-10-21 14:25:58 UTC (rev 35649)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/BrowseTree.java	2010-10-21 15:03:42 UTC (rev 35650)
@@ -48,9 +48,9 @@
         conf.headerTypes[0] = "class java.lang.String";
         conf.headerTypes[1] = "class java.util.Calendar";
         conf.rowsPerPage = 500;
-        AssetItemGrid.registerTableConf( conf,
+        AssetItemGrid.registerTableConfig( conf,
                                          ExplorerNodeConfig.RECENT_EDITED_ID );
-        AssetItemGrid.registerTableConf( conf,
+        AssetItemGrid.registerTableConfig( conf,
                                          ExplorerNodeConfig.RECENT_VIEWED_ID );
 
         conf = new TableConfig();
@@ -64,7 +64,7 @@
         conf.headerTypes[2] = "class java.lang.String";
         conf.rowsPerPage = 500;
 
-        AssetItemGrid.registerTableConf( conf,
+        AssetItemGrid.registerTableConfig( conf,
                                          ExplorerNodeConfig.INCOMING_ID );
     }
 

Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rulelist/AssetItemGrid.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rulelist/AssetItemGrid.java	2010-10-21 14:25:58 UTC (rev 35649)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rulelist/AssetItemGrid.java	2010-10-21 15:03:42 UTC (rev 35650)
@@ -99,42 +99,45 @@
      * Call this to set up a table config instead of loading it from the server. You then pass in the config name for later use.
      * Can save a round trip.
      */
-    public static void registerTableConf(TableConfig conf, String tableConfig) {
-       if (columnConfigs.containsKey(tableConfig)) return;
-       ColumnModel cm = createColumnModel( conf );
-       columnConfigs.put( tableConfig, cm );
-       RecordDef rd = createRecordDef( conf );
-       recordDefs.put( tableConfig, rd );
-       rowsPerPage.put( tableConfig, new Integer( conf.rowsPerPage ) );
+    public static void registerTableConfig(TableConfig tableConfig, String tableConfigKey) {
+       if (columnConfigs.containsKey(tableConfigKey))
+       {
+           return;
+       }
+       ColumnModel cm = createColumnModel( tableConfig );
+       columnConfigs.put( tableConfigKey, cm );
+       RecordDef rd = createRecordDef( tableConfig );
+       recordDefs.put( tableConfigKey, rd );
+       rowsPerPage.put( tableConfigKey, new Integer( tableConfig.rowsPerPage ) );
     }
 
 
     /**
      * Create a grid using the given config - config will be loaded from the server if it is not already cached.
-     * You can use registerTableConf to register it to avoid a server hit.
+     * You can use registerTableConfig to register it to avoid a server hit.
      */
     public AssetItemGrid(final EditItemEvent event,
-                         final String tableConfig,
+                         final String tableConfigKey,
                          final AssetItemGridDataLoader source) {
 
         this.editEvent = event;
         this.layout = new SimplePanel();
-        if ( !columnConfigs.containsKey( tableConfig ) ) {
-            RepositoryServiceFactory.getService().loadTableConfig( tableConfig,
+        if ( !columnConfigs.containsKey( tableConfigKey ) ) {
+            RepositoryServiceFactory.getService().loadTableConfig( tableConfigKey,
                                                                    new GenericCallback<TableConfig>() {
-                                                                       public void onSuccess(TableConfig conf) {
-                                                                           registerTableConf(conf, tableConfig);
+                                                                       public void onSuccess(TableConfig tableConfig) {
+                                                                           registerTableConfig(tableConfig, tableConfigKey);
                                                                            doGrid( source,
-                                                                                   columnConfigs.get(tableConfig),
-                                                                                   recordDefs.get(tableConfig),
-                                                                                   conf.rowsPerPage );
+                                                                                   columnConfigs.get(tableConfigKey),
+                                                                                   recordDefs.get(tableConfigKey),
+                                                                                   tableConfig.rowsPerPage );
                                                                        }
                                                                    } );
         } else {
             doGrid( source,
-                    columnConfigs.get( tableConfig ),
-                    recordDefs.get( tableConfig ),
-                    (rowsPerPage.get( tableConfig )).intValue() );
+                    columnConfigs.get( tableConfigKey ),
+                    recordDefs.get( tableConfigKey ),
+                    (rowsPerPage.get( tableConfigKey )).intValue() );
         }
 
         initWidget( layout );