[jboss-svn-commits] JBL Code SVN: r12815 - labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml.

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

Author: fmeyer
Date: 2007-06-24 22:18:11 -0400 (Sun, 24 Jun 2007)
New Revision: 12815

Modified:
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/FromHandler.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/PatternHandler.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/XmlDumper.java
Log:
JBRULES-880
	- just some code beauty

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/FromHandler.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/FromHandler.java	2007-06-25 02:14:32 UTC (rev 12814)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/FromHandler.java	2007-06-25 02:18:11 UTC (rev 12815)
@@ -65,10 +65,9 @@
 
         final ConditionalElementDescr parentDescr = (ConditionalElementDescr) parent;
 
-        if ( config.getChild( "accumulate" ) != null || config.getChild( "collect" ) != null ) return null;
+        if ( (config.getChild( "accumulate" ) == null) && (config.getChild( "collect" ) == null) ) 
+            ((ConditionalElementDescr) parent).addDescr( fromDescr );
 
-        ((ConditionalElementDescr) parent).addDescr( fromDescr );
-
         return null;
     }
 

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/PatternHandler.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/PatternHandler.java	2007-06-25 02:14:32 UTC (rev 12814)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/PatternHandler.java	2007-06-25 02:18:11 UTC (rev 12815)
@@ -112,10 +112,10 @@
             final PatternProcessorCeDescr parentDescr = (PatternProcessorCeDescr) parent;
             parentDescr.setSourcePattern( patternDescr );
         } else {
-            if ( config.getChild( "from" ) != null ) return null;
-
-            final ConditionalElementDescr parentDescr = (ConditionalElementDescr) parent;
-            parentDescr.addDescr( patternDescr );
+            if ( config.getChild( "from" ) == null ) { 
+                final ConditionalElementDescr parentDescr = (ConditionalElementDescr) parent;
+                parentDescr.addDescr( patternDescr );
+            }
         }
         return null;
     }

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/XmlDumper.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/XmlDumper.java	2007-06-25 02:14:32 UTC (rev 12814)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/XmlDumper.java	2007-06-25 02:18:11 UTC (rev 12815)
@@ -60,6 +60,7 @@
     private StringBuffer        xmlDump;
     private boolean             patternContext;
     private final static String eol = System.getProperty( "line.separator" );
+    private String              template;
 
     public synchronized String dump(final PackageDescr packageDescr) {
         this.xmlDump = new StringBuffer();
@@ -132,12 +133,10 @@
         tmpstr += this.template + " <from> <accumulate> ";
         visit( descr.getSourcePattern() );
         tmpstr += this.template;
-        
-        if ( descr.isExternalFunction() )
-            tmpstr += "<external-function evaluator=\"" + descr.getFunctionIdentifier() + "\" expression=\"" + descr.getExpression()  + "\"/>";
-        else 
-            tmpstr += "<init>" + descr.getInitCode() + "</init><action>" + descr.getActionCode() + "</action><result>" + descr.getResultCode() + "</result>";
 
+        if ( descr.isExternalFunction() ) tmpstr += "<external-function evaluator=\"" + descr.getFunctionIdentifier() + "\" expression=\"" + descr.getExpression() + "\"/>";
+        else tmpstr += "<init>" + descr.getInitCode() + "</init><action>" + descr.getActionCode() + "</action><result>" + descr.getResultCode() + "</result>";
+
         this.template = tmpstr + " </accumulate> </from> ";
         this.template += "</pattern>";
     }
@@ -146,7 +145,7 @@
         String tmpstr = new String();
         visitPatternDescr( descr.getReturnedPattern() );
         this.template = this.template.substring( 0,
-        this.template.indexOf( "</pattern>" ) );
+                                                 this.template.indexOf( "</pattern>" ) );
         tmpstr += this.template + " <from> <expression> ";
         tmpstr += descr.getDataSource();
         this.template = tmpstr + " </expression> </from> ";
@@ -240,8 +239,6 @@
         this.template = "<query name=\"" + descr.getName() + "\">" + "<lhs>" + processDescrList( descr.getLhs().getDescrs() ) + "</lhs>" + "</query>";
     }
 
-    private String template;
-
     private String processRules(final List rules) {
         String ruleList = "";
         for ( final Iterator iterator = rules.iterator(); iterator.hasNext(); ) {