[jboss-svn-commits] JBL Code SVN: r33572 - in labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse: debug/core and 1 other directories.

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

Author: KrisVerlaenen
Date: 2010-06-21 11:16:55 -0400 (Mon, 21 Jun 2010)
New Revision: 33572

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/debug/core/DroolsStackFrame.java
   labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/skin/BPMN2SkinProvider.java
Log:
- adding legacy support for BPMN2 beta1 format

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-06-21 15:06:39 UTC (rev 33571)
+++ labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/DroolsEclipsePlugin.java	2010-06-21 15:16:55 UTC (rev 33572)
@@ -517,6 +517,9 @@
                 
                 SemanticModules modules = configuration.getSemanticModules();
                 modules.addSemanticModule( new BPMNSemanticModule() );
+                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 ) );

Modified: labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/debug/core/DroolsStackFrame.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/debug/core/DroolsStackFrame.java	2010-06-21 15:06:39 UTC (rev 33571)
+++ labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/debug/core/DroolsStackFrame.java	2010-06-21 15:16:55 UTC (rev 33572)
@@ -25,7 +25,8 @@
     
     public boolean isExecutingRule() {
         try {
-            if ( "consequence".equals( getMethodName() ) && getSignature().startsWith( CONSEQUENCE_SIGNATURE ) ) {
+            if ( ("defaultConsequence".equals( getMethodName() ) || "consequence".equals( getMethodName() ) ) 
+            		&& getSignature().startsWith( CONSEQUENCE_SIGNATURE ) ) {
                 return true;
             }
         } catch ( DebugException exc ) {
@@ -39,7 +40,8 @@
             String methodName = getMethodName();
             String signature = getSignature();
             String type = getDeclaringTypeName();
-            if ( "consequence".equals( methodName ) && signature.startsWith( CONSEQUENCE_SIGNATURE ) ) {
+            if ( ("defaultConsequence".equals( methodName ) || "consequence".equals( methodName ) )
+            		&& signature.startsWith( CONSEQUENCE_SIGNATURE ) ) {
                 return DroolsEclipsePlugin.getDefault().getRuleInfoByClass( type );
             }
 

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	2010-06-21 15:06:39 UTC (rev 33571)
+++ labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/skin/BPMN2SkinProvider.java	2010-06-21 15:16:55 UTC (rev 33572)
@@ -14,6 +14,7 @@
 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;
@@ -211,17 +212,17 @@
 	        entries.add(combined);
         }
                           
-//        if (flowNodes.charAt(11) == '1') {
-//		    combined = new CombinedTemplateCreationEntry(
-//			    "Multiple Instances",
-//			    "Create a new Multiple Instances",
-//			    ForEachNodeWrapper.class,
-//			    new SimpleWrapperFactory(ForEachNodeWrapper.class, "Multiple Instances"),
-//			    ImageDescriptor.createFromURL(DroolsEclipsePlugin.getDefault().getBundle().getEntry("icons/bpmn2/multiple_instances.png")), 
-//			    ImageDescriptor.createFromURL(DroolsEclipsePlugin.getDefault().getBundle().getEntry("icons/bpmn2/multiple_instances.png"))
-//			);
-//			entries.add(combined);
-//        }
+        if (flowNodes.charAt(11) == '1') {
+		    combined = new CombinedTemplateCreationEntry(
+			    "Multiple Instances",
+			    "Create a new Multiple Instances",
+			    ForEachNodeWrapper.class,
+			    new SimpleWrapperFactory(ForEachNodeWrapper.class, "Multiple Instances"),
+			    ImageDescriptor.createFromURL(DroolsEclipsePlugin.getDefault().getBundle().getEntry("icons/bpmn2/multiple_instances.png")), 
+			    ImageDescriptor.createFromURL(DroolsEclipsePlugin.getDefault().getBundle().getEntry("icons/bpmn2/multiple_instances.png"))
+			);
+			entries.add(combined);
+        }
                     
         drawer.addAll(entries);
         return drawer;