[jboss-svn-commits] JBL Code SVN: r17640 - in labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main: java/org/drools/eclipse/flow/common/datatype and 15 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Tue Jan 8 20:41:04 EST 2008
Author: KrisVerlaenen
Date: 2008-01-08 20:41:03 -0500 (Tue, 08 Jan 2008)
New Revision: 17640
Removed:
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/resources/org/drools/eclipse/wizard/project/ruleflow.rf.template
labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/resources/org/drools/eclipse/wizard/project/ruleflow.rfm.template
Modified:
labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/WorkItemDefinitions.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/DefaultDataTypeRegistry.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/editor/core/DefaultElementWrapper.java
labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/common/editor/core/ElementConnection.java
labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/common/editor/core/ElementConnectionFactory.java
labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/common/editor/core/ElementWrapper.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/editor/core/command/ElementConnectionCreateCommand.java
labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/common/editor/core/command/ReconnectElementConnectionSourceCommand.java
labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/common/editor/core/command/ReconnectElementConnectionTargetCommand.java
labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/common/editor/editpart/ElementConnectionEditPart.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
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/ActionWrapper.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/ConnectionWrapperFactory.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/MilestoneWrapper.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/core/SubFlowWrapper.java
labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/core/WorkItemWrapper.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/RuleFlowEditPartFactory.java
labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/editor/editpart/WorkItemEditPart.java
labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/action/ActionCellEditor.java
labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/action/ActionDialog.java
labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/action/ActionPropertyDescriptor.java
labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/constraint/ConstraintCompletionProcessor.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/MilestoneConstraintCellEditor.java
labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/constraint/MilestoneConstraintDialog.java
labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/constraint/MilestoneConstraintPropertyDescriptor.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/constraint/RuleFlowGlobalsDialog.java
labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/constraint/RuleFlowImportsDialog.java
labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/task/TaskDialog.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:
JBRULES-1408: Refactoring of ruleflow to act as a pluggable process engine
Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/WorkItemDefinitions.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/WorkItemDefinitions.java 2008-01-09 01:39:52 UTC (rev 17639)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/WorkItemDefinitions.java 2008-01-09 01:41:03 UTC (rev 17640)
@@ -4,10 +4,10 @@
import java.util.HashMap;
import java.util.Map;
-import org.drools.ruleflow.common.core.WorkDefinition;
-import org.drools.ruleflow.common.core.impl.ParameterDefinitionImpl;
-import org.drools.ruleflow.common.core.impl.WorkDefinitionExtensionImpl;
-import org.drools.ruleflow.common.datatype.impl.type.StringDataType;
+import org.drools.process.core.WorkDefinition;
+import org.drools.process.core.datatype.impl.type.StringDataType;
+import org.drools.process.core.impl.ParameterDefinitionImpl;
+import org.drools.process.core.impl.WorkDefinitionExtensionImpl;
public final class WorkItemDefinitions {
Modified: 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/DataTypeRegistry.java 2008-01-09 01:39:52 UTC (rev 17639)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/common/datatype/DataTypeRegistry.java 2008-01-09 01:41:03 UTC (rev 17640)
@@ -17,7 +17,7 @@
import java.util.Set;
-import org.drools.ruleflow.common.datatype.DataTypeFactory;
+import org.drools.process.core.datatype.DataTypeFactory;
/**
* A registry of datatypes.
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 2008-01-09 01:39:52 UTC (rev 17639)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/common/datatype/DefaultDataTypeRegistry.java 2008-01-09 01:41:03 UTC (rev 17640)
@@ -19,13 +19,13 @@
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.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;
-import org.drools.ruleflow.common.datatype.impl.type.IntegerDataType;
-import org.drools.ruleflow.common.datatype.impl.type.StringDataType;
-import org.drools.ruleflow.common.datatype.impl.type.UndefinedDataType;
+import org.drools.process.core.datatype.DataTypeFactory;
+import org.drools.process.core.datatype.impl.InstanceDataTypeFactory;
+import org.drools.process.core.datatype.impl.type.BooleanDataType;
+import org.drools.process.core.datatype.impl.type.FloatDataType;
+import org.drools.process.core.datatype.impl.type.IntegerDataType;
+import org.drools.process.core.datatype.impl.type.StringDataType;
+import org.drools.process.core.datatype.impl.type.UndefinedDataType;
//import sun.beans.editors.FloatEditor;
//import sun.beans.editors.StringEditor;
Modified: 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/datatype/impl/DataTypeRegistryImpl.java 2008-01-09 01:39:52 UTC (rev 17639)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/common/datatype/impl/DataTypeRegistryImpl.java 2008-01-09 01:41:03 UTC (rev 17640)
@@ -21,7 +21,7 @@
import java.util.Set;
import org.drools.eclipse.flow.common.datatype.DataTypeRegistry;
-import org.drools.ruleflow.common.datatype.DataTypeFactory;
+import org.drools.process.core.datatype.DataTypeFactory;
/**
* Default implementation of a datatype registry.
Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/common/editor/core/DefaultElementWrapper.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/common/editor/core/DefaultElementWrapper.java 2008-01-09 01:39:52 UTC (rev 17639)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/common/editor/core/DefaultElementWrapper.java 2008-01-09 01:41:03 UTC (rev 17640)
@@ -128,28 +128,6 @@
protected void internalSetName(String name) {
}
- public List getOutgoingConnections(int type) {
- List result = new ArrayList();
- for (Iterator it = outgoingConnections.iterator(); it.hasNext();) {
- ElementConnection connection = (ElementConnection) it.next();
- if (connection.getType() == type) {
- result.add(connection);
- }
- }
- return Collections.unmodifiableList(result);
- }
-
- public List getIncomingConnections(int type) {
- List result = new ArrayList();
- for (Iterator it = incomingConnections.iterator(); it.hasNext();) {
- ElementConnection connection = (ElementConnection) it.next();
- if (connection.getType() == type) {
- result.add(connection);
- }
- }
- return Collections.unmodifiableList(result);
- }
-
public void addListener(ModelListener listener) {
listeners.add(listener);
}
Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/common/editor/core/ElementConnection.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/common/editor/core/ElementConnection.java 2008-01-09 01:39:52 UTC (rev 17639)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/common/editor/core/ElementConnection.java 2008-01-09 01:41:03 UTC (rev 17640)
@@ -37,16 +37,13 @@
private ElementWrapper source;
private ElementWrapper target;
- private int type;
private List bendpoints = new ArrayList();
private transient List listeners = new ArrayList();
- public ElementConnection(int type) {
- this.type = type;
+ public ElementConnection() {
}
- public ElementConnection(ElementWrapper source, ElementWrapper target, int type) {
- this(type);
+ public ElementConnection(ElementWrapper source, ElementWrapper target) {
if (source == null) {
throw new IllegalArgumentException("source is null");
}
@@ -99,10 +96,6 @@
return target;
}
- public int getType() {
- return type;
- }
-
public void addBendpoint(int index, Point point) {
bendpoints.add(index, point);
notifyListeners(CHANGE_BENDPOINTS);
Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/common/editor/core/ElementConnectionFactory.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/common/editor/core/ElementConnectionFactory.java 2008-01-09 01:39:52 UTC (rev 17639)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/common/editor/core/ElementConnectionFactory.java 2008-01-09 01:41:03 UTC (rev 17640)
@@ -22,18 +22,8 @@
*/
public class ElementConnectionFactory {
- private int type;
-
- public ElementConnectionFactory(int type) {
- this.type = type;
- }
-
public ElementConnection createElementConnection() {
- ElementConnection connection = new ElementConnection(type);
- return connection;
+ return new ElementConnection();
}
- protected int getType() {
- return this.type;
- }
}
Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/common/editor/core/ElementWrapper.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/common/editor/core/ElementWrapper.java 2008-01-09 01:39:52 UTC (rev 17639)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/common/editor/core/ElementWrapper.java 2008-01-09 01:41:03 UTC (rev 17640)
@@ -48,8 +48,6 @@
void removeOutgoingConnection(ElementConnection connection);
boolean acceptsIncomingConnection(ElementConnection connection);
boolean acceptsOutgoingConnection(ElementConnection connection);
- List getOutgoingConnections(int type);
- List getIncomingConnections(int type);
void addListener(ModelListener listener);
void removeListener(ModelListener listener);
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 2008-01-09 01:39:52 UTC (rev 17639)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/common/editor/core/ProcessWrapper.java 2008-01-09 01:41:03 UTC (rev 17640)
@@ -25,7 +25,7 @@
import java.util.List;
import java.util.Map;
-import org.drools.ruleflow.common.core.Process;
+import org.drools.process.core.Process;
import org.eclipse.ui.views.properties.ComboBoxPropertyDescriptor;
import org.eclipse.ui.views.properties.IPropertyDescriptor;
import org.eclipse.ui.views.properties.IPropertySource;
Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/common/editor/core/command/ElementConnectionCreateCommand.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/common/editor/core/command/ElementConnectionCreateCommand.java 2008-01-09 01:39:52 UTC (rev 17639)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/common/editor/core/command/ElementConnectionCreateCommand.java 2008-01-09 01:41:03 UTC (rev 17640)
@@ -39,7 +39,7 @@
}
// Check for existence of connection already
- List connections = source.getOutgoingConnections(connection.getType());
+ List connections = source.getOutgoingConnections();
for (Iterator it = connections.iterator(); it.hasNext(); ) {
ElementConnection conn = (ElementConnection) it.next();
if (conn.getTarget().equals(target)) {
Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/common/editor/core/command/ReconnectElementConnectionSourceCommand.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/common/editor/core/command/ReconnectElementConnectionSourceCommand.java 2008-01-09 01:39:52 UTC (rev 17639)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/common/editor/core/command/ReconnectElementConnectionSourceCommand.java 2008-01-09 01:41:03 UTC (rev 17640)
@@ -37,7 +37,7 @@
if (connection.getTarget().equals(newSource))
return false;
- List connections = newSource.getOutgoingConnections(connection.getType());
+ List connections = newSource.getOutgoingConnections();
for (int i = 0; i < connections.size(); i++) {
ElementConnection connection = ((ElementConnection)(connections.get(i)));
if (connection.getTarget().equals(target) && !connection.getSource().equals(oldSource))
Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/common/editor/core/command/ReconnectElementConnectionTargetCommand.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/common/editor/core/command/ReconnectElementConnectionTargetCommand.java 2008-01-09 01:39:52 UTC (rev 17639)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/common/editor/core/command/ReconnectElementConnectionTargetCommand.java 2008-01-09 01:41:03 UTC (rev 17640)
@@ -39,7 +39,7 @@
if (connection.getSource().equals(newTarget))
return false;
- List connections = newTarget.getIncomingConnections(connection.getType());
+ List connections = newTarget.getIncomingConnections();
for (Iterator it = connections.iterator(); it.hasNext(); ) {
ElementConnection connection = (ElementConnection) it.next();
if (connection.getSource().equals(source) && !connection.getTarget().equals(oldTarget))
Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/common/editor/editpart/ElementConnectionEditPart.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/common/editor/editpart/ElementConnectionEditPart.java 2008-01-09 01:39:52 UTC (rev 17639)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/common/editor/editpart/ElementConnectionEditPart.java 2008-01-09 01:41:03 UTC (rev 17640)
@@ -51,7 +51,7 @@
}
protected ElementConnectionFactory getDefaultElementConnectionFactory() {
- return new ElementConnectionFactory(0);
+ return new ElementConnectionFactory();
}
protected IFigure createFigure() {
Modified: 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/DataTypeEditor.java 2008-01-09 01:39:52 UTC (rev 17639)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/common/view/datatype/editor/DataTypeEditor.java 2008-01-09 01:41:03 UTC (rev 17640)
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import org.drools.ruleflow.common.datatype.DataType;
+import org.drools.process.core.datatype.DataType;
/**
* An editor for a datatype.
Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/common/view/datatype/editor/Editor.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/common/view/datatype/editor/Editor.java 2008-01-09 01:39:52 UTC (rev 17639)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/common/view/datatype/editor/Editor.java 2008-01-09 01:41:03 UTC (rev 17640)
@@ -17,7 +17,7 @@
import java.io.Serializable;
-import org.drools.ruleflow.common.datatype.DataType;
+import org.drools.process.core.datatype.DataType;
/**
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 2008-01-09 01:39:52 UTC (rev 17639)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/common/view/datatype/editor/impl/BooleanEditor.java 2008-01-09 01:41:03 UTC (rev 17640)
@@ -18,8 +18,8 @@
import java.io.Serializable;
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.drools.process.core.datatype.DataType;
+import org.drools.process.core.datatype.impl.type.BooleanDataType;
import org.eclipse.swt.SWT;
import org.eclipse.swt.layout.FillLayout;
import org.eclipse.swt.widgets.Combo;
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 2008-01-09 01:39:52 UTC (rev 17639)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/common/view/datatype/editor/impl/DataTypeCombo.java 2008-01-09 01:41:03 UTC (rev 17640)
@@ -17,7 +17,7 @@
import org.drools.eclipse.DroolsEclipsePlugin;
import org.drools.eclipse.flow.common.datatype.DataTypeRegistry;
-import org.drools.ruleflow.common.datatype.DataType;
+import org.drools.process.core.datatype.DataType;
import org.eclipse.jface.viewers.ComboViewer;
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.ISelectionChangedListener;
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 2008-01-09 01:39:52 UTC (rev 17639)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/common/view/datatype/editor/impl/DataTypeEditorComposite.java 2008-01-09 01:41:03 UTC (rev 17640)
@@ -23,8 +23,8 @@
import org.drools.eclipse.DroolsEclipsePlugin;
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.drools.process.core.datatype.DataType;
+import org.drools.process.core.datatype.impl.type.UndefinedDataType;
import org.eclipse.swt.graphics.Color;
import org.eclipse.swt.layout.FillLayout;
import org.eclipse.swt.widgets.Composite;
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 2008-01-09 01:39:52 UTC (rev 17639)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/common/view/datatype/editor/impl/EditorComposite.java 2008-01-09 01:41:03 UTC (rev 17640)
@@ -21,7 +21,7 @@
import org.drools.eclipse.DroolsEclipsePlugin;
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.drools.process.core.datatype.DataType;
import org.eclipse.swt.layout.FillLayout;
import org.eclipse.swt.widgets.Composite;
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 2008-01-09 01:39:52 UTC (rev 17639)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/common/view/datatype/editor/impl/EmptyEditor.java 2008-01-09 01:41:03 UTC (rev 17640)
@@ -19,7 +19,7 @@
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.drools.process.core.datatype.DataType;
import org.eclipse.swt.SWT;
import org.eclipse.swt.graphics.Color;
import org.eclipse.swt.layout.FillLayout;
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 2008-01-09 01:39:52 UTC (rev 17639)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/common/view/datatype/editor/impl/FloatEditor.java 2008-01-09 01:41:03 UTC (rev 17640)
@@ -18,8 +18,8 @@
import java.io.Serializable;
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.drools.process.core.datatype.DataType;
+import org.drools.process.core.datatype.impl.type.FloatDataType;
import org.eclipse.swt.SWT;
import org.eclipse.swt.layout.FillLayout;
import org.eclipse.swt.widgets.Composite;
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 2008-01-09 01:39:52 UTC (rev 17639)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/common/view/datatype/editor/impl/IntegerEditor.java 2008-01-09 01:41:03 UTC (rev 17640)
@@ -18,8 +18,8 @@
import java.io.Serializable;
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.drools.process.core.datatype.DataType;
+import org.drools.process.core.datatype.impl.type.IntegerDataType;
import org.eclipse.swt.SWT;
import org.eclipse.swt.layout.FillLayout;
import org.eclipse.swt.widgets.Composite;
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 2008-01-09 01:39:52 UTC (rev 17639)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/common/view/datatype/editor/impl/StringEditor.java 2008-01-09 01:41:03 UTC (rev 17640)
@@ -18,8 +18,8 @@
import java.io.Serializable;
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.drools.process.core.datatype.DataType;
+import org.drools.process.core.datatype.impl.type.StringDataType;
import org.eclipse.swt.SWT;
import org.eclipse.swt.layout.FillLayout;
import org.eclipse.swt.widgets.Composite;
Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/core/ActionWrapper.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/core/ActionWrapper.java 2008-01-09 01:39:52 UTC (rev 17639)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/core/ActionWrapper.java 2008-01-09 01:41:03 UTC (rev 17640)
@@ -18,8 +18,7 @@
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.action.ActionPropertyDescriptor;
-import org.drools.ruleflow.core.ActionNode;
-import org.drools.ruleflow.core.impl.ActionNodeImpl;
+import org.drools.workflow.core.node.ActionNode;
import org.eclipse.ui.views.properties.IPropertyDescriptor;
/**
@@ -36,7 +35,7 @@
public static final String ACTION = "Action";
public ActionWrapper() {
- setNode(new ActionNodeImpl());
+ setNode(new ActionNode());
getActionNode().setName("Action");
}
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 2008-01-09 01:39:52 UTC (rev 17639)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/core/ConnectionWrapper.java 2008-01-09 01:41:03 UTC (rev 17640)
@@ -17,9 +17,8 @@
import org.drools.eclipse.flow.common.editor.core.ElementConnection;
import org.drools.eclipse.flow.common.editor.core.ElementWrapper;
-import org.drools.ruleflow.core.Connection;
-import org.drools.ruleflow.core.Node;
-import org.drools.ruleflow.core.impl.ConnectionImpl;
+import org.drools.workflow.core.Node;
+import org.drools.workflow.core.impl.ConnectionImpl;
/**
* Wrapper for a connection.
@@ -30,14 +29,13 @@
private static final long serialVersionUID = 400L;
- private Connection connection;
+ private ConnectionImpl connection;
- public ConnectionWrapper(int type) {
- super(type);
+ public ConnectionWrapper() {
}
- public ConnectionWrapper(NodeWrapper source, NodeWrapper target, int type) {
- super(source, target, type);
+ public ConnectionWrapper(NodeWrapper source, NodeWrapper target) {
+ super(source, target);
}
public void disconnect() {
@@ -50,7 +48,6 @@
super.connect(source, target);
Node from = ((NodeWrapper) getSource()).getNode();
Node to = ((NodeWrapper) getTarget()).getNode();
- int type = getType();
- connection = new ConnectionImpl(from, to, type);
+ connection = new ConnectionImpl(from, Node.CONNECTION_DEFAULT_TYPE, to, Node.CONNECTION_DEFAULT_TYPE);
}
}
Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/core/ConnectionWrapperFactory.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/core/ConnectionWrapperFactory.java 2008-01-09 01:39:52 UTC (rev 17639)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/core/ConnectionWrapperFactory.java 2008-01-09 01:41:03 UTC (rev 17640)
@@ -25,12 +25,11 @@
*/
public class ConnectionWrapperFactory extends ElementConnectionFactory {
- public ConnectionWrapperFactory(int type) {
- super(type);
+ public ConnectionWrapperFactory() {
}
public ElementConnection createElementConnection() {
- ConnectionWrapper connection = new ConnectionWrapper(getType());
+ ConnectionWrapper connection = new ConnectionWrapper();
return connection;
}
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 2008-01-09 01:39:52 UTC (rev 17639)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/core/EndNodeWrapper.java 2008-01-09 01:41:03 UTC (rev 17640)
@@ -16,8 +16,7 @@
*/
import org.drools.eclipse.flow.common.editor.core.ElementConnection;
-import org.drools.ruleflow.core.EndNode;
-import org.drools.ruleflow.core.impl.EndNodeImpl;
+import org.drools.workflow.core.node.EndNode;
/**
* Wrapper for an end node.
@@ -29,7 +28,7 @@
private static final long serialVersionUID = 400L;
public EndNodeWrapper() {
- setNode(new EndNodeImpl());
+ setNode(new EndNode());
getEndNode().setName("End");
}
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 2008-01-09 01:39:52 UTC (rev 17639)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/core/JoinWrapper.java 2008-01-09 01:41:03 UTC (rev 17640)
@@ -17,9 +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.Connection;
-import org.drools.ruleflow.core.Join;
-import org.drools.ruleflow.core.impl.JoinImpl;
+import org.drools.workflow.core.Connection;
+import org.drools.workflow.core.node.Join;
import org.eclipse.ui.views.properties.ComboBoxPropertyDescriptor;
import org.eclipse.ui.views.properties.IPropertyDescriptor;
@@ -42,7 +41,7 @@
}
public JoinWrapper() {
- setNode(new JoinImpl());
+ setNode(new Join());
getJoin().setName("Join");
}
@@ -55,8 +54,7 @@
}
public boolean acceptsOutgoingConnection(ElementConnection connection) {
- return connection.getType() == Connection.TYPE_NORMAL
- && getOutgoingConnections().isEmpty();
+ return getOutgoingConnections().isEmpty();
}
public IPropertyDescriptor[] getPropertyDescriptors() {
Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/core/MilestoneWrapper.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/core/MilestoneWrapper.java 2008-01-09 01:39:52 UTC (rev 17639)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/core/MilestoneWrapper.java 2008-01-09 01:41:03 UTC (rev 17640)
@@ -18,8 +18,7 @@
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.MilestoneConstraintPropertyDescriptor;
-import org.drools.ruleflow.core.MilestoneNode;
-import org.drools.ruleflow.core.impl.MilestoneNodeImpl;
+import org.drools.workflow.core.node.MilestoneNode;
import org.eclipse.ui.views.properties.IPropertyDescriptor;
/**
@@ -35,7 +34,7 @@
public static final String CONSTRAINT = "Constraint";
public MilestoneWrapper() {
- setNode(new MilestoneNodeImpl());
+ setNode(new MilestoneNode());
getMilestoneNode().setName("Milestone");
}
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 2008-01-09 01:39:52 UTC (rev 17639)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/core/NodeWrapper.java 2008-01-09 01:41:03 UTC (rev 17640)
@@ -16,7 +16,7 @@
*/
import org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper;
-import org.drools.ruleflow.core.Node;
+import org.drools.workflow.core.Node;
/**
* Wrapper for a node.
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 2008-01-09 01:39:52 UTC (rev 17639)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/core/RuleFlowProcessWrapper.java 2008-01-09 01:41:03 UTC (rev 17640)
@@ -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.Process;
+import org.drools.process.core.Process;
import org.drools.ruleflow.core.RuleFlowProcess;
-import org.drools.ruleflow.core.impl.RuleFlowProcessImpl;
+import org.drools.workflow.core.WorkflowProcess;
/**
* Wrapper for a RuleFlow process.
@@ -40,12 +40,12 @@
// new ListPropertyDescriptor(VARIABLES, "Variables", VariableListCellEditor.class);
// }
- public RuleFlowProcess getRuleFlowProcess() {
- return (RuleFlowProcess) getProcess();
+ public WorkflowProcess getRuleFlowProcess() {
+ return (WorkflowProcess) getProcess();
}
protected Process createProcess() {
- return new RuleFlowProcessImpl();
+ return new RuleFlowProcess();
}
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 2008-01-09 01:39:52 UTC (rev 17639)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/core/RuleSetNodeWrapper.java 2008-01-09 01:41:03 UTC (rev 17640)
@@ -17,8 +17,7 @@
import org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper;
import org.drools.eclipse.flow.common.editor.core.ElementConnection;
-import org.drools.ruleflow.core.RuleSetNode;
-import org.drools.ruleflow.core.impl.RuleSetNodeImpl;
+import org.drools.workflow.core.node.RuleSetNode;
import org.eclipse.ui.views.properties.IPropertyDescriptor;
import org.eclipse.ui.views.properties.TextPropertyDescriptor;
@@ -41,7 +40,7 @@
}
public RuleSetNodeWrapper() {
- setNode(new RuleSetNodeImpl());
+ setNode(new RuleSetNode());
getRuleSetNode().setName("RuleSet");
getRuleSetNode().setRuleFlowGroup("");
}
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 2008-01-09 01:39:52 UTC (rev 17639)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/core/SplitWrapper.java 2008-01-09 01:41:03 UTC (rev 17640)
@@ -24,10 +24,9 @@
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.Connection;
-import org.drools.ruleflow.core.Constraint;
-import org.drools.ruleflow.core.Split;
-import org.drools.ruleflow.core.impl.SplitImpl;
+import org.drools.workflow.core.Connection;
+import org.drools.workflow.core.Constraint;
+import org.drools.workflow.core.node.Split;
import org.eclipse.ui.views.properties.ComboBoxPropertyDescriptor;
import org.eclipse.ui.views.properties.IPropertyDescriptor;
@@ -45,7 +44,7 @@
private transient IPropertyDescriptor[] descriptors;
public SplitWrapper() {
- setNode(new SplitImpl());
+ setNode(new Split());
getSplit().setName("Split");
setDescriptors();
}
@@ -67,12 +66,12 @@
}
public boolean acceptsOutgoingConnection(ElementConnection connection) {
- return connection.getType() == Connection.TYPE_NORMAL;
+ return true;
}
public IPropertyDescriptor[] getPropertyDescriptors() {
- if (getParent() != null && (getSplit().getType() == SplitImpl.TYPE_XOR
- || getSplit().getType() == SplitImpl.TYPE_OR)) {
+ if (getParent() != null && (getSplit().getType() == Split.TYPE_XOR
+ || getSplit().getType() == Split.TYPE_OR)) {
IPropertyDescriptor[] result = new IPropertyDescriptor[descriptors.length + 1];
System.arraycopy(descriptors, 0, result, 0, descriptors.length);
result[descriptors.length] =
@@ -87,8 +86,8 @@
return new Integer(getSplit().getType());
}
if (CONSTRAINTS.equals(id)) {
- return getSplit().getType() == SplitImpl.TYPE_XOR
- || getSplit().getType() == SplitImpl.TYPE_OR
+ return getSplit().getType() == Split.TYPE_XOR
+ || getSplit().getType() == Split.TYPE_OR
? new MyHashMap(getSplit().getConstraints()) : new MyHashMap();
}
return super.getPropertyValue(id);
@@ -98,7 +97,7 @@
if (TYPE.equals(id)) {
getSplit().setType(Split.TYPE_UNDEFINED);
} else if (CONSTRAINTS.equals(id)) {
- for (Iterator it = getSplit().getOutgoingConnections().iterator(); it.hasNext(); ) {
+ for (Iterator it = getSplit().getDefaultOutgoingConnections().iterator(); it.hasNext(); ) {
Connection connection = (Connection) it.next();
getSplit().setConstraint(connection, null);
}
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 2008-01-09 01:39:52 UTC (rev 17639)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/core/StartNodeWrapper.java 2008-01-09 01:41:03 UTC (rev 17640)
@@ -16,9 +16,8 @@
*/
import org.drools.eclipse.flow.common.editor.core.ElementConnection;
-import org.drools.ruleflow.core.Connection;
-import org.drools.ruleflow.core.StartNode;
-import org.drools.ruleflow.core.impl.StartNodeImpl;
+import org.drools.workflow.core.Connection;
+import org.drools.workflow.core.node.StartNode;
/**
* Wrapper for a start node.
@@ -30,7 +29,7 @@
private static final long serialVersionUID = 400L;
public StartNodeWrapper() {
- setNode(new StartNodeImpl());
+ setNode(new StartNode());
setName("Start");
}
@@ -43,7 +42,6 @@
}
public boolean acceptsOutgoingConnection(ElementConnection connection) {
- return connection.getType() == Connection.TYPE_NORMAL
- && getOutgoingConnections().isEmpty();
+ return getOutgoingConnections().isEmpty();
}
}
Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/core/SubFlowWrapper.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/core/SubFlowWrapper.java 2008-01-09 01:39:52 UTC (rev 17639)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/core/SubFlowWrapper.java 2008-01-09 01:41:03 UTC (rev 17640)
@@ -17,8 +17,7 @@
import org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper;
import org.drools.eclipse.flow.common.editor.core.ElementConnection;
-import org.drools.ruleflow.core.SubFlowNode;
-import org.drools.ruleflow.core.impl.SubFlowNodeImpl;
+import org.drools.workflow.core.node.SubProcessNode;
import org.eclipse.ui.views.properties.ComboBoxPropertyDescriptor;
import org.eclipse.ui.views.properties.IPropertyDescriptor;
import org.eclipse.ui.views.properties.TextPropertyDescriptor;
@@ -46,12 +45,12 @@
}
public SubFlowWrapper() {
- setNode(new SubFlowNodeImpl());
- getSubFlowNode().setName("SubFlow");
+ setNode(new SubProcessNode());
+ getSubProcessNode().setName("SubProcess");
}
- public SubFlowNode getSubFlowNode() {
- return (SubFlowNode) getNode();
+ public SubProcessNode getSubProcessNode() {
+ return (SubProcessNode) getNode();
}
public IPropertyDescriptor[] getPropertyDescriptors() {
@@ -68,20 +67,20 @@
public Object getPropertyValue(Object id) {
if (PROCESS_ID.equals(id)) {
- String processId = getSubFlowNode().getProcessId();
+ String processId = getSubProcessNode().getProcessId();
return processId == null ? "" : processId;
}
if (WAIT_FOR_COMPLETION.equals(id)) {
- return getSubFlowNode().isWaitForCompletion() ? new Integer(0) : new Integer(1);
+ return getSubProcessNode().isWaitForCompletion() ? new Integer(0) : new Integer(1);
}
return super.getPropertyValue(id);
}
public void resetPropertyValue(Object id) {
if (PROCESS_ID.equals(id)) {
- getSubFlowNode().setProcessId("");
+ getSubProcessNode().setProcessId("");
} else if (WAIT_FOR_COMPLETION.equals(id)) {
- getSubFlowNode().setWaitForCompletion(true);
+ getSubProcessNode().setWaitForCompletion(true);
} else {
super.resetPropertyValue(id);
}
@@ -89,9 +88,9 @@
public void setPropertyValue(Object id, Object value) {
if (PROCESS_ID.equals(id)) {
- getSubFlowNode().setProcessId((String) value);
+ getSubProcessNode().setProcessId((String) value);
} else if (WAIT_FOR_COMPLETION.equals(id)) {
- getSubFlowNode().setWaitForCompletion(((Integer) value).intValue() == 0);
+ getSubProcessNode().setWaitForCompletion(((Integer) value).intValue() == 0);
} else {
super.setPropertyValue(id, value);
}
Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/core/WorkItemWrapper.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/core/WorkItemWrapper.java 2008-01-09 01:39:52 UTC (rev 17639)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/core/WorkItemWrapper.java 2008-01-09 01:41:03 UTC (rev 17640)
@@ -21,11 +21,10 @@
import org.drools.eclipse.WorkItemDefinitions;
import org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper;
import org.drools.eclipse.flow.common.editor.core.ElementConnection;
-import org.drools.ruleflow.common.core.ParameterDefinition;
-import org.drools.ruleflow.common.core.Work;
-import org.drools.ruleflow.common.core.WorkDefinition;
-import org.drools.ruleflow.core.WorkItemNode;
-import org.drools.ruleflow.core.impl.WorkItemNodeImpl;
+import org.drools.process.core.ParameterDefinition;
+import org.drools.process.core.Work;
+import org.drools.process.core.WorkDefinition;
+import org.drools.workflow.core.node.WorkItemNode;
import org.eclipse.ui.views.properties.IPropertyDescriptor;
import org.eclipse.ui.views.properties.TextPropertyDescriptor;
@@ -43,7 +42,7 @@
private IPropertyDescriptor[] descriptors;
public WorkItemWrapper() {
- setNode(new WorkItemNodeImpl());
+ setNode(new WorkItemNode());
}
public WorkItemNode getWorkItemNode() {
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 2008-01-09 01:39:52 UTC (rev 17639)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/editor/RuleFlowPaletteFactory.java 2008-01-09 01:41:03 UTC (rev 17640)
@@ -33,10 +33,10 @@
import org.drools.eclipse.flow.ruleflow.core.StartNodeWrapper;
import org.drools.eclipse.flow.ruleflow.core.SubFlowWrapper;
import org.drools.eclipse.flow.ruleflow.core.WorkItemWrapper;
-import org.drools.ruleflow.common.core.WorkDefinition;
-import org.drools.ruleflow.common.core.WorkDefinitionExtension;
-import org.drools.ruleflow.common.core.impl.WorkImpl;
-import org.drools.ruleflow.core.Connection;
+import org.drools.process.core.WorkDefinition;
+import org.drools.process.core.WorkDefinitionExtension;
+import org.drools.process.core.impl.WorkImpl;
+import org.drools.workflow.core.Connection;
import org.eclipse.gef.palette.CombinedTemplateCreationEntry;
import org.eclipse.gef.palette.ConnectionCreationToolEntry;
import org.eclipse.gef.palette.MarqueeToolEntry;
@@ -217,7 +217,7 @@
tool = new MarqueeToolEntry();
entries.add(tool);
- final ElementConnectionFactory normalConnectionFactory = new ConnectionWrapperFactory(Connection.TYPE_NORMAL);
+ final ElementConnectionFactory normalConnectionFactory = new ConnectionWrapperFactory();
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 2008-01-09 01:39:52 UTC (rev 17639)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/editor/action/CheckRuleFlowAction.java 2008-01-09 01:41:03 UTC (rev 17640)
@@ -17,8 +17,8 @@
import org.drools.eclipse.DroolsEclipsePlugin;
import org.drools.eclipse.flow.ruleflow.editor.RuleFlowModelEditor;
-import org.drools.ruleflow.core.RuleFlowProcessValidationError;
-import org.drools.ruleflow.core.impl.RuleFlowProcessValidatorImpl;
+import org.drools.process.core.validation.ProcessValidationError;
+import org.drools.ruleflow.core.validation.RuleFlowProcessValidator;
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() {
- RuleFlowProcessValidationError[] errors = RuleFlowProcessValidatorImpl.getInstance().validateProcess(
+ ProcessValidationError[] errors = RuleFlowProcessValidator.getInstance().validateProcess(
((RuleFlowModelEditor) editor).getRuleFlowModel().getRuleFlowProcess());
if (errors.length == 0) {
MessageDialog.openInformation(editor.getSite().getShell(),
Deleted: 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 2008-01-09 01:39:52 UTC (rev 17639)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/editor/editpart/RuleFlowConnectionEditPart.java 2008-01-09 01:41:03 UTC (rev 17640)
@@ -1,53 +0,0 @@
-package org.drools.eclipse.flow.ruleflow.editor.editpart;
-/*
- * 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.eclipse.flow.common.editor.core.ElementConnection;
-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.Connection;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.PolygonDecoration;
-import org.eclipse.draw2d.PolylineConnection;
-import org.eclipse.draw2d.geometry.PointList;
-
-/**
- * EditPart for an element connection.
- *
- * @author <a href="mailto:kris_verlaenen at hotmail.com">Kris Verlaenen</a>
- */
-public class RuleFlowConnectionEditPart extends ElementConnectionEditPart {
-
- protected ElementConnectionFactory getDefaultElementConnectionFactory() {
- return new ConnectionWrapperFactory(Connection.TYPE_NORMAL);
- }
-
- protected IFigure createFigure() {
- PolylineConnection result = (PolylineConnection) super.createFigure();
- if (((ElementConnection) getModel()).getType() == Connection.TYPE_ABORT) {
- PolygonDecoration decoration = new PolygonDecoration();
- PointList decorationPointList = new PointList();
- decorationPointList.addPoint(0,0);
- decorationPointList.addPoint(-1,1);
- decorationPointList.addPoint(-2,0);
- decorationPointList.addPoint(-1,-1);
- decoration.setTemplate(decorationPointList);
- result.setSourceDecoration(decoration);
- }
- return result;
- }
-}
Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/editor/editpart/RuleFlowEditPartFactory.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/editor/editpart/RuleFlowEditPartFactory.java 2008-01-09 01:39:52 UTC (rev 17639)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/editor/editpart/RuleFlowEditPartFactory.java 2008-01-09 01:41:03 UTC (rev 17640)
@@ -16,6 +16,7 @@
*/
import org.drools.eclipse.flow.common.editor.core.ElementConnection;
+import org.drools.eclipse.flow.common.editor.editpart.ElementConnectionEditPart;
import org.drools.eclipse.flow.common.editor.editpart.ProcessEditPart;
import org.drools.eclipse.flow.ruleflow.core.ActionWrapper;
import org.drools.eclipse.flow.ruleflow.core.EndNodeWrapper;
@@ -44,7 +45,7 @@
} else if (model instanceof RuleSetNodeWrapper) {
result = new RuleSetNodeEditPart();
} else if (model instanceof ElementConnection) {
- result = new RuleFlowConnectionEditPart();
+ result = new ElementConnectionEditPart();
} else if (model instanceof StartNodeWrapper) {
result = new StartNodeEditPart();
} else if (model instanceof EndNodeWrapper) {
Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/editor/editpart/WorkItemEditPart.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/editor/editpart/WorkItemEditPart.java 2008-01-09 01:39:52 UTC (rev 17639)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/editor/editpart/WorkItemEditPart.java 2008-01-09 01:41:03 UTC (rev 17640)
@@ -20,8 +20,8 @@
import org.drools.eclipse.flow.common.editor.editpart.ElementEditPart;
import org.drools.eclipse.flow.common.editor.editpart.figure.ElementFigure;
import org.drools.eclipse.flow.ruleflow.core.WorkItemWrapper;
-import org.drools.ruleflow.common.core.WorkDefinition;
-import org.drools.ruleflow.common.core.WorkDefinitionExtension;
+import org.drools.process.core.WorkDefinition;
+import org.drools.process.core.WorkDefinitionExtension;
import org.eclipse.draw2d.IFigure;
import org.eclipse.draw2d.RoundedRectangle;
import org.eclipse.draw2d.geometry.Dimension;
Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/action/ActionCellEditor.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/action/ActionCellEditor.java 2008-01-09 01:39:52 UTC (rev 17639)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/action/ActionCellEditor.java 2008-01-09 01:41:03 UTC (rev 17640)
@@ -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.ActionNode;
-import org.drools.ruleflow.core.RuleFlowProcess;
+import org.drools.workflow.core.WorkflowProcess;
+import org.drools.workflow.core.node.ActionNode;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Shell;
@@ -29,10 +29,10 @@
*/
public class ActionCellEditor extends BeanDialogCellEditor {
- private RuleFlowProcess process;
+ private WorkflowProcess process;
private ActionNode actionNode;
- public ActionCellEditor(Composite parent, RuleFlowProcess process, ActionNode actionNode) {
+ public ActionCellEditor(Composite parent, WorkflowProcess process, ActionNode actionNode) {
super(parent);
this.process = process;
this.actionNode = actionNode;
Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/action/ActionDialog.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/action/ActionDialog.java 2008-01-09 01:39:52 UTC (rev 17639)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/action/ActionDialog.java 2008-01-09 01:41:03 UTC (rev 17640)
@@ -22,10 +22,10 @@
import org.drools.eclipse.flow.common.view.property.EditBeanDialog;
import org.drools.eclipse.flow.ruleflow.view.property.constraint.RuleFlowGlobalsDialog;
import org.drools.eclipse.flow.ruleflow.view.property.constraint.RuleFlowImportsDialog;
-import org.drools.ruleflow.core.ActionNode;
-import org.drools.ruleflow.core.RuleFlowProcess;
-import org.drools.ruleflow.core.impl.DroolsConsequenceAction;
import org.drools.util.ArrayUtils;
+import org.drools.workflow.core.WorkflowProcess;
+import org.drools.workflow.core.impl.DroolsConsequenceAction;
+import org.drools.workflow.core.node.ActionNode;
import org.eclipse.jface.resource.JFaceResources;
import org.eclipse.jface.text.Document;
import org.eclipse.jface.text.IDocument;
@@ -59,13 +59,13 @@
private static final String[] DIALECTS = new String[] { "mvel", "java" };
- private RuleFlowProcess process;
+ private WorkflowProcess process;
private TabFolder tabFolder;
private SourceViewer actionViewer;
private Combo dialectCombo;
//private ActionCompletionProcessor completionProcessor;
- public ActionDialog(Shell parentShell, RuleFlowProcess process, ActionNode actionNode) {
+ public ActionDialog(Shell parentShell, WorkflowProcess process, ActionNode actionNode) {
super(parentShell, "Action editor");
this.process = process;
super.setValue(actionNode.getAction());
Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/action/ActionPropertyDescriptor.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/action/ActionPropertyDescriptor.java 2008-01-09 01:39:52 UTC (rev 17639)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/action/ActionPropertyDescriptor.java 2008-01-09 01:41:03 UTC (rev 17640)
@@ -15,8 +15,8 @@
* limitations under the License.
*/
-import org.drools.ruleflow.core.ActionNode;
-import org.drools.ruleflow.core.RuleFlowProcess;
+import org.drools.workflow.core.WorkflowProcess;
+import org.drools.workflow.core.node.ActionNode;
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 ActionPropertyDescriptor extends PropertyDescriptor {
- private RuleFlowProcess process;
+ private WorkflowProcess process;
private ActionNode actionNode;
- public ActionPropertyDescriptor(Object id, String displayName, ActionNode actionNode, RuleFlowProcess process) {
+ public ActionPropertyDescriptor(Object id, String displayName, ActionNode actionNode, WorkflowProcess process) {
super(id, displayName);
this.actionNode = actionNode;
this.process = process;
}
- public RuleFlowProcess getProcess() {
+ public WorkflowProcess getProcess() {
return process;
}
Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/constraint/ConstraintCompletionProcessor.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/constraint/ConstraintCompletionProcessor.java 2008-01-09 01:39:52 UTC (rev 17639)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/constraint/ConstraintCompletionProcessor.java 2008-01-09 01:41:03 UTC (rev 17640)
@@ -23,7 +23,7 @@
import org.drools.eclipse.editors.DRLRuleEditor;
import org.drools.eclipse.editors.completion.RuleCompletionProcessor;
-import org.drools.ruleflow.core.RuleFlowProcess;
+import org.drools.workflow.core.WorkflowProcess;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.jdt.core.IJavaProject;
@@ -44,11 +44,11 @@
*/
public class ConstraintCompletionProcessor extends RuleCompletionProcessor {
- private RuleFlowProcess process;
+ private WorkflowProcess process;
private List imports;
private List globals;
- public ConstraintCompletionProcessor(RuleFlowProcess process) {
+ public ConstraintCompletionProcessor(WorkflowProcess process) {
super(null);
this.process = process;
}
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 2008-01-09 01:39:52 UTC (rev 17639)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/constraint/ConstraintListCellEditor.java 2008-01-09 01:41:03 UTC (rev 17640)
@@ -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.Split;
-import org.drools.ruleflow.core.RuleFlowProcess;
+import org.drools.workflow.core.WorkflowProcess;
+import org.drools.workflow.core.node.Split;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Shell;
@@ -29,10 +29,10 @@
*/
public class ConstraintListCellEditor extends BeanDialogCellEditor {
- private RuleFlowProcess process;
+ private WorkflowProcess process;
private Split split;
- public ConstraintListCellEditor(Composite parent, RuleFlowProcess process, Split split) {
+ public ConstraintListCellEditor(Composite parent, WorkflowProcess 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 2008-01-09 01:39:52 UTC (rev 17639)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/constraint/ConstraintListDialog.java 2008-01-09 01:41:03 UTC (rev 17640)
@@ -21,10 +21,10 @@
import java.util.Map;
import org.drools.eclipse.flow.common.view.property.EditBeanDialog;
-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.drools.workflow.core.Connection;
+import org.drools.workflow.core.Constraint;
+import org.drools.workflow.core.WorkflowProcess;
+import org.drools.workflow.core.node.Split;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.SelectionAdapter;
import org.eclipse.swt.events.SelectionEvent;
@@ -44,12 +44,12 @@
*/
public class ConstraintListDialog extends EditBeanDialog {
- private RuleFlowProcess process;
+ private WorkflowProcess process;
private Split split;
private Map newMap;
private Map labels = new HashMap();
- protected ConstraintListDialog(Shell parentShell, RuleFlowProcess process,
+ protected ConstraintListDialog(Shell parentShell, WorkflowProcess process,
Split split) {
super(parentShell, "Edit Constraints");
this.process = process;
@@ -62,7 +62,7 @@
gridLayout.numColumns = 3;
composite.setLayout(gridLayout);
- List outgoingConnections = split.getOutgoingConnections();
+ List outgoingConnections = split.getDefaultOutgoingConnections();
labels.clear();
for (Iterator it = outgoingConnections.iterator(); it.hasNext(); ) {
Connection outgoingConnection = (Connection) it.next();
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 2008-01-09 01:39:52 UTC (rev 17639)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/constraint/ConstraintsPropertyDescriptor.java 2008-01-09 01:41:03 UTC (rev 17640)
@@ -15,8 +15,8 @@
* limitations under the License.
*/
-import org.drools.ruleflow.core.Split;
-import org.drools.ruleflow.core.RuleFlowProcess;
+import org.drools.workflow.core.WorkflowProcess;
+import org.drools.workflow.core.node.Split;
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 RuleFlowProcess process;
+ private WorkflowProcess process;
private Split split;
- public ConstraintsPropertyDescriptor(Object id, String displayName, Split split, RuleFlowProcess process) {
+ public ConstraintsPropertyDescriptor(Object id, String displayName, Split split, WorkflowProcess process) {
super(id, displayName);
this.split = split;
this.process = process;
}
- public RuleFlowProcess getProcess() {
+ public WorkflowProcess getProcess() {
return process;
}
Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/constraint/MilestoneConstraintCellEditor.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/constraint/MilestoneConstraintCellEditor.java 2008-01-09 01:39:52 UTC (rev 17639)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/constraint/MilestoneConstraintCellEditor.java 2008-01-09 01:41:03 UTC (rev 17640)
@@ -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.MilestoneNode;
-import org.drools.ruleflow.core.RuleFlowProcess;
+import org.drools.workflow.core.WorkflowProcess;
+import org.drools.workflow.core.node.MilestoneNode;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Shell;
@@ -29,10 +29,10 @@
*/
public class MilestoneConstraintCellEditor extends BeanDialogCellEditor {
- private RuleFlowProcess process;
+ private WorkflowProcess process;
private MilestoneNode milestone;
- public MilestoneConstraintCellEditor(Composite parent, RuleFlowProcess process, MilestoneNode milestone) {
+ public MilestoneConstraintCellEditor(Composite parent, WorkflowProcess process, MilestoneNode milestone) {
super(parent);
this.process = process;
this.milestone = milestone;
Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/constraint/MilestoneConstraintDialog.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/constraint/MilestoneConstraintDialog.java 2008-01-09 01:39:52 UTC (rev 17639)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/constraint/MilestoneConstraintDialog.java 2008-01-09 01:41:03 UTC (rev 17640)
@@ -21,8 +21,8 @@
import org.drools.eclipse.editors.DRLSourceViewerConfig;
import org.drools.eclipse.editors.scanners.DRLPartionScanner;
import org.drools.eclipse.flow.common.view.property.EditBeanDialog;
-import org.drools.ruleflow.core.MilestoneNode;
-import org.drools.ruleflow.core.RuleFlowProcess;
+import org.drools.workflow.core.WorkflowProcess;
+import org.drools.workflow.core.node.MilestoneNode;
import org.eclipse.jface.resource.JFaceResources;
import org.eclipse.jface.text.Document;
import org.eclipse.jface.text.IDocument;
@@ -55,12 +55,12 @@
*/
public class MilestoneConstraintDialog extends EditBeanDialog {
- private RuleFlowProcess process;
+ private WorkflowProcess process;
private TabFolder tabFolder;
private SourceViewer constraintViewer;
private ConstraintCompletionProcessor completionProcessor;
- public MilestoneConstraintDialog(Shell parentShell, RuleFlowProcess process, MilestoneNode milestone) {
+ public MilestoneConstraintDialog(Shell parentShell, WorkflowProcess process, MilestoneNode milestone) {
super(parentShell, "Constraint editor");
this.process = process;
setValue(milestone.getConstraint());
Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/constraint/MilestoneConstraintPropertyDescriptor.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/constraint/MilestoneConstraintPropertyDescriptor.java 2008-01-09 01:39:52 UTC (rev 17639)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/constraint/MilestoneConstraintPropertyDescriptor.java 2008-01-09 01:41:03 UTC (rev 17640)
@@ -15,8 +15,9 @@
* limitations under the License.
*/
-import org.drools.ruleflow.core.MilestoneNode;
-import org.drools.ruleflow.core.RuleFlowProcess;
+
+import org.drools.workflow.core.WorkflowProcess;
+import org.drools.workflow.core.node.MilestoneNode;
import org.eclipse.jface.viewers.CellEditor;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.ui.views.properties.PropertyDescriptor;
@@ -28,16 +29,16 @@
*/
public class MilestoneConstraintPropertyDescriptor extends PropertyDescriptor {
- private RuleFlowProcess process;
+ private WorkflowProcess process;
private MilestoneNode milestone;
- public MilestoneConstraintPropertyDescriptor(Object id, String displayName, MilestoneNode milestone, RuleFlowProcess process) {
+ public MilestoneConstraintPropertyDescriptor(Object id, String displayName, MilestoneNode milestone, WorkflowProcess process) {
super(id, displayName);
this.milestone = milestone;
this.process = process;
}
- public RuleFlowProcess getProcess() {
+ public WorkflowProcess 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 2008-01-09 01:39:52 UTC (rev 17639)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/constraint/RuleFlowConstraintDialog.java 2008-01-09 01:41:03 UTC (rev 17640)
@@ -20,10 +20,10 @@
import org.drools.eclipse.editors.DRLSourceViewerConfig;
import org.drools.eclipse.editors.scanners.DRLPartionScanner;
-import org.drools.ruleflow.core.Constraint;
-import org.drools.ruleflow.core.RuleFlowProcess;
-import org.drools.ruleflow.core.impl.ConstraintImpl;
import org.drools.util.ArrayUtils;
+import org.drools.workflow.core.Constraint;
+import org.drools.workflow.core.WorkflowProcess;
+import org.drools.workflow.core.impl.ConstraintImpl;
import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.jface.resource.JFaceResources;
import org.eclipse.jface.text.Document;
@@ -65,7 +65,7 @@
private static final String[] TYPES = new String[] { "rule", "code" };
private Constraint constraint;
- private RuleFlowProcess process;
+ private WorkflowProcess process;
private boolean success;
private Button alwaysTrue;
private Text nameText;
@@ -76,7 +76,7 @@
private SourceViewer constraintViewer;
private ConstraintCompletionProcessor completionProcessor;
- public RuleFlowConstraintDialog(Shell parentShell, RuleFlowProcess process) {
+ public RuleFlowConstraintDialog(Shell parentShell, WorkflowProcess process) {
super(parentShell);
this.process = process;
setShellStyle(getShellStyle() | SWT.RESIZE);
Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/constraint/RuleFlowGlobalsDialog.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/constraint/RuleFlowGlobalsDialog.java 2008-01-09 01:39:52 UTC (rev 17639)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/constraint/RuleFlowGlobalsDialog.java 2008-01-09 01:41:03 UTC (rev 17640)
@@ -22,7 +22,7 @@
import java.util.regex.Pattern;
import org.drools.eclipse.editors.DRLSourceViewerConfig;
-import org.drools.ruleflow.core.RuleFlowProcess;
+import org.drools.workflow.core.WorkflowProcess;
import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.jface.text.Document;
import org.eclipse.jface.text.IDocument;
@@ -50,13 +50,13 @@
private static final Pattern GLOBAL_PATTERN = Pattern.compile(
"\\n\\s*global\\s+([^\\s;#]+)\\s+([^\\s;#]+);?", Pattern.DOTALL);
- private RuleFlowProcess process;
+ private WorkflowProcess process;
private boolean success;
private TabFolder tabFolder;
private SourceViewer globalsViewer;
private Map globals;
- public RuleFlowGlobalsDialog(Shell parentShell, RuleFlowProcess process) {
+ public RuleFlowGlobalsDialog(Shell parentShell, WorkflowProcess process) {
super(parentShell);
this.process = process;
setShellStyle(getShellStyle() | SWT.RESIZE);
Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/constraint/RuleFlowImportsDialog.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/constraint/RuleFlowImportsDialog.java 2008-01-09 01:39:52 UTC (rev 17639)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/constraint/RuleFlowImportsDialog.java 2008-01-09 01:41:03 UTC (rev 17640)
@@ -23,7 +23,7 @@
import org.drools.eclipse.editors.DRLSourceViewerConfig;
import org.drools.eclipse.editors.scanners.DRLPartionScanner;
-import org.drools.ruleflow.core.RuleFlowProcess;
+import org.drools.workflow.core.WorkflowProcess;
import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.jface.text.Document;
import org.eclipse.jface.text.IDocument;
@@ -57,13 +57,13 @@
private static final Pattern IMPORT_PATTERN = Pattern.compile(
"\\n\\s*import\\s+([^\\s;#]+);?", Pattern.DOTALL);
- private RuleFlowProcess process;
+ private WorkflowProcess process;
private boolean success;
private TabFolder tabFolder;
private SourceViewer importsViewer;
private List imports;
- public RuleFlowImportsDialog(Shell parentShell, RuleFlowProcess process) {
+ public RuleFlowImportsDialog(Shell parentShell, WorkflowProcess process) {
super(parentShell);
this.process = process;
setShellStyle(getShellStyle() | SWT.RESIZE);
Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/task/TaskDialog.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/task/TaskDialog.java 2008-01-09 01:39:52 UTC (rev 17639)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/task/TaskDialog.java 2008-01-09 01:41:03 UTC (rev 17640)
@@ -16,7 +16,7 @@
*/
import org.drools.eclipse.flow.common.view.property.EditBeanDialog;
-import org.drools.ruleflow.common.core.Work;
+import org.drools.process.core.Work;
import org.eclipse.swt.SWT;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.layout.GridLayout;
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 2008-01-09 01:39:52 UTC (rev 17639)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/variable/VariableDialog.java 2008-01-09 01:41:03 UTC (rev 17640)
@@ -22,8 +22,8 @@
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.DataType;
-import org.drools.ruleflow.core.Variable;
+import org.drools.process.core.Variable;
+import org.drools.process.core.datatype.DataType;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
import org.eclipse.jface.dialogs.ErrorDialog;
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 2008-01-09 01:39:52 UTC (rev 17639)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/variable/VariableListDialog.java 2008-01-09 01:41:03 UTC (rev 17640)
@@ -16,7 +16,7 @@
*/
import org.drools.eclipse.flow.common.view.property.EditListDialog;
-import org.drools.ruleflow.core.impl.VariableImpl;
+import org.drools.process.core.impl.VariableImpl;
import org.eclipse.swt.widgets.Shell;
/**
Deleted: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/resources/org/drools/eclipse/wizard/project/ruleflow.rf.template
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/resources/org/drools/eclipse/wizard/project/ruleflow.rf.template 2008-01-09 01:39:52 UTC (rev 17639)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/resources/org/drools/eclipse/wizard/project/ruleflow.rf.template 2008-01-09 01:41:03 UTC (rev 17640)
@@ -1,211 +0,0 @@
-<org.drools.eclipse.flow.ruleflow.core.RuleFlowProcessWrapper id="1" serialization="custom">
- <org.drools.eclipse.flow.common.editor.core.ProcessWrapper>
- <default>
- <elements id="2">
- <entry>
- <string>2-Wrapper</string>
- <org.drools.eclipse.flow.ruleflow.core.RuleSetNodeWrapper id="3" serialization="custom">
- <org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
- <default>
- <constraint id="4">
- <x>190</x>
- <y>101</y>
- <width>80</width>
- <height>40</height>
- </constraint>
- <element class="org.drools.ruleflow.core.impl.RuleSetNodeImpl" id="5">
- <ruleFlowGroup>hello</ruleFlowGroup>
- <id>2</id>
- <name>hello</name>
- <incomingConnections id="6">
- <org.drools.ruleflow.core.impl.ConnectionImpl id="7">
- <type>1</type>
- <from class="org.drools.ruleflow.core.impl.StartNodeImpl" id="8">
- <id>1</id>
- <name>Start</name>
- <incomingConnections id="9"/>
- <outgoingConnections id="10">
- <org.drools.ruleflow.core.impl.ConnectionImpl reference="7"/>
- </outgoingConnections>
- </from>
- <to class="org.drools.ruleflow.core.impl.RuleSetNodeImpl" reference="5"/>
- </org.drools.ruleflow.core.impl.ConnectionImpl>
- </incomingConnections>
- <outgoingConnections id="11">
- <org.drools.ruleflow.core.impl.ConnectionImpl id="12">
- <type>1</type>
- <from class="org.drools.ruleflow.core.impl.RuleSetNodeImpl" reference="5"/>
- <to class="org.drools.ruleflow.core.impl.RuleSetNodeImpl" id="13">
- <ruleFlowGroup>goodbye</ruleFlowGroup>
- <id>3</id>
- <name>goodbye</name>
- <incomingConnections id="14">
- <org.drools.ruleflow.core.impl.ConnectionImpl reference="12"/>
- </incomingConnections>
- <outgoingConnections id="15">
- <org.drools.ruleflow.core.impl.ConnectionImpl id="16">
- <type>1</type>
- <from class="org.drools.ruleflow.core.impl.RuleSetNodeImpl" reference="13"/>
- <to class="org.drools.ruleflow.core.impl.EndNodeImpl" id="17">
- <id>4</id>
- <name>End</name>
- <incomingConnections id="18">
- <org.drools.ruleflow.core.impl.ConnectionImpl reference="16"/>
- </incomingConnections>
- <outgoingConnections id="19"/>
- </to>
- </org.drools.ruleflow.core.impl.ConnectionImpl>
- </outgoingConnections>
- </to>
- </org.drools.ruleflow.core.impl.ConnectionImpl>
- </outgoingConnections>
- </element>
- <incomingConnections id="20">
- <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper id="21" serialization="custom">
- <org.drools.eclipse.flow.common.editor.core.ElementConnection>
- <default>
- <type>1</type>
- <bendpoints id="22"/>
- <source class="org.drools.eclipse.flow.ruleflow.core.StartNodeWrapper" id="23" serialization="custom">
- <org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
- <default>
- <constraint id="24">
- <x>57</x>
- <y>100</y>
- <width>80</width>
- <height>40</height>
- </constraint>
- <element class="org.drools.ruleflow.core.impl.StartNodeImpl" reference="8"/>
- <incomingConnections id="25"/>
- <outgoingConnections id="26">
- <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper reference="21"/>
- </outgoingConnections>
- </default>
- </org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
- </source>
- <target class="org.drools.eclipse.flow.ruleflow.core.RuleSetNodeWrapper" reference="3"/>
- </default>
- </org.drools.eclipse.flow.common.editor.core.ElementConnection>
- <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
- <default>
- <connection class="org.drools.ruleflow.core.impl.ConnectionImpl" reference="7"/>
- </default>
- </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
- </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
- </incomingConnections>
- <outgoingConnections id="27">
- <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper id="28" serialization="custom">
- <org.drools.eclipse.flow.common.editor.core.ElementConnection>
- <default>
- <type>1</type>
- <bendpoints id="29"/>
- <source class="org.drools.eclipse.flow.ruleflow.core.RuleSetNodeWrapper" reference="3"/>
- <target class="org.drools.eclipse.flow.ruleflow.core.RuleSetNodeWrapper" id="30" serialization="custom">
- <org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
- <default>
- <constraint id="31">
- <x>336</x>
- <y>101</y>
- <width>80</width>
- <height>40</height>
- </constraint>
- <element class="org.drools.ruleflow.core.impl.RuleSetNodeImpl" reference="13"/>
- <incomingConnections id="32">
- <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper reference="28"/>
- </incomingConnections>
- <outgoingConnections id="33">
- <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper id="34" serialization="custom">
- <org.drools.eclipse.flow.common.editor.core.ElementConnection>
- <default>
- <type>1</type>
- <bendpoints id="35"/>
- <source class="org.drools.eclipse.flow.ruleflow.core.RuleSetNodeWrapper" reference="30"/>
- <target class="org.drools.eclipse.flow.ruleflow.core.EndNodeWrapper" id="36" serialization="custom">
- <org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
- <default>
- <constraint id="37">
- <x>473</x>
- <y>102</y>
- <width>80</width>
- <height>40</height>
- </constraint>
- <element class="org.drools.ruleflow.core.impl.EndNodeImpl" reference="17"/>
- <incomingConnections id="38">
- <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper reference="34"/>
- </incomingConnections>
- <outgoingConnections id="39"/>
- <parent class="org.drools.eclipse.flow.ruleflow.core.RuleFlowProcessWrapper" reference="1"/>
- </default>
- </org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
- </target>
- </default>
- </org.drools.eclipse.flow.common.editor.core.ElementConnection>
- <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
- <default>
- <connection class="org.drools.ruleflow.core.impl.ConnectionImpl" reference="16"/>
- </default>
- </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
- </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
- </outgoingConnections>
- <parent class="org.drools.eclipse.flow.ruleflow.core.RuleFlowProcessWrapper" reference="1"/>
- </default>
- </org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
- </target>
- </default>
- </org.drools.eclipse.flow.common.editor.core.ElementConnection>
- <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
- <default>
- <connection class="org.drools.ruleflow.core.impl.ConnectionImpl" reference="12"/>
- </default>
- </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
- </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
- </outgoingConnections>
- <parent class="org.drools.eclipse.flow.ruleflow.core.RuleFlowProcessWrapper" reference="1"/>
- </default>
- </org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
- </org.drools.eclipse.flow.ruleflow.core.RuleSetNodeWrapper>
- </entry>
- <entry>
- <string>4-Wrapper</string>
- <org.drools.eclipse.flow.ruleflow.core.EndNodeWrapper reference="36"/>
- </entry>
- <entry>
- <string>3-Wrapper</string>
- <org.drools.eclipse.flow.ruleflow.core.RuleSetNodeWrapper reference="30"/>
- </entry>
- <entry>
- <string>1-Wrapper</string>
- <org.drools.eclipse.flow.ruleflow.core.StartNodeWrapper reference="23"/>
- </entry>
- </elements>
- <process class="org.drools.ruleflow.core.impl.RuleFlowProcessImpl" id="40">
- <nodes id="41">
- <entry>
- <long>2</long>
- <org.drools.ruleflow.core.impl.RuleSetNodeImpl reference="5"/>
- </entry>
- <entry>
- <long>4</long>
- <org.drools.ruleflow.core.impl.EndNodeImpl reference="17"/>
- </entry>
- <entry>
- <long>1</long>
- <org.drools.ruleflow.core.impl.StartNodeImpl reference="8"/>
- </entry>
- <entry>
- <long>3</long>
- <org.drools.ruleflow.core.impl.RuleSetNodeImpl reference="13"/>
- </entry>
- </nodes>
- <variables id="42"/>
- <lastNodeId>4</lastNodeId>
- <id>com.sample.ruleflow</id>
- <name>Ruleflow</name>
- <version>1.0</version>
- <type>RuleFlow</type>
- <packageName>com.sample</packageName>
- </process>
- <routerLayout>2</routerLayout>
- </default>
- </org.drools.eclipse.flow.common.editor.core.ProcessWrapper>
-</org.drools.eclipse.flow.ruleflow.core.RuleFlowProcessWrapper>
\ No newline at end of file
Deleted: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/resources/org/drools/eclipse/wizard/project/ruleflow.rfm.template
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/resources/org/drools/eclipse/wizard/project/ruleflow.rfm.template 2008-01-09 01:39:52 UTC (rev 17639)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/resources/org/drools/eclipse/wizard/project/ruleflow.rfm.template 2008-01-09 01:41:03 UTC (rev 17640)
@@ -1,73 +0,0 @@
-<org.drools.ruleflow.core.impl.RuleFlowProcessImpl id="1">
- <nodes id="2">
- <entry>
- <long>2</long>
- <org.drools.ruleflow.core.impl.RuleSetNodeImpl id="3">
- <ruleFlowGroup>hello</ruleFlowGroup>
- <id>2</id>
- <name>hello</name>
- <incomingConnections id="4">
- <org.drools.ruleflow.core.impl.ConnectionImpl id="5">
- <type>1</type>
- <from class="org.drools.ruleflow.core.impl.StartNodeImpl" id="6">
- <id>1</id>
- <name>Start</name>
- <incomingConnections id="7"/>
- <outgoingConnections id="8">
- <org.drools.ruleflow.core.impl.ConnectionImpl reference="5"/>
- </outgoingConnections>
- </from>
- <to class="org.drools.ruleflow.core.impl.RuleSetNodeImpl" reference="3"/>
- </org.drools.ruleflow.core.impl.ConnectionImpl>
- </incomingConnections>
- <outgoingConnections id="9">
- <org.drools.ruleflow.core.impl.ConnectionImpl id="10">
- <type>1</type>
- <from class="org.drools.ruleflow.core.impl.RuleSetNodeImpl" reference="3"/>
- <to class="org.drools.ruleflow.core.impl.RuleSetNodeImpl" id="11">
- <ruleFlowGroup>goodbye</ruleFlowGroup>
- <id>3</id>
- <name>goodbye</name>
- <incomingConnections id="12">
- <org.drools.ruleflow.core.impl.ConnectionImpl reference="10"/>
- </incomingConnections>
- <outgoingConnections id="13">
- <org.drools.ruleflow.core.impl.ConnectionImpl id="14">
- <type>1</type>
- <from class="org.drools.ruleflow.core.impl.RuleSetNodeImpl" reference="11"/>
- <to class="org.drools.ruleflow.core.impl.EndNodeImpl" id="15">
- <id>4</id>
- <name>End</name>
- <incomingConnections id="16">
- <org.drools.ruleflow.core.impl.ConnectionImpl reference="14"/>
- </incomingConnections>
- <outgoingConnections id="17"/>
- </to>
- </org.drools.ruleflow.core.impl.ConnectionImpl>
- </outgoingConnections>
- </to>
- </org.drools.ruleflow.core.impl.ConnectionImpl>
- </outgoingConnections>
- </org.drools.ruleflow.core.impl.RuleSetNodeImpl>
- </entry>
- <entry>
- <long>4</long>
- <org.drools.ruleflow.core.impl.EndNodeImpl reference="15"/>
- </entry>
- <entry>
- <long>1</long>
- <org.drools.ruleflow.core.impl.StartNodeImpl reference="6"/>
- </entry>
- <entry>
- <long>3</long>
- <org.drools.ruleflow.core.impl.RuleSetNodeImpl reference="11"/>
- </entry>
- </nodes>
- <variables id="18"/>
- <lastNodeId>4</lastNodeId>
- <id>com.sample.ruleflow</id>
- <name>Ruleflow</name>
- <version>1.0</version>
- <type>RuleFlow</type>
- <packageName>com.sample</packageName>
-</org.drools.ruleflow.core.impl.RuleFlowProcessImpl>
\ No newline at end of file
More information about the jboss-svn-commits
mailing list