[jboss-svn-commits] JBL Code SVN: r13245 - in labs/jbossrules/trunk/drools-core/src/main/java/org/drools: common and 1 other directory.

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

Author: KrisVerlaenen
Date: 2007-07-08 16:07:40 -0400 (Sun, 08 Jul 2007)
New Revision: 13245

Modified:
   labs/jbossrules/trunk/drools-core/src/main/java/org/drools/RuleBase.java
   labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/AbstractRuleBase.java
   labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/AbstractWorkingMemory.java
   labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/InternalRuleBase.java
Log:
Updated mgmt of ruleflow in rulebase + builder

Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/RuleBase.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/RuleBase.java	2007-07-08 20:07:33 UTC (rev 13244)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/RuleBase.java	2007-07-08 20:07:40 UTC (rev 13245)
@@ -127,12 +127,6 @@
 
     void removePackage(String packageName);
 
-    void addProcess(Process process);
-
-    void removeProcess(String id);
-
-    Process getProcess(String id);
-
     void removeRule(String packageName,
                     String ruleName);
 

Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/AbstractRuleBase.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/AbstractRuleBase.java	2007-07-08 20:07:33 UTC (rev 13244)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/AbstractRuleBase.java	2007-07-08 20:07:40 UTC (rev 13245)
@@ -407,6 +407,15 @@
                 pkg.addRule( newRule );
             }
         }
+        
+        //and now the rule flows
+        if ( newPkg.getRuleFlows() != Collections.EMPTY_MAP ) {
+            Map flows = newPkg.getRuleFlows();
+            for ( Iterator iter = flows.values().iterator(); iter.hasNext(); ) {
+                Process flow = (Process) iter.next();
+                pkg.addRuleFlow(flow);
+            }
+        }
     }
 
     protected synchronized void addRule(final Rule rule) throws InvalidPatternException {
@@ -457,6 +466,11 @@
                         this.globals.remove( globalName );
                     }
                 }
+                //and now the rule flows
+                Map flows = pkg.getRuleFlows();
+                for ( Iterator iter = flows.keySet().iterator(); iter.hasNext(); ) {
+                    removeProcess((String) iter.next());
+                }
                 // removing the package itself from the list
                 this.pkgs.remove( pkg.getName() );
             } finally {

Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/AbstractWorkingMemory.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/AbstractWorkingMemory.java	2007-07-08 20:07:33 UTC (rev 13244)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/AbstractWorkingMemory.java	2007-07-08 20:07:40 UTC (rev 13245)
@@ -1349,7 +1349,7 @@
     }
 
     public ProcessInstance startProcess(final String processId) {
-        final Process process = getRuleBase().getProcess( processId );
+        final Process process = ((InternalRuleBase) getRuleBase()).getProcess( processId );
         if ( process == null ) {
             throw new IllegalArgumentException( "Unknown process ID: " + processId );
         }

Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/InternalRuleBase.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/InternalRuleBase.java	2007-07-08 20:07:33 UTC (rev 13244)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/InternalRuleBase.java	2007-07-08 20:07:40 UTC (rev 13245)
@@ -29,6 +29,7 @@
 import org.drools.rule.CompositePackageClassLoader;
 import org.drools.rule.MapBackedClassLoader;
 import org.drools.rule.Package;
+import org.drools.ruleflow.common.core.Process;
 import org.drools.spi.FactHandleFactory;
 import org.drools.spi.PropagationContext;
 
@@ -99,4 +100,7 @@
     public Rete getRete();
     
     public InternalWorkingMemory[] getWorkingMemories();
+    
+    public Process getProcess(String id);
+
 }