|
From: <jbo...@li...> - 2006-05-30 18:58:46
|
Author: mar...@jb...
Date: 2006-05-30 14:58:38 -0400 (Tue, 30 May 2006)
New Revision: 4490
Modified:
labs/jbossrules/trunk/drools-ide/src/main/java/org/drools/ide/debug/AgendaLogicalStructureDelegate.java
labs/jbossrules/trunk/drools-ide/src/main/java/org/drools/ide/debug/AgendaViewContentProvider.java
labs/jbossrules/trunk/drools-ide/src/main/java/org/drools/ide/debug/ApplicationDataViewContentProvider.java
labs/jbossrules/trunk/drools-ide/src/main/java/org/drools/ide/debug/DroolsDebugEventHandlerView.java
labs/jbossrules/trunk/drools-ide/src/main/java/org/drools/ide/debug/WorkingMemoryViewContentProvider.java
labs/jbossrules/trunk/drools-ide/src/main/java/org/drools/ide/editors/ReteViewer.java
Log:
JBRULES-266 Customize how drools checks if an object is already asserted in its working memory
JBRULES-233 LogicalAssertions
Modified: labs/jbossrules/trunk/drools-ide/src/main/java/org/drools/ide/debug/AgendaLogicalStructureDelegate.java
===================================================================
--- labs/jbossrules/trunk/drools-ide/src/main/java/org/drools/ide/debug/AgendaLogicalStructureDelegate.java 2006-05-30 17:56:37 UTC (rev 4489)
+++ labs/jbossrules/trunk/drools-ide/src/main/java/org/drools/ide/debug/AgendaLogicalStructureDelegate.java 2006-05-30 18:58:38 UTC (rev 4490)
@@ -68,7 +68,7 @@
IVariable declarationVar = vars[k];
if ("identifier".equals(declarationVar.getName())) {
String paramName = declarationVar.getValue().getValueString();
- IJavaValue varValue = (IJavaValue) DebugUtil.getValueByExpression("return getRule().getDeclaration(\"" + paramName + "\").getValue(((org.drools.reteoo.FactHandleImpl) getTuple().get(getRule().getDeclaration(\"" + paramName + "\"))).getObject());", value);
+ IJavaValue varValue = (IJavaValue) DebugUtil.getValueByExpression("return getRule().getDeclaration(\"" + paramName + "\").getValue(((org.drools.common.InternalFactHandle) getTuple().get(getRule().getDeclaration(\"" + paramName + "\"))).getObject());", value);
if (varValue != null) {
variables.add(new VariableWrapper(paramName, varValue));
}
Modified: labs/jbossrules/trunk/drools-ide/src/main/java/org/drools/ide/debug/AgendaViewContentProvider.java
===================================================================
--- labs/jbossrules/trunk/drools-ide/src/main/java/org/drools/ide/debug/AgendaViewContentProvider.java 2006-05-30 17:56:37 UTC (rev 4489)
+++ labs/jbossrules/trunk/drools-ide/src/main/java/org/drools/ide/debug/AgendaViewContentProvider.java 2006-05-30 18:58:38 UTC (rev 4490)
@@ -29,7 +29,7 @@
try {
Object[] variables = null;
if (obj != null && obj instanceof IJavaObject
- && "org.drools.reteoo.WorkingMemoryImpl".equals(
+ && "org.drools.reteoo.ReteooWorkingMemory".equals(
((IJavaObject) obj).getReferenceTypeName())) {
variables = getAgendaElements((IJavaObject) obj);
} else if (obj instanceof IVariable) {
Modified: labs/jbossrules/trunk/drools-ide/src/main/java/org/drools/ide/debug/ApplicationDataViewContentProvider.java
===================================================================
--- labs/jbossrules/trunk/drools-ide/src/main/java/org/drools/ide/debug/ApplicationDataViewContentProvider.java 2006-05-30 17:56:37 UTC (rev 4489)
+++ labs/jbossrules/trunk/drools-ide/src/main/java/org/drools/ide/debug/ApplicationDataViewContentProvider.java 2006-05-30 18:58:38 UTC (rev 4490)
@@ -28,7 +28,7 @@
try {
IVariable[] variables = null;
if (obj != null && obj instanceof IJavaObject
- && "org.drools.reteoo.WorkingMemoryImpl".equals(
+ && "org.drools.reteoo.ReteooWorkingMemory".equals(
((IJavaObject) obj).getReferenceTypeName())) {
variables = getApplicationDataElements((IJavaObject) obj);
} else if (obj instanceof IVariable) {
Modified: labs/jbossrules/trunk/drools-ide/src/main/java/org/drools/ide/debug/DroolsDebugEventHandlerView.java
===================================================================
--- labs/jbossrules/trunk/drools-ide/src/main/java/org/drools/ide/debug/DroolsDebugEventHandlerView.java 2006-05-30 17:56:37 UTC (rev 4489)
+++ labs/jbossrules/trunk/drools-ide/src/main/java/org/drools/ide/debug/DroolsDebugEventHandlerView.java 2006-05-30 18:58:38 UTC (rev 4490)
@@ -64,7 +64,7 @@
IJavaObject stackObj = ((IJavaStackFrame) context).getThis();
if ((stackObj != null)
&& (stackObj.getJavaType() != null)
- && ("org.drools.reteoo.WorkingMemoryImpl".equals(
+ && ("org.drools.reteoo.ReteooWorkingMemory".equals(
stackObj.getJavaType().getName()))) {
input = stackObj;
}
@@ -84,7 +84,7 @@
IJavaObject stackObj = ((IJavaStackFrame) stack).getThis();
if ((stackObj != null)
&& (stackObj.getJavaType() != null)
- && ("org.drools.reteoo.WorkingMemoryImpl".equals(
+ && ("org.drools.reteoo.ReteooWorkingMemory".equals(
stackObj.getJavaType().getName()))) {
input = stackObj;
}
@@ -97,7 +97,7 @@
try {
IValue value = ((IVariable) context).getValue();
if (value != null && value instanceof IJavaObject
- && "org.drools.reteoo.WorkingMemoryImpl".equals(
+ && "org.drools.reteoo.ReteooWorkingMemory".equals(
variable.getValue().getReferenceTypeName())) {
input = value;
}
Modified: labs/jbossrules/trunk/drools-ide/src/main/java/org/drools/ide/debug/WorkingMemoryViewContentProvider.java
===================================================================
--- labs/jbossrules/trunk/drools-ide/src/main/java/org/drools/ide/debug/WorkingMemoryViewContentProvider.java 2006-05-30 17:56:37 UTC (rev 4489)
+++ labs/jbossrules/trunk/drools-ide/src/main/java/org/drools/ide/debug/WorkingMemoryViewContentProvider.java 2006-05-30 18:58:38 UTC (rev 4490)
@@ -33,7 +33,7 @@
try {
IVariable[] variables = null;
if (obj != null && obj instanceof IJavaObject
- && "org.drools.reteoo.WorkingMemoryImpl".equals(
+ && "org.drools.reteoo.ReteooWorkingMemory".equals(
((IJavaObject) obj).getReferenceTypeName())) {
variables = getWorkingMemoryElements((IJavaObject) obj);
} else if (obj instanceof IVariable) {
Modified: labs/jbossrules/trunk/drools-ide/src/main/java/org/drools/ide/editors/ReteViewer.java
===================================================================
--- labs/jbossrules/trunk/drools-ide/src/main/java/org/drools/ide/editors/ReteViewer.java 2006-05-30 17:56:37 UTC (rev 4489)
+++ labs/jbossrules/trunk/drools-ide/src/main/java/org/drools/ide/editors/ReteViewer.java 2006-05-30 18:58:38 UTC (rev 4490)
@@ -11,7 +11,7 @@
import org.drools.ide.builder.DroolsBuilder;
import org.drools.ide.util.ProjectClassLoader;
import org.drools.lang.descr.PackageDescr;
-import org.drools.reteoo.RuleBaseImpl;
+import org.drools.reteoo.ReteooRuleBase;
import org.drools.rule.Package;
import org.drools.visualize.ReteooJungViewerPanel;
import org.eclipse.core.resources.IFile;
@@ -112,7 +112,7 @@
Package pkg = builder.getPackage();
//add the package to a rulebase
- RuleBaseImpl ruleBase = new RuleBaseImpl();
+ ReteooRuleBase ruleBase = new ReteooRuleBase();
ruleBase.addPackage(pkg);
return ruleBase;
|