issue #44

imixs · Nov 22, 2015 · 3991218 · 3991218
1 parent b73a369
commit 3991218
Show file tree

Hide file tree

Showing 20 changed files with 27 additions and 193 deletions.
diff --git a/org.imixs.eclipse.bpmn2.feature/feature.xml b/org.imixs.eclipse.bpmn2.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.imixs.eclipse.bpmn2.feature"
       label="Imixs-BPMN Modeler"
-      version="1.3.0.qualifier"
+      version="1.4.0.qualifier"
       provider-name="Imixs Software Solutions GmbH">
    <install-handler/>
 

diff --git a/org.imixs.eclipse.bpmn2.feature/pom.xml b/org.imixs.eclipse.bpmn2.feature/pom.xml
@@ -17,7 +17,7 @@
 	<parent>
 		<groupId>org.imixs.eclipse</groupId>
 		<artifactId>org.imixs.eclipse.bpmn2</artifactId>
-		<version>1.3.0-SNAPSHOT</version>
+		<version>1.4.0-SNAPSHOT</version>
 		<!-- <relativePath>../pom.xml</relativePath> -->
 	</parent>
 

diff --git a/org.imixs.eclipse.bpmn2.plugin/META-INF/MANIFEST.MF b/org.imixs.eclipse.bpmn2.plugin/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.imixs.eclipse.bpmn2.plugin;singleton:=true
-Bundle-Version: 1.3.0.qualifier
+Bundle-Version: 1.4.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin

diff --git a/org.imixs.eclipse.bpmn2.plugin/plugin.xml b/org.imixs.eclipse.bpmn2.plugin/plugin.xml
@@ -49,37 +49,18 @@
              description="The Workflow Event describes the activities to be processed by the Imixs-Workflow Engine when this event is triggered. A Workflow Event can be triggered by a human user or an external event like a timer event."
              featureContainer="org.imixs.bpmn.ImixsFeatureContainerCatchEvent"
              id="org.imixs.workflow.bpmn.ActivityEntityCatchEvent"
-             name="Workflow Catch Event"
+             name="Workflow Event"
              propertyTabs="org.imixs.bpmn.propertytab.event.history org.imixs.bpmn.propertytab.event.acl org.imixs.bpmn.propertytab.event.mail org.imixs.bpmn.propertytab.event.workflow org.imixs.bpmn.propertytab.event.businessrule org.imixs.bpmn.propertytab.event.report org.imixs.bpmn.propertytab.event.version org.imixs.bpmn.propertytab.event.timer"
              runtimeId="org.imixs.workflow.bpmn.runtime"
              type="IntermediateCatchEvent">
           <property
            		description="Workflow Activity ID"
-                label="ID-Catch"
+                label="ID"
                 name="activityid"
                 type="EInt"
                 value="0">
           </property>            
       </customTask>
-        <customTask
-             category="Imixs-Workflow"
-             description="The Workflow Event describes the activities to be processed by the Imixs-Workflow Engine when this event is triggered. A Workflow Event can be triggered by a human user or an external event like a timer event."
-             featureContainer="org.imixs.bpmn.ImixsFeatureContainerThrowEvent"
-             id="org.imixs.workflow.bpmn.ActivityEntityThrowEvent"
-             name="Workflow Throw Event"
-             propertyTabs="org.imixs.bpmn.propertytab.event.history org.imixs.bpmn.propertytab.event.acl org.imixs.bpmn.propertytab.event.mail org.imixs.bpmn.propertytab.event.workflow org.imixs.bpmn.propertytab.event.businessrule org.imixs.bpmn.propertytab.event.report org.imixs.bpmn.propertytab.event.version org.imixs.bpmn.propertytab.event.timer"
-             runtimeId="org.imixs.workflow.bpmn.runtime"
-             type="IntermediateThrowEvent">
-          <property
-           		description="Workflow Activity ID"
-                label="ID-Throw"
-                name="activityid"
-                type="EInt"
-                value="0">
-          </property>            
-      </customTask>
-
-
 
       <!-- Activity Tabs 
       -->
@@ -89,7 +70,7 @@
             replaceTab="org.eclipse.bpmn2.modeler.commonEvent.tab"
             label="Workflow"
             runtimeId="org.imixs.workflow.bpmn.runtime"
-            type="org.eclipse.bpmn2.CatchEvent org.eclipse.bpmn2.ThrowEvent">
+            type="org.eclipse.bpmn2.CatchEvent">
       </propertyTab>
 
       <propertyTab
@@ -98,7 +79,7 @@
        		afterTab="org.imixs.bpmn.propertytab.event.workflow"
             label="ACL"
             runtimeId="org.imixs.workflow.bpmn.runtime"
-            type="org.eclipse.bpmn2.CatchEvent org.eclipse.bpmn2.ThrowEvent">
+            type="org.eclipse.bpmn2.CatchEvent">
       </propertyTab>
 
       <propertyTab
@@ -107,7 +88,7 @@
             afterTab="org.imixs.bpmn.propertytab.event.acl"
             label="History"
             runtimeId="org.imixs.workflow.bpmn.runtime"
-            type="org.eclipse.bpmn2.CatchEvent org.eclipse.bpmn2.ThrowEvent">
+            type="org.eclipse.bpmn2.CatchEvent">
       </propertyTab>
 
       <propertyTab
@@ -116,7 +97,7 @@
             afterTab="org.imixs.bpmn.propertytab.event.history"
             label="Mail"
             runtimeId="org.imixs.workflow.bpmn.runtime"
-            type="org.eclipse.bpmn2.CatchEvent org.eclipse.bpmn2.ThrowEvent">
+            type="org.eclipse.bpmn2.CatchEvent">
       </propertyTab>
 
       <propertyTab
@@ -125,7 +106,7 @@
             afterTab="org.imixs.bpmn.propertytab.event.mail"
             label="Rule"
             runtimeId="org.imixs.workflow.bpmn.runtime"
-            type="org.eclipse.bpmn2.CatchEvent org.eclipse.bpmn2.ThrowEvent">
+            type="org.eclipse.bpmn2.CatchEvent">
       </propertyTab>
 
       <propertyTab
@@ -134,7 +115,7 @@
             afterTab="org.imixs.bpmn.propertytab.event.businessrule"
             label="Report"
             runtimeId="org.imixs.workflow.bpmn.runtime"
-            type="org.eclipse.bpmn2.CatchEvent org.eclipse.bpmn2.ThrowEvent">
+            type="org.eclipse.bpmn2.CatchEvent">
       </propertyTab>
 
       <propertyTab
@@ -143,7 +124,7 @@
             afterTab="org.imixs.bpmn.propertytab.event.report"
             label="Version"
             runtimeId="org.imixs.workflow.bpmn.runtime"
-            type="org.eclipse.bpmn2.CatchEvent org.eclipse.bpmn2.ThrowEvent">
+            type="org.eclipse.bpmn2.CatchEvent">
       </propertyTab>
 
        <propertyTab
@@ -152,7 +133,7 @@
             afterTab="org.imixs.bpmn.propertytab.event.version"
             label="Timer"
             runtimeId="org.imixs.workflow.bpmn.runtime"
-            type="org.eclipse.bpmn2.CatchEvent org.eclipse.bpmn2.ThrowEvent">
+            type="org.eclipse.bpmn2.CatchEvent">
       </propertyTab>
 
 

diff --git a/org.imixs.eclipse.bpmn2.plugin/pom.xml b/org.imixs.eclipse.bpmn2.plugin/pom.xml
@@ -17,7 +17,7 @@
 	<parent>
 		<groupId>org.imixs.eclipse</groupId>
 		<artifactId>org.imixs.eclipse.bpmn2</artifactId>
-		<version>1.3.0-SNAPSHOT</version>
+		<version>1.4.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>org.imixs.eclipse.bpmn2.plugin</artifactId>

diff --git a/org.imixs.eclipse.bpmn2.plugin/src/org/imixs/bpmn/ImixsBPMNPlugin.java b/org.imixs.eclipse.bpmn2.plugin/src/org/imixs/bpmn/ImixsBPMNPlugin.java
@@ -15,7 +15,6 @@
 import org.eclipse.bpmn2.Definitions;
 import org.eclipse.bpmn2.ExtensionAttributeValue;
 import org.eclipse.bpmn2.IntermediateCatchEvent;
-import org.eclipse.bpmn2.IntermediateThrowEvent;
 import org.eclipse.bpmn2.Participant;
 import org.eclipse.bpmn2.Process;
 import org.eclipse.bpmn2.Task;
@@ -491,40 +490,8 @@ public static boolean isImixsCatchEvent(Object businessObject) {
 		return false;
 	}
 
-	/**
-	 * This Method verifies if a given object is an instance of a Imixs
-	 * IntermediateThrowEvent
-	 * 
-	 * @param businessObject
-	 * @return true if the object is a IntermediateThrowEvent and assigned to
-	 *         the Imixs TargetNamespace
-	 */
-	public static boolean isImixsThrowEvent(Object businessObject) {
-		if (businessObject == null)
-			return false;
-
-		if (businessObject instanceof IntermediateThrowEvent) {
-			EStructuralFeature feature = ModelDecorator.getAnyAttribute(
-					(IntermediateThrowEvent) businessObject, "activityid");
-			if (feature != null && feature instanceof EAttribute) {
-				if (ImixsRuntimeExtension.targetNamespace
-						.equals(((EAttributeImpl) feature)
-								.getExtendedMetaData().getNamespace())) {
-					return true;
-				}
-			}
-
-		}
-		return false;
-	}
+
 
-	public static boolean isImixsEvent(Object businessObject) {
-		if (isImixsCatchEvent(businessObject)
-				|| isImixsThrowEvent(businessObject))
-			return true;
-		else
-			return false;
-	}
 
 	/**
 	 * This Method verifies if a given object is an instance of a Imixs Task.

diff --git a/org.imixs.eclipse.bpmn2.plugin/src/org/imixs/bpmn/ImixsEventAdapter.java b/org.imixs.eclipse.bpmn2.plugin/src/org/imixs/bpmn/ImixsEventAdapter.java
@@ -4,7 +4,6 @@
 
 import org.eclipse.bpmn2.Event;
 import org.eclipse.bpmn2.IntermediateCatchEvent;
-import org.eclipse.bpmn2.IntermediateThrowEvent;
 import org.eclipse.bpmn2.SequenceFlow;
 import org.eclipse.bpmn2.Task;
 import org.eclipse.emf.common.notify.Notification;
@@ -35,9 +34,6 @@ public void notifyChanged(Notification notification) {
 		if (ImixsBPMNPlugin.isImixsCatchEvent(notification.getNotifier())) {
 			imixsEvent = (IntermediateCatchEvent) notification.getNotifier();
 		}
-		if (ImixsBPMNPlugin.isImixsThrowEvent(notification.getNotifier())) {
-			imixsEvent = (IntermediateThrowEvent) notification.getNotifier();
-		}
 
 		if (imixsEvent != null) {
 

diff --git a/org.imixs.eclipse.bpmn2.plugin/src/org/imixs/bpmn/ImixsFeatureContainerThrowEvent.java b/org.imixs.eclipse.bpmn2.plugin/src/org/imixs/bpmn/ImixsFeatureContainerThrowEvent.java
diff --git a/org.imixs.eclipse.bpmn2.plugin/src/org/imixs/bpmn/Tracer.java b/org.imixs.eclipse.bpmn2.plugin/src/org/imixs/bpmn/Tracer.java
@@ -139,7 +139,7 @@ void findImixsTargetEvents(FlowNode sourceRef, List<Event> resultList) {
 				// again a Imixs task - so we can stop ....
 				return;
 			}
-			if (ImixsBPMNPlugin.isImixsEvent(targetRef)) {
+			if (ImixsBPMNPlugin.isImixsCatchEvent(targetRef)) {
 				// add to list
 				if (!resultList.contains(targetRef)) {
 					resultList.add((Event) targetRef);

diff --git a/org.imixs.eclipse.bpmn2.plugin/src/org/imixs/bpmn/ui/event/ACLPropertySection.java b/org.imixs.eclipse.bpmn2.plugin/src/org/imixs/bpmn/ui/event/ACLPropertySection.java
@@ -55,7 +55,7 @@ public MailDetailComposite(Composite parent, int style) {
 
 		@Override
 		public void createBindings(final EObject be) {
-			if (!ImixsBPMNPlugin.isImixsEvent(businessObject)){
+			if (!ImixsBPMNPlugin.isImixsCatchEvent(businessObject)){
 				return ;
 			}
 

diff --git a/org.imixs.eclipse.bpmn2.plugin/src/org/imixs/bpmn/ui/event/AbstractPropertySection.java b/org.imixs.eclipse.bpmn2.plugin/src/org/imixs/bpmn/ui/event/AbstractPropertySection.java
@@ -31,7 +31,7 @@ public boolean doReplaceTab(String id, IWorkbenchPart part,
 		EObject businessObject = BusinessObjectUtil
 				.getBusinessObjectForSelection(selection);
 
-		if (ImixsBPMNPlugin.isImixsEvent(businessObject)) {
+		if (ImixsBPMNPlugin.isImixsCatchEvent(businessObject)) {
 			return true;
 		}
 		return false;

diff --git a/org.imixs.eclipse.bpmn2.plugin/src/org/imixs/bpmn/ui/event/BusinessRulePropertySection.java b/org.imixs.eclipse.bpmn2.plugin/src/org/imixs/bpmn/ui/event/BusinessRulePropertySection.java
@@ -42,7 +42,7 @@ public BusinessRuleDetailComposite(Composite parent, int style) {
 
 		@Override
 		public void createBindings(final EObject be) {
-			if (!ImixsBPMNPlugin.isImixsEvent(businessObject)){
+			if (!ImixsBPMNPlugin.isImixsCatchEvent(businessObject)){
 				return ;
 			}
 

diff --git a/org.imixs.eclipse.bpmn2.plugin/src/org/imixs/bpmn/ui/event/HistoryPropertySection.java b/org.imixs.eclipse.bpmn2.plugin/src/org/imixs/bpmn/ui/event/HistoryPropertySection.java
@@ -39,7 +39,7 @@ public HistoryDetailComposite(Composite parent, int style) {
 
 		@Override
 		public void createBindings(final EObject be) {
-			if (!ImixsBPMNPlugin.isImixsEvent(businessObject)) {
+			if (!ImixsBPMNPlugin.isImixsCatchEvent(businessObject)) {
 				return;
 			}
 

diff --git a/org.imixs.eclipse.bpmn2.plugin/src/org/imixs/bpmn/ui/event/MailPropertySection.java b/org.imixs.eclipse.bpmn2.plugin/src/org/imixs/bpmn/ui/event/MailPropertySection.java
@@ -48,7 +48,7 @@ public MailDetailComposite(Composite parent, int style) {
 
 		@Override
 		public void createBindings(final EObject be) {
-			if (!ImixsBPMNPlugin.isImixsEvent(businessObject)){
+			if (!ImixsBPMNPlugin.isImixsCatchEvent(businessObject)){
 				return ;
 			}
 

diff --git a/org.imixs.eclipse.bpmn2.plugin/src/org/imixs/bpmn/ui/event/ReportPropertySection.java b/org.imixs.eclipse.bpmn2.plugin/src/org/imixs/bpmn/ui/event/ReportPropertySection.java
@@ -43,7 +43,7 @@ public ReportDetailComposite(Composite parent, int style) {
 
 		@Override
 		public void createBindings(final EObject be) {
-			if (!ImixsBPMNPlugin.isImixsEvent(businessObject)){
+			if (!ImixsBPMNPlugin.isImixsCatchEvent(businessObject)){
 				return ;
 			}
 

diff --git a/org.imixs.eclipse.bpmn2.plugin/src/org/imixs/bpmn/ui/event/TimerPropertySection.java b/org.imixs.eclipse.bpmn2.plugin/src/org/imixs/bpmn/ui/event/TimerPropertySection.java
@@ -47,7 +47,7 @@ public TimerDetailComposite(Composite parent, int style) {
 
 		@Override
 		public void createBindings(final EObject be) {
-			if (!ImixsBPMNPlugin.isImixsEvent(businessObject)){
+			if (!ImixsBPMNPlugin.isImixsCatchEvent(businessObject)){
 				return ;
 			}