diff options
82 files changed, 310 insertions, 1376 deletions
@@ -3,6 +3,11 @@ local/ sandbox/ .git/ +# ignore eclipse project files +.settings/ +.project +.classpath + # Eclipse, Netbeans and IntelliJ files /.* !.gitignore @@ -11,6 +16,8 @@ sandbox/ /*.iws /*.iml + + # Repository wide ignore mac DS_Store files .DS_Store diff --git a/babel-snapshots/1.0.1/snapshot.zip b/babel-snapshots/1.0.1/snapshot.zip Binary files differdeleted file mode 100644 index 57674433..00000000 --- a/babel-snapshots/1.0.1/snapshot.zip +++ /dev/null diff --git a/babel-snapshots/1.0M1/snapshot.zip b/babel-snapshots/1.0M1/snapshot.zip Binary files differdeleted file mode 100644 index d7b55b5a..00000000 --- a/babel-snapshots/1.0M1/snapshot.zip +++ /dev/null diff --git a/babel-snapshots/1.2.1/snapshot.zip b/babel-snapshots/1.2.1/snapshot.zip Binary files differdeleted file mode 100644 index 38f4a616..00000000 --- a/babel-snapshots/1.2.1/snapshot.zip +++ /dev/null diff --git a/examples/plugins/org.eclipse.bpmn2.modeler.examples.customtask/.classpath b/examples/plugins/org.eclipse.bpmn2.modeler.examples.customtask/.classpath index c72d35a0..43b98628 100644 --- a/examples/plugins/org.eclipse.bpmn2.modeler.examples.customtask/.classpath +++ b/examples/plugins/org.eclipse.bpmn2.modeler.examples.customtask/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src"/> <classpathentry kind="output" path="target/classes"/> diff --git a/examples/plugins/org.eclipse.bpmn2.modeler.examples.customtask/META-INF/MANIFEST.MF b/examples/plugins/org.eclipse.bpmn2.modeler.examples.customtask/META-INF/MANIFEST.MF index 2af3aa8d..9e7afe75 100644 --- a/examples/plugins/org.eclipse.bpmn2.modeler.examples.customtask/META-INF/MANIFEST.MF +++ b/examples/plugins/org.eclipse.bpmn2.modeler.examples.customtask/META-INF/MANIFEST.MF @@ -2,19 +2,19 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.bpmn2.modeler.examples.customtask;singleton:=true -Bundle-Version: 1.5.1.qualifier +Bundle-Version: 1.5.5.qualifier Bundle-ClassPath: . Bundle-Vendor: %providerName Bundle-Localization: plugin -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Export-Package: org.eclipse.bpmn2.modeler.examples.customtask.MyModel, org.eclipse.bpmn2.modeler.examples.customtask.MyModel.impl, org.eclipse.bpmn2.modeler.examples.customtask.MyModel.util Require-Bundle: org.eclipse.core.runtime, org.eclipse.emf.ecore;visibility:=reexport, org.eclipse.emf.ecore.xmi;visibility:=reexport, - org.eclipse.graphiti;bundle-version="[0.14.0,0.17.0)", - org.eclipse.graphiti.ui;bundle-version="[0.14.0,0.17.0)", + org.eclipse.graphiti;bundle-version="[0.14.0,1.0.0)", + org.eclipse.graphiti.ui;bundle-version="[0.14.0,1.0.0)", org.eclipse.gef, org.eclipse.bpmn2, org.eclipse.bpmn2.edit, @@ -32,3 +32,4 @@ Require-Bundle: org.eclipse.core.runtime, org.eclipse.ui, org.eclipse.jdt.core Bundle-ActivationPolicy: lazy +Automatic-Module-Name: org.eclipse.bpmn2.modeler.examples.customtask diff --git a/examples/plugins/org.eclipse.bpmn2.modeler.examples.customtask/pom.xml b/examples/plugins/org.eclipse.bpmn2.modeler.examples.customtask/pom.xml index 0a784e99..13f80cf7 100644 --- a/examples/plugins/org.eclipse.bpmn2.modeler.examples.customtask/pom.xml +++ b/examples/plugins/org.eclipse.bpmn2.modeler.examples.customtask/pom.xml @@ -14,7 +14,7 @@ <parent> <groupId>org.eclipse.bpmn2.modeler.examples.plugins</groupId> <artifactId>org.eclipse.bpmn2.modeler.examples.plugins.parent</artifactId> - <version>1.5.1-SNAPSHOT</version> + <version>1.5.5-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> diff --git a/examples/plugins/org.eclipse.bpmn2.modeler.examples.datatypes/META-INF/MANIFEST.MF b/examples/plugins/org.eclipse.bpmn2.modeler.examples.datatypes/META-INF/MANIFEST.MF index b3dcfa3b..df495559 100644 --- a/examples/plugins/org.eclipse.bpmn2.modeler.examples.datatypes/META-INF/MANIFEST.MF +++ b/examples/plugins/org.eclipse.bpmn2.modeler.examples.datatypes/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.bpmn2.modeler.examples.datatypes;singleton:=true -Bundle-Version: 1.5.1.qualifier +Bundle-Version: 1.5.5.qualifier Bundle-Activator: org.eclipse.bpmn2.modeler.examples.datatypes.Activator Bundle-Vendor: %providerName Bundle-Localization: plugin @@ -13,8 +13,9 @@ Require-Bundle: org.eclipse.ui, org.eclipse.emf.transaction, org.eclipse.bpmn2.modeler.core, org.eclipse.bpmn2.modeler.ui, - org.eclipse.graphiti;bundle-version="[0.14.0,0.17.0)", - org.eclipse.graphiti.ui;bundle-version="[0.14.0,0.17.0)", + org.eclipse.graphiti;bundle-version="[0.14.0,1.0.0)", + org.eclipse.graphiti.ui;bundle-version="[0.14.0,1.0.0)", org.eclipse.bpmn2 -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ActivationPolicy: lazy +Automatic-Module-Name: org.eclipse.bpmn2.modeler.examples.datatypes diff --git a/examples/plugins/org.eclipse.bpmn2.modeler.examples.datatypes/pom.xml b/examples/plugins/org.eclipse.bpmn2.modeler.examples.datatypes/pom.xml index 2f861398..d2fd3940 100644 --- a/examples/plugins/org.eclipse.bpmn2.modeler.examples.datatypes/pom.xml +++ b/examples/plugins/org.eclipse.bpmn2.modeler.examples.datatypes/pom.xml @@ -14,7 +14,7 @@ <parent> <groupId>org.eclipse.bpmn2.modeler.examples.plugins</groupId> <artifactId>org.eclipse.bpmn2.modeler.examples.plugins.parent</artifactId> - <version>1.5.1-SNAPSHOT</version> + <version>1.5.5-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> diff --git a/examples/plugins/org.eclipse.bpmn2.modeler.examples.dynamic/.classpath b/examples/plugins/org.eclipse.bpmn2.modeler.examples.dynamic/.classpath index c72d35a0..43b98628 100644 --- a/examples/plugins/org.eclipse.bpmn2.modeler.examples.dynamic/.classpath +++ b/examples/plugins/org.eclipse.bpmn2.modeler.examples.dynamic/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src"/> <classpathentry kind="output" path="target/classes"/> diff --git a/examples/plugins/org.eclipse.bpmn2.modeler.examples.dynamic/META-INF/MANIFEST.MF b/examples/plugins/org.eclipse.bpmn2.modeler.examples.dynamic/META-INF/MANIFEST.MF index 0495dec9..c72a5af6 100644 --- a/examples/plugins/org.eclipse.bpmn2.modeler.examples.dynamic/META-INF/MANIFEST.MF +++ b/examples/plugins/org.eclipse.bpmn2.modeler.examples.dynamic/META-INF/MANIFEST.MF @@ -3,15 +3,15 @@ Bundle-ManifestVersion: 2 Bundle-Localization: plugin Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.bpmn2.modeler.examples.dynamic;singleton:=true -Bundle-Version: 1.5.1.qualifier +Bundle-Version: 1.5.5.qualifier Bundle-Activator: org.eclipse.bpmn2.modeler.examples.dynamic.Activator Bundle-Vendor: %providerName Require-Bundle: org.eclipse.ui.ide, org.eclipse.core.runtime, org.eclipse.ui.views.properties.tabbed, org.eclipse.gef, - org.eclipse.graphiti;bundle-version="[0.14.0,0.17.0)", - org.eclipse.graphiti.ui;bundle-version="[0.14.0,0.17.0)", + org.eclipse.graphiti;bundle-version="[0.14.0,1.0.0)", + org.eclipse.graphiti.ui;bundle-version="[0.14.0,1.0.0)", org.eclipse.emf.transaction, org.eclipse.emf.databinding, org.eclipse.emf.edit.ui, @@ -20,5 +20,6 @@ Require-Bundle: org.eclipse.ui.ide, org.eclipse.bpmn2, org.apache.xerces Bundle-ActivationPolicy: lazy -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Import-Package: org.eclipse.core.resources +Automatic-Module-Name: org.eclipse.bpmn2.modeler.examples.dynamic diff --git a/examples/plugins/org.eclipse.bpmn2.modeler.examples.dynamic/pom.xml b/examples/plugins/org.eclipse.bpmn2.modeler.examples.dynamic/pom.xml index e6a2d7ef..e99d20f0 100644 --- a/examples/plugins/org.eclipse.bpmn2.modeler.examples.dynamic/pom.xml +++ b/examples/plugins/org.eclipse.bpmn2.modeler.examples.dynamic/pom.xml @@ -14,7 +14,7 @@ <parent> <groupId>org.eclipse.bpmn2.modeler.examples.plugins</groupId> <artifactId>org.eclipse.bpmn2.modeler.examples.plugins.parent</artifactId> - <version>1.5.1-SNAPSHOT</version> + <version>1.5.5-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> diff --git a/examples/plugins/org.eclipse.bpmn2.modeler.examples.modelreader/META-INF/MANIFEST.MF b/examples/plugins/org.eclipse.bpmn2.modeler.examples.modelreader/META-INF/MANIFEST.MF index 647291b1..c6749172 100644 --- a/examples/plugins/org.eclipse.bpmn2.modeler.examples.modelreader/META-INF/MANIFEST.MF +++ b/examples/plugins/org.eclipse.bpmn2.modeler.examples.modelreader/META-INF/MANIFEST.MF @@ -2,19 +2,20 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.bpmn2.modeler.examples.modelreader;singleton:=true -Bundle-Version: 1.5.1.qualifier +Bundle-Version: 1.5.5.qualifier Bundle-Vendor: %providerName Export-Package: org.eclipse.bpmn2.modeler.examples.modelreader Require-Bundle: org.eclipse.ui.ide, org.eclipse.core.runtime, org.eclipse.ui.views.properties.tabbed, org.eclipse.gef, - org.eclipse.graphiti;bundle-version="[0.14.0,0.17.0)", - org.eclipse.graphiti.ui;bundle-version="[0.14.0,0.17.0)", + org.eclipse.graphiti;bundle-version="[0.14.0,1.0.0)", + org.eclipse.graphiti.ui;bundle-version="[0.14.0,1.0.0)", org.eclipse.emf.transaction, org.eclipse.emf.databinding, org.eclipse.emf.edit.ui, org.eclipse.bpmn2.modeler.core, org.eclipse.bpmn2.modeler.ui, org.eclipse.bpmn2 -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Automatic-Module-Name: org.eclipse.bpmn2.modeler.examples.modelreader diff --git a/examples/plugins/org.eclipse.bpmn2.modeler.examples.modelreader/pom.xml b/examples/plugins/org.eclipse.bpmn2.modeler.examples.modelreader/pom.xml index 027a49c0..782bb12e 100644 --- a/examples/plugins/org.eclipse.bpmn2.modeler.examples.modelreader/pom.xml +++ b/examples/plugins/org.eclipse.bpmn2.modeler.examples.modelreader/pom.xml @@ -17,7 +17,7 @@ <parent> <groupId>org.eclipse.bpmn2.modeler.examples.plugins</groupId> <artifactId>org.eclipse.bpmn2.modeler.examples.plugins.parent</artifactId> - <version>1.5.1-SNAPSHOT</version> + <version>1.5.5-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> diff --git a/examples/plugins/pom.xml b/examples/plugins/pom.xml index 81d18b3c..f9a67394 100644 --- a/examples/plugins/pom.xml +++ b/examples/plugins/pom.xml @@ -17,7 +17,7 @@ <parent> <groupId>org.eclipse.bpmn2.modeler.examples</groupId> <artifactId>org.eclipse.bpmn2.modeler.examples.parent</artifactId> - <version>1.5.1-SNAPSHOT</version> + <version>1.5.5-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> diff --git a/examples/pom.xml b/examples/pom.xml index aeef9cd4..690ada88 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -17,7 +17,7 @@ <parent> <groupId>org.eclipse.bpmn2.modeler</groupId> <artifactId>org.eclipse.bpmn2.modeler.parent</artifactId> - <version>1.5.1-SNAPSHOT</version> + <version>1.5.5-SNAPSHOT</version> <relativePath>../parent/pom.xml</relativePath> </parent> diff --git a/examples/projects/pom.xml b/examples/projects/pom.xml index 2b201829..255cfe82 100644 --- a/examples/projects/pom.xml +++ b/examples/projects/pom.xml @@ -17,7 +17,7 @@ <parent> <groupId>org.eclipse.bpmn2.modeler.examples</groupId> <artifactId>org.eclipse.bpmn2.modeler.examples.parent</artifactId> - <version>1.5.1-SNAPSHOT</version> + <version>1.5.5-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> diff --git a/features/org.eclipse.bpmn2.modeler.examples/feature.xml b/features/org.eclipse.bpmn2.modeler.examples/feature.xml index 53fb35ae..b4c59c72 100644 --- a/features/org.eclipse.bpmn2.modeler.examples/feature.xml +++ b/features/org.eclipse.bpmn2.modeler.examples/feature.xml @@ -2,7 +2,7 @@ <feature id="org.eclipse.bpmn2.modeler.examples" label="BPMN2 Modeler - Examples" - version="1.5.1.qualifier" + version="1.5.5.qualifier" provider-name="%providerName"> <description> diff --git a/features/org.eclipse.bpmn2.modeler.examples/pom.xml b/features/org.eclipse.bpmn2.modeler.examples/pom.xml index 5c8fbb89..8a7f31b8 100644 --- a/features/org.eclipse.bpmn2.modeler.examples/pom.xml +++ b/features/org.eclipse.bpmn2.modeler.examples/pom.xml @@ -17,7 +17,7 @@ <parent> <groupId>org.eclipse.bpmn2.modeler.features</groupId> <artifactId>org.eclipse.bpmn2.modeler.features.parent</artifactId> - <version>1.5.1-SNAPSHOT</version> + <version>1.5.5-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> diff --git a/features/org.eclipse.bpmn2.modeler.runtime.jboss/feature.properties b/features/org.eclipse.bpmn2.modeler.runtime.jboss/feature.properties index 6055ecd2..ac93e2d3 100644 --- a/features/org.eclipse.bpmn2.modeler.runtime.jboss/feature.properties +++ b/features/org.eclipse.bpmn2.modeler.runtime.jboss/feature.properties @@ -13,7 +13,7 @@ All rights reserved. This program and the accompanying materials \ are made available under the terms of the Eclipse Public License v1.0 \ which accompanies this distribution, and is available at -providerName=JBoss by Red Hat +providerName=Eclipse.org # "licenseURL" property - URL of the "Feature License" # do not translate value - just change to point to a locale-specific HTML page diff --git a/features/org.eclipse.bpmn2.modeler.runtime.jboss/feature.xml b/features/org.eclipse.bpmn2.modeler.runtime.jboss/feature.xml index fb80b572..2f596ff0 100644 --- a/features/org.eclipse.bpmn2.modeler.runtime.jboss/feature.xml +++ b/features/org.eclipse.bpmn2.modeler.runtime.jboss/feature.xml @@ -2,7 +2,7 @@ <feature id="org.eclipse.bpmn2.modeler.runtime.jboss" label="BPMN2 Modeler - jBPM Runtime Extension Feature" - version="1.5.1.qualifier" + version="1.5.5.qualifier" provider-name="%providerName"> <description url="http://jbpm.jboss.org/"> diff --git a/features/org.eclipse.bpmn2.modeler.runtime.jboss/pom.xml b/features/org.eclipse.bpmn2.modeler.runtime.jboss/pom.xml index 94834622..48fcc27a 100644 --- a/features/org.eclipse.bpmn2.modeler.runtime.jboss/pom.xml +++ b/features/org.eclipse.bpmn2.modeler.runtime.jboss/pom.xml @@ -14,7 +14,7 @@ <parent> <groupId>org.eclipse.bpmn2.modeler.features</groupId> <artifactId>org.eclipse.bpmn2.modeler.features.parent</artifactId> - <version>1.5.1-SNAPSHOT</version> + <version>1.5.5-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> diff --git a/features/org.eclipse.bpmn2.modeler.updatesite/pom.xml b/features/org.eclipse.bpmn2.modeler.updatesite/pom.xml index 28d840dd..d3171f46 100644 --- a/features/org.eclipse.bpmn2.modeler.updatesite/pom.xml +++ b/features/org.eclipse.bpmn2.modeler.updatesite/pom.xml @@ -17,7 +17,7 @@ <parent> <groupId>org.eclipse.bpmn2.modeler.features</groupId> <artifactId>org.eclipse.bpmn2.modeler.features.parent</artifactId> - <version>1.5.1-SNAPSHOT</version> + <version>1.5.5-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> diff --git a/features/org.eclipse.bpmn2.modeler/feature.xml b/features/org.eclipse.bpmn2.modeler/feature.xml index 5e524c78..23475f94 100644 --- a/features/org.eclipse.bpmn2.modeler/feature.xml +++ b/features/org.eclipse.bpmn2.modeler/feature.xml @@ -2,7 +2,7 @@ <feature id="org.eclipse.bpmn2.modeler" label="BPMN2 Modeler - Diagram Editor" - version="1.5.1.qualifier" + version="1.5.5.qualifier" provider-name="%providerName"> <description url="https://www.eclipse.org/bpmn2-modeler/"> diff --git a/features/org.eclipse.bpmn2.modeler/pom.xml b/features/org.eclipse.bpmn2.modeler/pom.xml index 7732daa7..6c159c85 100644 --- a/features/org.eclipse.bpmn2.modeler/pom.xml +++ b/features/org.eclipse.bpmn2.modeler/pom.xml @@ -17,7 +17,7 @@ <parent> <groupId>org.eclipse.bpmn2.modeler.features</groupId> <artifactId>org.eclipse.bpmn2.modeler.features.parent</artifactId> - <version>1.5.1-SNAPSHOT</version> + <version>1.5.5-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> diff --git a/features/pom.xml b/features/pom.xml index f5cbad0a..d1f754f5 100644 --- a/features/pom.xml +++ b/features/pom.xml @@ -7,14 +7,14 @@ <parent> <groupId>org.eclipse.bpmn2.modeler</groupId> <artifactId>org.eclipse.bpmn2.modeler.parent</artifactId> - <version>1.5.1-SNAPSHOT</version> + <version>1.5.5-SNAPSHOT</version> <relativePath>../parent/pom.xml</relativePath> </parent> <groupId>org.eclipse.bpmn2.modeler.features</groupId> <artifactId>org.eclipse.bpmn2.modeler.features.parent</artifactId> <name>BPMN2 Modeler: Features Parent</name> - <version>1.5.1-SNAPSHOT</version> + <version>1.5.5-SNAPSHOT</version> <packaging>pom</packaging> <modules> diff --git a/parent/pom.xml b/parent/pom.xml index fabc222a..e8643209 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -8,7 +8,7 @@ <groupId>org.eclipse.bpmn2.modeler</groupId> <artifactId>org.eclipse.bpmn2.modeler.parent</artifactId> - <version>1.5.1-SNAPSHOT</version> + <version>1.5.5-SNAPSHOT</version> <packaging>pom</packaging> <name>BPMN2 Modeler Parent</name> @@ -29,201 +29,82 @@ </licenses> <properties> - <tycho-version>1.1.0</tycho-version> + <!-- 1.3.0 2.7.2 --> + <tycho-version>2.7.5</tycho-version> <tycho-extras-version>${tycho-version}</tycho-extras-version> <BUILD_ALIAS>RC1</BUILD_ALIAS> <BUILD_NUMBER>1</BUILD_NUMBER> - <eclipse.orbit.url>http://download.eclipse.org/tools/orbit/downloads/drops/repository</eclipse.orbit.url> + <eclipse-site>https://download.eclipse.org/releases/2022-03</eclipse-site> + <platform-version>[4.8,5.2)</platform-version> + <platform-version-name>2022-12</platform-version-name> + <eclipse.orbit.url>https://download.eclipse.org/tools/orbit/downloads/drops/S20221109014815/repository</eclipse.orbit.url> </properties> <profiles> + <profile> - <id>platform-helios</id> - <activation> - <property> - <name>platform-version-name</name> - <value>helios</value> - </property> - </activation> - <properties> - <eclipse-site>http://download.eclipse.org/releases/helios</eclipse-site> - <platform-version>[3.6,3.7)</platform-version> - <platform-version-name>helios</platform-version-name> - </properties> - </profile> - <profile> - <id>platform-indigo</id> - <activation> - <property> - <name>platform-version-name</name> - <value>indigo</value> - </property> - </activation> - <properties> - <eclipse-site>http://download.eclipse.org/releases/indigo</eclipse-site> - <platform-version>[3.7,3.8)</platform-version> - <platform-version-name>indigo</platform-version-name> - </properties> - </profile> - <profile> - <id>platform-juno</id> - <activation> - <property> - <name>platform-version-name</name> - <value>juno</value> - </property> - </activation> - <properties> - <eclipse-site>http://download.eclipse.org/releases/juno</eclipse-site> - <platform-version>[4.2,4.3)</platform-version> - <platform-version-name>juno</platform-version-name> - </properties> - </profile> - <profile> - <id>platform-kepler</id> - <activation> - <property> - <name>platform-version-name</name> - <value>kepler</value> - </property> - </activation> - <properties> - <eclipse-site>http://download.eclipse.org/releases/kepler</eclipse-site> - <platform-version>[4.3,4.4)</platform-version> - <platform-version-name>kepler</platform-version-name> - </properties> - </profile> - <profile> - <id>platform-luna</id> - <activation> - <property> - <name>platform-version-name</name> - <value>luna</value> - </property> - </activation> - <properties> - <eclipse-site>http://download.eclipse.org/releases/luna</eclipse-site> - <platform-version>[4.4,4.5)</platform-version> - <platform-version-name>luna</platform-version-name> - </properties> - </profile> - <profile> - <id>platform-mars</id> - <activation> - <property> - <name>platform-version-name</name> - <value>mars</value> - </property> - </activation> - <properties> - <eclipse-site>http://download.eclipse.org/releases/mars</eclipse-site> - <platform-version>[4.5,5.0)</platform-version> - <platform-version-name>mars</platform-version-name> - </properties> - </profile> - <profile> - <id>platform-neon</id> + <id>platform-2021-06</id> <activation> <property> <name>platform-version-name</name> - <value>neon</value> + <value>2021-06</value> </property> </activation> <properties> - <eclipse-site>http://download.eclipse.org/releases/neon</eclipse-site> - <platform-version>[4.6,5.0)</platform-version> - <platform-version-name>neon</platform-version-name> - <eclipse.orbit.url>http://download.eclipse.org/tools/orbit/downloads/drops/R20160520211859/repository</eclipse.orbit.url> + <eclipse-site>https://download.eclipse.org/releases/2020-09</eclipse-site> + <platform-version>[4.8,5.2)</platform-version> + <platform-version-name>2021-06</platform-version-name> + <!-- + <eclipse.orbit.url>https://download.eclipse.org/tools/orbit/downloads/drops/R20200831200620/repository</eclipse.orbit.url> + --> + <eclipse.orbit.url>https://download.eclipse.org/tools/orbit/S-builds/S20210406213021/repository</eclipse.orbit.url> </properties> - <build> - <plugins> - <plugin> - <groupId>org.eclipse.tycho</groupId> - <artifactId>tycho-surefire-plugin</artifactId> - <version>${tycho-version}</version> - <configuration> - <useUIThread>false</useUIThread> - </configuration> - </plugin> - </plugins> - </build> + </profile> + <profile> - <id>platform-oxygen</id> + <id>platform-2022-06</id> <activation> <property> <name>platform-version-name</name> - <value>oxygen</value> + <value>2022-06</value> </property> </activation> <properties> - <eclipse-site>http://download.eclipse.org/releases/oxygen</eclipse-site> - <platform-version>[4.7,5.0)</platform-version> - <platform-version-name>oxygen</platform-version-name> - <eclipse.orbit.url>http://download.eclipse.org/tools/orbit/S-builds/S20170516192513/repository</eclipse.orbit.url> + <eclipse-site>https://download.eclipse.org/releases/2022-06</eclipse-site> + <platform-version>[4.8,5.2)</platform-version> + <platform-version-name>2022-06</platform-version-name> + <!-- I20220401155710 S20220517184036 --> + <eclipse.orbit.url>https://download.eclipse.org/tools/orbit/downloads/drops/S20220517184036/repository</eclipse.orbit.url> </properties> - <build> - <plugins> - <plugin> - <groupId>org.eclipse.tycho</groupId> - <artifactId>tycho-surefire-plugin</artifactId> - <version>${tycho-version}</version> - <configuration> - <useUIThread>false</useUIThread> - </configuration> - </plugin> - </plugins> - </build> - </profile> + + </profile> + <profile> - <id>platform-photon</id> + <id>platform-2022-12</id> <activation> <property> <name>platform-version-name</name> - <value>photon</value> + <value>2022-12</value> </property> </activation> <properties> - <eclipse-site>http://download.eclipse.org/releases/photon</eclipse-site> - <platform-version>[4.8,5.0)</platform-version> - <platform-version-name>photon</platform-version-name> - <eclipse.orbit.url>https://download.eclipse.org/tools/orbit/S-builds/S20190219190953/repository</eclipse.orbit.url> + <eclipse-site>https://download.eclipse.org/releases/2022-12</eclipse-site> + <platform-version>[4.8,5.2)</platform-version> + <platform-version-name>2022-12</platform-version-name> + <eclipse.orbit.url>https://download.eclipse.org/tools/orbit/downloads/drops/S20221109014815/repository</eclipse.orbit.url> </properties> - <build> - <plugins> - <plugin> - <groupId>org.eclipse.tycho</groupId> - <artifactId>tycho-surefire-plugin</artifactId> - <version>${tycho-version}</version> - <configuration> - <useUIThread>false</useUIThread> - </configuration> - </plugin> - </plugins> - </build> - </profile> + + </profile> + <profile> <id>sign</id> <build> <plugins> <plugin> - <groupId>org.eclipse.tycho.extras</groupId> - <artifactId>tycho-pack200a-plugin</artifactId> - <version>${tycho-extras-version}</version> - <executions> - <execution> - <id>pack200-normalize</id> - <goals> - <goal>normalize</goal> - </goals> - </execution> - </executions> - </plugin> - - <plugin> <groupId>org.eclipse.cbi.maven.plugins</groupId> <artifactId>eclipse-jarsigner-plugin</artifactId> - <version>1.1.3</version> + <version>1.3.2</version> <executions> <execution> <id>sign</id> @@ -234,20 +115,6 @@ </execution> </executions> </plugin> - - <plugin> - <groupId>org.eclipse.tycho.extras</groupId> - <artifactId>tycho-pack200b-plugin</artifactId> - <version>${tycho-extras-version}</version> - <executions> - <execution> - <id>pack200-pack</id> - <goals> - <goal>pack</goal> - </goals> - </execution> - </executions> - </plugin> </plugins> </build> </profile> @@ -271,7 +138,7 @@ <repository> <id>eclipse-bpmn2</id> - <url>http://download.eclipse.org/modeling/mdt/bpmn2/updates/photon/1.5.0/</url> + <url>https://download.eclipse.org/modeling/mdt/bpmn2/updates/2020-09/1.5.1/</url> <layout>p2</layout> <snapshots> <enabled>true</enabled> @@ -281,9 +148,11 @@ </releases> </repository> + + <!-- deactivated as no longer supported <repository> <id>eclipse-bpel</id> - <url>http://download.eclipse.org/bpel/updates/photon/1.1.2</url> + <url>https://download.eclipse.org/bpel/updates/2020-09/1.1.3</url> <layout>p2</layout> <snapshots> <enabled>true</enabled> @@ -292,10 +161,12 @@ <enabled>true</enabled> </releases> </repository> + --> <repository> <id>eclipse-graphiti</id> - <url>http://download.eclipse.org/graphiti/updates/milestones/</url> + <!-- <url>https://download.eclipse.org/graphiti/updates/milestones/S-0.19.0M3-202205200756</url> --> + <url>https://download.eclipse.org/graphiti/updates/milestones/</url> <layout>p2</layout> <snapshots> <enabled>true</enabled> @@ -307,7 +178,7 @@ <repository> <id>eclipse-emf</id> - <url>http://download.eclipse.org/modeling/emf/updates/releases/</url> + <url>https://download.eclipse.org/modeling/emf/updates/releases/</url> <layout>p2</layout> <snapshots> <enabled>true</enabled> @@ -319,7 +190,7 @@ <repository> <id>eclipse-gef</id> - <url>http://download.eclipse.org/tools/gef/updates/releases/</url> + <url>https://download.eclipse.org/tools/gef/updates/releases/</url> <layout>p2</layout> <snapshots> <enabled>true</enabled> @@ -332,7 +203,7 @@ <!-- vvv Remove when Web Tools has a fix for https://bugs.eclipse.org/bugs/show_bug.cgi?id=501445 --> <repository> <id>eclipse-wst</id> - <url>http://download.eclipse.org/webtools/downloads/drops/R3.13.0/I-latest/repository</url> + <url>https://download.eclipse.org/webtools/downloads/drops/R3.13.0/I-latest/repository</url> <layout>p2</layout> <snapshots> <enabled>true</enabled> @@ -364,22 +235,22 @@ <pluginRepository> <id>maven-central</id> - <url>http://repo1.maven.org/maven2/</url> + <url>https://repo1.maven.org/maven2/</url> </pluginRepository> <pluginRepository> <id>eclipse-nexus-central</id> - <url>http://maven.eclipse.org/nexus/content/groups/central/</url> + <url>https://maven.eclipse.org/nexus/content/groups/central/</url> </pluginRepository> <pluginRepository> <id>eclipse-nexus-public</id> - <url>http://maven.eclipse.org/nexus/content/groups/public/</url> + <url>https://maven.eclipse.org/nexus/content/groups/public/</url> </pluginRepository> <pluginRepository> <id>m2e-cbi</id> - <url>http://download.eclipse.org/technology/m2e/maven/</url> + <url>https://download.eclipse.org/technology/m2e/maven/</url> </pluginRepository> </pluginRepositories> @@ -390,11 +261,18 @@ <artifactId>tycho-packaging-plugin</artifactId> <version>${tycho-version}</version> <configuration> - <format>'${BUILD_ALIAS}-v'yyyyMMdd-HHmm'-B${BUILD_NUMBER}'</format> - <archiveSite>true</archiveSite> + <format>'${BUILD_ALIAS}-v'yyyyMMdd-HHmm'-B${BUILD_NUMBER}'</format> + <archiveSite>true</archiveSite> </configuration> </plugin> - + <plugin> + <groupId>org.eclipse.tycho</groupId> + <artifactId>tycho-surefire-plugin</artifactId> + <version>${tycho-version}</version> + <configuration> + <useUIThread>false</useUIThread> + </configuration> + </plugin> <plugin> <groupId>org.eclipse.tycho.extras</groupId> <artifactId>tycho-source-feature-plugin</artifactId> @@ -482,6 +360,7 @@ </environments> <!-- vvv Remove when Web Tools has a fix for https://bugs.eclipse.org/bugs/show_bug.cgi?id=501445 --> + <!-- removed from ralph.soika@imixs.com at 27.05.2020 <dependency-resolution> <extraRequirements> <requirement> @@ -491,6 +370,7 @@ </requirement> </extraRequirements> </dependency-resolution> + --> <!-- ^^^ Remove when Web Tools has a fix for https://bugs.eclipse.org/bugs/show_bug.cgi?id=501445 --> </configuration> </plugin> @@ -579,3 +459,4 @@ </pluginManagement> </build> </project> + diff --git a/plugins/org.eclipse.bpmn2.modeler.core/.classpath b/plugins/org.eclipse.bpmn2.modeler.core/.classpath index ad32c83a..eca7bdba 100644 --- a/plugins/org.eclipse.bpmn2.modeler.core/.classpath +++ b/plugins/org.eclipse.bpmn2.modeler.core/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src"/> <classpathentry kind="output" path="bin"/> diff --git a/plugins/org.eclipse.bpmn2.modeler.core/META-INF/MANIFEST.MF b/plugins/org.eclipse.bpmn2.modeler.core/META-INF/MANIFEST.MF index dc9d34fd..42719108 100644 --- a/plugins/org.eclipse.bpmn2.modeler.core/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.bpmn2.modeler.core/META-INF/MANIFEST.MF @@ -1,16 +1,17 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 +Automatic-Module-Name: org.eclipse.bpmn2.modeler.core Bundle-Localization: plugin Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.bpmn2.modeler.core;singleton:=true -Bundle-Version: 1.5.1.qualifier +Bundle-Version: 1.5.5.qualifier Bundle-Activator: org.eclipse.bpmn2.modeler.core.Activator Bundle-Vendor: %providerName Require-Bundle: org.eclipse.emf.transaction, org.eclipse.emf.edit.ui, org.eclipse.osgi, - org.eclipse.graphiti;bundle-version="[0.14.0,0.17.0)", - org.eclipse.graphiti.ui;bundle-version="[0.14.0,0.17.0)", + org.eclipse.graphiti;bundle-version="[0.14.0,1.0.0)", + org.eclipse.graphiti.ui;bundle-version="[0.14.0,1.0.0)", org.eclipse.gef, org.eclipse.bpmn2.edit, org.eclipse.bpmn2.editor, @@ -31,12 +32,13 @@ Require-Bundle: org.eclipse.emf.transaction, org.eclipse.ui.views.properties.tabbed, org.eclipse.jface.databinding, org.eclipse.core.databinding, + org.eclipse.core.databinding.property, org.eclipse.core.resources, org.eclipse.core.runtime, org.eclipse.core.expressions, org.eclipse.ui, org.eclipse.emf.ecore -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ActivationPolicy: lazy Export-Package: org.eclipse.bpmn2.modeler.core, org.eclipse.bpmn2.modeler.core.adapters, diff --git a/plugins/org.eclipse.bpmn2.modeler.core/pom.xml b/plugins/org.eclipse.bpmn2.modeler.core/pom.xml index 238b037c..1e607a10 100644 --- a/plugins/org.eclipse.bpmn2.modeler.core/pom.xml +++ b/plugins/org.eclipse.bpmn2.modeler.core/pom.xml @@ -17,7 +17,7 @@ <parent> <groupId>org.eclipse.bpmn2.modeler.plugins</groupId> <artifactId>org.eclipse.bpmn2.modeler.plugins.parent</artifactId> - <version>1.5.1-SNAPSHOT</version> + <version>1.5.5-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> diff --git a/plugins/org.eclipse.bpmn2.modeler.core/src/org/eclipse/bpmn2/modeler/core/features/containers/AbstractResizeContainerFeature.java b/plugins/org.eclipse.bpmn2.modeler.core/src/org/eclipse/bpmn2/modeler/core/features/containers/AbstractResizeContainerFeature.java index 33335f38..5fa4375e 100644 --- a/plugins/org.eclipse.bpmn2.modeler.core/src/org/eclipse/bpmn2/modeler/core/features/containers/AbstractResizeContainerFeature.java +++ b/plugins/org.eclipse.bpmn2.modeler.core/src/org/eclipse/bpmn2/modeler/core/features/containers/AbstractResizeContainerFeature.java @@ -72,16 +72,19 @@ public abstract class AbstractResizeContainerFeature extends DefaultResizeBPMNSh containerPos.push(p); } + /** + * Adjust location of children so that a resize up or left + * leaves them in the same location relative to the diagram. + * This allows the user to create (or remove) space between + * the Lane's edge and the contained activities. + */ @Override protected void postResizeShape(IResizeShapeContext context) { ContainerShape containerShape = (ContainerShape) context.getShape(); - - // Adjust location of children so that a resize up or left - // leaves them in the same location relative to the diagram. - // This allows the user to create (or remove) space between - // the Lane's edge and the contained activities. + Point pos = containerPos.pop(); if (context.getDirection()==IResizeShapeContext.DIRECTION_NORTH || + context.getDirection()==IResizeShapeContext.DIRECTION_SOUTH || context.getDirection()==IResizeShapeContext.DIRECTION_WEST || context.getDirection()==IResizeShapeContext.DIRECTION_NORTH_WEST || context.getDirection()==IResizeShapeContext.DIRECTION_NORTH_EAST || diff --git a/plugins/org.eclipse.bpmn2.modeler.core/src/org/eclipse/bpmn2/modeler/core/features/containers/lane/ResizeLaneFeature.java b/plugins/org.eclipse.bpmn2.modeler.core/src/org/eclipse/bpmn2/modeler/core/features/containers/lane/ResizeLaneFeature.java index e6ee46e8..5b67a1e1 100644 --- a/plugins/org.eclipse.bpmn2.modeler.core/src/org/eclipse/bpmn2/modeler/core/features/containers/lane/ResizeLaneFeature.java +++ b/plugins/org.eclipse.bpmn2.modeler.core/src/org/eclipse/bpmn2/modeler/core/features/containers/lane/ResizeLaneFeature.java @@ -12,11 +12,15 @@ ******************************************************************************/ package org.eclipse.bpmn2.modeler.core.features.containers.lane; +import java.util.List; + import org.eclipse.bpmn2.Lane; import org.eclipse.bpmn2.modeler.core.features.GraphitiConstants; import org.eclipse.bpmn2.modeler.core.features.containers.AbstractResizeContainerFeature; import org.eclipse.bpmn2.modeler.core.utils.BusinessObjectUtil; import org.eclipse.bpmn2.modeler.core.utils.FeatureSupport; +import org.eclipse.bpmn2.modeler.core.utils.GraphicsUtil; +import org.eclipse.draw2d.geometry.Rectangle; import org.eclipse.graphiti.features.IFeatureProvider; import org.eclipse.graphiti.features.IResizeShapeFeature; import org.eclipse.graphiti.features.context.IResizeShapeContext; @@ -233,26 +237,50 @@ public class ResizeLaneFeature extends AbstractResizeContainerFeature { } } + /** + * This method calculates the minimum size of a container (pool or lane) + * and avoids shrinking the container if child elements are hidden + */ @Override protected void preResizeShape(IResizeShapeContext context) { + int MIN_OFFSET=10; super.preResizeShape(context); - // TODO: figure out an algorithm to resize lanes so that children - // are always visible -// List<PictogramElement> children = FeatureSupport.getPoolOrLaneChildren((ContainerShape)context.getShape()); -// Rectangle bounds = GraphicsUtil.getBoundingRectangle(children); -// int direction = 0; -// if (bounds.x < context.getX()) { -// ((ResizeShapeContext)context).setX(bounds.x); -// } -// if (bounds.y < context.getY()) { -// ((ResizeShapeContext)context).setY(bounds.y); -// } -// if (bounds.x + bounds.width > context.getWidth()) { -// ((ResizeShapeContext)context).setWidth(bounds.x + bounds.width); -// } -// if (bounds.y + bounds.height > context.getHeight()) { -// ((ResizeShapeContext)context).setHeight(bounds.y + bounds.height); -// } + // compute dimensions... + List<PictogramElement> children = FeatureSupport.getPoolOrLaneChildren((ContainerShape)context.getShape()); + Rectangle bounds = GraphicsUtil.getBoundingRectangle(children); + Rectangle boundsAbsolute = GraphicsUtil.getBoundingRectangleAbsolute(children); + GraphicsAlgorithm rootGa = rootContainer.getGraphicsAlgorithm(); + + // debug information + /* + System.out.println("root: y="+rootGa.getY() + " h="+rootGa.getHeight()); + System.out.println("context: y="+context.getY() + " h="+context.getHeight()); + System.out.println("bounds: y=" + bounds.y +" h=" + bounds.width); + System.out.println("absolute: y=" + boundsAbsolute.y + " h=" + boundsAbsolute.width); + */ + + + // check if the desired dimension is possible + if (bounds.x < context.getX()) { + // without offset + ((ResizeShapeContext)context).setX(bounds.x); + } + if (boundsAbsolute.y < (rootGa.getY()+context.getY()) ) { + // here we compare the absolute y position of the child elements + // with the y position of the root container + if (boundsAbsolute.y-rootGa.getY()>MIN_OFFSET) { + ((ResizeShapeContext)context).setY(boundsAbsolute.y-rootGa.getY()-MIN_OFFSET); + } else { + // without offset + ((ResizeShapeContext)context).setY(boundsAbsolute.y-rootGa.getY()); + } + } + if (bounds.x + bounds.width > context.getWidth()) { + ((ResizeShapeContext)context).setWidth(bounds.x + bounds.width+MIN_OFFSET); + } + if (bounds.y + bounds.height > context.getHeight()) { + ((ResizeShapeContext)context).setHeight(bounds.y + bounds.height+MIN_OFFSET); + } } private ContainerShape getLowestLane(ContainerShape root, boolean useFirstLane) { diff --git a/plugins/org.eclipse.bpmn2.modeler.core/src/org/eclipse/bpmn2/modeler/core/merrimac/dialogs/FloatObjectEditor.java b/plugins/org.eclipse.bpmn2.modeler.core/src/org/eclipse/bpmn2/modeler/core/merrimac/dialogs/FloatObjectEditor.java index 7cd395e9..87fb7e7f 100644 --- a/plugins/org.eclipse.bpmn2.modeler.core/src/org/eclipse/bpmn2/modeler/core/merrimac/dialogs/FloatObjectEditor.java +++ b/plugins/org.eclipse.bpmn2.modeler.core/src/org/eclipse/bpmn2/modeler/core/merrimac/dialogs/FloatObjectEditor.java @@ -21,7 +21,7 @@ import org.eclipse.core.databinding.observable.value.IValueChangeListener; import org.eclipse.core.databinding.observable.value.ValueChangeEvent; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.EStructuralFeature; -import org.eclipse.jface.databinding.swt.SWTObservables; +import org.eclipse.jface.databinding.swt.typed.WidgetProperties; import org.eclipse.osgi.util.NLS; import org.eclipse.swt.SWT; import org.eclipse.swt.events.VerifyEvent; @@ -78,10 +78,10 @@ public class FloatObjectEditor extends TextObjectEditor { updateText(); - IObservableValue textObserveTextObserveWidget = SWTObservables.observeText(text, SWT.Modify); - textObserveTextObserveWidget.addValueChangeListener(new IValueChangeListener() { + IObservableValue<String> textObserveTextObserveWidget = WidgetProperties.text(SWT.Modify).observe((Control) text); + textObserveTextObserveWidget.addValueChangeListener(new IValueChangeListener<String>() { @Override - public void handleValueChange(ValueChangeEvent event) { + public void handleValueChange(ValueChangeEvent<? extends String> event) { try { final Double i = Double.parseDouble(text.getText()); @@ -92,7 +92,6 @@ public class FloatObjectEditor extends TextObjectEditor { } } - @SuppressWarnings("rawtypes") private void setFeatureValue(final double i) { getBusinessObjectDelegate().setValue(object, feature, Double.toString(i)); } @@ -120,6 +119,6 @@ public class FloatObjectEditor extends TextObjectEditor { catch (Exception e){ } } - return new Double(0); + return Double.valueOf(0); } } diff --git a/plugins/org.eclipse.bpmn2.modeler.core/src/org/eclipse/bpmn2/modeler/core/merrimac/dialogs/IntObjectEditor.java b/plugins/org.eclipse.bpmn2.modeler.core/src/org/eclipse/bpmn2/modeler/core/merrimac/dialogs/IntObjectEditor.java index 802ea2d9..1f7b365e 100644 --- a/plugins/org.eclipse.bpmn2.modeler.core/src/org/eclipse/bpmn2/modeler/core/merrimac/dialogs/IntObjectEditor.java +++ b/plugins/org.eclipse.bpmn2.modeler.core/src/org/eclipse/bpmn2/modeler/core/merrimac/dialogs/IntObjectEditor.java @@ -21,7 +21,7 @@ import org.eclipse.core.databinding.observable.value.IValueChangeListener; import org.eclipse.core.databinding.observable.value.ValueChangeEvent; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.EStructuralFeature; -import org.eclipse.jface.databinding.swt.SWTObservables; +import org.eclipse.jface.databinding.swt.typed.WidgetProperties; import org.eclipse.osgi.util.NLS; import org.eclipse.swt.SWT; import org.eclipse.swt.events.VerifyEvent; @@ -78,10 +78,10 @@ public class IntObjectEditor extends TextObjectEditor { updateText(); - IObservableValue textObserveTextObserveWidget = SWTObservables.observeText(text, SWT.Modify); - textObserveTextObserveWidget.addValueChangeListener(new IValueChangeListener() { + IObservableValue<String> textObserveTextObserveWidget = WidgetProperties.text(SWT.Modify).observe((Control) text); + textObserveTextObserveWidget.addValueChangeListener(new IValueChangeListener<String>() { @Override - public void handleValueChange(ValueChangeEvent event) { + public void handleValueChange(ValueChangeEvent<? extends String> event) { try { final Long i = Long.parseLong(text.getText()); @@ -93,7 +93,6 @@ public class IntObjectEditor extends TextObjectEditor { } } - @SuppressWarnings("rawtypes") private void setFeatureValue(final long i) { getBusinessObjectDelegate().setValue(object, feature, Long.toString(i)); } @@ -119,6 +118,6 @@ public class IntObjectEditor extends TextObjectEditor { catch (Exception e){ } } - return new Long(0); + return Long.valueOf(0); } } diff --git a/plugins/org.eclipse.bpmn2.modeler.core/src/org/eclipse/bpmn2/modeler/core/merrimac/dialogs/JavaPackageNameObjectEditor.java b/plugins/org.eclipse.bpmn2.modeler.core/src/org/eclipse/bpmn2/modeler/core/merrimac/dialogs/JavaPackageNameObjectEditor.java index 351af05c..e08a1193 100644 --- a/plugins/org.eclipse.bpmn2.modeler.core/src/org/eclipse/bpmn2/modeler/core/merrimac/dialogs/JavaPackageNameObjectEditor.java +++ b/plugins/org.eclipse.bpmn2.modeler.core/src/org/eclipse/bpmn2/modeler/core/merrimac/dialogs/JavaPackageNameObjectEditor.java @@ -21,7 +21,7 @@ import org.eclipse.core.databinding.observable.value.IValueChangeListener; import org.eclipse.core.databinding.observable.value.ValueChangeEvent; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.EStructuralFeature; -import org.eclipse.jface.databinding.swt.SWTObservables; +import org.eclipse.jface.databinding.swt.typed.WidgetProperties; import org.eclipse.osgi.util.NLS; import org.eclipse.swt.SWT; import org.eclipse.swt.events.VerifyEvent; @@ -84,12 +84,11 @@ public class JavaPackageNameObjectEditor extends TextObjectEditor { }); updateText(); - - IObservableValue textObserveTextObserveWidget = SWTObservables.observeText(text, SWT.Modify); - textObserveTextObserveWidget.addValueChangeListener(new IValueChangeListener() { + + IObservableValue<String> textObserveTextObserveWidget = WidgetProperties.text(SWT.Modify).observe((Control) text); + textObserveTextObserveWidget.addValueChangeListener(new IValueChangeListener<String>() { @Override - public void handleValueChange(ValueChangeEvent event) { - + public void handleValueChange(ValueChangeEvent<? extends String> event) { String s = text.getText(); if (!getValue().equals(s)) { setValue(s); diff --git a/plugins/org.eclipse.bpmn2.modeler.core/src/org/eclipse/bpmn2/modeler/core/merrimac/dialogs/JavaVariableNameObjectEditor.java b/plugins/org.eclipse.bpmn2.modeler.core/src/org/eclipse/bpmn2/modeler/core/merrimac/dialogs/JavaVariableNameObjectEditor.java index e4ad9ab2..01f77f4c 100644 --- a/plugins/org.eclipse.bpmn2.modeler.core/src/org/eclipse/bpmn2/modeler/core/merrimac/dialogs/JavaVariableNameObjectEditor.java +++ b/plugins/org.eclipse.bpmn2.modeler.core/src/org/eclipse/bpmn2/modeler/core/merrimac/dialogs/JavaVariableNameObjectEditor.java @@ -21,7 +21,7 @@ import org.eclipse.core.databinding.observable.value.IValueChangeListener; import org.eclipse.core.databinding.observable.value.ValueChangeEvent; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.EStructuralFeature; -import org.eclipse.jface.databinding.swt.SWTObservables; +import org.eclipse.jface.databinding.swt.typed.WidgetProperties; import org.eclipse.osgi.util.NLS; import org.eclipse.swt.SWT; import org.eclipse.swt.events.VerifyEvent; @@ -78,10 +78,10 @@ public class JavaVariableNameObjectEditor extends TextObjectEditor { updateText(); - IObservableValue textObserveTextObserveWidget = SWTObservables.observeText(text, SWT.Modify); - textObserveTextObserveWidget.addValueChangeListener(new IValueChangeListener() { + IObservableValue<String> textObserveTextObserveWidget = WidgetProperties.text(SWT.Modify).observe((Control) text); + textObserveTextObserveWidget.addValueChangeListener(new IValueChangeListener<String>() { @Override - public void handleValueChange(ValueChangeEvent event) { + public void handleValueChange(ValueChangeEvent<? extends String> event) { String s = text.getText(); if (!getValue().equals(s)) { diff --git a/plugins/org.eclipse.bpmn2.modeler.core/src/org/eclipse/bpmn2/modeler/core/merrimac/dialogs/NCNameObjectEditor.java b/plugins/org.eclipse.bpmn2.modeler.core/src/org/eclipse/bpmn2/modeler/core/merrimac/dialogs/NCNameObjectEditor.java index 51e9fefa..c4f08150 100644 --- a/plugins/org.eclipse.bpmn2.modeler.core/src/org/eclipse/bpmn2/modeler/core/merrimac/dialogs/NCNameObjectEditor.java +++ b/plugins/org.eclipse.bpmn2.modeler.core/src/org/eclipse/bpmn2/modeler/core/merrimac/dialogs/NCNameObjectEditor.java @@ -21,7 +21,7 @@ import org.eclipse.core.databinding.observable.value.IValueChangeListener; import org.eclipse.core.databinding.observable.value.ValueChangeEvent; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.EStructuralFeature; -import org.eclipse.jface.databinding.swt.SWTObservables; +import org.eclipse.jface.databinding.swt.typed.WidgetProperties; import org.eclipse.osgi.util.NLS; import org.eclipse.swt.SWT; import org.eclipse.swt.events.VerifyEvent; @@ -85,11 +85,11 @@ public class NCNameObjectEditor extends TextObjectEditor { updateText(); - IObservableValue textObserveTextObserveWidget = SWTObservables.observeText(text, SWT.Modify); - textObserveTextObserveWidget.addValueChangeListener(new IValueChangeListener() { + IObservableValue<String> textObserveTextObserveWidget = WidgetProperties.text(SWT.Modify).observe((Control) text); + textObserveTextObserveWidget.addValueChangeListener(new IValueChangeListener<String>() { @Override - public void handleValueChange(ValueChangeEvent event) { + public void handleValueChange(ValueChangeEvent<? extends String> event) { String s = text.getText(); if (!getValue().equals(s)) { setValue(s); diff --git a/plugins/org.eclipse.bpmn2.modeler.core/src/org/eclipse/bpmn2/modeler/core/merrimac/dialogs/QNameObjectEditor.java b/plugins/org.eclipse.bpmn2.modeler.core/src/org/eclipse/bpmn2/modeler/core/merrimac/dialogs/QNameObjectEditor.java index 05227679..2b60f846 100644 --- a/plugins/org.eclipse.bpmn2.modeler.core/src/org/eclipse/bpmn2/modeler/core/merrimac/dialogs/QNameObjectEditor.java +++ b/plugins/org.eclipse.bpmn2.modeler.core/src/org/eclipse/bpmn2/modeler/core/merrimac/dialogs/QNameObjectEditor.java @@ -21,7 +21,7 @@ import org.eclipse.core.databinding.observable.value.IValueChangeListener; import org.eclipse.core.databinding.observable.value.ValueChangeEvent; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.EStructuralFeature; -import org.eclipse.jface.databinding.swt.SWTObservables; +import org.eclipse.jface.databinding.swt.typed.WidgetProperties; import org.eclipse.osgi.util.NLS; import org.eclipse.swt.SWT; import org.eclipse.swt.events.VerifyEvent; @@ -78,10 +78,10 @@ public class QNameObjectEditor extends TextObjectEditor { updateText(); - IObservableValue textObserveTextObserveWidget = SWTObservables.observeText(text, SWT.Modify); - textObserveTextObserveWidget.addValueChangeListener(new IValueChangeListener() { + IObservableValue<String> textObserveTextObserveWidget = WidgetProperties.text(SWT.Modify).observe((Control) text); + textObserveTextObserveWidget.addValueChangeListener(new IValueChangeListener<String>() { @Override - public void handleValueChange(ValueChangeEvent event) { + public void handleValueChange(ValueChangeEvent<? extends String> event) { String s = text.getText(); if (!getValue().equals(s)) { diff --git a/plugins/org.eclipse.bpmn2.modeler.core/src/org/eclipse/bpmn2/modeler/core/runtime/XMLConfigElement.java b/plugins/org.eclipse.bpmn2.modeler.core/src/org/eclipse/bpmn2/modeler/core/runtime/XMLConfigElement.java index e1a9b66b..1fd3eaf2 100644 --- a/plugins/org.eclipse.bpmn2.modeler.core/src/org/eclipse/bpmn2/modeler/core/runtime/XMLConfigElement.java +++ b/plugins/org.eclipse.bpmn2.modeler.core/src/org/eclipse/bpmn2/modeler/core/runtime/XMLConfigElement.java @@ -23,7 +23,6 @@ import org.eclipse.core.runtime.IConfigurationElement; import org.eclipse.core.runtime.IContributor; import org.eclipse.core.runtime.IExtension; import org.eclipse.core.runtime.IPath; -import org.eclipse.core.runtime.IPluginDescriptor; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.InvalidRegistryObjectException; import org.eclipse.core.runtime.Path; @@ -262,11 +261,6 @@ public class XMLConfigElement implements IConfigurationElement { // TODO Auto-generated method stub return false; } - - public IPluginDescriptor getDeclaringPluginDescriptor() throws InvalidRegistryObjectException { - // TODO Auto-generated method stub - return null; - } } } diff --git a/plugins/org.eclipse.bpmn2.modeler.core/src/org/eclipse/bpmn2/modeler/core/utils/ErrorDialog.java b/plugins/org.eclipse.bpmn2.modeler.core/src/org/eclipse/bpmn2/modeler/core/utils/ErrorDialog.java index cd1b26c0..d5321dde 100644 --- a/plugins/org.eclipse.bpmn2.modeler.core/src/org/eclipse/bpmn2/modeler/core/utils/ErrorDialog.java +++ b/plugins/org.eclipse.bpmn2.modeler.core/src/org/eclipse/bpmn2/modeler/core/utils/ErrorDialog.java @@ -13,7 +13,6 @@ package org.eclipse.bpmn2.modeler.core.utils; -import org.eclipse.bpmn2.modeler.core.Activator; import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.swt.widgets.Display; @@ -51,17 +50,12 @@ public class ErrorDialog { } public void show() { - Thread t = Thread.currentThread(); -// Display.getDefault().syncExec(new Runnable() { -// @Override -// public void run() { - try { - String me = Activator.getDefault().getDescriptor().getLabel(); - MessageDialog.openError(Display.getDefault().getActiveShell(), me + " - " + title, message); //$NON-NLS-1$ - } - catch (Exception e) {} -// } -// }); + try { + MessageDialog.openError(Display.getDefault().getActiveShell(), title, message); //$NON-NLS-1$ + } + catch (Exception e) { + // no op + } } } diff --git a/plugins/org.eclipse.bpmn2.modeler.core/src/org/eclipse/bpmn2/modeler/core/utils/GraphicsUtil.java b/plugins/org.eclipse.bpmn2.modeler.core/src/org/eclipse/bpmn2/modeler/core/utils/GraphicsUtil.java index 429a9825..f926add0 100644 --- a/plugins/org.eclipse.bpmn2.modeler.core/src/org/eclipse/bpmn2/modeler/core/utils/GraphicsUtil.java +++ b/plugins/org.eclipse.bpmn2.modeler.core/src/org/eclipse/bpmn2/modeler/core/utils/GraphicsUtil.java @@ -797,6 +797,12 @@ public class GraphicsUtil { return lx-dist <= x && x <= lx+dist && ly-dist <= y && y <= ly+dist; } + /** + * This method computes a bounding rectangle around a group of PictorgramElements + * + * @param pes + * @return + */ public static Rectangle getBoundingRectangle(List<? extends PictogramElement> pes) { int xMin = Integer.MAX_VALUE; int yMin = Integer.MAX_VALUE; @@ -805,6 +811,35 @@ public class GraphicsUtil { for (PictogramElement pe : pes) { if (pe instanceof Shape) { + GraphicsAlgorithm peGa = pe.getGraphicsAlgorithm(); + IDimension size = calculateSize(pe); + if (peGa.getX()<xMin) + xMin = peGa.getX(); + if (peGa.getY()<yMin) + yMin = peGa.getY(); + if (peGa.getX() + size.getWidth()>xMax) + xMax = peGa.getX() + size.getWidth(); + if (peGa.getY() + size.getHeight()>yMax) + yMax = peGa.getY() + size.getHeight(); + } + } + return new Rectangle(xMin, yMin, xMax-xMin, yMax-yMin); + } + + /** + * This method computes a bounding rectangle around a group of PictorgramElements with absolute + * x,y coordinates relative to the Diagram + * @param pes + * @return + */ + public static Rectangle getBoundingRectangleAbsolute(List<? extends PictogramElement> pes) { + int xMin = Integer.MAX_VALUE; + int yMin = Integer.MAX_VALUE; + int xMax = Integer.MIN_VALUE; + int yMax = Integer.MIN_VALUE; + + for (PictogramElement pe : pes) { + if (pe instanceof Shape) { ILocation loc = Graphiti.getPeService().getLocationRelativeToDiagram((Shape)pe); IDimension size = calculateSize(pe); if (loc.getX()<xMin) @@ -818,5 +853,5 @@ public class GraphicsUtil { } } return new Rectangle(xMin, yMin, xMax-xMin, yMax-yMin); - } + } } diff --git a/plugins/org.eclipse.bpmn2.modeler.core/src/org/eclipse/bpmn2/modeler/core/validation/validators/GatewayValidator.java b/plugins/org.eclipse.bpmn2.modeler.core/src/org/eclipse/bpmn2/modeler/core/validation/validators/GatewayValidator.java index f7b8fbbd..e8a9db82 100644 --- a/plugins/org.eclipse.bpmn2.modeler.core/src/org/eclipse/bpmn2/modeler/core/validation/validators/GatewayValidator.java +++ b/plugins/org.eclipse.bpmn2.modeler.core/src/org/eclipse/bpmn2/modeler/core/validation/validators/GatewayValidator.java @@ -26,7 +26,18 @@ import org.eclipse.core.runtime.Status; import org.eclipse.emf.validation.IValidationContext; /** - * + * This class is responsible to validate the gateway direction + * for the different gateway types. The Gateway type relates to + * the number of incoming and outgoing sequence flows. + * <ul> + * <li>Converging gateways MUST have multiple incoming, and zero or one outgoing connection</li> + * <li>Diverging gateways MUST have zero or one incoming, and multiple outgoing connections</li> + * <li>Mixed gateways MUST have multiple incoming, and multiple outgoing connections</li> + * <li>Unspecified gateways MUST have either multiple incoming, or multiple outgoing connections</li> + * </ul> + * + * Issues: #550406 + * */ public class GatewayValidator extends AbstractBpmn2ElementValidator<Gateway> { @@ -107,38 +118,41 @@ public class GatewayValidator extends AbstractBpmn2ElementValidator<Gateway> { } } - if (object instanceof ExclusiveGateway) { - if (direction != GatewayDirection.DIVERGING - && direction != GatewayDirection.CONVERGING) { - addStatus(object, "gatewayDirection", //$NON-NLS-1$ - Status.ERROR, org.eclipse.bpmn2.modeler.core.validation.validators.Messages.GatewayValidator_Exclusive_Converging_Diverging); + // validate direction type (skip for mixed gateway type) + if (direction != GatewayDirection.MIXED) { + if (object instanceof ExclusiveGateway) { + if (direction != GatewayDirection.DIVERGING + && direction != GatewayDirection.CONVERGING) { + addStatus(object, "gatewayDirection", //$NON-NLS-1$ + Status.ERROR, org.eclipse.bpmn2.modeler.core.validation.validators.Messages.GatewayValidator_Exclusive_Converging_Diverging); + } } - } - if (object instanceof EventBasedGateway) { - if (direction != GatewayDirection.DIVERGING) { - addStatus(object,"gatewayDirection", //$NON-NLS-1$ - Status.ERROR, org.eclipse.bpmn2.modeler.core.validation.validators.Messages.GatewayValidator_Event_Diverging); + if (object instanceof EventBasedGateway) { + if (direction != GatewayDirection.DIVERGING) { + addStatus(object,"gatewayDirection", //$NON-NLS-1$ + Status.ERROR, org.eclipse.bpmn2.modeler.core.validation.validators.Messages.GatewayValidator_Event_Diverging); + } } - } - if (object instanceof ParallelGateway) { - if (direction != GatewayDirection.DIVERGING - && direction != GatewayDirection.CONVERGING) { - addStatus(object,"gatewayDirection", //$NON-NLS-1$ - Status.ERROR, org.eclipse.bpmn2.modeler.core.validation.validators.Messages.GatewayValidator_Parallel_Converging_Diverging); + if (object instanceof ParallelGateway) { + if (direction != GatewayDirection.DIVERGING + && direction != GatewayDirection.CONVERGING) { + addStatus(object,"gatewayDirection", //$NON-NLS-1$ + Status.ERROR, org.eclipse.bpmn2.modeler.core.validation.validators.Messages.GatewayValidator_Parallel_Converging_Diverging); + } } - } - if (object instanceof InclusiveGateway) { - if (direction != GatewayDirection.DIVERGING - && direction != GatewayDirection.CONVERGING) { - addStatus(object,"gatewayDirection", //$NON-NLS-1$ - Status.ERROR, org.eclipse.bpmn2.modeler.core.validation.validators.Messages.GatewayValidator_Inclusive_Converging_Diverging); + if (object instanceof InclusiveGateway) { + if (direction != GatewayDirection.DIVERGING + && direction != GatewayDirection.CONVERGING) { + addStatus(object,"gatewayDirection", //$NON-NLS-1$ + Status.ERROR, org.eclipse.bpmn2.modeler.core.validation.validators.Messages.GatewayValidator_Inclusive_Converging_Diverging); + } } - } - if (object instanceof ComplexGateway) { - if (direction != GatewayDirection.DIVERGING - && direction != GatewayDirection.CONVERGING) { - addStatus(object,"gatewayDirection", //$NON-NLS-1$ - Status.ERROR, org.eclipse.bpmn2.modeler.core.validation.validators.Messages.GatewayValidator_Complex_Converging_Diverging); + if (object instanceof ComplexGateway) { + if (direction != GatewayDirection.DIVERGING + && direction != GatewayDirection.CONVERGING) { + addStatus(object,"gatewayDirection", //$NON-NLS-1$ + Status.ERROR, org.eclipse.bpmn2.modeler.core.validation.validators.Messages.GatewayValidator_Complex_Converging_Diverging); + } } } return getResult(); diff --git a/plugins/org.eclipse.bpmn2.modeler.help/.classpath b/plugins/org.eclipse.bpmn2.modeler.help/.classpath index ad32c83a..eca7bdba 100644 --- a/plugins/org.eclipse.bpmn2.modeler.help/.classpath +++ b/plugins/org.eclipse.bpmn2.modeler.help/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src"/> <classpathentry kind="output" path="bin"/> diff --git a/plugins/org.eclipse.bpmn2.modeler.help/META-INF/MANIFEST.MF b/plugins/org.eclipse.bpmn2.modeler.help/META-INF/MANIFEST.MF index 0eae8a2d..07865a29 100644 --- a/plugins/org.eclipse.bpmn2.modeler.help/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.bpmn2.modeler.help/META-INF/MANIFEST.MF @@ -3,12 +3,13 @@ Bundle-ManifestVersion: 2 Bundle-Localization: plugin Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.bpmn2.modeler.help;singleton:=true -Bundle-Version: 1.5.1.qualifier +Bundle-Version: 1.5.5.qualifier Bundle-Activator: org.eclipse.bpmn2.modeler.help.Activator Bundle-Vendor: %providerName Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, org.eclipse.help -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ActivationPolicy: lazy Export-Package: org.eclipse.bpmn2.modeler.help +Automatic-Module-Name: org.eclipse.bpmn2.modeler.help diff --git a/plugins/org.eclipse.bpmn2.modeler.help/pom.xml b/plugins/org.eclipse.bpmn2.modeler.help/pom.xml index df28f167..84b20335 100644 --- a/plugins/org.eclipse.bpmn2.modeler.help/pom.xml +++ b/plugins/org.eclipse.bpmn2.modeler.help/pom.xml @@ -14,7 +14,7 @@ <parent> <groupId>org.eclipse.bpmn2.modeler.plugins</groupId> <artifactId>org.eclipse.bpmn2.modeler.plugins.parent</artifactId> - <version>1.5.1-SNAPSHOT</version> + <version>1.5.5-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> diff --git a/plugins/org.eclipse.bpmn2.modeler.runtime.jboss.jbpm/.classpath b/plugins/org.eclipse.bpmn2.modeler.runtime.jboss.jbpm/.classpath index c72d35a0..43b98628 100644 --- a/plugins/org.eclipse.bpmn2.modeler.runtime.jboss.jbpm/.classpath +++ b/plugins/org.eclipse.bpmn2.modeler.runtime.jboss.jbpm/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src"/> <classpathentry kind="output" path="target/classes"/> diff --git a/plugins/org.eclipse.bpmn2.modeler.runtime.jboss.jbpm/META-INF/MANIFEST.MF b/plugins/org.eclipse.bpmn2.modeler.runtime.jboss.jbpm/META-INF/MANIFEST.MF index d95ca30b..219256bc 100644 --- a/plugins/org.eclipse.bpmn2.modeler.runtime.jboss.jbpm/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.bpmn2.modeler.runtime.jboss.jbpm/META-INF/MANIFEST.MF @@ -2,13 +2,13 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.bpmn2.modeler.runtime.jboss.jbpm;singleton:=true -Bundle-Version: 1.5.1.qualifier +Bundle-Version: 1.5.5.qualifier Bundle-Activator: org.eclipse.bpmn2.modeler.runtime.jboss.jbpm5.Activator Bundle-Vendor: %providerName Bundle-Localization: plugin Require-Bundle: org.eclipse.ui.ide, - org.eclipse.graphiti;bundle-version="[0.14.0,0.17.0)", - org.eclipse.graphiti.ui;bundle-version="[0.14.0,0.17.0)", + org.eclipse.graphiti;bundle-version="[0.14.0,1.0.0)", + org.eclipse.graphiti.ui;bundle-version="[0.14.0,1.0.0)", org.eclipse.bpmn2.modeler.core, org.eclipse.emf.transaction, org.eclipse.ui.views.properties.tabbed, @@ -24,7 +24,7 @@ Require-Bundle: org.eclipse.ui.ide, org.eclipse.ui, org.eclipse.core.runtime, org.eclipse.jdt.core -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ActivationPolicy: lazy Export-Package: org.eclipse.bpmn2.modeler.runtime.jboss.jbpm5, org.eclipse.bpmn2.modeler.runtime.jboss.jbpm5.features, @@ -45,3 +45,4 @@ Import-Package: org.eclipse.bpmn2.modeler.help, org.eclipse.bpmn2.modeler.ui.features.activity.task, org.eclipse.bpmn2.modeler.ui.property, org.eclipse.bpmn2.modeler.ui.property.providers +Automatic-Module-Name: org.eclipse.bpmn2.modeler.runtime.jboss.jbpm diff --git a/plugins/org.eclipse.bpmn2.modeler.runtime.jboss.jbpm/pom.xml b/plugins/org.eclipse.bpmn2.modeler.runtime.jboss.jbpm/pom.xml index ac66d772..19dac3b9 100644 --- a/plugins/org.eclipse.bpmn2.modeler.runtime.jboss.jbpm/pom.xml +++ b/plugins/org.eclipse.bpmn2.modeler.runtime.jboss.jbpm/pom.xml @@ -14,7 +14,7 @@ <parent> <groupId>org.eclipse.bpmn2.modeler.plugins</groupId> <artifactId>org.eclipse.bpmn2.modeler.plugins.parent</artifactId> - <version>1.5.1-SNAPSHOT</version> + <version>1.5.5-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> diff --git a/plugins/org.eclipse.bpmn2.modeler.ui/.classpath b/plugins/org.eclipse.bpmn2.modeler.ui/.classpath index ad32c83a..eca7bdba 100644 --- a/plugins/org.eclipse.bpmn2.modeler.ui/.classpath +++ b/plugins/org.eclipse.bpmn2.modeler.ui/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src"/> <classpathentry kind="output" path="bin"/> diff --git a/plugins/org.eclipse.bpmn2.modeler.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.bpmn2.modeler.ui/META-INF/MANIFEST.MF index 697b9ce0..09172d9a 100644 --- a/plugins/org.eclipse.bpmn2.modeler.ui/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.bpmn2.modeler.ui/META-INF/MANIFEST.MF @@ -2,14 +2,14 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.bpmn2.modeler.ui;singleton:=true -Bundle-Version: 1.5.1.qualifier +Bundle-Version: 1.5.5.qualifier Bundle-Activator: org.eclipse.bpmn2.modeler.ui.Activator Bundle-Vendor: %providerName Bundle-Localization: plugin Require-Bundle: org.eclipse.ui.ide, org.eclipse.osgi, - org.eclipse.graphiti;bundle-version="[0.14.0,0.17.0)", - org.eclipse.graphiti.ui;bundle-version="[0.14.0,0.17.0)", + org.eclipse.graphiti;bundle-version="[0.14.0,1.0.0)", + org.eclipse.graphiti.ui;bundle-version="[0.14.0,1.0.0)", org.eclipse.bpmn2.modeler.core, org.eclipse.emf.transaction, org.eclipse.ui.views.properties.tabbed, @@ -34,7 +34,7 @@ Require-Bundle: org.eclipse.ui.ide, org.eclipse.emf.workspace, org.eclipse.bpmn2, org.eclipse.bpmn2.modeler.help -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ActivationPolicy: lazy Export-Package: org.eclipse.bpmn2.modeler.ui, org.eclipse.bpmn2.modeler.ui.adapters, @@ -77,4 +77,5 @@ Import-Package: org.eclipse.core.expressions, org.eclipse.emf.workspace, org.eclipse.emf.workspace.util, org.eclipse.wst.validation +Automatic-Module-Name: org.eclipse.bpmn2.modeler.ui diff --git a/plugins/org.eclipse.bpmn2.modeler.ui/pom.xml b/plugins/org.eclipse.bpmn2.modeler.ui/pom.xml index 6952d26c..56b7ec79 100644 --- a/plugins/org.eclipse.bpmn2.modeler.ui/pom.xml +++ b/plugins/org.eclipse.bpmn2.modeler.ui/pom.xml @@ -17,7 +17,7 @@ <parent> <groupId>org.eclipse.bpmn2.modeler.plugins</groupId> <artifactId>org.eclipse.bpmn2.modeler.plugins.parent</artifactId> - <version>1.5.1-SNAPSHOT</version> + <version>1.5.5-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> diff --git a/plugins/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/property/dialogs/DefaultSchemaImportDialog.java b/plugins/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/property/dialogs/DefaultSchemaImportDialog.java index 20d1399a..e969b78d 100644 --- a/plugins/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/property/dialogs/DefaultSchemaImportDialog.java +++ b/plugins/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/property/dialogs/DefaultSchemaImportDialog.java @@ -728,9 +728,7 @@ public class DefaultSchemaImportDialog extends SelectionStatusDialog { updateStatus ( new Status(IStatus.INFO, Activator.getDefault().getID(),0,msg,null)); } - - - @SuppressWarnings("boxing") + protected void loadDone () { long elapsed = System.currentTimeMillis() - fRunnableStart; diff --git a/plugins/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/property/dialogs/SchemaSelectionDialog.java b/plugins/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/property/dialogs/SchemaSelectionDialog.java index 995b4b7c..9c8de838 100644 --- a/plugins/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/property/dialogs/SchemaSelectionDialog.java +++ b/plugins/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/property/dialogs/SchemaSelectionDialog.java @@ -372,7 +372,6 @@ public class SchemaSelectionDialog extends SelectionStatusDialog { return null; } - @SuppressWarnings("boxing") void loadDone() { if (input == null || input instanceof Exception) { diff --git a/plugins/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/property/editors/NameAndURIObjectEditor.java b/plugins/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/property/editors/NameAndURIObjectEditor.java index 8f51a9c6..5076c3d1 100644 --- a/plugins/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/property/editors/NameAndURIObjectEditor.java +++ b/plugins/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/property/editors/NameAndURIObjectEditor.java @@ -130,7 +130,7 @@ public class NameAndURIObjectEditor extends ComboObjectEditor { if ( dialog.open() == Window.OK) { final String newURI = dialog.getURI(); final String newName = dialog.getName(); - if (!newURI.equals(value)) { + if (!newURI.equals(oldURI)) { final Definitions definitions = ModelUtil.getDefinitions(object); if (definitions!=null) { TransactionalEditingDomain domain = getDiagramEditor().getEditingDomain(); diff --git a/plugins/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/views/outline/BPMN2EditorOutlinePage.java b/plugins/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/views/outline/BPMN2EditorOutlinePage.java index 2f92004c..c3ba5eff 100644 --- a/plugins/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/views/outline/BPMN2EditorOutlinePage.java +++ b/plugins/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/views/outline/BPMN2EditorOutlinePage.java @@ -37,11 +37,7 @@ import org.eclipse.graphiti.ui.editor.DiagramEditor; import org.eclipse.graphiti.ui.internal.fixed.FixedScrollableThumbnail; import org.eclipse.jface.action.Action; import org.eclipse.jface.action.IAction; -import org.eclipse.jface.action.IMenuListener; -import org.eclipse.jface.action.IMenuManager; import org.eclipse.jface.action.IToolBarManager; -import org.eclipse.jface.action.MenuManager; -import org.eclipse.jface.action.Separator; import org.eclipse.swt.SWT; import org.eclipse.swt.events.MouseEvent; import org.eclipse.swt.events.MouseListener; @@ -49,12 +45,10 @@ import org.eclipse.swt.widgets.Canvas; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Listener; -import org.eclipse.swt.widgets.Menu; import org.eclipse.swt.widgets.Tree; import org.eclipse.ui.IActionBars; import org.eclipse.ui.IPropertyListener; import org.eclipse.ui.PlatformUI; -import org.eclipse.ui.internal.about.AboutAction; import org.eclipse.ui.part.IPageSite; import org.eclipse.ui.part.PageBook; @@ -209,20 +203,7 @@ public class BPMN2EditorOutlinePage extends ContentOutlinePage implements IPrope }); // Add a context menu for editing actions - final MenuManager contextMenu = new MenuManager("#PopUp"); //$NON-NLS-1$ - contextMenu.add(new Separator("additions")); //$NON-NLS-1$ - contextMenu.setRemoveAllWhenShown(true); - contextMenu.addMenuListener(new IMenuListener() { - - @Override - public void menuAboutToShow(IMenuManager manager) { - contextMenu.add(new AboutAction(diagramEditor.getSite().getWorkbenchWindow())); - } - }); - - Menu menu = contextMenu.createContextMenu(viewer.getControl()); - viewer.getControl().setMenu(menu); - getSite().registerContextMenu(Activator.PLUGIN_ID+".outline", contextMenu, viewer); //$NON-NLS-1$ + // not implemented ! } private void removeKeyListeners(Tree tree) { diff --git a/plugins/pom.xml b/plugins/pom.xml index a704c303..00d70d62 100644 --- a/plugins/pom.xml +++ b/plugins/pom.xml @@ -7,14 +7,14 @@ <parent> <groupId>org.eclipse.bpmn2.modeler</groupId> <artifactId>org.eclipse.bpmn2.modeler.parent</artifactId> - <version>1.5.1-SNAPSHOT</version> + <version>1.5.5-SNAPSHOT</version> <relativePath>../parent/pom.xml</relativePath> </parent> <groupId>org.eclipse.bpmn2.modeler.plugins</groupId> <artifactId>org.eclipse.bpmn2.modeler.plugins.parent</artifactId> <name>BPMN2 Modeler: Plugins Parent</name> - <version>1.5.1-SNAPSHOT</version> + <version>1.5.5-SNAPSHOT</version> <packaging>pom</packaging> <modules> @@ -4,15 +4,11 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs <groupId>org.eclipse</groupId> <artifactId>org-eclipse-bpmn2-modeler</artifactId> <name>BPMN2 Modeler</name> - <version>1.5.1-SNAPSHOT</version> + <version>1.5.5-SNAPSHOT</version> <packaging>pom</packaging> <modules> - <!-- must build parent BEFORE building the rest of this project - <module>parent</module> --> - <module>plugins</module> <module>features</module> <module>examples</module> - <module>tests</module> </modules> </project> diff --git a/tests/.project b/tests/.project deleted file mode 100644 index 76d5a448..00000000 --- a/tests/.project +++ /dev/null @@ -1,17 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<projectDescription> - <name>org.eclipse.bpmn2.modeler.tests.parent</name> - <comment></comment> - <projects> - </projects> - <buildSpec> - <buildCommand> - <name>org.eclipse.m2e.core.maven2Builder</name> - <arguments> - </arguments> - </buildCommand> - </buildSpec> - <natures> - <nature>org.eclipse.m2e.core.maven2Nature</nature> - </natures> -</projectDescription> diff --git a/tests/org.eclipse.bpmn2.modeler.core.tests/.classpath b/tests/org.eclipse.bpmn2.modeler.core.tests/.classpath deleted file mode 100644 index 97067505..00000000 --- a/tests/org.eclipse.bpmn2.modeler.core.tests/.classpath +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/> - <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> - <classpathentry kind="src" path="src/"/> - <classpathentry kind="src" path="resources/"/> - <classpathentry kind="output" path="target/classes"/> -</classpath> diff --git a/tests/org.eclipse.bpmn2.modeler.core.tests/.project b/tests/org.eclipse.bpmn2.modeler.core.tests/.project deleted file mode 100644 index aff11428..00000000 --- a/tests/org.eclipse.bpmn2.modeler.core.tests/.project +++ /dev/null @@ -1,34 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<projectDescription> - <name>org.eclipse.bpmn2.modeler.core.tests</name> - <comment></comment> - <projects> - </projects> - <buildSpec> - <buildCommand> - <name>org.eclipse.jdt.core.javabuilder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>org.eclipse.pde.ManifestBuilder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>org.eclipse.pde.SchemaBuilder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>org.eclipse.m2e.core.maven2Builder</name> - <arguments> - </arguments> - </buildCommand> - </buildSpec> - <natures> - <nature>org.eclipse.m2e.core.maven2Nature</nature> - <nature>org.eclipse.pde.PluginNature</nature> - <nature>org.eclipse.jdt.core.javanature</nature> - </natures> -</projectDescription> diff --git a/tests/org.eclipse.bpmn2.modeler.core.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.bpmn2.modeler.core.tests/META-INF/MANIFEST.MF deleted file mode 100644 index 01cc8788..00000000 --- a/tests/org.eclipse.bpmn2.modeler.core.tests/META-INF/MANIFEST.MF +++ /dev/null @@ -1,17 +0,0 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: %pluginName -Bundle-SymbolicName: org.eclipse.bpmn2.modeler.core.tests;singleton:=true -Bundle-Version: 1.5.1.qualifier -Require-Bundle: org.eclipse.bpmn2.edit, - org.eclipse.bpmn2.editor, - org.eclipse.bpmn2.modeler.core, - org.eclipse.emf.edit.ui, - org.eclipse.emf.ecore, - org.eclipse.emf.transaction, - org.eclipse.emf.validation.ocl, - org.junit, - org.mockito;bundle-version="1.9.5", - org.hamcrest;bundle-version="1.1.0" -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Bundle-ActivationPolicy: lazy diff --git a/tests/org.eclipse.bpmn2.modeler.core.tests/build.properties b/tests/org.eclipse.bpmn2.modeler.core.tests/build.properties deleted file mode 100644 index cad2cc51..00000000 --- a/tests/org.eclipse.bpmn2.modeler.core.tests/build.properties +++ /dev/null @@ -1,6 +0,0 @@ - -source.. = src/,\ - resources/ -output.. = target/classes -bin.includes = META-INF/,\ - . diff --git a/tests/org.eclipse.bpmn2.modeler.core.tests/plugin.properties b/tests/org.eclipse.bpmn2.modeler.core.tests/plugin.properties deleted file mode 100644 index ca9bf67e..00000000 --- a/tests/org.eclipse.bpmn2.modeler.core.tests/plugin.properties +++ /dev/null @@ -1,16 +0,0 @@ -# <copyright> -############################################################################### -# Copyright (c) 2011, 2012, 2013, 2014 Red Hat, Inc. -# All rights reserved. -# This program is made available under the terms of the -# Eclipse Public License v1.0 which accompanies this distribution, -# and is available at http://www.eclipse.org/legal/epl-v10.html -# -# Contributors: -# Red Hat, Inc. - initial API and implementation -############################################################################### -# </copyright> -# -# $Id$ -pluginName = BPMN2 Modeler Core -providerName = Eclipse.org diff --git a/tests/org.eclipse.bpmn2.modeler.core.tests/pom.xml b/tests/org.eclipse.bpmn2.modeler.core.tests/pom.xml deleted file mode 100644 index 126a14fe..00000000 --- a/tests/org.eclipse.bpmn2.modeler.core.tests/pom.xml +++ /dev/null @@ -1,13 +0,0 @@ -<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.eclipse.bpmn2.modeler.tests</groupId> - <artifactId>tests-parent</artifactId> - <version>1.5.1-SNAPSHOT</version> - </parent> - - <artifactId>org.eclipse.bpmn2.modeler.core.tests</artifactId> - <name>BPMN2 Modeler Tests: Core Tests</name> - <packaging>eclipse-test-plugin</packaging> -</project> - diff --git a/tests/org.eclipse.bpmn2.modeler.core.tests/src/org/eclipse/bpmn2/modeler/core/validation/tests/SyntaxCheckerUtilsTest.java b/tests/org.eclipse.bpmn2.modeler.core.tests/src/org/eclipse/bpmn2/modeler/core/validation/tests/SyntaxCheckerUtilsTest.java deleted file mode 100644 index 3e770c4c..00000000 --- a/tests/org.eclipse.bpmn2.modeler.core.tests/src/org/eclipse/bpmn2/modeler/core/validation/tests/SyntaxCheckerUtilsTest.java +++ /dev/null @@ -1,34 +0,0 @@ -package org.eclipse.bpmn2.modeler.core.validation.tests; - -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.assertFalse; - -import org.eclipse.bpmn2.modeler.core.validation.SyntaxCheckerUtils; -import org.junit.Test; - -public class SyntaxCheckerUtilsTest { - - @Test - public void testIsJavaIdentifier() throws Exception { - assertTrue( SyntaxCheckerUtils.isJavaIdentifier("_ab") ); - assertTrue( SyntaxCheckerUtils.isJavaIdentifier("a1b") ); - assertTrue( SyntaxCheckerUtils.isJavaIdentifier("_ab") ); - } - /* - @Test - public void testIsJavaIdentifierUTF8() throws Exception { - assertTrue( SyntaxCheckerUtils.isJavaIdentifier("形声") ); - } - */ - @Test - public void testIsJavaIdentifierNegative() throws Exception { - assertFalse( SyntaxCheckerUtils.isJavaIdentifier("_a b") ); - assertFalse( SyntaxCheckerUtils.isJavaIdentifier("1ab") ); - assertFalse( SyntaxCheckerUtils.isJavaIdentifier("!ab") ); - assertFalse( SyntaxCheckerUtils.isJavaIdentifier("*") ); - assertFalse( SyntaxCheckerUtils.isJavaIdentifier("+") ); - assertFalse( SyntaxCheckerUtils.isJavaIdentifier("-") ); - assertFalse( SyntaxCheckerUtils.isJavaIdentifier("a+") ); - assertFalse( SyntaxCheckerUtils.isJavaIdentifier("a#") ); - } -} diff --git a/tests/org.eclipse.bpmn2.modeler.core.tests/src/org/eclipse/bpmn2/modeler/core/validation/validators/tests/GatewayValidatorTest.java b/tests/org.eclipse.bpmn2.modeler.core.tests/src/org/eclipse/bpmn2/modeler/core/validation/validators/tests/GatewayValidatorTest.java deleted file mode 100644 index 89985c2e..00000000 --- a/tests/org.eclipse.bpmn2.modeler.core.tests/src/org/eclipse/bpmn2/modeler/core/validation/validators/tests/GatewayValidatorTest.java +++ /dev/null @@ -1,91 +0,0 @@ -package org.eclipse.bpmn2.modeler.core.validation.validators.tests; - -import org.eclipse.bpmn2.Bpmn2Package; -import org.eclipse.bpmn2.Gateway; -import org.eclipse.bpmn2.GatewayDirection; -import org.eclipse.bpmn2.SequenceFlow; -import org.eclipse.bpmn2.modeler.core.validation.validators.GatewayValidator; -import org.eclipse.emf.ecore.EClass; -import org.eclipse.emf.ecore.EObject; -import org.eclipse.emf.ecore.EStructuralFeature; -import org.eclipse.emf.validation.IValidationContext; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.mockito.Mock; -import org.mockito.runners.MockitoJUnitRunner; - -import static org.mockito.Matchers.anyString; -import static org.mockito.Mockito.times; -import static org.mockito.Mockito.when; -import static org.mockito.Mockito.verify; - -import java.util.ArrayList; -import java.util.List; - -@RunWith(MockitoJUnitRunner.class) -public class GatewayValidatorTest { - - @Mock - Gateway gateway; - - @Mock - IValidationContext ctx; - - @Mock - SequenceFlow flowOne; - - @Mock - SequenceFlow flowTwo; - - @Mock - SequenceFlow flowThree; - - @Mock - EClass eClass; - - @Mock - EStructuralFeature eFeature; - - List<SequenceFlow> zeroFlows; - - List<SequenceFlow> oneFlow; - - List<SequenceFlow> twoFlows; - - GatewayValidator validator; - - @Before - public void setUp() { - validator = new GatewayValidator(ctx) { - @Override - protected void addStatus(EObject object, String featureName, int severity, String messagePattern, Object... messageArguments) { - // do nothing for test purposes - } - }; - - zeroFlows = new ArrayList<SequenceFlow>(); - - oneFlow = new ArrayList<SequenceFlow>(); - oneFlow.add(flowOne); - - twoFlows = new ArrayList<SequenceFlow>(); - twoFlows.add(flowTwo); - twoFlows.add(flowThree); - - //when(eClass.getEStructuralFeature(anyString())).thenReturn(eFeature); - //when(gateway.eClass()).thenReturn(eClass); - - } - - @Test - public void testConvergingGatewayWrongSequenceCounts() throws Exception { - when(gateway.getGatewayDirection()).thenReturn(GatewayDirection.CONVERGING); - when(gateway.getIncoming()).thenReturn(zeroFlows); - when(gateway.getOutgoing()).thenReturn(twoFlows); - - validator.validate(gateway); - - verify(ctx, times(2)).addResult(Bpmn2Package.eINSTANCE.getGateway_GatewayDirection()); - } -} diff --git a/tests/org.eclipse.bpmn2.modeler.runtime.jboss.jbpm5.tests/.classpath b/tests/org.eclipse.bpmn2.modeler.runtime.jboss.jbpm5.tests/.classpath deleted file mode 100644 index ac0ce276..00000000 --- a/tests/org.eclipse.bpmn2.modeler.runtime.jboss.jbpm5.tests/.classpath +++ /dev/null @@ -1,22 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"> - <attributes> - <attribute name="maven.pomderived" value="true"/> - </attributes> - </classpathentry> - <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> - <classpathentry kind="src" path="src"/> - <classpathentry excluding="**" kind="src" path="widfiles"> - <attributes> - <attribute name="maven.pomderived" value="true"/> - </attributes> - </classpathentry> - <classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER"> - <attributes> - <attribute name="maven.pomderived" value="true"/> - </attributes> - </classpathentry> - <classpathentry kind="src" path="/org.eclipse.bpmn2.modeler.runtime.jboss.jbpm"/> - <classpathentry kind="output" path="target/classes"/> -</classpath> diff --git a/tests/org.eclipse.bpmn2.modeler.runtime.jboss.jbpm5.tests/.project b/tests/org.eclipse.bpmn2.modeler.runtime.jboss.jbpm5.tests/.project deleted file mode 100644 index b1b7bae3..00000000 --- a/tests/org.eclipse.bpmn2.modeler.runtime.jboss.jbpm5.tests/.project +++ /dev/null @@ -1,23 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<projectDescription> - <name>org.eclipse.bpmn2.modeler.runtime.jboss.jbpm5.tests</name> - <comment></comment> - <projects> - </projects> - <buildSpec> - <buildCommand> - <name>org.eclipse.jdt.core.javabuilder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>org.eclipse.m2e.core.maven2Builder</name> - <arguments> - </arguments> - </buildCommand> - </buildSpec> - <natures> - <nature>org.eclipse.jdt.core.javanature</nature> - <nature>org.eclipse.m2e.core.maven2Nature</nature> - </natures> -</projectDescription> diff --git a/tests/org.eclipse.bpmn2.modeler.runtime.jboss.jbpm5.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.bpmn2.modeler.runtime.jboss.jbpm5.tests/META-INF/MANIFEST.MF deleted file mode 100644 index 80c47740..00000000 --- a/tests/org.eclipse.bpmn2.modeler.runtime.jboss.jbpm5.tests/META-INF/MANIFEST.MF +++ /dev/null @@ -1,15 +0,0 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: %pluginName -Bundle-SymbolicName: org.eclipse.bpmn2.modeler.runtime.jboss.jbpm5.tests;singleton:=true -Bundle-Version: 1.5.1.qualifier -Bundle-Vendor: %providerName -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Require-Bundle: org.junit, - org.eclipse.bpmn2.modeler.runtime.jboss.jbpm, - org.eclipse.core.runtime, - org.eclipse.core.resources, - org.eclipse.ui -Bundle-Activator: org.eclipse.bpmn2.modeler.runtime.jboss.jbpm5.tests.Activator -Export-Package: org.eclipse.bpmn2.modeler.runtime.jboss.jbpm5.tests -Bundle-ActivationPolicy: lazy diff --git a/tests/org.eclipse.bpmn2.modeler.runtime.jboss.jbpm5.tests/about.html b/tests/org.eclipse.bpmn2.modeler.runtime.jboss.jbpm5.tests/about.html deleted file mode 100644 index 3408ea2e..00000000 --- a/tests/org.eclipse.bpmn2.modeler.runtime.jboss.jbpm5.tests/about.html +++ /dev/null @@ -1,26 +0,0 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml"><head> -<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"> -<title>About</title> -</head> -<body lang="EN-US"> -<h2>About This Content</h2> - -<p>June 5, 2006</p> -<h3>License</h3> - -<p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise -indicated below, the Content is provided to you under the terms and conditions of the -Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available -at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>. -For purposes of the EPL, "Program" will mean the Content.</p> - -<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is -being redistributed by another party ("Redistributor") and different terms and conditions may -apply to your use of any object code in the Content. Check the Redistributor's license that was -provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise -indicated below, the terms and conditions of the EPL still apply to any source code in the Content -and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p> - - -</body></html>
\ No newline at end of file diff --git a/tests/org.eclipse.bpmn2.modeler.runtime.jboss.jbpm5.tests/build.properties b/tests/org.eclipse.bpmn2.modeler.runtime.jboss.jbpm5.tests/build.properties deleted file mode 100644 index 58dfb941..00000000 --- a/tests/org.eclipse.bpmn2.modeler.runtime.jboss.jbpm5.tests/build.properties +++ /dev/null @@ -1,14 +0,0 @@ -############################################################################### -# Copyright (c) 2011, 2012, 2013, 2014 Red Hat, Inc. -# All rights reserved. -# This program is made available under the terms of the -# Eclipse Public License v1.0 which accompanies this distribution, -# and is available at http://www.eclipse.org/legal/epl-v10.html -# -# Contributors: -# Red Hat, Inc. - initial API and implementation -############################################################################### -source.. = src/ -output.. = bin/ -bin.includes = META-INF/,\ - . diff --git a/tests/org.eclipse.bpmn2.modeler.runtime.jboss.jbpm5.tests/epl-v10.html b/tests/org.eclipse.bpmn2.modeler.runtime.jboss.jbpm5.tests/epl-v10.html deleted file mode 100644 index 63fbca51..00000000 --- a/tests/org.eclipse.bpmn2.modeler.runtime.jboss.jbpm5.tests/epl-v10.html +++ /dev/null @@ -1,261 +0,0 @@ -<?xml version="1.0" encoding="ISO-8859-1" ?> -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml"> - -<head> -<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" /> -<title>Eclipse Public License - Version 1.0</title> -<style type="text/css"> - body { - size: 8.5in 11.0in; - margin: 0.25in 0.5in 0.25in 0.5in; - tab-interval: 0.5in; - } - p { - margin-left: auto; - margin-top: 0.5em; - margin-bottom: 0.5em; - } - p.list { - margin-left: 0.5in; - margin-top: 0.05em; - margin-bottom: 0.05em; - } - </style> - -</head> - -<body lang="EN-US"> - -<h2>Eclipse Public License - v 1.0</h2> - -<p>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE -PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR -DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS -AGREEMENT.</p> - -<p><b>1. DEFINITIONS</b></p> - -<p>"Contribution" means:</p> - -<p class="list">a) in the case of the initial Contributor, the initial -code and documentation distributed under this Agreement, and</p> -<p class="list">b) in the case of each subsequent Contributor:</p> -<p class="list">i) changes to the Program, and</p> -<p class="list">ii) additions to the Program;</p> -<p class="list">where such changes and/or additions to the Program -originate from and are distributed by that particular Contributor. A -Contribution 'originates' from a Contributor if it was added to the -Program by such Contributor itself or anyone acting on such -Contributor's behalf. Contributions do not include additions to the -Program which: (i) are separate modules of software distributed in -conjunction with the Program under their own license agreement, and (ii) -are not derivative works of the Program.</p> - -<p>"Contributor" means any person or entity that distributes -the Program.</p> - -<p>"Licensed Patents" mean patent claims licensable by a -Contributor which are necessarily infringed by the use or sale of its -Contribution alone or when combined with the Program.</p> - -<p>"Program" means the Contributions distributed in accordance -with this Agreement.</p> - -<p>"Recipient" means anyone who receives the Program under -this Agreement, including all Contributors.</p> - -<p><b>2. GRANT OF RIGHTS</b></p> - -<p class="list">a) Subject to the terms of this Agreement, each -Contributor hereby grants Recipient a non-exclusive, worldwide, -royalty-free copyright license to reproduce, prepare derivative works -of, publicly display, publicly perform, distribute and sublicense the -Contribution of such Contributor, if any, and such derivative works, in -source code and object code form.</p> - -<p class="list">b) Subject to the terms of this Agreement, each -Contributor hereby grants Recipient a non-exclusive, worldwide, -royalty-free patent license under Licensed Patents to make, use, sell, -offer to sell, import and otherwise transfer the Contribution of such -Contributor, if any, in source code and object code form. This patent -license shall apply to the combination of the Contribution and the -Program if, at the time the Contribution is added by the Contributor, -such addition of the Contribution causes such combination to be covered -by the Licensed Patents. The patent license shall not apply to any other -combinations which include the Contribution. No hardware per se is -licensed hereunder.</p> - -<p class="list">c) Recipient understands that although each Contributor -grants the licenses to its Contributions set forth herein, no assurances -are provided by any Contributor that the Program does not infringe the -patent or other intellectual property rights of any other entity. Each -Contributor disclaims any liability to Recipient for claims brought by -any other entity based on infringement of intellectual property rights -or otherwise. As a condition to exercising the rights and licenses -granted hereunder, each Recipient hereby assumes sole responsibility to -secure any other intellectual property rights needed, if any. For -example, if a third party patent license is required to allow Recipient -to distribute the Program, it is Recipient's responsibility to acquire -that license before distributing the Program.</p> - -<p class="list">d) Each Contributor represents that to its knowledge it -has sufficient copyright rights in its Contribution, if any, to grant -the copyright license set forth in this Agreement.</p> - -<p><b>3. REQUIREMENTS</b></p> - -<p>A Contributor may choose to distribute the Program in object code -form under its own license agreement, provided that:</p> - -<p class="list">a) it complies with the terms and conditions of this -Agreement; and</p> - -<p class="list">b) its license agreement:</p> - -<p class="list">i) effectively disclaims on behalf of all Contributors -all warranties and conditions, express and implied, including warranties -or conditions of title and non-infringement, and implied warranties or -conditions of merchantability and fitness for a particular purpose;</p> - -<p class="list">ii) effectively excludes on behalf of all Contributors -all liability for damages, including direct, indirect, special, -incidental and consequential damages, such as lost profits;</p> - -<p class="list">iii) states that any provisions which differ from this -Agreement are offered by that Contributor alone and not by any other -party; and</p> - -<p class="list">iv) states that source code for the Program is available -from such Contributor, and informs licensees how to obtain it in a -reasonable manner on or through a medium customarily used for software -exchange.</p> - -<p>When the Program is made available in source code form:</p> - -<p class="list">a) it must be made available under this Agreement; and</p> - -<p class="list">b) a copy of this Agreement must be included with each -copy of the Program.</p> - -<p>Contributors may not remove or alter any copyright notices contained -within the Program.</p> - -<p>Each Contributor must identify itself as the originator of its -Contribution, if any, in a manner that reasonably allows subsequent -Recipients to identify the originator of the Contribution.</p> - -<p><b>4. COMMERCIAL DISTRIBUTION</b></p> - -<p>Commercial distributors of software may accept certain -responsibilities with respect to end users, business partners and the -like. While this license is intended to facilitate the commercial use of -the Program, the Contributor who includes the Program in a commercial -product offering should do so in a manner which does not create -potential liability for other Contributors. Therefore, if a Contributor -includes the Program in a commercial product offering, such Contributor -("Commercial Contributor") hereby agrees to defend and -indemnify every other Contributor ("Indemnified Contributor") -against any losses, damages and costs (collectively "Losses") -arising from claims, lawsuits and other legal actions brought by a third -party against the Indemnified Contributor to the extent caused by the -acts or omissions of such Commercial Contributor in connection with its -distribution of the Program in a commercial product offering. The -obligations in this section do not apply to any claims or Losses -relating to any actual or alleged intellectual property infringement. In -order to qualify, an Indemnified Contributor must: a) promptly notify -the Commercial Contributor in writing of such claim, and b) allow the -Commercial Contributor to control, and cooperate with the Commercial -Contributor in, the defense and any related settlement negotiations. The -Indemnified Contributor may participate in any such claim at its own -expense.</p> - -<p>For example, a Contributor might include the Program in a commercial -product offering, Product X. That Contributor is then a Commercial -Contributor. If that Commercial Contributor then makes performance -claims, or offers warranties related to Product X, those performance -claims and warranties are such Commercial Contributor's responsibility -alone. Under this section, the Commercial Contributor would have to -defend claims against the other Contributors related to those -performance claims and warranties, and if a court requires any other -Contributor to pay any damages as a result, the Commercial Contributor -must pay those damages.</p> - -<p><b>5. NO WARRANTY</b></p> - -<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS -PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS -OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, -ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY -OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely -responsible for determining the appropriateness of using and -distributing the Program and assumes all risks associated with its -exercise of rights under this Agreement , including but not limited to -the risks and costs of program errors, compliance with applicable laws, -damage to or loss of data, programs or equipment, and unavailability or -interruption of operations.</p> - -<p><b>6. DISCLAIMER OF LIABILITY</b></p> - -<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT -NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, -INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING -WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF -LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING -NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR -DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED -HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.</p> - -<p><b>7. GENERAL</b></p> - -<p>If any provision of this Agreement is invalid or unenforceable under -applicable law, it shall not affect the validity or enforceability of -the remainder of the terms of this Agreement, and without further action -by the parties hereto, such provision shall be reformed to the minimum -extent necessary to make such provision valid and enforceable.</p> - -<p>If Recipient institutes patent litigation against any entity -(including a cross-claim or counterclaim in a lawsuit) alleging that the -Program itself (excluding combinations of the Program with other -software or hardware) infringes such Recipient's patent(s), then such -Recipient's rights granted under Section 2(b) shall terminate as of the -date such litigation is filed.</p> - -<p>All Recipient's rights under this Agreement shall terminate if it -fails to comply with any of the material terms or conditions of this -Agreement and does not cure such failure in a reasonable period of time -after becoming aware of such noncompliance. If all Recipient's rights -under this Agreement terminate, Recipient agrees to cease use and -distribution of the Program as soon as reasonably practicable. However, -Recipient's obligations under this Agreement and any licenses granted by -Recipient relating to the Program shall continue and survive.</p> - -<p>Everyone is permitted to copy and distribute copies of this -Agreement, but in order to avoid inconsistency the Agreement is -copyrighted and may only be modified in the following manner. The -Agreement Steward reserves the right to publish new versions (including -revisions) of this Agreement from time to time. No one other than the -Agreement Steward has the right to modify this Agreement. The Eclipse -Foundation is the initial Agreement Steward. The Eclipse Foundation may -assign the responsibility to serve as the Agreement Steward to a -suitable separate entity. Each new version of the Agreement will be -given a distinguishing version number. The Program (including -Contributions) may always be distributed subject to the version of the -Agreement under which it was received. In addition, after a new version -of the Agreement is published, Contributor may elect to distribute the -Program (including its Contributions) under the new version. Except as -expressly stated in Sections 2(a) and 2(b) above, Recipient receives no -rights or licenses to the intellectual property of any Contributor under -this Agreement, whether expressly, by implication, estoppel or -otherwise. All rights in the Program not expressly granted under this -Agreement are reserved.</p> - -<p>This Agreement is governed by the laws of the State of New York and -the intellectual property laws of the United States of America. No party -to this Agreement will bring a legal action under this Agreement more -than one year after the cause of action arose. Each party waives its -rights to a jury trial in any resulting litigation.</p> - -</body> - -</html>
\ No newline at end of file diff --git a/tests/org.eclipse.bpmn2.modeler.runtime.jboss.jbpm5.tests/plugin.properties b/tests/org.eclipse.bpmn2.modeler.runtime.jboss.jbpm5.tests/plugin.properties deleted file mode 100644 index 13786e52..00000000 --- a/tests/org.eclipse.bpmn2.modeler.runtime.jboss.jbpm5.tests/plugin.properties +++ /dev/null @@ -1,16 +0,0 @@ -# <copyright> -############################################################################### -# Copyright (c) 2011, 2012, 2013, 2014 Red Hat, Inc. -# All rights reserved. -# This program is made available under the terms of the -# Eclipse Public License v1.0 which accompanies this distribution, -# and is available at http://www.eclipse.org/legal/epl-v10.html -# -# Contributors: -# Red Hat, Inc. - initial API and implementation -############################################################################### -# </copyright> -# -# $Id$ -pluginName = Tests for BPMN2 Modeler Runtime extensions for JBoss jBPM -providerName = Eclipse.org diff --git a/tests/org.eclipse.bpmn2.modeler.runtime.jboss.jbpm5.tests/pom.xml b/tests/org.eclipse.bpmn2.modeler.runtime.jboss.jbpm5.tests/pom.xml deleted file mode 100644 index 86b40fe6..00000000 --- a/tests/org.eclipse.bpmn2.modeler.runtime.jboss.jbpm5.tests/pom.xml +++ /dev/null @@ -1,15 +0,0 @@ -<project - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" - xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.eclipse.bpmn2.modeler.tests</groupId> - <artifactId>tests-parent</artifactId> - <version>1.5.1-SNAPSHOT</version> - </parent> - - <artifactId>org.eclipse.bpmn2.modeler.runtime.jboss.jbpm5.tests</artifactId> - <name>BPMN2 Modeler Tests: Runtime JBPM5 Tests</name> - <packaging>eclipse-test-plugin</packaging> -</project> - diff --git a/tests/org.eclipse.bpmn2.modeler.runtime.jboss.jbpm5.tests/src/org/eclipse/bpmn2/modeler/runtime/jboss/jbpm5/tests/Activator.java b/tests/org.eclipse.bpmn2.modeler.runtime.jboss.jbpm5.tests/src/org/eclipse/bpmn2/modeler/runtime/jboss/jbpm5/tests/Activator.java deleted file mode 100644 index d60410c0..00000000 --- a/tests/org.eclipse.bpmn2.modeler.runtime.jboss.jbpm5.tests/src/org/eclipse/bpmn2/modeler/runtime/jboss/jbpm5/tests/Activator.java +++ /dev/null @@ -1,87 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2011, 2012 Red Hat, Inc. - * All rights reserved. - * This program is made available under the terms of the - * Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Red Hat, Inc. - initial API and implementation - * - * @author Bob Brodt - ******************************************************************************/ -package org.eclipse.bpmn2.modeler.runtime.jboss.jbpm5.tests; - -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.Platform; -import org.eclipse.core.runtime.Status; -import org.eclipse.jface.dialogs.ErrorDialog; -import org.eclipse.ui.PlatformUI; -import org.eclipse.ui.plugin.AbstractUIPlugin; -import org.osgi.framework.BundleContext; - -/** - * The activator class controls the plug-in life cycle - */ -public class Activator extends AbstractUIPlugin { - - // The plug-in ID - public static final String PLUGIN_ID = "org.eclipse.bpmn2.modeler.runtime.jboss.jbpm5.tests"; //$NON-NLS-1$ - - // The shared instance - private static Activator plugin; - - /** - * The constructor - */ - public Activator() { - } - - /* - * (non-Javadoc) - * - * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext) - */ - public void start(BundleContext context) throws Exception { - super.start(context); - plugin = this; - } - - /* - * (non-Javadoc) - * - * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext) - */ - public void stop(BundleContext context) throws Exception { - plugin = null; - super.stop(context); - } - - /** - * Returns the shared instance - * - * @return the shared instance - */ - public static Activator getDefault() { - return plugin; - } - - public static void logStatus(IStatus status) { - Platform.getLog(plugin.getBundle()).log(status); - } - - public static void logError(Exception e) { - logStatus(createStatus(e)); - } - - private static Status createStatus(Exception e) { - return new Status(IStatus.ERROR, Activator.PLUGIN_ID, e.getMessage(), e); - } - - public static void showErrorWithLogging(Exception e){ - Status s = createStatus(e); - logStatus(s); - ErrorDialog.openError(PlatformUI.getWorkbench().getDisplay().getActiveShell(), "An error occured", null, s); - } - -} diff --git a/tests/org.eclipse.bpmn2.modeler.runtime.jboss.jbpm5.tests/src/org/eclipse/bpmn2/modeler/runtime/jboss/jbpm5/tests/AllTests.java b/tests/org.eclipse.bpmn2.modeler.runtime.jboss.jbpm5.tests/src/org/eclipse/bpmn2/modeler/runtime/jboss/jbpm5/tests/AllTests.java deleted file mode 100644 index 5ae1e69c..00000000 --- a/tests/org.eclipse.bpmn2.modeler.runtime.jboss.jbpm5.tests/src/org/eclipse/bpmn2/modeler/runtime/jboss/jbpm5/tests/AllTests.java +++ /dev/null @@ -1,21 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2011, 2012 Red Hat, Inc. - * All rights reserved. - * This program is made available under the terms of the - * Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Red Hat, Inc. - initial API and implementation - ******************************************************************************/ -package org.eclipse.bpmn2.modeler.runtime.jboss.jbpm5.tests; - -import org.junit.runner.RunWith; -import org.junit.runners.Suite; -import org.junit.runners.Suite.SuiteClasses; - -@RunWith(Suite.class) -@SuiteClasses({ TestWIDHandler.class }) -public class AllTests { - -} diff --git a/tests/org.eclipse.bpmn2.modeler.runtime.jboss.jbpm5.tests/src/org/eclipse/bpmn2/modeler/runtime/jboss/jbpm5/tests/TestWIDHandler.java b/tests/org.eclipse.bpmn2.modeler.runtime.jboss.jbpm5.tests/src/org/eclipse/bpmn2/modeler/runtime/jboss/jbpm5/tests/TestWIDHandler.java deleted file mode 100644 index e0097b18..00000000 --- a/tests/org.eclipse.bpmn2.modeler.runtime.jboss.jbpm5.tests/src/org/eclipse/bpmn2/modeler/runtime/jboss/jbpm5/tests/TestWIDHandler.java +++ /dev/null @@ -1,141 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2011, 2012 Red Hat, Inc. - * All rights reserved. - * This program is made available under the terms of the - * Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Red Hat, Inc. - initial API and implementation - ******************************************************************************/ -package org.eclipse.bpmn2.modeler.runtime.jboss.jbpm5.tests; - -import java.io.File; -import java.io.FileInputStream; -import java.io.FileNotFoundException; -import java.io.IOException; -import java.net.URISyntaxException; -import java.net.URL; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; -import java.util.Scanner; - -import org.eclipse.bpmn2.modeler.runtime.jboss.jbpm5.wid.WIDException; -import org.eclipse.bpmn2.modeler.runtime.jboss.jbpm5.wid.WIDParser; -import org.eclipse.bpmn2.modeler.runtime.jboss.jbpm5.wid.WorkItemDefinition; -import org.eclipse.core.runtime.FileLocator; -import org.eclipse.core.runtime.IPath; -import org.eclipse.core.runtime.Path; -import org.junit.Assert; -import org.junit.Test; -import org.osgi.framework.Bundle; - - -/** - * Basic tests for the WIDHandler - * @author bfitzpat - * - */ -public class TestWIDHandler { - - private String getWidFile( String filepath ) { - Bundle bundle = Activator.getDefault().getBundle(); - IPath path = new Path("widfiles/"+filepath); - URL setupUrl = FileLocator.find(bundle, path, Collections.EMPTY_MAP); - File setupFile = null; - try { - setupFile = new File(FileLocator.toFileURL(setupUrl).toURI()); - } catch (URISyntaxException e1) { - // TODO Auto-generated catch block - e1.printStackTrace(); - } catch (IOException e1) { - // TODO Auto-generated catch block - e1.printStackTrace(); - } - filepath = setupFile.getAbsolutePath(); - - StringBuilder text = new StringBuilder(); - String NL = System.getProperty("line.separator"); - Scanner scanner = null; - try { - scanner = new Scanner(new FileInputStream(filepath), "UTF-8"); - while (scanner.hasNextLine()){ - text.append(scanner.nextLine() + NL); - } - return text.toString(); - } catch (FileNotFoundException e) { - e.printStackTrace(); - } finally { - if (scanner != null) - scanner.close(); - } - return null; - } - - @Test - public void testBasic() { - System.out.println("testBasic: logemail.wid"); - String content = getWidFile("logemail.wid"); - List<WorkItemDefinition> widMap = new ArrayList<WorkItemDefinition>(); - try { - widMap = WIDParser.parse(content); - } catch (WIDException e) { - Assert.fail("Failed with exception " + e.getMessage()); - } - Assert.assertTrue(!widMap.isEmpty()); - java.util.Iterator<WorkItemDefinition> widIterator = widMap.iterator(); - while(widIterator.hasNext()) - System.out.println(widIterator.next().toString()); - } - - @Test - public void testComplex() { - System.out.println("testComplex: widfiles/Email.wid"); - String content = getWidFile("Email.wid"); - List<WorkItemDefinition> widMap = new ArrayList<WorkItemDefinition>(); - try { - widMap = WIDParser.parse(content); - } catch (WIDException e) { - Assert.fail("Failed with exception " + e.getMessage()); - } - Assert.assertTrue(!widMap.isEmpty()); - java.util.Iterator<WorkItemDefinition> widIterator = widMap.iterator(); - while(widIterator.hasNext()) { - WorkItemDefinition wid = widIterator.next(); - Assert.assertTrue(wid.getEclipseCustomEditor() != null && - wid.getEclipseCustomEditor().trim().length() > 0); - System.out.println(wid.toString()); - }; - } - - @Test - public void testResults() { - System.out.println("testResults: widfiles/java.wid"); - String content = getWidFile("java.wid"); - List<WorkItemDefinition> widMap = new ArrayList<WorkItemDefinition>(); - try { - widMap = WIDParser.parse(content); - } catch (WIDException e) { - Assert.fail("Failed with exception " + e.getMessage()); - } - Assert.assertTrue(!widMap.isEmpty()); - java.util.Iterator<WorkItemDefinition> widIterator = widMap.iterator(); - while(widIterator.hasNext()) { - WorkItemDefinition wid = widIterator.next(); - Assert.assertTrue(!wid.getResults().isEmpty()); - System.out.println(wid.toString()); - } - } - - @Test - public void testFail() { - System.out.println("testFail: no wid"); - List<WorkItemDefinition> widMap = new ArrayList<WorkItemDefinition>(); - try { - widMap = WIDParser.parse(null); - } catch (WIDException e) { - Assert.assertTrue(e != null); - } - } -} diff --git a/tests/org.eclipse.bpmn2.modeler.runtime.jboss.jbpm5.tests/widfiles/Email.wid b/tests/org.eclipse.bpmn2.modeler.runtime.jboss.jbpm5.tests/widfiles/Email.wid deleted file mode 100644 index a4e47662..00000000 --- a/tests/org.eclipse.bpmn2.modeler.runtime.jboss.jbpm5.tests/widfiles/Email.wid +++ /dev/null @@ -1,25 +0,0 @@ -import org.drools.process.core.datatype.impl.type.StringDataType; -[ - [ - "name" : "Email WID", - "description" : "Sending emails", - "version" : "1.0", - "parameters" : [ - "From" : new StringDataType(), - "To" : new StringDataType(), - "Subject" : new StringDataType(), - "Body" : new StringDataType() - ], - "displayName" : "Email (WID) Task", - "icon" : "email.gif", - "eclipse:customEditor" : "org.drools.eclipse.flow.common.editor.editpart.work.EmailCustomEditor", - "category" : "Communication", - "defaultHandler" : "org.jbpm.process.workitem.email.EmailWorkItemHandler", - "documentation" : "index.html", - "dependencies" : [ - "file:./lib/jbpm-email.jar", - "file:./lib/mail-1.4.jar", - "file:./lib/activation-1.1.jar" - ] - ] -] diff --git a/tests/org.eclipse.bpmn2.modeler.runtime.jboss.jbpm5.tests/widfiles/Twitter.wid b/tests/org.eclipse.bpmn2.modeler.runtime.jboss.jbpm5.tests/widfiles/Twitter.wid deleted file mode 100644 index 113006d6..00000000 --- a/tests/org.eclipse.bpmn2.modeler.runtime.jboss.jbpm5.tests/widfiles/Twitter.wid +++ /dev/null @@ -1,24 +0,0 @@ -import org.drools.process.core.datatype.impl.type.StringDataType; - -[ - - [ - "name" : "Twitter WID", - "description" : "Send a twitter message", - "version" : "1.0", - "parameters" : [ - "Message" : new StringDataType() - ], - "displayName" : "Twitter (WID) Task", - "icon" : "twitter.gif", - "category" : "Communication", - "eclipse:customEditor" : "org.drools.eclipse.flow.common.editor.editpart.work.SampleCustomEditor", - "defaultHandler" : "org.jbpm.process.workitem.twitter.TwitterHandler", - "documentation" : "index.html", - "dependencies" : [ - "file:./lib/jbpm-twitter.jar", - "file:./lib/twitter4j-core-2.2.2.jar" - ] - ] - -] diff --git a/tests/org.eclipse.bpmn2.modeler.runtime.jboss.jbpm5.tests/widfiles/java.wid b/tests/org.eclipse.bpmn2.modeler.runtime.jboss.jbpm5.tests/widfiles/java.wid deleted file mode 100644 index 893f6086..00000000 --- a/tests/org.eclipse.bpmn2.modeler.runtime.jboss.jbpm5.tests/widfiles/java.wid +++ /dev/null @@ -1,19 +0,0 @@ -import org.drools.process.core.datatype.impl.type.StringDataType; -[ - - [ - "name" : "Java", - "parameters" : [ - "Class" : new StringDataType(), - "Method" : new StringDataType(), - "Object" : new ObjectDataType(), - "ParameterTypes" : new ListDataType(new StringDataType()), - "Parameters" : new ListDataType(new ObjectDataType()) - ], - "results" : [ - "Result" : new ObjectDataType() - ] - "displayName" : "Java", - "customEditor" : "org.drools.eclipse.flow.common.editor.editpart.work.SampleCustomEditor" - ] -]
\ No newline at end of file diff --git a/tests/org.eclipse.bpmn2.modeler.runtime.jboss.jbpm5.tests/widfiles/logemail.wid b/tests/org.eclipse.bpmn2.modeler.runtime.jboss.jbpm5.tests/widfiles/logemail.wid deleted file mode 100644 index c373a6ab..00000000 --- a/tests/org.eclipse.bpmn2.modeler.runtime.jboss.jbpm5.tests/widfiles/logemail.wid +++ /dev/null @@ -1,29 +0,0 @@ -import org.drools.process.core.datatype.impl.type.StringDataType; -[ - - [ - "name" : "SimpleEmail", - "parameters" : [ - "From" : new StringDataType(), - "To" : new StringDataType(), - "Subject" : new StringDataType(), - "Body" : new StringDataType() - ], - "displayName" : "Simple Email", - "icon" : "icons/import_statement.gif", - "customEditor" : -"org.drools.eclipse.flow.common.editor.editpart.work.EmailCustomEditor" - ], - - [ - "name" : "Log", - "parameters" : [ - "Message" : new StringDataType() - ], - "displayName" : "Log", - "icon" : "icons/open.gif", - "customEditor" : -"org.drools.eclipse.flow.common.editor.editpart.work.SampleCustomEditor" - ] - -]
\ No newline at end of file diff --git a/tests/pom.xml b/tests/pom.xml deleted file mode 100644 index cfdd5807..00000000 --- a/tests/pom.xml +++ /dev/null @@ -1,28 +0,0 @@ -<project -xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.eclipse.bpmn2.modeler</groupId> - <artifactId>org.eclipse.bpmn2.modeler.parent</artifactId> - <version>1.5.1-SNAPSHOT</version> - <relativePath>../parent/pom.xml</relativePath> - </parent> - - <groupId>org.eclipse.bpmn2.modeler.tests</groupId> - <artifactId>tests-parent</artifactId> - <name>BPMN2 Modeler: Tests Parent</name> - <packaging>pom</packaging> - - <dependencies> - <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-all</artifactId> - <version>1.9.5</version> - </dependency> - </dependencies> - - <modules> - <module>org.eclipse.bpmn2.modeler.runtime.jboss.jbpm5.tests</module> - <module>org.eclipse.bpmn2.modeler.core.tests</module> - </modules> -</project> |