[jboss-svn-commits] JBL Code SVN: r12248 - in labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin: src/main/java/org/drools/eclipse and 14 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Wed May 30 20:20:44 EDT 2007
Author: KrisVerlaenen
Date: 2007-05-30 20:20:43 -0400 (Wed, 30 May 2007)
New Revision: 12248
Added:
labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/debug/RealtimeAuditView.java
labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/common/datatype/DataTypeRegistry.java
labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/common/datatype/impl/DataTypeRegistryImpl.java
labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/common/view/datatype/editor/DataTypeEditor.java
labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/common/view/datatype/editor/Editor.java
Removed:
labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/common/datatype/IDataTypeRegistry.java
labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/common/datatype/impl/DataTypeRegistry.java
labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/common/view/datatype/editor/IDataTypeEditor.java
labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/common/view/datatype/editor/IEditor.java
Modified:
labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/plugin.xml
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/builder/DroolsBuilder.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/debug/DroolsDebugEventHandlerView.java
labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/common/datatype/DefaultDataTypeRegistry.java
labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/common/editor/GenericContextMenuProvider.java
labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/common/editor/core/ProcessWrapper.java
labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/common/view/datatype/editor/impl/BooleanEditor.java
labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/common/view/datatype/editor/impl/DataTypeCombo.java
labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/common/view/datatype/editor/impl/DataTypeEditorComposite.java
labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/common/view/datatype/editor/impl/EditorComposite.java
labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/common/view/datatype/editor/impl/EmptyEditor.java
labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/common/view/datatype/editor/impl/FloatEditor.java
labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/common/view/datatype/editor/impl/IntegerEditor.java
labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/common/view/datatype/editor/impl/StringEditor.java
labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/core/ConnectionWrapper.java
labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/core/EndNodeWrapper.java
labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/core/JoinWrapper.java
labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/core/NodeWrapper.java
labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/core/RuleFlowProcessWrapper.java
labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/core/RuleSetNodeWrapper.java
labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/core/SplitWrapper.java
labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/core/StartNodeWrapper.java
labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/editor/RuleFlowPaletteFactory.java
labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/editor/action/CheckRuleFlowAction.java
labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/editor/editpart/RuleFlowConnectionEditPart.java
labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/constraint/ConstraintListCellEditor.java
labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/constraint/ConstraintListDialog.java
labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/constraint/ConstraintsPropertyDescriptor.java
labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/constraint/RuleFlowConstraintDialog.java
labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/variable/VariableDialog.java
labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/variable/VariableListDialog.java
Log:
JBRRULES-770: Expose the enter and exit events for RuleFlow
- core + IDE (audit view) now supports 4 events for ruleflow (groups)
JBRULES-893: Realtime audit view
- First code for realtime audit view when selecting WorkingMemoryInMemoryLogger
JBRULES-894: Support for .package files in IDE
- .package files supported
Minor fixed for ruleflow
- empty ruleflow-groups now automatically deactivate when triggered
- fixed bug in split instance lookup
- removed all Ixxx interfaces in ruleflow
Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/plugin.xml
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/plugin.xml 2007-05-31 00:20:16 UTC (rev 12247)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/plugin.xml 2007-05-31 00:20:43 UTC (rev 12248)
@@ -28,6 +28,13 @@
id="org.drools.eclipse.debug.ApplicationDataView">
</view>
<view
+ name="Realtime Audit View"
+ icon="icons/drools.gif"
+ category="org.drools.eclipse.views"
+ class="org.drools.eclipse.debug.RealtimeAuditView"
+ id="org.drools.eclipse.debug.RealtimeAuditView">
+ </view>
+ <view
name="Audit View"
icon="icons/drools.gif"
category="org.drools.eclipse.views"
@@ -57,7 +64,7 @@
<editor
class="org.drools.eclipse.editors.DRLRuleEditor2"
contributorClass="org.drools.eclipse.editors.DRLRuleEditorActionContributor"
- extensions="drl,jbrule,drools,rule"
+ extensions="drl,jbrule,drools,rule,package,pkg"
icon="icons/drools.gif"
id="org.drools.eclipse.editors.DRLRuleEditor"
name="Rule Editor"/>
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-05-31 00:20:16 UTC (rev 12247)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/DroolsEclipsePlugin.java 2007-05-31 00:20:43 UTC (rev 12248)
@@ -294,7 +294,7 @@
try {
builder_configuration.setClassLoader(newLoader);
Thread.currentThread().setContextClassLoader(newLoader);
-
+
// first parse the source
PackageDescr packageDescr = null;
if (useCache) {
@@ -303,6 +303,7 @@
packageDescr = cachedDrlInfo.getPackageDescr();
}
}
+
if (packageDescr == null) {
if (dslReader != null) {
packageDescr = parser.parse(content, dslReader);
@@ -315,6 +316,15 @@
// compile parsed rules if necessary
if (compile && !parser.hasErrors()) {
builder = new PackageBuilder(builder_configuration);
+
+ // check whether a .package file exists and add it
+ if (resource.getParent() != null) {
+ IResource packageDef = resource.getParent().findMember(".package");
+ if (packageDef != null) {
+ builder.addPackage(parseResource(packageDef, false).getPackageDescr());
+ }
+ }
+
builder.addPackage(packageDescr);
result = new DRLInfo(
resource.getProjectRelativePath().toString(),
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-05-31 00:20:16 UTC (rev 12247)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/DroolsPluginImages.java 2007-05-31 00:20:43 UTC (rev 12248)
@@ -53,6 +53,7 @@
public static final String IMPORT = "Import";
public static final String DSL = "DSL";
public static final String GLOBAL = "Global";
+ public static final String RULEFLOW = "RuleFlow";
private static ImageRegistry imageRegistry;
private static final String PATH_SUFFIX = "/icons/";
@@ -84,6 +85,7 @@
declareRegistryImage(IMPORT, "import.gif");
declareRegistryImage(DSL, "dsl.GIF");
declareRegistryImage(GLOBAL, "field_public_obj.gif");
+ declareRegistryImage(RULEFLOW, "process.gif");
}
/**
Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/builder/DroolsBuilder.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/builder/DroolsBuilder.java 2007-05-31 00:20:16 UTC (rev 12247)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/builder/DroolsBuilder.java 2007-05-31 00:20:43 UTC (rev 12248)
@@ -119,7 +119,8 @@
if (res instanceof IFile
&& ("drl".equals(res.getFileExtension())
- || "dslr".equals(res.getFileExtension()))) {
+ || "dslr".equals(res.getFileExtension())
+ || ".package".equals(res.getName()))) {
removeProblemsFor(res);
try {
DroolsBuildMarker[] markers = parseDRLFile((IFile) res, new String(Util.getResourceContentsAsCharArray((IFile) res)));
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-05-31 00:20:16 UTC (rev 12247)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/debug/AuditView.java 2007-05-31 00:20:43 UTC (rev 12248)
@@ -14,6 +14,8 @@
import org.drools.audit.event.ActivationLogEvent;
import org.drools.audit.event.LogEvent;
import org.drools.audit.event.ObjectLogEvent;
+import org.drools.audit.event.RuleFlowGroupLogEvent;
+import org.drools.audit.event.RuleFlowLogEvent;
import org.drools.eclipse.DroolsEclipsePlugin;
import org.drools.eclipse.DroolsPluginImages;
import org.drools.eclipse.debug.actions.DeleteLogAction;
@@ -52,7 +54,7 @@
private IAction deleteAction;
private IAction refreshAction;
- public Viewer createViewer(Composite parent) {
+ protected Viewer createViewer(Composite parent) {
final TreeViewer variablesViewer = new TreeViewer(parent);
variablesViewer.setContentProvider(new AuditViewContentProvider());
variablesViewer.setLabelProvider(new AuditLabelProvider());
@@ -79,87 +81,9 @@
}
try {
XStream xstream = new XStream();
- // TODO
ObjectInputStream in = xstream.createObjectInputStream(
new FileReader(logFileName));
- List logEvents = (List) in.readObject();
- Iterator iterator = logEvents.iterator();
- List events = new ArrayList();
- Event currentBeforeActivationEvent = null;
- List newActivations = new ArrayList();
- Map activationMap = new HashMap();
- Map objectMap = new HashMap();
- while (iterator.hasNext()) {
- LogEvent inEvent = (LogEvent) iterator.next();
- Event event = new Event(inEvent.getType());
- switch (inEvent.getType()) {
- case LogEvent.OBJECT_ASSERTED:
- ObjectLogEvent inObjectEvent = (ObjectLogEvent) inEvent;
- event.setString("Object asserted (" + inObjectEvent.getFactId() + "): " + inObjectEvent.getObjectToString());
- if (currentBeforeActivationEvent != null) {
- currentBeforeActivationEvent.addSubEvent(event);
- } else {
- events.add(event);
- }
- event.addSubEvents(newActivations);
- newActivations.clear();
- objectMap.put(new Long(((ObjectLogEvent) inEvent).getFactId()), event);
- break;
- case LogEvent.OBJECT_MODIFIED:
- inObjectEvent = (ObjectLogEvent) inEvent;
- event.setString("Object modified (" + inObjectEvent.getFactId() + "): " + inObjectEvent.getObjectToString());
- if (currentBeforeActivationEvent != null) {
- currentBeforeActivationEvent.addSubEvent(event);
- } else {
- events.add(event);
- }
- event.addSubEvents(newActivations);
- newActivations.clear();
- Event assertEvent = (Event) objectMap.get(new Long(((ObjectLogEvent) inEvent).getFactId()));
- if (assertEvent != null) {
- event.setCauseEvent(assertEvent);
- }
- break;
- case LogEvent.OBJECT_RETRACTED:
- inObjectEvent = (ObjectLogEvent) inEvent;
- event.setString("Object retracted (" + inObjectEvent.getFactId() + "): " + inObjectEvent.getObjectToString());
- if (currentBeforeActivationEvent != null) {
- currentBeforeActivationEvent.addSubEvent(event);
- } else {
- events.add(event);
- }
- event.addSubEvents(newActivations);
- newActivations.clear();
- assertEvent = (Event) objectMap.get(new Long(((ObjectLogEvent) inEvent).getFactId()));
- if (assertEvent != null) {
- event.setCauseEvent(assertEvent);
- }
- break;
- case LogEvent.ACTIVATION_CREATED:
- ActivationLogEvent inActivationEvent = (ActivationLogEvent) inEvent;
- event.setString("Activation created: Rule " + inActivationEvent.getRule() + " " + inActivationEvent.getDeclarations());
- newActivations.add(event);
- activationMap.put(((ActivationLogEvent) inEvent).getActivationId(), event);
- break;
- case LogEvent.ACTIVATION_CANCELLED:
- inActivationEvent = (ActivationLogEvent) inEvent;
- event.setString("Activation cancelled: Rule " + inActivationEvent.getRule() + " " + inActivationEvent.getDeclarations());
- newActivations.add(event);
- event.setCauseEvent((Event) activationMap.get(((ActivationLogEvent) inEvent).getActivationId()));
- break;
- case LogEvent.BEFORE_ACTIVATION_FIRE:
- inActivationEvent = (ActivationLogEvent) inEvent;
- event.setString("Activation executed: Rule " + inActivationEvent.getRule() + " " + inActivationEvent.getDeclarations());
- events.add(event);
- currentBeforeActivationEvent = event;
- event.setCauseEvent((Event) activationMap.get(((ActivationLogEvent) inEvent).getActivationId()));
- break;
- case LogEvent.AFTER_ACTIVATION_FIRE:
- currentBeforeActivationEvent = null;
- break;
- }
- }
- getViewer().setInput(events);
+ getViewer().setInput(createEventList((List) in.readObject()));
// TODO: this is necessary because otherwise, the show cause action
// cannot find the cause event if it hasn't been shown yet
((TreeViewer) getViewer()).expandAll();
@@ -172,6 +96,126 @@
}
}
+ protected List createEventList(List logEvents) {
+ Iterator iterator = logEvents.iterator();
+ List events = new ArrayList();
+ Event currentBeforeActivationEvent = null;
+ List newActivations = new ArrayList();
+ Map activationMap = new HashMap();
+ Map objectMap = new HashMap();
+ while (iterator.hasNext()) {
+ LogEvent inEvent = (LogEvent) iterator.next();
+ Event event = new Event(inEvent.getType());
+ switch (inEvent.getType()) {
+ case LogEvent.OBJECT_ASSERTED:
+ ObjectLogEvent inObjectEvent = (ObjectLogEvent) inEvent;
+ event.setString("Object asserted (" + inObjectEvent.getFactId() + "): " + inObjectEvent.getObjectToString());
+ if (currentBeforeActivationEvent != null) {
+ currentBeforeActivationEvent.addSubEvent(event);
+ } else {
+ events.add(event);
+ }
+ event.addSubEvents(newActivations);
+ newActivations.clear();
+ objectMap.put(new Long(((ObjectLogEvent) inEvent).getFactId()), event);
+ break;
+ case LogEvent.OBJECT_MODIFIED:
+ inObjectEvent = (ObjectLogEvent) inEvent;
+ event.setString("Object modified (" + inObjectEvent.getFactId() + "): " + inObjectEvent.getObjectToString());
+ if (currentBeforeActivationEvent != null) {
+ currentBeforeActivationEvent.addSubEvent(event);
+ } else {
+ events.add(event);
+ }
+ event.addSubEvents(newActivations);
+ newActivations.clear();
+ Event assertEvent = (Event) objectMap.get(new Long(((ObjectLogEvent) inEvent).getFactId()));
+ if (assertEvent != null) {
+ event.setCauseEvent(assertEvent);
+ }
+ break;
+ case LogEvent.OBJECT_RETRACTED:
+ inObjectEvent = (ObjectLogEvent) inEvent;
+ event.setString("Object retracted (" + inObjectEvent.getFactId() + "): " + inObjectEvent.getObjectToString());
+ if (currentBeforeActivationEvent != null) {
+ currentBeforeActivationEvent.addSubEvent(event);
+ } else {
+ events.add(event);
+ }
+ event.addSubEvents(newActivations);
+ newActivations.clear();
+ assertEvent = (Event) objectMap.get(new Long(((ObjectLogEvent) inEvent).getFactId()));
+ if (assertEvent != null) {
+ event.setCauseEvent(assertEvent);
+ }
+ break;
+ case LogEvent.ACTIVATION_CREATED:
+ ActivationLogEvent inActivationEvent = (ActivationLogEvent) inEvent;
+ event.setString("Activation created: Rule " + inActivationEvent.getRule() + " " + inActivationEvent.getDeclarations());
+ newActivations.add(event);
+ activationMap.put(((ActivationLogEvent) inEvent).getActivationId(), event);
+ break;
+ case LogEvent.ACTIVATION_CANCELLED:
+ inActivationEvent = (ActivationLogEvent) inEvent;
+ event.setString("Activation cancelled: Rule " + inActivationEvent.getRule() + " " + inActivationEvent.getDeclarations());
+ newActivations.add(event);
+ event.setCauseEvent((Event) activationMap.get(((ActivationLogEvent) inEvent).getActivationId()));
+ break;
+ case LogEvent.BEFORE_ACTIVATION_FIRE:
+ inActivationEvent = (ActivationLogEvent) inEvent;
+ event.setString("Activation executed: Rule " + inActivationEvent.getRule() + " " + inActivationEvent.getDeclarations());
+ events.add(event);
+ currentBeforeActivationEvent = event;
+ event.setCauseEvent((Event) activationMap.get(((ActivationLogEvent) inEvent).getActivationId()));
+ break;
+ case LogEvent.AFTER_ACTIVATION_FIRE:
+ currentBeforeActivationEvent = null;
+ break;
+ case LogEvent.RULEFLOW_CREATED:
+ RuleFlowLogEvent inRuleFlowEvent = (RuleFlowLogEvent) inEvent;
+ event.setString("RuleFlow started: " + inRuleFlowEvent.getProcessName() + "[" + inRuleFlowEvent.getProcessId() + "]");
+ if (currentBeforeActivationEvent != null) {
+ currentBeforeActivationEvent.addSubEvent(event);
+ } else {
+ events.add(event);
+ }
+ break;
+ case LogEvent.RULEFLOW_COMPLETED:
+ inRuleFlowEvent = (RuleFlowLogEvent) inEvent;
+ event.setString("RuleFlow completed: " + inRuleFlowEvent.getProcessName() + "[" + inRuleFlowEvent.getProcessId() + "]");
+ if (currentBeforeActivationEvent != null) {
+ currentBeforeActivationEvent.addSubEvent(event);
+ } else {
+ events.add(event);
+ }
+ break;
+ case LogEvent.RULEFLOW_GROUP_ACTIVATED:
+ RuleFlowGroupLogEvent inRuleFlowGroupEvent = (RuleFlowGroupLogEvent) inEvent;
+ event.setString("RuleFlowGroup activated: " + inRuleFlowGroupEvent.getGroupName() + "[size=" + inRuleFlowGroupEvent.getSize() + "]");
+ event.addSubEvents(newActivations);
+ newActivations.clear();
+ if (currentBeforeActivationEvent != null) {
+ currentBeforeActivationEvent.addSubEvent(event);
+ } else {
+ events.add(event);
+ }
+ break;
+ case LogEvent.RULEFLOW_GROUP_DEACTIVATED:
+ inRuleFlowGroupEvent = (RuleFlowGroupLogEvent) inEvent;
+ event.setString("RuleFlowGroup deactivated: " + inRuleFlowGroupEvent.getGroupName() + "[size=" + inRuleFlowGroupEvent.getSize() + "]");
+ event.addSubEvents(newActivations);
+ newActivations.clear();
+ if (currentBeforeActivationEvent != null) {
+ currentBeforeActivationEvent.addSubEvent(event);
+ } else {
+ events.add(event);
+ }
+ break;
+ }
+ }
+ return events;
+ }
+
public void deleteLog() {
if (logFileName != null) {
File file = new File(logFileName);
@@ -330,6 +374,10 @@
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);
+ case LogEvent.RULEFLOW_CREATED: return DroolsPluginImages.getImage(DroolsPluginImages.RULEFLOW);
+ case LogEvent.RULEFLOW_COMPLETED: return DroolsPluginImages.getImage(DroolsPluginImages.RULEFLOW);
+ case LogEvent.RULEFLOW_GROUP_ACTIVATED: return DroolsPluginImages.getImage(DroolsPluginImages.RULEFLOW);
+ case LogEvent.RULEFLOW_GROUP_DEACTIVATED: return DroolsPluginImages.getImage(DroolsPluginImages.RULEFLOW);
}
return null;
}
Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/debug/DroolsDebugEventHandlerView.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/debug/DroolsDebugEventHandlerView.java 2007-05-31 00:20:16 UTC (rev 12247)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/debug/DroolsDebugEventHandlerView.java 2007-05-31 00:20:43 UTC (rev 12248)
@@ -63,7 +63,7 @@
protected void setViewerInput(Object context) {
Object input = null;
- // if a working memory has been expressively selected as variable, use this
+ // if a working memory has been explicitly selected as variable, use this
if (context instanceof IVariable) {
IVariable variable = (IVariable) context;
try {
Added: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/debug/RealtimeAuditView.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/debug/RealtimeAuditView.java (rev 0)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/debug/RealtimeAuditView.java 2007-05-31 00:20:43 UTC (rev 12248)
@@ -0,0 +1,105 @@
+package org.drools.eclipse.debug;
+
+import java.io.ObjectInputStream;
+import java.io.StringReader;
+import java.util.List;
+
+import org.drools.eclipse.DroolsEclipsePlugin;
+import org.eclipse.debug.core.DebugException;
+import org.eclipse.debug.core.model.IValue;
+import org.eclipse.debug.core.model.IVariable;
+import org.eclipse.debug.ui.IDebugUIConstants;
+import org.eclipse.jdt.debug.core.IJavaObject;
+import org.eclipse.jface.action.IToolBarManager;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.ui.ISelectionListener;
+import org.eclipse.ui.IWorkbenchPart;
+
+import com.thoughtworks.xstream.XStream;
+
+/**
+ * An audit view that shows the contents of the selected logger when debugging.
+ *
+ * @author <a href="mailto:kris_verlaenen at hotmail.com">Kris Verlaenen</a>
+ */
+public class RealtimeAuditView extends AuditView implements ISelectionListener {
+
+ public void dispose() {
+ getSite().getPage().removeSelectionListener(IDebugUIConstants.ID_VARIABLE_VIEW, this);
+ super.dispose();
+ }
+
+ protected Viewer createViewer(Composite parent) {
+ getSite().getPage().addSelectionListener(IDebugUIConstants.ID_VARIABLE_VIEW, this);
+ return super.createViewer(parent);
+ }
+
+ protected void setViewerInput(Object context) {
+ // if an in memory logger has been explicitly selected as variable
+ if (context instanceof IVariable) {
+ IVariable variable = (IVariable) context;
+ try {
+ IValue value = ((IVariable) context).getValue();
+ if (value != null && value instanceof IJavaObject
+ && "org.drools.audit.WorkingMemoryInMemoryLogger".equals(
+ variable.getValue().getReferenceTypeName())) {
+ setAuditEvents((IJavaObject) value);
+ }
+ } catch (Throwable t) {
+ DroolsEclipsePlugin.log(t);
+ }
+ }
+ }
+
+ protected void becomesHidden() {
+ setViewerInput(null);
+ super.becomesHidden();
+ }
+
+ protected void becomesVisible() {
+ super.becomesVisible();
+ ISelection selection = getSite().getPage().getSelection(
+ IDebugUIConstants.ID_VARIABLE_VIEW);
+ if (selection instanceof IStructuredSelection) {
+ setViewerInput(((IStructuredSelection) selection).getFirstElement());
+ }
+ }
+
+ public void selectionChanged(IWorkbenchPart part, ISelection selection) {
+ if (!isAvailable()) {
+ return;
+ }
+ if (selection == null) {
+ setViewerInput(null);
+ } else if (selection instanceof IStructuredSelection) {
+ setViewerInput(((IStructuredSelection) selection).getFirstElement());
+ }
+ }
+
+ protected void createActions() {
+ }
+
+ protected void configureToolBar(IToolBarManager tbm) {
+ }
+
+ private void setAuditEvents(IJavaObject inMemoryLogger) throws DebugException {
+ IValue eventString = DebugUtil.getValueByExpression("return getEvents();", inMemoryLogger);
+ String s = eventString.getValueString();
+ if (s != null) {
+ try {
+ XStream xstream = new XStream();
+ ObjectInputStream in = xstream.createObjectInputStream(
+ new StringReader(s));
+ getViewer().setInput(createEventList((List) in.readObject()));
+ } catch (Throwable t) {
+ DroolsEclipsePlugin.log(t);
+ getViewer().setInput(null);
+ }
+ } else {
+ getViewer().setInput(null);
+ }
+ }
+}
Copied: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/common/datatype/DataTypeRegistry.java (from rev 12245, labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/common/datatype/IDataTypeRegistry.java)
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/common/datatype/DataTypeRegistry.java (rev 0)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/common/datatype/DataTypeRegistry.java 2007-05-31 00:20:43 UTC (rev 12248)
@@ -0,0 +1,52 @@
+package org.drools.eclipse.flow.common.datatype;
+/*
+ * 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.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import java.util.Set;
+
+import org.drools.ruleflow.common.datatype.DataTypeFactory;
+
+/**
+ * A registry of datatypes.
+ *
+ * @author <a href="mailto:kris_verlaenen at hotmail.com">Kris Verlaenen</a>
+ */
+public interface DataTypeRegistry {
+
+ /**
+ * Returns all registered data types.
+ */
+ Set getDataTypes();
+
+ void registerDataType(Class type, DataTypeFactory dataTypeFactory, String name,
+ Class valueEditorClass, Class dataTypeEditorClass);
+
+ /**
+ * Returns the data type info of the data type with the given type
+ * @param type
+ * @return the data type info
+ * @throws IllegalArgumentException if the data type info of this type cannot be found
+ */
+ IDataTypeInfo getDataTypeInfo(Class type);
+
+ interface IDataTypeInfo {
+ Class getType();
+ DataTypeFactory getDataTypeFactory();
+ String getName();
+ Class getDataTypeEditorClass();
+ Class getValueEditorClass();
+ }
+}
Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/common/datatype/DefaultDataTypeRegistry.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/common/datatype/DefaultDataTypeRegistry.java 2007-05-31 00:20:16 UTC (rev 12247)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/common/datatype/DefaultDataTypeRegistry.java 2007-05-31 00:20:43 UTC (rev 12248)
@@ -15,11 +15,11 @@
* limitations under the License.
*/
-import org.drools.eclipse.flow.common.datatype.impl.DataTypeRegistry;
+import org.drools.eclipse.flow.common.datatype.impl.DataTypeRegistryImpl;
import org.drools.eclipse.flow.common.view.datatype.editor.impl.BooleanEditor;
import org.drools.eclipse.flow.common.view.datatype.editor.impl.EmptyEditor;
import org.drools.eclipse.flow.common.view.datatype.editor.impl.IntegerEditor;
-import org.drools.ruleflow.common.datatype.IDataTypeFactory;
+import org.drools.ruleflow.common.datatype.DataTypeFactory;
import org.drools.ruleflow.common.datatype.impl.InstanceDataTypeFactory;
import org.drools.ruleflow.common.datatype.impl.type.BooleanDataType;
import org.drools.ruleflow.common.datatype.impl.type.FloatDataType;
@@ -37,7 +37,7 @@
*/
public class DefaultDataTypeRegistry {
- private static final IDataTypeRegistry variableDataTypeRegistry = new DataTypeRegistry();
+ private static final DataTypeRegistry variableDataTypeRegistry = new DataTypeRegistryImpl();
private DefaultDataTypeRegistry() {
}
@@ -61,13 +61,13 @@
}
public static void registerVariableDataType(Class type,
- IDataTypeFactory dataTypeFactory, String name,
+ DataTypeFactory dataTypeFactory, String name,
Class valueEditorClass, Class dataTypeEditorClass) {
variableDataTypeRegistry.registerDataType(type, dataTypeFactory, name,
valueEditorClass, dataTypeEditorClass);
}
- public static IDataTypeRegistry getInstance() {
+ public static DataTypeRegistry getInstance() {
return variableDataTypeRegistry;
}
Deleted: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/common/datatype/IDataTypeRegistry.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/common/datatype/IDataTypeRegistry.java 2007-05-31 00:20:16 UTC (rev 12247)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/common/datatype/IDataTypeRegistry.java 2007-05-31 00:20:43 UTC (rev 12248)
@@ -1,52 +0,0 @@
-package org.drools.eclipse.flow.common.datatype;
-/*
- * 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.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import java.util.Set;
-
-import org.drools.ruleflow.common.datatype.IDataTypeFactory;
-
-/**
- * A registry of datatypes.
- *
- * @author <a href="mailto:kris_verlaenen at hotmail.com">Kris Verlaenen</a>
- */
-public interface IDataTypeRegistry {
-
- /**
- * Returns all registered data types.
- */
- Set getDataTypes();
-
- void registerDataType(Class type, IDataTypeFactory dataTypeFactory, String name,
- Class valueEditorClass, Class dataTypeEditorClass);
-
- /**
- * Returns the data type info of the data type with the given type
- * @param type
- * @return the data type info
- * @throws IllegalArgumentException if the data type info of this type cannot be found
- */
- IDataTypeInfo getDataTypeInfo(Class type);
-
- interface IDataTypeInfo {
- Class getType();
- IDataTypeFactory getDataTypeFactory();
- String getName();
- Class getDataTypeEditorClass();
- Class getValueEditorClass();
- }
-}
Deleted: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/common/datatype/impl/DataTypeRegistry.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/common/datatype/impl/DataTypeRegistry.java 2007-05-31 00:20:16 UTC (rev 12247)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/common/datatype/impl/DataTypeRegistry.java 2007-05-31 00:20:43 UTC (rev 12248)
@@ -1,95 +0,0 @@
-package org.drools.eclipse.flow.common.datatype.impl;
-/*
- * 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.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-
-import org.drools.eclipse.flow.common.datatype.IDataTypeRegistry;
-import org.drools.ruleflow.common.datatype.IDataTypeFactory;
-
-/**
- * Default implementation of a datatype registry.
- *
- * @author <a href="mailto:kris_verlaenen at hotmail.com">Kris Verlaenen</a>
- */
-public class DataTypeRegistry implements IDataTypeRegistry {
-
- private Map dataTypes = new HashMap();
-
- public Set getDataTypes() {
- return new HashSet(dataTypes.values());
- }
-
- public void registerDataType(Class type, IDataTypeFactory dataTypeFactory, String name,
- Class valueEditorClass, Class dataTypeEditorClass) {
- if (dataTypeFactory == null) {
- throw new NullPointerException("Data type factory may not be null");
- }
- if (name == null) {
- throw new NullPointerException("Name may not be null");
- }
- if (valueEditorClass == null) {
- throw new NullPointerException("valueEditorClass may not be null");
- }
- if (dataTypeEditorClass == null) {
- throw new NullPointerException("dataTypeEditorClass may not be null");
- }
- dataTypes.put(type, new DataTypeInfo(
- type, dataTypeFactory, name, valueEditorClass, dataTypeEditorClass));
- }
-
- public IDataTypeInfo getDataTypeInfo(Class type) {
- IDataTypeInfo dataTypeInfo = (IDataTypeInfo) dataTypes.get(type);
- if (dataTypeInfo == null) {
- throw new IllegalArgumentException("Cannot find data type info with type " + type);
- }
- return dataTypeInfo;
- }
-
- public class DataTypeInfo implements IDataTypeInfo {
- private Class type;
- private IDataTypeFactory dataTypeFactory;
- private String name;
- private Class valueEditorClass;
- private Class dataTypeEditorClass;
- private DataTypeInfo(Class type, IDataTypeFactory dataTypeFactory, String name,
- Class valueEditorClass, Class dataTypeEditorClass) {
- this.type = type;
- this.dataTypeFactory = dataTypeFactory;
- this.name = name;
- this.valueEditorClass = valueEditorClass;
- this.dataTypeEditorClass = dataTypeEditorClass;
- }
- public Class getType() {
- return type;
- }
- public IDataTypeFactory getDataTypeFactory() {
- return dataTypeFactory;
- }
- public String getName() {
- return name;
- }
- public Class getValueEditorClass() {
- return valueEditorClass;
- }
- public Class getDataTypeEditorClass() {
- return dataTypeEditorClass;
- }
- }
-}
Copied: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/common/datatype/impl/DataTypeRegistryImpl.java (from rev 12245, labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/common/datatype/impl/DataTypeRegistry.java)
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/common/datatype/impl/DataTypeRegistryImpl.java (rev 0)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/common/datatype/impl/DataTypeRegistryImpl.java 2007-05-31 00:20:43 UTC (rev 12248)
@@ -0,0 +1,95 @@
+package org.drools.eclipse.flow.common.datatype.impl;
+/*
+ * 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.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
+import org.drools.eclipse.flow.common.datatype.DataTypeRegistry;
+import org.drools.ruleflow.common.datatype.DataTypeFactory;
+
+/**
+ * Default implementation of a datatype registry.
+ *
+ * @author <a href="mailto:kris_verlaenen at hotmail.com">Kris Verlaenen</a>
+ */
+public class DataTypeRegistryImpl implements DataTypeRegistry {
+
+ private Map dataTypes = new HashMap();
+
+ public Set getDataTypes() {
+ return new HashSet(dataTypes.values());
+ }
+
+ public void registerDataType(Class type, DataTypeFactory dataTypeFactory, String name,
+ Class valueEditorClass, Class dataTypeEditorClass) {
+ if (dataTypeFactory == null) {
+ throw new NullPointerException("Data type factory may not be null");
+ }
+ if (name == null) {
+ throw new NullPointerException("Name may not be null");
+ }
+ if (valueEditorClass == null) {
+ throw new NullPointerException("valueEditorClass may not be null");
+ }
+ if (dataTypeEditorClass == null) {
+ throw new NullPointerException("dataTypeEditorClass may not be null");
+ }
+ dataTypes.put(type, new DataTypeInfo(
+ type, dataTypeFactory, name, valueEditorClass, dataTypeEditorClass));
+ }
+
+ public IDataTypeInfo getDataTypeInfo(Class type) {
+ IDataTypeInfo dataTypeInfo = (IDataTypeInfo) dataTypes.get(type);
+ if (dataTypeInfo == null) {
+ throw new IllegalArgumentException("Cannot find data type info with type " + type);
+ }
+ return dataTypeInfo;
+ }
+
+ public class DataTypeInfo implements IDataTypeInfo {
+ private Class type;
+ private DataTypeFactory dataTypeFactory;
+ private String name;
+ private Class valueEditorClass;
+ private Class dataTypeEditorClass;
+ private DataTypeInfo(Class type, DataTypeFactory dataTypeFactory, String name,
+ Class valueEditorClass, Class dataTypeEditorClass) {
+ this.type = type;
+ this.dataTypeFactory = dataTypeFactory;
+ this.name = name;
+ this.valueEditorClass = valueEditorClass;
+ this.dataTypeEditorClass = dataTypeEditorClass;
+ }
+ public Class getType() {
+ return type;
+ }
+ public DataTypeFactory getDataTypeFactory() {
+ return dataTypeFactory;
+ }
+ public String getName() {
+ return name;
+ }
+ public Class getValueEditorClass() {
+ return valueEditorClass;
+ }
+ public Class getDataTypeEditorClass() {
+ return dataTypeEditorClass;
+ }
+ }
+}
Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/common/editor/GenericContextMenuProvider.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/common/editor/GenericContextMenuProvider.java 2007-05-31 00:20:16 UTC (rev 12247)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/common/editor/GenericContextMenuProvider.java 2007-05-31 00:20:43 UTC (rev 12248)
@@ -16,9 +16,10 @@
*/
import org.eclipse.gef.ContextMenuProvider;
-import org.eclipse.gef.EditPartViewer;
+import org.eclipse.gef.GraphicalViewer;
import org.eclipse.gef.ui.actions.ActionRegistry;
import org.eclipse.gef.ui.actions.GEFActionConstants;
+import org.eclipse.gef.ui.actions.ToggleGridAction;
import org.eclipse.jface.action.IAction;
import org.eclipse.jface.action.IMenuManager;
import org.eclipse.ui.actions.ActionFactory;
@@ -32,7 +33,7 @@
private ActionRegistry actionRegistry;
- public GenericContextMenuProvider(EditPartViewer viewer,
+ public GenericContextMenuProvider(GraphicalViewer viewer,
ActionRegistry registry) {
super(viewer);
setActionRegistry(registry);
Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/common/editor/core/ProcessWrapper.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/common/editor/core/ProcessWrapper.java 2007-05-31 00:20:16 UTC (rev 12247)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/common/editor/core/ProcessWrapper.java 2007-05-31 00:20:43 UTC (rev 12248)
@@ -25,7 +25,7 @@
import java.util.List;
import java.util.Map;
-import org.drools.ruleflow.common.core.IProcess;
+import org.drools.ruleflow.common.core.Process;
import org.eclipse.ui.views.properties.IPropertyDescriptor;
import org.eclipse.ui.views.properties.IPropertySource;
import org.eclipse.ui.views.properties.TextPropertyDescriptor;
@@ -52,7 +52,7 @@
};
}
- private IProcess process;
+ private Process process;
private Map elements = new HashMap();
private transient List listeners = new ArrayList();
@@ -60,9 +60,9 @@
process = createProcess();
}
- protected abstract IProcess createProcess();
+ protected abstract Process createProcess();
- public IProcess getProcess() {
+ public Process getProcess() {
return process;
}
Copied: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/common/view/datatype/editor/DataTypeEditor.java (from rev 12245, labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/common/view/datatype/editor/IDataTypeEditor.java)
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/common/view/datatype/editor/DataTypeEditor.java (rev 0)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/common/view/datatype/editor/DataTypeEditor.java 2007-05-31 00:20:43 UTC (rev 12248)
@@ -0,0 +1,40 @@
+package org.drools.eclipse.flow.common.view.datatype.editor;
+/*
+ * 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.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import org.drools.ruleflow.common.datatype.DataType;
+
+/**
+ * An editor for a datatype.
+ *
+ * @author <a href="mailto:kris_verlaenen at hotmail.com">Kris Verlaenen</a>
+ */
+public interface DataTypeEditor {
+
+ void setDataType(DataType dataType);
+
+ DataType getDataType();
+
+ void reset();
+
+ void addListener(DataTypeListener listener);
+
+ void removeListener(DataTypeListener listener);
+
+ public interface DataTypeListener {
+ void dataTypeChanged(DataType dataType);
+ }
+}
Copied: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/common/view/datatype/editor/Editor.java (from rev 12245, labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/common/view/datatype/editor/IEditor.java)
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/common/view/datatype/editor/Editor.java (rev 0)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/common/view/datatype/editor/Editor.java 2007-05-31 00:20:43 UTC (rev 12248)
@@ -0,0 +1,38 @@
+package org.drools.eclipse.flow.common.view.datatype.editor;
+/*
+ * 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.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import java.io.Serializable;
+
+import org.drools.ruleflow.common.datatype.DataType;
+
+
+/**
+ * An editor for an object with a given datatype.
+ *
+ * @author <a href="mailto:kris_verlaenen at hotmail.com">Kris Verlaenen</a>
+ */
+public interface Editor {
+
+ void setDataType(DataType dataType);
+
+ Serializable getValue();
+
+ void setValue(Serializable value);
+
+ void reset();
+
+}
Deleted: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/common/view/datatype/editor/IDataTypeEditor.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/common/view/datatype/editor/IDataTypeEditor.java 2007-05-31 00:20:16 UTC (rev 12247)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/common/view/datatype/editor/IDataTypeEditor.java 2007-05-31 00:20:43 UTC (rev 12248)
@@ -1,40 +0,0 @@
-package org.drools.eclipse.flow.common.view.datatype.editor;
-/*
- * 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.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import org.drools.ruleflow.common.datatype.IDataType;
-
-/**
- * An editor for a datatype.
- *
- * @author <a href="mailto:kris_verlaenen at hotmail.com">Kris Verlaenen</a>
- */
-public interface IDataTypeEditor {
-
- void setDataType(IDataType dataType);
-
- IDataType getDataType();
-
- void reset();
-
- void addListener(DataTypeListener listener);
-
- void removeListener(DataTypeListener listener);
-
- public interface DataTypeListener {
- void dataTypeChanged(IDataType dataType);
- }
-}
Deleted: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/common/view/datatype/editor/IEditor.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/common/view/datatype/editor/IEditor.java 2007-05-31 00:20:16 UTC (rev 12247)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/common/view/datatype/editor/IEditor.java 2007-05-31 00:20:43 UTC (rev 12248)
@@ -1,38 +0,0 @@
-package org.drools.eclipse.flow.common.view.datatype.editor;
-/*
- * 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.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import java.io.Serializable;
-
-import org.drools.ruleflow.common.datatype.IDataType;
-
-
-/**
- * An editor for an object with a given datatype.
- *
- * @author <a href="mailto:kris_verlaenen at hotmail.com">Kris Verlaenen</a>
- */
-public interface IEditor {
-
- void setDataType(IDataType dataType);
-
- Serializable getValue();
-
- void setValue(Serializable value);
-
- void reset();
-
-}
Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/common/view/datatype/editor/impl/BooleanEditor.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/common/view/datatype/editor/impl/BooleanEditor.java 2007-05-31 00:20:16 UTC (rev 12247)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/common/view/datatype/editor/impl/BooleanEditor.java 2007-05-31 00:20:43 UTC (rev 12248)
@@ -17,8 +17,8 @@
import java.io.Serializable;
-import org.drools.eclipse.flow.common.view.datatype.editor.IEditor;
-import org.drools.ruleflow.common.datatype.IDataType;
+import org.drools.eclipse.flow.common.view.datatype.editor.Editor;
+import org.drools.ruleflow.common.datatype.DataType;
import org.drools.ruleflow.common.datatype.impl.type.BooleanDataType;
import org.eclipse.swt.SWT;
import org.eclipse.swt.layout.FillLayout;
@@ -30,7 +30,7 @@
*
* @author <a href="mailto:kris_verlaenen at hotmail.com">Kris Verlaenen</a>
*/
-public class BooleanEditor extends Composite implements IEditor {
+public class BooleanEditor extends Composite implements Editor {
private static final String[] TF = { "true", "false" };
@@ -44,7 +44,7 @@
combo.select(1);
}
- public void setDataType(IDataType dataType) {
+ public void setDataType(DataType dataType) {
if (!(dataType instanceof BooleanDataType)) {
throw new IllegalArgumentException("Illegal data type " + dataType);
}
Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/common/view/datatype/editor/impl/DataTypeCombo.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/common/view/datatype/editor/impl/DataTypeCombo.java 2007-05-31 00:20:16 UTC (rev 12247)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/common/view/datatype/editor/impl/DataTypeCombo.java 2007-05-31 00:20:43 UTC (rev 12248)
@@ -16,8 +16,8 @@
*/
import org.drools.eclipse.DroolsEclipsePlugin;
-import org.drools.eclipse.flow.common.datatype.IDataTypeRegistry;
-import org.drools.ruleflow.common.datatype.IDataType;
+import org.drools.eclipse.flow.common.datatype.DataTypeRegistry;
+import org.drools.ruleflow.common.datatype.DataType;
import org.eclipse.jface.viewers.ComboViewer;
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.ISelectionChangedListener;
@@ -34,33 +34,33 @@
*/
public class DataTypeCombo extends Composite {
- private IDataTypeRegistry registry;
+ private DataTypeRegistry registry;
private ComboViewer dataTypeCombo;
- public DataTypeCombo(Composite parent, int style, IDataTypeRegistry registry) {
+ public DataTypeCombo(Composite parent, int style, DataTypeRegistry registry) {
super(parent, style);
this.registry = registry;
setLayout(new FillLayout());
dataTypeCombo = new ComboViewer(this, SWT.READ_ONLY);
dataTypeCombo.setLabelProvider(new LabelProvider() {
public String getText(Object element) {
- return ((IDataTypeRegistry.IDataTypeInfo) element).getName();
+ return ((DataTypeRegistry.IDataTypeInfo) element).getName();
}
});
dataTypeCombo.add(registry.getDataTypes().toArray(
- new IDataTypeRegistry.IDataTypeInfo[0]));
+ new DataTypeRegistry.IDataTypeInfo[0]));
}
- private IDataTypeRegistry.IDataTypeInfo getSelectedTypeInfo() {
+ private DataTypeRegistry.IDataTypeInfo getSelectedTypeInfo() {
ISelection selection = dataTypeCombo.getSelection();
if (!selection.isEmpty()) {
- return (IDataTypeRegistry.IDataTypeInfo)
+ return (DataTypeRegistry.IDataTypeInfo)
((StructuredSelection) selection).getFirstElement();
}
return null;
}
- public void setDataType(IDataType dataType) {
+ public void setDataType(DataType dataType) {
if (dataType == null) {
dataTypeCombo.setSelection(null);
} else {
@@ -74,8 +74,8 @@
}
}
- public IDataType getDataType() {
- IDataTypeRegistry.IDataTypeInfo dataTypeInfo =
+ public DataType getDataType() {
+ DataTypeRegistry.IDataTypeInfo dataTypeInfo =
getSelectedTypeInfo();
return dataTypeInfo == null ? null :
dataTypeInfo.getDataTypeFactory().createDataType();
Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/common/view/datatype/editor/impl/DataTypeEditorComposite.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/common/view/datatype/editor/impl/DataTypeEditorComposite.java 2007-05-31 00:20:16 UTC (rev 12247)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/common/view/datatype/editor/impl/DataTypeEditorComposite.java 2007-05-31 00:20:43 UTC (rev 12248)
@@ -21,9 +21,9 @@
import java.util.List;
import org.drools.eclipse.DroolsEclipsePlugin;
-import org.drools.eclipse.flow.common.datatype.IDataTypeRegistry;
-import org.drools.eclipse.flow.common.view.datatype.editor.IDataTypeEditor;
-import org.drools.ruleflow.common.datatype.IDataType;
+import org.drools.eclipse.flow.common.datatype.DataTypeRegistry;
+import org.drools.eclipse.flow.common.view.datatype.editor.DataTypeEditor;
+import org.drools.ruleflow.common.datatype.DataType;
import org.drools.ruleflow.common.datatype.impl.type.UndefinedDataType;
import org.eclipse.swt.graphics.Color;
import org.eclipse.swt.layout.FillLayout;
@@ -34,18 +34,18 @@
*
* @author <a href="mailto:kris_verlaenen at hotmail.com">Kris Verlaenen</a>
*/
-public class DataTypeEditorComposite extends Composite implements IDataTypeEditor.DataTypeListener {
- private IDataTypeRegistry registry;
- private IDataTypeEditor dataTypeEditor;
+public class DataTypeEditorComposite extends Composite implements DataTypeEditor.DataTypeListener {
+ private DataTypeRegistry registry;
+ private DataTypeEditor dataTypeEditor;
private List listeners = new ArrayList();
- public DataTypeEditorComposite(Composite parent, int style, IDataTypeRegistry registry) {
+ public DataTypeEditorComposite(Composite parent, int style, DataTypeRegistry registry) {
super(parent, style);
this.registry = registry;
setLayout(new FillLayout());
dataTypeEditor = new EmptyEditor(this);
}
- public void setDataType(IDataType dataType) {
+ public void setDataType(DataType dataType) {
if (dataType == null) {
reset();
} else {
@@ -56,7 +56,7 @@
Class editorClass = null;
try {
editorClass = registry.getDataTypeInfo(dataType.getClass()).getDataTypeEditorClass();
- dataTypeEditor = (IDataTypeEditor) editorClass.getConstructor(
+ dataTypeEditor = (DataTypeEditor) editorClass.getConstructor(
new Class[] { Composite.class }).newInstance(new Object[] { this });
} catch (IllegalArgumentException e) {
// "Could not find data type info for type " + dataType.getClass()
@@ -85,7 +85,7 @@
}
}
- public IDataType getDataType() {
+ public DataType getDataType() {
return dataTypeEditor.getDataType();
}
@@ -98,23 +98,23 @@
((Composite) dataTypeEditor).setEnabled(enabled);
}
- public void addListener(IDataTypeEditor.DataTypeListener listener) {
+ public void addListener(DataTypeEditor.DataTypeListener listener) {
listeners.add(listener);
}
- public void removeListener(IDataTypeEditor.DataTypeListener listener) {
+ public void removeListener(DataTypeEditor.DataTypeListener listener) {
listeners.remove(listener);
}
private void notifyListeners() {
- IDataType dataType = getDataType();
+ DataType dataType = getDataType();
for (Iterator it = listeners.iterator(); it.hasNext(); ) {
- IDataTypeEditor.DataTypeListener listener = (IDataTypeEditor.DataTypeListener) it.next();
+ DataTypeEditor.DataTypeListener listener = (DataTypeEditor.DataTypeListener) it.next();
listener.dataTypeChanged(dataType);
}
}
- public void dataTypeChanged(IDataType dataType) {
+ public void dataTypeChanged(DataType dataType) {
notifyListeners();
}
Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/common/view/datatype/editor/impl/EditorComposite.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/common/view/datatype/editor/impl/EditorComposite.java 2007-05-31 00:20:16 UTC (rev 12247)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/common/view/datatype/editor/impl/EditorComposite.java 2007-05-31 00:20:43 UTC (rev 12248)
@@ -19,9 +19,9 @@
import java.lang.reflect.InvocationTargetException;
import org.drools.eclipse.DroolsEclipsePlugin;
-import org.drools.eclipse.flow.common.datatype.IDataTypeRegistry;
-import org.drools.eclipse.flow.common.view.datatype.editor.IEditor;
-import org.drools.ruleflow.common.datatype.IDataType;
+import org.drools.eclipse.flow.common.datatype.DataTypeRegistry;
+import org.drools.eclipse.flow.common.view.datatype.editor.Editor;
+import org.drools.ruleflow.common.datatype.DataType;
import org.eclipse.swt.layout.FillLayout;
import org.eclipse.swt.widgets.Composite;
@@ -32,17 +32,17 @@
*/
public class EditorComposite extends Composite {
- private IDataTypeRegistry registry;
- private IEditor editor;
+ private DataTypeRegistry registry;
+ private Editor editor;
- public EditorComposite(Composite parent, int style, IDataTypeRegistry registry) {
+ public EditorComposite(Composite parent, int style, DataTypeRegistry registry) {
super(parent, style);
this.registry = registry;
setLayout(new FillLayout());
editor = new EmptyEditor(this);
}
- public void setDataType(IDataType type) {
+ public void setDataType(DataType type) {
((Composite) editor).dispose();
if (type == null) {
editor = new EmptyEditor(this);
@@ -50,7 +50,7 @@
Class editorClass = null;
try {
editorClass = registry.getDataTypeInfo(type.getClass()).getValueEditorClass();
- editor = (IEditor) editorClass.getConstructor(
+ editor = (Editor) editorClass.getConstructor(
new Class[] { Composite.class }).newInstance(new Object[] { this });
} catch (IllegalArgumentException e) {
// "Could not find data type info for type " + type.getClass()
Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/common/view/datatype/editor/impl/EmptyEditor.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/common/view/datatype/editor/impl/EmptyEditor.java 2007-05-31 00:20:16 UTC (rev 12247)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/common/view/datatype/editor/impl/EmptyEditor.java 2007-05-31 00:20:43 UTC (rev 12248)
@@ -17,9 +17,9 @@
import java.io.Serializable;
-import org.drools.eclipse.flow.common.view.datatype.editor.IDataTypeEditor;
-import org.drools.eclipse.flow.common.view.datatype.editor.IEditor;
-import org.drools.ruleflow.common.datatype.IDataType;
+import org.drools.eclipse.flow.common.view.datatype.editor.DataTypeEditor;
+import org.drools.eclipse.flow.common.view.datatype.editor.Editor;
+import org.drools.ruleflow.common.datatype.DataType;
import org.eclipse.swt.SWT;
import org.eclipse.swt.graphics.Color;
import org.eclipse.swt.layout.FillLayout;
@@ -31,9 +31,9 @@
*
* @author <a href="mailto:kris_verlaenen at hotmail.com">Kris Verlaenen</a>
*/
-public class EmptyEditor extends Composite implements IEditor, IDataTypeEditor {
+public class EmptyEditor extends Composite implements Editor, DataTypeEditor {
- private IDataType dataType;
+ private DataType dataType;
private Serializable value;
private Label label;
@@ -44,11 +44,11 @@
label = new Label(this, SWT.NONE);
}
- public IDataType getDataType() {
+ public DataType getDataType() {
return dataType;
}
- public void setDataType(IDataType dataType) {
+ public void setDataType(DataType dataType) {
this.dataType = dataType;
}
@@ -64,11 +64,11 @@
// do nothing
}
- public void addListener(IDataTypeEditor.DataTypeListener listener) {
+ public void addListener(DataTypeEditor.DataTypeListener listener) {
// do nothing
}
- public void removeListener(IDataTypeEditor.DataTypeListener listener) {
+ public void removeListener(DataTypeEditor.DataTypeListener listener) {
// do nothing
}
Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/common/view/datatype/editor/impl/FloatEditor.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/common/view/datatype/editor/impl/FloatEditor.java 2007-05-31 00:20:16 UTC (rev 12247)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/common/view/datatype/editor/impl/FloatEditor.java 2007-05-31 00:20:43 UTC (rev 12248)
@@ -17,8 +17,8 @@
import java.io.Serializable;
-import org.drools.eclipse.flow.common.view.datatype.editor.IEditor;
-import org.drools.ruleflow.common.datatype.IDataType;
+import org.drools.eclipse.flow.common.view.datatype.editor.Editor;
+import org.drools.ruleflow.common.datatype.DataType;
import org.drools.ruleflow.common.datatype.impl.type.FloatDataType;
import org.eclipse.swt.SWT;
import org.eclipse.swt.layout.FillLayout;
@@ -30,7 +30,7 @@
*
* @author <a href="mailto:kris_verlaenen at hotmail.com">Kris Verlaenen</a>
*/
-public class FloatEditor extends Composite implements IEditor {
+public class FloatEditor extends Composite implements Editor {
private Text text;
@@ -40,7 +40,7 @@
text = new Text(this, SWT.NONE);
}
- public void setDataType(IDataType dataType) {
+ public void setDataType(DataType dataType) {
if (!(dataType instanceof FloatDataType)) {
throw new IllegalArgumentException("Illegal data type " + dataType);
}
Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/common/view/datatype/editor/impl/IntegerEditor.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/common/view/datatype/editor/impl/IntegerEditor.java 2007-05-31 00:20:16 UTC (rev 12247)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/common/view/datatype/editor/impl/IntegerEditor.java 2007-05-31 00:20:43 UTC (rev 12248)
@@ -17,8 +17,8 @@
import java.io.Serializable;
-import org.drools.eclipse.flow.common.view.datatype.editor.IEditor;
-import org.drools.ruleflow.common.datatype.IDataType;
+import org.drools.eclipse.flow.common.view.datatype.editor.Editor;
+import org.drools.ruleflow.common.datatype.DataType;
import org.drools.ruleflow.common.datatype.impl.type.IntegerDataType;
import org.eclipse.swt.SWT;
import org.eclipse.swt.layout.FillLayout;
@@ -30,7 +30,7 @@
*
* @author <a href="mailto:kris_verlaenen at hotmail.com">Kris Verlaenen</a>
*/
-public class IntegerEditor extends Composite implements IEditor {
+public class IntegerEditor extends Composite implements Editor {
private Text text;
@@ -40,7 +40,7 @@
text = new Text(this, SWT.NONE);
}
- public void setDataType(IDataType dataType) {
+ public void setDataType(DataType dataType) {
if (!(dataType instanceof IntegerDataType)) {
throw new IllegalArgumentException("Illegal data type " + dataType);
}
Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/common/view/datatype/editor/impl/StringEditor.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/common/view/datatype/editor/impl/StringEditor.java 2007-05-31 00:20:16 UTC (rev 12247)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/common/view/datatype/editor/impl/StringEditor.java 2007-05-31 00:20:43 UTC (rev 12248)
@@ -17,8 +17,8 @@
import java.io.Serializable;
-import org.drools.eclipse.flow.common.view.datatype.editor.IEditor;
-import org.drools.ruleflow.common.datatype.IDataType;
+import org.drools.eclipse.flow.common.view.datatype.editor.Editor;
+import org.drools.ruleflow.common.datatype.DataType;
import org.drools.ruleflow.common.datatype.impl.type.StringDataType;
import org.eclipse.swt.SWT;
import org.eclipse.swt.layout.FillLayout;
@@ -30,7 +30,7 @@
*
* @author <a href="mailto:kris_verlaenen at hotmail.com">Kris Verlaenen</a>
*/
-public class StringEditor extends Composite implements IEditor {
+public class StringEditor extends Composite implements Editor {
private Text text;
@@ -40,7 +40,7 @@
text = new Text(this, SWT.NONE);
}
- public void setDataType(IDataType dataType) {
+ public void setDataType(DataType dataType) {
if (!(dataType instanceof StringDataType)) {
throw new IllegalArgumentException("Illegal data type " + dataType);
}
Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/core/ConnectionWrapper.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/core/ConnectionWrapper.java 2007-05-31 00:20:16 UTC (rev 12247)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/core/ConnectionWrapper.java 2007-05-31 00:20:43 UTC (rev 12248)
@@ -17,9 +17,9 @@
import org.drools.eclipse.flow.common.editor.core.ElementConnection;
import org.drools.eclipse.flow.common.editor.core.ElementWrapper;
-import org.drools.ruleflow.core.IConnection;
-import org.drools.ruleflow.core.INode;
-import org.drools.ruleflow.core.impl.Connection;
+import org.drools.ruleflow.core.Connection;
+import org.drools.ruleflow.core.Node;
+import org.drools.ruleflow.core.impl.ConnectionImpl;
/**
* Wrapper for a connection.
@@ -30,7 +30,7 @@
private static final long serialVersionUID = 4049352037223445809L;
- private IConnection connection;
+ private Connection connection;
public ConnectionWrapper(int type) {
super(type);
@@ -48,9 +48,9 @@
public void connect(ElementWrapper source, ElementWrapper target) {
super.connect(source, target);
- INode from = ((NodeWrapper) getSource()).getNode();
- INode to = ((NodeWrapper) getTarget()).getNode();
+ Node from = ((NodeWrapper) getSource()).getNode();
+ Node to = ((NodeWrapper) getTarget()).getNode();
int type = getType();
- connection = new Connection(from, to, type);
+ connection = new ConnectionImpl(from, to, type);
}
}
Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/core/EndNodeWrapper.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/core/EndNodeWrapper.java 2007-05-31 00:20:16 UTC (rev 12247)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/core/EndNodeWrapper.java 2007-05-31 00:20:43 UTC (rev 12248)
@@ -16,8 +16,8 @@
*/
import org.drools.eclipse.flow.common.editor.core.ElementConnection;
-import org.drools.ruleflow.core.IEndNode;
-import org.drools.ruleflow.core.impl.EndNode;
+import org.drools.ruleflow.core.EndNode;
+import org.drools.ruleflow.core.impl.EndNodeImpl;
/**
* Wrapper for an end node.
@@ -29,12 +29,12 @@
private static final long serialVersionUID = 3617855270152385336L;
public EndNodeWrapper() {
- setNode(new EndNode());
+ setNode(new EndNodeImpl());
getEndNode().setName("End");
}
- public IEndNode getEndNode() {
- return (IEndNode) getNode();
+ public EndNode getEndNode() {
+ return (EndNode) getNode();
}
public boolean acceptsIncomingConnection(ElementConnection connection) {
Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/core/JoinWrapper.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/core/JoinWrapper.java 2007-05-31 00:20:16 UTC (rev 12247)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/core/JoinWrapper.java 2007-05-31 00:20:43 UTC (rev 12248)
@@ -17,9 +17,9 @@
import org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper;
import org.drools.eclipse.flow.common.editor.core.ElementConnection;
-import org.drools.ruleflow.core.IConnection;
-import org.drools.ruleflow.core.IJoin;
-import org.drools.ruleflow.core.impl.Join;
+import org.drools.ruleflow.core.Connection;
+import org.drools.ruleflow.core.Join;
+import org.drools.ruleflow.core.impl.JoinImpl;
import org.eclipse.ui.views.properties.ComboBoxPropertyDescriptor;
import org.eclipse.ui.views.properties.IPropertyDescriptor;
@@ -42,12 +42,12 @@
}
public JoinWrapper() {
- setNode(new Join());
+ setNode(new JoinImpl());
getJoin().setName("Join");
}
- public IJoin getJoin() {
- return (IJoin) getNode();
+ public Join getJoin() {
+ return (Join) getNode();
}
public boolean acceptsIncomingConnection(ElementConnection connection) {
@@ -55,7 +55,7 @@
}
public boolean acceptsOutgoingConnection(ElementConnection connection) {
- return connection.getType() == IConnection.TYPE_NORMAL
+ return connection.getType() == Connection.TYPE_NORMAL
&& getOutgoingConnections().isEmpty();
}
@@ -72,7 +72,7 @@
public void resetPropertyValue(Object id) {
if (TYPE.equals(id)) {
- getJoin().setType(IJoin.TYPE_UNDEFINED);
+ getJoin().setType(Join.TYPE_UNDEFINED);
} else {
super.resetPropertyValue(id);
}
Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/core/NodeWrapper.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/core/NodeWrapper.java 2007-05-31 00:20:16 UTC (rev 12247)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/core/NodeWrapper.java 2007-05-31 00:20:43 UTC (rev 12248)
@@ -16,7 +16,7 @@
*/
import org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper;
-import org.drools.ruleflow.core.INode;
+import org.drools.ruleflow.core.Node;
/**
* Wrapper for a node.
@@ -25,12 +25,12 @@
*/
public abstract class NodeWrapper extends DefaultElementWrapper {
- protected void setNode(INode node) {
+ protected void setNode(Node node) {
setElement(node);
}
- public INode getNode() {
- return (INode) getElement();
+ public Node getNode() {
+ return (Node) getElement();
}
public String getId() {
Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/core/RuleFlowProcessWrapper.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/core/RuleFlowProcessWrapper.java 2007-05-31 00:20:16 UTC (rev 12247)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/core/RuleFlowProcessWrapper.java 2007-05-31 00:20:43 UTC (rev 12248)
@@ -17,9 +17,9 @@
import org.drools.eclipse.flow.common.editor.core.ElementWrapper;
import org.drools.eclipse.flow.common.editor.core.ProcessWrapper;
-import org.drools.ruleflow.common.core.IProcess;
-import org.drools.ruleflow.core.IRuleFlowProcess;
-import org.drools.ruleflow.core.impl.RuleFlowProcess;
+import org.drools.ruleflow.common.core.Process;
+import org.drools.ruleflow.core.RuleFlowProcess;
+import org.drools.ruleflow.core.impl.RuleFlowProcessImpl;
/**
* Wrapper for a RuleFlow process.
@@ -40,12 +40,12 @@
// new ListPropertyDescriptor(VARIABLES, "Variables", VariableListCellEditor.class);
// }
- public IRuleFlowProcess getRuleFlowProcess() {
- return (IRuleFlowProcess) getProcess();
+ public RuleFlowProcess getRuleFlowProcess() {
+ return (RuleFlowProcess) getProcess();
}
- protected IProcess createProcess() {
- return new RuleFlowProcess();
+ protected Process createProcess() {
+ return new RuleFlowProcessImpl();
}
protected void internalAddElement(ElementWrapper element) {
Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/core/RuleSetNodeWrapper.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/core/RuleSetNodeWrapper.java 2007-05-31 00:20:16 UTC (rev 12247)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/core/RuleSetNodeWrapper.java 2007-05-31 00:20:43 UTC (rev 12248)
@@ -17,8 +17,8 @@
import org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper;
import org.drools.eclipse.flow.common.editor.core.ElementConnection;
-import org.drools.ruleflow.core.IRuleSetNode;
-import org.drools.ruleflow.core.impl.RuleSetNode;
+import org.drools.ruleflow.core.RuleSetNode;
+import org.drools.ruleflow.core.impl.RuleSetNodeImpl;
import org.eclipse.ui.views.properties.IPropertyDescriptor;
import org.eclipse.ui.views.properties.TextPropertyDescriptor;
@@ -41,13 +41,13 @@
}
public RuleSetNodeWrapper() {
- setNode(new RuleSetNode());
+ setNode(new RuleSetNodeImpl());
getRuleSetNode().setName("RuleSet");
getRuleSetNode().setRuleFlowGroup("");
}
- public IRuleSetNode getRuleSetNode() {
- return (IRuleSetNode) getNode();
+ public RuleSetNode getRuleSetNode() {
+ return (RuleSetNode) getNode();
}
public IPropertyDescriptor[] getPropertyDescriptors() {
Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/core/SplitWrapper.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/core/SplitWrapper.java 2007-05-31 00:20:16 UTC (rev 12247)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/core/SplitWrapper.java 2007-05-31 00:20:43 UTC (rev 12248)
@@ -24,10 +24,10 @@
import org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper;
import org.drools.eclipse.flow.common.editor.core.ElementConnection;
import org.drools.eclipse.flow.ruleflow.view.property.constraint.ConstraintsPropertyDescriptor;
-import org.drools.ruleflow.core.IConnection;
-import org.drools.ruleflow.core.IConstraint;
-import org.drools.ruleflow.core.ISplit;
-import org.drools.ruleflow.core.impl.Split;
+import org.drools.ruleflow.core.Connection;
+import org.drools.ruleflow.core.Constraint;
+import org.drools.ruleflow.core.Split;
+import org.drools.ruleflow.core.impl.SplitImpl;
import org.eclipse.ui.views.properties.ComboBoxPropertyDescriptor;
import org.eclipse.ui.views.properties.IPropertyDescriptor;
@@ -45,7 +45,7 @@
private transient IPropertyDescriptor[] descriptors;
public SplitWrapper() {
- setNode(new Split());
+ setNode(new SplitImpl());
getSplit().setName("Split");
setDescriptors();
}
@@ -58,8 +58,8 @@
new String[] { "", "AND", "XOR", "OR" });
}
- public ISplit getSplit() {
- return (ISplit) getNode();
+ public Split getSplit() {
+ return (Split) getNode();
}
public boolean acceptsIncomingConnection(ElementConnection connection) {
@@ -67,12 +67,12 @@
}
public boolean acceptsOutgoingConnection(ElementConnection connection) {
- return connection.getType() == IConnection.TYPE_NORMAL;
+ return connection.getType() == Connection.TYPE_NORMAL;
}
public IPropertyDescriptor[] getPropertyDescriptors() {
- if (getParent() != null && (getSplit().getType() == Split.TYPE_XOR
- || getSplit().getType() == Split.TYPE_OR)) {
+ if (getParent() != null && (getSplit().getType() == SplitImpl.TYPE_XOR
+ || getSplit().getType() == SplitImpl.TYPE_OR)) {
IPropertyDescriptor[] result = new IPropertyDescriptor[descriptors.length + 1];
System.arraycopy(descriptors, 0, result, 0, descriptors.length);
result[descriptors.length] =
@@ -87,8 +87,8 @@
return new Integer(getSplit().getType());
}
if (CONSTRAINTS.equals(id)) {
- return getSplit().getType() == Split.TYPE_XOR
- || getSplit().getType() == Split.TYPE_OR
+ return getSplit().getType() == SplitImpl.TYPE_XOR
+ || getSplit().getType() == SplitImpl.TYPE_OR
? new MyHashMap(getSplit().getConstraints()) : new MyHashMap();
}
return super.getPropertyValue(id);
@@ -96,10 +96,10 @@
public void resetPropertyValue(Object id) {
if (TYPE.equals(id)) {
- getSplit().setType(ISplit.TYPE_UNDEFINED);
+ getSplit().setType(Split.TYPE_UNDEFINED);
} else if (CONSTRAINTS.equals(id)) {
for (Iterator it = getSplit().getOutgoingConnections().iterator(); it.hasNext(); ) {
- IConnection connection = (IConnection) it.next();
+ Connection connection = (Connection) it.next();
getSplit().setConstraint(connection, null);
}
} else {
@@ -114,7 +114,7 @@
Iterator iterator = ((Map) value).entrySet().iterator();
while (iterator.hasNext()) {
Map.Entry element = (Map.Entry) iterator.next();
- getSplit().setConstraint((IConnection) element.getKey(), (IConstraint) element.getValue());
+ getSplit().setConstraint((Connection) element.getKey(), (Constraint) element.getValue());
}
} else {
super.setPropertyValue(id, value);
Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/core/StartNodeWrapper.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/core/StartNodeWrapper.java 2007-05-31 00:20:16 UTC (rev 12247)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/core/StartNodeWrapper.java 2007-05-31 00:20:43 UTC (rev 12248)
@@ -16,9 +16,9 @@
*/
import org.drools.eclipse.flow.common.editor.core.ElementConnection;
-import org.drools.ruleflow.core.IConnection;
-import org.drools.ruleflow.core.IStartNode;
-import org.drools.ruleflow.core.impl.StartNode;
+import org.drools.ruleflow.core.Connection;
+import org.drools.ruleflow.core.StartNode;
+import org.drools.ruleflow.core.impl.StartNodeImpl;
/**
* Wrapper for a start node.
@@ -30,12 +30,12 @@
private static final long serialVersionUID = 3978428031117375030L;
public StartNodeWrapper() {
- setNode(new StartNode());
+ setNode(new StartNodeImpl());
setName("Start");
}
- public IStartNode getStartNode() {
- return (IStartNode) getNode();
+ public StartNode getStartNode() {
+ return (StartNode) getNode();
}
public boolean acceptsIncomingConnection(ElementConnection connection) {
@@ -43,7 +43,7 @@
}
public boolean acceptsOutgoingConnection(ElementConnection connection) {
- return connection.getType() == IConnection.TYPE_NORMAL
+ return connection.getType() == Connection.TYPE_NORMAL
&& getOutgoingConnections().isEmpty();
}
}
Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/editor/RuleFlowPaletteFactory.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/editor/RuleFlowPaletteFactory.java 2007-05-31 00:20:16 UTC (rev 12247)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/editor/RuleFlowPaletteFactory.java 2007-05-31 00:20:43 UTC (rev 12248)
@@ -27,7 +27,7 @@
import org.drools.eclipse.flow.ruleflow.core.RuleSetNodeWrapper;
import org.drools.eclipse.flow.ruleflow.core.SplitWrapper;
import org.drools.eclipse.flow.ruleflow.core.StartNodeWrapper;
-import org.drools.ruleflow.core.IConnection;
+import org.drools.ruleflow.core.Connection;
import org.eclipse.gef.palette.CombinedTemplateCreationEntry;
import org.eclipse.gef.palette.ConnectionCreationToolEntry;
import org.eclipse.gef.palette.MarqueeToolEntry;
@@ -133,7 +133,7 @@
tool = new MarqueeToolEntry();
entries.add(tool);
- final ElementConnectionFactory normalConnectionFactory = new ConnectionWrapperFactory(IConnection.TYPE_NORMAL);
+ final ElementConnectionFactory normalConnectionFactory = new ConnectionWrapperFactory(Connection.TYPE_NORMAL);
tool = new ConnectionCreationToolEntry(
"Connection Creation",
Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/editor/action/CheckRuleFlowAction.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/editor/action/CheckRuleFlowAction.java 2007-05-31 00:20:16 UTC (rev 12247)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/editor/action/CheckRuleFlowAction.java 2007-05-31 00:20:43 UTC (rev 12248)
@@ -17,8 +17,8 @@
import org.drools.eclipse.DroolsEclipsePlugin;
import org.drools.eclipse.flow.ruleflow.editor.RuleFlowModelEditor;
-import org.drools.ruleflow.core.IRuleFlowProcessValidationError;
-import org.drools.ruleflow.core.impl.RuleFlowProcessValidator;
+import org.drools.ruleflow.core.RuleFlowProcessValidationError;
+import org.drools.ruleflow.core.impl.RuleFlowProcessValidatorImpl;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
import org.eclipse.jface.action.IAction;
@@ -46,7 +46,7 @@
}
private void execute() {
- IRuleFlowProcessValidationError[] errors = RuleFlowProcessValidator.getInstance().validateProcess(
+ RuleFlowProcessValidationError[] errors = RuleFlowProcessValidatorImpl.getInstance().validateProcess(
((RuleFlowModelEditor) editor).getRuleFlowModel().getRuleFlowProcess());
if (errors.length == 0) {
MessageDialog.openInformation(editor.getSite().getShell(),
Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/editor/editpart/RuleFlowConnectionEditPart.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/editor/editpart/RuleFlowConnectionEditPart.java 2007-05-31 00:20:16 UTC (rev 12247)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/editor/editpart/RuleFlowConnectionEditPart.java 2007-05-31 00:20:43 UTC (rev 12248)
@@ -19,7 +19,7 @@
import org.drools.eclipse.flow.common.editor.core.ElementConnectionFactory;
import org.drools.eclipse.flow.common.editor.editpart.ElementConnectionEditPart;
import org.drools.eclipse.flow.ruleflow.core.ConnectionWrapperFactory;
-import org.drools.ruleflow.core.IConnection;
+import org.drools.ruleflow.core.Connection;
import org.eclipse.draw2d.IFigure;
import org.eclipse.draw2d.PolygonDecoration;
import org.eclipse.draw2d.PolylineConnection;
@@ -33,12 +33,12 @@
public class RuleFlowConnectionEditPart extends ElementConnectionEditPart {
protected ElementConnectionFactory getDefaultElementConnectionFactory() {
- return new ConnectionWrapperFactory(IConnection.TYPE_NORMAL);
+ return new ConnectionWrapperFactory(Connection.TYPE_NORMAL);
}
protected IFigure createFigure() {
PolylineConnection result = (PolylineConnection) super.createFigure();
- if (((ElementConnection) getModel()).getType() == IConnection.TYPE_ABORT) {
+ if (((ElementConnection) getModel()).getType() == Connection.TYPE_ABORT) {
PolygonDecoration decoration = new PolygonDecoration();
PointList decorationPointList = new PointList();
decorationPointList.addPoint(0,0);
Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/constraint/ConstraintListCellEditor.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/constraint/ConstraintListCellEditor.java 2007-05-31 00:20:16 UTC (rev 12247)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/constraint/ConstraintListCellEditor.java 2007-05-31 00:20:43 UTC (rev 12248)
@@ -17,8 +17,8 @@
import org.drools.eclipse.flow.common.view.property.BeanDialogCellEditor;
import org.drools.eclipse.flow.common.view.property.EditBeanDialog;
-import org.drools.ruleflow.core.ISplit;
-import org.drools.ruleflow.core.IRuleFlowProcess;
+import org.drools.ruleflow.core.Split;
+import org.drools.ruleflow.core.RuleFlowProcess;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Shell;
@@ -29,10 +29,10 @@
*/
public class ConstraintListCellEditor extends BeanDialogCellEditor {
- private IRuleFlowProcess process;
- private ISplit split;
+ private RuleFlowProcess process;
+ private Split split;
- public ConstraintListCellEditor(Composite parent, IRuleFlowProcess process, ISplit split) {
+ public ConstraintListCellEditor(Composite parent, RuleFlowProcess process, Split split) {
super(parent);
this.process = process;
this.split = split;
Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/constraint/ConstraintListDialog.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/constraint/ConstraintListDialog.java 2007-05-31 00:20:16 UTC (rev 12247)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/constraint/ConstraintListDialog.java 2007-05-31 00:20:43 UTC (rev 12248)
@@ -21,10 +21,10 @@
import java.util.Map;
import org.drools.eclipse.flow.common.view.property.EditBeanDialog;
-import org.drools.ruleflow.core.IConnection;
-import org.drools.ruleflow.core.IConstraint;
-import org.drools.ruleflow.core.ISplit;
-import org.drools.ruleflow.core.IRuleFlowProcess;
+import org.drools.ruleflow.core.Connection;
+import org.drools.ruleflow.core.Constraint;
+import org.drools.ruleflow.core.Split;
+import org.drools.ruleflow.core.RuleFlowProcess;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.SelectionAdapter;
import org.eclipse.swt.events.SelectionEvent;
@@ -44,13 +44,13 @@
*/
public class ConstraintListDialog extends EditBeanDialog {
- private IRuleFlowProcess process;
- private ISplit split;
+ private RuleFlowProcess process;
+ private Split split;
private Map newMap;
private Map labels = new HashMap();
- protected ConstraintListDialog(Shell parentShell, IRuleFlowProcess process,
- ISplit split) {
+ protected ConstraintListDialog(Shell parentShell, RuleFlowProcess process,
+ Split split) {
super(parentShell, "Edit Constraints");
this.process = process;
this.split = split;
@@ -65,7 +65,7 @@
List outgoingConnections = split.getOutgoingConnections();
labels.clear();
for (Iterator it = outgoingConnections.iterator(); it.hasNext(); ) {
- IConnection outgoingConnection = (IConnection) it.next();
+ Connection outgoingConnection = (Connection) it.next();
Label label1 = new Label(composite, SWT.NONE);
label1.setText("To node " + outgoingConnection.getTo().getName()
+ ": ");
@@ -76,7 +76,7 @@
gridData.grabExcessHorizontalSpace = true;
gridData.horizontalAlignment = GridData.FILL;
label2.setLayoutData(gridData);
- IConstraint constraint = (IConstraint) newMap.get(outgoingConnection);
+ Constraint constraint = (Constraint) newMap.get(outgoingConnection);
if (constraint != null) {
label2.setText(constraint.getName());
}
@@ -99,7 +99,7 @@
return newMap;
}
- private void editItem(final IConnection connection) {
+ private void editItem(final Connection connection) {
final Runnable r = new Runnable() {
public void run() {
@@ -108,7 +108,7 @@
RuleFlowConstraintDialog dialog = new RuleFlowConstraintDialog(
getShell(), process);
dialog.create();
- IConstraint constraint = (IConstraint) newMap.get(connection);
+ Constraint constraint = (Constraint) newMap.get(connection);
dialog.setConstraint(constraint);
int code = dialog.open();
if (code != CANCEL) {
@@ -133,9 +133,9 @@
}
private class EditButtonListener extends SelectionAdapter {
- private IConnection connection;
+ private Connection connection;
- public EditButtonListener(IConnection connection) {
+ public EditButtonListener(Connection connection) {
this.connection = connection;
}
Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/constraint/ConstraintsPropertyDescriptor.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/constraint/ConstraintsPropertyDescriptor.java 2007-05-31 00:20:16 UTC (rev 12247)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/constraint/ConstraintsPropertyDescriptor.java 2007-05-31 00:20:43 UTC (rev 12248)
@@ -15,8 +15,8 @@
* limitations under the License.
*/
-import org.drools.ruleflow.core.ISplit;
-import org.drools.ruleflow.core.IRuleFlowProcess;
+import org.drools.ruleflow.core.Split;
+import org.drools.ruleflow.core.RuleFlowProcess;
import org.eclipse.jface.viewers.CellEditor;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.ui.views.properties.PropertyDescriptor;
@@ -28,16 +28,16 @@
*/
public class ConstraintsPropertyDescriptor extends PropertyDescriptor {
- private IRuleFlowProcess process;
- private ISplit split;
+ private RuleFlowProcess process;
+ private Split split;
- public ConstraintsPropertyDescriptor(Object id, String displayName, ISplit split, IRuleFlowProcess process) {
+ public ConstraintsPropertyDescriptor(Object id, String displayName, Split split, RuleFlowProcess process) {
super(id, displayName);
this.split = split;
this.process = process;
}
- public IRuleFlowProcess getProcess() {
+ public RuleFlowProcess getProcess() {
return process;
}
Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/constraint/RuleFlowConstraintDialog.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/constraint/RuleFlowConstraintDialog.java 2007-05-31 00:20:16 UTC (rev 12247)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/constraint/RuleFlowConstraintDialog.java 2007-05-31 00:20:43 UTC (rev 12248)
@@ -15,9 +15,9 @@
* limitations under the License.
*/
-import org.drools.ruleflow.core.IConstraint;
-import org.drools.ruleflow.core.IRuleFlowProcess;
-import org.drools.ruleflow.core.impl.Constraint;
+import org.drools.ruleflow.core.Constraint;
+import org.drools.ruleflow.core.RuleFlowProcess;
+import org.drools.ruleflow.core.impl.ConstraintImpl;
import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.SelectionEvent;
@@ -41,7 +41,7 @@
*/
public class RuleFlowConstraintDialog extends Dialog {
- private IConstraint constraint;
+ private Constraint constraint;
private boolean success;
private Button alwaysTrue;
private Text nameText;
@@ -49,7 +49,7 @@
private TabFolder tabFolder;
private Text translation;
- public RuleFlowConstraintDialog(Shell parentShell, IRuleFlowProcess process) {
+ public RuleFlowConstraintDialog(Shell parentShell, RuleFlowProcess process) {
super(parentShell);
setShellStyle(getShellStyle() | SWT.RESIZE);
}
@@ -148,7 +148,7 @@
private void updateTranslation() {
// TODO add custom token model checker
success = true;
- constraint = new Constraint();
+ constraint = new ConstraintImpl();
constraint.setConstraint(null);
constraint.setConstraint(translation.getText());
constraint.setName(nameText.getText());
@@ -164,7 +164,7 @@
}
public void updateConstraint() {
- constraint = new Constraint();
+ constraint = new ConstraintImpl();
if (!alwaysTrue.getSelection()) {
constraint.setConstraint(translation.getText());
} else {
@@ -178,14 +178,14 @@
}
}
- public IConstraint getConstraint() {
+ public Constraint getConstraint() {
return constraint;
}
- public void setConstraint(IConstraint constraint) {
+ public void setConstraint(Constraint constraint) {
this.constraint = constraint;
if (constraint != null) {
- if ("true".equals(constraint.getConstraint())) {
+ if ("eval(true)".equals(constraint.getConstraint())) {
alwaysTrue.setSelection(true);
} else {
translation.setText(constraint.getConstraint().toString());
Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/variable/VariableDialog.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/variable/VariableDialog.java 2007-05-31 00:20:16 UTC (rev 12247)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/variable/VariableDialog.java 2007-05-31 00:20:43 UTC (rev 12248)
@@ -17,13 +17,13 @@
import org.drools.eclipse.DroolsEclipsePlugin;
import org.drools.eclipse.flow.common.datatype.DefaultDataTypeRegistry;
-import org.drools.eclipse.flow.common.view.datatype.editor.IDataTypeEditor;
+import org.drools.eclipse.flow.common.view.datatype.editor.DataTypeEditor;
import org.drools.eclipse.flow.common.view.datatype.editor.impl.DataTypeCombo;
import org.drools.eclipse.flow.common.view.datatype.editor.impl.DataTypeEditorComposite;
import org.drools.eclipse.flow.common.view.datatype.editor.impl.EditorComposite;
import org.drools.eclipse.flow.common.view.property.EditBeanDialog;
-import org.drools.ruleflow.common.datatype.IDataType;
-import org.drools.ruleflow.core.IVariable;
+import org.drools.ruleflow.common.datatype.DataType;
+import org.drools.ruleflow.core.Variable;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
import org.eclipse.jface.dialogs.ErrorDialog;
@@ -67,7 +67,7 @@
gridData.grabExcessHorizontalSpace = true;
gridData.horizontalAlignment = GridData.FILL;
nameText.setLayoutData(gridData);
- String name = ((IVariable) getValue()).getName();
+ String name = ((Variable) getValue()).getName();
nameText.setText(name == null ? "" : name);
Label typeLabel = new Label(composite, SWT.NONE);
@@ -75,11 +75,11 @@
dataTypeCombo = new DataTypeCombo(composite,
SWT.NONE, DefaultDataTypeRegistry.getInstance());
- IDataType dataType = ((IVariable) getValue()).getType();
+ DataType dataType = ((Variable) getValue()).getType();
dataTypeCombo.setDataType(dataType);
dataTypeCombo.addSelectionChangedListener(new ISelectionChangedListener() {
public void selectionChanged(SelectionChangedEvent event) {
- IDataType dataType = dataTypeCombo.getDataType();
+ DataType dataType = dataTypeCombo.getDataType();
dataTypeEditorComposite.setDataType(dataType);
editorComposite.setDataType(dataType);
composite.layout();
@@ -95,8 +95,8 @@
gridData.horizontalAlignment = GridData.FILL;
dataTypeEditorComposite.setLayoutData(gridData);
dataTypeEditorComposite.setDataType(dataType);
- dataTypeEditorComposite.addListener(new IDataTypeEditor.DataTypeListener() {
- public void dataTypeChanged(IDataType dataType) {
+ dataTypeEditorComposite.addListener(new DataTypeEditor.DataTypeListener() {
+ public void dataTypeChanged(DataType dataType) {
editorComposite.setDataType(dataType);
composite.layout();
}
@@ -114,7 +114,7 @@
gridData.grabExcessHorizontalSpace = true;
editorComposite.setLayoutData(gridData);
editorComposite.setDataType(dataType);
- editorComposite.setValue(((IVariable) getValue()).getValue());
+ editorComposite.setValue(((Variable) getValue()).getValue());
Composite bottom = new Composite(composite, SWT.NONE);
gridData = new GridData();
@@ -126,7 +126,7 @@
}
protected Object updateValue(Object value) {
- IVariable variable = (IVariable) getValue();
+ Variable variable = (Variable) getValue();
variable.setName(nameText.getText());
try {
variable.setType(dataTypeEditorComposite.getDataType());
Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/variable/VariableListDialog.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/variable/VariableListDialog.java 2007-05-31 00:20:16 UTC (rev 12247)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/variable/VariableListDialog.java 2007-05-31 00:20:43 UTC (rev 12248)
@@ -16,7 +16,7 @@
*/
import org.drools.eclipse.flow.common.view.property.EditListDialog;
-import org.drools.ruleflow.core.impl.Variable;
+import org.drools.ruleflow.core.impl.VariableImpl;
import org.eclipse.swt.widgets.Shell;
/**
@@ -31,6 +31,6 @@
}
protected Object createItem() {
- return new Variable();
+ return new VariableImpl();
}
}
More information about the jboss-svn-commits
mailing list