[jboss-svn-commits] JBL Code SVN: r5500 - labs/jbossrules/branches/3.0.x/drools-core/src/main/java/org/drools/rule

[jboss-svn-commits at lists.jboss.org]

Author: tirelli
Date: 2006-08-05 17:52:32 -0400 (Sat, 05 Aug 2006)
New Revision: 5500

Modified:
   labs/jbossrules/branches/3.0.x/drools-core/src/main/java/org/drools/rule/BoundVariableConstraint.java
Log:
* JBRULES-389

  * Removing cache to avoid problems with out-of-date cache value
  * Updating testcases



Modified: labs/jbossrules/branches/3.0.x/drools-core/src/main/java/org/drools/rule/BoundVariableConstraint.java
===================================================================
--- labs/jbossrules/branches/3.0.x/drools-core/src/main/java/org/drools/rule/BoundVariableConstraint.java	2006-08-05 21:49:14 UTC (rev 5499)
+++ labs/jbossrules/branches/3.0.x/drools-core/src/main/java/org/drools/rule/BoundVariableConstraint.java	2006-08-05 21:52:32 UTC (rev 5500)
@@ -38,8 +38,6 @@
 
     private final Declaration    declaration;
 
-    private final int            column;
-
     private final Declaration[]  requiredDeclarations;
 
     private final Evaluator      evaluator;
@@ -49,7 +47,6 @@
                                    final Evaluator evaluator) {
         this.fieldExtractor = fieldExtractor;
         this.declaration = declaration;
-        this.column = declaration.getColumn();
         this.requiredDeclarations = new Declaration[]{declaration};
         this.evaluator = evaluator;
     }
@@ -92,7 +89,6 @@
     public int hashCode() {
         final int PRIME = 31;
         int result = 1;
-        result = PRIME * result + this.column;
         result = PRIME * result + ((this.declaration == null) ? 0 : this.declaration.hashCode());
         result = PRIME * result + ((this.evaluator == null) ? 0 : this.evaluator.hashCode());
         result = PRIME * result + ((this.fieldExtractor == null) ? 0 : this.fieldExtractor.hashCode());
@@ -111,7 +107,7 @@
 
         final BoundVariableConstraint other = (BoundVariableConstraint) object;
 
-        return (this.column == other.column) && this.fieldExtractor.equals( other.fieldExtractor ) && this.declaration.equals( other.declaration ) && this.evaluator.equals( other.evaluator ) && Arrays.equals( this.requiredDeclarations,
+        return this.fieldExtractor.equals( other.fieldExtractor ) && this.declaration.equals( other.declaration ) && this.evaluator.equals( other.evaluator ) && Arrays.equals( this.requiredDeclarations,
                                                                                                                                                                                                                  other.requiredDeclarations );
     }