[jboss-svn-commits] JBL Code SVN: r6244 - labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/beta
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Fri Sep 15 13:45:40 EDT 2006
Author: tirelli
Date: 2006-09-15 13:45:31 -0400 (Fri, 15 Sep 2006)
New Revision: 6244
Modified:
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/beta/BooleanConstrainedLeftMemory.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/beta/BooleanConstrainedRightMemory.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/beta/DefaultLeftMemory.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/beta/DefaultRightMemory.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/beta/InstanceEqualConstrRightMemory.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/beta/ObjectEqualConstrLeftMemory.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/beta/ObjectEqualConstrRightMemory.java
Log:
JBRULE-484: fixing compilation problems
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/beta/BooleanConstrainedLeftMemory.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/beta/BooleanConstrainedLeftMemory.java 2006-09-15 16:23:14 UTC (rev 6243)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/beta/BooleanConstrainedLeftMemory.java 2006-09-15 17:45:31 UTC (rev 6244)
@@ -44,6 +44,8 @@
implements
BetaLeftMemory {
+ private static final long serialVersionUID = 2385678633684465433L;
+
private BetaLeftMemory innerMemory = null;
private MultiLinkedList trueList = null;
@@ -54,7 +56,7 @@
private Declaration declaration = null;
private Column column;
private Evaluator evaluator = null;
-
+
public BooleanConstrainedLeftMemory(final FieldExtractor extractor,
final Declaration declaration,
final Evaluator evaluator) {
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/beta/BooleanConstrainedRightMemory.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/beta/BooleanConstrainedRightMemory.java 2006-09-15 16:23:14 UTC (rev 6243)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/beta/BooleanConstrainedRightMemory.java 2006-09-15 17:45:31 UTC (rev 6244)
@@ -45,6 +45,8 @@
implements
BetaRightMemory {
+ private static final long serialVersionUID = -4971705123457908949L;
+
private BetaRightMemory innerMemory = null;
private MultiLinkedList trueList = null;
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/beta/DefaultLeftMemory.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/beta/DefaultLeftMemory.java 2006-09-15 16:23:14 UTC (rev 6243)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/beta/DefaultLeftMemory.java 2006-09-15 17:45:31 UTC (rev 6244)
@@ -39,6 +39,7 @@
implements
BetaLeftMemory {
+ private static final long serialVersionUID = 5316711294716215716L;
private final MultiLinkedList memory;
public DefaultLeftMemory() {
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/beta/DefaultRightMemory.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/beta/DefaultRightMemory.java 2006-09-15 16:23:14 UTC (rev 6243)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/beta/DefaultRightMemory.java 2006-09-15 17:45:31 UTC (rev 6244)
@@ -39,6 +39,7 @@
implements
BetaRightMemory {
+ private static final long serialVersionUID = -1354173209252891466L;
private final MultiLinkedList memory;
public DefaultRightMemory() {
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/beta/InstanceEqualConstrRightMemory.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/beta/InstanceEqualConstrRightMemory.java 2006-09-15 16:23:14 UTC (rev 6243)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/beta/InstanceEqualConstrRightMemory.java 2006-09-15 17:45:31 UTC (rev 6244)
@@ -23,7 +23,6 @@
import java.util.TreeSet;
import org.drools.WorkingMemory;
-import org.drools.common.DefaultFactHandle;
import org.drools.common.InternalFactHandle;
import org.drools.reteoo.ObjectMatches;
import org.drools.spi.Tuple;
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/beta/ObjectEqualConstrLeftMemory.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/beta/ObjectEqualConstrLeftMemory.java 2006-09-15 16:23:14 UTC (rev 6243)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/beta/ObjectEqualConstrLeftMemory.java 2006-09-15 17:45:31 UTC (rev 6244)
@@ -1,5 +1,4 @@
/*
- * Copyright 2005 JBoss Inc
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -49,6 +48,8 @@
implements
BetaLeftMemory {
+ private static final long serialVersionUID = 8850322171273097103L;
+
private BetaLeftMemory innerMemory = null;
private Map memoryMap = null;
@@ -287,7 +288,7 @@
*/
private final MultiLinkedList getTupleBucket(final WorkingMemory workingMemory,
final Tuple tuple) {
- final Integer hash = getTupleHash( workingMemory,
+ final Object hash = getTupleHash( workingMemory,
tuple );
MultiLinkedList list = (MultiLinkedList) this.memoryMap.get( hash );
if ( list == null ) {
@@ -305,11 +306,11 @@
* @param tuple
* @return
*/
- private final Integer getTupleHash(final WorkingMemory workingMemory,
+ private final Object getTupleHash(final WorkingMemory workingMemory,
final Tuple tuple) {
final Object select = this.declaration.getValue( tuple.get( this.column.getFactIndex() ).getObject() );
- final Integer hash = (select != null) ? new Integer( select.hashCode() ) : new Integer( 0 );
- return hash;
+ //final Integer hash = (select != null) ? new Integer( select.hashCode() ) : new Integer( 0 );
+ return select;
}
public final int size() {
@@ -345,6 +346,7 @@
}
private static final class KeyMultiLinkedList extends MultiLinkedList {
+ private static final long serialVersionUID = -8399527096749007875L;
private final Object key;
public KeyMultiLinkedList(final Object key) {
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/beta/ObjectEqualConstrRightMemory.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/beta/ObjectEqualConstrRightMemory.java 2006-09-15 16:23:14 UTC (rev 6243)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/beta/ObjectEqualConstrRightMemory.java 2006-09-15 17:45:31 UTC (rev 6244)
@@ -25,7 +25,6 @@
import java.util.TreeSet;
import org.drools.WorkingMemory;
-import org.drools.common.DefaultFactHandle;
import org.drools.common.InternalFactHandle;
import org.drools.reteoo.ObjectMatches;
import org.drools.rule.Column;
@@ -48,6 +47,8 @@
implements
BetaRightMemory {
+ private static final long serialVersionUID = 839131713237772535L;
+
private BetaRightMemory innerMemory = null;
private Map memoryMap = null;
@@ -234,8 +235,7 @@
public final void selectPossibleMatches(final WorkingMemory workingMemory,
final Tuple tuple) {
final Object select = this.declaration.getValue( tuple.get( this.column.getFactIndex() ).getObject() );
- final Integer hash = (select != null) ? new Integer( select.hashCode() ) : new Integer( 0 );
- this.selectedList = (MultiLinkedList) this.memoryMap.get( hash );
+ this.selectedList = (MultiLinkedList) this.memoryMap.get( select );
if ( this.innerMemory != null ) {
this.innerMemory.selectPossibleMatches( workingMemory,
@@ -264,11 +264,10 @@
private final MultiLinkedList getFactList(final WorkingMemory workingMemory,
final InternalFactHandle handle) {
final Object select = this.extractor.getValue( handle.getObject() );
- final Integer hash = (select != null) ? new Integer( select.hashCode() ) : new Integer( 0 );
- MultiLinkedList list = (MultiLinkedList) this.memoryMap.get( hash );
+ MultiLinkedList list = (MultiLinkedList) this.memoryMap.get( select );
if ( list == null ) {
- list = new KeyMultiLinkedList( hash );
- this.memoryMap.put( hash,
+ list = new KeyMultiLinkedList( select );
+ this.memoryMap.put( select,
list );
}
return list;
@@ -340,6 +339,7 @@
}
private static class KeyMultiLinkedList extends MultiLinkedList {
+ private static final long serialVersionUID = -8734984411917804541L;
private final Object key;
public KeyMultiLinkedList(final Object key) {
More information about the jboss-svn-commits
mailing list