[jboss-svn-commits] JBL Code SVN: r8231 - in labs/jbossrules/trunk/drools-jbrms/src: main/java/org/drools/brms/server test/java/org/drools/brms/server

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

Author: mark.proctor at jboss.com
Date: 2006-12-11 13:02:20 -0500 (Mon, 11 Dec 2006)
New Revision: 8231

Modified:
   labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/server/JBRMSServiceServlet.java
   labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/server/TableDisplayHandler.java
   labs/jbossrules/trunk/drools-jbrms/src/test/java/org/drools/brms/server/ServiceImplementationTest.java
Log:
JBRULES-583 Refactor RuleItem to AssetItem

Modified: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/server/JBRMSServiceServlet.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/server/JBRMSServiceServlet.java	2006-12-11 18:00:49 UTC (rev 8230)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/server/JBRMSServiceServlet.java	2006-12-11 18:02:20 UTC (rev 8231)
@@ -18,15 +18,13 @@
 import org.drools.brms.client.rpc.RuleContentText;
 import org.drools.brms.client.rpc.TableConfig;
 import org.drools.brms.client.rpc.TableDataResult;
-import org.drools.brms.client.rpc.TableDataRow;
+import org.drools.repository.AssetItem;
 import org.drools.repository.CategorisableItem;
 import org.drools.repository.CategoryItem;
+import org.drools.repository.PackageItem;
 import org.drools.repository.RepositoryConfigurator;
-import org.drools.repository.RuleItem;
-import org.drools.repository.RulePackageItem;
 import org.drools.repository.RulesRepository;
 import org.drools.repository.RulesRepositoryException;
-import org.drools.repository.StateItem;
 
 import com.google.gwt.user.client.rpc.SerializableException;
 import com.google.gwt.user.server.rpc.RemoteServiceServlet;
@@ -78,7 +76,7 @@
                                  String initialCategory,
                                  String initialPackage) throws SerializableException {        
         try {
-            RulePackageItem pkg = getRulesRepository().loadRulePackage( initialPackage );
+            PackageItem pkg = getRulesRepository().loadRulePackage( initialPackage );
             pkg.addRule( ruleName,
                                          description, initialCategory );
 
@@ -92,7 +90,7 @@
         Iterator pkgs = getRulesRepository().listPackages();
         List result = new ArrayList();
         while(pkgs.hasNext()) {
-            RulePackageItem pkg = (RulePackageItem) pkgs.next();
+            PackageItem pkg = (PackageItem) pkgs.next();
             result.add( pkg.getName() );
         }
         return (String[]) result.toArray( new String[result.size()] );
@@ -195,7 +193,7 @@
      */
     public RuleAsset loadRuleAsset(String uuid) throws SerializableException {
         RulesRepository repo = getRulesRepository();
-        RuleItem item = repo.loadRuleByUUID( uuid );
+        AssetItem item = repo.loadRuleByUUID( uuid );
         RuleAsset asset = new RuleAsset();
         
         asset.metaData = popuplateMetaData( item );
@@ -276,7 +274,7 @@
         
         
         RulesRepository repo = getRulesRepository();
-        RuleItem rule = repo.loadRuleByUUID( asset.uuid );
+        AssetItem rule = repo.loadRuleByUUID( asset.uuid );
         rule.checkout();
         throw new UnsupportedOperationException("Not implemented yet !");
     }

Modified: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/server/TableDisplayHandler.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/server/TableDisplayHandler.java	2006-12-11 18:00:49 UTC (rev 8230)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/server/TableDisplayHandler.java	2006-12-11 18:02:20 UTC (rev 8231)
@@ -1,7 +1,6 @@
 package org.drools.brms.server;
 
 import java.text.DateFormat;
-import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Iterator;
@@ -12,7 +11,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.repository.RuleItem;
+import org.drools.repository.AssetItem;
 
 import com.google.gwt.user.client.rpc.SerializableException;
 
@@ -32,7 +31,7 @@
         List data = new ArrayList();
         
         for ( Iterator iter = list.iterator(); iter.hasNext(); ) {
-            RuleItem rule = (RuleItem) iter.next();
+            AssetItem rule = (AssetItem) iter.next();
             TableDataRow row = new TableDataRow();
             try {
 

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	2006-12-11 18:00:49 UTC (rev 8230)
+++ labs/jbossrules/trunk/drools-jbrms/src/test/java/org/drools/brms/server/ServiceImplementationTest.java	2006-12-11 18:02:20 UTC (rev 8231)
@@ -11,9 +11,8 @@
 import org.drools.brms.client.rpc.TableDataResult;
 import org.drools.brms.client.rpc.TableDataRow;
 import org.drools.brms.client.rulelist.RuleItemListViewer;
-
+import org.drools.repository.AssetItem;
 import org.drools.repository.CategoryItem;
-import org.drools.repository.RuleItem;
 
 import com.google.gwt.user.client.rpc.SerializableException;
 
@@ -160,7 +159,7 @@
       assertEquals("testLoadRuleAsset", asset.metaData.title);
       assertEquals("testLoadRuleAsset", asset.metaData.packageName);
    
-      RuleItem rule = impl.repo.loadRulePackage( "testLoadRuleAsset" ).loadRule( "testLoadRuleAsset" );
+      AssetItem rule = impl.repo.loadRulePackage( "testLoadRuleAsset" ).loadRule( "testLoadRuleAsset" );
       rule.updateState( "whee" );
       rule.checkin( "changed state" );
       asset = impl.loadRuleAsset( uuid );