Merge branch 'master' of https://git.fortiss.org/af3/kernel.git into 4175

org.fortiss.tooling.base.ui/.classpath

@@ -9,12 +9,6 @@
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="src" path="res"/>
 	<classpathentry kind="lib" path="lib/opal-1.0.4.jar" sourcepath="lib/opal-1.0.4-src.zip"/>
-	<classpathentry exported="true" kind="lib" path="lib/com.google.guava-15.0.0.v201403281430.jar" sourcepath="lib/klay-layouters-2016-02-src.zip"/>
-	<classpathentry exported="true" kind="lib" path="lib/de.cau.cs.kieler.core-0.15.0.201602160301.jar" sourcepath="lib/klay-layouters-2016-02-src.zip"/>
-	<classpathentry exported="true" kind="lib" path="lib/de.cau.cs.kieler.core.kgraph-0.8.0.201602160301.jar" sourcepath="lib/klay-layouters-2016-02-src.zip"/>
-	<classpathentry exported="true" kind="lib" path="lib/de.cau.cs.kieler.kiml-0.19.0.201602160301.jar" sourcepath="lib/klay-layouters-2016-02-src.zip"/>
-	<classpathentry exported="true" kind="lib" path="lib/de.cau.cs.kieler.klay.force-0.4.0.201602160301.jar" sourcepath="lib/klay-layouters-2016-02-src.zip"/>
-	<classpathentry exported="true" kind="lib" path="lib/de.cau.cs.kieler.klay.layered-0.13.0.201602160301.jar" sourcepath="lib/klay-layouters-2016-02-src.zip"/>
-	<classpathentry exported="true" kind="lib" path="lib/de.cau.cs.kieler.klay.tree-0.4.0.201602160301.jar" sourcepath="lib/klay-layouters-2016-02-src.zip"/>
+	<classpathentry exported="true" kind="lib" path="lib/com.google.guava-15.0.0.v201403281430.jar"/>
 	<classpathentry kind="output" path="build"/>
 </classpath>

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

@@ -7,7 +7,11 @@ Bundle-Activator: org.fortiss.tooling.base.ui.ToolingBaseUIActivator
 Require-Bundle: org.fortiss.tooling.base;bundle-version="2.20.0";visibility:=reexport,
  org.fortiss.tooling.kernel.ui;bundle-version="2.20.0";visibility:=reexport,
  org.eclipse.swt,
- org.fortiss.tooling.common.ui
+ org.fortiss.tooling.common.ui,
+ org.eclipse.elk.core;bundle-version="0.7.1",
+ org.eclipse.elk.alg.layered;bundle-version="0.7.1",
+ org.eclipse.elk.graph;bundle-version="0.7.1",
+ org.eclipse.elk.alg.common;bundle-version="0.7.1"
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Bundle-Vendor: fortiss GmbH
@@ -45,11 +49,5 @@ Export-Package: org.fortiss.tooling.base.ui,
  org.fortiss.tooling.base.ui.widget
 Bundle-ClassPath: .,
  lib/opal-1.0.4.jar,
- lib/com.google.guava-15.0.0.v201403281430.jar,
- lib/de.cau.cs.kieler.core-0.15.0.201602160301.jar,
- lib/de.cau.cs.kieler.core.kgraph-0.8.0.201602160301.jar,
- lib/de.cau.cs.kieler.kiml-0.19.0.201602160301.jar,
- lib/de.cau.cs.kieler.klay.force-0.4.0.201602160301.jar,
- lib/de.cau.cs.kieler.klay.layered-0.13.0.201602160301.jar,
- lib/de.cau.cs.kieler.klay.tree-0.4.0.201602160301.jar
+ lib/com.google.guava-15.0.0.v201403281430.jar
 Automatic-Module-Name: org.fortiss.tooling.base.ui

org.fortiss.tooling.base.ui/build.properties

@@ -8,11 +8,5 @@ bin.includes = META-INF/,\
                plugin.xml,\
                icons/,\
                lib/opal-1.0.4.jar, \
-               lib/com.google.guava-15.0.0.v201403281430.jar,\
-               lib/de.cau.cs.kieler.core-0.15.0.201602160301.jar,\
-               lib/de.cau.cs.kieler.core.kgraph-0.8.0.201602160301.jar,\
-               lib/de.cau.cs.kieler.kiml-0.19.0.201602160301.jar,\
-               lib/de.cau.cs.kieler.klay.force-0.4.0.201602160301.jar,\
-               lib/de.cau.cs.kieler.klay.layered-0.13.0.201602160301.jar,\
-               lib/de.cau.cs.kieler.klay.tree-0.4.0.201602160301.jar
+               lib/com.google.guava-15.0.0.v201403281430.jar
 src.includes = icons/

org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/layout/auto/.ratings

@@ -2,4 +2,4 @@ AutoLayoutMenu.java 67dc2d04a6f39ec72ea640b745997baa8ff63a49 GREEN
 DiagramTapeMeasure.java 72454e6fe5225dab11d3d691baad93aab7a171c0 GREEN
 IAutoLayouter.java de1b11d9e202c7e23352ad85684dbf8a3fd17c7d GREEN
 IAutoLayouterTapeMeasure.java df186e0ba505e0ecda211b1df76cf12f3245b47e GREEN
-KielerAutoLayouter.java 8c01dc17ce6c9a1bbd3fc02f1d19eb86e0a79e86 GREEN
+KielerAutoLayouter.java cb01df7d05830b95b595d7f1aec53a801812e5b6 GREEN