[jboss-svn-commits] JBL Code SVN: r12791 - in labs/jbossrules/trunk/drools-compiler/src: main/java/org/drools/lang/descr and 3 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Sat Jun 23 11:44:26 EDT 2007
Author: fmeyer
Date: 2007-06-23 11:44:25 -0400 (Sat, 23 Jun 2007)
New Revision: 12791
Modified:
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/DrlDumper.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/AndDescr.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/FromDescr.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/FunctionCallDescr.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/Restriction.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/RestrictionDescr.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/ExpressionHandler.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/XmlDumper.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/xml/DumperTest.java
labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/xml/test_ParseFrom.xml
Log:
JBRULES-880
- Updated DRL dumper to handle with new language features
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/DrlDumper.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/DrlDumper.java 2007-06-23 13:50:01 UTC (rev 12790)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/DrlDumper.java 2007-06-23 15:44:25 UTC (rev 12791)
@@ -159,9 +159,8 @@
public void visitFromDescr(final FromDescr descr) {
visitPatternDescr( descr.getReturnedPattern() );
- this.template += " from (";
- this.template += descr.getDataSource().getText().trim();
- this.template += ")";
+ this.template += " from ";
+ this.template += descr.getDataSource();
}
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/AndDescr.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/AndDescr.java 2007-06-23 13:50:01 UTC (rev 12790)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/AndDescr.java 2007-06-23 15:44:25 UTC (rev 12791)
@@ -17,7 +17,6 @@
*/
import java.util.ArrayList;
-import java.util.Iterator;
import java.util.List;
public class AndDescr extends BaseDescr
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/FromDescr.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/FromDescr.java 2007-06-23 13:50:01 UTC (rev 12790)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/FromDescr.java 2007-06-23 15:44:25 UTC (rev 12791)
@@ -6,6 +6,8 @@
public class FromDescr extends BaseDescr
implements
ConditionalElementDescr {
+
+ private static final long serialVersionUID = -7321451713158332284L;
private PatternDescr pattern;
private DeclarativeInvokerDescr dataSource;
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/FunctionCallDescr.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/FunctionCallDescr.java 2007-06-23 13:50:01 UTC (rev 12790)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/FunctionCallDescr.java 2007-06-23 15:44:25 UTC (rev 12791)
@@ -5,6 +5,7 @@
*/
public class FunctionCallDescr extends DeclarativeInvokerDescr {
+ private static final long serialVersionUID = 2578223387059771844L;
private String name;
private String arguments;
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/Restriction.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/Restriction.java 2007-06-23 13:50:01 UTC (rev 12790)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/Restriction.java 2007-06-23 15:44:25 UTC (rev 12791)
@@ -18,4 +18,6 @@
public class Restriction extends BaseDescr {
+ private static final long serialVersionUID = 5509877288721548535L;
+
}
\ No newline at end of file
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/RestrictionDescr.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/RestrictionDescr.java 2007-06-23 13:50:01 UTC (rev 12790)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/RestrictionDescr.java 2007-06-23 15:44:25 UTC (rev 12791)
@@ -23,4 +23,6 @@
*/
public class RestrictionDescr extends BaseDescr {
+ private static final long serialVersionUID = 3979438504432163004L;
+
}
\ No newline at end of file
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/ExpressionHandler.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/ExpressionHandler.java 2007-06-23 13:50:01 UTC (rev 12790)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/ExpressionHandler.java 2007-06-23 15:44:25 UTC (rev 12791)
@@ -84,9 +84,7 @@
try {
final DeclarativeInvokerDescr declarativeInvoker = parser.from_source( fromSource );
- declarativeInvoker.setText( expression );
fromSource.setDataSource( declarativeInvoker );
-
} catch ( final RecognitionException e ) {
throw new SAXParseException( "<" + localName + "> must have a valid expression content ",
this.xmlPackageReader.getLocator() );
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-23 13:50:01 UTC (rev 12790)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/XmlDumper.java 2007-06-23 15:44:25 UTC (rev 12791)
@@ -146,10 +146,9 @@
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().getText().trim();
-
+ tmpstr += descr.getDataSource();
this.template = tmpstr + " </expression> </from> ";
this.template += "</pattern>";
}
Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/xml/DumperTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/xml/DumperTest.java 2007-06-23 13:50:01 UTC (rev 12790)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/xml/DumperTest.java 2007-06-23 15:44:25 UTC (rev 12791)
@@ -65,7 +65,7 @@
}
//FM: FIXME
- public void FIXME_testRoundTripFromDrl() throws Exception {
+ public void testRoundTripFromDrl() throws Exception {
DumperTestHelper.DrlFile( "test_from.drl" );
}
Modified: labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/xml/test_ParseFrom.xml
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/xml/test_ParseFrom.xml 2007-06-23 13:50:01 UTC (rev 12790)
+++ labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/xml/test_ParseFrom.xml 2007-06-23 15:44:25 UTC (rev 12791)
@@ -21,7 +21,7 @@
<pattern identifier="cheese" object-type="Cheese" >
<from>
<expression>
- cheesery.getCheeses(i+4);
+ cheesery.getCheeses(i+4)
</expression>
</from>
</pattern>
More information about the jboss-svn-commits
mailing list