[jboss-svn-commits] JBL Code SVN: r17439 - in labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml: rules and 1 other directory.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Sat Dec 29 13:14:33 EST 2007
Author: mark.proctor at jboss.com
Date: 2007-12-29 13:14:33 -0500 (Sat, 29 Dec 2007)
New Revision: 17439
Modified:
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/processes/ActionNodeHandler.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/processes/ConnectionHandler.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/processes/EndNodeHandler.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/processes/GlobalHandler.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/processes/ImportHandler.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/processes/ProcessHandler.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/processes/StartNodeHandler.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/rules/AccumulateHandler.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/rules/AccumulateHelperHandler.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/rules/AndHandler.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/rules/CollectHandler.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/rules/EvalHandler.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/rules/ExistsHandler.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/rules/ExpressionHandler.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/rules/FieldBindingHandler.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/rules/FieldConstraintHandler.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/rules/ForallHandler.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/rules/FromHandler.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/rules/FunctionHandler.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/rules/LiteralRestrictionHandler.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/rules/NotHandler.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/rules/OrHandler.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/rules/PackageHandler.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/rules/PatternHandler.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/rules/PredicateHandler.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/rules/QualifiedIdentifierRestrictionHandler.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/rules/QueryHandler.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/rules/RestrictionConnectiveHandler.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/rules/ReturnValueRestrictionHandler.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/rules/RuleHandler.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/rules/VariableRestrictionsHandler.java
Log:
-renamed xmlPackageReader to just parser
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/processes/ActionNodeHandler.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/processes/ActionNodeHandler.java 2007-12-29 18:07:05 UTC (rev 17438)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/processes/ActionNodeHandler.java 2007-12-29 18:14:33 UTC (rev 17439)
@@ -44,40 +44,40 @@
public Object start(final String uri,
final String localName,
final Attributes attrs,
- final ExtensibleXmlParser xmlPackageReader) throws SAXException {
- xmlPackageReader.startConfiguration( localName,
+ final ExtensibleXmlParser parser) throws SAXException {
+ parser.startConfiguration( localName,
attrs );
- RuleFlowProcessImpl process = ( RuleFlowProcessImpl ) xmlPackageReader.getParent();
+ RuleFlowProcessImpl process = ( RuleFlowProcessImpl ) parser.getParent();
ActionNodeImpl actionNode = new ActionNodeImpl();
final String name = attrs.getValue( "name" );
- emptyAttributeCheck( localName, "name", name, xmlPackageReader );
+ emptyAttributeCheck( localName, "name", name, parser );
actionNode.setName( name );
process.addNode( actionNode );
- ((ProcessBuildData)xmlPackageReader.getData()).addNode( actionNode );
+ ((ProcessBuildData)parser.getData()).addNode( actionNode );
return actionNode;
}
public Object end(final String uri,
final String localName,
- final ExtensibleXmlParser xmlPackageReader) throws SAXException {
- final Configuration config = xmlPackageReader.endConfiguration();
- RuleFlowProcessImpl process = ( RuleFlowProcessImpl ) xmlPackageReader.getParent();
+ final ExtensibleXmlParser parser) throws SAXException {
+ final Configuration config = parser.endConfiguration();
+ RuleFlowProcessImpl process = ( RuleFlowProcessImpl ) parser.getParent();
- ActionNodeImpl actionNode = ( ActionNodeImpl ) xmlPackageReader.getCurrent();
+ ActionNodeImpl actionNode = ( ActionNodeImpl ) parser.getCurrent();
String text = config.getText();
if ( text == null ) {
throw new SAXParseException( "<action-node> requires content",
- xmlPackageReader.getLocator() );
+ parser.getLocator() );
}
final String dialect = config.getAttribute( "dialect" );
- emptyAttributeCheck( localName, "dialect", dialect, xmlPackageReader );
+ emptyAttributeCheck( localName, "dialect", dialect, parser );
DroolsConsequenceAction actionText = new DroolsConsequenceAction( dialect, text);
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/processes/ConnectionHandler.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/processes/ConnectionHandler.java 2007-12-29 18:07:05 UTC (rev 17438)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/processes/ConnectionHandler.java 2007-12-29 18:14:33 UTC (rev 17439)
@@ -46,26 +46,26 @@
public Object start(final String uri,
final String localName,
final Attributes attrs,
- final ExtensibleXmlParser xmlPackageReader) throws SAXException {
- xmlPackageReader.startConfiguration( localName,
+ final ExtensibleXmlParser parser) throws SAXException {
+ parser.startConfiguration( localName,
attrs );
String fromName = attrs.getValue( "from" );
String toName = attrs.getValue( "to" );
- emptyAttributeCheck( localName, "from", fromName, xmlPackageReader );
- emptyAttributeCheck( localName, "to", toName, xmlPackageReader );
+ emptyAttributeCheck( localName, "from", fromName, parser );
+ emptyAttributeCheck( localName, "to", toName, parser );
- ProcessBuildData buildData = (ProcessBuildData)xmlPackageReader.getData();
+ ProcessBuildData buildData = (ProcessBuildData)parser.getData();
Node fromNode = buildData.getNode( fromName );
Node toNode = buildData.getNode( toName );
if ( fromNode == null ) {
throw new SAXParseException( "from Node connection name '" + fromName + "' cannot be found",
- xmlPackageReader.getLocator() );
+ parser.getLocator() );
}
if ( toNode == null ) {
throw new SAXParseException( "from Node connection name '" + toName + "' cannot be found",
- xmlPackageReader.getLocator() );
+ parser.getLocator() );
}
ConnectionImpl connection = new ConnectionImpl(fromNode, toNode, Connection.TYPE_NORMAL);
@@ -75,9 +75,9 @@
public Object end(final String uri,
final String localName,
- final ExtensibleXmlParser xmlPackageReader) throws SAXException {
- final Configuration config = xmlPackageReader.endConfiguration();
- return xmlPackageReader.getCurrent();
+ final ExtensibleXmlParser parser) throws SAXException {
+ final Configuration config = parser.endConfiguration();
+ return parser.getCurrent();
}
public Class generateNodeFor() {
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/processes/EndNodeHandler.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/processes/EndNodeHandler.java 2007-12-29 18:07:05 UTC (rev 17438)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/processes/EndNodeHandler.java 2007-12-29 18:14:33 UTC (rev 17439)
@@ -45,29 +45,29 @@
public Object start(final String uri,
final String localName,
final Attributes attrs,
- final ExtensibleXmlParser xmlPackageReader) throws SAXException {
- xmlPackageReader.startConfiguration( localName,
+ final ExtensibleXmlParser parser) throws SAXException {
+ parser.startConfiguration( localName,
attrs );
- RuleFlowProcessImpl process = ( RuleFlowProcessImpl ) xmlPackageReader.getParent();
+ RuleFlowProcessImpl process = ( RuleFlowProcessImpl ) parser.getParent();
final EndNode endNode = new EndNodeImpl();
final String name = attrs.getValue( "name" );
- emptyAttributeCheck( localName, "name", name, xmlPackageReader );
+ emptyAttributeCheck( localName, "name", name, parser );
endNode.setName( name );
process.addNode( endNode );
- ((ProcessBuildData)xmlPackageReader.getData()).addNode( endNode );
+ ((ProcessBuildData)parser.getData()).addNode( endNode );
return endNode;
}
public Object end(final String uri,
final String localName,
- final ExtensibleXmlParser xmlPackageReader) throws SAXException {
- final Configuration config = xmlPackageReader.endConfiguration();
- return xmlPackageReader.getCurrent();
+ final ExtensibleXmlParser parser) throws SAXException {
+ final Configuration config = parser.endConfiguration();
+ return parser.getCurrent();
}
public Class generateNodeFor() {
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/processes/GlobalHandler.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/processes/GlobalHandler.java 2007-12-29 18:07:05 UTC (rev 17438)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/processes/GlobalHandler.java 2007-12-29 18:14:33 UTC (rev 17439)
@@ -46,17 +46,17 @@
public Object start(final String uri,
final String localName,
final Attributes attrs,
- final ExtensibleXmlParser xmlPackageReader) throws SAXException {
- xmlPackageReader.startConfiguration( localName,
+ final ExtensibleXmlParser parser) throws SAXException {
+ parser.startConfiguration( localName,
attrs );
- RuleFlowProcessImpl process = ( RuleFlowProcessImpl ) xmlPackageReader.getParent();
+ RuleFlowProcessImpl process = ( RuleFlowProcessImpl ) parser.getParent();
final String identifier = attrs.getValue( "identifier" );
final String type = attrs.getValue( "type" );
- emptyAttributeCheck( localName, "identifier", identifier, xmlPackageReader );
- emptyAttributeCheck( localName, "type", type, xmlPackageReader );
+ emptyAttributeCheck( localName, "identifier", identifier, parser );
+ emptyAttributeCheck( localName, "type", type, parser );
Map<String, String> map = process.getGlobals();
if ( map == null ) {
@@ -70,8 +70,8 @@
public Object end(final String uri,
final String localName,
- final ExtensibleXmlParser xmlPackageReader) throws SAXException {
- final Configuration config = xmlPackageReader.endConfiguration();
+ final ExtensibleXmlParser parser) throws SAXException {
+ final Configuration config = parser.endConfiguration();
return null;
}
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/processes/ImportHandler.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/processes/ImportHandler.java 2007-12-29 18:07:05 UTC (rev 17438)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/processes/ImportHandler.java 2007-12-29 18:14:33 UTC (rev 17439)
@@ -45,14 +45,14 @@
public Object start(final String uri,
final String localName,
final Attributes attrs,
- final ExtensibleXmlParser xmlPackageReader) throws SAXException {
- xmlPackageReader.startConfiguration( localName,
+ final ExtensibleXmlParser parser) throws SAXException {
+ parser.startConfiguration( localName,
attrs );
- RuleFlowProcessImpl process = ( RuleFlowProcessImpl ) xmlPackageReader.getParent();
+ RuleFlowProcessImpl process = ( RuleFlowProcessImpl ) parser.getParent();
final String name = attrs.getValue( "name" );
- emptyAttributeCheck( localName, "name", name, xmlPackageReader );
+ emptyAttributeCheck( localName, "name", name, parser );
java.util.List<String> list =process.getImports();
if ( list == null ) {
@@ -66,8 +66,8 @@
public Object end(final String uri,
final String localName,
- final ExtensibleXmlParser xmlPackageReader) throws SAXException {
- final Configuration config = xmlPackageReader.endConfiguration();
+ final ExtensibleXmlParser parser) throws SAXException {
+ final Configuration config = parser.endConfiguration();
return null;
}
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/processes/ProcessHandler.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/processes/ProcessHandler.java 2007-12-29 18:07:05 UTC (rev 17438)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/processes/ProcessHandler.java 2007-12-29 18:14:33 UTC (rev 17439)
@@ -36,8 +36,8 @@
public Object start(final String uri,
final String localName,
final Attributes attrs,
- final ExtensibleXmlParser xmlPackageReader) throws SAXException {
- xmlPackageReader.startConfiguration( localName,
+ final ExtensibleXmlParser parser) throws SAXException {
+ parser.startConfiguration( localName,
attrs );
final String id = attrs.getValue( "id" );
@@ -46,10 +46,10 @@
final String type = attrs.getValue( "type" );
final String packageName = attrs.getValue( "package-name" );
- emptyAttributeCheck( localName, "id", name, xmlPackageReader );
- emptyAttributeCheck( localName, "name", name, xmlPackageReader );
- //emptyAttributeCheck( localName, "version", version, xmlPackageReader );
- emptyAttributeCheck( localName, "package-name", packageName, xmlPackageReader );
+ emptyAttributeCheck( localName, "id", name, parser );
+ emptyAttributeCheck( localName, "name", name, parser );
+ //emptyAttributeCheck( localName, "version", version, parser );
+ emptyAttributeCheck( localName, "package-name", packageName, parser );
RuleFlowProcessImpl process = new RuleFlowProcessImpl();
@@ -59,16 +59,16 @@
process.setType( type );
process.setPackageName( packageName );
- ((ProcessBuildData)xmlPackageReader.getData()).setProcess( process );
+ ((ProcessBuildData)parser.getData()).setProcess( process );
return process;
}
public Object end(final String uri,
final String localName,
- final ExtensibleXmlParser xmlPackageReader) throws SAXException {
- final Configuration config = xmlPackageReader.endConfiguration();
- return xmlPackageReader.getCurrent();
+ final ExtensibleXmlParser parser) throws SAXException {
+ final Configuration config = parser.endConfiguration();
+ return parser.getCurrent();
}
public Class generateNodeFor() {
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/processes/StartNodeHandler.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/processes/StartNodeHandler.java 2007-12-29 18:07:05 UTC (rev 17438)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/processes/StartNodeHandler.java 2007-12-29 18:14:33 UTC (rev 17439)
@@ -42,29 +42,29 @@
public Object start(final String uri,
final String localName,
final Attributes attrs,
- final ExtensibleXmlParser xmlPackageReader) throws SAXException {
- xmlPackageReader.startConfiguration( localName,
+ final ExtensibleXmlParser parser) throws SAXException {
+ parser.startConfiguration( localName,
attrs );
- RuleFlowProcessImpl process = ( RuleFlowProcessImpl ) xmlPackageReader.getParent();
+ RuleFlowProcessImpl process = ( RuleFlowProcessImpl ) parser.getParent();
final StartNode startNode = new StartNodeImpl();
final String name = attrs.getValue( "name" );
- emptyAttributeCheck( localName, "name", name, xmlPackageReader );
+ emptyAttributeCheck( localName, "name", name, parser );
startNode.setName( name );
process.addNode( startNode );
- ((ProcessBuildData)xmlPackageReader.getData()).addNode( startNode );
+ ((ProcessBuildData)parser.getData()).addNode( startNode );
return startNode;
}
public Object end(final String uri,
final String localName,
- final ExtensibleXmlParser xmlPackageReader) throws SAXException {
- final Configuration config = xmlPackageReader.endConfiguration();
- return xmlPackageReader.getCurrent();
+ final ExtensibleXmlParser parser) throws SAXException {
+ final Configuration config = parser.endConfiguration();
+ return parser.getCurrent();
}
public Class generateNodeFor() {
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/rules/AccumulateHandler.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/rules/AccumulateHandler.java 2007-12-29 18:07:05 UTC (rev 17438)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/rules/AccumulateHandler.java 2007-12-29 18:14:33 UTC (rev 17439)
@@ -54,9 +54,9 @@
public Object start(final String uri,
final String localName,
final Attributes attrs,
- final ExtensibleXmlParser xmlPackageReader) throws SAXException {
+ final ExtensibleXmlParser parser) throws SAXException {
- xmlPackageReader.startConfiguration( localName,
+ parser.startConfiguration( localName,
attrs );
final AccumulateDescr accumulateDesrc = new AccumulateDescr();
return accumulateDesrc;
@@ -64,15 +64,15 @@
public Object end(final String uri,
final String localName,
- final ExtensibleXmlParser xmlPackageReader) throws SAXException {
+ final ExtensibleXmlParser parser) throws SAXException {
- final Configuration config = xmlPackageReader.endConfiguration();
- final AccumulateDescr accumulateDescr = (AccumulateDescr) xmlPackageReader.getCurrent();
+ final Configuration config = parser.endConfiguration();
+ final AccumulateDescr accumulateDescr = (AccumulateDescr) parser.getCurrent();
- final Object parent = xmlPackageReader.getParent();
+ final Object parent = parser.getParent();
if ( parent.getClass().getName().equals( FromDescr.class.getName() ) ) {
- final PatternDescr result = (PatternDescr) xmlPackageReader.getParent( 1 );
+ final PatternDescr result = (PatternDescr) parser.getParent( 1 );
result.setSource( accumulateDescr );
} else if ( parent instanceof ConditionalElementDescr ) {
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/rules/AccumulateHelperHandler.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/rules/AccumulateHelperHandler.java 2007-12-29 18:07:05 UTC (rev 17438)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/rules/AccumulateHelperHandler.java 2007-12-29 18:14:33 UTC (rev 17439)
@@ -57,9 +57,9 @@
public Object start(final String uri,
final String localName,
final Attributes attrs,
- final ExtensibleXmlParser xmlPackageReader) throws SAXException {
+ final ExtensibleXmlParser parser) throws SAXException {
- xmlPackageReader.startConfiguration( localName,
+ parser.startConfiguration( localName,
attrs );
return new BaseDescr();
@@ -67,27 +67,27 @@
public Object end(final String uri,
final String localName,
- final ExtensibleXmlParser xmlPackageReader) throws SAXException {
+ final ExtensibleXmlParser parser) throws SAXException {
- final Configuration config = xmlPackageReader.endConfiguration();
+ final Configuration config = parser.endConfiguration();
final String expression = config.getText();
- final Object parent = xmlPackageReader.getParent();
+ final Object parent = parser.getParent();
final AccumulateDescr accumulate = (AccumulateDescr) parent;
if ( localName.equals( "init" ) ) {
- emptyContentCheck( localName, expression, xmlPackageReader );
+ emptyContentCheck( localName, expression, parser );
accumulate.setInitCode( expression.trim() );
} else if ( localName.equals( "action" ) ) {
- emptyContentCheck( localName, expression, xmlPackageReader );
+ emptyContentCheck( localName, expression, parser );
accumulate.setActionCode( expression.trim() );
} else if ( localName.equals( "result" ) ) {
- emptyContentCheck( localName, expression, xmlPackageReader );
+ emptyContentCheck( localName, expression, parser );
accumulate.setResultCode( expression.trim() );
} else if ( localName.equals( "reverse" ) ) {
- emptyContentCheck( localName, expression, xmlPackageReader );
+ emptyContentCheck( localName, expression, parser );
accumulate.setReverseCode( expression.trim() );
} else if ( localName.equals( "external-function" ) ) {
accumulate.setExternalFunction( true );
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/rules/AndHandler.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/rules/AndHandler.java 2007-12-29 18:07:05 UTC (rev 17438)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/rules/AndHandler.java 2007-12-29 18:14:33 UTC (rev 17439)
@@ -74,8 +74,8 @@
public Object start(final String uri,
final String localName,
final Attributes attrs,
- final ExtensibleXmlParser xmlPackageReader) throws SAXException {
- xmlPackageReader.startConfiguration( localName,
+ final ExtensibleXmlParser parser) throws SAXException {
+ parser.startConfiguration( localName,
attrs );
final AndDescr andDescr = new AndDescr();
@@ -84,12 +84,12 @@
public Object end(final String uri,
final String localName,
- final ExtensibleXmlParser xmlPackageReader) throws SAXException {
- final Configuration config = xmlPackageReader.endConfiguration();
+ final ExtensibleXmlParser parser) throws SAXException {
+ final Configuration config = parser.endConfiguration();
- final AndDescr andDescr = (AndDescr) xmlPackageReader.getCurrent();
+ final AndDescr andDescr = (AndDescr) parser.getCurrent();
- final Object parent = xmlPackageReader.getParent();
+ final Object parent = parser.getParent();
if ( parent instanceof RuleDescr || parent instanceof QueryDescr ) {
final RuleDescr ruleDescr = (RuleDescr) parent;
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/rules/CollectHandler.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/rules/CollectHandler.java 2007-12-29 18:07:05 UTC (rev 17438)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/rules/CollectHandler.java 2007-12-29 18:14:33 UTC (rev 17439)
@@ -55,9 +55,9 @@
public Object start(final String uri,
final String localName,
final Attributes attrs,
- final ExtensibleXmlParser xmlPackageReader) throws SAXException {
+ final ExtensibleXmlParser parser) throws SAXException {
- xmlPackageReader.startConfiguration( localName,
+ parser.startConfiguration( localName,
attrs );
final CollectDescr collectDescr = new CollectDescr();
return collectDescr;
@@ -65,15 +65,15 @@
public Object end(final String uri,
final String localName,
- final ExtensibleXmlParser xmlPackageReader) throws SAXException {
+ final ExtensibleXmlParser parser) throws SAXException {
- final Configuration config = xmlPackageReader.endConfiguration();
- final CollectDescr collectDescr = (CollectDescr) xmlPackageReader.getCurrent();
+ final Configuration config = parser.endConfiguration();
+ final CollectDescr collectDescr = (CollectDescr) parser.getCurrent();
- final Object parent = xmlPackageReader.getParent();
+ final Object parent = parser.getParent();
if ( parent.getClass().getName().equals( FromDescr.class.getName() ) ) {
- final PatternDescr resultPattern = (PatternDescr) xmlPackageReader.getParent( 1 );
+ final PatternDescr resultPattern = (PatternDescr) parser.getParent( 1 );
resultPattern.setSource( collectDescr );
} else if ( parent instanceof ConditionalElementDescr ) {
final ConditionalElementDescr parentDescr = (ConditionalElementDescr) parent;
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/rules/EvalHandler.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/rules/EvalHandler.java 2007-12-29 18:07:05 UTC (rev 17438)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/rules/EvalHandler.java 2007-12-29 18:14:33 UTC (rev 17439)
@@ -68,8 +68,8 @@
public Object start(final String uri,
final String localName,
final Attributes attrs,
- final ExtensibleXmlParser xmlPackageReader) throws SAXException {
- xmlPackageReader.startConfiguration( localName,
+ final ExtensibleXmlParser parser) throws SAXException {
+ parser.startConfiguration( localName,
attrs );
final EvalDescr evalDescr = new EvalDescr();
@@ -79,18 +79,18 @@
public Object end(final String uri,
final String localName,
- final ExtensibleXmlParser xmlPackageReader) throws SAXException {
- final Configuration config = xmlPackageReader.endConfiguration();
+ final ExtensibleXmlParser parser) throws SAXException {
+ final Configuration config = parser.endConfiguration();
- final EvalDescr evalDescr = (EvalDescr) xmlPackageReader.getCurrent();
+ final EvalDescr evalDescr = (EvalDescr) parser.getCurrent();
final String expression = config.getText();
- emptyContentCheck( localName, expression, xmlPackageReader );
+ emptyContentCheck( localName, expression, parser );
evalDescr.setContent( expression );
- final ConditionalElementDescr parentDescr = (ConditionalElementDescr) xmlPackageReader.getParent();
+ final ConditionalElementDescr parentDescr = (ConditionalElementDescr) parser.getParent();
parentDescr.addDescr( evalDescr );
return evalDescr;
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/rules/ExistsHandler.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/rules/ExistsHandler.java 2007-12-29 18:07:05 UTC (rev 17438)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/rules/ExistsHandler.java 2007-12-29 18:14:33 UTC (rev 17439)
@@ -69,8 +69,8 @@
public Object start(final String uri,
final String localName,
final Attributes attrs,
- final ExtensibleXmlParser xmlPackageReader) throws SAXException {
- xmlPackageReader.startConfiguration( localName,
+ final ExtensibleXmlParser parser) throws SAXException {
+ parser.startConfiguration( localName,
attrs );
final ExistsDescr existsDescr = new ExistsDescr();
@@ -79,17 +79,17 @@
public Object end(final String uri,
final String localName,
- final ExtensibleXmlParser xmlPackageReader) throws SAXException {
- final Configuration config = xmlPackageReader.endConfiguration();
+ final ExtensibleXmlParser parser) throws SAXException {
+ final Configuration config = parser.endConfiguration();
- final ExistsDescr existsDescr = (ExistsDescr) xmlPackageReader.getCurrent();
+ final ExistsDescr existsDescr = (ExistsDescr) parser.getCurrent();
if ( (existsDescr.getDescrs().size() != 1) && (existsDescr.getDescrs().get( 0 ).getClass() != PatternDescr.class) ) {
throw new SAXParseException( "<exists> can only have a single <pattern...> as a child element",
- xmlPackageReader.getLocator() );
+ parser.getLocator() );
}
- final ConditionalElementDescr parentDescr = (ConditionalElementDescr) xmlPackageReader.getParent();
+ final ConditionalElementDescr parentDescr = (ConditionalElementDescr) parser.getParent();
parentDescr.addDescr( existsDescr );
return existsDescr;
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/rules/ExpressionHandler.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/rules/ExpressionHandler.java 2007-12-29 18:07:05 UTC (rev 17438)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/rules/ExpressionHandler.java 2007-12-29 18:14:33 UTC (rev 17439)
@@ -66,9 +66,9 @@
public Object start(final String uri,
final String localName,
final Attributes attrs,
- final ExtensibleXmlParser xmlPackageReader) throws SAXException {
+ final ExtensibleXmlParser parser) throws SAXException {
- xmlPackageReader.startConfiguration( localName,
+ parser.startConfiguration( localName,
attrs );
return new BaseDescr();
@@ -76,28 +76,28 @@
public Object end(final String uri,
final String localName,
- final ExtensibleXmlParser xmlPackageReader) throws SAXException {
+ final ExtensibleXmlParser parser) throws SAXException {
- final Configuration config = xmlPackageReader.endConfiguration();
+ final Configuration config = parser.endConfiguration();
final String expression = config.getText();
- emptyContentCheck( localName, expression, xmlPackageReader );
+ emptyContentCheck( localName, expression, parser );
- final Object parent = xmlPackageReader.getParent();
+ final Object parent = parser.getParent();
final FromDescr fromSource = (FromDescr) parent;
final CharStream charStream = new ANTLRStringStream( expression.trim() );
final DRLLexer lexer = new DRLLexer( charStream );
final TokenStream tokenStream = new CommonTokenStream( lexer );
- final DRLParser parser = new DRLParser( tokenStream );
+ final DRLParser drlParser = new DRLParser( tokenStream );
try {
- final DeclarativeInvokerDescr declarativeInvoker = parser.from_source( fromSource );
+ final DeclarativeInvokerDescr declarativeInvoker = drlParser.from_source( fromSource );
fromSource.setDataSource( declarativeInvoker );
} catch ( final RecognitionException e ) {
throw new SAXParseException( "<" + localName + "> must have a valid expression content ",
- xmlPackageReader.getLocator() );
+ parser.getLocator() );
}
return null;
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/rules/FieldBindingHandler.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/rules/FieldBindingHandler.java 2007-12-29 18:07:05 UTC (rev 17438)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/rules/FieldBindingHandler.java 2007-12-29 18:14:33 UTC (rev 17439)
@@ -55,15 +55,15 @@
public Object start(final String uri,
final String localName,
final Attributes attrs,
- final ExtensibleXmlParser xmlPackageReader) throws SAXException {
- xmlPackageReader.startConfiguration( localName,
+ final ExtensibleXmlParser parser) throws SAXException {
+ parser.startConfiguration( localName,
attrs );
final String identifier = attrs.getValue( "identifier" );
final String fieldName = attrs.getValue( "field-name" );
- emptyAttributeCheck( localName, "identifier", identifier, xmlPackageReader );
- emptyAttributeCheck( localName, "fieldName", fieldName, xmlPackageReader );
+ emptyAttributeCheck( localName, "identifier", identifier, parser );
+ emptyAttributeCheck( localName, "fieldName", fieldName, parser );
final FieldBindingDescr fieldBindingDescr = new FieldBindingDescr( fieldName,
identifier );
@@ -73,12 +73,12 @@
public Object end(final String uri,
final String localName,
- final ExtensibleXmlParser xmlPackageReader) throws SAXException {
- final Configuration config = xmlPackageReader.endConfiguration();
+ final ExtensibleXmlParser parser) throws SAXException {
+ final Configuration config = parser.endConfiguration();
- final FieldBindingDescr fieldBindingDescr = (FieldBindingDescr) xmlPackageReader.getCurrent();
+ final FieldBindingDescr fieldBindingDescr = (FieldBindingDescr) parser.getCurrent();
- final PatternDescr patternDescr = (PatternDescr) xmlPackageReader.getParent( );
+ final PatternDescr patternDescr = (PatternDescr) parser.getParent( );
patternDescr.addConstraint( fieldBindingDescr );
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/rules/FieldConstraintHandler.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/rules/FieldConstraintHandler.java 2007-12-29 18:07:05 UTC (rev 17438)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/rules/FieldConstraintHandler.java 2007-12-29 18:14:33 UTC (rev 17439)
@@ -67,13 +67,13 @@
public Object start(final String uri,
final String localName,
final Attributes attrs,
- final ExtensibleXmlParser xmlPackageReader) throws SAXException {
- xmlPackageReader.startConfiguration( localName,
+ final ExtensibleXmlParser parser) throws SAXException {
+ parser.startConfiguration( localName,
attrs );
final String fieldName = attrs.getValue( "field-name" );
- emptyAttributeCheck( localName, "field-name", fieldName, xmlPackageReader );
+ emptyAttributeCheck( localName, "field-name", fieldName, parser );
final FieldConstraintDescr fieldConstraint = new FieldConstraintDescr( fieldName );
@@ -82,20 +82,20 @@
public Object end(final String uri,
final String localName,
- final ExtensibleXmlParser xmlPackageReader) throws SAXException {
+ final ExtensibleXmlParser parser) throws SAXException {
- final Configuration config = xmlPackageReader.endConfiguration();
+ final Configuration config = parser.endConfiguration();
- final FieldConstraintDescr fieldConstraintDescr = (FieldConstraintDescr) xmlPackageReader.getCurrent();
+ final FieldConstraintDescr fieldConstraintDescr = (FieldConstraintDescr) parser.getCurrent();
- final Object parent = xmlPackageReader.getParent( );
+ final Object parent = parser.getParent( );
if ( parent instanceof PatternDescr ) {
final PatternDescr patternDescr = (PatternDescr) parent;
patternDescr.addConstraint( fieldConstraintDescr );
} else if ( parent instanceof ConditionalElementDescr ) {
final ConditionalElementDescr ceDescr = (ConditionalElementDescr) parent;
- final FieldConstraintDescr field = (FieldConstraintDescr) xmlPackageReader.getCurrent();
+ final FieldConstraintDescr field = (FieldConstraintDescr) parser.getCurrent();
ceDescr.addOrMerge( field );
}
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/rules/ForallHandler.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/rules/ForallHandler.java 2007-12-29 18:07:05 UTC (rev 17438)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/rules/ForallHandler.java 2007-12-29 18:14:33 UTC (rev 17439)
@@ -70,9 +70,9 @@
public Object start(final String uri,
final String localName,
final Attributes attrs,
- final ExtensibleXmlParser xmlPackageReader) throws SAXException {
+ final ExtensibleXmlParser parser) throws SAXException {
- xmlPackageReader.startConfiguration( localName,
+ parser.startConfiguration( localName,
attrs );
final ForallDescr forallDescr = new ForallDescr();
@@ -85,12 +85,12 @@
*/
public Object end(final String uri,
final String localName,
- final ExtensibleXmlParser xmlPackageReader) throws SAXException {
- final Configuration config = xmlPackageReader.endConfiguration();
+ final ExtensibleXmlParser parser) throws SAXException {
+ final Configuration config = parser.endConfiguration();
- final ForallDescr forallDescr = (ForallDescr) xmlPackageReader.getCurrent();
+ final ForallDescr forallDescr = (ForallDescr) parser.getCurrent();
- final Object parent = xmlPackageReader.getParent();
+ final Object parent = parser.getParent();
final ConditionalElementDescr parentDescr = (ConditionalElementDescr) parent;
parentDescr.addDescr( forallDescr );
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/rules/FromHandler.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/rules/FromHandler.java 2007-12-29 18:07:05 UTC (rev 17438)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/rules/FromHandler.java 2007-12-29 18:14:33 UTC (rev 17439)
@@ -54,9 +54,9 @@
public Object start(final String uri,
final String localName,
final Attributes attrs,
- final ExtensibleXmlParser xmlPackageReader) throws SAXException {
+ final ExtensibleXmlParser parser) throws SAXException {
- xmlPackageReader.startConfiguration( localName,
+ parser.startConfiguration( localName,
attrs );
final FromDescr fromDesctiptor = new FromDescr();
@@ -65,17 +65,17 @@
public Object end(final String uri,
final String localName,
- final ExtensibleXmlParser xmlPackageReader) throws SAXException {
+ final ExtensibleXmlParser parser) throws SAXException {
- final Configuration config = xmlPackageReader.endConfiguration();
+ final Configuration config = parser.endConfiguration();
- final FromDescr fromDescr = (FromDescr) xmlPackageReader.getCurrent();
+ final FromDescr fromDescr = (FromDescr) parser.getCurrent();
- Object parent = xmlPackageReader.getParent();
+ Object parent = parser.getParent();
final PatternDescr patternDescr = (PatternDescr) parent;
- final ConditionalElementDescr parentDescr = (ConditionalElementDescr) xmlPackageReader.getParent( 1 );
+ final ConditionalElementDescr parentDescr = (ConditionalElementDescr) parser.getParent( 1 );
if ( (config.getChild( "expression" ) != null) ) {
patternDescr.setSource( fromDescr );
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/rules/FunctionHandler.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/rules/FunctionHandler.java 2007-12-29 18:07:05 UTC (rev 17438)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/rules/FunctionHandler.java 2007-12-29 18:14:33 UTC (rev 17439)
@@ -57,14 +57,14 @@
public Object start(final String uri,
final String localName,
final Attributes attrs,
- final ExtensibleXmlParser xmlPackageReader) throws SAXException {
- xmlPackageReader.startConfiguration( localName,
+ final ExtensibleXmlParser parser) throws SAXException {
+ parser.startConfiguration( localName,
attrs );
final String name = attrs.getValue( "name" );
final String returnType = attrs.getValue( "return-type" );
- emptyAttributeCheck( localName, "name", name, xmlPackageReader );
- emptyAttributeCheck( localName, "return-type", returnType, xmlPackageReader );
+ emptyAttributeCheck( localName, "name", name, parser );
+ emptyAttributeCheck( localName, "return-type", returnType, parser );
final FunctionDescr functionDescr = new FunctionDescr( name,
returnType );
@@ -74,10 +74,10 @@
public Object end(final String uri,
final String localName,
- final ExtensibleXmlParser xmlPackageReader) throws SAXException {
- final Configuration config = xmlPackageReader.endConfiguration();
+ final ExtensibleXmlParser parser) throws SAXException {
+ final Configuration config = parser.endConfiguration();
- FunctionDescr functionDescr = ( FunctionDescr ) xmlPackageReader.getCurrent();
+ FunctionDescr functionDescr = ( FunctionDescr ) parser.getCurrent();
final Configuration[] parameters = config.getChildren( "parameter" );
@@ -85,8 +85,8 @@
final String identifier = parameters[i].getAttribute( "identifier" );
final String type = parameters[i].getAttribute( "type" );
- emptyAttributeCheck("parameter", "identifier", identifier, xmlPackageReader);
- emptyAttributeCheck("parameter", "type", type, xmlPackageReader);
+ emptyAttributeCheck("parameter", "identifier", identifier, parser);
+ emptyAttributeCheck("parameter", "type", type, parser);
functionDescr.addParameter( type,
identifier );
@@ -96,12 +96,12 @@
final Configuration body = config.getChild( "body" );
if ( body == null ) {
throw new SAXParseException( "function must have a <body>",
- xmlPackageReader.getLocator() );
+ parser.getLocator() );
}
functionDescr.setText( body.getText() );
- final PackageDescr packageDescr = (PackageDescr) xmlPackageReader.getData();
+ final PackageDescr packageDescr = (PackageDescr) parser.getData();
packageDescr.addFunction( functionDescr );
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/rules/LiteralRestrictionHandler.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/rules/LiteralRestrictionHandler.java 2007-12-29 18:07:05 UTC (rev 17438)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/rules/LiteralRestrictionHandler.java 2007-12-29 18:14:33 UTC (rev 17439)
@@ -64,12 +64,12 @@
public Object start(final String uri,
final String localName,
final Attributes attrs,
- final ExtensibleXmlParser xmlPackageReader) throws SAXException {
- xmlPackageReader.startConfiguration( localName,
+ final ExtensibleXmlParser parser) throws SAXException {
+ parser.startConfiguration( localName,
attrs );
final String evaluator = attrs.getValue( "evaluator" );
- emptyAttributeCheck( localName, "evaluator", evaluator, xmlPackageReader );
+ emptyAttributeCheck( localName, "evaluator", evaluator, parser );
final String text = attrs.getValue( "value" );
@@ -81,12 +81,12 @@
public Object end(final String uri,
final String localName,
- final ExtensibleXmlParser xmlPackageReader) throws SAXException {
- final Configuration config = xmlPackageReader.endConfiguration();
+ final ExtensibleXmlParser parser) throws SAXException {
+ final Configuration config = parser.endConfiguration();
- final LiteralRestrictionDescr literalDescr = (LiteralRestrictionDescr) xmlPackageReader.getCurrent();
+ final LiteralRestrictionDescr literalDescr = (LiteralRestrictionDescr) parser.getCurrent();
- final Object parent = xmlPackageReader.getParent();
+ final Object parent = parser.getParent();
if ( parent instanceof FieldConstraintDescr ) {
final FieldConstraintDescr fieldConstriantDescr = (FieldConstraintDescr) parent;
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/rules/NotHandler.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/rules/NotHandler.java 2007-12-29 18:07:05 UTC (rev 17438)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/rules/NotHandler.java 2007-12-29 18:14:33 UTC (rev 17439)
@@ -68,8 +68,8 @@
public Object start(final String uri,
final String localName,
final Attributes attrs,
- final ExtensibleXmlParser xmlPackageReader) throws SAXException {
- xmlPackageReader.startConfiguration( localName,
+ final ExtensibleXmlParser parser) throws SAXException {
+ parser.startConfiguration( localName,
attrs );
final NotDescr notDescr = new NotDescr();
@@ -78,17 +78,17 @@
public Object end(final String uri,
final String localName,
- final ExtensibleXmlParser xmlPackageReader) throws SAXException {
- final Configuration config = xmlPackageReader.endConfiguration();
+ final ExtensibleXmlParser parser) throws SAXException {
+ final Configuration config = parser.endConfiguration();
- final NotDescr notDescr = (NotDescr) xmlPackageReader.getCurrent();
+ final NotDescr notDescr = (NotDescr) parser.getCurrent();
if ( (notDescr.getDescrs().size() != 1) && (notDescr.getDescrs().get( 0 ).getClass() != PatternDescr.class) ) {
throw new SAXParseException( "<not> can only have a single <pattern...> as a child element",
- xmlPackageReader.getLocator() );
+ parser.getLocator() );
}
- final ConditionalElementDescr parentDescr = (ConditionalElementDescr) xmlPackageReader.getParent();
+ final ConditionalElementDescr parentDescr = (ConditionalElementDescr) parser.getParent();
parentDescr.addDescr( notDescr );
return null;
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/rules/OrHandler.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/rules/OrHandler.java 2007-12-29 18:07:05 UTC (rev 17438)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/rules/OrHandler.java 2007-12-29 18:14:33 UTC (rev 17439)
@@ -66,8 +66,8 @@
public Object start(final String uri,
final String localName,
final Attributes attrs,
- final ExtensibleXmlParser xmlPackageReader) throws SAXException {
- xmlPackageReader.startConfiguration( localName,
+ final ExtensibleXmlParser parser) throws SAXException {
+ parser.startConfiguration( localName,
attrs );
final OrDescr orDescr = new OrDescr();
@@ -76,12 +76,12 @@
public Object end(final String uri,
final String localName,
- final ExtensibleXmlParser xmlPackageReader) throws SAXException {
- final Configuration config = xmlPackageReader.endConfiguration();
+ final ExtensibleXmlParser parser) throws SAXException {
+ final Configuration config = parser.endConfiguration();
- final OrDescr orDescr = (OrDescr) xmlPackageReader.getCurrent();
+ final OrDescr orDescr = (OrDescr) parser.getCurrent();
- final Object parent = xmlPackageReader.getParent();
+ final Object parent = parser.getParent();
if ( parent instanceof ConditionalElementDescr ) {
final ConditionalElementDescr parentDescr = (ConditionalElementDescr) parent;
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/rules/PackageHandler.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/rules/PackageHandler.java 2007-12-29 18:07:05 UTC (rev 17438)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/rules/PackageHandler.java 2007-12-29 18:14:33 UTC (rev 17439)
@@ -54,28 +54,28 @@
public Object start(final String uri,
final String localName,
final Attributes attrs,
- final ExtensibleXmlParser xmlPackageReader) throws SAXException {
- xmlPackageReader.startConfiguration( localName,
+ final ExtensibleXmlParser parser) throws SAXException {
+ parser.startConfiguration( localName,
attrs );
final String ruleSetName = attrs.getValue( "name" );
if ( ruleSetName == null || ruleSetName.trim().equals( "" ) ) {
throw new SAXParseException( "<package> requires a 'name' attribute",
- xmlPackageReader.getLocator() );
+ parser.getLocator() );
}
final PackageDescr packageDescr = new PackageDescr( ruleSetName.trim() );
- xmlPackageReader.setData( packageDescr );
+ parser.setData( packageDescr );
return packageDescr;
}
public Object end(final String uri,
final String localName,
- final ExtensibleXmlParser xmlPackageReader) throws SAXException {
- final PackageDescr packageDescr = ( PackageDescr ) xmlPackageReader.getData();
- final Configuration config = xmlPackageReader.endConfiguration();
+ final ExtensibleXmlParser parser) throws SAXException {
+ final PackageDescr packageDescr = ( PackageDescr ) parser.getData();
+ final Configuration config = parser.endConfiguration();
final Configuration[] imports = config.getChildren( "import" );
@@ -84,7 +84,7 @@
if ( importEntry == null || importEntry.trim().equals( "" ) ) {
throw new SAXParseException( "<import> cannot be blank",
- xmlPackageReader.getLocator() );
+ parser.getLocator() );
}
packageDescr.addImport( new ImportDescr( importEntry ) );
}
@@ -96,7 +96,7 @@
if ( importfunctionEntry == null || importfunctionEntry.trim().equals( "" ) ) {
throw new SAXParseException( "<importfunction> cannot be blank",
- xmlPackageReader.getLocator() );
+ parser.getLocator() );
}
FunctionImportDescr funcdescr = new FunctionImportDescr();
@@ -113,13 +113,13 @@
if ( identifier == null || identifier.trim().equals( "" ) ) {
throw new SAXParseException( "<global> must have an identifier",
- xmlPackageReader.getLocator() );
+ parser.getLocator() );
}
final String type = globals[i].getAttribute( "type" );
if ( type == null || type.trim().equals( "" ) ) {
throw new SAXParseException( "<global> must have specify a type",
- xmlPackageReader.getLocator() );
+ parser.getLocator() );
}
final GlobalDescr global = new GlobalDescr( identifier,
type );
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/rules/PatternHandler.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/rules/PatternHandler.java 2007-12-29 18:07:05 UTC (rev 17438)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/rules/PatternHandler.java 2007-12-29 18:14:33 UTC (rev 17439)
@@ -76,15 +76,15 @@
public Object start(final String uri,
final String localName,
final Attributes attrs,
- final ExtensibleXmlParser xmlPackageReader) throws SAXException {
- xmlPackageReader.startConfiguration( localName,
+ final ExtensibleXmlParser parser) throws SAXException {
+ parser.startConfiguration( localName,
attrs );
final String objectType = attrs.getValue( "object-type" );
if ( objectType == null || objectType.trim().equals( "" ) ) {
throw new SAXParseException( "<pattern> requires an 'object-type' attribute",
- xmlPackageReader.getLocator() );
+ parser.getLocator() );
}
PatternDescr patternDescr = null;
@@ -102,12 +102,12 @@
public Object end(final String uri,
final String localName,
- final ExtensibleXmlParser xmlPackageReader) throws SAXException {
+ final ExtensibleXmlParser parser) throws SAXException {
- final Configuration config = xmlPackageReader.endConfiguration();
- final PatternDescr patternDescr = (PatternDescr) xmlPackageReader.getCurrent();
+ final Configuration config = parser.endConfiguration();
+ final PatternDescr patternDescr = (PatternDescr) parser.getCurrent();
- final Object parent = xmlPackageReader.getParent();
+ final Object parent = parser.getParent();
if ( parent instanceof PatternDestinationDescr ) {
final PatternDestinationDescr parentDescr = (PatternDestinationDescr) parent;
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/rules/PredicateHandler.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/rules/PredicateHandler.java 2007-12-29 18:07:05 UTC (rev 17438)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/rules/PredicateHandler.java 2007-12-29 18:14:33 UTC (rev 17439)
@@ -58,8 +58,8 @@
public Object start(final String uri,
final String localName,
final Attributes attrs,
- final ExtensibleXmlParser xmlPackageReader) throws SAXException {
- xmlPackageReader.startConfiguration( localName,
+ final ExtensibleXmlParser parser) throws SAXException {
+ parser.startConfiguration( localName,
attrs );
final PredicateDescr predicateDescr = new PredicateDescr();
@@ -69,21 +69,21 @@
public Object end(final String uri,
final String localName,
- final ExtensibleXmlParser xmlPackageReader) throws SAXException {
- final Configuration config = xmlPackageReader.endConfiguration();
+ final ExtensibleXmlParser parser) throws SAXException {
+ final Configuration config = parser.endConfiguration();
- final PredicateDescr predicateDescr = (PredicateDescr) xmlPackageReader.getCurrent();
+ final PredicateDescr predicateDescr = (PredicateDescr) parser.getCurrent();
final String expression = config.getText();
if ( expression == null || expression.trim().equals( "" ) ) {
throw new SAXParseException( "<predicate> must have some content",
- xmlPackageReader.getLocator() );
+ parser.getLocator() );
}
predicateDescr.setContent( expression );
- final PatternDescr patternDescr = (PatternDescr) xmlPackageReader.getParent();
+ final PatternDescr patternDescr = (PatternDescr) parser.getParent();
patternDescr.addConstraint( predicateDescr );
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/rules/QualifiedIdentifierRestrictionHandler.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/rules/QualifiedIdentifierRestrictionHandler.java 2007-12-29 18:07:05 UTC (rev 17438)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/rules/QualifiedIdentifierRestrictionHandler.java 2007-12-29 18:14:33 UTC (rev 17439)
@@ -60,12 +60,12 @@
public Object start(final String uri,
final String localName,
final Attributes attrs,
- final ExtensibleXmlParser xmlPackageReader) throws SAXException {
- xmlPackageReader.startConfiguration( localName,
+ final ExtensibleXmlParser parser) throws SAXException {
+ parser.startConfiguration( localName,
attrs );
String evaluator = attrs.getValue( "evaluator" );
- emptyAttributeCheck( localName, "evaluator", evaluator, xmlPackageReader );
+ emptyAttributeCheck( localName, "evaluator", evaluator, parser );
boolean isNegated = evaluator.startsWith( "not " );
if( isNegated ) {
evaluator = evaluator.substring( 4 );
@@ -81,18 +81,18 @@
public Object end(final String uri,
final String localName,
- final ExtensibleXmlParser xmlPackageReader) throws SAXException {
- final Configuration config = xmlPackageReader.endConfiguration();
+ final ExtensibleXmlParser parser) throws SAXException {
+ final Configuration config = parser.endConfiguration();
- final QualifiedIdentifierRestrictionDescr qualifiedIdentifierRestricionDescr = (QualifiedIdentifierRestrictionDescr) xmlPackageReader.getCurrent();
+ final QualifiedIdentifierRestrictionDescr qualifiedIdentifierRestricionDescr = (QualifiedIdentifierRestrictionDescr) parser.getCurrent();
final String expression = config.getText();
- emptyContentCheck( localName, expression, xmlPackageReader );
+ emptyContentCheck( localName, expression, parser );
qualifiedIdentifierRestricionDescr.setText( expression );
- final Object parent = xmlPackageReader.getParent();
+ final Object parent = parser.getParent();
if ( parent instanceof FieldConstraintDescr ) {
final FieldConstraintDescr fieldConstraintDescr = (FieldConstraintDescr) parent;
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/rules/QueryHandler.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/rules/QueryHandler.java 2007-12-29 18:07:05 UTC (rev 17438)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/rules/QueryHandler.java 2007-12-29 18:14:33 UTC (rev 17439)
@@ -58,12 +58,12 @@
public Object start(final String uri,
final String localName,
final Attributes attrs,
- final ExtensibleXmlParser xmlPackageReader) throws SAXException {
- xmlPackageReader.startConfiguration( localName,
+ final ExtensibleXmlParser parser) throws SAXException {
+ parser.startConfiguration( localName,
attrs );
final String queryName = attrs.getValue( "name" );
- emptyAttributeCheck( localName, "name", queryName, xmlPackageReader );
+ emptyAttributeCheck( localName, "name", queryName, parser );
final QueryDescr queryDescr = new QueryDescr( queryName.trim() );
@@ -72,19 +72,19 @@
public Object end(final String uri,
final String localName,
- final ExtensibleXmlParser xmlPackageReader) throws SAXException {
- final Configuration config = xmlPackageReader.endConfiguration();
+ final ExtensibleXmlParser parser) throws SAXException {
+ final Configuration config = parser.endConfiguration();
- final QueryDescr queryDescr = (QueryDescr) xmlPackageReader.getCurrent();
+ final QueryDescr queryDescr = (QueryDescr) parser.getCurrent();
final AndDescr lhs = queryDescr.getLhs();
if ( lhs == null || lhs.getDescrs().isEmpty() ) {
throw new SAXParseException( "<query> requires a LHS",
- xmlPackageReader.getLocator() );
+ parser.getLocator() );
}
- (( PackageDescr ) xmlPackageReader.getData()).addRule( queryDescr );
+ (( PackageDescr ) parser.getData()).addRule( queryDescr );
return queryDescr;
}
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/rules/RestrictionConnectiveHandler.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/rules/RestrictionConnectiveHandler.java 2007-12-29 18:07:05 UTC (rev 17438)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/rules/RestrictionConnectiveHandler.java 2007-12-29 18:14:33 UTC (rev 17439)
@@ -67,8 +67,8 @@
public Object start(final String uri,
final String localName,
final Attributes attrs,
- final ExtensibleXmlParser xmlPackageReader) throws SAXException {
- xmlPackageReader.startConfiguration( localName,
+ final ExtensibleXmlParser parser) throws SAXException {
+ parser.startConfiguration( localName,
attrs );
RestrictionConnectiveDescr connectiveDescr = null;
@@ -83,12 +83,12 @@
public Object end(final String uri,
final String localName,
- final ExtensibleXmlParser xmlPackageReader) throws SAXException {
- final Configuration config = xmlPackageReader.endConfiguration();
+ final ExtensibleXmlParser parser) throws SAXException {
+ final Configuration config = parser.endConfiguration();
- final RestrictionConnectiveDescr connectiveDescr = (RestrictionConnectiveDescr) xmlPackageReader.getCurrent();
+ final RestrictionConnectiveDescr connectiveDescr = (RestrictionConnectiveDescr) parser.getCurrent();
- final Object obj = xmlPackageReader.getParent();
+ final Object obj = parser.getParent();
if ( obj instanceof FieldConstraintDescr ) {
final FieldConstraintDescr fieldConstriantDescr = (FieldConstraintDescr) obj;
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/rules/ReturnValueRestrictionHandler.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/rules/ReturnValueRestrictionHandler.java 2007-12-29 18:07:05 UTC (rev 17438)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/rules/ReturnValueRestrictionHandler.java 2007-12-29 18:14:33 UTC (rev 17439)
@@ -65,11 +65,11 @@
public Object start(final String uri,
final String localName,
final Attributes attrs,
- final ExtensibleXmlParser xmlPackageReader) throws SAXException {
- xmlPackageReader.startConfiguration( localName,
+ final ExtensibleXmlParser parser) throws SAXException {
+ parser.startConfiguration( localName,
attrs );
final String evaluator = attrs.getValue( "evaluator" );
- emptyAttributeCheck( localName, "evaluator", evaluator, xmlPackageReader );
+ emptyAttributeCheck( localName, "evaluator", evaluator, parser );
final ReturnValueRestrictionDescr returnValueDescr = new ReturnValueRestrictionDescr( evaluator );
@@ -78,17 +78,17 @@
public Object end(final String uri,
final String localName,
- final ExtensibleXmlParser xmlPackageReader) throws SAXException {
- final Configuration config = xmlPackageReader.endConfiguration();
+ final ExtensibleXmlParser parser) throws SAXException {
+ final Configuration config = parser.endConfiguration();
- final ReturnValueRestrictionDescr returnValueDescr = (ReturnValueRestrictionDescr) xmlPackageReader.getCurrent();
+ final ReturnValueRestrictionDescr returnValueDescr = (ReturnValueRestrictionDescr) parser.getCurrent();
final String expression = config.getText();
- emptyContentCheck( localName, expression, xmlPackageReader );
+ emptyContentCheck( localName, expression, parser );
returnValueDescr.setContent( expression );
- final Object parent = xmlPackageReader.getParent();
+ final Object parent = parser.getParent();
if ( parent instanceof FieldConstraintDescr ) {
final FieldConstraintDescr fieldConstraintDescr = (FieldConstraintDescr) parent;
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/rules/RuleHandler.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/rules/RuleHandler.java 2007-12-29 18:07:05 UTC (rev 17438)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/rules/RuleHandler.java 2007-12-29 18:14:33 UTC (rev 17439)
@@ -59,12 +59,12 @@
public Object start(final String uri,
final String localName,
final Attributes attrs,
- final ExtensibleXmlParser xmlPackageReader) throws SAXException {
- xmlPackageReader.startConfiguration( localName,
+ final ExtensibleXmlParser parser) throws SAXException {
+ parser.startConfiguration( localName,
attrs );
final String ruleName = attrs.getValue( "name" );
- emptyAttributeCheck(localName, "name", ruleName, xmlPackageReader );
+ emptyAttributeCheck(localName, "name", ruleName, parser );
final RuleDescr ruleDescr = new RuleDescr( ruleName.trim() );
@@ -73,22 +73,22 @@
public Object end(final String uri,
final String localName,
- final ExtensibleXmlParser xmlPackageReader) throws SAXException {
- final Configuration config = xmlPackageReader.endConfiguration();
+ final ExtensibleXmlParser parser) throws SAXException {
+ final Configuration config = parser.endConfiguration();
- final RuleDescr ruleDescr = (RuleDescr) xmlPackageReader.getCurrent();
+ final RuleDescr ruleDescr = (RuleDescr) parser.getCurrent();
final AndDescr lhs = ruleDescr.getLhs();
if ( lhs == null ) {
throw new SAXParseException( "<rule> requires a LHS",
- xmlPackageReader.getLocator() );
+ parser.getLocator() );
}
final Configuration rhs = config.getChild( "rhs" );
if ( rhs == null ) {
throw new SAXParseException( "<rule> requires a <rh> child element",
- xmlPackageReader.getLocator() );
+ parser.getLocator() );
}
ruleDescr.setConsequence( rhs.getText() );
@@ -96,7 +96,7 @@
final Configuration[] attributes = config.getChildren( "rule-attribute" );
for ( int i = 0, length = attributes.length; i < length; i++ ) {
final String name = attributes[i].getAttribute( "name" );
- emptyAttributeCheck( "rule-attribute", "name", name, xmlPackageReader );
+ emptyAttributeCheck( "rule-attribute", "name", name, parser );
final String value = attributes[i].getAttribute( "value" );
@@ -104,7 +104,7 @@
value ) );
}
- (( PackageDescr ) xmlPackageReader.getData()).addRule( ruleDescr );
+ (( PackageDescr ) parser.getData()).addRule( ruleDescr );
return ruleDescr;
}
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/rules/VariableRestrictionsHandler.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/rules/VariableRestrictionsHandler.java 2007-12-29 18:07:05 UTC (rev 17438)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/rules/VariableRestrictionsHandler.java 2007-12-29 18:14:33 UTC (rev 17439)
@@ -60,15 +60,15 @@
public Object start(final String uri,
final String localName,
final Attributes attrs,
- final ExtensibleXmlParser xmlPackageReader) throws SAXException {
- xmlPackageReader.startConfiguration( localName,
+ final ExtensibleXmlParser parser) throws SAXException {
+ parser.startConfiguration( localName,
attrs );
final String evaluator = attrs.getValue( "evaluator" );
final String identifier = attrs.getValue( "identifier" );
- emptyAttributeCheck( localName, "evaluator", evaluator, xmlPackageReader );
- emptyAttributeCheck( localName, identifier, "identifier", xmlPackageReader );
+ emptyAttributeCheck( localName, "evaluator", evaluator, parser );
+ emptyAttributeCheck( localName, identifier, "identifier", parser );
final VariableRestrictionDescr variableDescr = new VariableRestrictionDescr( evaluator,
identifier );
@@ -78,12 +78,12 @@
public Object end(final String uri,
final String localName,
- final ExtensibleXmlParser xmlPackageReader) throws SAXException {
- final Configuration config = xmlPackageReader.endConfiguration();
+ final ExtensibleXmlParser parser) throws SAXException {
+ final Configuration config = parser.endConfiguration();
- final VariableRestrictionDescr variableDescr = (VariableRestrictionDescr) xmlPackageReader.getCurrent();
+ final VariableRestrictionDescr variableDescr = (VariableRestrictionDescr) parser.getCurrent();
- final Object parent = xmlPackageReader.getParent();
+ final Object parent = parser.getParent();
if ( parent instanceof FieldConstraintDescr ) {
final FieldConstraintDescr fieldConstraintDescr = (FieldConstraintDescr) parent;
More information about the jboss-svn-commits
mailing list