diff --git a/.gitignore b/.gitignore
index e27b74d27706ebd71f8c63556436515ae07240f3..763bc5ded238b70af005ecfed5fca311895d1e0a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,8 @@
-/*/bin/
-/*/build/
-/*/generated-src/
+/*/bin/
+/*/build/
+/*/generated-src/
+/*/target/
+/target/
+*.rej
+.DS_Store
+._.DS_Store
diff --git a/org.fortiss.tooling.base.ui/.classpath b/org.fortiss.tooling.base.ui/.classpath
index 12c742aacd1101b77e4bc40ea39978688b27881e..f3432614cab791d8777072527d4bfe02afb4eef9 100644
--- a/org.fortiss.tooling.base.ui/.classpath
+++ b/org.fortiss.tooling.base.ui/.classpath
@@ -1,6 +1,10 @@
<?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"/>
diff --git a/org.fortiss.tooling.base.ui/.project b/org.fortiss.tooling.base.ui/.project
index 184b901317190b167ea5c7ecd1d70abc698053b3..55dd568b47b9eaa5e6e400842feff49c4e1f9f9e 100644
--- a/org.fortiss.tooling.base.ui/.project
+++ b/org.fortiss.tooling.base.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>
diff --git a/org.fortiss.tooling.base.ui/META-INF/MANIFEST.MF b/org.fortiss.tooling.base.ui/META-INF/MANIFEST.MF
index e7108c82a4fdc073a777578f0329f3db93bb9a77..f72072fb48ab7f8b80340d9f4ea00ddbf1bf1681 100644
--- a/org.fortiss.tooling.base.ui/META-INF/MANIFEST.MF
+++ b/org.fortiss.tooling.base.ui/META-INF/MANIFEST.MF
@@ -8,7 +8,7 @@ Require-Bundle: org.fortiss.tooling.base;bundle-version="2.14.0";visibility:=ree
org.fortiss.tooling.kernel.ui;bundle-version="2.14.0";visibility:=reexport,
org.eclipse.swt
Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
Bundle-Vendor: fortiss GmbH
Export-Package: org.fortiss.tooling.base.ui,
org.fortiss.tooling.base.ui.annotation,
diff --git a/org.fortiss.tooling.base/.classpath b/org.fortiss.tooling.base/.classpath
index 36704c98ff5c3688703cbb1d07d139dde3ff69be..ca9fe910a5d812df0be45f6ed787526c17e9aae5 100644
--- a/org.fortiss.tooling.base/.classpath
+++ b/org.fortiss.tooling.base/.classpath
@@ -1,6 +1,10 @@
<?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"/>
diff --git a/org.fortiss.tooling.base/.project b/org.fortiss.tooling.base/.project
index 7fabf197079747f4240ade1f650502ea0f1d78b5..b6040468f8281d7e3016b4ca6015fa7d9d064f3b 100644
--- a/org.fortiss.tooling.base/.project
+++ b/org.fortiss.tooling.base/.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>
diff --git a/org.fortiss.tooling.base/META-INF/MANIFEST.MF b/org.fortiss.tooling.base/META-INF/MANIFEST.MF
index d3b33a32de3c9bf3a451b8a8cd716706867c86d6..85d9d4053425515c8c8387dabe204854be6a68ae 100644
--- a/org.fortiss.tooling.base/META-INF/MANIFEST.MF
+++ b/org.fortiss.tooling.base/META-INF/MANIFEST.MF
@@ -1,36 +1,36 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Tooling Base
-Bundle-SymbolicName: org.fortiss.tooling.base;singleton:=true
-Bundle-Version: 2.14.0.qualifier
-Bundle-ClassPath: .
-Bundle-Vendor: fortiss GmbH
-Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.emf.ecore;visibility:=reexport,
- org.fortiss.tooling.kernel;visibility:=reexport;bundle-version="2.14.0"
-Bundle-ActivationPolicy: lazy
-Export-Package: org.fortiss.tooling.base,
- org.fortiss.tooling.base.annotation,
- org.fortiss.tooling.base.annotation.valueprovider,
- org.fortiss.tooling.base.compose,
- org.fortiss.tooling.base.dnd,
- org.fortiss.tooling.base.layout,
- org.fortiss.tooling.base.library,
- org.fortiss.tooling.base.migration,
- org.fortiss.tooling.base.model.base,
- org.fortiss.tooling.base.model.base.impl,
- org.fortiss.tooling.base.model.base.util,
- org.fortiss.tooling.base.model.element,
- org.fortiss.tooling.base.model.element.impl,
- org.fortiss.tooling.base.model.element.util,
- org.fortiss.tooling.base.model.layout,
- org.fortiss.tooling.base.model.layout.impl,
- org.fortiss.tooling.base.model.layout.util,
- org.fortiss.tooling.base.model.visualization,
- org.fortiss.tooling.base.model.visualization.impl,
- org.fortiss.tooling.base.model.visualization.util,
- org.fortiss.tooling.base.utils
-Bundle-Activator: org.fortiss.tooling.base.ToolingBaseActivator
-Automatic-Module-Name: org.fortiss.tooling.base
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %pluginName
+Bundle-SymbolicName: org.fortiss.tooling.base;singleton:=true
+Bundle-Version: 2.14.0.qualifier
+Bundle-ClassPath: .
+Bundle-Vendor: %providerName
+Bundle-Localization: plugin
+Bundle-RequiredExecutionEnvironment: JavaSE-11
+Require-Bundle: org.eclipse.core.runtime,
+ org.eclipse.emf.ecore;visibility:=reexport,
+ org.fortiss.tooling.kernel;visibility:=reexport;bundle-version="2.14.0"
+Bundle-ActivationPolicy: lazy
+Export-Package: org.fortiss.tooling.base,
+ org.fortiss.tooling.base.annotation,
+ org.fortiss.tooling.base.annotation.valueprovider,
+ org.fortiss.tooling.base.compose,
+ org.fortiss.tooling.base.dnd,
+ org.fortiss.tooling.base.layout,
+ org.fortiss.tooling.base.library,
+ org.fortiss.tooling.base.migration,
+ org.fortiss.tooling.base.model.base,
+ org.fortiss.tooling.base.model.base.impl,
+ org.fortiss.tooling.base.model.base.util,
+ org.fortiss.tooling.base.model.element,
+ org.fortiss.tooling.base.model.element.impl,
+ org.fortiss.tooling.base.model.element.util,
+ org.fortiss.tooling.base.model.layout,
+ org.fortiss.tooling.base.model.layout.impl,
+ org.fortiss.tooling.base.model.layout.util,
+ org.fortiss.tooling.base.model.visualization,
+ org.fortiss.tooling.base.model.visualization.impl,
+ org.fortiss.tooling.base.model.visualization.util,
+ org.fortiss.tooling.base.utils
+Bundle-Activator: org.fortiss.tooling.base.ToolingBaseActivator
+Automatic-Module-Name: org.fortiss.tooling.base
diff --git a/org.fortiss.tooling.base/plugin.xml b/org.fortiss.tooling.base/plugin.xml
index 5ed524a48e46db91e5c8dbf63d06f4c860339046..53662f9523a65e42730c15d554e8700dd6e555c7 100644
--- a/org.fortiss.tooling.base/plugin.xml
+++ b/org.fortiss.tooling.base/plugin.xml
@@ -1,42 +1,45 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<!-- (c) 2011 fortiss GmbH -->
-
-<plugin>
- <extension-point id="annotation" name="Annotation" schema="schema/annotation.exsd"/>
-
- <extension point="org.eclipse.emf.ecore.generated_package">
- <package
- uri="http://www.fortiss.org/tooling/base/model/element"
- class="org.fortiss.tooling.base.model.element.ElementPackage"
- genModel="model/base.genmodel"/>
- </extension>
-
- <extension point="org.eclipse.emf.ecore.generated_package">
- <!-- @generated base -->
- <package
- uri="http://www.fortiss.org/tooling/base/model/layout"
- class="org.fortiss.tooling.base.model.layout.LayoutPackage"/>
- </extension>
-
- <extension point="org.eclipse.emf.ecore.generated_package">
- <!-- @generated base -->
- <package
- uri="http://www.fortiss.org/tooling/base/model/base"
- class="org.fortiss.tooling.base.model.base.BasePackage"/>
- </extension>
-
- <extension point="org.eclipse.emf.ecore.generated_package">
- <!-- @generated base -->
- <package
- uri="http://www.fortiss.org/tooling/base/model/visualization"
- class="org.fortiss.tooling.base.model.visualization.VisualizationPackage"/>
- </extension>
-
- <extension point="org.fortiss.tooling.kernel.migrationProvider">
- <migrationProvider migrationProvider="org.fortiss.tooling.base.migration.RemoveDuplicatedAnnotationsMigrationProvider">
- <objectClass objectClass="org.fortiss.tooling.kernel.extension.data.ITopLevelElement"/>
- </migrationProvider>
-
- </extension>
-</plugin>
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.0"?>
+<!-- (c) 2011 fortiss GmbH -->
+
+<plugin>
+ <extension-point id="annotation" name="Annotation" schema="schema/annotation.exsd"/>
+
+ <extension point="org.eclipse.emf.ecore.generated_package">
+ <package
+ uri="http://www.fortiss.org/tooling/base/model/element"
+ class="org.fortiss.tooling.base.model.element.ElementPackage"
+ genModel="model/base.genmodel"/>
+ </extension>
+
+ <extension point="org.eclipse.emf.ecore.generated_package">
+ <!-- @generated base -->
+ <package
+ uri="http://www.fortiss.org/tooling/base/model/layout"
+ class="org.fortiss.tooling.base.model.layout.LayoutPackage"
+ genModel="model/base.genmodel"/>
+ </extension>
+
+ <extension point="org.eclipse.emf.ecore.generated_package">
+ <!-- @generated base -->
+ <package
+ uri="http://www.fortiss.org/tooling/base/model/base"
+ class="org.fortiss.tooling.base.model.base.BasePackage"
+ genModel="model/base.genmodel"/>
+ </extension>
+
+ <extension point="org.eclipse.emf.ecore.generated_package">
+ <!-- @generated base -->
+ <package
+ uri="http://www.fortiss.org/tooling/base/model/visualization"
+ class="org.fortiss.tooling.base.model.visualization.VisualizationPackage"
+ genModel="model/base.genmodel"/>
+ </extension>
+
+ <extension point="org.fortiss.tooling.kernel.migrationProvider">
+ <migrationProvider migrationProvider="org.fortiss.tooling.base.migration.RemoveDuplicatedAnnotationsMigrationProvider">
+ <objectClass objectClass="org.fortiss.tooling.kernel.extension.data.ITopLevelElement"/>
+ </migrationProvider>
+
+ </extension>
+</plugin>
diff --git a/org.fortiss.tooling.common.ui/.classpath b/org.fortiss.tooling.common.ui/.classpath
index 9dab51ea3b228f831ec2150bb8868376d1745a20..0920a6fed0bb5a3313c4f46b95ea1fcb99101429 100644
--- a/org.fortiss.tooling.common.ui/.classpath
+++ b/org.fortiss.tooling.common.ui/.classpath
@@ -1,12 +1,16 @@
<?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="external-src"/>
<classpathentry kind="src" path="res"/>
+ <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 exported="true" kind="lib" path="lib/org.conqat.ide.commons.gef.jar"/>
<classpathentry exported="true" kind="lib" path="lib/org.conqat.ide.commons.ui.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/swt-grouplayout.jar"/>
+ <classpathentry kind="lib" path="lib/swt-grouplayout.jar"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="output" path="build"/>
</classpath>
diff --git a/org.fortiss.tooling.common.ui/.project b/org.fortiss.tooling.common.ui/.project
index 0209b2d708714a1cca31da04feae09307f0137a5..c7c4d5f2ee07d857e2fde41ced8e95ff07e51e61 100644
--- a/org.fortiss.tooling.common.ui/.project
+++ b/org.fortiss.tooling.common.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>
diff --git a/org.fortiss.tooling.common.ui/META-INF/MANIFEST.MF b/org.fortiss.tooling.common.ui/META-INF/MANIFEST.MF
index 150abe9b8a61f34d4f8dbb78ddb512255fd7bb48..4446d79643ee60e872eeb2569df18e86b8439526 100644
--- a/org.fortiss.tooling.common.ui/META-INF/MANIFEST.MF
+++ b/org.fortiss.tooling.common.ui/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: Tooling Commons UI
Bundle-SymbolicName: org.fortiss.tooling.common.ui;singleton:=true
Bundle-Version: 2.14.0.qualifier
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
Require-Bundle: org.fortiss.tooling.common;bundle-version="2.14.0";visibility:=reexport,
org.eclipse.core.resources;visibility:=reexport,
org.eclipse.ui;visibility:=reexport,
@@ -17,8 +17,10 @@ Require-Bundle: org.fortiss.tooling.common;bundle-version="2.14.0";visibility:=r
org.eclipse.ui.views.properties.tabbed;visibility:=reexport,
org.eclipse.ui.ide;visibility:=reexport,
org.eclipse.jface.text;visibility:=reexport,
- org.eclipse.fx.ui.workbench3;visibility:=reexport,
- org.eclipse.fx.osgi.util;resolution:=optional
+ org.openjfx.controls;bundle-version="11.0.2";visibility:=reexport,
+ org.openjfx.base;bundle-version="11.0.2";visibility:=reexport,
+ org.openjfx.fxml;bundle-version="11.0.2";visibility:=reexport,
+ org.eclipse.fx.ui.workbench3;bundle-version="3.5.0";visibility:=reexport
Bundle-ClassPath: .,
lib/org.conqat.ide.commons.gef.jar,
lib/org.conqat.ide.commons.ui.jar,
diff --git a/org.fortiss.tooling.common/.classpath b/org.fortiss.tooling.common/.classpath
index d3222840cdcada3aafe722665b5a062d495fd112..c045661bf74792e8081e793bf298d629169c5e3e 100644
--- a/org.fortiss.tooling.common/.classpath
+++ b/org.fortiss.tooling.common/.classpath
@@ -1,16 +1,20 @@
<?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 exported="true" kind="lib" path="lib/org.conqat.ide.commons.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/opencsv-2.3.jar"/>
+ <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 exported="true" kind="lib" path="lib/apache-commons/commons-lang-2.6.jar"/>
<classpathentry exported="true" kind="lib" path="lib/apache-commons/commons-lang3-3.7.jar" sourcepath="lib/apache-commons/commons-lang3-3.7-sources.jar">
<attributes>
<attribute name="javadoc_location" value="jar:platform:/resource/org.fortiss.tooling.common/lib/apache-commons/commons-lang3-3.7-javadoc.jar!/"/>
</attributes>
</classpathentry>
- <classpathentry exported="true" kind="lib" path="lib/apache-commons/commons-lang-2.6.jar"/>
<classpathentry exported="true" kind="lib" path="lib/apache-commons/commons-io-2.4.jar" sourcepath="lib/apache-commons/commons-io-2.4-sources.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/opencsv-2.3.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/org.conqat.ide.commons.jar"/>
<classpathentry kind="output" path="build"/>
</classpath>
diff --git a/org.fortiss.tooling.common/.project b/org.fortiss.tooling.common/.project
index 704ad90a2979a79941f1d6f999ded08ecfab8a11..fcc3bd81ab5c53d5a90dbcfc8936dd5f3aa0f64f 100644
--- a/org.fortiss.tooling.common/.project
+++ b/org.fortiss.tooling.common/.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>
diff --git a/org.fortiss.tooling.common/META-INF/MANIFEST.MF b/org.fortiss.tooling.common/META-INF/MANIFEST.MF
index edc3cf5e4bada22384c29b8ef22fa6cc744bcfec..0690818544f1f8459a92b923dffeb3a1a7f52d7e 100644
--- a/org.fortiss.tooling.common/META-INF/MANIFEST.MF
+++ b/org.fortiss.tooling.common/META-INF/MANIFEST.MF
@@ -7,7 +7,7 @@ Require-Bundle: org.eclipse.core.runtime;visibility:=reexport,
com.ibm.icu;visibility:=reexport,
org.junit;visibility:=reexport
Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
Bundle-ClassPath: .,
lib/apache-commons/commons-lang-2.6.jar,
lib/apache-commons/commons-lang3-3.7.jar,
diff --git a/org.fortiss.tooling.graphicsGL.ui/.classpath b/org.fortiss.tooling.graphicsGL.ui/.classpath
index dc706db7b165d8a005f9bb31cbb1d8b20b9ca822..070a705b2c67a786f516412443ee02528689697d 100644
--- a/org.fortiss.tooling.graphicsGL.ui/.classpath
+++ b/org.fortiss.tooling.graphicsGL.ui/.classpath
@@ -1,8 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry exported="true" kind="lib" path="lib/lwjgl.jar" sourcepath="lib/lwjgl-src.zip"/>
- <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 exported="true" kind="lib" path="lib/lwjgl.jar" sourcepath="lib/lwjgl-src.zip"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="src" path="test-src"/>
<classpathentry kind="src" path="external-src"/>
diff --git a/org.fortiss.tooling.graphicsGL.ui/.project b/org.fortiss.tooling.graphicsGL.ui/.project
index 44deff9a04a60e167a19b9b1817fe1a852cbc2b9..a603ee594ee28aa25d9fb72518d62abd9853a593 100644
--- a/org.fortiss.tooling.graphicsGL.ui/.project
+++ b/org.fortiss.tooling.graphicsGL.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>
diff --git a/org.fortiss.tooling.graphicsGL.ui/META-INF/MANIFEST.MF b/org.fortiss.tooling.graphicsGL.ui/META-INF/MANIFEST.MF
index e40b3fb748f17cd19848c99051194d8f4b1accce..5977a6c7753879f5879f7d5c238f6b41a4ea2099 100644
--- a/org.fortiss.tooling.graphicsGL.ui/META-INF/MANIFEST.MF
+++ b/org.fortiss.tooling.graphicsGL.ui/META-INF/MANIFEST.MF
@@ -7,7 +7,7 @@ Bundle-Activator: org.fortiss.tooling.graphicsGL.ui.ToolingGraphicsGLUIActivator
Require-Bundle: org.fortiss.tooling.graphicsGL;bundle-version="2.14.0";visibility:=reexport,
org.fortiss.tooling.base.ui;bundle-version="2.14.0";visibility:=reexport
Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
Bundle-Vendor: fortiss GmbH
Export-Package: org.fortiss.tooling.graphicsGL.ui,
org.fortiss.tooling.graphicsGL.ui.camera,
diff --git a/org.fortiss.tooling.graphicsGL/.classpath b/org.fortiss.tooling.graphicsGL/.classpath
index 36704c98ff5c3688703cbb1d07d139dde3ff69be..ca9fe910a5d812df0be45f6ed787526c17e9aae5 100644
--- a/org.fortiss.tooling.graphicsGL/.classpath
+++ b/org.fortiss.tooling.graphicsGL/.classpath
@@ -1,6 +1,10 @@
<?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"/>
diff --git a/org.fortiss.tooling.graphicsGL/.project b/org.fortiss.tooling.graphicsGL/.project
index 0817b9eb1d2e320acd6241c84213cde5cc9f3daa..c692ee4b7604f9d6111b66b60f62ad2b44ab9c72 100644
--- a/org.fortiss.tooling.graphicsGL/.project
+++ b/org.fortiss.tooling.graphicsGL/.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>
diff --git a/org.fortiss.tooling.graphicsGL/META-INF/MANIFEST.MF b/org.fortiss.tooling.graphicsGL/META-INF/MANIFEST.MF
index a79099efe5fed1a3c4cea8b8d96bab4bac979ce6..e5d57d0e3fa11d86eded587ca7fdd4d3137d150b 100644
--- a/org.fortiss.tooling.graphicsGL/META-INF/MANIFEST.MF
+++ b/org.fortiss.tooling.graphicsGL/META-INF/MANIFEST.MF
@@ -1,27 +1,27 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Tooling Graphics GL
-Bundle-SymbolicName: org.fortiss.tooling.graphicsGL;singleton:=true
-Bundle-Version: 2.14.0.qualifier
-Bundle-ClassPath: .
-Bundle-Vendor: fortiss GmbH
-Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Bundle-ActivationPolicy: lazy
-Bundle-Activator: org.fortiss.tooling.graphicsGL.ToolingGraphicsGLActivator
-Export-Package: org.fortiss.tooling.graphicsGL,
- org.fortiss.tooling.graphicsGL.model,
- org.fortiss.tooling.graphicsGL.model.graph,
- org.fortiss.tooling.graphicsGL.model.graph.impl,
- org.fortiss.tooling.graphicsGL.model.graph.util,
- org.fortiss.tooling.graphicsGL.model.impl,
- org.fortiss.tooling.graphicsGL.model.mesh,
- org.fortiss.tooling.graphicsGL.model.mesh.impl,
- org.fortiss.tooling.graphicsGL.model.mesh.util,
- org.fortiss.tooling.graphicsGL.model.scene,
- org.fortiss.tooling.graphicsGL.model.scene.impl,
- org.fortiss.tooling.graphicsGL.model.scene.util,
- org.fortiss.tooling.graphicsGL.model.util,
- org.fortiss.tooling.graphicsGL.util
-Require-Bundle: org.fortiss.tooling.kernel;bundle-version="2.14.0";visibility:=reexport
-Automatic-Module-Name: org.fortiss.tooling.graphicsGL
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %pluginName
+Bundle-SymbolicName: org.fortiss.tooling.graphicsGL;singleton:=true
+Bundle-Version: 2.14.0.qualifier
+Bundle-ClassPath: .
+Bundle-Vendor: %providerName
+Bundle-Localization: plugin
+Bundle-RequiredExecutionEnvironment: JavaSE-11
+Bundle-ActivationPolicy: lazy
+Bundle-Activator: org.fortiss.tooling.graphicsGL.ToolingGraphicsGLActivator
+Export-Package: org.fortiss.tooling.graphicsGL,
+ org.fortiss.tooling.graphicsGL.model,
+ org.fortiss.tooling.graphicsGL.model.graph,
+ org.fortiss.tooling.graphicsGL.model.graph.impl,
+ org.fortiss.tooling.graphicsGL.model.graph.util,
+ org.fortiss.tooling.graphicsGL.model.impl,
+ org.fortiss.tooling.graphicsGL.model.mesh,
+ org.fortiss.tooling.graphicsGL.model.mesh.impl,
+ org.fortiss.tooling.graphicsGL.model.mesh.util,
+ org.fortiss.tooling.graphicsGL.model.scene,
+ org.fortiss.tooling.graphicsGL.model.scene.impl,
+ org.fortiss.tooling.graphicsGL.model.scene.util,
+ org.fortiss.tooling.graphicsGL.model.util,
+ org.fortiss.tooling.graphicsGL.util
+Require-Bundle: org.fortiss.tooling.kernel;bundle-version="2.14.0";visibility:=reexport
+Automatic-Module-Name: org.fortiss.tooling.graphicsGL
diff --git a/org.fortiss.tooling.graphicsGL/plugin.xml b/org.fortiss.tooling.graphicsGL/plugin.xml
index 4a40398299e25d4f187417531bd0f19848d8b007..19adc7e34b700c5aea31ae545a8190ad4e10a01a 100644
--- a/org.fortiss.tooling.graphicsGL/plugin.xml
+++ b/org.fortiss.tooling.graphicsGL/plugin.xml
@@ -1,33 +1,36 @@
-<?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>
diff --git a/org.fortiss.tooling.kernel.ui/.classpath b/org.fortiss.tooling.kernel.ui/.classpath
index 1d73d526ca5acf7915e35f0e4e611829603debde..8e91bb2b015125cb38f46704cbab9dee0ed07166 100644
--- a/org.fortiss.tooling.kernel.ui/.classpath
+++ b/org.fortiss.tooling.kernel.ui/.classpath
@@ -1,6 +1,10 @@
<?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"/>
diff --git a/org.fortiss.tooling.kernel.ui/.project b/org.fortiss.tooling.kernel.ui/.project
index e4b9b3227da0d3f5a78b87e18f21f5db72336b60..81ada56dbc2800bfd8aa3004cc301ea7c5ba6310 100644
--- a/org.fortiss.tooling.kernel.ui/.project
+++ b/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>
diff --git a/org.fortiss.tooling.kernel.ui/META-INF/MANIFEST.MF b/org.fortiss.tooling.kernel.ui/META-INF/MANIFEST.MF
index 83d8cef86dade7ad413cb5d8a3d44a6898f8194f..fa186e2c1999d449dce2219d2eae27a42da31878 100644
--- a/org.fortiss.tooling.kernel.ui/META-INF/MANIFEST.MF
+++ b/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,
diff --git a/org.fortiss.tooling.kernel/.classpath b/org.fortiss.tooling.kernel/.classpath
index 36704c98ff5c3688703cbb1d07d139dde3ff69be..ca9fe910a5d812df0be45f6ed787526c17e9aae5 100644
--- a/org.fortiss.tooling.kernel/.classpath
+++ b/org.fortiss.tooling.kernel/.classpath
@@ -1,6 +1,10 @@
<?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"/>
diff --git a/org.fortiss.tooling.kernel/.project b/org.fortiss.tooling.kernel/.project
index b3dc6de436ba1593c888adb6ea03dc9767e89877..fee3ec1a08f08f6b5e49459ffaa5e3a1f4f64517 100644
--- a/org.fortiss.tooling.kernel/.project
+++ b/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>
diff --git a/org.fortiss.tooling.kernel/META-INF/MANIFEST.MF b/org.fortiss.tooling.kernel/META-INF/MANIFEST.MF
index 94aa49932f71b8ceddb755df3b5393ce2bd6ba56..ff4058a1982894c047f24d3b3a5220958bc974a4 100644
--- a/org.fortiss.tooling.kernel/META-INF/MANIFEST.MF
+++ b/org.fortiss.tooling.kernel/META-INF/MANIFEST.MF
@@ -1,36 +1,44 @@
-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
diff --git a/org.fortiss.tooling.kernel/src/org/fortiss/tooling/kernel/extension/base/.ratings b/org.fortiss.tooling.kernel/src/org/fortiss/tooling/kernel/extension/base/.ratings
index 0a29d0c1e0c82d128da5a762830cba25b5bcc927..05ded098fabef31e2ecff7e4dce51ee5a048c083 100644
--- a/org.fortiss.tooling.kernel/src/org/fortiss/tooling/kernel/extension/base/.ratings
+++ b/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
diff --git a/org.fortiss.tooling.kernel/src/org/fortiss/tooling/kernel/extension/base/RemoveDeprecatedArtifactsMigrationProviderBase.java b/org.fortiss.tooling.kernel/src/org/fortiss/tooling/kernel/extension/base/RemoveDeprecatedArtifactsMigrationProviderBase.java
index 3fdbcadf1d42a27d88952290a71e8bfe1450b946..4a1b676223b7ec53259a26d1a671b11ff2f911e2 100644
--- a/org.fortiss.tooling.kernel/src/org/fortiss/tooling/kernel/extension/base/RemoveDeprecatedArtifactsMigrationProviderBase.java
+++ b/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} */
diff --git a/org.fortiss.tooling.kernel/src/org/fortiss/tooling/kernel/utils/.ratings b/org.fortiss.tooling.kernel/src/org/fortiss/tooling/kernel/utils/.ratings
index 4d47ce375c7171b940f119faf060b70042fe7cdc..a61917f85ff8354586341551fce429baa987647d 100644
--- a/org.fortiss.tooling.kernel/src/org/fortiss/tooling/kernel/utils/.ratings
+++ b/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
diff --git a/org.fortiss.tooling.kernel/src/org/fortiss/tooling/kernel/utils/TransformationUtils.java b/org.fortiss.tooling.kernel/src/org/fortiss/tooling/kernel/utils/TransformationUtils.java
index 495891fae79b99c103cf61f607792dd1e48a5307..552d3a9d56d34450be781af828efe0b8aa5d359e 100644
--- a/org.fortiss.tooling.kernel/src/org/fortiss/tooling/kernel/utils/TransformationUtils.java
+++ b/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);
}
diff --git a/org.fortiss.tooling.spiderchart.ui/.classpath b/org.fortiss.tooling.spiderchart.ui/.classpath
index 30195d7a257c594289eb725865d10e44aa287ee6..5ec5c0d472425196dd61544159a97ce7c6d17d5a 100644
--- a/org.fortiss.tooling.spiderchart.ui/.classpath
+++ b/org.fortiss.tooling.spiderchart.ui/.classpath
@@ -1,6 +1,10 @@
<?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"/>
diff --git a/org.fortiss.tooling.spiderchart.ui/.project b/org.fortiss.tooling.spiderchart.ui/.project
index babafa4f1dcb8d7276685b3a8ca82062c8acc2be..96f259ee466cf1ce4842f0f2749e0bc51ca42ecc 100644
--- a/org.fortiss.tooling.spiderchart.ui/.project
+++ b/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>
diff --git a/org.fortiss.tooling.spiderchart.ui/META-INF/MANIFEST.MF b/org.fortiss.tooling.spiderchart.ui/META-INF/MANIFEST.MF
index a2648161dc617377efcc47fc37bbfbb3483b8ca8..809ec86406ce1ea1f55557ce99ffe5e6c6a53183 100644
--- a/org.fortiss.tooling.spiderchart.ui/META-INF/MANIFEST.MF
+++ b/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,
diff --git a/pom.xml b/pom.xml
new file mode 100644
index 0000000000000000000000000000000000000000..1fac8002add685d3c4acad2ea6bea3dfabe1e8ea
--- /dev/null
+++ b/pom.xml
@@ -0,0 +1,17 @@
+<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