[jboss-svn-commits] JBL Code SVN: r12526 - in labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main: java/org/drools/eclipse/debug and 4 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Tue Jun 12 22:47:00 EDT 2007
Author: mark.proctor at jboss.com
Date: 2007-06-12 22:47:00 -0400 (Tue, 12 Jun 2007)
New Revision: 12526
Modified:
labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/DroolsEclipsePlugin.java
labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/DroolsPluginImages.java
labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/debug/AuditView.java
labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/editors/completion/RuleCompletionProcessor.java
labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/editors/rete/model/GraphicalVertex.java
labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/resources/org/drools/eclipse/editors/keywords.properties
labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/resources/org/drools/eclipse/wizard/project/Sample.drl.template
Log:
JBRULES-922 API change for assert and modify
Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/DroolsEclipsePlugin.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/DroolsEclipsePlugin.java 2007-06-13 02:46:52 UTC (rev 12525)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/DroolsEclipsePlugin.java 2007-06-13 02:47:00 UTC (rev 12526)
@@ -292,7 +292,8 @@
builder_configuration.setJavaLanguageLevel(level);
}
try {
- builder_configuration.setClassLoader(newLoader);
+ // @todo I've deleted this method, is that ok?
+ //builder_configuration.setClassLoader(newLoader);
Thread.currentThread().setContextClassLoader(newLoader);
// first parse the source
Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/DroolsPluginImages.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/DroolsPluginImages.java 2007-06-13 02:46:52 UTC (rev 12525)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/DroolsPluginImages.java 2007-06-13 02:47:00 UTC (rev 12526)
@@ -36,9 +36,9 @@
public static final String OPEN_LOG = "OpenLog";
public static final String DELETE_LOG = "ClearLog";
public static final String DELETE_LOG_DISABLED = "ClearLogDisabled";
- public static final String ASSERT_OBJECT = "AssertObject";
- public static final String MODIFY_OBJECT = "ModifyObject";
- public static final String RETRACT_OBJECT = "RetractObject";
+ public static final String INSERT = "Insert";
+ public static final String UPDATE = "Update";
+ public static final String RETRACT = "RetractO";
public static final String CREATE_ACTIVATION = "CreateActivation";
public static final String CANCEL_ACTIVATION = "CancelActivation";
public static final String EXECUTE_ACTIVATION = "ExecuteActivation";
@@ -68,9 +68,9 @@
declareRegistryImage(OPEN_LOG, "open.gif");
declareRegistryImage(DELETE_LOG, "clear.gif");
declareRegistryImage(DELETE_LOG_DISABLED, "clear_disabled.gif");
- declareRegistryImage(ASSERT_OBJECT, "greensquare.GIF");
- declareRegistryImage(MODIFY_OBJECT, "yellowsquare.GIF");
- declareRegistryImage(RETRACT_OBJECT, "redsquare.GIF");
+ declareRegistryImage(INSERT, "greensquare.GIF");
+ declareRegistryImage(UPDATE, "yellowsquare.GIF");
+ declareRegistryImage(RETRACT, "redsquare.GIF");
declareRegistryImage(CREATE_ACTIVATION, "arrowright.GIF");
declareRegistryImage(CANCEL_ACTIVATION, "arrowleft.GIF");
declareRegistryImage(EXECUTE_ACTIVATION, "bluediamond.GIF");
Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/debug/AuditView.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/debug/AuditView.java 2007-06-13 02:46:52 UTC (rev 12525)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/debug/AuditView.java 2007-06-13 02:47:00 UTC (rev 12526)
@@ -107,7 +107,7 @@
LogEvent inEvent = (LogEvent) iterator.next();
Event event = new Event(inEvent.getType());
switch (inEvent.getType()) {
- case LogEvent.OBJECT_ASSERTED:
+ case LogEvent.INSERTED:
ObjectLogEvent inObjectEvent = (ObjectLogEvent) inEvent;
event.setString("Object asserted (" + inObjectEvent.getFactId() + "): " + inObjectEvent.getObjectToString());
if (currentBeforeActivationEvent != null) {
@@ -119,7 +119,7 @@
newActivations.clear();
objectMap.put(new Long(((ObjectLogEvent) inEvent).getFactId()), event);
break;
- case LogEvent.OBJECT_MODIFIED:
+ case LogEvent.UPDATED:
inObjectEvent = (ObjectLogEvent) inEvent;
event.setString("Object modified (" + inObjectEvent.getFactId() + "): " + inObjectEvent.getObjectToString());
if (currentBeforeActivationEvent != null) {
@@ -134,7 +134,7 @@
event.setCauseEvent(assertEvent);
}
break;
- case LogEvent.OBJECT_RETRACTED:
+ case LogEvent.RETRACTED:
inObjectEvent = (ObjectLogEvent) inEvent;
event.setString("Object retracted (" + inObjectEvent.getFactId() + "): " + inObjectEvent.getObjectToString());
if (currentBeforeActivationEvent != null) {
@@ -368,9 +368,9 @@
if (element instanceof Event) {
int type = ((Event) element).getType();
switch (type) {
- case LogEvent.OBJECT_ASSERTED: return DroolsPluginImages.getImage(DroolsPluginImages.ASSERT_OBJECT);
- case LogEvent.OBJECT_MODIFIED: return DroolsPluginImages.getImage(DroolsPluginImages.MODIFY_OBJECT);
- case LogEvent.OBJECT_RETRACTED: return DroolsPluginImages.getImage(DroolsPluginImages.RETRACT_OBJECT);
+ case LogEvent.INSERTED: return DroolsPluginImages.getImage(DroolsPluginImages.INSERT);
+ case LogEvent.UPDATED: return DroolsPluginImages.getImage(DroolsPluginImages.UPDATE);
+ case LogEvent.RETRACTED: return DroolsPluginImages.getImage(DroolsPluginImages.RETRACT);
case LogEvent.ACTIVATION_CREATED: return DroolsPluginImages.getImage(DroolsPluginImages.CREATE_ACTIVATION);
case LogEvent.ACTIVATION_CANCELLED: return DroolsPluginImages.getImage(DroolsPluginImages.CANCEL_ACTIVATION);
case LogEvent.BEFORE_ACTIVATION_FIRE: return DroolsPluginImages.getImage(DroolsPluginImages.EXECUTE_ACTIVATION);
Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/editors/completion/RuleCompletionProcessor.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/editors/completion/RuleCompletionProcessor.java 2007-06-13 02:46:52 UTC (rev 12525)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/editors/completion/RuleCompletionProcessor.java 2007-06-13 02:47:00 UTC (rev 12526)
@@ -573,19 +573,19 @@
private void addRHSKeywordCompletionProposals(
List list, String prefix) {
RuleCompletionProposal prop = new RuleCompletionProposal(prefix
- .length(), "modify", "modify();", 7);
+ .length(), "update", "update();", 7);
prop.setImage(DROOLS_ICON);
list.add(prop);
prop = new RuleCompletionProposal(prefix.length(), "retract",
"retract();", 8);
prop.setImage(DROOLS_ICON);
list.add(prop);
- prop = new RuleCompletionProposal(prefix.length(), "assert",
- "assert();", 7);
+ prop = new RuleCompletionProposal(prefix.length(), "insert",
+ "insert();", 7);
prop.setImage(DROOLS_ICON);
list.add(prop);
- prop = new RuleCompletionProposal(prefix.length(), "assertLogical",
- "assertLogical();", 14);
+ prop = new RuleCompletionProposal(prefix.length(), "insertLogical",
+ "insertLogical();", 14);
prop.setImage(DROOLS_ICON);
list.add(prop);
}
Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/editors/rete/model/GraphicalVertex.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/editors/rete/model/GraphicalVertex.java 2007-06-13 02:46:52 UTC (rev 12525)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/editors/rete/model/GraphicalVertex.java 2007-06-13 02:47:00 UTC (rev 12526)
@@ -239,7 +239,7 @@
/**
* Set the Size of this vertex.
- * Will not modify the size if newSize is null.
+ * Will not update the size if newSize is null.
* @param newSize a non-null Dimension instance or null
*/
public void setSize(Dimension newSize) {
Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/resources/org/drools/eclipse/editors/keywords.properties
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/resources/org/drools/eclipse/editors/keywords.properties 2007-06-13 02:46:52 UTC (rev 12525)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/resources/org/drools/eclipse/editors/keywords.properties 2007-06-13 02:47:00 UTC (rev 12526)
@@ -3,10 +3,10 @@
then
rule
end
-modify
+update
retract
-assert
-assertLogical
+insert
+insertLogical
salience
import
expander
Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/resources/org/drools/eclipse/wizard/project/Sample.drl.template
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/resources/org/drools/eclipse/wizard/project/Sample.drl.template 2007-06-13 02:46:52 UTC (rev 12525)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/resources/org/drools/eclipse/wizard/project/Sample.drl.template 2007-06-13 02:47:00 UTC (rev 12526)
@@ -9,7 +9,7 @@
System.out.println( message );
m.setMessage( "Goodbye cruel world" );
m.setStatus( Message.GOODBYE );
- modify( m );
+ update( m );
end
rule "GoodBye"
More information about the jboss-svn-commits
mailing list