Merge branch '3620' into 'master'

3620

See merge request !46

org.fortiss.tooling.graphicsGL/plugin.xml

-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<!-- (c) 2012 fortiss GmbH -->
-
-<plugin>
-   <extension point="org.eclipse.emf.ecore.generated_package">
-      <package
-            class="org.fortiss.tooling.graphicsGL.model.ToolingGraphics3DPackage"
-            genModel="model/graphics3D.genmodel"
-            uri="http://www.fortiss.org/tooling/graphics3D"/>
-   </extension>
-
-   <extension point="org.eclipse.emf.ecore.generated_package">
-      <!-- @generated graphics3D -->
-      <package
-            uri="http://www.fortiss.org/tooling/graphics3D/graph"
-            class="org.fortiss.tooling.graphicsGL.model.graph.GraphPackage"/>
-   </extension>
-
-   <extension point="org.eclipse.emf.ecore.generated_package">
-      <!-- @generated graphics3D -->
-      <package
-            uri="http://www.fortiss.org/tooling/graphics3D/mesh"
-            class="org.fortiss.tooling.graphicsGL.model.mesh.MeshPackage"/>
-   </extension>
-
-   <extension point="org.eclipse.emf.ecore.generated_package">
-      <!-- @generated graphics3D -->
-      <package
-            uri="http://www.fortiss.org/tooling/graphics3D/scene"
-            class="org.fortiss.tooling.graphicsGL.model.scene.ScenePackage"/>
-   </extension>
-</plugin>
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.0"?>
+<!-- (c) 2012 fortiss GmbH -->
+
+<plugin>
+   <extension point="org.eclipse.emf.ecore.generated_package">
+      <package
+            class="org.fortiss.tooling.graphicsGL.model.ToolingGraphics3DPackage"
+            genModel="model/graphics3D.genmodel"
+            uri="http://www.fortiss.org/tooling/graphics3D"/>
+   </extension>
+
+   <extension point="org.eclipse.emf.ecore.generated_package">
+      <!-- @generated graphics3D -->
+      <package
+            uri="http://www.fortiss.org/tooling/graphics3D/graph"
+            class="org.fortiss.tooling.graphicsGL.model.graph.GraphPackage"
+            genModel="model/graphics3D.genmodel"/>
+   </extension>
+
+   <extension point="org.eclipse.emf.ecore.generated_package">
+      <!-- @generated graphics3D -->
+      <package
+            uri="http://www.fortiss.org/tooling/graphics3D/mesh"
+            class="org.fortiss.tooling.graphicsGL.model.mesh.MeshPackage"
+            genModel="model/graphics3D.genmodel"/>
+   </extension>
+
+   <extension point="org.eclipse.emf.ecore.generated_package">
+      <!-- @generated graphics3D -->
+      <package
+            uri="http://www.fortiss.org/tooling/graphics3D/scene"
+            class="org.fortiss.tooling.graphicsGL.model.scene.ScenePackage"
+            genModel="model/graphics3D.genmodel"/>
+   </extension>
+</plugin>

org.fortiss.tooling.kernel.ui/.classpath

 <?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.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
+		<attributes>
+			<attribute name="module" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="build"/>

org.fortiss.tooling.kernel.ui/.project

@@ -20,21 +20,6 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
-		<buildCommand>
-			<name>org.fortiss.ide.dev_tools.warnings.RemoveWarningsBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.fortiss.ide.dev_tools.warnings.GuidelinesChecker</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.m2e.core.maven2Builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
 		<buildCommand>
 			<name>org.eclipse.systemfocus.tooling.codereview.builder.CodeReviewBuilder</name>
 			<arguments>
@@ -52,7 +37,6 @@
 		</buildCommand>
 	</buildSpec>
 	<natures>
-		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>org.eclipse.systemfocus.tooling.codereview.nature.CodeReviewNature</nature>

org.fortiss.tooling.kernel.ui/META-INF/MANIFEST.MF

@@ -10,7 +10,7 @@ Require-Bundle: org.fortiss.tooling.common.ui;bundle-version="2.14.0";visibility
  org.eclipse.emf.databinding;visibility:=reexport,
  org.eclipse.core.databinding.property;visibility:=reexport
 Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Bundle-Vendor: fortiss GmbH
 Export-Package: org.fortiss.tooling.kernel.ui,
  org.fortiss.tooling.kernel.ui.databinding,

org.fortiss.tooling.kernel/.classpath

 <?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.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
+		<attributes>
+			<attribute name="module" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="generated-src"/>
 	<classpathentry kind="src" path="src"/>

org.fortiss.tooling.kernel/.project

@@ -5,11 +5,6 @@
 	<projects>
 	</projects>
 	<buildSpec>
-		<buildCommand>
-			<name>org.fortiss.ide.dev_tools.emf.builder.EcoreBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
 		<buildCommand>
 			<name>org.eclipse.systemfocus.tooling.emfgeneration.git.EcoreBuilderGIT</name>
 			<arguments>
@@ -30,21 +25,6 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
-		<buildCommand>
-			<name>org.fortiss.ide.dev_tools.warnings.RemoveWarningsBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.fortiss.ide.dev_tools.warnings.GuidelinesChecker</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.m2e.core.maven2Builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
 		<buildCommand>
 			<name>org.eclipse.systemfocus.tooling.codereview.builder.CodeReviewBuilder</name>
 			<arguments>
@@ -62,7 +42,6 @@
 		</buildCommand>
 	</buildSpec>
 	<natures>
-		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>org.eclipse.systemfocus.tooling.codereview.nature.CodeReviewNature</nature>

org.fortiss.tooling.kernel/META-INF/MANIFEST.MF

-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.fortiss.tooling.kernel;singleton:=true
-Bundle-Version: 2.14.0.qualifier
-Bundle-ClassPath: .
-Bundle-Activator: org.fortiss.tooling.kernel.ToolingKernelActivator
-Bundle-Vendor: %providerName
-Bundle-Localization: plugin
-Require-Bundle: org.fortiss.tooling.common;visibility:=reexport;bundle-version="2.14.0",
- org.eclipse.core.runtime,
- org.eclipse.emf.ecore;visibility:=reexport;bundle-version="2.7.0",
- org.eclipse.emf.transaction;visibility:=reexport;bundle-version="1.4.0",
- org.eclipse.emf.ecore.xmi;visibility:=reexport;bundle-version="2.7.0"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Bundle-ActivationPolicy: lazy
-Export-Package: org.fortiss.tooling.kernel;uses:="org.eclipse.core.runtime,  org.osgi.framework",
- org.fortiss.tooling.kernel.constraint,
- org.fortiss.tooling.kernel.extension,
- org.fortiss.tooling.kernel.extension.base,
- org.fortiss.tooling.kernel.extension.data,
- org.fortiss.tooling.kernel.extension.exception,
- org.fortiss.tooling.kernel.introspection,
- org.fortiss.tooling.kernel.introspection.items,
- org.fortiss.tooling.kernel.model;uses:=org.eclipse.emf.ecore,
- org.fortiss.tooling.kernel.model.constraints,
- org.fortiss.tooling.kernel.model.constraints.impl,
- org.fortiss.tooling.kernel.model.constraints.util,
- org.fortiss.tooling.kernel.model.impl;uses:=org.fortiss.tooling.kernel.model,
- org.fortiss.tooling.kernel.model.util;uses:="org.eclipse.emf.ecore,  org.fortiss.tooling.kernel.model,  org.eclipse.emf.common.notify.impl,  org.eclipse.emf.common.notify",
- org.fortiss.tooling.kernel.service;uses:="org.eclipse.core.runtime,  org.eclipse.emf.ecore,  org.fortiss.tooling.kernel.interfaces,  org.conqat.lib.commons.collections",
- org.fortiss.tooling.kernel.service.base,
- org.fortiss.tooling.kernel.service.listener,
- org.fortiss.tooling.kernel.service.types,
- org.fortiss.tooling.kernel.utils;uses:="org.eclipse.emf.ecore,  org.eclipse.core.resources"
-Automatic-Module-Name: org.fortiss.tooling.kernel
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %pluginName
+Bundle-SymbolicName: org.fortiss.tooling.kernel;singleton:=true
+Bundle-Version: 2.14.0.qualifier
+Bundle-ClassPath: .
+Bundle-Activator: org.fortiss.tooling.kernel.ToolingKernelActivator
+Bundle-Vendor: %providerName
+Bundle-Localization: plugin
+Require-Bundle: org.fortiss.tooling.common;visibility:=reexport;bundle-version="2.14.0",
+ org.eclipse.core.runtime,
+ org.eclipse.emf.ecore;visibility:=reexport;bundle-version="2.7.0",
+ org.eclipse.emf.transaction;visibility:=reexport;bundle-version="1.4.0",
+ org.eclipse.emf.ecore.xmi;visibility:=reexport;bundle-version="2.7.0"
+Bundle-RequiredExecutionEnvironment: JavaSE-11
+Bundle-ActivationPolicy: lazy
+Export-Package: org.fortiss.tooling.kernel;uses:="org.eclipse.core.runtime,
+   org.osgi.framework",
+ org.fortiss.tooling.kernel.constraint,
+ org.fortiss.tooling.kernel.extension,
+ org.fortiss.tooling.kernel.extension.base,
+ org.fortiss.tooling.kernel.extension.data,
+ org.fortiss.tooling.kernel.extension.exception,
+ org.fortiss.tooling.kernel.introspection,
+ org.fortiss.tooling.kernel.introspection.items,
+ org.fortiss.tooling.kernel.model;uses:=org.eclipse.emf.ecore,
+ org.fortiss.tooling.kernel.model.constraints,
+ org.fortiss.tooling.kernel.model.constraints.impl,
+ org.fortiss.tooling.kernel.model.constraints.util,
+ org.fortiss.tooling.kernel.model.impl;uses:=org.fortiss.tooling.kernel.model,
+ org.fortiss.tooling.kernel.model.util;uses:="org.eclipse.emf.ecore,
+   org.fortiss.tooling.kernel.model,
+   org.eclipse.emf.common.notify.impl,
+   org.eclipse.emf.common.notify",
+ org.fortiss.tooling.kernel.service;uses:="org.eclipse.core.runtime,
+   org.eclipse.emf.ecore,
+   org.fortiss.tooling.kernel.interfaces,
+   org.conqat.lib.commons.collections",
+ org.fortiss.tooling.kernel.service.base,
+ org.fortiss.tooling.kernel.service.listener,
+ org.fortiss.tooling.kernel.service.types,
+ org.fortiss.tooling.kernel.utils;uses:="org.eclipse.emf.ecore,
+   org.eclipse.core.resources"
+Automatic-Module-Name: org.fortiss.tooling.kernel

org.fortiss.tooling.kernel/src/org/fortiss/tooling/kernel/extension/base/.ratings

@@ -5,6 +5,6 @@ DialogMessage.java 8420640e999e4fb15fa644333e5d71e1d16c2559 GREEN
 ElementCompositorBase.java 7a445e5adde11878fe0515baca8b915287149b28 GREEN
 MultiViolationConstraintCheckerBase.java 30886a94c99cf8948f64401b1db821abe06e1e6c GREEN
 PrototypeProviderBase.java ebcd1794c3798b9899a620b01fd5aa0402129423 GREEN
-RemoveDeprecatedArtifactsMigrationProviderBase.java 3fdbcadf1d42a27d88952290a71e8bfe1450b946 GREEN
+RemoveDeprecatedArtifactsMigrationProviderBase.java 4a1b676223b7ec53259a26d1a671b11ff2f911e2 GREEN
 TransformationContextChainBase.java 1ef37880ab275778c563928e80ba378fec964cb6 GREEN
 TransformationProviderBase.java 9e91100cc1f2c8fbd8d41af55aedfea34e02ff71 GREEN

org.fortiss.tooling.kernel/src/org/fortiss/tooling/kernel/extension/base/RemoveDeprecatedArtifactsMigrationProviderBase.java

@@ -50,11 +50,11 @@ public abstract class RemoveDeprecatedArtifactsMigrationProviderBase implements
 	protected abstract Collection<Class<? extends EObject>> getDeprecatedRootArtifacts();
 
 	/** Returns the {@link Stream} of deprecated model elements to be removed. */
-	@SuppressWarnings("unchecked")
 	private Stream<EObject> getDeprecatedModelElements(ITopLevelElement modelElement) {
 		Stream<EObject> root = asStream(modelElement.getRootModelElement().eAllContents());
+		Collection<Class<? extends EObject>> deprArtifacts = getDeprecatedArtifacts();
 		return root.filter(
-				e -> isInstanceOfAny(e, (Class<EObject>[])getDeprecatedArtifacts().toArray()));
+				e -> isInstanceOfAny(e, deprArtifacts.toArray(new Class[deprArtifacts.size()])));
 	}
 
 	/** {@inheritDoc} */

org.fortiss.tooling.kernel/src/org/fortiss/tooling/kernel/utils/.ratings

@@ -11,5 +11,5 @@ KernelModelElementUtils.java 56c86fe9afb23053f50d7279809afd2a5bb10eba GREEN
 LoggingUtils.java 0e0aa5d466d80ea29cfc7e91178b23a5cdd4ddf7 GREEN
 PrototypesUtils.java ec75bed75cfc5103f1f38e3a29df86f729428775 GREEN
 ResourceUtils.java 698c7db34acb4f1a258a1953e6afcca9823763a8 GREEN
-TransformationUtils.java 495891fae79b99c103cf61f607792dd1e48a5307 GREEN
+TransformationUtils.java 552d3a9d56d34450be781af828efe0b8aa5d359e GREEN
 UniqueIDUtils.java 665955b1790c1bd1c2087e23114da920bfec2265 GREEN

org.fortiss.tooling.kernel/src/org/fortiss/tooling/kernel/utils/TransformationUtils.java

@@ -15,6 +15,8 @@
 +--------------------------------------------------------------------------*/
 package org.fortiss.tooling.kernel.utils;
 
+import static org.eclipse.core.runtime.Assert.isNotNull;
+
 import java.util.List;
 
 import org.eclipse.emf.ecore.EObject;
@@ -45,31 +47,28 @@ public final class TransformationUtils {
 	 *             if no transformation chain could be found or none of the
 	 *             possible chains succeeded.
 	 */
-	@SuppressWarnings("unchecked")
 	public static <T extends Object> T createTransformedObjectFor(final EObject sourceElement,
 			final Class<T> targetClass, ITransformationContext context)
 			throws ChainTransformationFailedException {
 		List<TransformationProviderChain> chainList = ITransformationService.getInstance()
 				.getTransformationProviderChain(sourceElement.getClass(), targetClass, context);
-		ChainTransformationFailedException e = null;
 		if(!chainList.isEmpty()) {
-			Object executableObject = null;
 			for(TransformationProviderChain chain : chainList) {
 				try {
-					// For the moment, we use the first chain.
+					// For the moment, we use the first chain that successfully completes.
 					// Alternatives need an interpretation of the context, which
 					// we do not use at the moment.
-					executableObject = chain.transform(sourceElement, context);
-					e = null;
-					break;
+					@SuppressWarnings("unchecked") T executableObject =
+							(T)chain.transform(sourceElement, context);
+					isNotNull(executableObject, "The resulting object of the transformation" +
+							" of the object " + sourceElement + " to " +
+							targetClass.getSimpleName() + "is null, but did not fail. Please" +
+							" ensure correct operation of all involved TransformationProviders.");
+					return executableObject;
 				} catch(ChainTransformationFailedException ctfe) {
 					// fall through
-					e = ctfe;
 				}
 			}
-			if(e == null && executableObject != null) {
-				return (T)executableObject;
-			}
 		}
 		throw new NoTransformationChainFound(sourceElement, targetClass);
 	}

org.fortiss.tooling.spiderchart.ui/.classpath

 <?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.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
+		<attributes>
+			<attribute name="module" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="src" path="test-src"/>

org.fortiss.tooling.spiderchart.ui/.project

@@ -20,21 +20,6 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
-		<buildCommand>
-			<name>org.fortiss.ide.dev_tools.warnings.RemoveWarningsBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.fortiss.ide.dev_tools.warnings.GuidelinesChecker</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.m2e.core.maven2Builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
 		<buildCommand>
 			<name>org.eclipse.systemfocus.tooling.codereview.builder.CodeReviewBuilder</name>
 			<arguments>
@@ -52,7 +37,6 @@
 		</buildCommand>
 	</buildSpec>
 	<natures>
-		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>org.eclipse.systemfocus.tooling.codereview.nature.CodeReviewNature</nature>

org.fortiss.tooling.spiderchart.ui/META-INF/MANIFEST.MF

@@ -4,7 +4,7 @@ Bundle-Name: Spider Chart
 Bundle-SymbolicName: org.fortiss.tooling.spiderchart.ui
 Bundle-Version: 2.14.0.qualifier
 Bundle-Vendor: fortiss GmbH
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Bundle-Developer: Amit Kumar Mondal (admin@amitinside.com)
 Github-Project-Url: https://github.com/amitjoy/Spider-Chart-SWT.git 
 Export-Package: org.fortiss.tooling.spiderchart.model,

pom.xml

+<project xmlns="http://maven.apache.org/POM/4.0.0"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
+  http://maven.apache.org/maven-v4_0_0.xsd">
+
+  <modelVersion>4.0.0</modelVersion>
+  <artifactId>org.fortiss.tooling.bundles</artifactId>
+  <packaging>pom</packaging>
+
+  <parent>
+    <groupId>org.fortiss.af3.bundle</groupId>
+    <artifactId>org.fortiss.af3.bundle.parent</artifactId>
+    <version>1.0.0-SNAPSHOT</version>
+    <relativePath>../pom-bundle-parent.xml</relativePath>
+  </parent>
+
+</project>
\ No newline at end of file