[jboss-svn-commits] JBL Code SVN: r17143 - in labs/jbossrules/trunk/drools-compiler/src: test/java/org/drools/xml/processes and 1 other directory.

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

Author: mark.proctor at jboss.com
Date: 2007-12-09 22:46:44 -0500 (Sun, 09 Dec 2007)
New Revision: 17143

Modified:
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/PackageBuilder.java
   labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/xml/processes/ActionNodeTest.java
Log:
JBRULES-1375 Create initial ePDL language parser implementation
-changed method to addProcessFromXml

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/PackageBuilder.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/PackageBuilder.java	2007-12-10 03:39:41 UTC (rev 17142)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/PackageBuilder.java	2007-12-10 03:46:44 UTC (rev 17143)
@@ -59,6 +59,7 @@
 import org.drools.ruleflow.core.impl.DroolsConsequenceAction;
 import org.drools.xml.ExtensibleXmlParser;
 import org.drools.xml.XmlPackageReader;
+import org.drools.xml.XmlProcessReader;
 import org.xml.sax.SAXException;
 
 /**
@@ -238,12 +239,13 @@
         this.results = this.dialectRegistry.addResults( this.results );        
     }
     
-    public void addProcess(Process process) {
+    public void addProcessFromXml(Reader reader) {
         ProcessBuilder processBuilder = new ProcessBuilder( this );
-        
+        XmlProcessReader xmlReader = new XmlProcessReader( );
         try {
+            Process process = xmlReader.read(  reader );
             processBuilder.buildProcess( process );
-            this.results.addAll( processBuilder.getErrors() );
+            this.results.addAll( processBuilder.getErrors() );            
         } catch ( Exception e ) {
             if ( e instanceof RuntimeException ) {
                 throw (RuntimeException) e;
@@ -252,7 +254,7 @@
                                                      e ) );
         } 
 
-        this.results = this.dialectRegistry.addResults( this.results );          
+        this.results = this.dialectRegistry.addResults( this.results ); 
     }
 
     /**

Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/xml/processes/ActionNodeTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/xml/processes/ActionNodeTest.java	2007-12-10 03:39:41 UTC (rev 17142)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/xml/processes/ActionNodeTest.java	2007-12-10 03:46:44 UTC (rev 17143)
@@ -15,11 +15,10 @@
 
 public class ActionNodeTest extends TestCase {
     public void testSingleActionNode() throws Exception {        
-        XmlProcessReader reader = new XmlProcessReader( );
-        Process process = reader.read( new InputStreamReader( ActionNodeTest.class.getResourceAsStream( "ActionNodeTest.xml" ) ) );
+
         
         PackageBuilder builder = new PackageBuilder();
-        builder.addProcess( process );
+        builder.addProcessFromXml( new InputStreamReader( ActionNodeTest.class.getResourceAsStream( "ActionNodeTest.xml" ) ) );
         
         System.out.println( builder.getErrors() );