[jboss-svn-commits] JBL Code SVN: r36383 - in labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse: META-INF and 35 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Sun Dec 12 20:57:18 EST 2010
Author: KrisVerlaenen
Date: 2010-12-12 20:57:15 -0500 (Sun, 12 Dec 2010)
New Revision: 36383
Added:
labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/action/ConvertToBPMN2ProcessAction.java
labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/action/ConvertToBPMN2ProcessDialog.java
Modified:
labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/META-INF/MANIFEST.MF
labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/pom.xml
labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/DroolsEclipsePlugin.java
labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/builder/DroolsBuilder.java
labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/builder/Util.java
labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/core/Package.java
labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/core/Rule.java
labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/core/ui/DroolsGroupByRuleGroupContentProvider.java
labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/core/ui/DroolsTreeSorter.java
labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/debug/ProcessInstanceViewer.java
labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/debug/actions/FileAuditDropAdapter.java
labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/debug/core/DroolsDebugTarget.java
labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/debug/core/DroolsThread.java
labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/debug/core/MVELStackFrame.java
labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/editors/outline/RuleContentOutlinePage.java
labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/editors/rete/commands/NodeSetConstraintCommand.java
labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/bpmn2/editor/BPMNModelEditor.java
labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/common/editor/action/ExportImageAction.java
labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/common/editor/action/VerticalAutoLayoutAction.java
labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/common/editor/core/ProcessWrapper.java
labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/common/editor/editpart/ElementCellEditorLocator.java
labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/common/editor/policy/ElementEditPolicy.java
labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/editor/RuleFlowModelEditor.java
labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/editor/action/CheckRuleFlowAction.java
labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/editor/editpart/figure/bpmn/BPMNJoinFigure.java
labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/editor/editpart/figure/bpmn/BPMNSplitFigure.java
labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/editor/editpart/figure/bpmn/BPMNStartNodeFigure.java
labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/editor/editpart/figure/bpmn2/BPMNJoinFigure.java
labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/editor/editpart/figure/bpmn2/BPMNSplitFigure.java
labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/editor/editpart/figure/bpmn2/BPMNStartNodeFigure.java
labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/action/ActionCellEditor.java
labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/action/ActionCompletionProcessor.java
labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/action/ActionDialog.java
labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/action/ActionPropertyDescriptor.java
labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/action/ActionsDialog.java
labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/action/OnEntryActionsCellEditor.java
labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/action/OnEntryActionsPropertyDescriptor.java
labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/action/OnExitActionsCellEditor.java
labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/action/OnExitActionsPropertyDescriptor.java
labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/color/ColorPropertyDescriptor.java
labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/constraint/ConstraintCompletionProcessor.java
labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/constraint/ConstraintListCellEditor.java
labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/constraint/ConstraintListDialog.java
labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/constraint/ConstraintsPropertyDescriptor.java
labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/constraint/GlobalCompletionProcessor.java
labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/constraint/MilestoneConstraintCellEditor.java
labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/constraint/MilestoneConstraintDialog.java
labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/constraint/MilestoneConstraintPropertyDescriptor.java
labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/constraint/RuleFlowConstraintDialog.java
labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/constraint/RuleFlowGlobalsDialog.java
labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/constraint/RuleFlowImportsDialog.java
labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/constraint/StateConstraintListCellEditor.java
labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/constraint/StateConstraintListDialog.java
labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/constraint/StateConstraintsPropertyDescriptor.java
labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/exceptionHandler/ExceptionHandlerDialog.java
labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/exceptionHandler/ExceptionHandlersCellEditor.java
labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/exceptionHandler/ExceptionHandlersDialog.java
labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/exceptionHandler/ExceptionHandlersPropertyDescriptor.java
labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/subprocess/SubProcessParameterInMappingCellEditor.java
labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/subprocess/SubProcessParameterInMappingDialog.java
labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/subprocess/SubProcessParameterInMappingPropertyDescriptor.java
labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/subprocess/SubProcessParameterOutMappingCellEditor.java
labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/subprocess/SubProcessParameterOutMappingDialog.java
labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/subprocess/SubProcessParameterOutMappingPropertyDescriptor.java
labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/swimlane/SwimlaneDialog.java
labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/swimlane/SwimlanesCellEditor.java
labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/swimlane/SwimlanesDialog.java
labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/timers/TimerDialog.java
labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/timers/TimersCellEditor.java
labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/timers/TimersDialog.java
labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/timers/TimersPropertyDescriptor.java
labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/variable/VariableDialog.java
labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/variable/VariableListCellEditor.java
labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/variable/VariableListDialog.java
labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/workitem/WorkItemParameterMappingCellEditor.java
labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/workitem/WorkItemParameterMappingDialog.java
labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/workitem/WorkItemParameterMappingPropertyDescriptor.java
labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/workitem/WorkItemResultMappingCellEditor.java
labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/workitem/WorkItemResultMappingDialog.java
labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/workitem/WorkItemResultMappingPropertyDescriptor.java
labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/launching/DroolsJUnitLaunchConfigurationDelegate.java
labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/launching/DroolsVMDebugger.java
labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/rulebuilder/editors/BrlPage.java
labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/rulebuilder/editors/RuleEditor.java
labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/rulebuilder/ui/ActionInsertFreeFormLineWidget.java
labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/rulebuilder/ui/ActionRetractFactWidget.java
labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/rulebuilder/ui/ActionSetFieldWidget.java
labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/rulebuilder/ui/AddNewFieldConstraintDialog.java
labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/rulebuilder/ui/CompositeFactPatternWidget.java
labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/rulebuilder/ui/ConstraintValueEditor.java
labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/rulebuilder/ui/FactPatternWidget.java
labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/rulebuilder/ui/RHSDSLSentenceWidget.java
labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/rulebuilder/ui/RuleModeller.java
labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/wizard/decisiontable/NewDTFilePage.java
labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/wizard/dsl/NewDSLFilePage.java
labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/wizard/project/NewDroolsProjectWizard.java
labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/reteoo/PropagationQueuingNodeVertex.java
Log:
JBRULES-2827: Migrate Drools Flow to jBPM5
- migrating
Modified: labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/META-INF/MANIFEST.MF
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/META-INF/MANIFEST.MF 2010-12-13 00:08:23 UTC (rev 36382)
+++ labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/META-INF/MANIFEST.MF 2010-12-13 01:57:15 UTC (rev 36383)
@@ -42,11 +42,11 @@
lib/junit.jar,
lib/drools-templates.jar,
lib/mvel2.jar,
- lib/drools-bpmn2.jar,
+ lib/jbpm-bpmn2.jar,
lib/antlr-runtime.jar,
lib/jxl.jar,
lib/xpp3_min.jar,
lib/xstream.jar,
- lib/drools-flow-core.jar,
- lib/drools-flow-compiler.jar
+ lib/jbpm-flow.jar,
+ lib/jbpm-flow-builder.jar
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Modified: labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/pom.xml
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/pom.xml 2010-12-13 00:08:23 UTC (rev 36382)
+++ labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/pom.xml 2010-12-13 01:57:15 UTC (rev 36383)
@@ -134,11 +134,6 @@
</dependency>
<dependency>
- <groupId>org.jbpm</groupId>
- <artifactId>jbpm-flow</artifactId>
- </dependency>
-
- <dependency>
<groupId>org.drools</groupId>
<artifactId>drools-ide-common</artifactId>
</dependency>
Modified: labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/DroolsEclipsePlugin.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/DroolsEclipsePlugin.java 2010-12-13 00:08:23 UTC (rev 36382)
+++ labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/DroolsEclipsePlugin.java 2010-12-13 01:57:15 UTC (rev 36383)
@@ -26,17 +26,12 @@
import java.util.MissingResourceException;
import java.util.ResourceBundle;
-import org.drools.bpmn2.xml.BPMNSemanticModule;
import org.drools.compiler.DrlParser;
import org.drools.compiler.DroolsError;
import org.drools.compiler.DroolsParserException;
import org.drools.compiler.PackageBuilder;
import org.drools.compiler.PackageBuilderConfiguration;
import org.drools.compiler.PackageRegistry;
-import org.drools.compiler.ProcessBuilder;
-import org.drools.compiler.ProcessBuilderImpl;
-import org.drools.compiler.xml.ProcessSemanticModule;
-import org.drools.compiler.xml.XmlProcessReader;
import org.drools.core.util.StringUtils;
import org.drools.eclipse.DRLInfo.FunctionInfo;
import org.drools.eclipse.DRLInfo.RuleInfo;
@@ -48,7 +43,6 @@
import org.drools.eclipse.util.ProjectClassLoader;
import org.drools.io.ResourceFactory;
import org.drools.lang.descr.PackageDescr;
-import org.drools.process.core.Process;
import org.drools.rule.Package;
import org.drools.rule.builder.dialect.java.JavaDialectConfiguration;
import org.drools.xml.SemanticModules;
@@ -70,6 +64,12 @@
import org.eclipse.swt.widgets.Display;
import org.eclipse.ui.forms.FormColors;
import org.eclipse.ui.plugin.AbstractUIPlugin;
+import org.jbpm.bpmn2.xml.BPMNDISemanticModule;
+import org.jbpm.bpmn2.xml.BPMNSemanticModule;
+import org.jbpm.compiler.ProcessBuilderImpl;
+import org.jbpm.compiler.xml.ProcessSemanticModule;
+import org.jbpm.compiler.xml.XmlProcessReader;
+import org.jbpm.process.core.Process;
import org.osgi.framework.BundleContext;
/**
@@ -519,10 +519,8 @@
SemanticModules modules = configuration.getSemanticModules();
modules.addSemanticModule( new BPMNSemanticModule() );
+ modules.addSemanticModule( new BPMNDISemanticModule() );
modules.addSemanticModule( new ProcessSemanticModule() );
- modules.addSemanticModule( new org.drools.bpmn2.legacy.beta1.BPMNSemanticModule() );
- modules.addSemanticModule( new org.drools.bpmn2.legacy.beta1.BPMN2SemanticModule() );
- modules.addSemanticModule( new org.drools.bpmn2.legacy.beta1.BPMNDISemanticModule() );
XmlProcessReader xmlReader = new XmlProcessReader( modules );
Process process = (Process) xmlReader.read( new StringReader( input ) );
Added: labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/action/ConvertToBPMN2ProcessAction.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/action/ConvertToBPMN2ProcessAction.java (rev 0)
+++ labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/action/ConvertToBPMN2ProcessAction.java 2010-12-13 01:57:15 UTC (rev 36383)
@@ -0,0 +1,107 @@
+package org.drools.eclipse.action;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.InputStreamReader;
+import java.io.Reader;
+import java.io.StringReader;
+
+import org.drools.compiler.PackageBuilderConfiguration;
+import org.drools.eclipse.DroolsEclipsePlugin;
+import org.eclipse.core.internal.resources.File;
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IWorkspace;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.jface.action.IAction;
+import org.eclipse.jface.dialogs.ProgressMonitorDialog;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.ui.IObjectActionDelegate;
+import org.eclipse.ui.IWorkbenchPart;
+import org.eclipse.ui.actions.WorkspaceModifyOperation;
+import org.jbpm.bpmn2.xml.XmlBPMNProcessDumper;
+import org.jbpm.compiler.xml.XmlProcessReader;
+import org.jbpm.compiler.xml.processes.RuleFlowMigrator;
+import org.jbpm.ruleflow.core.RuleFlowProcess;
+
+public class ConvertToBPMN2ProcessAction implements IObjectActionDelegate {
+
+ private IFile file;
+ private IWorkbenchPart targetPart;
+
+ public void setActivePart(IAction action, IWorkbenchPart targetPart) {
+ this.targetPart = targetPart;
+ }
+
+ public void run(IAction action) {
+ if (file != null && file.exists()) {
+ try {
+ convertToBPMN2();
+ } catch (Throwable t) {
+ DroolsEclipsePlugin.log(t);
+ }
+ }
+
+ }
+
+ public void selectionChanged(IAction action, ISelection selection) {
+ if (selection instanceof IStructuredSelection) {
+ IStructuredSelection structured = (IStructuredSelection) selection;
+ if (structured.size() == 1) {
+ Object element = structured.getFirstElement();
+ if (element instanceof IFile) {
+ file = (IFile) element;
+ }
+ }
+ }
+ }
+
+ public void convertToBPMN2() {
+ try {
+ InputStreamReader isr = new InputStreamReader(((File) file).getContents());
+ PackageBuilderConfiguration configuration = new PackageBuilderConfiguration();
+ XmlProcessReader xmlReader = new XmlProcessReader( configuration.getSemanticModules() );
+ String xml = RuleFlowMigrator.convertReaderToString(isr);
+ Reader reader = new StringReader(xml);
+ RuleFlowProcess process = (RuleFlowProcess) xmlReader.read(reader);
+ final String output = XmlBPMNProcessDumper.INSTANCE.dump(process, true);
+
+ ConvertToBPMN2ProcessDialog dialog = new ConvertToBPMN2ProcessDialog(targetPart.getSite().getShell());
+ dialog.setOriginalFile(file);
+ dialog.open();
+ IPath path = dialog.getResult();
+
+ if (path == null) {
+ return;
+ }
+
+ IWorkspace workspace = ResourcesPlugin.getWorkspace();
+ final IFile newFile = workspace.getRoot().getFile(path);
+
+ WorkspaceModifyOperation op = new WorkspaceModifyOperation() {
+ public void execute(final IProgressMonitor monitor)
+ throws CoreException {
+ try {
+ ByteArrayOutputStream out = new ByteArrayOutputStream();
+ newFile.create(new ByteArrayInputStream(output.getBytes()), true, monitor);
+ out.close();
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+ };
+
+ try {
+ new ProgressMonitorDialog(targetPart.getSite().getShell()).run(false, true, op);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ } catch (Throwable t) {
+ t.printStackTrace();
+ }
+ }
+
+}
Added: labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/action/ConvertToBPMN2ProcessDialog.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/action/ConvertToBPMN2ProcessDialog.java (rev 0)
+++ labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/action/ConvertToBPMN2ProcessDialog.java 2010-12-13 01:57:15 UTC (rev 36383)
@@ -0,0 +1,300 @@
+package org.drools.eclipse.action;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.IWorkspace;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.jface.dialogs.IDialogConstants;
+import org.eclipse.jface.dialogs.IDialogSettings;
+import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.jface.dialogs.TitleAreaDialog;
+import org.eclipse.osgi.util.NLS;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Event;
+import org.eclipse.swt.widgets.Listener;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.ui.internal.ide.IDEInternalWorkbenchImages;
+import org.eclipse.ui.internal.ide.IDEWorkbenchMessages;
+import org.eclipse.ui.internal.ide.IDEWorkbenchPlugin;
+import org.eclipse.ui.internal.ide.misc.ResourceAndContainerGroup;
+
+public class ConvertToBPMN2ProcessDialog extends TitleAreaDialog {
+
+ private static final String DIALOG_SETTINGS_SECTION = "SaveAsDialogSettings"; //$NON-NLS-1$
+
+ private IFile originalFile = null;
+
+ private String originalName = null;
+
+ private IPath result;
+
+ // widgets
+ private ResourceAndContainerGroup resourceGroup;
+
+ private Button okButton;
+
+ /**
+ * Image for title area
+ */
+ private Image dlgTitleImage = null;
+
+ /**
+ * Creates a new Save As dialog for no specific file.
+ *
+ * @param parentShell the parent shell
+ */
+ public ConvertToBPMN2ProcessDialog(Shell parentShell) {
+ super(parentShell);
+ }
+
+ protected void configureShell(Shell shell) {
+ super.configureShell(shell);
+ shell.setText("Convert to BPMN2");
+ }
+
+ protected Control createContents(Composite parent) {
+ Control contents = super.createContents(parent);
+ initializeControls();
+ validatePage();
+ resourceGroup.setFocus();
+ setTitle("Convert to BPMN2");
+ dlgTitleImage = IDEInternalWorkbenchImages.getImageDescriptor(
+ IDEInternalWorkbenchImages.IMG_DLGBAN_SAVEAS_DLG).createImage();
+ setTitleImage(dlgTitleImage);
+ setMessage("Convert the selected process to BPMN2");
+ return contents;
+ }
+
+ public boolean close() {
+ if (dlgTitleImage != null) {
+ dlgTitleImage.dispose();
+ }
+ return super.close();
+ }
+
+ protected void createButtonsForButtonBar(Composite parent) {
+ okButton = createButton(parent, IDialogConstants.OK_ID,
+ IDialogConstants.OK_LABEL, true);
+ createButton(parent, IDialogConstants.CANCEL_ID,
+ IDialogConstants.CANCEL_LABEL, false);
+ }
+
+ protected Control createDialogArea(Composite parent) {
+ // top level composite
+ Composite parentComposite = (Composite) super.createDialogArea(parent);
+
+ // create a composite with standard margins and spacing
+ Composite composite = new Composite(parentComposite, SWT.NONE);
+ GridLayout layout = new GridLayout();
+ layout.marginHeight = convertVerticalDLUsToPixels(IDialogConstants.VERTICAL_MARGIN);
+ layout.marginWidth = convertHorizontalDLUsToPixels(IDialogConstants.HORIZONTAL_MARGIN);
+ layout.verticalSpacing = convertVerticalDLUsToPixels(IDialogConstants.VERTICAL_SPACING);
+ layout.horizontalSpacing = convertHorizontalDLUsToPixels(IDialogConstants.HORIZONTAL_SPACING);
+ composite.setLayout(layout);
+ composite.setLayoutData(new GridData(GridData.FILL_BOTH));
+ composite.setFont(parentComposite.getFont());
+
+ Listener listener = new Listener() {
+ public void handleEvent(Event event) {
+ setDialogComplete(validatePage());
+ }
+ };
+
+ resourceGroup = new ResourceAndContainerGroup(
+ composite,
+ listener,
+ IDEWorkbenchMessages.SaveAsDialog_fileLabel, IDEWorkbenchMessages.SaveAsDialog_file);
+ resourceGroup.setAllowExistingResources(true);
+
+ return parentComposite;
+ }
+
+ /**
+ * Returns the full path entered by the user.
+ * <p>
+ * Note that the file and container might not exist and would need to be created.
+ * See the <code>IFile.create</code> method and the
+ * <code>ContainerGenerator</code> class.
+ * </p>
+ *
+ * @return the path, or <code>null</code> if Cancel was pressed
+ */
+ public IPath getResult() {
+ return result;
+ }
+
+ /**
+ * Initializes the controls of this dialog.
+ */
+ private void initializeControls() {
+ if (originalFile != null) {
+ resourceGroup.setContainerFullPath(originalFile.getParent()
+ .getFullPath());
+ String fileName = originalFile.getName();
+ int index = fileName.lastIndexOf(".");
+ if (index != -1) {
+ fileName = fileName.substring(0, index);
+ }
+ fileName += ".bpmn";
+ resourceGroup.setResource(fileName);
+ } else if (originalName != null) {
+ resourceGroup.setResource(originalName);
+ }
+ setDialogComplete(validatePage());
+ }
+
+ /* (non-Javadoc)
+ * Method declared on Dialog.
+ */
+ protected void okPressed() {
+ // Get new path.
+ IPath path = resourceGroup.getContainerFullPath().append(
+ resourceGroup.getResource());
+
+ //If the user does not supply a file extension and if the save
+ //as dialog was provided a default file name append the extension
+ //of the default filename to the new name
+ if (path.getFileExtension() == null) {
+ if (originalFile != null && originalFile.getFileExtension() != null) {
+ path = path.addFileExtension(originalFile.getFileExtension());
+ } else if (originalName != null) {
+ int pos = originalName.lastIndexOf('.');
+ if (++pos > 0 && pos < originalName.length()) {
+ path = path.addFileExtension(originalName.substring(pos));
+ }
+ }
+ }
+
+ // If the path already exists then confirm overwrite.
+ IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(path);
+ if (file.exists()) {
+ String[] buttons = new String[] { IDialogConstants.YES_LABEL,
+ IDialogConstants.NO_LABEL, IDialogConstants.CANCEL_LABEL };
+ String question = NLS.bind(
+ IDEWorkbenchMessages.SaveAsDialog_overwriteQuestion, path
+ .toString());
+ MessageDialog d = new MessageDialog(getShell(),
+ IDEWorkbenchMessages.Question,
+ null, question, MessageDialog.QUESTION, buttons, 0);
+ int overwrite = d.open();
+ switch (overwrite) {
+ case 0: // Yes
+ break;
+ case 1: // No
+ return;
+ case 2: // Cancel
+ default:
+ cancelPressed();
+ return;
+ }
+ }
+
+ // Store path and close.
+ result = path;
+ close();
+ }
+
+ /**
+ * Sets the completion state of this dialog and adjusts the enable state of
+ * the Ok button accordingly.
+ *
+ * @param value <code>true</code> if this dialog is compelete, and
+ * <code>false</code> otherwise
+ */
+ protected void setDialogComplete(boolean value) {
+ okButton.setEnabled(value);
+ }
+
+ /**
+ * Sets the original file to use.
+ *
+ * @param originalFile the original file
+ */
+ public void setOriginalFile(IFile originalFile) {
+ this.originalFile = originalFile;
+ }
+
+ /**
+ * Set the original file name to use.
+ * Used instead of <code>setOriginalFile</code>
+ * when the original resource is not an IFile.
+ * Must be called before <code>create</code>.
+ * @param originalName default file name
+ */
+ public void setOriginalName(String originalName) {
+ this.originalName = originalName;
+ }
+
+ /**
+ * Returns whether this page's visual components all contain valid values.
+ *
+ * @return <code>true</code> if valid, and <code>false</code> otherwise
+ */
+ private boolean validatePage() {
+ if (!resourceGroup.areAllValuesValid()) {
+ if (!resourceGroup.getResource().equals("")) { //$NON-NLS-1$
+ setErrorMessage(resourceGroup.getProblemMessage());
+ } else {
+ setErrorMessage(null);
+ }
+ return false;
+ }
+
+ String resourceName = resourceGroup.getResource();
+ IWorkspace workspace = ResourcesPlugin.getWorkspace();
+
+ // Do not allow a closed project to be selected
+ IPath fullPath = resourceGroup.getContainerFullPath();
+ if (fullPath != null) {
+ String projectName = fullPath.segment(0);
+ IStatus isValidProjectName = workspace.validateName(projectName, IResource.PROJECT);
+ if(isValidProjectName.isOK()) {
+ IProject project = workspace.getRoot().getProject(projectName);
+ if(!project.isOpen()) {
+ setErrorMessage(IDEWorkbenchMessages.SaveAsDialog_closedProjectMessage);
+ return false;
+ }
+ }
+ }
+
+ IStatus result = workspace.validateName(resourceName, IResource.FILE);
+ if (!result.isOK()){
+ setErrorMessage(result.getMessage());
+ return false;
+ }
+
+ setErrorMessage(null);
+ return true;
+ }
+
+ /* (non-Javadoc)
+ * @see org.eclipse.jface.window.Dialog#getDialogBoundsSettings()
+ *
+ * @since 3.2
+ */
+ protected IDialogSettings getDialogBoundsSettings() {
+ IDialogSettings settings = IDEWorkbenchPlugin.getDefault().getDialogSettings();
+ IDialogSettings section = settings.getSection(DIALOG_SETTINGS_SECTION);
+ if (section == null) {
+ section = settings.addNewSection(DIALOG_SETTINGS_SECTION);
+ }
+ return section;
+ }
+
+ /*
+ * (non-Javadoc)
+ * @see org.eclipse.jface.dialogs.Dialog#isResizable()
+ */
+ protected boolean isResizable() {
+ return true;
+ }
+}
Modified: labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/builder/DroolsBuilder.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/builder/DroolsBuilder.java 2010-12-13 00:08:23 UTC (rev 36382)
+++ labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/builder/DroolsBuilder.java 2010-12-13 01:57:15 UTC (rev 36383)
@@ -43,7 +43,6 @@
import org.drools.eclipse.DroolsEclipsePlugin;
import org.drools.eclipse.ProcessInfo;
import org.drools.eclipse.preferences.IDroolsConstants;
-import org.drools.eclipse.util.DroolsRuntime;
import org.drools.eclipse.util.DroolsRuntimeManager;
import org.drools.eclipse.wizard.project.NewDroolsProjectWizard;
import org.drools.ide.common.client.modeldriven.brl.RuleModel;
Modified: labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/builder/Util.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/builder/Util.java 2010-12-13 00:08:23 UTC (rev 36382)
+++ labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/builder/Util.java 2010-12-13 01:57:15 UTC (rev 36383)
@@ -21,7 +21,6 @@
import java.io.InputStream;
import java.io.InputStreamReader;
-
import org.drools.eclipse.DroolsEclipsePlugin;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.runtime.CoreException;
Modified: labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/core/Package.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/core/Package.java 2010-12-13 00:08:23 UTC (rev 36382)
+++ labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/core/Package.java 2010-12-13 01:57:15 UTC (rev 36383)
@@ -21,7 +21,6 @@
import java.util.Iterator;
import java.util.List;
import java.util.Map;
-import java.util.Map.Entry;
/**
* This represents a package.
Modified: labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/core/Rule.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/core/Rule.java 2010-12-13 00:08:23 UTC (rev 36382)
+++ labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/core/Rule.java 2010-12-13 01:57:15 UTC (rev 36383)
@@ -19,8 +19,6 @@
import java.util.HashMap;
import java.util.Map;
-import org.eclipse.ui.internal.views.markers.GroupsContribution;
-
/**
* This represents a rule.
*
Modified: labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/core/ui/DroolsGroupByRuleGroupContentProvider.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/core/ui/DroolsGroupByRuleGroupContentProvider.java 2010-12-13 00:08:23 UTC (rev 36382)
+++ labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/core/ui/DroolsGroupByRuleGroupContentProvider.java 2010-12-13 01:57:15 UTC (rev 36383)
@@ -16,12 +16,6 @@
package org.drools.eclipse.core.ui;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-
import org.drools.eclipse.core.DroolsElement;
import org.drools.eclipse.core.Package;
import org.drools.eclipse.core.RuleGroup;
Modified: labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/core/ui/DroolsTreeSorter.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/core/ui/DroolsTreeSorter.java 2010-12-13 00:08:23 UTC (rev 36382)
+++ labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/core/ui/DroolsTreeSorter.java 2010-12-13 01:57:15 UTC (rev 36383)
@@ -29,7 +29,6 @@
import org.drools.eclipse.core.Rule;
import org.drools.eclipse.core.RuleAttribute;
import org.drools.eclipse.core.RuleFlowGroup;
-import org.drools.eclipse.core.RuleGroup;
import org.drools.eclipse.core.RuleSet;
import org.drools.eclipse.core.Template;
import org.eclipse.jface.viewers.Viewer;
Modified: labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/debug/ProcessInstanceViewer.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/debug/ProcessInstanceViewer.java 2010-12-13 00:08:23 UTC (rev 36382)
+++ labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/debug/ProcessInstanceViewer.java 2010-12-13 01:57:15 UTC (rev 36383)
@@ -17,6 +17,7 @@
package org.drools.eclipse.debug;
import java.util.HashMap;
+import java.util.Iterator;
import java.util.List;
import java.util.Map;
Modified: labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/debug/actions/FileAuditDropAdapter.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/debug/actions/FileAuditDropAdapter.java 2010-12-13 00:08:23 UTC (rev 36382)
+++ labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/debug/actions/FileAuditDropAdapter.java 2010-12-13 01:57:15 UTC (rev 36383)
@@ -17,13 +17,11 @@
package org.drools.eclipse.debug.actions;
import org.drools.eclipse.debug.AuditView;
-import org.eclipse.jface.viewers.TreeViewer;
import org.eclipse.jface.viewers.Viewer;
import org.eclipse.jface.viewers.ViewerDropAdapter;
import org.eclipse.swt.dnd.DropTargetListener;
import org.eclipse.swt.dnd.FileTransfer;
import org.eclipse.swt.dnd.TransferData;
-import org.eclipse.ui.part.ViewPart;
public class FileAuditDropAdapter extends ViewerDropAdapter implements DropTargetListener {
Modified: labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/debug/core/DroolsDebugTarget.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/debug/core/DroolsDebugTarget.java 2010-12-13 00:08:23 UTC (rev 36382)
+++ labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/debug/core/DroolsDebugTarget.java 2010-12-13 01:57:15 UTC (rev 36383)
@@ -54,7 +54,6 @@
import com.sun.jdi.event.ClassPrepareEvent;
import com.sun.jdi.event.Event;
import com.sun.jdi.event.EventSet;
-import com.sun.jdi.event.MethodEntryEvent;
import com.sun.jdi.event.ThreadDeathEvent;
import com.sun.jdi.event.ThreadStartEvent;
import com.sun.jdi.event.VMStartEvent;
@@ -62,7 +61,6 @@
import com.sun.jdi.request.ClassPrepareRequest;
import com.sun.jdi.request.EventRequest;
import com.sun.jdi.request.EventRequestManager;
-import com.sun.jdi.request.MethodEntryRequest;
public class DroolsDebugTarget extends JDIDebugTarget {
Modified: labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/debug/core/DroolsThread.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/debug/core/DroolsThread.java 2010-12-13 00:08:23 UTC (rev 36382)
+++ labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/debug/core/DroolsThread.java 2010-12-13 01:57:15 UTC (rev 36383)
@@ -26,8 +26,6 @@
import org.eclipse.debug.core.DebugEvent;
import org.eclipse.debug.core.DebugException;
import org.eclipse.debug.core.model.IBreakpoint;
-import org.eclipse.debug.core.model.IStackFrame;
-import org.eclipse.jdt.debug.core.IJavaThread;
import org.eclipse.jdt.internal.debug.core.model.JDIDebugModelMessages;
import org.eclipse.jdt.internal.debug.core.model.JDIDebugTarget;
import org.eclipse.jdt.internal.debug.core.model.JDIStackFrame;
@@ -35,9 +33,7 @@
import org.mvel2.debug.Debugger;
import com.sun.jdi.ClassType;
-import com.sun.jdi.IncompatibleThreadStateException;
import com.sun.jdi.IntegerValue;
-import com.sun.jdi.InvalidStackFrameException;
import com.sun.jdi.Location;
import com.sun.jdi.Method;
import com.sun.jdi.ObjectCollectedException;
Modified: labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/debug/core/MVELStackFrame.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/debug/core/MVELStackFrame.java 2010-12-13 00:08:23 UTC (rev 36382)
+++ labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/debug/core/MVELStackFrame.java 2010-12-13 01:57:15 UTC (rev 36383)
@@ -40,7 +40,6 @@
import org.eclipse.jdt.debug.core.IJavaValue;
import org.eclipse.jdt.internal.debug.core.model.JDILocalVariable;
import org.eclipse.jdt.internal.debug.core.model.JDIObjectValue;
-import org.eclipse.jdt.internal.debug.core.model.JDIStackFrame;
import com.sun.jdi.AbsentInformationException;
import com.sun.jdi.ArrayReference;
Modified: labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/editors/outline/RuleContentOutlinePage.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/editors/outline/RuleContentOutlinePage.java 2010-12-13 00:08:23 UTC (rev 36382)
+++ labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/editors/outline/RuleContentOutlinePage.java 2010-12-13 01:57:15 UTC (rev 36383)
@@ -24,7 +24,6 @@
import org.drools.compiler.DroolsParserException;
import org.drools.eclipse.DRLInfo;
import org.drools.eclipse.DroolsEclipsePlugin;
-import org.drools.eclipse.DroolsPluginImages;
import org.drools.eclipse.core.DroolsElement;
import org.drools.eclipse.core.DroolsModelBuilder;
import org.drools.eclipse.core.Package;
@@ -44,7 +43,6 @@
import org.eclipse.jface.action.IToolBarManager;
import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.ITreeContentProvider;
import org.eclipse.jface.viewers.SelectionChangedEvent;
import org.eclipse.jface.viewers.StructuredSelection;
import org.eclipse.jface.viewers.TreeViewer;
Modified: labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/editors/rete/commands/NodeSetConstraintCommand.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/editors/rete/commands/NodeSetConstraintCommand.java 2010-12-13 00:08:23 UTC (rev 36382)
+++ labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/editors/rete/commands/NodeSetConstraintCommand.java 2010-12-13 01:57:15 UTC (rev 36383)
@@ -18,7 +18,6 @@
import org.drools.reteoo.BaseVertex;
import org.eclipse.draw2d.geometry.Rectangle;
-
import org.eclipse.gef.RequestConstants;
import org.eclipse.gef.commands.Command;
import org.eclipse.gef.requests.ChangeBoundsRequest;
Modified: labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/bpmn2/editor/BPMNModelEditor.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/bpmn2/editor/BPMNModelEditor.java 2010-12-13 00:08:23 UTC (rev 36382)
+++ labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/bpmn2/editor/BPMNModelEditor.java 2010-12-13 01:57:15 UTC (rev 36383)
@@ -25,10 +25,6 @@
import java.util.ArrayList;
import java.util.List;
-import org.drools.bpmn2.xml.BPMNDISemanticModule;
-import org.drools.bpmn2.xml.BPMNSemanticModule;
-import org.drools.bpmn2.xml.XmlBPMNProcessDumper;
-import org.drools.compiler.xml.XmlProcessReader;
import org.drools.eclipse.DroolsEclipsePlugin;
import org.drools.eclipse.WorkItemDefinitions;
import org.drools.eclipse.flow.common.editor.GenericModelEditor;
@@ -41,7 +37,6 @@
import org.drools.eclipse.util.ProjectClassLoader;
import org.drools.process.core.WorkDefinition;
import org.drools.process.core.WorkDefinitionExtension;
-import org.drools.ruleflow.core.RuleFlowProcess;
import org.drools.xml.SemanticModules;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.runtime.IStatus;
@@ -58,6 +53,11 @@
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.ui.IEditorInput;
import org.eclipse.ui.IFileEditorInput;
+import org.jbpm.bpmn2.xml.BPMNDISemanticModule;
+import org.jbpm.bpmn2.xml.BPMNSemanticModule;
+import org.jbpm.bpmn2.xml.XmlBPMNProcessDumper;
+import org.jbpm.compiler.xml.XmlProcessReader;
+import org.jbpm.ruleflow.core.RuleFlowProcess;
/**
* Graphical editor for a RuleFlow.
@@ -148,6 +148,7 @@
entries.add(combined);
}
} catch (Throwable t) {
+ DroolsEclipsePlugin.log(t);
MessageDialog.openError(
getSite().getShell(), "Parsing work item definitions", t.getMessage());
}
@@ -171,9 +172,7 @@
RuleFlowProcess process = getRuleFlowModel().getRuleFlowProcess();
String targetNamespace = (String) process.getMetaData("TargetNamespace");
if ("http://www.omg.org/bpmn20".equals(targetNamespace)) {
- org.drools.bpmn2.legacy.beta1.XmlBPMNProcessDumper dumper = org.drools.bpmn2.legacy.beta1.XmlBPMNProcessDumper.INSTANCE;
- String out = dumper.dump(process, includeGraphics);
- writer.write(out);
+ throw new IllegalArgumentException("BPMN2 beta1 no longer supported");
} else {
XmlBPMNProcessDumper dumper = XmlBPMNProcessDumper.INSTANCE;
String out = dumper.dump(process, XmlBPMNProcessDumper.META_DATA_USING_DI);
@@ -204,9 +203,6 @@
SemanticModules semanticModules = new SemanticModules();
semanticModules.addSemanticModule(new BPMNSemanticModule());
semanticModules.addSemanticModule(new BPMNDISemanticModule());
- semanticModules.addSemanticModule(new org.drools.bpmn2.legacy.beta1.BPMNSemanticModule());
- semanticModules.addSemanticModule(new org.drools.bpmn2.legacy.beta1.BPMN2SemanticModule());
- semanticModules.addSemanticModule(new org.drools.bpmn2.legacy.beta1.BPMNDISemanticModule());
XmlProcessReader xmlReader = new XmlProcessReader(semanticModules);
try
Modified: labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/common/editor/action/ExportImageAction.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/common/editor/action/ExportImageAction.java 2010-12-13 00:08:23 UTC (rev 36382)
+++ labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/common/editor/action/ExportImageAction.java 2010-12-13 01:57:15 UTC (rev 36383)
@@ -49,8 +49,6 @@
import org.eclipse.ui.IFileEditorInput;
import org.eclipse.ui.actions.ActionDelegate;
import org.eclipse.ui.actions.WorkspaceModifyOperation;
-import org.eclipse.ui.dialogs.SaveAsDialog;
-import org.eclipse.ui.part.FileEditorInput;
/**
* Action for exporting an image of a RuleFlow.
Modified: labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/common/editor/action/VerticalAutoLayoutAction.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/common/editor/action/VerticalAutoLayoutAction.java 2010-12-13 00:08:23 UTC (rev 36382)
+++ labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/common/editor/action/VerticalAutoLayoutAction.java 2010-12-13 01:57:15 UTC (rev 36383)
@@ -35,11 +35,11 @@
import java.util.List;
import java.util.Map;
+import org.drools.definition.process.Connection;
+import org.drools.definition.process.WorkflowProcess;
import org.drools.eclipse.flow.common.editor.GenericModelEditor;
import org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper;
import org.drools.eclipse.flow.common.editor.core.ProcessWrapper;
-import org.drools.definition.process.Connection;
-import org.drools.definition.process.WorkflowProcess;
import org.eclipse.draw2d.geometry.Dimension;
import org.eclipse.draw2d.geometry.Rectangle;
import org.eclipse.draw2d.graph.DirectedGraph;
Modified: labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/common/editor/core/ProcessWrapper.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/common/editor/core/ProcessWrapper.java 2010-12-13 00:08:23 UTC (rev 36382)
+++ labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/common/editor/core/ProcessWrapper.java 2010-12-13 01:57:15 UTC (rev 36383)
@@ -25,21 +25,21 @@
import java.util.List;
import java.util.Map;
+import org.drools.definition.process.Process;
import org.drools.eclipse.flow.common.view.property.ListPropertyDescriptor;
import org.drools.eclipse.flow.ruleflow.view.property.exceptionHandler.ExceptionHandlersPropertyDescriptor;
import org.drools.eclipse.flow.ruleflow.view.property.swimlane.SwimlanesCellEditor;
import org.drools.eclipse.flow.ruleflow.view.property.variable.VariableListCellEditor;
-import org.drools.definition.process.Process;
-import org.drools.process.core.context.exception.ExceptionHandler;
-import org.drools.process.core.context.exception.ExceptionScope;
-import org.drools.process.core.context.swimlane.Swimlane;
-import org.drools.process.core.context.swimlane.SwimlaneContext;
-import org.drools.process.core.context.variable.Variable;
-import org.drools.process.core.context.variable.VariableScope;
import org.eclipse.ui.views.properties.ComboBoxPropertyDescriptor;
import org.eclipse.ui.views.properties.IPropertyDescriptor;
import org.eclipse.ui.views.properties.IPropertySource;
import org.eclipse.ui.views.properties.TextPropertyDescriptor;
+import org.jbpm.process.core.context.exception.ExceptionHandler;
+import org.jbpm.process.core.context.exception.ExceptionScope;
+import org.jbpm.process.core.context.swimlane.Swimlane;
+import org.jbpm.process.core.context.swimlane.SwimlaneContext;
+import org.jbpm.process.core.context.variable.Variable;
+import org.jbpm.process.core.context.variable.VariableScope;
/**
* A wrapper for process element.
@@ -66,13 +66,13 @@
public static final String SWIMLANES = "swimlanes";
public static final String EXCEPTION_HANDLERS = "exceptionHandlers";
- private org.drools.process.core.Process process;
+ private org.jbpm.process.core.Process process;
private Map<String, ElementWrapper> elements = new HashMap<String, ElementWrapper>();
private transient List<ModelListener> listeners = new ArrayList<ModelListener>();
protected IPropertyDescriptor[] descriptors;
public ProcessWrapper() {
- process = (org.drools.process.core.Process) createProcess();
+ process = (org.jbpm.process.core.Process) createProcess();
}
protected abstract Process createProcess();
@@ -82,7 +82,7 @@
}
public void localSetProcess(Process process) {
- this.process = (org.drools.process.core.Process) process;
+ this.process = (org.jbpm.process.core.Process) process;
}
public String getName() {
Modified: labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/common/editor/editpart/ElementCellEditorLocator.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/common/editor/editpart/ElementCellEditorLocator.java 2010-12-13 00:08:23 UTC (rev 36382)
+++ labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/common/editor/editpart/ElementCellEditorLocator.java 2010-12-13 01:57:15 UTC (rev 36383)
@@ -31,15 +31,12 @@
* limitations under the License.
*/
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.widgets.Text;
-
-import org.eclipse.jface.viewers.CellEditor;
-
import org.eclipse.draw2d.Label;
import org.eclipse.draw2d.geometry.Rectangle;
-
import org.eclipse.gef.tools.CellEditorLocator;
+import org.eclipse.jface.viewers.CellEditor;
+import org.eclipse.swt.graphics.Point;
+import org.eclipse.swt.widgets.Text;
/**
* A CellEditorLocator for elements.
Modified: labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/common/editor/policy/ElementEditPolicy.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/common/editor/policy/ElementEditPolicy.java 2010-12-13 00:08:23 UTC (rev 36382)
+++ labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/common/editor/policy/ElementEditPolicy.java 2010-12-13 01:57:15 UTC (rev 36383)
@@ -33,7 +33,6 @@
import org.drools.eclipse.flow.common.editor.core.ElementContainer;
import org.drools.eclipse.flow.common.editor.core.ElementWrapper;
-import org.drools.eclipse.flow.common.editor.core.ProcessWrapper;
import org.drools.eclipse.flow.common.editor.core.command.DeleteElementCommand;
import org.eclipse.gef.commands.Command;
import org.eclipse.gef.editpolicies.ComponentEditPolicy;
Modified: labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/editor/RuleFlowModelEditor.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/editor/RuleFlowModelEditor.java 2010-12-13 00:08:23 UTC (rev 36382)
+++ labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/editor/RuleFlowModelEditor.java 2010-12-13 01:57:15 UTC (rev 36383)
@@ -43,10 +43,6 @@
import java.util.List;
import org.drools.compiler.PackageBuilderConfiguration;
-import org.drools.compiler.xml.ProcessSemanticModule;
-import org.drools.compiler.xml.XmlProcessReader;
-import org.drools.compiler.xml.XmlRuleFlowProcessDumper;
-import org.drools.compiler.xml.processes.RuleFlowMigrator;
import org.drools.eclipse.DroolsEclipsePlugin;
import org.drools.eclipse.WorkItemDefinitions;
import org.drools.eclipse.flow.common.editor.GenericModelEditor;
@@ -58,7 +54,6 @@
import org.drools.eclipse.util.ProjectClassLoader;
import org.drools.process.core.WorkDefinition;
import org.drools.process.core.WorkDefinitionExtension;
-import org.drools.ruleflow.core.RuleFlowProcess;
import org.drools.xml.SemanticModules;
import org.eclipse.core.resources.IFile;
import org.eclipse.draw2d.geometry.Rectangle;
@@ -72,6 +67,11 @@
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.ui.IEditorInput;
import org.eclipse.ui.IFileEditorInput;
+import org.jbpm.compiler.xml.ProcessSemanticModule;
+import org.jbpm.compiler.xml.XmlProcessReader;
+import org.jbpm.compiler.xml.XmlRuleFlowProcessDumper;
+import org.jbpm.compiler.xml.processes.RuleFlowMigrator;
+import org.jbpm.ruleflow.core.RuleFlowProcess;
/**
* Graphical editor for a RuleFlow.
@@ -166,6 +166,7 @@
entries.add(combined);
}
} catch (Throwable t) {
+ DroolsEclipsePlugin.log(t);
MessageDialog.openError(
getSite().getShell(), "Parsing work item definitions", t.getMessage());
}
Modified: labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/editor/action/CheckRuleFlowAction.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/editor/action/CheckRuleFlowAction.java 2010-12-13 00:08:23 UTC (rev 36382)
+++ labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/editor/action/CheckRuleFlowAction.java 2010-12-13 01:57:15 UTC (rev 36383)
@@ -33,8 +33,6 @@
import org.drools.eclipse.DroolsEclipsePlugin;
import org.drools.eclipse.flow.ruleflow.editor.RuleFlowModelEditor;
-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;
@@ -43,6 +41,8 @@
import org.eclipse.ui.IEditorActionDelegate;
import org.eclipse.ui.IEditorPart;
import org.eclipse.ui.actions.ActionDelegate;
+import org.jbpm.process.core.validation.ProcessValidationError;
+import org.jbpm.ruleflow.core.validation.RuleFlowProcessValidator;
/**
* Action for checking a RuleFlow.
Modified: labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/editor/editpart/figure/bpmn/BPMNJoinFigure.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/editor/editpart/figure/bpmn/BPMNJoinFigure.java 2010-12-13 00:08:23 UTC (rev 36382)
+++ labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/editor/editpart/figure/bpmn/BPMNJoinFigure.java 2010-12-13 01:57:15 UTC (rev 36383)
@@ -19,10 +19,10 @@
import org.drools.eclipse.DroolsEclipsePlugin;
import org.drools.eclipse.flow.common.editor.editpart.figure.AbstractElementFigure;
import org.drools.eclipse.flow.ruleflow.editor.editpart.JoinEditPart.JoinFigureInterface;
-import org.drools.workflow.core.node.Join;
import org.eclipse.draw2d.geometry.Rectangle;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.swt.graphics.Image;
+import org.jbpm.workflow.core.node.Join;
public class BPMNJoinFigure extends AbstractElementFigure implements JoinFigureInterface {
Modified: labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/editor/editpart/figure/bpmn/BPMNSplitFigure.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/editor/editpart/figure/bpmn/BPMNSplitFigure.java 2010-12-13 00:08:23 UTC (rev 36382)
+++ labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/editor/editpart/figure/bpmn/BPMNSplitFigure.java 2010-12-13 01:57:15 UTC (rev 36383)
@@ -19,10 +19,10 @@
import org.drools.eclipse.DroolsEclipsePlugin;
import org.drools.eclipse.flow.common.editor.editpart.figure.AbstractElementFigure;
import org.drools.eclipse.flow.ruleflow.editor.editpart.SplitEditPart.SplitFigureInterface;
-import org.drools.workflow.core.node.Split;
import org.eclipse.draw2d.geometry.Rectangle;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.swt.graphics.Image;
+import org.jbpm.workflow.core.node.Split;
public class BPMNSplitFigure extends AbstractElementFigure implements SplitFigureInterface {
Modified: labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/editor/editpart/figure/bpmn/BPMNStartNodeFigure.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/editor/editpart/figure/bpmn/BPMNStartNodeFigure.java 2010-12-13 00:08:23 UTC (rev 36382)
+++ labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/editor/editpart/figure/bpmn/BPMNStartNodeFigure.java 2010-12-13 01:57:15 UTC (rev 36383)
@@ -18,7 +18,6 @@
import org.drools.eclipse.DroolsEclipsePlugin;
import org.drools.eclipse.flow.common.editor.editpart.figure.AbstractElementFigure;
-import org.eclipse.draw2d.LineBorder;
import org.eclipse.draw2d.geometry.Rectangle;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.swt.graphics.Image;
Modified: labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/editor/editpart/figure/bpmn2/BPMNJoinFigure.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/editor/editpart/figure/bpmn2/BPMNJoinFigure.java 2010-12-13 00:08:23 UTC (rev 36382)
+++ labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/editor/editpart/figure/bpmn2/BPMNJoinFigure.java 2010-12-13 01:57:15 UTC (rev 36383)
@@ -19,10 +19,10 @@
import org.drools.eclipse.DroolsEclipsePlugin;
import org.drools.eclipse.flow.common.editor.editpart.figure.AbstractElementFigure;
import org.drools.eclipse.flow.ruleflow.editor.editpart.JoinEditPart.JoinFigureInterface;
-import org.drools.workflow.core.node.Join;
import org.eclipse.draw2d.geometry.Rectangle;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.swt.graphics.Image;
+import org.jbpm.workflow.core.node.Join;
public class BPMNJoinFigure extends AbstractElementFigure implements JoinFigureInterface {
Modified: labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/editor/editpart/figure/bpmn2/BPMNSplitFigure.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/editor/editpart/figure/bpmn2/BPMNSplitFigure.java 2010-12-13 00:08:23 UTC (rev 36382)
+++ labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/editor/editpart/figure/bpmn2/BPMNSplitFigure.java 2010-12-13 01:57:15 UTC (rev 36383)
@@ -19,10 +19,10 @@
import org.drools.eclipse.DroolsEclipsePlugin;
import org.drools.eclipse.flow.common.editor.editpart.figure.AbstractElementFigure;
import org.drools.eclipse.flow.ruleflow.editor.editpart.SplitEditPart.SplitFigureInterface;
-import org.drools.workflow.core.node.Split;
import org.eclipse.draw2d.geometry.Rectangle;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.swt.graphics.Image;
+import org.jbpm.workflow.core.node.Split;
public class BPMNSplitFigure extends AbstractElementFigure implements SplitFigureInterface {
Modified: labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/editor/editpart/figure/bpmn2/BPMNStartNodeFigure.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/editor/editpart/figure/bpmn2/BPMNStartNodeFigure.java 2010-12-13 00:08:23 UTC (rev 36382)
+++ labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/editor/editpart/figure/bpmn2/BPMNStartNodeFigure.java 2010-12-13 01:57:15 UTC (rev 36383)
@@ -18,7 +18,6 @@
import org.drools.eclipse.DroolsEclipsePlugin;
import org.drools.eclipse.flow.common.editor.editpart.figure.AbstractElementFigure;
-import org.eclipse.draw2d.LineBorder;
import org.eclipse.draw2d.geometry.Rectangle;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.swt.graphics.Image;
Modified: labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/action/ActionCellEditor.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/action/ActionCellEditor.java 2010-12-13 00:08:23 UTC (rev 36382)
+++ labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/action/ActionCellEditor.java 2010-12-13 01:57:15 UTC (rev 36383)
@@ -33,13 +33,13 @@
import org.drools.eclipse.flow.common.view.property.BeanDialogCellEditor;
import org.drools.eclipse.flow.common.view.property.EditBeanDialog;
-import org.drools.workflow.core.DroolsAction;
-import org.drools.workflow.core.WorkflowProcess;
-import org.drools.workflow.core.node.ActionNode;
import org.eclipse.jface.window.Window;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Shell;
+import org.jbpm.workflow.core.DroolsAction;
+import org.jbpm.workflow.core.WorkflowProcess;
+import org.jbpm.workflow.core.node.ActionNode;
/**
* Cell editor for an action.
Modified: labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/action/ActionCompletionProcessor.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/action/ActionCompletionProcessor.java 2010-12-13 00:08:23 UTC (rev 36382)
+++ labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/action/ActionCompletionProcessor.java 2010-12-13 01:57:15 UTC (rev 36383)
@@ -41,7 +41,6 @@
import org.drools.eclipse.editors.DRLRuleEditor;
import org.drools.eclipse.editors.completion.RuleCompletionProcessor;
import org.drools.lang.descr.GlobalDescr;
-import org.drools.workflow.core.WorkflowProcess;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.jdt.core.IJavaProject;
@@ -54,6 +53,7 @@
import org.eclipse.ui.IWorkbenchPage;
import org.eclipse.ui.IWorkbenchWindow;
import org.eclipse.ui.PlatformUI;
+import org.jbpm.workflow.core.WorkflowProcess;
/**
* Completion for ruleflow constraints.
@@ -110,7 +110,7 @@
private void loadImports() {
this.imports = new ArrayList<String>();
- List<String> imports = ((org.drools.process.core.Process) process).getImports();
+ List<String> imports = ((org.jbpm.process.core.Process) process).getImports();
if (imports != null) {
Iterator<String> iterator = imports.iterator();
Modified: labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/action/ActionDialog.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/action/ActionDialog.java 2010-12-13 00:08:23 UTC (rev 36382)
+++ labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/action/ActionDialog.java 2010-12-13 01:57:15 UTC (rev 36383)
@@ -40,9 +40,6 @@
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.workflow.core.DroolsAction;
-import org.drools.workflow.core.WorkflowProcess;
-import org.drools.workflow.core.impl.DroolsConsequenceAction;
import org.eclipse.jface.resource.JFaceResources;
import org.eclipse.jface.text.Document;
import org.eclipse.jface.text.IDocument;
@@ -70,6 +67,9 @@
import org.eclipse.swt.widgets.Shell;
import org.eclipse.swt.widgets.TabFolder;
import org.eclipse.swt.widgets.TabItem;
+import org.jbpm.workflow.core.DroolsAction;
+import org.jbpm.workflow.core.WorkflowProcess;
+import org.jbpm.workflow.core.impl.DroolsConsequenceAction;
/**
* Dialog for editing an action.
Modified: labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/action/ActionPropertyDescriptor.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/action/ActionPropertyDescriptor.java 2010-12-13 00:08:23 UTC (rev 36382)
+++ labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/action/ActionPropertyDescriptor.java 2010-12-13 01:57:15 UTC (rev 36383)
@@ -31,11 +31,11 @@
* limitations under the License.
*/
-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;
+import org.jbpm.workflow.core.WorkflowProcess;
+import org.jbpm.workflow.core.node.ActionNode;
/**
* Property descriptor for an action.
Modified: labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/action/ActionsDialog.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/action/ActionsDialog.java 2010-12-13 00:08:23 UTC (rev 36382)
+++ labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/action/ActionsDialog.java 2010-12-13 01:57:15 UTC (rev 36383)
@@ -33,10 +33,10 @@
import org.drools.eclipse.flow.common.view.property.EditBeanDialog;
import org.drools.eclipse.flow.common.view.property.EditListDialog;
-import org.drools.workflow.core.DroolsAction;
-import org.drools.workflow.core.WorkflowProcess;
-import org.drools.workflow.core.impl.DroolsConsequenceAction;
import org.eclipse.swt.widgets.Shell;
+import org.jbpm.workflow.core.DroolsAction;
+import org.jbpm.workflow.core.WorkflowProcess;
+import org.jbpm.workflow.core.impl.DroolsConsequenceAction;
/**
* Dialog for editing actions.
Modified: labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/action/OnEntryActionsCellEditor.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/action/OnEntryActionsCellEditor.java 2010-12-13 00:08:23 UTC (rev 36382)
+++ labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/action/OnEntryActionsCellEditor.java 2010-12-13 01:57:15 UTC (rev 36383)
@@ -35,11 +35,11 @@
import org.drools.eclipse.flow.common.view.property.BeanDialogCellEditor;
import org.drools.eclipse.flow.common.view.property.EditBeanDialog;
-import org.drools.workflow.core.DroolsAction;
-import org.drools.workflow.core.WorkflowProcess;
-import org.drools.workflow.core.impl.ExtendedNodeImpl;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Shell;
+import org.jbpm.workflow.core.DroolsAction;
+import org.jbpm.workflow.core.WorkflowProcess;
+import org.jbpm.workflow.core.impl.ExtendedNodeImpl;
/**
* Cell editor for on entry actions.
Modified: labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/action/OnEntryActionsPropertyDescriptor.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/action/OnEntryActionsPropertyDescriptor.java 2010-12-13 00:08:23 UTC (rev 36382)
+++ labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/action/OnEntryActionsPropertyDescriptor.java 2010-12-13 01:57:15 UTC (rev 36383)
@@ -16,11 +16,11 @@
package org.drools.eclipse.flow.ruleflow.view.property.action;
-import org.drools.workflow.core.WorkflowProcess;
-import org.drools.workflow.core.impl.ExtendedNodeImpl;
import org.eclipse.jface.viewers.CellEditor;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.ui.views.properties.PropertyDescriptor;
+import org.jbpm.workflow.core.WorkflowProcess;
+import org.jbpm.workflow.core.impl.ExtendedNodeImpl;
public class OnEntryActionsPropertyDescriptor extends PropertyDescriptor {
Modified: labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/action/OnExitActionsCellEditor.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/action/OnExitActionsCellEditor.java 2010-12-13 00:08:23 UTC (rev 36382)
+++ labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/action/OnExitActionsCellEditor.java 2010-12-13 01:57:15 UTC (rev 36383)
@@ -35,11 +35,11 @@
import org.drools.eclipse.flow.common.view.property.BeanDialogCellEditor;
import org.drools.eclipse.flow.common.view.property.EditBeanDialog;
-import org.drools.workflow.core.DroolsAction;
-import org.drools.workflow.core.WorkflowProcess;
-import org.drools.workflow.core.impl.ExtendedNodeImpl;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Shell;
+import org.jbpm.workflow.core.DroolsAction;
+import org.jbpm.workflow.core.WorkflowProcess;
+import org.jbpm.workflow.core.impl.ExtendedNodeImpl;
/**
* Cell editor for on exit actions.
Modified: labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/action/OnExitActionsPropertyDescriptor.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/action/OnExitActionsPropertyDescriptor.java 2010-12-13 00:08:23 UTC (rev 36382)
+++ labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/action/OnExitActionsPropertyDescriptor.java 2010-12-13 01:57:15 UTC (rev 36383)
@@ -16,11 +16,11 @@
package org.drools.eclipse.flow.ruleflow.view.property.action;
-import org.drools.workflow.core.WorkflowProcess;
-import org.drools.workflow.core.impl.ExtendedNodeImpl;
import org.eclipse.jface.viewers.CellEditor;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.ui.views.properties.PropertyDescriptor;
+import org.jbpm.workflow.core.WorkflowProcess;
+import org.jbpm.workflow.core.impl.ExtendedNodeImpl;
public class OnExitActionsPropertyDescriptor extends PropertyDescriptor {
Modified: labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/color/ColorPropertyDescriptor.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/color/ColorPropertyDescriptor.java 2010-12-13 00:08:23 UTC (rev 36382)
+++ labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/color/ColorPropertyDescriptor.java 2010-12-13 01:57:15 UTC (rev 36383)
@@ -16,11 +16,6 @@
package org.drools.eclipse.flow.ruleflow.view.property.color;
-import java.lang.reflect.InvocationTargetException;
-
-import org.drools.eclipse.flow.ruleflow.view.property.action.ActionCellEditor;
-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;
Modified: labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/constraint/ConstraintCompletionProcessor.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/constraint/ConstraintCompletionProcessor.java 2010-12-13 00:08:23 UTC (rev 36382)
+++ labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/constraint/ConstraintCompletionProcessor.java 2010-12-13 01:57:15 UTC (rev 36383)
@@ -33,17 +33,13 @@
*/
import java.util.ArrayList;
-import java.util.Arrays;
import java.util.Iterator;
import java.util.List;
import org.drools.eclipse.editors.DRLRuleEditor;
import org.drools.eclipse.editors.completion.RuleCompletionProcessor;
import org.drools.lang.descr.GlobalDescr;
-import org.drools.process.core.context.variable.Variable;
-import org.drools.process.core.context.variable.VariableScope;
import org.drools.process.core.datatype.DataType;
-import org.drools.workflow.core.WorkflowProcess;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.jdt.core.IJavaProject;
@@ -56,6 +52,9 @@
import org.eclipse.ui.IWorkbenchPage;
import org.eclipse.ui.IWorkbenchWindow;
import org.eclipse.ui.PlatformUI;
+import org.jbpm.process.core.context.variable.Variable;
+import org.jbpm.process.core.context.variable.VariableScope;
+import org.jbpm.workflow.core.WorkflowProcess;
/**
* Completion for ruleflow constraints.
@@ -122,7 +121,7 @@
private void loadImports() {
this.imports = new ArrayList();
- List imports = ((org.drools.process.core.Process) process).getImports();
+ List imports = ((org.jbpm.process.core.Process) process).getImports();
if (imports != null) {
Iterator iterator = imports.iterator();
while (iterator.hasNext()) {
Modified: labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/constraint/ConstraintListCellEditor.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/constraint/ConstraintListCellEditor.java 2010-12-13 00:08:23 UTC (rev 36382)
+++ labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/constraint/ConstraintListCellEditor.java 2010-12-13 01:57:15 UTC (rev 36383)
@@ -33,10 +33,10 @@
import org.drools.eclipse.flow.common.view.property.BeanDialogCellEditor;
import org.drools.eclipse.flow.common.view.property.EditBeanDialog;
-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;
+import org.jbpm.workflow.core.WorkflowProcess;
+import org.jbpm.workflow.core.node.Split;
/**
* Cell editor for constraints.
Modified: labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/constraint/ConstraintListDialog.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/constraint/ConstraintListDialog.java 2010-12-13 00:08:23 UTC (rev 36382)
+++ labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/constraint/ConstraintListDialog.java 2010-12-13 01:57:15 UTC (rev 36383)
@@ -37,10 +37,6 @@
import org.drools.definition.process.Connection;
import org.drools.eclipse.flow.common.view.property.EditBeanDialog;
-import org.drools.workflow.core.Constraint;
-import org.drools.workflow.core.WorkflowProcess;
-import org.drools.workflow.core.impl.ConnectionRef;
-import org.drools.workflow.core.node.Split;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.SelectionAdapter;
import org.eclipse.swt.events.SelectionEvent;
@@ -52,6 +48,10 @@
import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Shell;
+import org.jbpm.workflow.core.Constraint;
+import org.jbpm.workflow.core.WorkflowProcess;
+import org.jbpm.workflow.core.impl.ConnectionRef;
+import org.jbpm.workflow.core.node.Split;
/**
* Dialog for editing constraints.
Modified: labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/constraint/ConstraintsPropertyDescriptor.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/constraint/ConstraintsPropertyDescriptor.java 2010-12-13 00:08:23 UTC (rev 36382)
+++ labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/constraint/ConstraintsPropertyDescriptor.java 2010-12-13 01:57:15 UTC (rev 36383)
@@ -31,11 +31,11 @@
* limitations under the License.
*/
-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;
+import org.jbpm.workflow.core.WorkflowProcess;
+import org.jbpm.workflow.core.node.Split;
/**
* Property descriptor for constraints.
Modified: labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/constraint/GlobalCompletionProcessor.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/constraint/GlobalCompletionProcessor.java 2010-12-13 00:08:23 UTC (rev 36382)
+++ labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/constraint/GlobalCompletionProcessor.java 2010-12-13 01:57:15 UTC (rev 36383)
@@ -33,16 +33,12 @@
*/
import java.util.ArrayList;
-import java.util.Collection;
import java.util.Collections;
import java.util.List;
-import java.util.Map;
-import java.util.regex.Matcher;
import org.drools.eclipse.DroolsEclipsePlugin;
import org.drools.eclipse.editors.completion.CompletionUtil;
import org.drools.eclipse.editors.completion.DefaultCompletionProcessor;
-import org.drools.eclipse.editors.completion.RuleCompletionProcessor;
import org.drools.eclipse.editors.completion.RuleCompletionProposal;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.runtime.CoreException;
Modified: labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/constraint/MilestoneConstraintCellEditor.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/constraint/MilestoneConstraintCellEditor.java 2010-12-13 00:08:23 UTC (rev 36382)
+++ labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/constraint/MilestoneConstraintCellEditor.java 2010-12-13 01:57:15 UTC (rev 36383)
@@ -33,10 +33,10 @@
import org.drools.eclipse.flow.common.view.property.BeanDialogCellEditor;
import org.drools.eclipse.flow.common.view.property.EditBeanDialog;
-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;
+import org.jbpm.workflow.core.WorkflowProcess;
+import org.jbpm.workflow.core.node.MilestoneNode;
/**
* Cell editor for milestone constraints.
Modified: labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/constraint/MilestoneConstraintDialog.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/constraint/MilestoneConstraintDialog.java 2010-12-13 00:08:23 UTC (rev 36382)
+++ labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/constraint/MilestoneConstraintDialog.java 2010-12-13 01:57:15 UTC (rev 36383)
@@ -37,8 +37,6 @@
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.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;
@@ -63,6 +61,8 @@
import org.eclipse.swt.widgets.Shell;
import org.eclipse.swt.widgets.TabFolder;
import org.eclipse.swt.widgets.TabItem;
+import org.jbpm.workflow.core.WorkflowProcess;
+import org.jbpm.workflow.core.node.MilestoneNode;
/**
* Dialog for editing constraints.
Modified: labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/constraint/MilestoneConstraintPropertyDescriptor.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/constraint/MilestoneConstraintPropertyDescriptor.java 2010-12-13 00:08:23 UTC (rev 36382)
+++ labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/constraint/MilestoneConstraintPropertyDescriptor.java 2010-12-13 01:57:15 UTC (rev 36383)
@@ -31,11 +31,11 @@
* limitations under the License.
*/
-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;
+import org.jbpm.workflow.core.WorkflowProcess;
+import org.jbpm.workflow.core.node.MilestoneNode;
/**
* Property descriptor for a milestone constraint.
Modified: labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/constraint/RuleFlowConstraintDialog.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/constraint/RuleFlowConstraintDialog.java 2010-12-13 00:08:23 UTC (rev 36382)
+++ labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/constraint/RuleFlowConstraintDialog.java 2010-12-13 01:57:15 UTC (rev 36383)
@@ -37,9 +37,6 @@
import org.drools.core.util.ArrayUtils;
import org.drools.eclipse.editors.DRLSourceViewerConfig;
import org.drools.eclipse.editors.scanners.DRLPartionScanner;
-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;
@@ -69,6 +66,9 @@
import org.eclipse.swt.widgets.TabFolder;
import org.eclipse.swt.widgets.TabItem;
import org.eclipse.swt.widgets.Text;
+import org.jbpm.workflow.core.Constraint;
+import org.jbpm.workflow.core.WorkflowProcess;
+import org.jbpm.workflow.core.impl.ConstraintImpl;
/**
* Dialog for editing constraints.
@@ -282,7 +282,7 @@
int code = dialog.open();
if (code != CANCEL) {
List imports = dialog.getImports();
- ((org.drools.process.core.Process) process).setImports(imports);
+ ((org.jbpm.process.core.Process) process).setImports(imports);
completionProcessor.reset();
}
}
@@ -299,7 +299,7 @@
int code = dialog.open();
if (code != CANCEL) {
Map globals = dialog.getGlobals();
- ((org.drools.process.core.Process) process).setGlobals(globals);
+ ((org.jbpm.process.core.Process) process).setGlobals(globals);
completionProcessor.reset();
}
}
Modified: labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/constraint/RuleFlowGlobalsDialog.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/constraint/RuleFlowGlobalsDialog.java 2010-12-13 00:08:23 UTC (rev 36382)
+++ labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/constraint/RuleFlowGlobalsDialog.java 2010-12-13 01:57:15 UTC (rev 36383)
@@ -23,7 +23,6 @@
import org.drools.eclipse.editors.DRLSourceViewerConfig;
import org.drools.eclipse.editors.scanners.DRLPartionScanner;
-import org.drools.workflow.core.WorkflowProcess;
import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.jface.text.Document;
import org.eclipse.jface.text.IDocument;
@@ -46,6 +45,7 @@
import org.eclipse.swt.widgets.Shell;
import org.eclipse.swt.widgets.TabFolder;
import org.eclipse.swt.widgets.TabItem;
+import org.jbpm.workflow.core.WorkflowProcess;
/**
* Dialog for editing imports.
@@ -115,7 +115,7 @@
private String getProcessImports() {
String result = "# define your globals here: e.g. global java.util.List myList\n";
- Map<String, String> globals = ((org.drools.process.core.Process) process).getGlobals();
+ Map<String, String> globals = ((org.jbpm.process.core.Process) process).getGlobals();
if (globals != null) {
for (Map.Entry<String, String> entry: globals.entrySet()) {
result += "global " + entry.getValue() + " " + entry.getKey() + "\n";
Modified: labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/constraint/RuleFlowImportsDialog.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/constraint/RuleFlowImportsDialog.java 2010-12-13 00:08:23 UTC (rev 36382)
+++ labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/constraint/RuleFlowImportsDialog.java 2010-12-13 01:57:15 UTC (rev 36383)
@@ -38,8 +38,6 @@
import org.drools.eclipse.editors.DRLSourceViewerConfig;
import org.drools.eclipse.editors.scanners.DRLPartionScanner;
-import org.drools.process.core.Process;
-import org.drools.workflow.core.WorkflowProcess;
import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.jface.text.Document;
import org.eclipse.jface.text.IDocument;
@@ -62,6 +60,8 @@
import org.eclipse.swt.widgets.Shell;
import org.eclipse.swt.widgets.TabFolder;
import org.eclipse.swt.widgets.TabItem;
+import org.jbpm.process.core.Process;
+import org.jbpm.workflow.core.WorkflowProcess;
/**
* Dialog for editing imports.
Modified: labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/constraint/StateConstraintListCellEditor.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/constraint/StateConstraintListCellEditor.java 2010-12-13 00:08:23 UTC (rev 36382)
+++ labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/constraint/StateConstraintListCellEditor.java 2010-12-13 01:57:15 UTC (rev 36383)
@@ -35,12 +35,12 @@
import org.drools.eclipse.flow.common.view.property.BeanDialogCellEditor;
import org.drools.eclipse.flow.common.view.property.EditBeanDialog;
-import org.drools.workflow.core.Constraint;
-import org.drools.workflow.core.WorkflowProcess;
-import org.drools.workflow.core.impl.ConnectionRef;
-import org.drools.workflow.core.node.StateNode;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Shell;
+import org.jbpm.workflow.core.Constraint;
+import org.jbpm.workflow.core.WorkflowProcess;
+import org.jbpm.workflow.core.impl.ConnectionRef;
+import org.jbpm.workflow.core.node.StateNode;
/**
* Cell editor for state constraints.
Modified: labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/constraint/StateConstraintListDialog.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/constraint/StateConstraintListDialog.java 2010-12-13 00:08:23 UTC (rev 36382)
+++ labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/constraint/StateConstraintListDialog.java 2010-12-13 01:57:15 UTC (rev 36383)
@@ -37,11 +37,6 @@
import org.drools.definition.process.Connection;
import org.drools.eclipse.flow.common.view.property.EditBeanDialog;
-import org.drools.workflow.core.Constraint;
-import org.drools.workflow.core.WorkflowProcess;
-import org.drools.workflow.core.impl.ConnectionRef;
-import org.drools.workflow.core.impl.NodeImpl;
-import org.drools.workflow.core.node.StateNode;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.SelectionAdapter;
import org.eclipse.swt.events.SelectionEvent;
@@ -53,6 +48,11 @@
import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Shell;
+import org.jbpm.workflow.core.Constraint;
+import org.jbpm.workflow.core.WorkflowProcess;
+import org.jbpm.workflow.core.impl.ConnectionRef;
+import org.jbpm.workflow.core.impl.NodeImpl;
+import org.jbpm.workflow.core.node.StateNode;
/**
* Dialog for editing constraints.
Modified: labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/constraint/StateConstraintsPropertyDescriptor.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/constraint/StateConstraintsPropertyDescriptor.java 2010-12-13 00:08:23 UTC (rev 36382)
+++ labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/constraint/StateConstraintsPropertyDescriptor.java 2010-12-13 01:57:15 UTC (rev 36383)
@@ -31,11 +31,11 @@
* limitations under the License.
*/
-import org.drools.workflow.core.WorkflowProcess;
-import org.drools.workflow.core.node.StateNode;
import org.eclipse.jface.viewers.CellEditor;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.ui.views.properties.PropertyDescriptor;
+import org.jbpm.workflow.core.WorkflowProcess;
+import org.jbpm.workflow.core.node.StateNode;
/**
* Property descriptor for state constraints.
Modified: labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/exceptionHandler/ExceptionHandlerDialog.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/exceptionHandler/ExceptionHandlerDialog.java 2010-12-13 00:08:23 UTC (rev 36382)
+++ labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/exceptionHandler/ExceptionHandlerDialog.java 2010-12-13 01:57:15 UTC (rev 36383)
@@ -42,11 +42,6 @@
import org.drools.eclipse.flow.ruleflow.view.property.action.ActionCompletionProcessor;
import org.drools.eclipse.flow.ruleflow.view.property.constraint.RuleFlowGlobalsDialog;
import org.drools.eclipse.flow.ruleflow.view.property.constraint.RuleFlowImportsDialog;
-import org.drools.process.core.Process;
-import org.drools.process.core.context.exception.ActionExceptionHandler;
-import org.drools.workflow.core.DroolsAction;
-import org.drools.workflow.core.WorkflowProcess;
-import org.drools.workflow.core.impl.DroolsConsequenceAction;
import org.eclipse.jface.resource.JFaceResources;
import org.eclipse.jface.text.Document;
import org.eclipse.jface.text.IDocument;
@@ -75,6 +70,11 @@
import org.eclipse.swt.widgets.TabFolder;
import org.eclipse.swt.widgets.TabItem;
import org.eclipse.swt.widgets.Text;
+import org.jbpm.process.core.Process;
+import org.jbpm.process.core.context.exception.ActionExceptionHandler;
+import org.jbpm.workflow.core.DroolsAction;
+import org.jbpm.workflow.core.WorkflowProcess;
+import org.jbpm.workflow.core.impl.DroolsConsequenceAction;
/**
* Dialog for editing exception handlers.
Modified: labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/exceptionHandler/ExceptionHandlersCellEditor.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/exceptionHandler/ExceptionHandlersCellEditor.java 2010-12-13 00:08:23 UTC (rev 36382)
+++ labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/exceptionHandler/ExceptionHandlersCellEditor.java 2010-12-13 01:57:15 UTC (rev 36383)
@@ -33,12 +33,12 @@
import java.util.Map;
+import org.drools.definition.process.Process;
import org.drools.eclipse.flow.common.view.property.BeanDialogCellEditor;
import org.drools.eclipse.flow.common.view.property.EditBeanDialog;
-import org.drools.definition.process.Process;
-import org.drools.process.core.context.exception.ActionExceptionHandler;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Shell;
+import org.jbpm.process.core.context.exception.ActionExceptionHandler;
/**
* Cell edtior for exception handlers.
Modified: labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/exceptionHandler/ExceptionHandlersDialog.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/exceptionHandler/ExceptionHandlersDialog.java 2010-12-13 00:08:23 UTC (rev 36382)
+++ labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/exceptionHandler/ExceptionHandlersDialog.java 2010-12-13 01:57:15 UTC (rev 36383)
@@ -31,12 +31,12 @@
* limitations under the License.
*/
+import org.drools.definition.process.Process;
import org.drools.eclipse.flow.common.view.property.EditBeanDialog;
import org.drools.eclipse.flow.common.view.property.EditMapDialog;
-import org.drools.definition.process.Process;
-import org.drools.process.core.context.exception.ActionExceptionHandler;
-import org.drools.workflow.core.WorkflowProcess;
import org.eclipse.swt.widgets.Shell;
+import org.jbpm.process.core.context.exception.ActionExceptionHandler;
+import org.jbpm.workflow.core.WorkflowProcess;
/**
* Dialog for editing exception handlers.
Modified: labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/exceptionHandler/ExceptionHandlersPropertyDescriptor.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/exceptionHandler/ExceptionHandlersPropertyDescriptor.java 2010-12-13 00:08:23 UTC (rev 36382)
+++ labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/exceptionHandler/ExceptionHandlersPropertyDescriptor.java 2010-12-13 01:57:15 UTC (rev 36383)
@@ -16,8 +16,8 @@
package org.drools.eclipse.flow.ruleflow.view.property.exceptionHandler;
+import org.drools.definition.process.Process;
import org.drools.eclipse.flow.common.view.property.ListPropertyDescriptor;
-import org.drools.definition.process.Process;
import org.eclipse.jface.viewers.CellEditor;
import org.eclipse.swt.widgets.Composite;
Modified: labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/subprocess/SubProcessParameterInMappingCellEditor.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/subprocess/SubProcessParameterInMappingCellEditor.java 2010-12-13 00:08:23 UTC (rev 36382)
+++ labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/subprocess/SubProcessParameterInMappingCellEditor.java 2010-12-13 01:57:15 UTC (rev 36383)
@@ -33,9 +33,9 @@
import org.drools.eclipse.flow.common.view.property.BeanDialogCellEditor;
import org.drools.eclipse.flow.common.view.property.EditBeanDialog;
-import org.drools.workflow.core.node.SubProcessNode;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Shell;
+import org.jbpm.workflow.core.node.SubProcessNode;
/**
* Cell editor for sub process parameter mappings.
Modified: labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/subprocess/SubProcessParameterInMappingDialog.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/subprocess/SubProcessParameterInMappingDialog.java 2010-12-13 00:08:23 UTC (rev 36382)
+++ labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/subprocess/SubProcessParameterInMappingDialog.java 2010-12-13 01:57:15 UTC (rev 36383)
@@ -35,7 +35,6 @@
import java.util.Map;
import org.drools.eclipse.flow.common.view.property.EditBeanDialog;
-import org.drools.workflow.core.node.SubProcessNode;
import org.eclipse.jface.resource.JFaceResources;
import org.eclipse.swt.SWT;
import org.eclipse.swt.custom.TableEditor;
@@ -58,6 +57,7 @@
import org.eclipse.swt.widgets.TableColumn;
import org.eclipse.swt.widgets.TableItem;
import org.eclipse.swt.widgets.Text;
+import org.jbpm.workflow.core.node.SubProcessNode;
/**
* Dialog for editing work item parameter mappings.
Modified: labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/subprocess/SubProcessParameterInMappingPropertyDescriptor.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/subprocess/SubProcessParameterInMappingPropertyDescriptor.java 2010-12-13 00:08:23 UTC (rev 36382)
+++ labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/subprocess/SubProcessParameterInMappingPropertyDescriptor.java 2010-12-13 01:57:15 UTC (rev 36383)
@@ -16,11 +16,10 @@
package org.drools.eclipse.flow.ruleflow.view.property.subprocess;
-import org.drools.workflow.core.node.SubProcessNode;
-import org.drools.workflow.core.node.WorkItemNode;
import org.eclipse.jface.viewers.CellEditor;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.ui.views.properties.PropertyDescriptor;
+import org.jbpm.workflow.core.node.SubProcessNode;
public class SubProcessParameterInMappingPropertyDescriptor extends PropertyDescriptor {
Modified: labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/subprocess/SubProcessParameterOutMappingCellEditor.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/subprocess/SubProcessParameterOutMappingCellEditor.java 2010-12-13 00:08:23 UTC (rev 36382)
+++ labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/subprocess/SubProcessParameterOutMappingCellEditor.java 2010-12-13 01:57:15 UTC (rev 36383)
@@ -33,10 +33,9 @@
import org.drools.eclipse.flow.common.view.property.BeanDialogCellEditor;
import org.drools.eclipse.flow.common.view.property.EditBeanDialog;
-import org.drools.workflow.core.node.SubProcessNode;
-import org.drools.workflow.core.node.WorkItemNode;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Shell;
+import org.jbpm.workflow.core.node.SubProcessNode;
/**
* Cell editor for sub process parameter mappings.
Modified: labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/subprocess/SubProcessParameterOutMappingDialog.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/subprocess/SubProcessParameterOutMappingDialog.java 2010-12-13 00:08:23 UTC (rev 36382)
+++ labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/subprocess/SubProcessParameterOutMappingDialog.java 2010-12-13 01:57:15 UTC (rev 36383)
@@ -35,7 +35,6 @@
import java.util.Map;
import org.drools.eclipse.flow.common.view.property.EditBeanDialog;
-import org.drools.workflow.core.node.SubProcessNode;
import org.eclipse.jface.resource.JFaceResources;
import org.eclipse.swt.SWT;
import org.eclipse.swt.custom.TableEditor;
@@ -58,6 +57,7 @@
import org.eclipse.swt.widgets.TableColumn;
import org.eclipse.swt.widgets.TableItem;
import org.eclipse.swt.widgets.Text;
+import org.jbpm.workflow.core.node.SubProcessNode;
/**
* Dialog for editing work item result mappings.
Modified: labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/subprocess/SubProcessParameterOutMappingPropertyDescriptor.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/subprocess/SubProcessParameterOutMappingPropertyDescriptor.java 2010-12-13 00:08:23 UTC (rev 36382)
+++ labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/subprocess/SubProcessParameterOutMappingPropertyDescriptor.java 2010-12-13 01:57:15 UTC (rev 36383)
@@ -16,10 +16,10 @@
package org.drools.eclipse.flow.ruleflow.view.property.subprocess;
-import org.drools.workflow.core.node.SubProcessNode;
import org.eclipse.jface.viewers.CellEditor;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.ui.views.properties.PropertyDescriptor;
+import org.jbpm.workflow.core.node.SubProcessNode;
public class SubProcessParameterOutMappingPropertyDescriptor extends PropertyDescriptor {
Modified: labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/swimlane/SwimlaneDialog.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/swimlane/SwimlaneDialog.java 2010-12-13 00:08:23 UTC (rev 36382)
+++ labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/swimlane/SwimlaneDialog.java 2010-12-13 01:57:15 UTC (rev 36383)
@@ -32,7 +32,6 @@
*/
import org.drools.eclipse.flow.common.view.property.EditBeanDialog;
-import org.drools.process.core.context.swimlane.Swimlane;
import org.eclipse.swt.SWT;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.layout.GridLayout;
@@ -41,6 +40,7 @@
import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.swt.widgets.Text;
+import org.jbpm.process.core.context.swimlane.Swimlane;
/**
* Dialog for editing swimlanes.
Modified: labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/swimlane/SwimlanesCellEditor.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/swimlane/SwimlanesCellEditor.java 2010-12-13 00:08:23 UTC (rev 36382)
+++ labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/swimlane/SwimlanesCellEditor.java 2010-12-13 01:57:15 UTC (rev 36383)
@@ -35,9 +35,9 @@
import org.drools.eclipse.flow.common.view.property.BeanDialogCellEditor;
import org.drools.eclipse.flow.common.view.property.EditBeanDialog;
-import org.drools.process.core.context.swimlane.Swimlane;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Shell;
+import org.jbpm.process.core.context.swimlane.Swimlane;
/**
* Cell edtior for swimlanes.
Modified: labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/swimlane/SwimlanesDialog.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/swimlane/SwimlanesDialog.java 2010-12-13 00:08:23 UTC (rev 36382)
+++ labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/swimlane/SwimlanesDialog.java 2010-12-13 01:57:15 UTC (rev 36383)
@@ -32,8 +32,8 @@
*/
import org.drools.eclipse.flow.common.view.property.EditListDialog;
-import org.drools.process.core.context.swimlane.Swimlane;
import org.eclipse.swt.widgets.Shell;
+import org.jbpm.process.core.context.swimlane.Swimlane;
/**
* Dialog for editing swimlanes.
Modified: labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/timers/TimerDialog.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/timers/TimerDialog.java 2010-12-13 00:08:23 UTC (rev 36382)
+++ labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/timers/TimerDialog.java 2010-12-13 01:57:15 UTC (rev 36383)
@@ -42,11 +42,6 @@
import org.drools.eclipse.flow.ruleflow.view.property.action.ActionCompletionProcessor;
import org.drools.eclipse.flow.ruleflow.view.property.constraint.RuleFlowGlobalsDialog;
import org.drools.eclipse.flow.ruleflow.view.property.constraint.RuleFlowImportsDialog;
-import org.drools.process.core.Process;
-import org.drools.process.core.timer.Timer;
-import org.drools.workflow.core.DroolsAction;
-import org.drools.workflow.core.WorkflowProcess;
-import org.drools.workflow.core.impl.DroolsConsequenceAction;
import org.eclipse.jface.resource.JFaceResources;
import org.eclipse.jface.text.Document;
import org.eclipse.jface.text.IDocument;
@@ -75,6 +70,11 @@
import org.eclipse.swt.widgets.TabFolder;
import org.eclipse.swt.widgets.TabItem;
import org.eclipse.swt.widgets.Text;
+import org.jbpm.process.core.Process;
+import org.jbpm.process.core.timer.Timer;
+import org.jbpm.workflow.core.DroolsAction;
+import org.jbpm.workflow.core.WorkflowProcess;
+import org.jbpm.workflow.core.impl.DroolsConsequenceAction;
/**
* Dialog for editing exception handlers.
Modified: labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/timers/TimersCellEditor.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/timers/TimersCellEditor.java 2010-12-13 00:08:23 UTC (rev 36382)
+++ labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/timers/TimersCellEditor.java 2010-12-13 01:57:15 UTC (rev 36383)
@@ -35,12 +35,12 @@
import org.drools.eclipse.flow.common.view.property.BeanDialogCellEditor;
import org.drools.eclipse.flow.common.view.property.EditBeanDialog;
-import org.drools.process.core.timer.Timer;
-import org.drools.workflow.core.DroolsAction;
-import org.drools.workflow.core.WorkflowProcess;
-import org.drools.workflow.core.node.StateBasedNode;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Shell;
+import org.jbpm.process.core.timer.Timer;
+import org.jbpm.workflow.core.DroolsAction;
+import org.jbpm.workflow.core.WorkflowProcess;
+import org.jbpm.workflow.core.node.StateBasedNode;
/**
* Cell editor for timers.
Modified: labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/timers/TimersDialog.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/timers/TimersDialog.java 2010-12-13 00:08:23 UTC (rev 36382)
+++ labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/timers/TimersDialog.java 2010-12-13 01:57:15 UTC (rev 36383)
@@ -33,11 +33,11 @@
import org.drools.eclipse.flow.common.view.property.EditBeanDialog;
import org.drools.eclipse.flow.common.view.property.EditMapDialog;
-import org.drools.process.core.timer.Timer;
-import org.drools.workflow.core.DroolsAction;
-import org.drools.workflow.core.WorkflowProcess;
-import org.drools.workflow.core.impl.DroolsConsequenceAction;
import org.eclipse.swt.widgets.Shell;
+import org.jbpm.process.core.timer.Timer;
+import org.jbpm.workflow.core.DroolsAction;
+import org.jbpm.workflow.core.WorkflowProcess;
+import org.jbpm.workflow.core.impl.DroolsConsequenceAction;
/**
* Dialog for editing a list of timers.
Modified: labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/timers/TimersPropertyDescriptor.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/timers/TimersPropertyDescriptor.java 2010-12-13 00:08:23 UTC (rev 36382)
+++ labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/timers/TimersPropertyDescriptor.java 2010-12-13 01:57:15 UTC (rev 36383)
@@ -16,11 +16,11 @@
package org.drools.eclipse.flow.ruleflow.view.property.timers;
-import org.drools.workflow.core.WorkflowProcess;
-import org.drools.workflow.core.node.StateBasedNode;
import org.eclipse.jface.viewers.CellEditor;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.ui.views.properties.PropertyDescriptor;
+import org.jbpm.workflow.core.WorkflowProcess;
+import org.jbpm.workflow.core.node.StateBasedNode;
public class TimersPropertyDescriptor extends PropertyDescriptor {
Modified: labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/variable/VariableDialog.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/variable/VariableDialog.java 2010-12-13 00:08:23 UTC (rev 36382)
+++ labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/variable/VariableDialog.java 2010-12-13 01:57:15 UTC (rev 36383)
@@ -37,7 +37,6 @@
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.process.core.context.variable.Variable;
import org.drools.process.core.datatype.DataType;
import org.eclipse.jface.viewers.ISelectionChangedListener;
import org.eclipse.jface.viewers.SelectionChangedEvent;
@@ -49,6 +48,7 @@
import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.swt.widgets.Text;
+import org.jbpm.process.core.context.variable.Variable;
/**
* Dialog for editing variables.
Modified: labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/variable/VariableListCellEditor.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/variable/VariableListCellEditor.java 2010-12-13 00:08:23 UTC (rev 36382)
+++ labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/variable/VariableListCellEditor.java 2010-12-13 01:57:15 UTC (rev 36383)
@@ -35,9 +35,9 @@
import org.drools.eclipse.flow.common.view.property.BeanDialogCellEditor;
import org.drools.eclipse.flow.common.view.property.EditBeanDialog;
-import org.drools.process.core.context.variable.Variable;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Shell;
+import org.jbpm.process.core.context.variable.Variable;
/**
* Cell edtior for variables.
Modified: labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/variable/VariableListDialog.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/variable/VariableListDialog.java 2010-12-13 00:08:23 UTC (rev 36382)
+++ labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/variable/VariableListDialog.java 2010-12-13 01:57:15 UTC (rev 36383)
@@ -32,8 +32,8 @@
*/
import org.drools.eclipse.flow.common.view.property.EditListDialog;
-import org.drools.process.core.context.variable.Variable;
import org.eclipse.swt.widgets.Shell;
+import org.jbpm.process.core.context.variable.Variable;
/**
* Dialog for editing a list of variables.
Modified: labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/workitem/WorkItemParameterMappingCellEditor.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/workitem/WorkItemParameterMappingCellEditor.java 2010-12-13 00:08:23 UTC (rev 36382)
+++ labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/workitem/WorkItemParameterMappingCellEditor.java 2010-12-13 01:57:15 UTC (rev 36383)
@@ -33,9 +33,9 @@
import org.drools.eclipse.flow.common.view.property.BeanDialogCellEditor;
import org.drools.eclipse.flow.common.view.property.EditBeanDialog;
-import org.drools.workflow.core.node.WorkItemNode;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Shell;
+import org.jbpm.workflow.core.node.WorkItemNode;
/**
* Cell editor for work item result mappings.
Modified: labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/workitem/WorkItemParameterMappingDialog.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/workitem/WorkItemParameterMappingDialog.java 2010-12-13 00:08:23 UTC (rev 36382)
+++ labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/workitem/WorkItemParameterMappingDialog.java 2010-12-13 01:57:15 UTC (rev 36383)
@@ -35,7 +35,6 @@
import java.util.Map;
import org.drools.eclipse.flow.common.view.property.EditBeanDialog;
-import org.drools.workflow.core.node.WorkItemNode;
import org.eclipse.jface.resource.JFaceResources;
import org.eclipse.swt.SWT;
import org.eclipse.swt.custom.TableEditor;
@@ -58,6 +57,7 @@
import org.eclipse.swt.widgets.TableColumn;
import org.eclipse.swt.widgets.TableItem;
import org.eclipse.swt.widgets.Text;
+import org.jbpm.workflow.core.node.WorkItemNode;
/**
* Dialog for editing work item parameter mappings.
Modified: labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/workitem/WorkItemParameterMappingPropertyDescriptor.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/workitem/WorkItemParameterMappingPropertyDescriptor.java 2010-12-13 00:08:23 UTC (rev 36382)
+++ labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/workitem/WorkItemParameterMappingPropertyDescriptor.java 2010-12-13 01:57:15 UTC (rev 36383)
@@ -16,10 +16,10 @@
package org.drools.eclipse.flow.ruleflow.view.property.workitem;
-import org.drools.workflow.core.node.WorkItemNode;
import org.eclipse.jface.viewers.CellEditor;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.ui.views.properties.PropertyDescriptor;
+import org.jbpm.workflow.core.node.WorkItemNode;
public class WorkItemParameterMappingPropertyDescriptor extends PropertyDescriptor {
Modified: labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/workitem/WorkItemResultMappingCellEditor.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/workitem/WorkItemResultMappingCellEditor.java 2010-12-13 00:08:23 UTC (rev 36382)
+++ labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/workitem/WorkItemResultMappingCellEditor.java 2010-12-13 01:57:15 UTC (rev 36383)
@@ -33,9 +33,9 @@
import org.drools.eclipse.flow.common.view.property.BeanDialogCellEditor;
import org.drools.eclipse.flow.common.view.property.EditBeanDialog;
-import org.drools.workflow.core.node.WorkItemNode;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Shell;
+import org.jbpm.workflow.core.node.WorkItemNode;
/**
* Cell editor for work item result mappings.
Modified: labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/workitem/WorkItemResultMappingDialog.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/workitem/WorkItemResultMappingDialog.java 2010-12-13 00:08:23 UTC (rev 36382)
+++ labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/workitem/WorkItemResultMappingDialog.java 2010-12-13 01:57:15 UTC (rev 36383)
@@ -35,7 +35,6 @@
import java.util.Map;
import org.drools.eclipse.flow.common.view.property.EditBeanDialog;
-import org.drools.workflow.core.node.WorkItemNode;
import org.eclipse.jface.resource.JFaceResources;
import org.eclipse.swt.SWT;
import org.eclipse.swt.custom.TableEditor;
@@ -58,6 +57,7 @@
import org.eclipse.swt.widgets.TableColumn;
import org.eclipse.swt.widgets.TableItem;
import org.eclipse.swt.widgets.Text;
+import org.jbpm.workflow.core.node.WorkItemNode;
/**
* Dialog for editing work item result mappings.
Modified: labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/workitem/WorkItemResultMappingPropertyDescriptor.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/workitem/WorkItemResultMappingPropertyDescriptor.java 2010-12-13 00:08:23 UTC (rev 36382)
+++ labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/workitem/WorkItemResultMappingPropertyDescriptor.java 2010-12-13 01:57:15 UTC (rev 36383)
@@ -16,10 +16,10 @@
package org.drools.eclipse.flow.ruleflow.view.property.workitem;
-import org.drools.workflow.core.node.WorkItemNode;
import org.eclipse.jface.viewers.CellEditor;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.ui.views.properties.PropertyDescriptor;
+import org.jbpm.workflow.core.node.WorkItemNode;
public class WorkItemResultMappingPropertyDescriptor extends PropertyDescriptor {
Modified: labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/launching/DroolsJUnitLaunchConfigurationDelegate.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/launching/DroolsJUnitLaunchConfigurationDelegate.java 2010-12-13 00:08:23 UTC (rev 36382)
+++ labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/launching/DroolsJUnitLaunchConfigurationDelegate.java 2010-12-13 01:57:15 UTC (rev 36383)
@@ -17,7 +17,6 @@
package org.drools.eclipse.launching;
import java.text.MessageFormat;
-import java.util.HashMap;
import org.drools.eclipse.debug.core.IDroolsDebugConstants;
import org.eclipse.core.runtime.CoreException;
@@ -28,7 +27,6 @@
import org.eclipse.debug.core.ILaunchConfiguration;
import org.eclipse.debug.core.ILaunchManager;
import org.eclipse.debug.core.model.IBreakpoint;
-import org.eclipse.jdt.internal.debug.core.breakpoints.JavaLineBreakpoint;
import org.eclipse.jdt.internal.launching.LaunchingMessages;
import org.eclipse.jdt.junit.launcher.JUnitLaunchConfigurationDelegate;
import org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants;
Modified: labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/launching/DroolsVMDebugger.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/launching/DroolsVMDebugger.java 2010-12-13 00:08:23 UTC (rev 36382)
+++ labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/launching/DroolsVMDebugger.java 2010-12-13 01:57:15 UTC (rev 36383)
@@ -41,7 +41,6 @@
import org.eclipse.jdt.internal.launching.LaunchingPlugin;
import org.eclipse.jdt.internal.launching.LibraryInfo;
import org.eclipse.jdt.internal.launching.StandardVMDebugger;
-import org.eclipse.jdt.internal.launching.StandardVMRunner;
import org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants;
import org.eclipse.jdt.launching.IVMInstall;
import org.eclipse.jdt.launching.JavaRuntime;
Modified: labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/rulebuilder/editors/BrlPage.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/rulebuilder/editors/BrlPage.java 2010-12-13 00:08:23 UTC (rev 36382)
+++ labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/rulebuilder/editors/BrlPage.java 2010-12-13 01:57:15 UTC (rev 36383)
@@ -16,9 +16,9 @@
package org.drools.eclipse.rulebuilder.editors;
+import org.drools.eclipse.rulebuilder.ui.RuleModeller;
import org.drools.ide.common.client.modeldriven.brl.RuleModel;
import org.drools.ide.common.server.util.BRXMLPersistence;
-import org.drools.eclipse.rulebuilder.ui.RuleModeller;
import org.eclipse.ui.forms.IManagedForm;
import org.eclipse.ui.forms.editor.FormPage;
import org.eclipse.ui.forms.widgets.FormToolkit;
Modified: labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/rulebuilder/editors/RuleEditor.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/rulebuilder/editors/RuleEditor.java 2010-12-13 00:08:23 UTC (rev 36382)
+++ labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/rulebuilder/editors/RuleEditor.java 2010-12-13 01:57:15 UTC (rev 36383)
@@ -37,7 +37,6 @@
import org.drools.ide.common.server.rules.SuggestionCompletionLoader;
import org.drools.ide.common.server.util.BRDRLPersistence;
import org.drools.ide.common.server.util.BRXMLPersistence;
-import org.drools.lang.dsl.DSLMappingFile;
import org.drools.lang.dsl.DSLTokenizedMappingFile;
import org.eclipse.core.internal.resources.Container;
import org.eclipse.core.resources.IFile;
Modified: labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/rulebuilder/ui/ActionInsertFreeFormLineWidget.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/rulebuilder/ui/ActionInsertFreeFormLineWidget.java 2010-12-13 00:08:23 UTC (rev 36382)
+++ labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/rulebuilder/ui/ActionInsertFreeFormLineWidget.java 2010-12-13 01:57:15 UTC (rev 36383)
@@ -20,13 +20,10 @@
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.ModifyEvent;
import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.graphics.FontMetrics;
-import org.eclipse.swt.graphics.GC;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.layout.GridLayout;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.MessageBox;
import org.eclipse.swt.widgets.Text;
import org.eclipse.ui.forms.events.HyperlinkEvent;
Modified: labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/rulebuilder/ui/ActionRetractFactWidget.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/rulebuilder/ui/ActionRetractFactWidget.java 2010-12-13 00:08:23 UTC (rev 36382)
+++ labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/rulebuilder/ui/ActionRetractFactWidget.java 2010-12-13 01:57:15 UTC (rev 36383)
@@ -16,8 +16,8 @@
package org.drools.eclipse.rulebuilder.ui;
+import org.drools.eclipse.rulebuilder.modeldriven.HumanReadable;
import org.drools.ide.common.client.modeldriven.brl.ActionRetractFact;
-import org.drools.eclipse.rulebuilder.modeldriven.HumanReadable;
import org.eclipse.swt.layout.GridLayout;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.ui.forms.widgets.FormToolkit;
Modified: labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/rulebuilder/ui/ActionSetFieldWidget.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/rulebuilder/ui/ActionSetFieldWidget.java 2010-12-13 00:08:23 UTC (rev 36382)
+++ labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/rulebuilder/ui/ActionSetFieldWidget.java 2010-12-13 01:57:15 UTC (rev 36383)
@@ -16,13 +16,13 @@
package org.drools.eclipse.rulebuilder.ui;
+import org.drools.eclipse.rulebuilder.modeldriven.HumanReadable;
import org.drools.ide.common.client.modeldriven.SuggestionCompletionEngine;
import org.drools.ide.common.client.modeldriven.brl.ActionFieldValue;
import org.drools.ide.common.client.modeldriven.brl.ActionSetField;
import org.drools.ide.common.client.modeldriven.brl.ActionUpdateField;
import org.drools.ide.common.client.modeldriven.brl.FactPattern;
import org.drools.ide.common.client.modeldriven.brl.RuleModel;
-import org.drools.eclipse.rulebuilder.modeldriven.HumanReadable;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.ModifyEvent;
import org.eclipse.swt.events.ModifyListener;
Modified: labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/rulebuilder/ui/AddNewFieldConstraintDialog.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/rulebuilder/ui/AddNewFieldConstraintDialog.java 2010-12-13 00:08:23 UTC (rev 36382)
+++ labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/rulebuilder/ui/AddNewFieldConstraintDialog.java 2010-12-13 01:57:15 UTC (rev 36383)
@@ -17,9 +17,9 @@
package org.drools.eclipse.rulebuilder.ui;
import org.drools.ide.common.client.modeldriven.SuggestionCompletionEngine;
+import org.drools.ide.common.client.modeldriven.brl.BaseSingleFieldConstraint;
import org.drools.ide.common.client.modeldriven.brl.CompositeFieldConstraint;
import org.drools.ide.common.client.modeldriven.brl.FactPattern;
-import org.drools.ide.common.client.modeldriven.brl.BaseSingleFieldConstraint;
import org.drools.ide.common.client.modeldriven.brl.SingleFieldConstraint;
import org.eclipse.swt.SWT;
import org.eclipse.swt.layout.GridData;
Modified: labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/rulebuilder/ui/CompositeFactPatternWidget.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/rulebuilder/ui/CompositeFactPatternWidget.java 2010-12-13 00:08:23 UTC (rev 36382)
+++ labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/rulebuilder/ui/CompositeFactPatternWidget.java 2010-12-13 01:57:15 UTC (rev 36383)
@@ -16,9 +16,9 @@
package org.drools.eclipse.rulebuilder.ui;
+import org.drools.eclipse.rulebuilder.modeldriven.HumanReadable;
import org.drools.ide.common.client.modeldriven.brl.CompositeFactPattern;
import org.drools.ide.common.client.modeldriven.brl.FactPattern;
-import org.drools.eclipse.rulebuilder.modeldriven.HumanReadable;
import org.eclipse.swt.SWT;
import org.eclipse.swt.graphics.Color;
import org.eclipse.swt.layout.GridData;
Modified: labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/rulebuilder/ui/ConstraintValueEditor.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/rulebuilder/ui/ConstraintValueEditor.java 2010-12-13 00:08:23 UTC (rev 36382)
+++ labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/rulebuilder/ui/ConstraintValueEditor.java 2010-12-13 01:57:15 UTC (rev 36383)
@@ -21,9 +21,9 @@
import org.drools.eclipse.DroolsEclipsePlugin;
import org.drools.ide.common.client.modeldriven.DropDownData;
import org.drools.ide.common.client.modeldriven.SuggestionCompletionEngine;
+import org.drools.ide.common.client.modeldriven.brl.BaseSingleFieldConstraint;
import org.drools.ide.common.client.modeldriven.brl.ConnectiveConstraint;
import org.drools.ide.common.client.modeldriven.brl.FactPattern;
-import org.drools.ide.common.client.modeldriven.brl.BaseSingleFieldConstraint;
import org.drools.ide.common.client.modeldriven.brl.SingleFieldConstraint;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.swt.SWT;
Modified: labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/rulebuilder/ui/FactPatternWidget.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/rulebuilder/ui/FactPatternWidget.java 2010-12-13 00:08:23 UTC (rev 36382)
+++ labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/rulebuilder/ui/FactPatternWidget.java 2010-12-13 01:57:15 UTC (rev 36383)
@@ -17,23 +17,20 @@
package org.drools.eclipse.rulebuilder.ui;
import java.util.ArrayList;
-import java.util.HashMap;
import java.util.List;
+import org.drools.eclipse.rulebuilder.modeldriven.HumanReadable;
import org.drools.ide.common.client.modeldriven.SuggestionCompletionEngine;
+import org.drools.ide.common.client.modeldriven.brl.BaseSingleFieldConstraint;
import org.drools.ide.common.client.modeldriven.brl.CompositeFactPattern;
import org.drools.ide.common.client.modeldriven.brl.CompositeFieldConstraint;
import org.drools.ide.common.client.modeldriven.brl.ConnectiveConstraint;
import org.drools.ide.common.client.modeldriven.brl.FactPattern;
import org.drools.ide.common.client.modeldriven.brl.FieldConstraint;
-import org.drools.ide.common.client.modeldriven.brl.BaseSingleFieldConstraint;
import org.drools.ide.common.client.modeldriven.brl.SingleFieldConstraint;
-import org.drools.eclipse.rulebuilder.modeldriven.HumanReadable;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.ModifyEvent;
import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.Device;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.layout.GridLayout;
import org.eclipse.swt.widgets.Combo;
Modified: labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/rulebuilder/ui/RHSDSLSentenceWidget.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/rulebuilder/ui/RHSDSLSentenceWidget.java 2010-12-13 00:08:23 UTC (rev 36382)
+++ labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/rulebuilder/ui/RHSDSLSentenceWidget.java 2010-12-13 01:57:15 UTC (rev 36383)
@@ -16,7 +16,6 @@
package org.drools.eclipse.rulebuilder.ui;
-import org.drools.ide.common.client.modeldriven.SuggestionCompletionEngine;
import org.drools.ide.common.client.modeldriven.brl.DSLSentence;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.ui.forms.widgets.FormToolkit;
Modified: labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/rulebuilder/ui/RuleModeller.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/rulebuilder/ui/RuleModeller.java 2010-12-13 00:08:23 UTC (rev 36382)
+++ labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/rulebuilder/ui/RuleModeller.java 2010-12-13 01:57:15 UTC (rev 36383)
@@ -16,6 +16,7 @@
package org.drools.eclipse.rulebuilder.ui;
+import org.drools.eclipse.rulebuilder.editors.RuleEditor;
import org.drools.ide.common.client.modeldriven.SuggestionCompletionEngine;
import org.drools.ide.common.client.modeldriven.brl.ActionInsertFact;
import org.drools.ide.common.client.modeldriven.brl.ActionRetractFact;
@@ -27,7 +28,6 @@
import org.drools.ide.common.client.modeldriven.brl.IAction;
import org.drools.ide.common.client.modeldriven.brl.IPattern;
import org.drools.ide.common.client.modeldriven.brl.RuleModel;
-import org.drools.eclipse.rulebuilder.editors.RuleEditor;
import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.jface.window.Window;
import org.eclipse.swt.SWT;
Modified: labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/wizard/decisiontable/NewDTFilePage.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/wizard/decisiontable/NewDTFilePage.java 2010-12-13 00:08:23 UTC (rev 36382)
+++ labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/wizard/decisiontable/NewDTFilePage.java 2010-12-13 01:57:15 UTC (rev 36383)
@@ -19,7 +19,6 @@
import java.io.IOException;
import java.io.InputStream;
-
import org.drools.eclipse.DroolsEclipsePlugin;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.swt.widgets.Composite;
Modified: labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/wizard/dsl/NewDSLFilePage.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/wizard/dsl/NewDSLFilePage.java 2010-12-13 00:08:23 UTC (rev 36382)
+++ labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/wizard/dsl/NewDSLFilePage.java 2010-12-13 01:57:15 UTC (rev 36383)
@@ -23,7 +23,6 @@
import java.io.IOException;
import java.io.InputStream;
-
import org.drools.eclipse.DroolsEclipsePlugin;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.swt.widgets.Composite;
Modified: labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/wizard/project/NewDroolsProjectWizard.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/wizard/project/NewDroolsProjectWizard.java 2010-12-13 00:08:23 UTC (rev 36382)
+++ labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/wizard/project/NewDroolsProjectWizard.java 2010-12-13 01:57:15 UTC (rev 36383)
@@ -26,7 +26,6 @@
import org.drools.eclipse.DroolsEclipsePlugin;
import org.drools.eclipse.builder.DroolsBuilder;
-import org.drools.eclipse.preferences.DroolsRuntimesPreferencePage;
import org.drools.eclipse.util.DroolsClasspathContainer;
import org.drools.eclipse.util.DroolsRuntime;
import org.eclipse.core.resources.ICommand;
Modified: labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/reteoo/PropagationQueuingNodeVertex.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/reteoo/PropagationQueuingNodeVertex.java 2010-12-13 00:08:23 UTC (rev 36382)
+++ labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/reteoo/PropagationQueuingNodeVertex.java 2010-12-13 01:57:15 UTC (rev 36383)
@@ -19,7 +19,6 @@
*/
package org.drools.reteoo;
-import org.drools.spi.ObjectType;
import org.eclipse.draw2d.ColorConstants;
import org.eclipse.swt.graphics.Color;
More information about the jboss-svn-commits
mailing list