[jboss-svn-commits] JBL Code SVN: r29744 - in labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse: src/main/java/org/drools/eclipse/flow/bpmn2/editor and 2 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Thu Oct 22 06:18:26 EDT 2009
Author: KrisVerlaenen
Date: 2009-10-22 06:18:26 -0400 (Thu, 22 Oct 2009)
New Revision: 29744
Added:
labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/icons/manual.gif
labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/icons/receive.gif
labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/icons/send.gif
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/ruleflow/editor/editpart/figure/bpmn2/BPMNActionNodeFigure.java
labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/skin/BPMN2SkinProvider.java
Log:
Added: labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/icons/manual.gif
===================================================================
(Binary files differ)
Property changes on: labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/icons/manual.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/icons/receive.gif
===================================================================
(Binary files differ)
Property changes on: labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/icons/receive.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/icons/send.gif
===================================================================
(Binary files differ)
Property changes on: labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/icons/send.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
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 2009-10-22 10:16:42 UTC (rev 29743)
+++ labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/bpmn2/editor/BPMNModelEditor.java 2009-10-22 10:18:26 UTC (rev 29744)
@@ -20,15 +20,14 @@
import java.io.InputStreamReader;
import java.io.OutputStream;
import java.io.OutputStreamWriter;
-import java.io.Reader;
-import java.io.StringReader;
import java.net.URL;
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.BPMN2SemanticModule;
import org.drools.bpmn2.xml.XmlBPMNProcessDumper;
-import org.drools.compiler.PackageBuilderConfiguration;
import org.drools.eclipse.DroolsEclipsePlugin;
import org.drools.eclipse.WorkItemDefinitions;
import org.drools.eclipse.flow.common.editor.GenericModelEditor;
@@ -44,8 +43,6 @@
import org.drools.ruleflow.core.RuleFlowProcess;
import org.drools.xml.SemanticModules;
import org.drools.xml.XmlProcessReader;
-import org.drools.xml.XmlRuleFlowProcessDumper;
-import org.drools.xml.processes.RuleFlowMigrator;
import org.eclipse.core.resources.IFile;
import org.eclipse.draw2d.geometry.Rectangle;
import org.eclipse.gef.EditPartFactory;
@@ -184,6 +181,8 @@
InputStreamReader isr = new InputStreamReader(is);
SemanticModules semanticModules = new SemanticModules();
semanticModules.addSemanticModule(new BPMNSemanticModule());
+ semanticModules.addSemanticModule(new BPMN2SemanticModule());
+ semanticModules.addSemanticModule(new BPMNDISemanticModule());
XmlProcessReader xmlReader = new XmlProcessReader(semanticModules);
try
Modified: labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/editor/editpart/figure/bpmn2/BPMNActionNodeFigure.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/editor/editpart/figure/bpmn2/BPMNActionNodeFigure.java 2009-10-22 10:16:42 UTC (rev 29743)
+++ labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/editor/editpart/figure/bpmn2/BPMNActionNodeFigure.java 2009-10-22 10:18:26 UTC (rev 29744)
@@ -13,7 +13,7 @@
public class BPMNActionNodeFigure extends AbstractElementFigure {
private static final Image ICON = ImageDescriptor.createFromURL(
- DroolsEclipsePlugin.getDefault().getBundle().getEntry("icons/action.gif")).createImage();
+ DroolsEclipsePlugin.getDefault().getBundle().getEntry("icons/open.gif")).createImage();
private static final Color color = new Color(Display.getCurrent(), 255, 255, 225);
Modified: labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/skin/BPMN2SkinProvider.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/skin/BPMN2SkinProvider.java 2009-10-22 10:16:42 UTC (rev 29743)
+++ labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/skin/BPMN2SkinProvider.java 2009-10-22 10:18:26 UTC (rev 29744)
@@ -14,13 +14,11 @@
import org.drools.eclipse.flow.ruleflow.core.EndNodeWrapper;
import org.drools.eclipse.flow.ruleflow.core.EventNodeWrapper;
import org.drools.eclipse.flow.ruleflow.core.FaultNodeWrapper;
-import org.drools.eclipse.flow.ruleflow.core.ForEachNodeWrapper;
import org.drools.eclipse.flow.ruleflow.core.HumanTaskNodeWrapper;
import org.drools.eclipse.flow.ruleflow.core.JoinWrapper;
import org.drools.eclipse.flow.ruleflow.core.RuleSetNodeWrapper;
import org.drools.eclipse.flow.ruleflow.core.SplitWrapper;
import org.drools.eclipse.flow.ruleflow.core.StartNodeWrapper;
-import org.drools.eclipse.flow.ruleflow.core.StateNodeWrapper;
import org.drools.eclipse.flow.ruleflow.core.SubProcessWrapper;
import org.drools.eclipse.flow.ruleflow.core.TimerWrapper;
import org.drools.eclipse.flow.ruleflow.editor.editpart.JoinEditPart.JoinFigureInterface;
@@ -153,29 +151,29 @@
entries.add(combined);
}
-// if (flowNodes.charAt(6) == '1') {
-// combined = new CombinedTemplateCreationEntry(
-// "Timer Event",
-// "Create a new Timer Event",
-// TimerWrapper.class,
-// new SimpleWrapperFactory(TimerWrapper.class, "Timer"),
-// ImageDescriptor.createFromURL(DroolsEclipsePlugin.getDefault().getBundle().getEntry("icons/bpmn2/intermediate_event_empty.png")),
-// ImageDescriptor.createFromURL(DroolsEclipsePlugin.getDefault().getBundle().getEntry("icons/bpmn2/intermediate_event_empty.png"))
-// );
-// entries.add(combined);
-// }
+ if (flowNodes.charAt(6) == '1') {
+ combined = new CombinedTemplateCreationEntry(
+ "Timer Event",
+ "Create a new Timer Event",
+ TimerWrapper.class,
+ new SimpleWrapperFactory(TimerWrapper.class, "Timer"),
+ ImageDescriptor.createFromURL(DroolsEclipsePlugin.getDefault().getBundle().getEntry("icons/bpmn2/intermediate_event_empty.png")),
+ ImageDescriptor.createFromURL(DroolsEclipsePlugin.getDefault().getBundle().getEntry("icons/bpmn2/intermediate_event_empty.png"))
+ );
+ entries.add(combined);
+ }
-// if (flowNodes.charAt(7) == '1') {
-// combined = new CombinedTemplateCreationEntry(
-// "Error Event",
-// "Create a new Error Event",
-// FaultNodeWrapper.class,
-// new SimpleWrapperFactory(FaultNodeWrapper.class, "Error"),
-// ImageDescriptor.createFromURL(DroolsEclipsePlugin.getDefault().getBundle().getEntry("icons/bpmn2/intermediate_event_error.png")),
-// ImageDescriptor.createFromURL(DroolsEclipsePlugin.getDefault().getBundle().getEntry("icons/bpmn2/intermediate_event_error.png"))
-// );
-// entries.add(combined);
-// }
+ if (flowNodes.charAt(7) == '1') {
+ combined = new CombinedTemplateCreationEntry(
+ "Error Event",
+ "Create a new Error Event",
+ FaultNodeWrapper.class,
+ new SimpleWrapperFactory(FaultNodeWrapper.class, "Error"),
+ ImageDescriptor.createFromURL(DroolsEclipsePlugin.getDefault().getBundle().getEntry("icons/bpmn2/intermediate_event_error.png")),
+ ImageDescriptor.createFromURL(DroolsEclipsePlugin.getDefault().getBundle().getEntry("icons/bpmn2/intermediate_event_error.png"))
+ );
+ entries.add(combined);
+ }
if (flowNodes.charAt(8) == '1') {
combined = new CombinedTemplateCreationEntry(
@@ -201,17 +199,17 @@
entries.add(combined);
}
-// if (flowNodes.charAt(10) == '1') {
-// combined = new CombinedTemplateCreationEntry(
-// "Embedded Sub-Process",
-// "Create a new Embedded Sub-Process",
-// CompositeContextNodeWrapper.class,
-// new SimpleWrapperFactory(CompositeContextNodeWrapper.class, "Sub-Process"),
-// ImageDescriptor.createFromURL(DroolsEclipsePlugin.getDefault().getBundle().getEntry("icons/bpmn2/sub_process.png")),
-// ImageDescriptor.createFromURL(DroolsEclipsePlugin.getDefault().getBundle().getEntry("icons/bpmn2/sub_process.png"))
-// );
-// entries.add(combined);
-// }
+ if (flowNodes.charAt(10) == '1') {
+ combined = new CombinedTemplateCreationEntry(
+ "Embedded Sub-Process",
+ "Create a new Embedded Sub-Process",
+ CompositeContextNodeWrapper.class,
+ new SimpleWrapperFactory(CompositeContextNodeWrapper.class, "Sub-Process"),
+ ImageDescriptor.createFromURL(DroolsEclipsePlugin.getDefault().getBundle().getEntry("icons/bpmn2/sub_process.png")),
+ ImageDescriptor.createFromURL(DroolsEclipsePlugin.getDefault().getBundle().getEntry("icons/bpmn2/sub_process.png"))
+ );
+ entries.add(combined);
+ }
// if (flowNodes.charAt(11) == '1') {
// combined = new CombinedTemplateCreationEntry(
More information about the jboss-svn-commits
mailing list