[jboss-svn-commits] JBL Code SVN: r7037 - in labs/jbossrules/trunk/drools-core/src/main/java/org/drools: base/evaluators spi
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Mon Oct 23 16:31:27 EDT 2006
Author: tirelli
Date: 2006-10-23 16:31:07 -0400 (Mon, 23 Oct 2006)
New Revision: 7037
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/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/spi/Evaluator.java
Log:
Fixing integration tests
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 19:46:36 UTC (rev 7036)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/evaluators/ArrayFactory.java 2006-10-23 20:31:07 UTC (rev 7037)
@@ -53,8 +53,6 @@
return ArrayEqualEvaluator.INSTANCE;
} else if ( operator == Operator.NOT_EQUAL ) {
return ArrayNotEqualEvaluator.INSTANCE;
- } else if ( operator == Operator.LESS ) {
- return ArrayContainsEvaluator.INSTANCE;
} else if ( operator == Operator.CONTAINS ) {
return ArrayContainsEvaluator.INSTANCE;
} else {
@@ -85,17 +83,6 @@
return value1.equals( value2 );
}
- public boolean evaluate(final FieldValue object1,
- final Extractor extractor,
- final Object object2) {
- final Object value1 = object1.getValue();
- final Object value2 = extractor.getValue( object2 );
- if ( value1 == null ) {
- return value2 == null;
- }
- return value1.equals( value2 );
- }
-
public boolean evaluateCachedRight(final VariableContextEntry context,
final Object left) {
final Object value = context.declaration.getExtractor().getValue( left );
@@ -142,17 +129,6 @@
return !value1.equals( value2 );
}
- public boolean evaluate(final FieldValue object1,
- final Extractor extractor,
- final Object object2) {
- final Object value1 = object1.getValue();
- final Object value2 = extractor.getValue( object2 );
- if ( value1 == null ) {
- return value2 == null;
- }
- return !value1.equals( value2 );
- }
-
public boolean evaluateCachedRight(final VariableContextEntry context,
final Object left) {
final Object value = context.declaration.getExtractor().getValue( left );
@@ -201,22 +177,10 @@
return true;
}
- public boolean evaluate(final FieldValue object1,
- final Extractor extractor,
- final Object object2) {
- final Object value = extractor.getValue( object2 );
- final Object[] array = (Object[]) object1.getValue();
- if ( Arrays.binarySearch( array,
- value ) == -1 ) {
- return false;
- }
- return true;
- }
-
public boolean evaluateCachedRight(final VariableContextEntry context,
final Object left) {
- final Object value = ((ObjectVariableContextEntry) context).right;
- final Object[] array = (Object[]) context.declaration.getExtractor().getValue( left );
+ final Object value = context.declaration.getExtractor().getValue( left );
+ final Object[] array = (Object[]) ((ObjectVariableContextEntry) context).right;
if ( Arrays.binarySearch( array,
value ) == -1 ) {
return false;
@@ -226,8 +190,8 @@
public boolean evaluateCachedLeft(final VariableContextEntry context,
final Object right) {
- final Object value = context.extractor.getValue( right );
- final Object[] array = (Object[]) ((ObjectVariableContextEntry) context).left;
+ final Object value = ((ObjectVariableContextEntry) context).left;
+ final Object[] array = (Object[]) context.extractor.getValue( right );
if ( Arrays.binarySearch( array,
value ) == -1 ) {
return false;
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 19:46:36 UTC (rev 7036)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/evaluators/BigDecimalFactory.java 2006-10-23 20:31:07 UTC (rev 7037)
@@ -85,17 +85,6 @@
return value1.equals( value2 );
}
- public boolean evaluate(final FieldValue object1,
- final Extractor extractor,
- final Object object2) {
- final Object value1 = object1.getValue();
- final Object value2 = extractor.getValue( object2 );
- if ( value1 == null ) {
- return value2 == null;
- }
- return value1.equals( value2 );
- }
-
public boolean evaluateCachedRight(final VariableContextEntry context,
final Object left) {
final Object value = context.declaration.getExtractor().getValue( left );
@@ -142,17 +131,6 @@
return !value1.equals( value2 );
}
- public boolean evaluate(final FieldValue object1,
- final Extractor extractor,
- final Object object2) {
- final Object value1 = object1.getValue();
- final Object value2 = extractor.getValue( object2 );
- if ( value1 == null ) {
- return value2 != null;
- }
- return !value1.equals( value2 );
- }
-
public boolean evaluateCachedRight(final VariableContextEntry context,
final Object left) {
final Object value = context.declaration.getExtractor().getValue( left );
@@ -195,23 +173,16 @@
return comp.compareTo( object2.getValue() ) < 0;
}
- public boolean evaluate(final FieldValue object1,
- final Extractor extractor,
- final Object object2) {
- final BigDecimal comp = (BigDecimal) object1.getValue();
- return comp.compareTo( extractor.getValue( object2 ) ) < 0;
- }
-
public boolean evaluateCachedRight(final VariableContextEntry context,
final Object left) {
- final BigDecimal comp = (BigDecimal) context.declaration.getExtractor().getValue( left );
- return comp.compareTo( ((ObjectVariableContextEntry) context).right ) < 0;
+ final BigDecimal comp = (BigDecimal) ((ObjectVariableContextEntry) context).right;
+ return comp.compareTo( context.declaration.getExtractor().getValue( left ) ) < 0;
}
public boolean evaluateCachedLeft(final VariableContextEntry context,
final Object right) {
- final BigDecimal comp = (BigDecimal) ((ObjectVariableContextEntry) context).left;
- return comp.compareTo( context.extractor.getValue( right ) ) < 0;
+ final BigDecimal comp = (BigDecimal) context.extractor.getValue( right );
+ return comp.compareTo( ((ObjectVariableContextEntry) context).left ) < 0;
}
public String toString() {
@@ -238,23 +209,16 @@
return comp.compareTo( object2.getValue() ) <= 0;
}
- public boolean evaluate(final FieldValue object1,
- final Extractor extractor,
- final Object object2) {
- final BigDecimal comp = (BigDecimal) object1.getValue();
- return comp.compareTo( extractor.getValue( object2 ) ) <= 0;
- }
-
public boolean evaluateCachedRight(final VariableContextEntry context,
final Object left) {
- final BigDecimal comp = (BigDecimal) context.declaration.getExtractor().getValue( left );
- return comp.compareTo( ((ObjectVariableContextEntry) context).right ) <= 0;
+ final BigDecimal comp = (BigDecimal) ((ObjectVariableContextEntry) context).right;
+ return comp.compareTo( context.declaration.getExtractor().getValue( left ) ) <= 0;
}
public boolean evaluateCachedLeft(final VariableContextEntry context,
final Object right) {
- final BigDecimal comp = (BigDecimal) ((ObjectVariableContextEntry) context).left;
- return comp.compareTo( context.extractor.getValue( right ) ) <= 0;
+ final BigDecimal comp = (BigDecimal) context.extractor.getValue( right );
+ return comp.compareTo( ((ObjectVariableContextEntry) context).left ) <= 0;
}
public String toString() {
@@ -277,27 +241,20 @@
public boolean evaluate(final Extractor extractor,
final Object object1,
final FieldValue object2) {
- final BigDecimal comp = (BigDecimal) extractor.getValue( object1 );
- return comp.compareTo( object2.getValue() ) > 0;
+ final BigDecimal comp = (BigDecimal) object2.getValue();
+ return comp.compareTo( extractor.getValue( object1 ) ) > 0;
}
- public boolean evaluate(final FieldValue object1,
- final Extractor extractor,
- final Object object2) {
- final BigDecimal comp = (BigDecimal) object1.getValue();
- return comp.compareTo( extractor.getValue( object2 ) ) > 0;
- }
-
public boolean evaluateCachedRight(final VariableContextEntry context,
final Object left) {
- final BigDecimal comp = (BigDecimal) context.declaration.getExtractor().getValue( left );
- return comp.compareTo( ((ObjectVariableContextEntry) context).right ) > 0;
+ final BigDecimal comp = (BigDecimal) ((ObjectVariableContextEntry) context).right;
+ return comp.compareTo( context.declaration.getExtractor().getValue( left ) ) > 0;
}
public boolean evaluateCachedLeft(final VariableContextEntry context,
final Object right) {
- final BigDecimal comp = (BigDecimal) ((ObjectVariableContextEntry) context).left;
- return comp.compareTo( context.extractor.getValue( right ) ) > 0;
+ final BigDecimal comp = (BigDecimal) context.extractor.getValue( right );
+ return comp.compareTo( ((ObjectVariableContextEntry) context).left ) > 0;
}
public String toString() {
@@ -324,23 +281,16 @@
return comp.compareTo( object2.getValue() ) >= 0;
}
- public boolean evaluate(final FieldValue object1,
- final Extractor extractor,
- final Object object2) {
- final BigDecimal comp = (BigDecimal) object1.getValue();
- return comp.compareTo( extractor.getValue( object2 ) ) >= 0;
- }
-
public boolean evaluateCachedRight(final VariableContextEntry context,
final Object left) {
- final BigDecimal comp = (BigDecimal) context.declaration.getExtractor().getValue( left );
- return comp.compareTo( ((ObjectVariableContextEntry) context).right ) >= 0;
+ final BigDecimal comp = (BigDecimal) ((ObjectVariableContextEntry) context).right;
+ return comp.compareTo( context.declaration.getExtractor().getValue( left ) ) >= 0;
}
public boolean evaluateCachedLeft(final VariableContextEntry context,
final Object right) {
- final BigDecimal comp = (BigDecimal) ((ObjectVariableContextEntry) context).left;
- return comp.compareTo( context.extractor.getValue( right ) ) >= 0;
+ final BigDecimal comp = (BigDecimal) context.extractor.getValue( right );
+ return comp.compareTo( ((ObjectVariableContextEntry) context).left ) >= 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 19:46:36 UTC (rev 7036)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/evaluators/BigIntegerFactory.java 2006-10-23 20:31:07 UTC (rev 7037)
@@ -85,17 +85,6 @@
return value1.equals( value2 );
}
- public boolean evaluate(final FieldValue object1,
- final Extractor extractor,
- final Object object2) {
- final Object value1 = object1.getValue();
- final Object value2 = extractor.getValue( object2 );
- if ( value1 == null ) {
- return value2 == null;
- }
- return value1.equals( value2 );
- }
-
public boolean evaluateCachedRight(final VariableContextEntry context,
final Object left) {
final Object value = context.declaration.getExtractor().getValue( left );
@@ -142,17 +131,6 @@
return !value1.equals( value2 );
}
- public boolean evaluate(final FieldValue object1,
- final Extractor extractor,
- final Object object2) {
- final Object value1 = object1.getValue();
- final Object value2 = extractor.getValue( object2 );
- if ( value1 == null ) {
- return value2 != null;
- }
- return !value1.equals( value2 );
- }
-
public boolean evaluateCachedRight(final VariableContextEntry context,
final Object left) {
final Object value = context.declaration.getExtractor().getValue( left );
@@ -195,23 +173,16 @@
return comp.compareTo( object2.getValue() ) < 0;
}
- public boolean evaluate(final FieldValue object1,
- final Extractor extractor,
- final Object object2) {
- final BigInteger comp = (BigInteger) object1.getValue();
- return comp.compareTo( extractor.getValue( object2 ) ) < 0;
- }
-
public boolean evaluateCachedRight(final VariableContextEntry context,
final Object left) {
- final BigInteger comp = (BigInteger) context.declaration.getExtractor().getValue( left );
- return comp.compareTo( ((ObjectVariableContextEntry) context).right ) < 0;
+ final BigInteger comp = (BigInteger) ((ObjectVariableContextEntry) context).right;
+ return comp.compareTo( context.declaration.getExtractor().getValue( left ) ) < 0;
}
public boolean evaluateCachedLeft(final VariableContextEntry context,
final Object right) {
- final BigInteger comp = (BigInteger) ((ObjectVariableContextEntry) context).left;
- return comp.compareTo( context.extractor.getValue( right ) ) < 0;
+ final BigInteger comp = (BigInteger) context.extractor.getValue( right );
+ return comp.compareTo( ((ObjectVariableContextEntry) context).left ) < 0;
}
public String toString() {
@@ -238,23 +209,16 @@
return comp.compareTo( object2.getValue() ) <= 0;
}
- public boolean evaluate(final FieldValue object1,
- final Extractor extractor,
- final Object object2) {
- final BigInteger comp = (BigInteger) object1.getValue();
- return comp.compareTo( extractor.getValue( object2 ) ) <= 0;
- }
-
public boolean evaluateCachedRight(final VariableContextEntry context,
final Object left) {
- final BigInteger comp = (BigInteger) context.declaration.getExtractor().getValue( left );
- return comp.compareTo( ((ObjectVariableContextEntry) context).right ) <= 0;
+ final BigInteger comp = (BigInteger) ((ObjectVariableContextEntry) context).right;
+ return comp.compareTo( context.declaration.getExtractor().getValue( left ) ) <= 0;
}
public boolean evaluateCachedLeft(final VariableContextEntry context,
final Object right) {
- final BigInteger comp = (BigInteger) ((ObjectVariableContextEntry) context).left;
- return comp.compareTo( context.extractor.getValue( right ) ) <= 0;
+ final BigInteger comp = (BigInteger) context.extractor.getValue( right );
+ return comp.compareTo( ((ObjectVariableContextEntry) context).left ) <= 0;
}
public String toString() {
@@ -281,23 +245,16 @@
return comp.compareTo( object2.getValue() ) > 0;
}
- public boolean evaluate(final FieldValue object1,
- final Extractor extractor,
- final Object object2) {
- final BigInteger comp = (BigInteger) object1.getValue();
- return comp.compareTo( extractor.getValue( object2 ) ) > 0;
- }
-
public boolean evaluateCachedRight(final VariableContextEntry context,
final Object left) {
- final BigInteger comp = (BigInteger) context.declaration.getExtractor().getValue( left );
- return comp.compareTo( ((ObjectVariableContextEntry) context).right ) > 0;
+ final BigInteger comp = (BigInteger) ((ObjectVariableContextEntry) context).right;
+ return comp.compareTo( context.declaration.getExtractor().getValue( left ) ) > 0;
}
public boolean evaluateCachedLeft(final VariableContextEntry context,
final Object right) {
- final BigInteger comp = (BigInteger) ((ObjectVariableContextEntry) context).left;
- return comp.compareTo( context.extractor.getValue( right ) ) > 0;
+ final BigInteger comp = (BigInteger) context.extractor.getValue( right );
+ return comp.compareTo( ((ObjectVariableContextEntry) context).left ) > 0;
}
public String toString() {
@@ -324,23 +281,16 @@
return comp.compareTo( object2.getValue() ) >= 0;
}
- public boolean evaluate(final FieldValue object1,
- final Extractor extractor,
- final Object object2) {
- final BigInteger comp = (BigInteger) object1.getValue();
- return comp.compareTo( extractor.getValue( object2 ) ) >= 0;
- }
-
public boolean evaluateCachedRight(final VariableContextEntry context,
final Object left) {
- final BigInteger comp = (BigInteger) context.declaration.getExtractor().getValue( left );
- return comp.compareTo( ((ObjectVariableContextEntry) context).right ) >= 0;
+ final BigInteger comp = (BigInteger) ((ObjectVariableContextEntry) context).right;
+ return comp.compareTo( context.declaration.getExtractor().getValue( left ) ) >= 0;
}
public boolean evaluateCachedLeft(final VariableContextEntry context,
final Object right) {
- final BigInteger comp = (BigInteger) ((ObjectVariableContextEntry) context).left;
- return comp.compareTo( context.extractor.getValue( right ) ) >= 0;
+ final BigInteger comp = (BigInteger) context.extractor.getValue( right );
+ return comp.compareTo( ((ObjectVariableContextEntry) context).left ) >= 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 19:46:36 UTC (rev 7036)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/evaluators/BooleanFactory.java 2006-10-23 20:31:07 UTC (rev 7037)
@@ -70,12 +70,6 @@
return extractor.getBooleanValue( object1 ) == object2.getBooleanValue();
}
- public boolean evaluate(final FieldValue object1,
- final Extractor extractor,
- final Object object2) {
- return extractor.getBooleanValue( object2 ) == object1.getBooleanValue();
- }
-
public boolean evaluateCachedRight(final VariableContextEntry context,
final Object left) {
return context.declaration.getExtractor().getBooleanValue( left ) == ((BooleanVariableContextEntry) context).right;
@@ -109,12 +103,6 @@
return extractor.getBooleanValue( object1 ) != object2.getBooleanValue();
}
- public boolean evaluate(final FieldValue object1,
- final Extractor extractor,
- final Object object2) {
- return extractor.getBooleanValue( object2 ) != object1.getBooleanValue();
- }
-
public boolean evaluateCachedRight(final VariableContextEntry context,
final Object left) {
return context.declaration.getExtractor().getBooleanValue( left ) != ((BooleanVariableContextEntry) context).right;
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 19:46:36 UTC (rev 7036)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/evaluators/ByteFactory.java 2006-10-23 20:31:07 UTC (rev 7037)
@@ -78,12 +78,6 @@
return extractor.getByteValue( object1 ) == object2.getByteValue();
}
- public boolean evaluate(final FieldValue object1,
- final Extractor extractor,
- final Object object2) {
- return object1.getByteValue() == extractor.getByteValue( object2 );
- }
-
public boolean evaluateCachedRight(final VariableContextEntry context,
final Object left) {
return context.declaration.getExtractor().getByteValue( left ) == ((LongVariableContextEntry) context).right;
@@ -117,12 +111,6 @@
return extractor.getByteValue( object1 ) != object2.getByteValue();
}
- public boolean evaluate(final FieldValue object1,
- final Extractor extractor,
- final Object object2) {
- return object1.getByteValue() != extractor.getByteValue( object2 );
- }
-
public boolean evaluateCachedRight(final VariableContextEntry context,
final Object left) {
return context.declaration.getExtractor().getByteValue( left ) != ((LongVariableContextEntry) context).right;
@@ -156,12 +144,6 @@
return extractor.getByteValue( object1 ) < object2.getByteValue();
}
- public boolean evaluate(final FieldValue object1,
- final Extractor extractor,
- final Object object2) {
- return object1.getByteValue() < extractor.getByteValue( object2 );
- }
-
public boolean evaluateCachedRight(final VariableContextEntry context,
final Object left) {
return ((LongVariableContextEntry) context).right < context.declaration.getExtractor().getByteValue( left );
@@ -195,12 +177,6 @@
return extractor.getByteValue( object1 ) <= object2.getByteValue();
}
- public boolean evaluate(final FieldValue object1,
- final Extractor extractor,
- final Object object2) {
- return object1.getByteValue() <= extractor.getByteValue( object2 );
- }
-
public boolean evaluateCachedRight(final VariableContextEntry context,
final Object left) {
return ((LongVariableContextEntry) context).right <= context.declaration.getExtractor().getByteValue( left );
@@ -234,12 +210,6 @@
return extractor.getByteValue( object1 ) > object2.getByteValue();
}
- public boolean evaluate(final FieldValue object1,
- final Extractor extractor,
- final Object object2) {
- return object1.getByteValue() > extractor.getByteValue( object2 );
- }
-
public boolean evaluateCachedRight(final VariableContextEntry context,
final Object left) {
return ((LongVariableContextEntry) context).right > context.declaration.getExtractor().getByteValue( left );
@@ -273,12 +243,6 @@
return extractor.getByteValue( object1 ) >= object2.getByteValue();
}
- public boolean evaluate(final FieldValue object1,
- final Extractor extractor,
- final Object object2) {
- return object1.getByteValue() >= extractor.getByteValue( object2 );
- }
-
public boolean evaluateCachedRight(final VariableContextEntry context,
final Object left) {
return ((LongVariableContextEntry) context).right >= context.declaration.getExtractor().getByteValue( left );
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 19:46:36 UTC (rev 7036)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/evaluators/CharacterFactory.java 2006-10-23 20:31:07 UTC (rev 7037)
@@ -78,12 +78,6 @@
return extractor.getCharValue( object1 ) == object2.getCharValue();
}
- public boolean evaluate(final FieldValue object1,
- final Extractor extractor,
- final Object object2) {
- return object1.getCharValue() == extractor.getCharValue( object2 );
- }
-
public boolean evaluateCachedRight(final VariableContextEntry context,
final Object left) {
return context.declaration.getExtractor().getCharValue( left ) == ((LongVariableContextEntry) context).right;
@@ -117,12 +111,6 @@
return extractor.getCharValue( object1 ) != object2.getCharValue();
}
- public boolean evaluate(final FieldValue object1,
- final Extractor extractor,
- final Object object2) {
- return object1.getCharValue() != extractor.getCharValue( object2 );
- }
-
public boolean evaluateCachedRight(final VariableContextEntry context,
final Object left) {
return context.declaration.getExtractor().getCharValue( left ) != ((LongVariableContextEntry) context).right;
@@ -156,12 +144,6 @@
return extractor.getCharValue( object1 ) < object2.getCharValue();
}
- public boolean evaluate(final FieldValue object1,
- final Extractor extractor,
- final Object object2) {
- return object1.getCharValue() < extractor.getCharValue( object2 );
- }
-
public boolean evaluateCachedRight(final VariableContextEntry context,
final Object left) {
return ((LongVariableContextEntry) context).right < context.declaration.getExtractor().getCharValue( left );
@@ -195,12 +177,6 @@
return extractor.getCharValue( object1 ) <= object2.getCharValue();
}
- public boolean evaluate(final FieldValue object1,
- final Extractor extractor,
- final Object object2) {
- return object1.getCharValue() <= extractor.getCharValue( object2 );
- }
-
public boolean evaluateCachedRight(final VariableContextEntry context,
final Object left) {
return ((LongVariableContextEntry) context).right <= context.declaration.getExtractor().getCharValue( left );
@@ -234,12 +210,6 @@
return extractor.getCharValue( object1 ) > object2.getCharValue();
}
- public boolean evaluate(final FieldValue object1,
- final Extractor extractor,
- final Object object2) {
- return object1.getCharValue() > extractor.getCharValue( object2 );
- }
-
public boolean evaluateCachedRight(final VariableContextEntry context,
final Object left) {
return ((LongVariableContextEntry) context).right > context.declaration.getExtractor().getCharValue( left );
@@ -273,12 +243,6 @@
return extractor.getCharValue( object1 ) >= object2.getCharValue();
}
- public boolean evaluate(final FieldValue object1,
- final Extractor extractor,
- final Object object2) {
- return object1.getCharValue() >= extractor.getCharValue( object2 );
- }
-
public boolean evaluateCachedRight(final VariableContextEntry context,
final Object left) {
return ((LongVariableContextEntry) context).right >= context.declaration.getExtractor().getCharValue( left );
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 19:46:36 UTC (rev 7036)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/evaluators/DateFactory.java 2006-10-23 20:31:07 UTC (rev 7037)
@@ -105,20 +105,6 @@
return value1.compareTo( getRightDate( value2 ) ) == 0;
}
- public boolean evaluate(final FieldValue object1,
- final Extractor extractor,
- final Object object2) {
- final Date value1 = (Date) object1.getValue();
- final Object value2 = extractor.getValue( object2 );
- if ( value1 == null ) {
- return value2 == null;
- }
- if ( value2 == null ) {
- return false;
- }
- return value1.compareTo( getRightDate( value2 ) ) == 0;
- }
-
public boolean evaluateCachedRight(final VariableContextEntry context,
final Object left) {
final Date value1 = (Date) context.declaration.getExtractor().getValue( left );
@@ -176,20 +162,6 @@
return value1.compareTo( getRightDate( value2 ) ) != 0;
}
- public boolean evaluate(final FieldValue object1,
- final Extractor extractor,
- final Object object2) {
- final Date value1 = (Date) object1.getValue();
- final Object value2 = extractor.getValue( object2 );
- if ( value1 == null ) {
- return value2 != null;
- }
- if ( value2 == null ) {
- return true;
- }
- return value1.compareTo( getRightDate( value2 ) ) != 0;
- }
-
public boolean evaluateCachedRight(final VariableContextEntry context,
final Object left) {
final Date value1 = (Date) context.declaration.getExtractor().getValue( left );
@@ -241,14 +213,6 @@
return value1.compareTo( getRightDate( value2 ) ) < 0;
}
- public boolean evaluate(final FieldValue object1,
- final Extractor extractor,
- final Object object2) {
- final Date value1 = (Date) object1.getValue();
- final Object value2 = extractor.getValue( object2 );
- return value1.compareTo( getRightDate( value2 ) ) < 0;
- }
-
public boolean evaluateCachedRight(final VariableContextEntry context,
final Object left) {
final Date value1 = (Date) context.declaration.getExtractor().getValue( left );
@@ -288,14 +252,6 @@
return value1.compareTo( getRightDate( value2 ) ) <= 0;
}
- public boolean evaluate(final FieldValue object1,
- final Extractor extractor,
- final Object object2) {
- final Date value1 = (Date) object1.getValue();
- final Object value2 = extractor.getValue( object2 );
- return value1.compareTo( getRightDate( value2 ) ) <= 0;
- }
-
public boolean evaluateCachedRight(final VariableContextEntry context,
final Object left) {
final Date value1 = (Date) context.declaration.getExtractor().getValue( left );
@@ -335,14 +291,6 @@
return value1.compareTo( getRightDate( value2 ) ) > 0;
}
- public boolean evaluate(final FieldValue object1,
- final Extractor extractor,
- final Object object2) {
- final Date value1 = (Date) object1.getValue();
- final Object value2 = extractor.getValue( object2 );
- return value1.compareTo( getRightDate( value2 ) ) > 0;
- }
-
public boolean evaluateCachedRight(final VariableContextEntry context,
final Object left) {
final Date value1 = (Date) context.declaration.getExtractor().getValue( left );
@@ -382,14 +330,6 @@
return value1.compareTo( getRightDate( value2 ) ) >= 0;
}
- public boolean evaluate(final FieldValue object1,
- final Extractor extractor,
- final Object object2) {
- final Date value1 = (Date) object1.getValue();
- final Object value2 = extractor.getValue( object2 );
- return value1.compareTo( getRightDate( value2 ) ) >= 0;
- }
-
public boolean evaluateCachedRight(final VariableContextEntry context,
final Object left) {
final Date value1 = (Date) context.declaration.getExtractor().getValue( left );
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 19:46:36 UTC (rev 7036)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/evaluators/DoubleFactory.java 2006-10-23 20:31:07 UTC (rev 7037)
@@ -79,13 +79,6 @@
return extractor.getDoubleValue( object1 ) == object2.getDoubleValue();
}
- public boolean evaluate(final FieldValue object1,
- final Extractor extractor,
- final Object object2) {
- // TODO: we are not handling delta right now... maybe we should
- return object1.getDoubleValue() == extractor.getDoubleValue( object2 );
- }
-
public boolean evaluateCachedRight(final VariableContextEntry context,
final Object left) {
// TODO: we are not handling delta right now... maybe we should
@@ -122,13 +115,6 @@
return extractor.getDoubleValue( object1 ) != object2.getDoubleValue();
}
- public boolean evaluate(final FieldValue object1,
- final Extractor extractor,
- final Object object2) {
- // TODO: we are not handling delta right now... maybe we should
- return object1.getDoubleValue() != extractor.getDoubleValue( object2 );
- }
-
public boolean evaluateCachedRight(final VariableContextEntry context,
final Object left) {
// TODO: we are not handling delta right now... maybe we should
@@ -165,13 +151,6 @@
return extractor.getDoubleValue( object1 ) < object2.getDoubleValue();
}
- public boolean evaluate(final FieldValue object1,
- final Extractor extractor,
- final Object object2) {
- // TODO: we are not handling delta right now... maybe we should
- return object1.getDoubleValue() < extractor.getDoubleValue( object2 );
- }
-
public boolean evaluateCachedRight(final VariableContextEntry context,
final Object left) {
// TODO: we are not handling delta right now... maybe we should
@@ -208,13 +187,6 @@
return extractor.getDoubleValue( object1 ) <= object2.getDoubleValue();
}
- public boolean evaluate(final FieldValue object1,
- final Extractor extractor,
- final Object object2) {
- // TODO: we are not handling delta right now... maybe we should
- return object1.getDoubleValue() <= extractor.getDoubleValue( object2 );
- }
-
public boolean evaluateCachedRight(final VariableContextEntry context,
final Object left) {
// TODO: we are not handling delta right now... maybe we should
@@ -251,13 +223,6 @@
return extractor.getDoubleValue( object1 ) > object2.getDoubleValue();
}
- public boolean evaluate(final FieldValue object1,
- final Extractor extractor,
- final Object object2) {
- // TODO: we are not handling delta right now... maybe we should
- return object1.getDoubleValue() > extractor.getDoubleValue( object2 );
- }
-
public boolean evaluateCachedRight(final VariableContextEntry context,
final Object left) {
// TODO: we are not handling delta right now... maybe we should
@@ -294,13 +259,6 @@
return extractor.getDoubleValue( object1 ) >= object2.getDoubleValue();
}
- public boolean evaluate(final FieldValue object1,
- final Extractor extractor,
- final Object object2) {
- // TODO: we are not handling delta right now... maybe we should
- return object1.getDoubleValue() >= extractor.getDoubleValue( object2 );
- }
-
public boolean evaluateCachedRight(final VariableContextEntry context,
final Object left) {
// TODO: we are not handling delta right now... maybe we should
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 19:46:36 UTC (rev 7036)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/evaluators/FloatFactory.java 2006-10-23 20:31:07 UTC (rev 7037)
@@ -77,13 +77,6 @@
return extractor.getFloatValue( object1 ) == object2.getFloatValue();
}
- public boolean evaluate(final FieldValue object1,
- final Extractor extractor,
- final Object object2) {
- // TODO: we are not handling delta right now... maybe we should
- return object1.getFloatValue() == extractor.getFloatValue( object2 );
- }
-
public boolean evaluateCachedRight(final VariableContextEntry context,
final Object left) {
// TODO: we are not handling delta right now... maybe we should
@@ -120,13 +113,6 @@
return extractor.getFloatValue( object1 ) != object2.getFloatValue();
}
- public boolean evaluate(final FieldValue object1,
- final Extractor extractor,
- final Object object2) {
- // TODO: we are not handling delta right now... maybe we should
- return object1.getFloatValue() != extractor.getFloatValue( object2 );
- }
-
public boolean evaluateCachedRight(final VariableContextEntry context,
final Object left) {
// TODO: we are not handling delta right now... maybe we should
@@ -163,13 +149,6 @@
return extractor.getFloatValue( object1 ) < object2.getFloatValue();
}
- public boolean evaluate(final FieldValue object1,
- final Extractor extractor,
- final Object object2) {
- // TODO: we are not handling delta right now... maybe we should
- return object1.getFloatValue() < extractor.getFloatValue( object2 );
- }
-
public boolean evaluateCachedRight(final VariableContextEntry context,
final Object left) {
// TODO: we are not handling delta right now... maybe we should
@@ -206,13 +185,6 @@
return extractor.getFloatValue( object1 ) <= object2.getFloatValue();
}
- public boolean evaluate(final FieldValue object1,
- final Extractor extractor,
- final Object object2) {
- // TODO: we are not handling delta right now... maybe we should
- return object1.getFloatValue() <= extractor.getFloatValue( object2 );
- }
-
public boolean evaluateCachedRight(final VariableContextEntry context,
final Object left) {
// TODO: we are not handling delta right now... maybe we should
@@ -249,13 +221,6 @@
return extractor.getFloatValue( object1 ) > object2.getFloatValue();
}
- public boolean evaluate(final FieldValue object1,
- final Extractor extractor,
- final Object object2) {
- // TODO: we are not handling delta right now... maybe we should
- return object1.getFloatValue() > extractor.getFloatValue( object2 );
- }
-
public boolean evaluateCachedRight(final VariableContextEntry context,
final Object left) {
// TODO: we are not handling delta right now... maybe we should
@@ -292,13 +257,6 @@
return extractor.getFloatValue( object1 ) >= object2.getFloatValue();
}
- public boolean evaluate(final FieldValue object1,
- final Extractor extractor,
- final Object object2) {
- // TODO: we are not handling delta right now... maybe we should
- return object1.getFloatValue() >= extractor.getFloatValue( object2 );
- }
-
public boolean evaluateCachedRight(final VariableContextEntry context,
final Object left) {
// TODO: we are not handling delta right now... maybe we should
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 19:46:36 UTC (rev 7036)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/evaluators/IntegerFactory.java 2006-10-23 20:31:07 UTC (rev 7037)
@@ -78,12 +78,6 @@
return extractor.getIntValue( object1 ) == object2.getIntValue();
}
- public boolean evaluate(final FieldValue object1,
- final Extractor extractor,
- final Object object2) {
- return extractor.getIntValue( object2 ) == object1.getIntValue();
- }
-
public boolean evaluateCachedRight(final VariableContextEntry context,
final Object left) {
return context.declaration.getExtractor().getIntValue( left ) == ((LongVariableContextEntry) context).right;
@@ -118,12 +112,6 @@
return extractor.getIntValue( object1 ) != object2.getIntValue();
}
- public boolean evaluate(final FieldValue object1,
- final Extractor extractor,
- final Object object2) {
- return extractor.getIntValue( object2 ) != object1.getIntValue();
- }
-
public boolean evaluateCachedRight(final VariableContextEntry context,
final Object left) {
return context.declaration.getExtractor().getIntValue( left ) != ((LongVariableContextEntry) context).right;
@@ -157,12 +145,6 @@
return extractor.getIntValue( object1 ) < object2.getIntValue();
}
- public boolean evaluate(final FieldValue object1,
- final Extractor extractor,
- final Object object2) {
- return object1.getIntValue() < extractor.getIntValue( object2 );
- }
-
public boolean evaluateCachedRight(final VariableContextEntry context,
final Object left) {
return ((LongVariableContextEntry) context).right < context.declaration.getExtractor().getIntValue( left );
@@ -196,12 +178,6 @@
return extractor.getIntValue( object1 ) <= object2.getIntValue();
}
- public boolean evaluate(final FieldValue object1,
- final Extractor extractor,
- final Object object2) {
- return object1.getIntValue() <= extractor.getIntValue( object2 );
- }
-
public boolean evaluateCachedRight(final VariableContextEntry context,
final Object left) {
return ((LongVariableContextEntry) context).right <= context.declaration.getExtractor().getIntValue( left );
@@ -235,12 +211,6 @@
return extractor.getIntValue( object1 ) > object2.getIntValue();
}
- public boolean evaluate(final FieldValue object1,
- final Extractor extractor,
- final Object object2) {
- return object1.getIntValue() > extractor.getIntValue( object2 );
- }
-
public boolean evaluateCachedRight(final VariableContextEntry context,
final Object left) {
return ((LongVariableContextEntry) context).right > context.declaration.getExtractor().getIntValue( left );
@@ -274,12 +244,6 @@
return extractor.getIntValue( object1 ) >= object2.getIntValue();
}
- public boolean evaluate(final FieldValue object1,
- final Extractor extractor,
- final Object object2) {
- return object1.getIntValue() >= extractor.getIntValue( object2 );
- }
-
public boolean evaluateCachedRight(final VariableContextEntry context,
final Object left) {
return ((LongVariableContextEntry) context).right >= context.declaration.getExtractor().getIntValue( left );
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 19:46:36 UTC (rev 7036)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/evaluators/LongFactory.java 2006-10-23 20:31:07 UTC (rev 7037)
@@ -78,12 +78,6 @@
return extractor.getLongValue( object1 ) == object2.getLongValue();
}
- public boolean evaluate(final FieldValue object1,
- final Extractor extractor,
- final Object object2) {
- return object1.getLongValue() == extractor.getLongValue( object2 );
- }
-
public boolean evaluateCachedRight(final VariableContextEntry context,
final Object left) {
return context.declaration.getExtractor().getLongValue( left ) == ((LongVariableContextEntry) context).right;
@@ -117,12 +111,6 @@
return extractor.getLongValue( object1 ) != object2.getLongValue();
}
- public boolean evaluate(final FieldValue object1,
- final Extractor extractor,
- final Object object2) {
- return object1.getLongValue() != extractor.getLongValue( object2 );
- }
-
public boolean evaluateCachedRight(final VariableContextEntry context,
final Object left) {
return context.declaration.getExtractor().getLongValue( left ) != ((LongVariableContextEntry) context).right;
@@ -156,12 +144,6 @@
return extractor.getLongValue( object1 ) < object2.getLongValue();
}
- public boolean evaluate(final FieldValue object1,
- final Extractor extractor,
- final Object object2) {
- return object1.getLongValue() < extractor.getLongValue( object2 );
- }
-
public boolean evaluateCachedRight(final VariableContextEntry context,
final Object left) {
return ((LongVariableContextEntry) context).right < context.declaration.getExtractor().getLongValue( left );
@@ -195,12 +177,6 @@
return extractor.getLongValue( object1 ) <= object2.getLongValue();
}
- public boolean evaluate(final FieldValue object1,
- final Extractor extractor,
- final Object object2) {
- return object1.getLongValue() <= extractor.getLongValue( object2 );
- }
-
public boolean evaluateCachedRight(final VariableContextEntry context,
final Object left) {
return ((LongVariableContextEntry) context).right <= context.declaration.getExtractor().getLongValue( left );
@@ -234,12 +210,6 @@
return extractor.getLongValue( object1 ) > object2.getLongValue();
}
- public boolean evaluate(final FieldValue object1,
- final Extractor extractor,
- final Object object2) {
- return object1.getLongValue() > extractor.getLongValue( object2 );
- }
-
public boolean evaluateCachedRight(final VariableContextEntry context,
final Object left) {
return ((LongVariableContextEntry) context).right > context.declaration.getExtractor().getLongValue( left );
@@ -273,12 +243,6 @@
return extractor.getLongValue( object1 ) >= object2.getLongValue();
}
- public boolean evaluate(final FieldValue object1,
- final Extractor extractor,
- final Object object2) {
- return object1.getLongValue() >= extractor.getLongValue( object2 );
- }
-
public boolean evaluateCachedRight(final VariableContextEntry context,
final Object left) {
return ((LongVariableContextEntry) context).right >= context.declaration.getExtractor().getLongValue( left );
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 19:46:36 UTC (rev 7036)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/evaluators/ObjectFactory.java 2006-10-23 20:31:07 UTC (rev 7037)
@@ -100,17 +100,6 @@
return value1.equals( value2 );
}
- public boolean evaluate(final FieldValue object1,
- final Extractor extractor,
- final Object object2) {
- final Object value1 = object1.getValue();
- final Object value2 = extractor.getValue( object2 );
- if ( value1 == null ) {
- return value2 == null;
- }
- return value1.equals( value2 );
- }
-
public boolean evaluateCachedRight(final VariableContextEntry context,
final Object left) {
final Object value = context.declaration.getExtractor().getValue( left );
@@ -158,17 +147,6 @@
return !value1.equals( value2 );
}
- public boolean evaluate(final FieldValue object1,
- final Extractor extractor,
- final Object object2) {
- final Object value1 = object1.getValue();
- final Object value2 = extractor.getValue( object2 );
- if ( value1 == null ) {
- return value2 != null;
- }
- return !value1.equals( value2 );
- }
-
public boolean evaluateCachedRight(final VariableContextEntry context,
final Object left) {
final Object value = context.declaration.getExtractor().getValue( left );
@@ -208,23 +186,16 @@
return comp.compareTo( object2.getValue() ) < 0;
}
- public boolean evaluate(final FieldValue object1,
- final Extractor extractor,
- final Object object2) {
- final Comparable comp = (Comparable) object1.getValue();
- return comp.compareTo( extractor.getValue( object2 ) ) < 0;
- }
-
public boolean evaluateCachedRight(final VariableContextEntry context,
final Object left) {
- final Comparable comp = (Comparable) context.declaration.getExtractor().getValue( left );
- return comp.compareTo( ((ObjectVariableContextEntry) context).right ) < 0;
+ final Comparable comp = (Comparable) ((ObjectVariableContextEntry) context).right;
+ return comp.compareTo( context.declaration.getExtractor().getValue( left ) ) < 0;
}
public boolean evaluateCachedLeft(final VariableContextEntry context,
final Object right) {
- final Comparable comp = (Comparable) ((ObjectVariableContextEntry) context).left;
- return comp.compareTo( context.extractor.getValue( right ) ) < 0;
+ final Comparable comp = (Comparable) context.extractor.getValue( right );
+ return comp.compareTo( ((ObjectVariableContextEntry) context).left ) < 0;
}
public String toString() {
@@ -251,23 +222,16 @@
return comp.compareTo( object2.getValue() ) <= 0;
}
- public boolean evaluate(final FieldValue object1,
- final Extractor extractor,
- final Object object2) {
- final Comparable comp = (Comparable) object1.getValue();
- return comp.compareTo( extractor.getValue( object2 ) ) <= 0;
- }
-
public boolean evaluateCachedRight(final VariableContextEntry context,
final Object left) {
- final Comparable comp = (Comparable) context.declaration.getExtractor().getValue( left );
- return comp.compareTo( ((ObjectVariableContextEntry) context).right ) <= 0;
+ final Comparable comp = (Comparable) ((ObjectVariableContextEntry) context).right;
+ return comp.compareTo( context.declaration.getExtractor().getValue( left ) ) <= 0;
}
public boolean evaluateCachedLeft(final VariableContextEntry context,
final Object right) {
- final Comparable comp = (Comparable) ((ObjectVariableContextEntry) context).left;
- return comp.compareTo( context.extractor.getValue( right ) ) <= 0;
+ final Comparable comp = (Comparable) context.extractor.getValue( right );
+ return comp.compareTo( ((ObjectVariableContextEntry) context).left ) <= 0;
}
public String toString() {
@@ -291,26 +255,19 @@
final Object object1,
final FieldValue object2) {
final Comparable comp = (Comparable) extractor.getValue( object1 );
- return comp.compareTo( object2.getValue() ) >= 0;
+ return comp.compareTo( object2.getValue() ) > 0;
}
- public boolean evaluate(final FieldValue object1,
- final Extractor extractor,
- final Object object2) {
- final Comparable comp = (Comparable) object1.getValue();
- return comp.compareTo( extractor.getValue( object2 ) ) >= 0;
- }
-
public boolean evaluateCachedRight(final VariableContextEntry context,
final Object left) {
- final Comparable comp = (Comparable) context.declaration.getExtractor().getValue( left );
- return comp.compareTo( ((ObjectVariableContextEntry) context).right ) >= 0;
+ final Comparable comp = (Comparable) ((ObjectVariableContextEntry) context).right;
+ return comp.compareTo( context.declaration.getExtractor().getValue( left ) ) > 0;
}
public boolean evaluateCachedLeft(final VariableContextEntry context,
final Object right) {
- final Comparable comp = (Comparable) ((ObjectVariableContextEntry) context).left;
- return comp.compareTo( context.extractor.getValue( right ) ) >= 0;
+ final Comparable comp = (Comparable) context.extractor.getValue( right );
+ return comp.compareTo( ((ObjectVariableContextEntry) context).left ) > 0;
}
public String toString() {
@@ -337,23 +294,16 @@
return comp.compareTo( object2.getValue() ) >= 0;
}
- public boolean evaluate(final FieldValue object1,
- final Extractor extractor,
- final Object object2) {
- final Comparable comp = (Comparable) object1.getValue();
- return comp.compareTo( extractor.getValue( object2 ) ) >= 0;
- }
-
public boolean evaluateCachedRight(final VariableContextEntry context,
final Object left) {
- final Comparable comp = (Comparable) context.declaration.getExtractor().getValue( left );
- return comp.compareTo( ((ObjectVariableContextEntry) context).right ) >= 0;
+ final Comparable comp = (Comparable) ((ObjectVariableContextEntry) context).right;
+ return comp.compareTo( context.declaration.getExtractor().getValue( left ) ) >= 0;
}
public boolean evaluateCachedLeft(final VariableContextEntry context,
final Object right) {
- final Comparable comp = (Comparable) ((ObjectVariableContextEntry) context).left;
- return comp.compareTo( context.extractor.getValue( right ) ) >= 0;
+ final Comparable comp = (Comparable) context.extractor.getValue( right );
+ return comp.compareTo( ((ObjectVariableContextEntry) context).left ) >= 0;
}
public String toString() {
@@ -381,25 +331,17 @@
return col.contains( value );
}
- public boolean evaluate(final FieldValue object1,
- final Extractor extractor,
- final Object object2) {
- final Object value = extractor.getValue( object2 );
- final Collection col = (Collection) object1.getValue();
- return col.contains( value );
- }
-
public boolean evaluateCachedRight(final VariableContextEntry context,
final Object left) {
- final Object value = ((ObjectVariableContextEntry) context).right;
- final Collection col = (Collection) context.declaration.getExtractor().getValue( left );
+ final Object value = context.declaration.getExtractor().getValue( left );
+ final Collection col = (Collection) ((ObjectVariableContextEntry) context).right;
return col.contains( value );
}
public boolean evaluateCachedLeft(final VariableContextEntry context,
final Object right) {
- final Object value = context.extractor.getValue( right );
- final Collection col = (Collection) ((ObjectVariableContextEntry) context).left;
+ final Object value = ((ObjectVariableContextEntry) context).left;
+ final Collection col = (Collection) context.extractor.getValue( right );
return col.contains( value );
}
@@ -428,25 +370,17 @@
return !col.contains( value );
}
- public boolean evaluate(final FieldValue object1,
- final Extractor extractor,
- final Object object2) {
- final Object value = extractor.getValue( object2 );
- final Collection col = (Collection) object1.getValue();
- return !col.contains( value );
- }
-
public boolean evaluateCachedRight(final VariableContextEntry context,
final Object left) {
- final Object value = ((ObjectVariableContextEntry) context).right;
- final Collection col = (Collection) context.declaration.getExtractor().getValue( left );
+ final Object value = context.declaration.getExtractor().getValue( left );
+ final Collection col = (Collection) ((ObjectVariableContextEntry) context).right;
return !col.contains( value );
}
public boolean evaluateCachedLeft(final VariableContextEntry context,
final Object right) {
- final Object value = context.extractor.getValue( right );
- final Collection col = (Collection) ((ObjectVariableContextEntry) context).left;
+ final Object value = ((ObjectVariableContextEntry) context).left;
+ final Collection col = (Collection) context.extractor.getValue( right );
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 19:46:36 UTC (rev 7036)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/evaluators/ShortFactory.java 2006-10-23 20:31:07 UTC (rev 7037)
@@ -78,12 +78,6 @@
return extractor.getShortValue( object1 ) == object2.getShortValue();
}
- public boolean evaluate(final FieldValue object1,
- final Extractor extractor,
- final Object object2) {
- return object1.getShortValue() == extractor.getShortValue( object2 );
- }
-
public boolean evaluateCachedRight(final VariableContextEntry context,
final Object left) {
return context.declaration.getExtractor().getShortValue( left ) == ((LongVariableContextEntry) context).right;
@@ -117,12 +111,6 @@
return extractor.getShortValue( object1 ) != object2.getShortValue();
}
- public boolean evaluate(final FieldValue object1,
- final Extractor extractor,
- final Object object2) {
- return object1.getShortValue() != extractor.getShortValue( object2 );
- }
-
public boolean evaluateCachedRight(final VariableContextEntry context,
final Object left) {
return context.declaration.getExtractor().getShortValue( left ) != ((LongVariableContextEntry) context).right;
@@ -156,12 +144,6 @@
return extractor.getShortValue( object1 ) < object2.getShortValue();
}
- public boolean evaluate(final FieldValue object1,
- final Extractor extractor,
- final Object object2) {
- return object1.getShortValue() < extractor.getShortValue( object2 );
- }
-
public boolean evaluateCachedRight(final VariableContextEntry context,
final Object left) {
return ((LongVariableContextEntry) context).right < context.declaration.getExtractor().getShortValue( left );
@@ -195,12 +177,6 @@
return extractor.getShortValue( object1 ) <= object2.getShortValue();
}
- public boolean evaluate(final FieldValue object1,
- final Extractor extractor,
- final Object object2) {
- return object1.getShortValue() <= extractor.getShortValue( object2 );
- }
-
public boolean evaluateCachedRight(final VariableContextEntry context,
final Object left) {
return ((LongVariableContextEntry) context).right <= context.declaration.getExtractor().getShortValue( left );
@@ -234,12 +210,6 @@
return extractor.getShortValue( object1 ) > object2.getShortValue();
}
- public boolean evaluate(final FieldValue object1,
- final Extractor extractor,
- final Object object2) {
- return object1.getShortValue() > extractor.getShortValue( object2 );
- }
-
public boolean evaluateCachedRight(final VariableContextEntry context,
final Object left) {
return ((LongVariableContextEntry) context).right > context.declaration.getExtractor().getShortValue( left );
@@ -273,12 +243,6 @@
return extractor.getShortValue( object1 ) >= object2.getShortValue();
}
- public boolean evaluate(final FieldValue object1,
- final Extractor extractor,
- final Object object2) {
- return object1.getShortValue() >= extractor.getShortValue( object2 );
- }
-
public boolean evaluateCachedRight(final VariableContextEntry context,
final Object left) {
return ((LongVariableContextEntry) context).right >= context.declaration.getExtractor().getShortValue( left );
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 19:46:36 UTC (rev 7036)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/evaluators/StringFactory.java 2006-10-23 20:31:07 UTC (rev 7037)
@@ -84,17 +84,6 @@
return value1.equals( value2 );
}
- public boolean evaluate(final FieldValue object1,
- final Extractor extractor,
- final Object object2) {
- final Object value1 = object1.getValue();
- final Object value2 = extractor.getValue( object2 );
- if ( value1 == null ) {
- return value2 == null;
- }
- return value1.equals( value2 );
- }
-
public boolean evaluateCachedRight(final VariableContextEntry context,
final Object left) {
final Object value = context.declaration.getExtractor().getValue( left );
@@ -141,17 +130,6 @@
return !value1.equals( value2 );
}
- public boolean evaluate(final FieldValue object1,
- final Extractor extractor,
- final Object object2) {
- final Object value1 = object1.getValue();
- final Object value2 = extractor.getValue( object2 );
- if ( value1 == null ) {
- return value2 != null;
- }
- return !value1.equals( value2 );
- }
-
public boolean evaluateCachedRight(final VariableContextEntry context,
final Object left) {
final Object value = context.declaration.getExtractor().getValue( left );
@@ -198,33 +176,22 @@
return value1.matches( value2 );
}
- public boolean evaluate(final FieldValue object1,
- final Extractor extractor,
- final Object object2) {
- final String value1 = (String) object1.getValue();
- final String value2 = (String) extractor.getValue( object2 );
- if ( value1 == null ) {
- return false;
- }
- return value1.matches( value2 );
- }
-
public boolean evaluateCachedRight(final VariableContextEntry context,
final Object left) {
- final String value = (String) context.declaration.getExtractor().getValue( left );
+ final String value = (String) ((ObjectVariableContextEntry) context).right;
if ( value == null ) {
return false;
}
- return value.matches( (String) ((ObjectVariableContextEntry) context).right );
+ return value.matches( (String) context.declaration.getExtractor().getValue( left ) );
}
public boolean evaluateCachedLeft(final VariableContextEntry context,
final Object right) {
- if ( ((ObjectVariableContextEntry) context).left == null ) {
+ final String value = (String) context.extractor.getValue( right );
+ if ( value == null ) {
return false;
}
- final String value = (String) context.extractor.getValue( right );
- return ((String) ((ObjectVariableContextEntry) context).left).matches( value );
+ return value.matches( (String) ((ObjectVariableContextEntry) context).left);
}
public String toString() {
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 19:46:36 UTC (rev 7036)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/spi/Evaluator.java 2006-10-23 20:31:07 UTC (rev 7037)
@@ -47,23 +47,6 @@
Object object1,
FieldValue value);
- /**
- * This method will extract the value from the object2 using the
- * extractor and compare it with the object1.
- *
- * @param object1
- * The actual value to compare to
- * @param extractor
- * The extractor used to get the source value from the object
- * @param object2
- * The source object to evaluate
- *
- * @return Returns true if evaluation is successfull. false otherwise.
- */
- public boolean evaluate(FieldValue object1,
- Extractor extractor,
- Object object2);
-
public boolean evaluateCachedLeft(VariableContextEntry context,
Object object1);
More information about the jboss-svn-commits
mailing list