[jboss-svn-commits] JBL Code SVN: r12770 - in labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools: xml and 1 other directory.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Thu Jun 21 23:59:59 EDT 2007
Author: fmeyer
Date: 2007-06-21 23:59:59 -0400 (Thu, 21 Jun 2007)
New Revision: 12770
Modified:
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/DrlDumper.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/AndHandler.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/EvalHandler.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/ExistsHandler.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/ForallHandler.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/NotHandler.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/OrHandler.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/XmlPackageReader.java
Log:
JBRULES-880
- Fixing some peers and code beauty.
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-22 03:16:05 UTC (rev 12769)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/DrlDumper.java 2007-06-22 03:59:59 UTC (rev 12770)
@@ -16,19 +16,17 @@
* limitations under the License.
*/
-import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import org.drools.lang.descr.AndDescr;
import org.drools.lang.descr.AttributeDescr;
import org.drools.lang.descr.CollectDescr;
-import org.drools.lang.descr.ForallDescr;
-import org.drools.lang.descr.PatternDescr;
import org.drools.lang.descr.EvalDescr;
import org.drools.lang.descr.ExistsDescr;
import org.drools.lang.descr.FieldBindingDescr;
import org.drools.lang.descr.FieldConstraintDescr;
+import org.drools.lang.descr.ForallDescr;
import org.drools.lang.descr.FunctionDescr;
import org.drools.lang.descr.GlobalDescr;
import org.drools.lang.descr.ImportDescr;
@@ -37,6 +35,7 @@
import org.drools.lang.descr.OrDescr;
import org.drools.lang.descr.PackageDescr;
import org.drools.lang.descr.PackageDescrDumper;
+import org.drools.lang.descr.PatternDescr;
import org.drools.lang.descr.PredicateDescr;
import org.drools.lang.descr.QualifiedIdentifierRestrictionDescr;
import org.drools.lang.descr.QueryDescr;
@@ -56,16 +55,16 @@
PackageDescrDumper {
private StringBuffer drlDump;
- private static final String eol = System.getProperty( "line.separator" );
- private String template;
- private boolean needsBracket = false;
+ private static final String eol = System.getProperty( "line.separator" );
+ private String template;
+ private boolean needsBracket = false;
public synchronized String dump(final PackageDescr packageDescr) {
this.drlDump = new StringBuffer();
visitPackageDescr( packageDescr );
return this.drlDump.toString();
}
-
+
public String getTemplate() {
return this.template;
}
@@ -94,7 +93,8 @@
public void visitFieldConstraintDescr(final FieldConstraintDescr descr) {
if ( !descr.getRestrictions().isEmpty() ) {
- this.template = descr.getFieldName() + " " + processFieldConstraint( descr.getRestriction(), false );
+ this.template = descr.getFieldName() + " " + processFieldConstraint( descr.getRestriction(),
+ false );
}
}
@@ -142,21 +142,21 @@
tmpstr += this.template.substring( 2 );
this.template = tmpstr + ");";
}
-
+
//TODO FM: FIXME
public void visitAccumulateDescr() {
-
+
}
-
+
public void visitForallDescr(final ForallDescr descr) {
this.template = new String();
- this.template += "\t\tforall ( ";
+ this.template += "\t\tforall ( ";
this.template += DrlDumper.eol;
- this.template += processDescrList( descr.getDescrs() );
+ this.template += processDescrList( descr.getDescrs() );
this.template += "\t\t)";
this.template += DrlDumper.eol;
}
-
+
public void visitFieldBindingDescr(final FieldBindingDescr descr) {
this.template = new String();
this.template = descr.getIdentifier() + " : " + descr.getFieldName();
@@ -193,7 +193,8 @@
}
public void visitRestrictionConnectiveDescr(final RestrictionConnectiveDescr descr) {
- String tmp = this.processFieldConstraint( descr, true );
+ String tmp = this.processFieldConstraint( descr,
+ true );
this.template = tmp;
}
@@ -289,7 +290,8 @@
visit( iterator.next() );
descrString += this.template;
if ( descrString.endsWith( DrlDumper.eol ) ) {
- descrString = descrString.substring( 0, descrString.indexOf( DrlDumper.eol ) );
+ descrString = descrString.substring( 0,
+ descrString.indexOf( DrlDumper.eol ) );
}
descrString += " || ";
}
@@ -328,29 +330,30 @@
descrString.length() );
}
- private String processFieldConstraint(final RestrictionConnectiveDescr restriction, boolean addBrackets ) {
+ private String processFieldConstraint(final RestrictionConnectiveDescr restriction,
+ boolean addBrackets) {
String descrString = "";
String connective = "";
boolean bracketTmp = this.needsBracket;
this.needsBracket = restriction.getRestrictions().size() > 1;
-
+
if ( restriction.getConnective() == RestrictionConnectiveDescr.OR ) {
connective = " || ";
} else {
connective = " && ";
}
- if( addBrackets && bracketTmp ) {
+ if ( addBrackets && bracketTmp ) {
descrString += "( ";
}
for ( final Iterator it = restriction.getRestrictions().iterator(); it.hasNext(); ) {
final Object temp = it.next();
visit( temp );
descrString += this.template;
- if( it.hasNext() ) {
+ if ( it.hasNext() ) {
descrString += connective;
}
}
- if( addBrackets && bracketTmp ) {
+ if ( addBrackets && bracketTmp ) {
descrString += " )";
}
this.needsBracket = bracketTmp;
@@ -360,15 +363,15 @@
private String processDescrList(final List descr) {
String descrString = "";
for ( final Iterator ite = descr.iterator(); ite.hasNext(); ) {
-
- Object obj = ite.next();
-
+
+ Object obj = ite.next();
+
visit( obj );
descrString += this.template;
-
- if (obj.getClass().equals( PatternDescr.class ) || obj.getClass().equals( CollectDescr.class ) ) {
+
+ if ( obj.getClass().equals( PatternDescr.class ) || obj.getClass().equals( CollectDescr.class ) ) {
descrString += DrlDumper.eol;
- } else if (ite.hasNext()) {
+ } else if ( ite.hasNext() ) {
descrString += " && ";
}
}
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/AndHandler.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/AndHandler.java 2007-06-22 03:16:05 UTC (rev 12769)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/AndHandler.java 2007-06-22 03:59:59 UTC (rev 12770)
@@ -24,6 +24,7 @@
import org.drools.lang.descr.ConditionalElementDescr;
import org.drools.lang.descr.EvalDescr;
import org.drools.lang.descr.ExistsDescr;
+import org.drools.lang.descr.ForallDescr;
import org.drools.lang.descr.NotDescr;
import org.drools.lang.descr.OrDescr;
import org.drools.lang.descr.PatternDescr;
@@ -59,6 +60,8 @@
this.validPeers.add( ExistsDescr.class );
this.validPeers.add( EvalDescr.class );
this.validPeers.add( PatternDescr.class );
+ this.validPeers.add( ForallDescr.class );
+
this.allowNesting = true;
}
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/EvalHandler.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/EvalHandler.java 2007-06-22 03:16:05 UTC (rev 12769)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/EvalHandler.java 2007-06-22 03:59:59 UTC (rev 12770)
@@ -21,6 +21,7 @@
import java.util.ListIterator;
import org.drools.lang.descr.AndDescr;
+import org.drools.lang.descr.ForallDescr;
import org.drools.lang.descr.PatternDescr;
import org.drools.lang.descr.ConditionalElementDescr;
import org.drools.lang.descr.EvalDescr;
@@ -56,6 +57,8 @@
this.validPeers.add( ExistsDescr.class );
this.validPeers.add( EvalDescr.class );
this.validPeers.add( PatternDescr.class );
+ this.validPeers.add( ForallDescr.class );
+
this.allowNesting = true;
}
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/ExistsHandler.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/ExistsHandler.java 2007-06-22 03:16:05 UTC (rev 12769)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/ExistsHandler.java 2007-06-22 03:59:59 UTC (rev 12770)
@@ -24,6 +24,7 @@
import org.drools.lang.descr.ConditionalElementDescr;
import org.drools.lang.descr.EvalDescr;
import org.drools.lang.descr.ExistsDescr;
+import org.drools.lang.descr.ForallDescr;
import org.drools.lang.descr.NotDescr;
import org.drools.lang.descr.OrDescr;
import org.drools.lang.descr.PatternDescr;
@@ -57,6 +58,8 @@
this.validPeers.add( ExistsDescr.class );
this.validPeers.add( EvalDescr.class );
this.validPeers.add( PatternDescr.class );
+ this.validPeers.add( ForallDescr.class );
+
this.allowNesting = true;
}
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/ForallHandler.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/ForallHandler.java 2007-06-22 03:16:05 UTC (rev 12769)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/ForallHandler.java 2007-06-22 03:59:59 UTC (rev 12770)
@@ -9,7 +9,12 @@
import org.drools.lang.descr.AndDescr;
import org.drools.lang.descr.ConditionalElementDescr;
+import org.drools.lang.descr.EvalDescr;
+import org.drools.lang.descr.ExistsDescr;
import org.drools.lang.descr.ForallDescr;
+import org.drools.lang.descr.NotDescr;
+import org.drools.lang.descr.OrDescr;
+import org.drools.lang.descr.PatternDescr;
import org.xml.sax.Attributes;
import org.xml.sax.SAXException;
@@ -30,6 +35,14 @@
this.validPeers = new HashSet();
this.validPeers.add( null );
+
+ this.validPeers.add( AndDescr.class );
+ this.validPeers.add( OrDescr.class );
+ this.validPeers.add( NotDescr.class );
+ this.validPeers.add( ExistsDescr.class );
+ this.validPeers.add( EvalDescr.class );
+ this.validPeers.add( PatternDescr.class );
+ this.validPeers.add( ForallDescr.class );
this.allowNesting = true;
}
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/NotHandler.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/NotHandler.java 2007-06-22 03:16:05 UTC (rev 12769)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/NotHandler.java 2007-06-22 03:59:59 UTC (rev 12770)
@@ -21,6 +21,7 @@
import java.util.ListIterator;
import org.drools.lang.descr.AndDescr;
+import org.drools.lang.descr.ForallDescr;
import org.drools.lang.descr.PatternDescr;
import org.drools.lang.descr.ConditionalElementDescr;
import org.drools.lang.descr.EvalDescr;
@@ -56,6 +57,7 @@
this.validPeers.add( ExistsDescr.class );
this.validPeers.add( EvalDescr.class );
this.validPeers.add( PatternDescr.class );
+ this.validPeers.add( ForallDescr.class );
this.allowNesting = true;
}
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/OrHandler.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/OrHandler.java 2007-06-22 03:16:05 UTC (rev 12769)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/OrHandler.java 2007-06-22 03:59:59 UTC (rev 12770)
@@ -24,6 +24,7 @@
import org.drools.lang.descr.ConditionalElementDescr;
import org.drools.lang.descr.EvalDescr;
import org.drools.lang.descr.ExistsDescr;
+import org.drools.lang.descr.ForallDescr;
import org.drools.lang.descr.NotDescr;
import org.drools.lang.descr.OrDescr;
import org.drools.lang.descr.PatternDescr;
@@ -52,6 +53,7 @@
this.validPeers.add( ExistsDescr.class );
this.validPeers.add( EvalDescr.class );
this.validPeers.add( PatternDescr.class );
+ this.validPeers.add( ForallDescr.class );
this.allowNesting = true;
}
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-22 03:16:05 UTC (rev 12769)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/PatternHandler.java 2007-06-22 03:59:59 UTC (rev 12770)
@@ -68,6 +68,7 @@
this.validPeers.add( ExistsDescr.class );
this.validPeers.add( EvalDescr.class );
this.validPeers.add( PatternDescr.class );
+ this.validPeers.add( ForallDescr.class );
this.allowNesting = true;
}
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/XmlPackageReader.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/XmlPackageReader.java 2007-06-22 03:16:05 UTC (rev 12769)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/XmlPackageReader.java 2007-06-22 03:59:59 UTC (rev 12770)
@@ -500,7 +500,7 @@
}
}
if ( !validPeer ) {
- throw new SAXParseException( "<" + localName + "> is after an invalid element",
+ throw new SAXParseException( "<" + localName + "> is after an invalid element: " + Handler.class.getName(),
getLocator() );
}
More information about the jboss-svn-commits
mailing list