[jboss-svn-commits] JBL Code SVN: r7015 - in labs/jbossrules/trunk/drools-core/src/main/java/org/drools: base/evaluators rule spi
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Mon Oct 23 08:41:19 EDT 2006
Author: tirelli
Date: 2006-10-23 08:41:02 -0400 (Mon, 23 Oct 2006)
New Revision: 7015
Removed:
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/LiteralContextEntry.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/ReturnValueContextEntry.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/VariableContextEntry.java
Modified:
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/evaluators/ArrayFactory.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/evaluators/BigDecimalFactory.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/evaluators/BigIntegerFactory.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/evaluators/BooleanFactory.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/evaluators/ByteFactory.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/evaluators/CharacterFactory.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/evaluators/DateFactory.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/evaluators/DoubleFactory.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/evaluators/FactTemplateFactory.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/evaluators/FloatFactory.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/evaluators/IntegerFactory.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/evaluators/LongFactory.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/evaluators/ObjectFactory.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/evaluators/ShortFactory.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/evaluators/StringFactory.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/LiteralRestriction.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/ReturnValueConstraint.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/ReturnValueRestriction.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/VariableRestriction.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/spi/Evaluator.java
Log:
Improving performance by removing unnecessary ContextEntry subinterfaces
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/evaluators/ArrayFactory.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/evaluators/ArrayFactory.java 2006-10-23 12:39:33 UTC (rev 7014)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/evaluators/ArrayFactory.java 2006-10-23 12:41:02 UTC (rev 7015)
@@ -20,8 +20,8 @@
import org.drools.base.BaseEvaluator;
import org.drools.base.ValueType;
-import org.drools.rule.VariableContextEntry;
import org.drools.rule.VariableRestriction.ObjectVariableContextEntry;
+import org.drools.rule.VariableRestriction.VariableContextEntry;
import org.drools.spi.Evaluator;
import org.drools.spi.Extractor;
import org.drools.spi.FieldValue;
@@ -98,7 +98,7 @@
public boolean evaluateCachedRight(final VariableContextEntry context,
final Object left) {
- final Object value = context.getVariableDeclaration().getExtractor().getValue( left );
+ final Object value = context.declaration.getExtractor().getValue( left );
if ( value == null ) {
return ((ObjectVariableContextEntry) context).right == null;
}
@@ -107,7 +107,7 @@
public boolean evaluateCachedLeft(final VariableContextEntry context,
final Object right) {
- final Object value = context.getFieldExtractor().getValue( right );
+ final Object value = context.extractor.getValue( right );
if ( ((ObjectVariableContextEntry) context).left == null ) {
return value == null;
}
@@ -155,7 +155,7 @@
public boolean evaluateCachedRight(final VariableContextEntry context,
final Object left) {
- final Object value = context.getVariableDeclaration().getExtractor().getValue( left );
+ final Object value = context.declaration.getExtractor().getValue( left );
if ( value == null ) {
return ((ObjectVariableContextEntry) context).right == null;
}
@@ -164,7 +164,7 @@
public boolean evaluateCachedLeft(final VariableContextEntry context,
final Object right) {
- final Object value = context.getFieldExtractor().getValue( right );
+ final Object value = context.extractor.getValue( right );
if ( ((ObjectVariableContextEntry) context).left == null ) {
return value == null;
}
@@ -216,7 +216,7 @@
public boolean evaluateCachedRight(final VariableContextEntry context,
final Object left) {
final Object value = ((ObjectVariableContextEntry) context).right;
- final Object[] array = (Object[]) context.getVariableDeclaration().getExtractor().getValue( left );
+ final Object[] array = (Object[]) context.declaration.getExtractor().getValue( left );
if ( Arrays.binarySearch( array,
value ) == -1 ) {
return false;
@@ -226,7 +226,7 @@
public boolean evaluateCachedLeft(final VariableContextEntry context,
final Object right) {
- final Object value = context.getFieldExtractor().getValue( right );
+ final Object value = context.extractor.getValue( right );
final Object[] array = (Object[]) ((ObjectVariableContextEntry) context).left;
if ( Arrays.binarySearch( array,
value ) == -1 ) {
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/evaluators/BigDecimalFactory.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/evaluators/BigDecimalFactory.java 2006-10-23 12:39:33 UTC (rev 7014)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/evaluators/BigDecimalFactory.java 2006-10-23 12:41:02 UTC (rev 7015)
@@ -20,8 +20,8 @@
import org.drools.base.BaseEvaluator;
import org.drools.base.ValueType;
-import org.drools.rule.VariableContextEntry;
import org.drools.rule.VariableRestriction.ObjectVariableContextEntry;
+import org.drools.rule.VariableRestriction.VariableContextEntry;
import org.drools.spi.Evaluator;
import org.drools.spi.Extractor;
import org.drools.spi.FieldValue;
@@ -98,7 +98,7 @@
public boolean evaluateCachedRight(final VariableContextEntry context,
final Object left) {
- final Object value = context.getVariableDeclaration().getExtractor().getValue( left );
+ final Object value = context.declaration.getExtractor().getValue( left );
if ( value == null ) {
return ((ObjectVariableContextEntry) context).right == null;
}
@@ -107,7 +107,7 @@
public boolean evaluateCachedLeft(final VariableContextEntry context,
final Object right) {
- final Object value = context.getFieldExtractor().getValue( right );
+ final Object value = context.extractor.getValue( right );
if ( ((ObjectVariableContextEntry) context).left == null ) {
return value == null;
}
@@ -155,7 +155,7 @@
public boolean evaluateCachedRight(final VariableContextEntry context,
final Object left) {
- final Object value = context.getVariableDeclaration().getExtractor().getValue( left );
+ final Object value = context.declaration.getExtractor().getValue( left );
if ( value == null ) {
return ((ObjectVariableContextEntry) context).right != null;
}
@@ -164,7 +164,7 @@
public boolean evaluateCachedLeft(final VariableContextEntry context,
final Object right) {
- final Object value = context.getFieldExtractor().getValue( right );
+ final Object value = context.extractor.getValue( right );
if ( ((ObjectVariableContextEntry) context).left == null ) {
return value != null;
}
@@ -204,14 +204,14 @@
public boolean evaluateCachedRight(final VariableContextEntry context,
final Object left) {
- final BigDecimal comp = (BigDecimal) context.getVariableDeclaration().getExtractor().getValue( left );
+ final BigDecimal comp = (BigDecimal) context.declaration.getExtractor().getValue( left );
return comp.compareTo( ((ObjectVariableContextEntry) context).right ) < 0;
}
public boolean evaluateCachedLeft(final VariableContextEntry context,
final Object right) {
final BigDecimal comp = (BigDecimal) ((ObjectVariableContextEntry) context).left;
- return comp.compareTo( context.getFieldExtractor().getValue( right ) ) < 0;
+ return comp.compareTo( context.extractor.getValue( right ) ) < 0;
}
public String toString() {
@@ -247,14 +247,14 @@
public boolean evaluateCachedRight(final VariableContextEntry context,
final Object left) {
- final BigDecimal comp = (BigDecimal) context.getVariableDeclaration().getExtractor().getValue( left );
+ final BigDecimal comp = (BigDecimal) context.declaration.getExtractor().getValue( left );
return comp.compareTo( ((ObjectVariableContextEntry) context).right ) <= 0;
}
public boolean evaluateCachedLeft(final VariableContextEntry context,
final Object right) {
final BigDecimal comp = (BigDecimal) ((ObjectVariableContextEntry) context).left;
- return comp.compareTo( context.getFieldExtractor().getValue( right ) ) <= 0;
+ return comp.compareTo( context.extractor.getValue( right ) ) <= 0;
}
public String toString() {
@@ -290,14 +290,14 @@
public boolean evaluateCachedRight(final VariableContextEntry context,
final Object left) {
- final BigDecimal comp = (BigDecimal) context.getVariableDeclaration().getExtractor().getValue( left );
+ final BigDecimal comp = (BigDecimal) context.declaration.getExtractor().getValue( left );
return comp.compareTo( ((ObjectVariableContextEntry) context).right ) > 0;
}
public boolean evaluateCachedLeft(final VariableContextEntry context,
final Object right) {
final BigDecimal comp = (BigDecimal) ((ObjectVariableContextEntry) context).left;
- return comp.compareTo( context.getFieldExtractor().getValue( right ) ) > 0;
+ return comp.compareTo( context.extractor.getValue( right ) ) > 0;
}
public String toString() {
@@ -333,14 +333,14 @@
public boolean evaluateCachedRight(final VariableContextEntry context,
final Object left) {
- final BigDecimal comp = (BigDecimal) context.getVariableDeclaration().getExtractor().getValue( left );
+ final BigDecimal comp = (BigDecimal) context.declaration.getExtractor().getValue( left );
return comp.compareTo( ((ObjectVariableContextEntry) context).right ) >= 0;
}
public boolean evaluateCachedLeft(final VariableContextEntry context,
final Object right) {
final BigDecimal comp = (BigDecimal) ((ObjectVariableContextEntry) context).left;
- return comp.compareTo( context.getFieldExtractor().getValue( right ) ) >= 0;
+ return comp.compareTo( context.extractor.getValue( right ) ) >= 0;
}
public String toString() {
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/evaluators/BigIntegerFactory.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/evaluators/BigIntegerFactory.java 2006-10-23 12:39:33 UTC (rev 7014)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/evaluators/BigIntegerFactory.java 2006-10-23 12:41:02 UTC (rev 7015)
@@ -20,8 +20,8 @@
import org.drools.base.BaseEvaluator;
import org.drools.base.ValueType;
-import org.drools.rule.VariableContextEntry;
import org.drools.rule.VariableRestriction.ObjectVariableContextEntry;
+import org.drools.rule.VariableRestriction.VariableContextEntry;
import org.drools.spi.Evaluator;
import org.drools.spi.Extractor;
import org.drools.spi.FieldValue;
@@ -98,7 +98,7 @@
public boolean evaluateCachedRight(final VariableContextEntry context,
final Object left) {
- final Object value = context.getVariableDeclaration().getExtractor().getValue( left );
+ final Object value = context.declaration.getExtractor().getValue( left );
if ( value == null ) {
return ((ObjectVariableContextEntry) context).right == null;
}
@@ -107,7 +107,7 @@
public boolean evaluateCachedLeft(final VariableContextEntry context,
final Object right) {
- final Object value = context.getFieldExtractor().getValue( right );
+ final Object value = context.extractor.getValue( right );
if ( ((ObjectVariableContextEntry) context).left == null ) {
return value == null;
}
@@ -155,7 +155,7 @@
public boolean evaluateCachedRight(final VariableContextEntry context,
final Object left) {
- final Object value = context.getVariableDeclaration().getExtractor().getValue( left );
+ final Object value = context.declaration.getExtractor().getValue( left );
if ( value == null ) {
return ((ObjectVariableContextEntry) context).right != null;
}
@@ -164,7 +164,7 @@
public boolean evaluateCachedLeft(final VariableContextEntry context,
final Object right) {
- final Object value = context.getFieldExtractor().getValue( right );
+ final Object value = context.extractor.getValue( right );
if ( ((ObjectVariableContextEntry) context).left == null ) {
return value != null;
}
@@ -204,14 +204,14 @@
public boolean evaluateCachedRight(final VariableContextEntry context,
final Object left) {
- final BigInteger comp = (BigInteger) context.getVariableDeclaration().getExtractor().getValue( left );
+ final BigInteger comp = (BigInteger) context.declaration.getExtractor().getValue( left );
return comp.compareTo( ((ObjectVariableContextEntry) context).right ) < 0;
}
public boolean evaluateCachedLeft(final VariableContextEntry context,
final Object right) {
final BigInteger comp = (BigInteger) ((ObjectVariableContextEntry) context).left;
- return comp.compareTo( context.getFieldExtractor().getValue( right ) ) < 0;
+ return comp.compareTo( context.extractor.getValue( right ) ) < 0;
}
public String toString() {
@@ -247,14 +247,14 @@
public boolean evaluateCachedRight(final VariableContextEntry context,
final Object left) {
- final BigInteger comp = (BigInteger) context.getVariableDeclaration().getExtractor().getValue( left );
+ final BigInteger comp = (BigInteger) context.declaration.getExtractor().getValue( left );
return comp.compareTo( ((ObjectVariableContextEntry) context).right ) <= 0;
}
public boolean evaluateCachedLeft(final VariableContextEntry context,
final Object right) {
final BigInteger comp = (BigInteger) ((ObjectVariableContextEntry) context).left;
- return comp.compareTo( context.getFieldExtractor().getValue( right ) ) <= 0;
+ return comp.compareTo( context.extractor.getValue( right ) ) <= 0;
}
public String toString() {
@@ -290,14 +290,14 @@
public boolean evaluateCachedRight(final VariableContextEntry context,
final Object left) {
- final BigInteger comp = (BigInteger) context.getVariableDeclaration().getExtractor().getValue( left );
+ final BigInteger comp = (BigInteger) context.declaration.getExtractor().getValue( left );
return comp.compareTo( ((ObjectVariableContextEntry) context).right ) > 0;
}
public boolean evaluateCachedLeft(final VariableContextEntry context,
final Object right) {
final BigInteger comp = (BigInteger) ((ObjectVariableContextEntry) context).left;
- return comp.compareTo( context.getFieldExtractor().getValue( right ) ) > 0;
+ return comp.compareTo( context.extractor.getValue( right ) ) > 0;
}
public String toString() {
@@ -333,14 +333,14 @@
public boolean evaluateCachedRight(final VariableContextEntry context,
final Object left) {
- final BigInteger comp = (BigInteger) context.getVariableDeclaration().getExtractor().getValue( left );
+ final BigInteger comp = (BigInteger) context.declaration.getExtractor().getValue( left );
return comp.compareTo( ((ObjectVariableContextEntry) context).right ) >= 0;
}
public boolean evaluateCachedLeft(final VariableContextEntry context,
final Object right) {
final BigInteger comp = (BigInteger) ((ObjectVariableContextEntry) context).left;
- return comp.compareTo( context.getFieldExtractor().getValue( right ) ) >= 0;
+ return comp.compareTo( context.extractor.getValue( right ) ) >= 0;
}
public String toString() {
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/evaluators/BooleanFactory.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/evaluators/BooleanFactory.java 2006-10-23 12:39:33 UTC (rev 7014)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/evaluators/BooleanFactory.java 2006-10-23 12:41:02 UTC (rev 7015)
@@ -18,8 +18,8 @@
import org.drools.base.BaseEvaluator;
import org.drools.base.ValueType;
-import org.drools.rule.VariableContextEntry;
import org.drools.rule.VariableRestriction.BooleanVariableContextEntry;
+import org.drools.rule.VariableRestriction.VariableContextEntry;
import org.drools.spi.Evaluator;
import org.drools.spi.Extractor;
import org.drools.spi.FieldValue;
@@ -78,12 +78,12 @@
public boolean evaluateCachedRight(final VariableContextEntry context,
final Object left) {
- return context.getVariableDeclaration().getExtractor().getBooleanValue( left ) == ((BooleanVariableContextEntry) context).right;
+ return context.declaration.getExtractor().getBooleanValue( left ) == ((BooleanVariableContextEntry) context).right;
}
public boolean evaluateCachedLeft(final VariableContextEntry context,
final Object object2) {
- return context.getFieldExtractor().getBooleanValue( object2 ) == ((BooleanVariableContextEntry) context).left;
+ return context.extractor.getBooleanValue( object2 ) == ((BooleanVariableContextEntry) context).left;
}
public String toString() {
@@ -117,12 +117,12 @@
public boolean evaluateCachedRight(final VariableContextEntry context,
final Object left) {
- return context.getVariableDeclaration().getExtractor().getBooleanValue( left ) != ((BooleanVariableContextEntry) context).right;
+ return context.declaration.getExtractor().getBooleanValue( left ) != ((BooleanVariableContextEntry) context).right;
}
public boolean evaluateCachedLeft(final VariableContextEntry context,
final Object object2) {
- return context.getFieldExtractor().getBooleanValue( object2 ) != ((BooleanVariableContextEntry) context).left;
+ return context.extractor.getBooleanValue( object2 ) != ((BooleanVariableContextEntry) context).left;
}
public String toString() {
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/evaluators/ByteFactory.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/evaluators/ByteFactory.java 2006-10-23 12:39:33 UTC (rev 7014)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/evaluators/ByteFactory.java 2006-10-23 12:41:02 UTC (rev 7015)
@@ -18,8 +18,8 @@
import org.drools.base.BaseEvaluator;
import org.drools.base.ValueType;
-import org.drools.rule.VariableContextEntry;
import org.drools.rule.VariableRestriction.LongVariableContextEntry;
+import org.drools.rule.VariableRestriction.VariableContextEntry;
import org.drools.spi.Evaluator;
import org.drools.spi.Extractor;
import org.drools.spi.FieldValue;
@@ -86,12 +86,12 @@
public boolean evaluateCachedRight(final VariableContextEntry context,
final Object left) {
- return context.getVariableDeclaration().getExtractor().getByteValue( left ) == ((LongVariableContextEntry) context).right;
+ return context.declaration.getExtractor().getByteValue( left ) == ((LongVariableContextEntry) context).right;
}
public boolean evaluateCachedLeft(final VariableContextEntry context,
final Object right) {
- return ((LongVariableContextEntry) context).left == context.getFieldExtractor().getByteValue( right );
+ return ((LongVariableContextEntry) context).left == context.extractor.getByteValue( right );
}
public String toString() {
@@ -125,12 +125,12 @@
public boolean evaluateCachedRight(final VariableContextEntry context,
final Object left) {
- return context.getVariableDeclaration().getExtractor().getByteValue( left ) != ((LongVariableContextEntry) context).right;
+ return context.declaration.getExtractor().getByteValue( left ) != ((LongVariableContextEntry) context).right;
}
public boolean evaluateCachedLeft(final VariableContextEntry context,
final Object right) {
- return ((LongVariableContextEntry) context).left != context.getFieldExtractor().getByteValue( right );
+ return ((LongVariableContextEntry) context).left != context.extractor.getByteValue( right );
}
public String toString() {
@@ -164,12 +164,12 @@
public boolean evaluateCachedRight(final VariableContextEntry context,
final Object left) {
- return context.getVariableDeclaration().getExtractor().getByteValue( left ) < ((LongVariableContextEntry) context).right;
+ return context.declaration.getExtractor().getByteValue( left ) < ((LongVariableContextEntry) context).right;
}
public boolean evaluateCachedLeft(final VariableContextEntry context,
final Object right) {
- return ((LongVariableContextEntry) context).left < context.getFieldExtractor().getByteValue( right );
+ return ((LongVariableContextEntry) context).left < context.extractor.getByteValue( right );
}
public String toString() {
@@ -203,12 +203,12 @@
public boolean evaluateCachedRight(final VariableContextEntry context,
final Object left) {
- return context.getVariableDeclaration().getExtractor().getByteValue( left ) <= ((LongVariableContextEntry) context).right;
+ return context.declaration.getExtractor().getByteValue( left ) <= ((LongVariableContextEntry) context).right;
}
public boolean evaluateCachedLeft(final VariableContextEntry context,
final Object right) {
- return ((LongVariableContextEntry) context).left <= context.getFieldExtractor().getByteValue( right );
+ return ((LongVariableContextEntry) context).left <= context.extractor.getByteValue( right );
}
public String toString() {
@@ -242,12 +242,12 @@
public boolean evaluateCachedRight(final VariableContextEntry context,
final Object left) {
- return context.getVariableDeclaration().getExtractor().getByteValue( left ) > ((LongVariableContextEntry) context).right;
+ return context.declaration.getExtractor().getByteValue( left ) > ((LongVariableContextEntry) context).right;
}
public boolean evaluateCachedLeft(final VariableContextEntry context,
final Object right) {
- return ((LongVariableContextEntry) context).left > context.getFieldExtractor().getByteValue( right );
+ return ((LongVariableContextEntry) context).left > context.extractor.getByteValue( right );
}
public String toString() {
@@ -281,12 +281,12 @@
public boolean evaluateCachedRight(final VariableContextEntry context,
final Object left) {
- return context.getVariableDeclaration().getExtractor().getByteValue( left ) >= ((LongVariableContextEntry) context).right;
+ return context.declaration.getExtractor().getByteValue( left ) >= ((LongVariableContextEntry) context).right;
}
public boolean evaluateCachedLeft(final VariableContextEntry context,
final Object right) {
- return ((LongVariableContextEntry) context).left >= context.getFieldExtractor().getByteValue( right );
+ return ((LongVariableContextEntry) context).left >= context.extractor.getByteValue( right );
}
public String toString() {
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/evaluators/CharacterFactory.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/evaluators/CharacterFactory.java 2006-10-23 12:39:33 UTC (rev 7014)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/evaluators/CharacterFactory.java 2006-10-23 12:41:02 UTC (rev 7015)
@@ -18,8 +18,8 @@
import org.drools.base.BaseEvaluator;
import org.drools.base.ValueType;
-import org.drools.rule.VariableContextEntry;
import org.drools.rule.VariableRestriction.LongVariableContextEntry;
+import org.drools.rule.VariableRestriction.VariableContextEntry;
import org.drools.spi.Evaluator;
import org.drools.spi.Extractor;
import org.drools.spi.FieldValue;
@@ -86,12 +86,12 @@
public boolean evaluateCachedRight(final VariableContextEntry context,
final Object left) {
- return context.getVariableDeclaration().getExtractor().getCharValue( left ) == ((LongVariableContextEntry) context).right;
+ return context.declaration.getExtractor().getCharValue( left ) == ((LongVariableContextEntry) context).right;
}
public boolean evaluateCachedLeft(final VariableContextEntry context,
final Object right) {
- return ((LongVariableContextEntry) context).left == context.getFieldExtractor().getCharValue( right );
+ return ((LongVariableContextEntry) context).left == context.extractor.getCharValue( right );
}
public String toString() {
@@ -125,12 +125,12 @@
public boolean evaluateCachedRight(final VariableContextEntry context,
final Object left) {
- return context.getVariableDeclaration().getExtractor().getCharValue( left ) != ((LongVariableContextEntry) context).right;
+ return context.declaration.getExtractor().getCharValue( left ) != ((LongVariableContextEntry) context).right;
}
public boolean evaluateCachedLeft(final VariableContextEntry context,
final Object right) {
- return ((LongVariableContextEntry) context).left != context.getFieldExtractor().getCharValue( right );
+ return ((LongVariableContextEntry) context).left != context.extractor.getCharValue( right );
}
public String toString() {
@@ -164,12 +164,12 @@
public boolean evaluateCachedRight(final VariableContextEntry context,
final Object left) {
- return context.getVariableDeclaration().getExtractor().getCharValue( left ) < ((LongVariableContextEntry) context).right;
+ return context.declaration.getExtractor().getCharValue( left ) < ((LongVariableContextEntry) context).right;
}
public boolean evaluateCachedLeft(final VariableContextEntry context,
final Object right) {
- return ((LongVariableContextEntry) context).left < context.getFieldExtractor().getCharValue( right );
+ return ((LongVariableContextEntry) context).left < context.extractor.getCharValue( right );
}
public String toString() {
@@ -203,12 +203,12 @@
public boolean evaluateCachedRight(final VariableContextEntry context,
final Object left) {
- return context.getVariableDeclaration().getExtractor().getCharValue( left ) <= ((LongVariableContextEntry) context).right;
+ return context.declaration.getExtractor().getCharValue( left ) <= ((LongVariableContextEntry) context).right;
}
public boolean evaluateCachedLeft(final VariableContextEntry context,
final Object right) {
- return ((LongVariableContextEntry) context).left <= context.getFieldExtractor().getCharValue( right );
+ return ((LongVariableContextEntry) context).left <= context.extractor.getCharValue( right );
}
public String toString() {
@@ -242,12 +242,12 @@
public boolean evaluateCachedRight(final VariableContextEntry context,
final Object left) {
- return context.getVariableDeclaration().getExtractor().getCharValue( left ) > ((LongVariableContextEntry) context).right;
+ return context.declaration.getExtractor().getCharValue( left ) > ((LongVariableContextEntry) context).right;
}
public boolean evaluateCachedLeft(final VariableContextEntry context,
final Object right) {
- return ((LongVariableContextEntry) context).left > context.getFieldExtractor().getCharValue( right );
+ return ((LongVariableContextEntry) context).left > context.extractor.getCharValue( right );
}
public String toString() {
@@ -281,12 +281,12 @@
public boolean evaluateCachedRight(final VariableContextEntry context,
final Object left) {
- return context.getVariableDeclaration().getExtractor().getCharValue( left ) >= ((LongVariableContextEntry) context).right;
+ return context.declaration.getExtractor().getCharValue( left ) >= ((LongVariableContextEntry) context).right;
}
public boolean evaluateCachedLeft(final VariableContextEntry context,
final Object right) {
- return ((LongVariableContextEntry) context).left >= context.getFieldExtractor().getCharValue( right );
+ return ((LongVariableContextEntry) context).left >= context.extractor.getCharValue( right );
}
public String toString() {
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/evaluators/DateFactory.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/evaluators/DateFactory.java 2006-10-23 12:39:33 UTC (rev 7014)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/evaluators/DateFactory.java 2006-10-23 12:41:02 UTC (rev 7015)
@@ -22,8 +22,8 @@
import org.drools.base.BaseEvaluator;
import org.drools.base.ValueType;
-import org.drools.rule.VariableContextEntry;
import org.drools.rule.VariableRestriction.ObjectVariableContextEntry;
+import org.drools.rule.VariableRestriction.VariableContextEntry;
import org.drools.spi.Evaluator;
import org.drools.spi.Extractor;
import org.drools.spi.FieldValue;
@@ -121,7 +121,7 @@
public boolean evaluateCachedRight(final VariableContextEntry context,
final Object left) {
- final Date value1 = (Date) context.getVariableDeclaration().getExtractor().getValue( left );
+ final Date value1 = (Date) context.declaration.getExtractor().getValue( left );
final Object value2 = ((ObjectVariableContextEntry) context).right;
if ( value1 == null ) {
return value2 == null;
@@ -135,7 +135,7 @@
public boolean evaluateCachedLeft(final VariableContextEntry context,
final Object right) {
final Date value1 = (Date) ((ObjectVariableContextEntry) context).left;
- final Object value2 = context.getFieldExtractor().getValue( right );
+ final Object value2 = context.extractor.getValue( right );
if ( value1 == null ) {
return value2 == null;
}
@@ -192,7 +192,7 @@
public boolean evaluateCachedRight(final VariableContextEntry context,
final Object left) {
- final Date value1 = (Date) context.getVariableDeclaration().getExtractor().getValue( left );
+ final Date value1 = (Date) context.declaration.getExtractor().getValue( left );
final Object value2 = ((ObjectVariableContextEntry) context).right;
if ( value1 == null ) {
return value2 != null;
@@ -206,7 +206,7 @@
public boolean evaluateCachedLeft(final VariableContextEntry context,
final Object right) {
final Date value1 = (Date) ((ObjectVariableContextEntry) context).left;
- final Object value2 = context.getFieldExtractor().getValue( right );
+ final Object value2 = context.extractor.getValue( right );
if ( value1 == null ) {
return value2 != null;
}
@@ -251,7 +251,7 @@
public boolean evaluateCachedRight(final VariableContextEntry context,
final Object left) {
- final Date value1 = (Date) context.getVariableDeclaration().getExtractor().getValue( left );
+ final Date value1 = (Date) context.declaration.getExtractor().getValue( left );
final Object value2 = ((ObjectVariableContextEntry) context).right;
return value1.compareTo( getRightDate( value2 ) ) < 0;
}
@@ -259,7 +259,7 @@
public boolean evaluateCachedLeft(final VariableContextEntry context,
final Object right) {
final Date value1 = (Date) ((ObjectVariableContextEntry) context).left;
- final Object value2 = context.getFieldExtractor().getValue( right );
+ final Object value2 = context.extractor.getValue( right );
return value1.compareTo( getRightDate( value2 ) ) < 0;
}
@@ -298,7 +298,7 @@
public boolean evaluateCachedRight(final VariableContextEntry context,
final Object left) {
- final Date value1 = (Date) context.getVariableDeclaration().getExtractor().getValue( left );
+ final Date value1 = (Date) context.declaration.getExtractor().getValue( left );
final Object value2 = ((ObjectVariableContextEntry) context).right;
return value1.compareTo( getRightDate( value2 ) ) <= 0;
}
@@ -306,7 +306,7 @@
public boolean evaluateCachedLeft(final VariableContextEntry context,
final Object right) {
final Date value1 = (Date) ((ObjectVariableContextEntry) context).left;
- final Object value2 = context.getFieldExtractor().getValue( right );
+ final Object value2 = context.extractor.getValue( right );
return value1.compareTo( getRightDate( value2 ) ) <= 0;
}
@@ -345,7 +345,7 @@
public boolean evaluateCachedRight(final VariableContextEntry context,
final Object left) {
- final Date value1 = (Date) context.getVariableDeclaration().getExtractor().getValue( left );
+ final Date value1 = (Date) context.declaration.getExtractor().getValue( left );
final Object value2 = ((ObjectVariableContextEntry) context).right;
return value1.compareTo( getRightDate( value2 ) ) > 0;
}
@@ -353,7 +353,7 @@
public boolean evaluateCachedLeft(final VariableContextEntry context,
final Object right) {
final Date value1 = (Date) ((ObjectVariableContextEntry) context).left;
- final Object value2 = context.getFieldExtractor().getValue( right );
+ final Object value2 = context.extractor.getValue( right );
return value1.compareTo( getRightDate( value2 ) ) > 0;
}
@@ -392,7 +392,7 @@
public boolean evaluateCachedRight(final VariableContextEntry context,
final Object left) {
- final Date value1 = (Date) context.getVariableDeclaration().getExtractor().getValue( left );
+ final Date value1 = (Date) context.declaration.getExtractor().getValue( left );
final Object value2 = ((ObjectVariableContextEntry) context).right;
return value1.compareTo( getRightDate( value2 ) ) >= 0;
}
@@ -400,7 +400,7 @@
public boolean evaluateCachedLeft(final VariableContextEntry context,
final Object right) {
final Date value1 = (Date) ((ObjectVariableContextEntry) context).left;
- final Object value2 = context.getFieldExtractor().getValue( right );
+ final Object value2 = context.extractor.getValue( right );
return value1.compareTo( getRightDate( value2 ) ) >= 0;
}
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/evaluators/DoubleFactory.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/evaluators/DoubleFactory.java 2006-10-23 12:39:33 UTC (rev 7014)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/evaluators/DoubleFactory.java 2006-10-23 12:41:02 UTC (rev 7015)
@@ -18,8 +18,8 @@
import org.drools.base.BaseEvaluator;
import org.drools.base.ValueType;
-import org.drools.rule.VariableContextEntry;
import org.drools.rule.VariableRestriction.DoubleVariableContextEntry;
+import org.drools.rule.VariableRestriction.VariableContextEntry;
import org.drools.spi.Evaluator;
import org.drools.spi.Extractor;
import org.drools.spi.FieldValue;
@@ -89,13 +89,13 @@
public boolean evaluateCachedRight(final VariableContextEntry context,
final Object left) {
// TODO: we are not handling delta right now... maybe we should
- return context.getVariableDeclaration().getExtractor().getDoubleValue( left ) == ((DoubleVariableContextEntry) context).right;
+ return context.declaration.getExtractor().getDoubleValue( left ) == ((DoubleVariableContextEntry) context).right;
}
public boolean evaluateCachedLeft(final VariableContextEntry context,
final Object right) {
// TODO: we are not handling delta right now... maybe we should
- return ((DoubleVariableContextEntry) context).left == context.getFieldExtractor().getDoubleValue( right );
+ return ((DoubleVariableContextEntry) context).left == context.extractor.getDoubleValue( right );
}
public String toString() {
@@ -132,13 +132,13 @@
public boolean evaluateCachedRight(final VariableContextEntry context,
final Object left) {
// TODO: we are not handling delta right now... maybe we should
- return context.getVariableDeclaration().getExtractor().getDoubleValue( left ) != ((DoubleVariableContextEntry) context).right;
+ return context.declaration.getExtractor().getDoubleValue( left ) != ((DoubleVariableContextEntry) context).right;
}
public boolean evaluateCachedLeft(final VariableContextEntry context,
final Object right) {
// TODO: we are not handling delta right now... maybe we should
- return ((DoubleVariableContextEntry) context).left != context.getFieldExtractor().getDoubleValue( right );
+ return ((DoubleVariableContextEntry) context).left != context.extractor.getDoubleValue( right );
}
public String toString() {
@@ -175,13 +175,13 @@
public boolean evaluateCachedRight(final VariableContextEntry context,
final Object left) {
// TODO: we are not handling delta right now... maybe we should
- return context.getVariableDeclaration().getExtractor().getDoubleValue( left ) < ((DoubleVariableContextEntry) context).right;
+ return context.declaration.getExtractor().getDoubleValue( left ) < ((DoubleVariableContextEntry) context).right;
}
public boolean evaluateCachedLeft(final VariableContextEntry context,
final Object right) {
// TODO: we are not handling delta right now... maybe we should
- return ((DoubleVariableContextEntry) context).left < context.getFieldExtractor().getDoubleValue( right );
+ return ((DoubleVariableContextEntry) context).left < context.extractor.getDoubleValue( right );
}
public String toString() {
@@ -218,13 +218,13 @@
public boolean evaluateCachedRight(final VariableContextEntry context,
final Object left) {
// TODO: we are not handling delta right now... maybe we should
- return context.getVariableDeclaration().getExtractor().getDoubleValue( left ) <= ((DoubleVariableContextEntry) context).right;
+ return context.declaration.getExtractor().getDoubleValue( left ) <= ((DoubleVariableContextEntry) context).right;
}
public boolean evaluateCachedLeft(final VariableContextEntry context,
final Object right) {
// TODO: we are not handling delta right now... maybe we should
- return ((DoubleVariableContextEntry) context).left <= context.getFieldExtractor().getDoubleValue( right );
+ return ((DoubleVariableContextEntry) context).left <= context.extractor.getDoubleValue( right );
}
public String toString() {
@@ -261,13 +261,13 @@
public boolean evaluateCachedRight(final VariableContextEntry context,
final Object left) {
// TODO: we are not handling delta right now... maybe we should
- return context.getVariableDeclaration().getExtractor().getDoubleValue( left ) > ((DoubleVariableContextEntry) context).right;
+ return context.declaration.getExtractor().getDoubleValue( left ) > ((DoubleVariableContextEntry) context).right;
}
public boolean evaluateCachedLeft(final VariableContextEntry context,
final Object right) {
// TODO: we are not handling delta right now... maybe we should
- return ((DoubleVariableContextEntry) context).left > context.getFieldExtractor().getDoubleValue( right );
+ return ((DoubleVariableContextEntry) context).left > context.extractor.getDoubleValue( right );
}
public String toString() {
@@ -304,13 +304,13 @@
public boolean evaluateCachedRight(final VariableContextEntry context,
final Object left) {
// TODO: we are not handling delta right now... maybe we should
- return context.getVariableDeclaration().getExtractor().getDoubleValue( left ) >= ((DoubleVariableContextEntry) context).right;
+ return context.declaration.getExtractor().getDoubleValue( left ) >= ((DoubleVariableContextEntry) context).right;
}
public boolean evaluateCachedLeft(final VariableContextEntry context,
final Object right) {
// TODO: we are not handling delta right now... maybe we should
- return ((DoubleVariableContextEntry) context).left >= context.getFieldExtractor().getDoubleValue( right );
+ return ((DoubleVariableContextEntry) context).left >= context.extractor.getDoubleValue( right );
}
public String toString() {
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/evaluators/FactTemplateFactory.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/evaluators/FactTemplateFactory.java 2006-10-23 12:39:33 UTC (rev 7014)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/evaluators/FactTemplateFactory.java 2006-10-23 12:41:02 UTC (rev 7015)
@@ -18,8 +18,8 @@
import org.drools.base.BaseEvaluator;
import org.drools.base.ValueType;
-import org.drools.rule.VariableContextEntry;
import org.drools.rule.VariableRestriction.ObjectVariableContextEntry;
+import org.drools.rule.VariableRestriction.VariableContextEntry;
import org.drools.spi.Evaluator;
import org.drools.spi.Extractor;
import org.drools.spi.FieldValue;
@@ -95,7 +95,7 @@
public boolean evaluateCachedRight(final VariableContextEntry context,
final Object left) {
- final Object value = context.getVariableDeclaration().getExtractor().getValue( left );
+ final Object value = context.declaration.getExtractor().getValue( left );
if ( value == null ) {
return ((ObjectVariableContextEntry) context).right == null;
}
@@ -104,7 +104,7 @@
public boolean evaluateCachedLeft(final VariableContextEntry context,
final Object right) {
- final Object value = context.getFieldExtractor().getValue( right );
+ final Object value = context.extractor.getValue( right );
if ( ((ObjectVariableContextEntry) context).left == null ) {
return value == null;
}
@@ -152,7 +152,7 @@
public boolean evaluateCachedRight(final VariableContextEntry context,
final Object left) {
- final Object value = context.getVariableDeclaration().getExtractor().getValue( left );
+ final Object value = context.declaration.getExtractor().getValue( left );
if ( value == null ) {
return ((ObjectVariableContextEntry) context).right != null;
}
@@ -161,7 +161,7 @@
public boolean evaluateCachedLeft(final VariableContextEntry context,
final Object right) {
- final Object value = context.getFieldExtractor().getValue( right );
+ final Object value = context.extractor.getValue( right );
if ( ((ObjectVariableContextEntry) context).left == null ) {
return value != null;
}
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/evaluators/FloatFactory.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/evaluators/FloatFactory.java 2006-10-23 12:39:33 UTC (rev 7014)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/evaluators/FloatFactory.java 2006-10-23 12:41:02 UTC (rev 7015)
@@ -18,8 +18,8 @@
import org.drools.base.BaseEvaluator;
import org.drools.base.ValueType;
-import org.drools.rule.VariableContextEntry;
import org.drools.rule.VariableRestriction.DoubleVariableContextEntry;
+import org.drools.rule.VariableRestriction.VariableContextEntry;
import org.drools.spi.Evaluator;
import org.drools.spi.Extractor;
import org.drools.spi.FieldValue;
@@ -87,13 +87,13 @@
public boolean evaluateCachedRight(final VariableContextEntry context,
final Object left) {
// TODO: we are not handling delta right now... maybe we should
- return context.getVariableDeclaration().getExtractor().getFloatValue( left ) == ((DoubleVariableContextEntry) context).right;
+ return context.declaration.getExtractor().getFloatValue( left ) == ((DoubleVariableContextEntry) context).right;
}
public boolean evaluateCachedLeft(final VariableContextEntry context,
final Object right) {
// TODO: we are not handling delta right now... maybe we should
- return ((DoubleVariableContextEntry) context).left == context.getFieldExtractor().getFloatValue( right );
+ return ((DoubleVariableContextEntry) context).left == context.extractor.getFloatValue( right );
}
public String toString() {
@@ -130,13 +130,13 @@
public boolean evaluateCachedRight(final VariableContextEntry context,
final Object left) {
// TODO: we are not handling delta right now... maybe we should
- return context.getVariableDeclaration().getExtractor().getFloatValue( left ) != ((DoubleVariableContextEntry) context).right;
+ return context.declaration.getExtractor().getFloatValue( left ) != ((DoubleVariableContextEntry) context).right;
}
public boolean evaluateCachedLeft(final VariableContextEntry context,
final Object right) {
// TODO: we are not handling delta right now... maybe we should
- return ((DoubleVariableContextEntry) context).left != context.getFieldExtractor().getFloatValue( right );
+ return ((DoubleVariableContextEntry) context).left != context.extractor.getFloatValue( right );
}
public String toString() {
@@ -173,13 +173,13 @@
public boolean evaluateCachedRight(final VariableContextEntry context,
final Object left) {
// TODO: we are not handling delta right now... maybe we should
- return context.getVariableDeclaration().getExtractor().getFloatValue( left ) < ((DoubleVariableContextEntry) context).right;
+ return context.declaration.getExtractor().getFloatValue( left ) < ((DoubleVariableContextEntry) context).right;
}
public boolean evaluateCachedLeft(final VariableContextEntry context,
final Object right) {
// TODO: we are not handling delta right now... maybe we should
- return ((DoubleVariableContextEntry) context).left < context.getFieldExtractor().getFloatValue( right );
+ return ((DoubleVariableContextEntry) context).left < context.extractor.getFloatValue( right );
}
public String toString() {
@@ -216,13 +216,13 @@
public boolean evaluateCachedRight(final VariableContextEntry context,
final Object left) {
// TODO: we are not handling delta right now... maybe we should
- return context.getVariableDeclaration().getExtractor().getFloatValue( left ) <= ((DoubleVariableContextEntry) context).right;
+ return context.declaration.getExtractor().getFloatValue( left ) <= ((DoubleVariableContextEntry) context).right;
}
public boolean evaluateCachedLeft(final VariableContextEntry context,
final Object right) {
// TODO: we are not handling delta right now... maybe we should
- return ((DoubleVariableContextEntry) context).left <= context.getFieldExtractor().getFloatValue( right );
+ return ((DoubleVariableContextEntry) context).left <= context.extractor.getFloatValue( right );
}
public String toString() {
@@ -259,13 +259,13 @@
public boolean evaluateCachedRight(final VariableContextEntry context,
final Object left) {
// TODO: we are not handling delta right now... maybe we should
- return context.getVariableDeclaration().getExtractor().getFloatValue( left ) > ((DoubleVariableContextEntry) context).right;
+ return context.declaration.getExtractor().getFloatValue( left ) > ((DoubleVariableContextEntry) context).right;
}
public boolean evaluateCachedLeft(final VariableContextEntry context,
final Object right) {
// TODO: we are not handling delta right now... maybe we should
- return ((DoubleVariableContextEntry) context).left > context.getFieldExtractor().getFloatValue( right );
+ return ((DoubleVariableContextEntry) context).left > context.extractor.getFloatValue( right );
}
public String toString() {
@@ -302,13 +302,13 @@
public boolean evaluateCachedRight(final VariableContextEntry context,
final Object left) {
// TODO: we are not handling delta right now... maybe we should
- return context.getVariableDeclaration().getExtractor().getFloatValue( left ) >= ((DoubleVariableContextEntry) context).right;
+ return context.declaration.getExtractor().getFloatValue( left ) >= ((DoubleVariableContextEntry) context).right;
}
public boolean evaluateCachedLeft(final VariableContextEntry context,
final Object right) {
// TODO: we are not handling delta right now... maybe we should
- return ((DoubleVariableContextEntry) context).left >= context.getFieldExtractor().getFloatValue( right );
+ return ((DoubleVariableContextEntry) context).left >= context.extractor.getFloatValue( right );
}
public String toString() {
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/evaluators/IntegerFactory.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/evaluators/IntegerFactory.java 2006-10-23 12:39:33 UTC (rev 7014)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/evaluators/IntegerFactory.java 2006-10-23 12:41:02 UTC (rev 7015)
@@ -18,8 +18,8 @@
import org.drools.base.BaseEvaluator;
import org.drools.base.ValueType;
-import org.drools.rule.VariableContextEntry;
import org.drools.rule.VariableRestriction.LongVariableContextEntry;
+import org.drools.rule.VariableRestriction.VariableContextEntry;
import org.drools.spi.Evaluator;
import org.drools.spi.Extractor;
import org.drools.spi.FieldValue;
@@ -86,12 +86,12 @@
public boolean evaluateCachedRight(final VariableContextEntry context,
final Object left) {
- return context.getVariableDeclaration().getExtractor().getIntValue( left ) == ((LongVariableContextEntry) context).right;
+ return context.declaration.getExtractor().getIntValue( left ) == ((LongVariableContextEntry) context).right;
}
public boolean evaluateCachedLeft(final VariableContextEntry context,
final Object object2) {
- return context.getFieldExtractor().getIntValue( object2 ) == ((LongVariableContextEntry) context).left;
+ return context.extractor.getIntValue( object2 ) == ((LongVariableContextEntry) context).left;
}
public String toString() {
@@ -126,12 +126,12 @@
public boolean evaluateCachedRight(final VariableContextEntry context,
final Object left) {
- return context.getVariableDeclaration().getExtractor().getIntValue( left ) != ((LongVariableContextEntry) context).right;
+ return context.declaration.getExtractor().getIntValue( left ) != ((LongVariableContextEntry) context).right;
}
public boolean evaluateCachedLeft(final VariableContextEntry context,
final Object object2) {
- return context.getFieldExtractor().getIntValue( object2 ) != ((LongVariableContextEntry) context).left;
+ return context.extractor.getIntValue( object2 ) != ((LongVariableContextEntry) context).left;
}
public String toString() {
@@ -165,12 +165,12 @@
public boolean evaluateCachedRight(final VariableContextEntry context,
final Object left) {
- return context.getVariableDeclaration().getExtractor().getIntValue( left ) < ((LongVariableContextEntry) context).right;
+ return context.declaration.getExtractor().getIntValue( left ) < ((LongVariableContextEntry) context).right;
}
public boolean evaluateCachedLeft(final VariableContextEntry context,
final Object right) {
- return ((LongVariableContextEntry) context).left < context.getFieldExtractor().getIntValue( right );
+ return ((LongVariableContextEntry) context).left < context.extractor.getIntValue( right );
}
public String toString() {
@@ -204,12 +204,12 @@
public boolean evaluateCachedRight(final VariableContextEntry context,
final Object left) {
- return context.getVariableDeclaration().getExtractor().getIntValue( left ) <= ((LongVariableContextEntry) context).right;
+ return context.declaration.getExtractor().getIntValue( left ) <= ((LongVariableContextEntry) context).right;
}
public boolean evaluateCachedLeft(final VariableContextEntry context,
final Object right) {
- return ((LongVariableContextEntry) context).left <= context.getFieldExtractor().getIntValue( right );
+ return ((LongVariableContextEntry) context).left <= context.extractor.getIntValue( right );
}
public String toString() {
@@ -243,12 +243,12 @@
public boolean evaluateCachedRight(final VariableContextEntry context,
final Object left) {
- return context.getVariableDeclaration().getExtractor().getIntValue( left ) > ((LongVariableContextEntry) context).right;
+ return context.declaration.getExtractor().getIntValue( left ) > ((LongVariableContextEntry) context).right;
}
public boolean evaluateCachedLeft(final VariableContextEntry context,
final Object right) {
- return ((LongVariableContextEntry) context).left > context.getFieldExtractor().getIntValue( right );
+ return ((LongVariableContextEntry) context).left > context.extractor.getIntValue( right );
}
public String toString() {
@@ -282,12 +282,12 @@
public boolean evaluateCachedRight(final VariableContextEntry context,
final Object left) {
- return context.getVariableDeclaration().getExtractor().getIntValue( left ) >= ((LongVariableContextEntry) context).right;
+ return context.declaration.getExtractor().getIntValue( left ) >= ((LongVariableContextEntry) context).right;
}
public boolean evaluateCachedLeft(final VariableContextEntry context,
final Object right) {
- return ((LongVariableContextEntry) context).left >= context.getFieldExtractor().getIntValue( right );
+ return ((LongVariableContextEntry) context).left >= context.extractor.getIntValue( right );
}
public String toString() {
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/evaluators/LongFactory.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/evaluators/LongFactory.java 2006-10-23 12:39:33 UTC (rev 7014)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/evaluators/LongFactory.java 2006-10-23 12:41:02 UTC (rev 7015)
@@ -18,8 +18,8 @@
import org.drools.base.BaseEvaluator;
import org.drools.base.ValueType;
-import org.drools.rule.VariableContextEntry;
import org.drools.rule.VariableRestriction.LongVariableContextEntry;
+import org.drools.rule.VariableRestriction.VariableContextEntry;
import org.drools.spi.Evaluator;
import org.drools.spi.Extractor;
import org.drools.spi.FieldValue;
@@ -86,12 +86,12 @@
public boolean evaluateCachedRight(final VariableContextEntry context,
final Object left) {
- return context.getVariableDeclaration().getExtractor().getLongValue( left ) == ((LongVariableContextEntry) context).right;
+ return context.declaration.getExtractor().getLongValue( left ) == ((LongVariableContextEntry) context).right;
}
public boolean evaluateCachedLeft(final VariableContextEntry context,
final Object right) {
- return ((LongVariableContextEntry) context).left == context.getFieldExtractor().getLongValue( right );
+ return ((LongVariableContextEntry) context).left == context.extractor.getLongValue( right );
}
public String toString() {
@@ -125,12 +125,12 @@
public boolean evaluateCachedRight(final VariableContextEntry context,
final Object left) {
- return context.getVariableDeclaration().getExtractor().getLongValue( left ) != ((LongVariableContextEntry) context).right;
+ return context.declaration.getExtractor().getLongValue( left ) != ((LongVariableContextEntry) context).right;
}
public boolean evaluateCachedLeft(final VariableContextEntry context,
final Object right) {
- return ((LongVariableContextEntry) context).left != context.getFieldExtractor().getLongValue( right );
+ return ((LongVariableContextEntry) context).left != context.extractor.getLongValue( right );
}
public String toString() {
@@ -164,12 +164,12 @@
public boolean evaluateCachedRight(final VariableContextEntry context,
final Object left) {
- return context.getVariableDeclaration().getExtractor().getLongValue( left ) < ((LongVariableContextEntry) context).right;
+ return context.declaration.getExtractor().getLongValue( left ) < ((LongVariableContextEntry) context).right;
}
public boolean evaluateCachedLeft(final VariableContextEntry context,
final Object right) {
- return ((LongVariableContextEntry) context).left < context.getFieldExtractor().getLongValue( right );
+ return ((LongVariableContextEntry) context).left < context.extractor.getLongValue( right );
}
public String toString() {
@@ -203,12 +203,12 @@
public boolean evaluateCachedRight(final VariableContextEntry context,
final Object left) {
- return context.getVariableDeclaration().getExtractor().getLongValue( left ) <= ((LongVariableContextEntry) context).right;
+ return context.declaration.getExtractor().getLongValue( left ) <= ((LongVariableContextEntry) context).right;
}
public boolean evaluateCachedLeft(final VariableContextEntry context,
final Object right) {
- return ((LongVariableContextEntry) context).left <= context.getFieldExtractor().getLongValue( right );
+ return ((LongVariableContextEntry) context).left <= context.extractor.getLongValue( right );
}
public String toString() {
@@ -242,12 +242,12 @@
public boolean evaluateCachedRight(final VariableContextEntry context,
final Object left) {
- return context.getVariableDeclaration().getExtractor().getLongValue( left ) > ((LongVariableContextEntry) context).right;
+ return context.declaration.getExtractor().getLongValue( left ) > ((LongVariableContextEntry) context).right;
}
public boolean evaluateCachedLeft(final VariableContextEntry context,
final Object right) {
- return ((LongVariableContextEntry) context).left > context.getFieldExtractor().getLongValue( right );
+ return ((LongVariableContextEntry) context).left > context.extractor.getLongValue( right );
}
public String toString() {
@@ -281,12 +281,12 @@
public boolean evaluateCachedRight(final VariableContextEntry context,
final Object left) {
- return context.getVariableDeclaration().getExtractor().getLongValue( left ) >= ((LongVariableContextEntry) context).right;
+ return context.declaration.getExtractor().getLongValue( left ) >= ((LongVariableContextEntry) context).right;
}
public boolean evaluateCachedLeft(final VariableContextEntry context,
final Object right) {
- return ((LongVariableContextEntry) context).left >= context.getFieldExtractor().getLongValue( right );
+ return ((LongVariableContextEntry) context).left >= context.extractor.getLongValue( right );
}
public String toString() {
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/evaluators/ObjectFactory.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/evaluators/ObjectFactory.java 2006-10-23 12:39:33 UTC (rev 7014)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/evaluators/ObjectFactory.java 2006-10-23 12:41:02 UTC (rev 7015)
@@ -20,8 +20,8 @@
import org.drools.base.BaseEvaluator;
import org.drools.base.ValueType;
-import org.drools.rule.VariableContextEntry;
import org.drools.rule.VariableRestriction.ObjectVariableContextEntry;
+import org.drools.rule.VariableRestriction.VariableContextEntry;
import org.drools.spi.Evaluator;
import org.drools.spi.Extractor;
import org.drools.spi.FieldValue;
@@ -113,7 +113,7 @@
public boolean evaluateCachedRight(final VariableContextEntry context,
final Object left) {
- final Object value = context.getVariableDeclaration().getExtractor().getValue( left );
+ final Object value = context.declaration.getExtractor().getValue( left );
if ( value == null ) {
return ((ObjectVariableContextEntry) context).right == null;
}
@@ -122,7 +122,7 @@
public boolean evaluateCachedLeft(final VariableContextEntry context,
final Object right) {
- final Object value = context.getFieldExtractor().getValue( right );
+ final Object value = context.extractor.getValue( right );
if ( ((ObjectVariableContextEntry) context).left == null ) {
return value == null;
}
@@ -171,7 +171,7 @@
public boolean evaluateCachedRight(final VariableContextEntry context,
final Object left) {
- final Object value = context.getVariableDeclaration().getExtractor().getValue( left );
+ final Object value = context.declaration.getExtractor().getValue( left );
if ( value == null ) {
return ((ObjectVariableContextEntry) context).right != null;
}
@@ -180,7 +180,7 @@
public boolean evaluateCachedLeft(final VariableContextEntry context,
final Object right) {
- final Object value = context.getFieldExtractor().getValue( right );
+ final Object value = context.extractor.getValue( right );
if ( ((ObjectVariableContextEntry) context).left == null ) {
return value != null;
}
@@ -217,14 +217,14 @@
public boolean evaluateCachedRight(final VariableContextEntry context,
final Object left) {
- final Comparable comp = (Comparable) context.getVariableDeclaration().getExtractor().getValue( left );
+ final Comparable comp = (Comparable) context.declaration.getExtractor().getValue( left );
return comp.compareTo( ((ObjectVariableContextEntry) context).right ) < 0;
}
public boolean evaluateCachedLeft(final VariableContextEntry context,
final Object right) {
final Comparable comp = (Comparable) ((ObjectVariableContextEntry) context).left;
- return comp.compareTo( context.getFieldExtractor().getValue( right ) ) < 0;
+ return comp.compareTo( context.extractor.getValue( right ) ) < 0;
}
public String toString() {
@@ -260,14 +260,14 @@
public boolean evaluateCachedRight(final VariableContextEntry context,
final Object left) {
- final Comparable comp = (Comparable) context.getVariableDeclaration().getExtractor().getValue( left );
+ final Comparable comp = (Comparable) context.declaration.getExtractor().getValue( left );
return comp.compareTo( ((ObjectVariableContextEntry) context).right ) <= 0;
}
public boolean evaluateCachedLeft(final VariableContextEntry context,
final Object right) {
final Comparable comp = (Comparable) ((ObjectVariableContextEntry) context).left;
- return comp.compareTo( context.getFieldExtractor().getValue( right ) ) <= 0;
+ return comp.compareTo( context.extractor.getValue( right ) ) <= 0;
}
public String toString() {
@@ -303,14 +303,14 @@
public boolean evaluateCachedRight(final VariableContextEntry context,
final Object left) {
- final Comparable comp = (Comparable) context.getVariableDeclaration().getExtractor().getValue( left );
+ final Comparable comp = (Comparable) context.declaration.getExtractor().getValue( left );
return comp.compareTo( ((ObjectVariableContextEntry) context).right ) >= 0;
}
public boolean evaluateCachedLeft(final VariableContextEntry context,
final Object right) {
final Comparable comp = (Comparable) ((ObjectVariableContextEntry) context).left;
- return comp.compareTo( context.getFieldExtractor().getValue( right ) ) >= 0;
+ return comp.compareTo( context.extractor.getValue( right ) ) >= 0;
}
public String toString() {
@@ -346,14 +346,14 @@
public boolean evaluateCachedRight(final VariableContextEntry context,
final Object left) {
- final Comparable comp = (Comparable) context.getVariableDeclaration().getExtractor().getValue( left );
+ final Comparable comp = (Comparable) context.declaration.getExtractor().getValue( left );
return comp.compareTo( ((ObjectVariableContextEntry) context).right ) >= 0;
}
public boolean evaluateCachedLeft(final VariableContextEntry context,
final Object right) {
final Comparable comp = (Comparable) ((ObjectVariableContextEntry) context).left;
- return comp.compareTo( context.getFieldExtractor().getValue( right ) ) >= 0;
+ return comp.compareTo( context.extractor.getValue( right ) ) >= 0;
}
public String toString() {
@@ -392,13 +392,13 @@
public boolean evaluateCachedRight(final VariableContextEntry context,
final Object left) {
final Object value = ((ObjectVariableContextEntry) context).right;
- final Collection col = (Collection) context.getVariableDeclaration().getExtractor().getValue( left );
+ final Collection col = (Collection) context.declaration.getExtractor().getValue( left );
return col.contains( value );
}
public boolean evaluateCachedLeft(final VariableContextEntry context,
final Object right) {
- final Object value = context.getFieldExtractor().getValue( right );
+ final Object value = context.extractor.getValue( right );
final Collection col = (Collection) ((ObjectVariableContextEntry) context).left;
return col.contains( value );
}
@@ -439,13 +439,13 @@
public boolean evaluateCachedRight(final VariableContextEntry context,
final Object left) {
final Object value = ((ObjectVariableContextEntry) context).right;
- final Collection col = (Collection) context.getVariableDeclaration().getExtractor().getValue( left );
+ final Collection col = (Collection) context.declaration.getExtractor().getValue( left );
return !col.contains( value );
}
public boolean evaluateCachedLeft(final VariableContextEntry context,
final Object right) {
- final Object value = context.getFieldExtractor().getValue( right );
+ final Object value = context.extractor.getValue( right );
final Collection col = (Collection) ((ObjectVariableContextEntry) context).left;
return !col.contains( value );
}
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/evaluators/ShortFactory.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/evaluators/ShortFactory.java 2006-10-23 12:39:33 UTC (rev 7014)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/evaluators/ShortFactory.java 2006-10-23 12:41:02 UTC (rev 7015)
@@ -18,8 +18,8 @@
import org.drools.base.BaseEvaluator;
import org.drools.base.ValueType;
-import org.drools.rule.VariableContextEntry;
import org.drools.rule.VariableRestriction.LongVariableContextEntry;
+import org.drools.rule.VariableRestriction.VariableContextEntry;
import org.drools.spi.Evaluator;
import org.drools.spi.Extractor;
import org.drools.spi.FieldValue;
@@ -86,12 +86,12 @@
public boolean evaluateCachedRight(final VariableContextEntry context,
final Object left) {
- return context.getVariableDeclaration().getExtractor().getShortValue( left ) == ((LongVariableContextEntry) context).right;
+ return context.declaration.getExtractor().getShortValue( left ) == ((LongVariableContextEntry) context).right;
}
public boolean evaluateCachedLeft(final VariableContextEntry context,
final Object right) {
- return ((LongVariableContextEntry) context).left == context.getFieldExtractor().getShortValue( right );
+ return ((LongVariableContextEntry) context).left == context.extractor.getShortValue( right );
}
public String toString() {
@@ -125,12 +125,12 @@
public boolean evaluateCachedRight(final VariableContextEntry context,
final Object left) {
- return context.getVariableDeclaration().getExtractor().getShortValue( left ) != ((LongVariableContextEntry) context).right;
+ return context.declaration.getExtractor().getShortValue( left ) != ((LongVariableContextEntry) context).right;
}
public boolean evaluateCachedLeft(final VariableContextEntry context,
final Object right) {
- return ((LongVariableContextEntry) context).left != context.getFieldExtractor().getShortValue( right );
+ return ((LongVariableContextEntry) context).left != context.extractor.getShortValue( right );
}
public String toString() {
@@ -164,12 +164,12 @@
public boolean evaluateCachedRight(final VariableContextEntry context,
final Object left) {
- return context.getVariableDeclaration().getExtractor().getShortValue( left ) < ((LongVariableContextEntry) context).right;
+ return context.declaration.getExtractor().getShortValue( left ) < ((LongVariableContextEntry) context).right;
}
public boolean evaluateCachedLeft(final VariableContextEntry context,
final Object right) {
- return ((LongVariableContextEntry) context).left < context.getFieldExtractor().getShortValue( right );
+ return ((LongVariableContextEntry) context).left < context.extractor.getShortValue( right );
}
public String toString() {
@@ -203,12 +203,12 @@
public boolean evaluateCachedRight(final VariableContextEntry context,
final Object left) {
- return context.getVariableDeclaration().getExtractor().getShortValue( left ) <= ((LongVariableContextEntry) context).right;
+ return context.declaration.getExtractor().getShortValue( left ) <= ((LongVariableContextEntry) context).right;
}
public boolean evaluateCachedLeft(final VariableContextEntry context,
final Object right) {
- return ((LongVariableContextEntry) context).left <= context.getFieldExtractor().getShortValue( right );
+ return ((LongVariableContextEntry) context).left <= context.extractor.getShortValue( right );
}
public String toString() {
@@ -242,12 +242,12 @@
public boolean evaluateCachedRight(final VariableContextEntry context,
final Object left) {
- return context.getVariableDeclaration().getExtractor().getShortValue( left ) > ((LongVariableContextEntry) context).right;
+ return context.declaration.getExtractor().getShortValue( left ) > ((LongVariableContextEntry) context).right;
}
public boolean evaluateCachedLeft(final VariableContextEntry context,
final Object right) {
- return ((LongVariableContextEntry) context).left > context.getFieldExtractor().getShortValue( right );
+ return ((LongVariableContextEntry) context).left > context.extractor.getShortValue( right );
}
public String toString() {
@@ -281,12 +281,12 @@
public boolean evaluateCachedRight(final VariableContextEntry context,
final Object left) {
- return context.getVariableDeclaration().getExtractor().getShortValue( left ) >= ((LongVariableContextEntry) context).right;
+ return context.declaration.getExtractor().getShortValue( left ) >= ((LongVariableContextEntry) context).right;
}
public boolean evaluateCachedLeft(final VariableContextEntry context,
final Object right) {
- return ((LongVariableContextEntry) context).left >= context.getFieldExtractor().getShortValue( right );
+ return ((LongVariableContextEntry) context).left >= context.extractor.getShortValue( right );
}
public String toString() {
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/evaluators/StringFactory.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/evaluators/StringFactory.java 2006-10-23 12:39:33 UTC (rev 7014)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/evaluators/StringFactory.java 2006-10-23 12:41:02 UTC (rev 7015)
@@ -18,8 +18,8 @@
import org.drools.base.BaseEvaluator;
import org.drools.base.ValueType;
-import org.drools.rule.VariableContextEntry;
import org.drools.rule.VariableRestriction.ObjectVariableContextEntry;
+import org.drools.rule.VariableRestriction.VariableContextEntry;
import org.drools.spi.Evaluator;
import org.drools.spi.Extractor;
import org.drools.spi.FieldValue;
@@ -97,7 +97,7 @@
public boolean evaluateCachedRight(final VariableContextEntry context,
final Object left) {
- final Object value = context.getVariableDeclaration().getExtractor().getValue( left );
+ final Object value = context.declaration.getExtractor().getValue( left );
if ( value == null ) {
return ((ObjectVariableContextEntry) context).right == null;
}
@@ -106,7 +106,7 @@
public boolean evaluateCachedLeft(final VariableContextEntry context,
final Object right) {
- final Object value = context.getFieldExtractor().getValue( right );
+ final Object value = context.extractor.getValue( right );
if ( ((ObjectVariableContextEntry) context).left == null ) {
return value == null;
}
@@ -154,7 +154,7 @@
public boolean evaluateCachedRight(final VariableContextEntry context,
final Object left) {
- final Object value = context.getVariableDeclaration().getExtractor().getValue( left );
+ final Object value = context.declaration.getExtractor().getValue( left );
if ( value == null ) {
return ((ObjectVariableContextEntry) context).right != null;
}
@@ -163,7 +163,7 @@
public boolean evaluateCachedLeft(final VariableContextEntry context,
final Object right) {
- final Object value = context.getFieldExtractor().getValue( right );
+ final Object value = context.extractor.getValue( right );
if ( ((ObjectVariableContextEntry) context).left == null ) {
return value != null;
}
@@ -211,7 +211,7 @@
public boolean evaluateCachedRight(final VariableContextEntry context,
final Object left) {
- final String value = (String) context.getVariableDeclaration().getExtractor().getValue( left );
+ final String value = (String) context.declaration.getExtractor().getValue( left );
if ( value == null ) {
return false;
}
@@ -223,7 +223,7 @@
if ( ((ObjectVariableContextEntry) context).left == null ) {
return false;
}
- final String value = (String) context.getFieldExtractor().getValue( right );
+ final String value = (String) context.extractor.getValue( right );
return ((String) ((ObjectVariableContextEntry) context).left).matches( value );
}
Deleted: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/LiteralContextEntry.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/LiteralContextEntry.java 2006-10-23 12:39:33 UTC (rev 7014)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/LiteralContextEntry.java 2006-10-23 12:41:02 UTC (rev 7015)
@@ -1,24 +0,0 @@
-package org.drools.rule;
-
-import org.drools.spi.FieldExtractor;
-
-/**
- * A context for literal constraints
- *
- * @author etirelli
- */
-public interface LiteralContextEntry
- extends
- ContextEntry {
-
- /**
- * Returns the field extractor for the constrained field
- */
- public FieldExtractor getFieldExtractor();
-
- /**
- * Returns the object to extract the field from
- */
- public Object getObject();
-
-}
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/LiteralRestriction.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/LiteralRestriction.java 2006-10-23 12:39:33 UTC (rev 7014)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/LiteralRestriction.java 2006-10-23 12:41:02 UTC (rev 7015)
@@ -44,7 +44,7 @@
final FieldExtractor fieldExtractor) {
this.field = field;
this.evaluator = evaluator;
- this.contextEntry = new LiteralContextEntryImpl( fieldExtractor );
+ this.contextEntry = new LiteralContextEntry( fieldExtractor );
}
public Evaluator getEvaluator() {
@@ -114,14 +114,14 @@
return contextEntry;
}
- private static class LiteralContextEntryImpl
+ private static class LiteralContextEntry
implements
- LiteralContextEntry {
- private FieldExtractor extractor;
- private Object object;
- private ContextEntry next;
+ ContextEntry {
+ public FieldExtractor extractor;
+ public Object object;
+ public ContextEntry next;
- public LiteralContextEntryImpl(FieldExtractor extractor) {
+ public LiteralContextEntry(FieldExtractor extractor) {
this.extractor = extractor;
}
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/ReturnValueConstraint.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/ReturnValueConstraint.java 2006-10-23 12:39:33 UTC (rev 7014)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/ReturnValueConstraint.java 2006-10-23 12:41:02 UTC (rev 7015)
@@ -18,6 +18,7 @@
import org.drools.RuntimeDroolsException;
import org.drools.reteoo.ReteTuple;
+import org.drools.rule.ReturnValueRestriction.ReturnValueContextEntry;
import org.drools.spi.BetaNodeFieldConstraint;
import org.drools.spi.Evaluator;
import org.drools.spi.FieldExtractor;
Deleted: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/ReturnValueContextEntry.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/ReturnValueContextEntry.java 2006-10-23 12:39:33 UTC (rev 7014)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/ReturnValueContextEntry.java 2006-10-23 12:41:02 UTC (rev 7015)
@@ -1,34 +0,0 @@
-package org.drools.rule;
-
-import org.drools.common.InternalWorkingMemory;
-import org.drools.reteoo.ReteTuple;
-import org.drools.spi.FieldExtractor;
-
-public interface ReturnValueContextEntry extends ContextEntry {
-
- /**
- * Returns the field extractor for the constrained field
- */
- public FieldExtractor getFieldExtractor();
-
- /**
- * Returns the object to extract the field from
- */
- public Object getObject();
-
- /**
- * Returns the ReteTuple where the variable value is read from
- */
- public ReteTuple getTuple();
-
- /**
- * Returns the required declarations for the given restriction
- */
- public Declaration[] getRequiredDeclarations();
-
- /**
- * Returns the current working memory for the context
- */
- public InternalWorkingMemory getWorkingMemory();
-
-}
\ No newline at end of file
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/ReturnValueRestriction.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/ReturnValueRestriction.java 2006-10-23 12:39:33 UTC (rev 7014)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/ReturnValueRestriction.java 2006-10-23 12:41:02 UTC (rev 7015)
@@ -68,7 +68,7 @@
}
this.evaluator = evaluator;
- this.contextEntry = new ReturnValueContextEntryImpl(fieldExtractor, requiredDeclarations);
+ this.contextEntry = new ReturnValueContextEntry(fieldExtractor, requiredDeclarations);
}
public Declaration[] getRequiredDeclarations() {
@@ -166,18 +166,18 @@
return this.contextEntry;
}
- public static class ReturnValueContextEntryImpl
+ public static class ReturnValueContextEntry
implements
- ReturnValueContextEntry {
- private FieldExtractor fieldExtractor;
- private Object object;
- private ReteTuple leftTuple;
- private InternalWorkingMemory workingMemory;
- private Declaration[] requiredDeclarations;
+ ContextEntry {
+ public FieldExtractor fieldExtractor;
+ public Object object;
+ public ReteTuple leftTuple;
+ public InternalWorkingMemory workingMemory;
+ public Declaration[] requiredDeclarations;
private ContextEntry entry;
- public ReturnValueContextEntryImpl(FieldExtractor fieldExtractor, Declaration[] requiredDeclarations) {
+ public ReturnValueContextEntry(FieldExtractor fieldExtractor, Declaration[] requiredDeclarations) {
this.fieldExtractor = fieldExtractor;
this.requiredDeclarations = requiredDeclarations;
}
Deleted: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/VariableContextEntry.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/VariableContextEntry.java 2006-10-23 12:39:33 UTC (rev 7014)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/VariableContextEntry.java 2006-10-23 12:41:02 UTC (rev 7015)
@@ -1,29 +0,0 @@
-package org.drools.rule;
-
-import org.drools.reteoo.ReteTuple;
-import org.drools.spi.FieldExtractor;
-
-public interface VariableContextEntry
- extends
- ContextEntry {
-
- /**
- * Returns the field extractor for the constrained field
- */
- public FieldExtractor getFieldExtractor();
-
- /**
- * Returns the object to extract the field from
- */
- public Object getObject();
-
- /**
- * Returns the ReteTuple where the variable value is read from
- */
- public ReteTuple getTuple();
-
- /**
- * Returns the Declaration object that knows how to read the value from the tuple
- */
- public Declaration getVariableDeclaration();
-}
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/VariableRestriction.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/VariableRestriction.java 2006-10-23 12:39:33 UTC (rev 7014)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/VariableRestriction.java 2006-10-23 12:41:02 UTC (rev 7015)
@@ -129,16 +129,16 @@
return this.contextEntry;
}
- public static abstract class VariableContextEntryImpl
+ public static abstract class VariableContextEntry
implements
- VariableContextEntry {
- protected FieldExtractor extractor;
- protected Object object;
- protected Declaration declaration;
- protected ReteTuple reteTuple;
- protected ContextEntry entry;
+ ContextEntry {
+ public FieldExtractor extractor;
+ public Object object;
+ public Declaration declaration;
+ public ReteTuple reteTuple;
+ public ContextEntry entry;
- public VariableContextEntryImpl(final FieldExtractor extractor,
+ public VariableContextEntry(final FieldExtractor extractor,
final Declaration declaration) {
this.extractor = extractor;
this.declaration = declaration;
@@ -170,7 +170,7 @@
}
- public static class ObjectVariableContextEntry extends VariableContextEntryImpl {
+ public static class ObjectVariableContextEntry extends VariableContextEntry {
public Object left;
public Object right;
@@ -193,7 +193,7 @@
}
}
- public static class LongVariableContextEntry extends VariableContextEntryImpl {
+ public static class LongVariableContextEntry extends VariableContextEntry {
public long left;
public long right;
@@ -216,7 +216,7 @@
}
}
- public static class DoubleVariableContextEntry extends VariableContextEntryImpl {
+ public static class DoubleVariableContextEntry extends VariableContextEntry {
public double left;
public double right;
@@ -239,7 +239,7 @@
}
}
- public static class BooleanVariableContextEntry extends VariableContextEntryImpl {
+ public static class BooleanVariableContextEntry extends VariableContextEntry {
public boolean left;
public boolean right;
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/spi/Evaluator.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/spi/Evaluator.java 2006-10-23 12:39:33 UTC (rev 7014)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/spi/Evaluator.java 2006-10-23 12:41:02 UTC (rev 7015)
@@ -20,7 +20,7 @@
import org.drools.base.ValueType;
import org.drools.base.evaluators.Operator;
-import org.drools.rule.VariableContextEntry;
+import org.drools.rule.VariableRestriction.VariableContextEntry;
public interface Evaluator
extends
More information about the jboss-svn-commits
mailing list