[jboss-svn-commits] JBL Code SVN: r33733 - in labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow: ruleflow/editor/editpart/figure/bpmn and 1 other directories.

[jboss-svn-commits at lists.jboss.org]

Author: KrisVerlaenen
Date: 2010-07-02 09:31:50 -0400 (Fri, 02 Jul 2010)
New Revision: 33733

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/bpmn/BPMNStartNodeFigure.java
   labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/editor/editpart/figure/bpmn2/BPMNStartNodeFigure.java
Log:
- adding legacy support for BPMN2 beta1 format

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-07-02 12:36:44 UTC (rev 33732)
+++ labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/bpmn2/editor/BPMNModelEditor.java	2010-07-02 13:31:50 UTC (rev 33733)
@@ -164,9 +164,17 @@
     protected void writeModel(OutputStream os, boolean includeGraphics) throws IOException {
         OutputStreamWriter writer = new OutputStreamWriter(os);
         try {
-            XmlBPMNProcessDumper dumper = XmlBPMNProcessDumper.INSTANCE;
-            String out = dumper.dump(getRuleFlowModel().getRuleFlowProcess(), includeGraphics);
-            writer.write(out);
+        	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);
+        	} else {
+	            XmlBPMNProcessDumper dumper = XmlBPMNProcessDumper.INSTANCE;
+	            String out = dumper.dump(process, includeGraphics);
+	            writer.write(out);
+        	}
         } catch (Throwable t) {
             DroolsEclipsePlugin.log(t);
         }
@@ -180,7 +188,9 @@
     		InputStreamReader isr = new InputStreamReader(is);
     		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/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-07-02 12:36:44 UTC (rev 33732)
+++ labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/editor/editpart/figure/bpmn/BPMNStartNodeFigure.java	2010-07-02 13:31:50 UTC (rev 33733)
@@ -30,8 +30,9 @@
     
     public void setSelected(boolean b) {
         super.setSelected(b);
-        ((LineBorder) getBorder()).setWidth(b ? 3 : 1);
-        repaint();
+        // TODO: how can we set this to selected (or is this never necessary?)
+//        ((LineBorder) getBorder()).setWidth(b ? 3 : 1);
+//        repaint();
     }
     
 }

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-07-02 12:36:44 UTC (rev 33732)
+++ labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/editor/editpart/figure/bpmn2/BPMNStartNodeFigure.java	2010-07-02 13:31:50 UTC (rev 33733)
@@ -30,8 +30,9 @@
     
     public void setSelected(boolean b) {
         super.setSelected(b);
-        ((LineBorder) getBorder()).setWidth(b ? 3 : 1);
-        repaint();
+        // TODO: how can we set this to selected (or is this never necessary?)
+//      ((LineBorder) getBorder()).setWidth(b ? 3 : 1);
+//      repaint();
     }
     
 }