[jboss-svn-commits] JBL Code SVN: r9341 - in labs/jbossrules/trunk/drools-core: src/main/java/org/drools/base and 3 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Mon Feb 5 08:58:12 EST 2007
Author: mark.proctor at jboss.com
Date: 2007-02-05 08:58:12 -0500 (Mon, 05 Feb 2007)
New Revision: 9341
Removed:
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/resolvers/
Modified:
labs/jbossrules/trunk/drools-core/.classpath
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/BaseEvaluator.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/ClassFieldExtractor.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/AgendaItem.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/DefaultBetaConstraints.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/DoubleBetaConstraints.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/EmptyBetaConstraints.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/EqualityKey.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/InstanceEqualsConstraint.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/InstanceNotEqualsConstraint.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/LogicalDependency.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/QuadroupleBetaConstraints.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/SingleBetaConstraints.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/TripleBetaConstraints.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/TupleStartEqualsConstraint.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/AlphaNode.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/BetaNode.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/CompositeObjectSinkAdapter.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/JoinNode.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/LeftInputAdapterNode.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/ObjectSource.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/ObjectTypeNode.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/Rete.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/RuleTerminalNode.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/TupleSource.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/spi/ColumnExtractor.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/spi/DeclarationScopeResolver.java
Log:
-Deleted JFDI resolvers, as we now use MVEL
-moved getClass() == X.class to isntanceof as its actually faster, less bytecode.
Modified: labs/jbossrules/trunk/drools-core/.classpath
===================================================================
--- labs/jbossrules/trunk/drools-core/.classpath 2007-02-05 13:51:15 UTC (rev 9340)
+++ labs/jbossrules/trunk/drools-core/.classpath 2007-02-05 13:58:12 UTC (rev 9341)
@@ -5,8 +5,8 @@
<classpathentry kind="src" path="src/test/resources" output="target/test-classes"/>
<classpathentry kind="output" path="target/classes"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="var" path="M2_REPO/xpp3/xpp3/1.1.3.4.O/xpp3-1.1.3.4.O.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/mvel/mvel14/1.2beta6/mvel14-1.2beta6.jar"/>
<classpathentry kind="var" path="M2_REPO/xstream/xstream/1.1.3/xstream-1.1.3.jar"/>
<classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/mvel/mvel14/1.2beta6/mvel14-1.2beta6.jar"/>
- <classpathentry kind="var" path="M2_REPO/xpp3/xpp3/1.1.3.4.O/xpp3-1.1.3.4.O.jar"/>
</classpath>
\ No newline at end of file
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/BaseEvaluator.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/BaseEvaluator.java 2007-02-05 13:51:15 UTC (rev 9340)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/BaseEvaluator.java 2007-02-05 13:58:12 UTC (rev 9341)
@@ -51,7 +51,7 @@
if ( this == object ) {
return true;
}
- if ( object == null || getClass() != object.getClass() ) {
+ if ( object == null || !( object instanceof BaseEvaluator) ) {
return false;
}
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/ClassFieldExtractor.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/ClassFieldExtractor.java 2007-02-05 13:51:15 UTC (rev 9340)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/ClassFieldExtractor.java 2007-02-05 13:58:12 UTC (rev 9341)
@@ -100,7 +100,7 @@
return true;
}
- if ( object == null || object.getClass() != ClassFieldExtractor.class ) {
+ if ( object == null || !( object instanceof ClassFieldExtractor ) ) {
return false;
}
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/AgendaItem.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/AgendaItem.java 2007-02-05 13:51:15 UTC (rev 9340)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/AgendaItem.java 2007-02-05 13:58:12 UTC (rev 9341)
@@ -171,7 +171,7 @@
return true;
}
- if ( object == null || object.getClass() != AgendaItem.class ) {
+ if ( object == null || !(object instanceof AgendaItem) ) {
return false;
}
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/DefaultBetaConstraints.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/DefaultBetaConstraints.java 2007-02-05 13:51:15 UTC (rev 9340)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/DefaultBetaConstraints.java 2007-02-05 13:58:12 UTC (rev 9341)
@@ -107,7 +107,7 @@
}
private boolean isIndexable(final BetaNodeFieldConstraint constraint) {
- if ( constraint.getClass() == VariableConstraint.class ) {
+ if ( constraint instanceof VariableConstraint ) {
final VariableConstraint variableConstraint = (VariableConstraint) constraint;
return (variableConstraint.getEvaluator().getOperator() == Operator.EQUAL);
} else {
@@ -244,7 +244,7 @@
return true;
}
- if ( object == null || getClass() != object.getClass() ) {
+ if ( object == null || !( object instanceof DefaultBetaConstraints ) ) {
return false;
}
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/DoubleBetaConstraints.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/DoubleBetaConstraints.java 2007-02-05 13:51:15 UTC (rev 9340)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/DoubleBetaConstraints.java 2007-02-05 13:58:12 UTC (rev 9341)
@@ -99,7 +99,7 @@
private boolean isIndexable(final BetaNodeFieldConstraint constraint) {
- if ( constraint.getClass() == VariableConstraint.class ) {
+ if ( constraint instanceof VariableConstraint ) {
final VariableConstraint variableConstraint = (VariableConstraint) constraint;
return (variableConstraint.getEvaluator().getOperator() == Operator.EQUAL);
} else {
@@ -224,7 +224,7 @@
return true;
}
- if ( object == null || getClass() != object.getClass() ) {
+ if ( object == null || !( object instanceof DoubleBetaConstraints) ) {
return false;
}
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/EmptyBetaConstraints.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/EmptyBetaConstraints.java 2007-02-05 13:51:15 UTC (rev 9340)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/EmptyBetaConstraints.java 2007-02-05 13:58:12 UTC (rev 9341)
@@ -110,7 +110,7 @@
return true;
}
- return (object != null && getClass() == object.getClass());
+ return (object != null && ( object instanceof EmptyBetaConstraints ) );
}
}
\ No newline at end of file
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/EqualityKey.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/EqualityKey.java 2007-02-05 13:51:15 UTC (rev 9340)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/EqualityKey.java 2007-02-05 13:58:12 UTC (rev 9341)
@@ -147,7 +147,7 @@
return false;
}
- if ( object.getClass() == EqualityKey.class ) {
+ if ( object instanceof EqualityKey) {
return this == object;
}
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/InstanceEqualsConstraint.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/InstanceEqualsConstraint.java 2007-02-05 13:51:15 UTC (rev 9340)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/InstanceEqualsConstraint.java 2007-02-05 13:58:12 UTC (rev 9341)
@@ -80,7 +80,7 @@
return true;
}
- if ( object == null || getClass() != object.getClass() ) {
+ if ( object == null || !(object instanceof InstanceEqualsConstraint) ) {
return false;
}
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/InstanceNotEqualsConstraint.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/InstanceNotEqualsConstraint.java 2007-02-05 13:51:15 UTC (rev 9340)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/InstanceNotEqualsConstraint.java 2007-02-05 13:58:12 UTC (rev 9341)
@@ -76,7 +76,7 @@
return true;
}
- if ( object == null || getClass() != object.getClass() ) {
+ if ( object == null || !(object instanceof InstanceNotEqualsConstraint ) ) {
return false;
}
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/LogicalDependency.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/LogicalDependency.java 2007-02-05 13:51:15 UTC (rev 9340)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/LogicalDependency.java 2007-02-05 13:58:12 UTC (rev 9341)
@@ -47,13 +47,13 @@
}
public boolean equals(final Object object) {
- if ( object == null || !(object.getClass() != this.getClass()) ) {
- return false;
- }
-
if ( this == object ) {
return true;
}
+
+ if ( object == null || !(object instanceof LogicalDependency ) ) {
+ return false;
+ }
final LogicalDependency other = (LogicalDependency) object;
return (this.getJustifier() == other.getJustifier() && this.getFactHandle() == other.getFactHandle());
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/QuadroupleBetaConstraints.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/QuadroupleBetaConstraints.java 2007-02-05 13:51:15 UTC (rev 9340)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/QuadroupleBetaConstraints.java 2007-02-05 13:58:12 UTC (rev 9341)
@@ -154,7 +154,7 @@
}
private boolean isIndexable(final BetaNodeFieldConstraint constraint) {
- if ( constraint.getClass() == VariableConstraint.class ) {
+ if ( constraint instanceof VariableConstraint ) {
final VariableConstraint variableConstraint = (VariableConstraint) constraint;
return (variableConstraint.getEvaluator().getOperator() == Operator.EQUAL);
} else {
@@ -313,7 +313,7 @@
return true;
}
- if ( object == null || getClass() != object.getClass() ) {
+ if ( object == null || !(object instanceof QuadroupleBetaConstraints)) {
return false;
}
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/SingleBetaConstraints.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/SingleBetaConstraints.java 2007-02-05 13:51:15 UTC (rev 9340)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/SingleBetaConstraints.java 2007-02-05 13:58:12 UTC (rev 9341)
@@ -70,7 +70,7 @@
}
private boolean isIndexable(final BetaNodeFieldConstraint constraint) {
- if ( constraint.getClass() == VariableConstraint.class ) {
+ if ( constraint instanceof VariableConstraint ) {
final VariableConstraint variableConstraint = (VariableConstraint) constraint;
return (variableConstraint.getEvaluator().getOperator() == Operator.EQUAL);
} else {
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/TripleBetaConstraints.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/TripleBetaConstraints.java 2007-02-05 13:51:15 UTC (rev 9340)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/TripleBetaConstraints.java 2007-02-05 13:58:12 UTC (rev 9341)
@@ -125,7 +125,7 @@
}
private boolean isIndexable(final BetaNodeFieldConstraint constraint) {
- if ( constraint.getClass() == VariableConstraint.class ) {
+ if ( constraint instanceof VariableConstraint ) {
final VariableConstraint variableConstraint = (VariableConstraint) constraint;
return (variableConstraint.getEvaluator().getOperator() == Operator.EQUAL);
} else {
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/TupleStartEqualsConstraint.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/TupleStartEqualsConstraint.java 2007-02-05 13:51:15 UTC (rev 9340)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/TupleStartEqualsConstraint.java 2007-02-05 13:58:12 UTC (rev 9341)
@@ -90,7 +90,7 @@
}
public boolean equals(final Object object) {
- if ( this.getClass() == object.getClass() ) {
+ if ( object instanceof TupleStartEqualsConstraint ) {
return true;
}
return false;
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/AlphaNode.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/AlphaNode.java 2007-02-05 13:51:15 UTC (rev 9340)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/AlphaNode.java 2007-02-05 13:58:12 UTC (rev 9341)
@@ -227,7 +227,7 @@
return true;
}
- if ( object == null || getClass() != object.getClass() ) {
+ if ( object == null || !(object instanceof AlphaNode) ) {
return false;
}
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/BetaNode.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/BetaNode.java 2007-02-05 13:51:15 UTC (rev 9340)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/BetaNode.java 2007-02-05 13:58:12 UTC (rev 9341)
@@ -135,7 +135,7 @@
final TupleSink[] sinks = this.sink.getSinks();
for ( int i = 0, length = sinks.length; i < length; i++ ) {
- if ( sinks[i].getClass() == RuleTerminalNode.class ) {
+ if ( sinks[i] instanceof RuleTerminalNode ) {
list.add( ((RuleTerminalNode) sinks[i]).getRule().getName() );
} else if ( sinks[i] instanceof BetaNode ) {
list.addAll( ((BetaNode) sinks[i]).getRules() );
@@ -147,7 +147,7 @@
public ObjectTypeNode getObjectTypeNode() {
ObjectSource source = this.rightInput;
- while ( source.getClass() != ObjectTypeNode.class ) {
+ while ( !(source instanceof ObjectTypeNode) ) {
source = source.objectSource;
}
return ((ObjectTypeNode) source);
@@ -219,7 +219,7 @@
return true;
}
- if ( object == null || getClass() != object.getClass() ) {
+ if ( object == null || !( object instanceof BetaNode) ) {
return false;
}
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/CompositeObjectSinkAdapter.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/CompositeObjectSinkAdapter.java 2007-02-05 13:51:15 UTC (rev 9340)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/CompositeObjectSinkAdapter.java 2007-02-05 13:58:12 UTC (rev 9341)
@@ -53,11 +53,11 @@
}
public void addObjectSink(final ObjectSink sink) {
- if ( sink.getClass() == AlphaNode.class ) {
+ if ( sink instanceof AlphaNode ) {
final AlphaNode alphaNode = (AlphaNode) sink;
final AlphaNodeFieldConstraint fieldConstraint = alphaNode.getConstraint();
- if ( fieldConstraint.getClass() == LiteralConstraint.class ) {
+ if ( fieldConstraint instanceof LiteralConstraint ) {
final LiteralConstraint literalConstraint = (LiteralConstraint) fieldConstraint;
final Evaluator evaluator = literalConstraint.getEvaluator();
@@ -96,11 +96,11 @@
}
public void removeObjectSink(final ObjectSink sink) {
- if ( sink.getClass() == AlphaNode.class ) {
+ if ( sink instanceof AlphaNode ) {
final AlphaNode alphaNode = (AlphaNode) sink;
final AlphaNodeFieldConstraint fieldConstraint = alphaNode.getConstraint();
- if ( fieldConstraint.getClass() == LiteralConstraint.class ) {
+ if ( fieldConstraint instanceof LiteralConstraint ) {
final LiteralConstraint literalConstraint = (LiteralConstraint) fieldConstraint;
final Evaluator evaluator = literalConstraint.getEvaluator();
final FieldValue value = literalConstraint.getField();
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/JoinNode.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/JoinNode.java 2007-02-05 13:51:15 UTC (rev 9340)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/JoinNode.java 2007-02-05 13:58:12 UTC (rev 9341)
@@ -249,7 +249,7 @@
public String toString() {
ObjectSource source = this.rightInput;
- while ( source.getClass() != ObjectTypeNode.class ) {
+ while ( !(source instanceof ObjectTypeNode ) ) {
source = source.objectSource;
}
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/LeftInputAdapterNode.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/LeftInputAdapterNode.java 2007-02-05 13:51:15 UTC (rev 9340)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/LeftInputAdapterNode.java 2007-02-05 13:58:12 UTC (rev 9341)
@@ -263,7 +263,7 @@
return true;
}
- if ( object == null || object.getClass() != LeftInputAdapterNode.class ) {
+ if ( object == null || !( object instanceof LeftInputAdapterNode ) ) {
return false;
}
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/ObjectSource.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/ObjectSource.java 2007-02-05 13:51:15 UTC (rev 9340)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/ObjectSource.java 2007-02-05 13:58:12 UTC (rev 9341)
@@ -95,7 +95,7 @@
protected void addObjectSink(final ObjectSink objectSink) {
if ( this.sink == EmptyObjectSinkAdapter.getInstance() ) {
this.sink = new SingleObjectSinkAdapter( objectSink );
- } else if ( this.sink.getClass() == SingleObjectSinkAdapter.class ) {
+ } else if ( this.sink instanceof SingleObjectSinkAdapter ) {
final CompositeObjectSinkAdapter sinkAdapter = new CompositeObjectSinkAdapter(alphaNodeHashingThreshold);
sinkAdapter.addObjectSink( this.sink.getSinks()[0] );
sinkAdapter.addObjectSink( objectSink );
@@ -116,7 +116,7 @@
throw new IllegalArgumentException( "Cannot remove a sink, when the list of sinks is null" );
}
- if ( this.sink.getClass() == SingleObjectSinkAdapter.class ) {
+ if ( this.sink instanceof SingleObjectSinkAdapter ) {
this.sink = EmptyObjectSinkAdapter.getInstance();
} else {
CompositeObjectSinkAdapter sinkAdapter = ( CompositeObjectSinkAdapter ) this.sink;
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/ObjectTypeNode.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/ObjectTypeNode.java 2007-02-05 13:51:15 UTC (rev 9340)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/ObjectTypeNode.java 2007-02-05 13:58:12 UTC (rev 9341)
@@ -265,7 +265,7 @@
return true;
}
- if ( object == null || object.getClass() != ObjectTypeNode.class ) {
+ if ( object == null || !(object instanceof ObjectTypeNode ) ) {
return false;
}
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/Rete.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/Rete.java 2007-02-05 13:51:15 UTC (rev 9340)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/Rete.java 2007-02-05 13:58:12 UTC (rev 9341)
@@ -103,7 +103,7 @@
Object key = null;
- if ( object.getClass() == FactImpl.class ) {
+ if ( object instanceof FactImpl ) {
key = ((Fact) object).getFactTemplate().getName();
} else {
key = object.getClass();
@@ -152,7 +152,7 @@
cachedNodes = getMatchingNodes( object );
Object key = null;
- if ( object.getClass() == FactImpl.class ) {
+ if ( object instanceof FactImpl ) {
key = ((Fact) object).getFactTemplate().getName();
} else {
key = object.getClass();
@@ -239,7 +239,7 @@
return true;
}
- if ( object == null || object.getClass() != Rete.class ) {
+ if ( object == null || !( object instanceof Rete ) ) {
return false;
}
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/RuleTerminalNode.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/RuleTerminalNode.java 2007-02-05 13:51:15 UTC (rev 9340)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/RuleTerminalNode.java 2007-02-05 13:58:12 UTC (rev 9341)
@@ -385,7 +385,7 @@
return true;
}
- if ( object == null || object.getClass() != RuleTerminalNode.class ) {
+ if ( object == null || !(object instanceof RuleTerminalNode ) ) {
return false;
}
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/TupleSource.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/TupleSource.java 2007-02-05 13:51:15 UTC (rev 9340)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/TupleSource.java 2007-02-05 13:58:12 UTC (rev 9341)
@@ -74,7 +74,7 @@
protected void addTupleSink(final TupleSink tupleSink) {
if ( this.sink == EmptyTupleSinkAdapter.getInstance() ) {
this.sink = new SingleTupleSinkAdapter( tupleSink );
- } else if ( this.sink.getClass() == SingleTupleSinkAdapter.class ) {
+ } else if ( this.sink instanceof SingleTupleSinkAdapter ) {
final CompositeTupleSinkAdapter sinkAdapter = new CompositeTupleSinkAdapter();
sinkAdapter.addTupleSink( this.sink.getSinks()[0] );
sinkAdapter.addTupleSink( tupleSink );
@@ -95,7 +95,7 @@
throw new IllegalArgumentException( "Cannot remove a sink, when the list of sinks is null" );
}
- if ( this.sink.getClass() == SingleTupleSinkAdapter.class ) {
+ if ( this.sink instanceof SingleTupleSinkAdapter ) {
this.sink = EmptyTupleSinkAdapter.getInstance();
} else {
final CompositeTupleSinkAdapter sinkAdapter = (CompositeTupleSinkAdapter) this.sink;
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/spi/ColumnExtractor.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/spi/ColumnExtractor.java 2007-02-05 13:51:15 UTC (rev 9340)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/spi/ColumnExtractor.java 2007-02-05 13:58:12 UTC (rev 9341)
@@ -50,7 +50,7 @@
public Class getExtractToClass() {
// @todo : this is a bit nasty, but does the trick
- if ( this.objectType.getClass() == ClassObjectType.class ) {
+ if ( this.objectType instanceof ClassObjectType ) {
return ((ClassObjectType) this.objectType).getClassType();
} else {
return Fact.class;
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/spi/DeclarationScopeResolver.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/spi/DeclarationScopeResolver.java 2007-02-05 13:51:15 UTC (rev 9340)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/spi/DeclarationScopeResolver.java 2007-02-05 13:58:12 UTC (rev 9341)
@@ -29,7 +29,7 @@
for ( int i = 0, length = this.maps.length; i < length; i++ ) {
final Object object = this.maps[i].get( name );
if ( object != null ) {
- if ( object.getClass() == Declaration.class ) {
+ if ( object instanceof Declaration ) {
return ((Declaration) object).getExtractor().getExtractToClass();
} else {
return (Class) object;
More information about the jboss-svn-commits
mailing list