From dd39614e742af9af190d651371047d597dd3e86d Mon Sep 17 00:00:00 2001 From: Niklas Rentz Date: Mon, 6 Nov 2023 17:42:34 +0100 Subject: [PATCH 1/7] update to Eclipse 2023-09 and corresponding new Orbit release. Replace any javax.inject with jakarta.inject imports. --- .../category.xml | 6 +-- .../pom.xml | 6 +-- ...er.klighd.targetplatform-elkNightly.target | 11 +++--- ...d.targetplatform-piccolo-elkNightly.target | 11 +++--- ...ieler.klighd.targetplatform-piccolo.target | 11 +++--- ...cau.cs.kieler.klighd.targetplatform.target | 11 +++--- .../contentassist/KGraphProposalProvider.java | 2 +- .../kgraph/text/KGraphValueConverters.java | 2 +- .../syntheses/EObjectFallbackSynthesis.xtend | 2 +- .../ide/syntheses/ErrorModelSynthesis.xtend | 2 +- .../ide/syntheses/MessageModelSynthesis.xtend | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../lsp/KGraphDiagramServerManager.xtend | 4 +- .../ui/wizard/KlighdProjectContributor.xtend | 2 +- .../META-INF/MANIFEST.MF | 2 +- pom.xml | 38 ++++++++++--------- ...hlightedEdgeToForegroundTestModelGen.xtend | 2 +- .../META-INF/MANIFEST.MF | 3 +- 18 files changed, 63 insertions(+), 56 deletions(-) diff --git a/build/de.cau.cs.kieler.klighd.repository/category.xml b/build/de.cau.cs.kieler.klighd.repository/category.xml index ce72249af..d95c6d0f9 100644 --- a/build/de.cau.cs.kieler.klighd.repository/category.xml +++ b/build/de.cau.cs.kieler.klighd.repository/category.xml @@ -63,11 +63,11 @@ - + - + - + diff --git a/build/de.cau.cs.kieler.klighd.repository/pom.xml b/build/de.cau.cs.kieler.klighd.repository/pom.xml index 3c96be4a1..7ab1ceefb 100644 --- a/build/de.cau.cs.kieler.klighd.repository/pom.xml +++ b/build/de.cau.cs.kieler.klighd.repository/pom.xml @@ -52,17 +52,17 @@ - https://download.eclipse.org/releases/2022-09/ + https://download.eclipse.org/releases/2023-09/ https://download.eclipse.org/modeling/mdt/uml2/updates/5.4/ https://download.eclipse.org/elk/updates/releases/0.8.1/> - https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.28.0/> + https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.32.0/> https://xtext.github.io/download/updates/releases/2.1.1/> - https://download.eclipse.org/tools/orbit/downloads/drops/R20220830213456/repository/ + https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/release/4.29.0 https://rtsys.informatik.uni-kiel.de/~kieler/updatesite/sprotty/0.9.0/ diff --git a/build/de.cau.cs.kieler.klighd.targetplatform/de.cau.cs.kieler.klighd.targetplatform-elkNightly.target b/build/de.cau.cs.kieler.klighd.targetplatform/de.cau.cs.kieler.klighd.targetplatform-elkNightly.target index 7c913547e..378ba46eb 100644 --- a/build/de.cau.cs.kieler.klighd.targetplatform/de.cau.cs.kieler.klighd.targetplatform-elkNightly.target +++ b/build/de.cau.cs.kieler.klighd.targetplatform/de.cau.cs.kieler.klighd.targetplatform-elkNightly.target @@ -8,7 +8,7 @@ - + @@ -25,18 +25,19 @@ - + - + - - + + + diff --git a/build/de.cau.cs.kieler.klighd.targetplatform/de.cau.cs.kieler.klighd.targetplatform-piccolo-elkNightly.target b/build/de.cau.cs.kieler.klighd.targetplatform/de.cau.cs.kieler.klighd.targetplatform-piccolo-elkNightly.target index 9fd6a5984..15fa75331 100644 --- a/build/de.cau.cs.kieler.klighd.targetplatform/de.cau.cs.kieler.klighd.targetplatform-piccolo-elkNightly.target +++ b/build/de.cau.cs.kieler.klighd.targetplatform/de.cau.cs.kieler.klighd.targetplatform-piccolo-elkNightly.target @@ -8,7 +8,7 @@ - + @@ -25,7 +25,7 @@ - + @@ -36,11 +36,12 @@ - + - - + + + diff --git a/build/de.cau.cs.kieler.klighd.targetplatform/de.cau.cs.kieler.klighd.targetplatform-piccolo.target b/build/de.cau.cs.kieler.klighd.targetplatform/de.cau.cs.kieler.klighd.targetplatform-piccolo.target index 5c4d0fff2..f7d9928be 100644 --- a/build/de.cau.cs.kieler.klighd.targetplatform/de.cau.cs.kieler.klighd.targetplatform-piccolo.target +++ b/build/de.cau.cs.kieler.klighd.targetplatform/de.cau.cs.kieler.klighd.targetplatform-piccolo.target @@ -8,7 +8,7 @@ - + @@ -25,7 +25,7 @@ - + @@ -36,11 +36,12 @@ - + - - + + + diff --git a/build/de.cau.cs.kieler.klighd.targetplatform/de.cau.cs.kieler.klighd.targetplatform.target b/build/de.cau.cs.kieler.klighd.targetplatform/de.cau.cs.kieler.klighd.targetplatform.target index 9d4a9872d..2dfc84fb4 100644 --- a/build/de.cau.cs.kieler.klighd.targetplatform/de.cau.cs.kieler.klighd.targetplatform.target +++ b/build/de.cau.cs.kieler.klighd.targetplatform/de.cau.cs.kieler.klighd.targetplatform.target @@ -8,7 +8,7 @@ - + @@ -25,18 +25,19 @@ - + - + - - + + + diff --git a/plugins/de.cau.cs.kieler.kgraph.text.ui/src/de/cau/cs/kieler/kgraph/text/ui/contentassist/KGraphProposalProvider.java b/plugins/de.cau.cs.kieler.kgraph.text.ui/src/de/cau/cs/kieler/kgraph/text/ui/contentassist/KGraphProposalProvider.java index 9bee4845b..ad211e736 100644 --- a/plugins/de.cau.cs.kieler.kgraph.text.ui/src/de/cau/cs/kieler/kgraph/text/ui/contentassist/KGraphProposalProvider.java +++ b/plugins/de.cau.cs.kieler.kgraph.text.ui/src/de/cau/cs/kieler/kgraph/text/ui/contentassist/KGraphProposalProvider.java @@ -20,7 +20,7 @@ import java.lang.reflect.InvocationTargetException; import java.util.Arrays; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.eclipse.elk.core.data.LayoutAlgorithmData; import org.eclipse.elk.core.data.LayoutMetaDataService; diff --git a/plugins/de.cau.cs.kieler.kgraph.text/src/de/cau/cs/kieler/kgraph/text/KGraphValueConverters.java b/plugins/de.cau.cs.kieler.kgraph.text/src/de/cau/cs/kieler/kgraph/text/KGraphValueConverters.java index b072dd450..d02e2f691 100644 --- a/plugins/de.cau.cs.kieler.kgraph.text/src/de/cau/cs/kieler/kgraph/text/KGraphValueConverters.java +++ b/plugins/de.cau.cs.kieler.kgraph.text/src/de/cau/cs/kieler/kgraph/text/KGraphValueConverters.java @@ -18,7 +18,7 @@ import java.util.regex.Pattern; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.eclipse.xtext.conversion.IValueConverter; import org.eclipse.xtext.conversion.ValueConverter; diff --git a/plugins/de.cau.cs.kieler.klighd.ide/src/de/cau/cs/kieler/klighd/ide/syntheses/EObjectFallbackSynthesis.xtend b/plugins/de.cau.cs.kieler.klighd.ide/src/de/cau/cs/kieler/klighd/ide/syntheses/EObjectFallbackSynthesis.xtend index c594c448d..4350cfc84 100644 --- a/plugins/de.cau.cs.kieler.klighd.ide/src/de/cau/cs/kieler/klighd/ide/syntheses/EObjectFallbackSynthesis.xtend +++ b/plugins/de.cau.cs.kieler.klighd.ide/src/de/cau/cs/kieler/klighd/ide/syntheses/EObjectFallbackSynthesis.xtend @@ -39,7 +39,7 @@ import de.cau.cs.kieler.klighd.ide.syntheses.action.EcoreModelExpandDetailsActio import de.cau.cs.kieler.klighd.util.KlighdProperties import java.util.List import java.util.Map -import javax.inject.Inject +import jakarta.inject.Inject import org.eclipse.elk.alg.layered.options.EdgeStraighteningStrategy import org.eclipse.elk.alg.layered.options.FixedAlignment import org.eclipse.elk.alg.layered.options.LayeredOptions diff --git a/plugins/de.cau.cs.kieler.klighd.ide/src/de/cau/cs/kieler/klighd/ide/syntheses/ErrorModelSynthesis.xtend b/plugins/de.cau.cs.kieler.klighd.ide/src/de/cau/cs/kieler/klighd/ide/syntheses/ErrorModelSynthesis.xtend index 61fd73754..69c3bb781 100644 --- a/plugins/de.cau.cs.kieler.klighd.ide/src/de/cau/cs/kieler/klighd/ide/syntheses/ErrorModelSynthesis.xtend +++ b/plugins/de.cau.cs.kieler.klighd.ide/src/de/cau/cs/kieler/klighd/ide/syntheses/ErrorModelSynthesis.xtend @@ -27,7 +27,7 @@ import de.cau.cs.kieler.klighd.krendering.extensions.KRenderingExtensions import de.cau.cs.kieler.klighd.syntheses.AbstractDiagramSynthesis import de.cau.cs.kieler.klighd.ide.model.ErrorModel import de.cau.cs.kieler.klighd.ide.syntheses.action.AbstractErrorModelShowExceptionAction -import javax.inject.Inject +import jakarta.inject.Inject /** * Diagram synthesis for a {@link MessageModel}. diff --git a/plugins/de.cau.cs.kieler.klighd.ide/src/de/cau/cs/kieler/klighd/ide/syntheses/MessageModelSynthesis.xtend b/plugins/de.cau.cs.kieler.klighd.ide/src/de/cau/cs/kieler/klighd/ide/syntheses/MessageModelSynthesis.xtend index f5af0a26c..43287e19a 100644 --- a/plugins/de.cau.cs.kieler.klighd.ide/src/de/cau/cs/kieler/klighd/ide/syntheses/MessageModelSynthesis.xtend +++ b/plugins/de.cau.cs.kieler.klighd.ide/src/de/cau/cs/kieler/klighd/ide/syntheses/MessageModelSynthesis.xtend @@ -22,7 +22,7 @@ import de.cau.cs.kieler.klighd.krendering.extensions.KContainerRenderingExtensio import de.cau.cs.kieler.klighd.krendering.extensions.KNodeExtensions import de.cau.cs.kieler.klighd.krendering.extensions.KRenderingExtensions import de.cau.cs.kieler.klighd.syntheses.AbstractDiagramSynthesis -import javax.inject.Inject +import jakarta.inject.Inject import static extension de.cau.cs.kieler.klighd.syntheses.DiagramSyntheses.* diff --git a/plugins/de.cau.cs.kieler.klighd.krendering.extensions/META-INF/MANIFEST.MF b/plugins/de.cau.cs.kieler.klighd.krendering.extensions/META-INF/MANIFEST.MF index d4cbf9620..d2041547a 100644 --- a/plugins/de.cau.cs.kieler.klighd.krendering.extensions/META-INF/MANIFEST.MF +++ b/plugins/de.cau.cs.kieler.klighd.krendering.extensions/META-INF/MANIFEST.MF @@ -6,7 +6,7 @@ Bundle-Version: 2.3.1.qualifier Bundle-Activator: de.cau.cs.kieler.klighd.krendering.extensions.KRenderingExtensionsPlugin Bundle-Vendor: Kiel University Require-Bundle: org.eclipse.core.runtime, - javax.inject;bundle-version="1.0.0", + jakarta.inject.jakarta.inject-api;bundle-version="2.0.1", com.google.inject;bundle-version="3.0.0", org.eclipse.xtext.xbase.lib;bundle-version="2.4.0", org.eclipse.elk.core;bundle-version="0.1.0", diff --git a/plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/KGraphDiagramServerManager.xtend b/plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/KGraphDiagramServerManager.xtend index 964adab69..ade55703b 100644 --- a/plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/KGraphDiagramServerManager.xtend +++ b/plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/KGraphDiagramServerManager.xtend @@ -18,8 +18,8 @@ package de.cau.cs.kieler.klighd.lsp import java.util.ArrayList import java.util.List -import javax.inject.Inject -import javax.inject.Provider +import jakarta.inject.Inject +import jakarta.inject.Provider import org.eclipse.sprotty.xtext.IDiagramServerFactory import org.eclipse.sprotty.xtext.ls.DiagramServerManager diff --git a/plugins/de.cau.cs.kieler.klighd.ui.wizard/src/de/cau/cs/kieler/klighd/ui/wizard/KlighdProjectContributor.xtend b/plugins/de.cau.cs.kieler.klighd.ui.wizard/src/de/cau/cs/kieler/klighd/ui/wizard/KlighdProjectContributor.xtend index c1a37ba46..65fda1d33 100644 --- a/plugins/de.cau.cs.kieler.klighd.ui.wizard/src/de/cau/cs/kieler/klighd/ui/wizard/KlighdProjectContributor.xtend +++ b/plugins/de.cau.cs.kieler.klighd.ui.wizard/src/de/cau/cs/kieler/klighd/ui/wizard/KlighdProjectContributor.xtend @@ -88,7 +88,7 @@ class KlighdProjectContributor implements IProjectFactoryContributor { ''' package «projectInfo.transformationPackage» - import javax.inject.Inject + import jakarta.inject.Inject import de.cau.cs.kieler.klighd.kgraph.KNode import de.cau.cs.kieler.klighd.krendering.KRenderingFactory diff --git a/plugins/de.cau.cs.kieler.klighd/META-INF/MANIFEST.MF b/plugins/de.cau.cs.kieler.klighd/META-INF/MANIFEST.MF index d718971e1..c065d4b46 100644 --- a/plugins/de.cau.cs.kieler.klighd/META-INF/MANIFEST.MF +++ b/plugins/de.cau.cs.kieler.klighd/META-INF/MANIFEST.MF @@ -16,7 +16,7 @@ Require-Bundle: de.cau.cs.kieler.klighd.kgraph, org.eclipse.ui.workbench;bundle-version="3.103.0";visibility:=reexport, com.google.guava;bundle-version="10.0.0";visibility:=reexport, com.google.inject;bundle-version="3.0.0", - javax.inject;bundle-version="1.0.0";visibility:=reexport + jakarta.inject.jakarta.inject-api;bundle-version="2.0.1";visibility:=reexport Bundle-ActivationPolicy: lazy Bundle-Activator: de.cau.cs.kieler.klighd.KlighdPlugin Export-Package: de.cau.cs.kieler.klighd, diff --git a/pom.xml b/pom.xml index 3d7756eb3..9a4d3cc40 100644 --- a/pom.xml +++ b/pom.xml @@ -51,24 +51,26 @@ - 3.18.0 - 3.26.0 0.8.1 - 2.26.0 - 2.28.0 - 2.17.0 - 2.9.0 - 31.1-jre - 5.1.0 - 3.27.0 - 0.15.0 + 2.10.1 + 32.1.2-jre + 7.0.0 + 3.31.0 + 0.21.1 0.9.0 0.1.0 - 3.121.0 + 3.124.100 2.7.3 - 3.126.0 - 2.28.0 - 2.28.0 + 2.32.0 + 2.32.0 + + + 3.19.100 + 3.29.0 + 2.29.0 + 2.35.0 + 2.19.0 + 3.130.0 @@ -189,7 +191,7 @@ org.eclipse.platform org.eclipse.ui.workbench - 3.110.0 + ${ui-workbench-version} org.eclipse.platform @@ -217,12 +219,12 @@ org.eclipse.platform org.eclipse.e4.ui.workbench.renderers.swt - 0.15.600 + 0.16.100 org.eclipse.emf org.eclipse.emf.ecore.change - 2.14.0 + 2.15.0 @@ -331,7 +333,7 @@ org.eclipse.xtend xtend-maven-plugin - ${xtext-version} + ${xtend-version} diff --git a/test/de.cau.cs.kieler.klighd.piccolo.test/src/de/cau/cs/kieler/klighd/piccolo/test/highlightedEdgeToForeground/HighlightedEdgeToForegroundTestModelGen.xtend b/test/de.cau.cs.kieler.klighd.piccolo.test/src/de/cau/cs/kieler/klighd/piccolo/test/highlightedEdgeToForeground/HighlightedEdgeToForegroundTestModelGen.xtend index f84ca0981..5f06724a3 100644 --- a/test/de.cau.cs.kieler.klighd.piccolo.test/src/de/cau/cs/kieler/klighd/piccolo/test/highlightedEdgeToForeground/HighlightedEdgeToForegroundTestModelGen.xtend +++ b/test/de.cau.cs.kieler.klighd.piccolo.test/src/de/cau/cs/kieler/klighd/piccolo/test/highlightedEdgeToForeground/HighlightedEdgeToForegroundTestModelGen.xtend @@ -23,7 +23,7 @@ import de.cau.cs.kieler.klighd.krendering.extensions.KEdgeExtensions import de.cau.cs.kieler.klighd.krendering.extensions.KNodeExtensions import de.cau.cs.kieler.klighd.krendering.extensions.KPortExtensions import de.cau.cs.kieler.klighd.krendering.extensions.KRenderingExtensions -import javax.inject.Inject +import jakarta.inject.Inject import org.eclipse.elk.core.options.EdgeRouting import org.eclipse.elk.core.options.PortConstraints import org.eclipse.elk.core.options.PortSide diff --git a/test/de.cau.cs.kieler.klighd.test/META-INF/MANIFEST.MF b/test/de.cau.cs.kieler.klighd.test/META-INF/MANIFEST.MF index abf2acd1e..76355fb24 100644 --- a/test/de.cau.cs.kieler.klighd.test/META-INF/MANIFEST.MF +++ b/test/de.cau.cs.kieler.klighd.test/META-INF/MANIFEST.MF @@ -7,7 +7,8 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Require-Bundle: org.junit;bundle-version="4.8.0", org.eclipse.core.runtime, org.eclipse.elk.core.service, - org.hamcrest.library, + org.hamcrest.library;bundle-version="[0.0.0,2.0.0)", + org.hamcrest.core;bundle-version="[0.0.0,2.0.0)", de.cau.cs.kieler.klighd, de.cau.cs.kieler.klighd.incremental;resolution:=optional, de.cau.cs.kieler.klighd.piccolo;resolution:=optional, From f235e17d412931e183faf0671fb8211b05f97983 Mon Sep 17 00:00:00 2001 From: Niklas Rentz Date: Thu, 9 Nov 2023 16:21:51 +0100 Subject: [PATCH 2/7] enforce Java-11. --- plugins-dev/de.cau.cs.kieler.klighd.kgx/.classpath | 2 +- .../de.cau.cs.kieler.klighd.kgx/META-INF/MANIFEST.MF | 2 +- .../.classpath | 2 +- .../META-INF/MANIFEST.MF | 2 +- plugins/de.cau.cs.kieler.kgraph.text.ide/.classpath | 2 +- .../META-INF/MANIFEST.MF | 2 +- plugins/de.cau.cs.kieler.kgraph.text.ui/.classpath | 2 +- .../de.cau.cs.kieler.kgraph.text.ui/META-INF/MANIFEST.MF | 2 +- plugins/de.cau.cs.kieler.kgraph.text/.classpath | 2 +- .../de.cau.cs.kieler.kgraph.text/META-INF/MANIFEST.MF | 2 +- plugins/de.cau.cs.kieler.klighd.ide/.classpath | 2 +- plugins/de.cau.cs.kieler.klighd.ide/META-INF/MANIFEST.MF | 2 +- plugins/de.cau.cs.kieler.klighd.incremental/.classpath | 2 +- .../META-INF/MANIFEST.MF | 2 +- plugins/de.cau.cs.kieler.klighd.kgraph/.classpath | 2 +- .../de.cau.cs.kieler.klighd.kgraph/META-INF/MANIFEST.MF | 2 +- .../.classpath | 2 +- .../META-INF/MANIFEST.MF | 2 +- plugins/de.cau.cs.kieler.klighd.krendering/.classpath | 2 +- .../META-INF/MANIFEST.MF | 2 +- plugins/de.cau.cs.kieler.klighd.piccolo.batik/.classpath | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../de.cau.cs.kieler.klighd.piccolo.draw2d/.classpath | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../de.cau.cs.kieler.klighd.piccolo.freehep/.classpath | 2 +- .../META-INF/MANIFEST.MF | 2 +- plugins/de.cau.cs.kieler.klighd.piccolo/.classpath | 2 +- .../de.cau.cs.kieler.klighd.piccolo/META-INF/MANIFEST.MF | 2 +- plugins/de.cau.cs.kieler.klighd.standalone/.classpath | 2 +- .../META-INF/MANIFEST.MF | 2 +- plugins/de.cau.cs.kieler.klighd.ui.contrib3x/.classpath | 2 +- .../META-INF/MANIFEST.MF | 2 +- plugins/de.cau.cs.kieler.klighd.ui.emf/.classpath | 2 +- .../de.cau.cs.kieler.klighd.ui.emf/META-INF/MANIFEST.MF | 2 +- plugins/de.cau.cs.kieler.klighd.ui.view/.classpath | 2 +- .../de.cau.cs.kieler.klighd.ui.view/META-INF/MANIFEST.MF | 2 +- plugins/de.cau.cs.kieler.klighd.ui.wizard/.classpath | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../klighd/ui/wizard/KlighdProjectContributor.xtend | 3 ++- plugins/de.cau.cs.kieler.klighd.ui/.classpath | 2 +- plugins/de.cau.cs.kieler.klighd.ui/META-INF/MANIFEST.MF | 2 +- plugins/de.cau.cs.kieler.klighd/.classpath | 2 +- plugins/de.cau.cs.kieler.klighd/META-INF/MANIFEST.MF | 2 +- pom.xml | 9 ++++----- test/de.cau.cs.kieler.klighd.piccolo.test/.classpath | 2 +- .../runConfigs/AdapterTest.launch | 2 +- .../DiagramClipGlobalPortLabelVisiblityConfigTest.launch | 2 +- .../runConfigs/DiagramClipPortLabelVisibilityTest.launch | 2 +- .../runConfigs/DiagramClipTest.launch | 2 +- .../DiagramZoomControllerBoundsComputerTest.launch | 2 +- .../runConfigs/FreeHEPSVGOffscreenRenderingTest.launch | 2 +- .../runConfigs/HighlightedEdgeToForegroundTest.launch | 2 +- .../runConfigs/RenderingTest.launch | 2 +- .../de.cau.cs.kieler.klighd.piccolo.test.launch | 2 +- test/de.cau.cs.kieler.klighd.test/.classpath | 2 +- test/de.cau.cs.kieler.klighd.test/META-INF/MANIFEST.MF | 2 +- .../runConfigs/ConnectedEdgesTest.launch | 2 +- .../runConfigs/IncrementalUpdateTest.launch | 2 +- .../runConfigs/Iterables2Test.launch | 2 +- .../runConfigs/KGraphUtilTest.launch | 2 +- .../runConfigs/ModelingUtilTest.launch | 2 +- .../runConfigs/SizeEstimationTest.launch | 2 +- .../runConfigs/SizeEstimationTestWithFailings.launch | 2 +- .../ViewChangedNotificationSuppressionTest.launch | 2 +- .../runConfigs/ViewChangedNotificationTest.launch | 2 +- .../runConfigs/ViewContextSourceModelTrackingTest.launch | 2 +- .../runConfigs/de.cau.cs.kieler.klighd.test.launch | 2 +- 67 files changed, 71 insertions(+), 71 deletions(-) diff --git a/plugins-dev/de.cau.cs.kieler.klighd.kgx/.classpath b/plugins-dev/de.cau.cs.kieler.klighd.kgx/.classpath index eca7bdba8..e801ebfb4 100644 --- a/plugins-dev/de.cau.cs.kieler.klighd.kgx/.classpath +++ b/plugins-dev/de.cau.cs.kieler.klighd.kgx/.classpath @@ -1,6 +1,6 @@ - + diff --git a/plugins-dev/de.cau.cs.kieler.klighd.kgx/META-INF/MANIFEST.MF b/plugins-dev/de.cau.cs.kieler.klighd.kgx/META-INF/MANIFEST.MF index 5e41d7e6e..a36267692 100644 --- a/plugins-dev/de.cau.cs.kieler.klighd.kgx/META-INF/MANIFEST.MF +++ b/plugins-dev/de.cau.cs.kieler.klighd.kgx/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: KIELER Lightweight Diagrams Custom XMI Resource Factory Implementat Bundle-SymbolicName: de.cau.cs.kieler.klighd.kgx;singleton:=true Bundle-Version: 1.0.0.qualifier Automatic-Module-Name: de.cau.cs.kieler.klighd.kgx -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Bundle-Vendor: Kiel University Fragment-Host: de.cau.cs.kieler.klighd Require-Bundle: org.eclipse.emf.ecore.xmi diff --git a/plugins-dev/de.cau.cs.kieler.klighd.offscreen.application/.classpath b/plugins-dev/de.cau.cs.kieler.klighd.offscreen.application/.classpath index eca7bdba8..e801ebfb4 100644 --- a/plugins-dev/de.cau.cs.kieler.klighd.offscreen.application/.classpath +++ b/plugins-dev/de.cau.cs.kieler.klighd.offscreen.application/.classpath @@ -1,6 +1,6 @@ - + diff --git a/plugins-dev/de.cau.cs.kieler.klighd.offscreen.application/META-INF/MANIFEST.MF b/plugins-dev/de.cau.cs.kieler.klighd.offscreen.application/META-INF/MANIFEST.MF index 4c239448d..21e770e0e 100644 --- a/plugins-dev/de.cau.cs.kieler.klighd.offscreen.application/META-INF/MANIFEST.MF +++ b/plugins-dev/de.cau.cs.kieler.klighd.offscreen.application/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: KLighD Offscreen Rendering Application Bundle-SymbolicName: de.cau.cs.kieler.klighd.offscreen.application;singleton:=true Bundle-Version: 0.45.0.qualifier Bundle-Vendor: Kiel University -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Require-Bundle: org.eclipse.emf.ecore, org.eclipse.emf.ecore.xmi, de.cau.cs.kieler.klighd, diff --git a/plugins/de.cau.cs.kieler.kgraph.text.ide/.classpath b/plugins/de.cau.cs.kieler.kgraph.text.ide/.classpath index ad52d9d4d..0a3b82d4d 100644 --- a/plugins/de.cau.cs.kieler.kgraph.text.ide/.classpath +++ b/plugins/de.cau.cs.kieler.kgraph.text.ide/.classpath @@ -1,6 +1,6 @@ - + diff --git a/plugins/de.cau.cs.kieler.kgraph.text.ide/META-INF/MANIFEST.MF b/plugins/de.cau.cs.kieler.kgraph.text.ide/META-INF/MANIFEST.MF index 89f145d46..073b7d2a6 100644 --- a/plugins/de.cau.cs.kieler.kgraph.text.ide/META-INF/MANIFEST.MF +++ b/plugins/de.cau.cs.kieler.kgraph.text.ide/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: KIELER KGraph Text Ide Bundle-SymbolicName: de.cau.cs.kieler.kgraph.text.ide Bundle-Version: 2.3.1.qualifier Bundle-Vendor: Kiel University -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Require-Bundle: de.cau.cs.kieler.kgraph.text, org.eclipse.xtext.ide, com.google.guava, diff --git a/plugins/de.cau.cs.kieler.kgraph.text.ui/.classpath b/plugins/de.cau.cs.kieler.kgraph.text.ui/.classpath index 0377d772d..9891e0694 100644 --- a/plugins/de.cau.cs.kieler.kgraph.text.ui/.classpath +++ b/plugins/de.cau.cs.kieler.kgraph.text.ui/.classpath @@ -1,6 +1,6 @@ - + diff --git a/plugins/de.cau.cs.kieler.kgraph.text.ui/META-INF/MANIFEST.MF b/plugins/de.cau.cs.kieler.kgraph.text.ui/META-INF/MANIFEST.MF index 19cf491b9..3decd4c4b 100644 --- a/plugins/de.cau.cs.kieler.kgraph.text.ui/META-INF/MANIFEST.MF +++ b/plugins/de.cau.cs.kieler.kgraph.text.ui/META-INF/MANIFEST.MF @@ -21,7 +21,7 @@ Require-Bundle: org.eclipse.xtext.ui, de.cau.cs.kieler.klighd.kgraph Import-Package: org.apache.log4j DynamicImport-Package: de.cau.cs.kieler.klighd.test -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Export-Package: de.cau.cs.kieler.kgraph.text.ui, de.cau.cs.kieler.kgraph.text.ui.contentassist, de.cau.cs.kieler.kgraph.text.ui.internal, diff --git a/plugins/de.cau.cs.kieler.kgraph.text/.classpath b/plugins/de.cau.cs.kieler.kgraph.text/.classpath index 0377d772d..9891e0694 100644 --- a/plugins/de.cau.cs.kieler.kgraph.text/.classpath +++ b/plugins/de.cau.cs.kieler.kgraph.text/.classpath @@ -1,6 +1,6 @@ - + diff --git a/plugins/de.cau.cs.kieler.kgraph.text/META-INF/MANIFEST.MF b/plugins/de.cau.cs.kieler.kgraph.text/META-INF/MANIFEST.MF index 48bb9cdd0..98c4ad22c 100644 --- a/plugins/de.cau.cs.kieler.kgraph.text/META-INF/MANIFEST.MF +++ b/plugins/de.cau.cs.kieler.kgraph.text/META-INF/MANIFEST.MF @@ -23,7 +23,7 @@ Require-Bundle: org.eclipse.xtext;visibility:=reexport, de.cau.cs.kieler.klighd;resolution:=optional Import-Package: org.apache.log4j DynamicImport-Package: de.cau.cs.kieler.klighd.test -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Export-Package: de.cau.cs.kieler.kgraph.text, de.cau.cs.kieler.kgraph.text.formatting, de.cau.cs.kieler.kgraph.text.generator, diff --git a/plugins/de.cau.cs.kieler.klighd.ide/.classpath b/plugins/de.cau.cs.kieler.klighd.ide/.classpath index 2f5ffb21d..e769fecbe 100644 --- a/plugins/de.cau.cs.kieler.klighd.ide/.classpath +++ b/plugins/de.cau.cs.kieler.klighd.ide/.classpath @@ -1,6 +1,6 @@ - + diff --git a/plugins/de.cau.cs.kieler.klighd.ide/META-INF/MANIFEST.MF b/plugins/de.cau.cs.kieler.klighd.ide/META-INF/MANIFEST.MF index 5dfed97ed..36090a5ff 100644 --- a/plugins/de.cau.cs.kieler.klighd.ide/META-INF/MANIFEST.MF +++ b/plugins/de.cau.cs.kieler.klighd.ide/META-INF/MANIFEST.MF @@ -11,7 +11,7 @@ Require-Bundle: de.cau.cs.kieler.klighd;visibility:=reexport, org.eclipse.elk.alg.layered, org.eclipse.elk.core Bundle-ActivationPolicy: lazy -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Bundle-Vendor: Kiel University Export-Package: de.cau.cs.kieler.klighd.ide, de.cau.cs.kieler.klighd.ide.model, diff --git a/plugins/de.cau.cs.kieler.klighd.incremental/.classpath b/plugins/de.cau.cs.kieler.klighd.incremental/.classpath index 43b986286..1db08c6b4 100644 --- a/plugins/de.cau.cs.kieler.klighd.incremental/.classpath +++ b/plugins/de.cau.cs.kieler.klighd.incremental/.classpath @@ -1,6 +1,6 @@ - + diff --git a/plugins/de.cau.cs.kieler.klighd.incremental/META-INF/MANIFEST.MF b/plugins/de.cau.cs.kieler.klighd.incremental/META-INF/MANIFEST.MF index 4ffbed71e..90654d3c8 100644 --- a/plugins/de.cau.cs.kieler.klighd.incremental/META-INF/MANIFEST.MF +++ b/plugins/de.cau.cs.kieler.klighd.incremental/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: KlighD incremental update extension Bundle-SymbolicName: de.cau.cs.kieler.klighd.incremental;singleton:=true Bundle-Version: 2.3.1.qualifier Bundle-Vendor: Kiel University -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Require-Bundle: de.cau.cs.kieler.klighd, de.cau.cs.kieler.klighd.kgraph, com.google.guava diff --git a/plugins/de.cau.cs.kieler.klighd.kgraph/.classpath b/plugins/de.cau.cs.kieler.klighd.kgraph/.classpath index cf36b5611..bc57d2383 100644 --- a/plugins/de.cau.cs.kieler.klighd.kgraph/.classpath +++ b/plugins/de.cau.cs.kieler.klighd.kgraph/.classpath @@ -1,6 +1,6 @@ - + diff --git a/plugins/de.cau.cs.kieler.klighd.kgraph/META-INF/MANIFEST.MF b/plugins/de.cau.cs.kieler.klighd.kgraph/META-INF/MANIFEST.MF index c4aa8b08d..f9da6c450 100644 --- a/plugins/de.cau.cs.kieler.klighd.kgraph/META-INF/MANIFEST.MF +++ b/plugins/de.cau.cs.kieler.klighd.kgraph/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: KIELER Lightweight Diagrams Graph Model Bundle-SymbolicName: de.cau.cs.kieler.klighd.kgraph;singleton:=true Bundle-Version: 2.3.1.qualifier Bundle-ClassPath: . -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Export-Package: de.cau.cs.kieler.klighd.kgraph, de.cau.cs.kieler.klighd.kgraph.impl, de.cau.cs.kieler.klighd.kgraph.util diff --git a/plugins/de.cau.cs.kieler.klighd.krendering.extensions/.classpath b/plugins/de.cau.cs.kieler.klighd.krendering.extensions/.classpath index 2f5ffb21d..e769fecbe 100644 --- a/plugins/de.cau.cs.kieler.klighd.krendering.extensions/.classpath +++ b/plugins/de.cau.cs.kieler.klighd.krendering.extensions/.classpath @@ -1,6 +1,6 @@ - + diff --git a/plugins/de.cau.cs.kieler.klighd.krendering.extensions/META-INF/MANIFEST.MF b/plugins/de.cau.cs.kieler.klighd.krendering.extensions/META-INF/MANIFEST.MF index d2041547a..a6665cf9d 100644 --- a/plugins/de.cau.cs.kieler.klighd.krendering.extensions/META-INF/MANIFEST.MF +++ b/plugins/de.cau.cs.kieler.klighd.krendering.extensions/META-INF/MANIFEST.MF @@ -12,7 +12,7 @@ Require-Bundle: org.eclipse.core.runtime, org.eclipse.elk.core;bundle-version="0.1.0", de.cau.cs.kieler.klighd.krendering, de.cau.cs.kieler.klighd.kgraph -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Bundle-ActivationPolicy: lazy Export-Package: de.cau.cs.kieler.klighd.krendering.extensions Automatic-Module-Name: de.cau.cs.kieler.klighd.krendering.extensions diff --git a/plugins/de.cau.cs.kieler.klighd.krendering/.classpath b/plugins/de.cau.cs.kieler.klighd.krendering/.classpath index 8d0c758d4..bd4b424b6 100644 --- a/plugins/de.cau.cs.kieler.klighd.krendering/.classpath +++ b/plugins/de.cau.cs.kieler.klighd.krendering/.classpath @@ -1,6 +1,6 @@ - + diff --git a/plugins/de.cau.cs.kieler.klighd.krendering/META-INF/MANIFEST.MF b/plugins/de.cau.cs.kieler.klighd.krendering/META-INF/MANIFEST.MF index c707850ae..4992c4b9d 100644 --- a/plugins/de.cau.cs.kieler.klighd.krendering/META-INF/MANIFEST.MF +++ b/plugins/de.cau.cs.kieler.klighd.krendering/META-INF/MANIFEST.MF @@ -6,7 +6,7 @@ Automatic-Module-Name: de.cau.cs.kieler.klighd.krendering Bundle-Version: 2.3.1.qualifier Bundle-ClassPath: . Bundle-Vendor: Kiel University -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Export-Package: de.cau.cs.kieler.klighd.krendering, de.cau.cs.kieler.klighd.krendering.impl, de.cau.cs.kieler.klighd.krendering.util diff --git a/plugins/de.cau.cs.kieler.klighd.piccolo.batik/.classpath b/plugins/de.cau.cs.kieler.klighd.piccolo.batik/.classpath index 711341e8d..9715836f2 100644 --- a/plugins/de.cau.cs.kieler.klighd.piccolo.batik/.classpath +++ b/plugins/de.cau.cs.kieler.klighd.piccolo.batik/.classpath @@ -7,7 +7,7 @@ - + diff --git a/plugins/de.cau.cs.kieler.klighd.piccolo.batik/META-INF/MANIFEST.MF b/plugins/de.cau.cs.kieler.klighd.piccolo.batik/META-INF/MANIFEST.MF index 977fe3bd6..a78256dc0 100644 --- a/plugins/de.cau.cs.kieler.klighd.piccolo.batik/META-INF/MANIFEST.MF +++ b/plugins/de.cau.cs.kieler.klighd.piccolo.batik/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-SymbolicName: de.cau.cs.kieler.klighd.piccolo.batik;singleton:=true Bundle-Version: 2.2.1.qualifier Bundle-Vendor: Kiel University Fragment-Host: de.cau.cs.kieler.klighd.piccolo;bundle-version="0.10.0" -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Bundle-ClassPath: ., lib/batik.jar, lib/lib/batik-dom.jar, diff --git a/plugins/de.cau.cs.kieler.klighd.piccolo.draw2d/.classpath b/plugins/de.cau.cs.kieler.klighd.piccolo.draw2d/.classpath index eca7bdba8..e801ebfb4 100644 --- a/plugins/de.cau.cs.kieler.klighd.piccolo.draw2d/.classpath +++ b/plugins/de.cau.cs.kieler.klighd.piccolo.draw2d/.classpath @@ -1,6 +1,6 @@ - + diff --git a/plugins/de.cau.cs.kieler.klighd.piccolo.draw2d/META-INF/MANIFEST.MF b/plugins/de.cau.cs.kieler.klighd.piccolo.draw2d/META-INF/MANIFEST.MF index b36cfcb69..41b86dd32 100644 --- a/plugins/de.cau.cs.kieler.klighd.piccolo.draw2d/META-INF/MANIFEST.MF +++ b/plugins/de.cau.cs.kieler.klighd.piccolo.draw2d/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-SymbolicName: de.cau.cs.kieler.klighd.piccolo.draw2d;singleton:=true Bundle-Version: 2.3.1.qualifier Bundle-Vendor: Kiel University Fragment-Host: de.cau.cs.kieler.klighd.piccolo -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Require-Bundle: com.google.guava;bundle-version="10.0.0", org.eclipse.draw2d;bundle-version="3.7.0" Automatic-Module-Name: de.cau.cs.kieler.klighd.piccolo.draw2d diff --git a/plugins/de.cau.cs.kieler.klighd.piccolo.freehep/.classpath b/plugins/de.cau.cs.kieler.klighd.piccolo.freehep/.classpath index ec88fe259..91cbc7b24 100644 --- a/plugins/de.cau.cs.kieler.klighd.piccolo.freehep/.classpath +++ b/plugins/de.cau.cs.kieler.klighd.piccolo.freehep/.classpath @@ -1,6 +1,6 @@ - + diff --git a/plugins/de.cau.cs.kieler.klighd.piccolo.freehep/META-INF/MANIFEST.MF b/plugins/de.cau.cs.kieler.klighd.piccolo.freehep/META-INF/MANIFEST.MF index 7677b38ba..4d04a2f6a 100644 --- a/plugins/de.cau.cs.kieler.klighd.piccolo.freehep/META-INF/MANIFEST.MF +++ b/plugins/de.cau.cs.kieler.klighd.piccolo.freehep/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-SymbolicName: de.cau.cs.kieler.klighd.piccolo.freehep;singleton:=true Bundle-Version: 2.3.1.qualifier Bundle-Vendor: Kiel University Fragment-Host: de.cau.cs.kieler.klighd.piccolo -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Bundle-ClassPath: ., lib/freehep-graphics2d-2.3.jar, lib/freehep-graphicsbase-2.3.jar, diff --git a/plugins/de.cau.cs.kieler.klighd.piccolo/.classpath b/plugins/de.cau.cs.kieler.klighd.piccolo/.classpath index 43b986286..1db08c6b4 100644 --- a/plugins/de.cau.cs.kieler.klighd.piccolo/.classpath +++ b/plugins/de.cau.cs.kieler.klighd.piccolo/.classpath @@ -1,6 +1,6 @@ - + diff --git a/plugins/de.cau.cs.kieler.klighd.piccolo/META-INF/MANIFEST.MF b/plugins/de.cau.cs.kieler.klighd.piccolo/META-INF/MANIFEST.MF index 9aeef5e0e..b53001927 100644 --- a/plugins/de.cau.cs.kieler.klighd.piccolo/META-INF/MANIFEST.MF +++ b/plugins/de.cau.cs.kieler.klighd.piccolo/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: KIELER Lightweight Diagrams Powered by Piccolo2D Bundle-SymbolicName: de.cau.cs.kieler.klighd.piccolo;singleton:=true Bundle-Version: 2.3.1.qualifier Bundle-Vendor: Kiel University -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Bundle-ActivationPolicy: lazy Require-Bundle: com.google.guava;bundle-version="10.0.0", de.cau.cs.kieler.klighd;bundle-version="0.3.0";visibility:=reexport, diff --git a/plugins/de.cau.cs.kieler.klighd.standalone/.classpath b/plugins/de.cau.cs.kieler.klighd.standalone/.classpath index cf36b5611..bc57d2383 100644 --- a/plugins/de.cau.cs.kieler.klighd.standalone/.classpath +++ b/plugins/de.cau.cs.kieler.klighd.standalone/.classpath @@ -1,6 +1,6 @@ - + diff --git a/plugins/de.cau.cs.kieler.klighd.standalone/META-INF/MANIFEST.MF b/plugins/de.cau.cs.kieler.klighd.standalone/META-INF/MANIFEST.MF index f3822bf83..531c019e7 100644 --- a/plugins/de.cau.cs.kieler.klighd.standalone/META-INF/MANIFEST.MF +++ b/plugins/de.cau.cs.kieler.klighd.standalone/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: KIELER Lightweight Diagrams Standalone Setup Bundle-SymbolicName: de.cau.cs.kieler.klighd.standalone Bundle-Version: 2.3.1.qualifier Bundle-Vendor: KIELER Lightweight Diagrams (KLighD) -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Require-Bundle: org.eclipse.emf.ecore.xmi, org.eclipse.elk.core, de.cau.cs.kieler.klighd, diff --git a/plugins/de.cau.cs.kieler.klighd.ui.contrib3x/.classpath b/plugins/de.cau.cs.kieler.klighd.ui.contrib3x/.classpath index dc7ce67ee..19ef143f2 100644 --- a/plugins/de.cau.cs.kieler.klighd.ui.contrib3x/.classpath +++ b/plugins/de.cau.cs.kieler.klighd.ui.contrib3x/.classpath @@ -1,5 +1,5 @@ - + diff --git a/plugins/de.cau.cs.kieler.klighd.ui.contrib3x/META-INF/MANIFEST.MF b/plugins/de.cau.cs.kieler.klighd.ui.contrib3x/META-INF/MANIFEST.MF index f48b7252a..989d621fb 100644 --- a/plugins/de.cau.cs.kieler.klighd.ui.contrib3x/META-INF/MANIFEST.MF +++ b/plugins/de.cau.cs.kieler.klighd.ui.contrib3x/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: KLighD-specific Eclipse 3x UI contributions Bundle-SymbolicName: de.cau.cs.kieler.klighd.ui.contrib3x;singleton:=true Bundle-Version: 2.3.1.qualifier Bundle-Vendor: Kiel University -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Require-Bundle: org.eclipse.ui;bundle-version="3.105.0", de.cau.cs.kieler.klighd.ui;bundle-version="0.5.0" Automatic-Module-Name: de.cau.cs.kieler.klighd.ui.contrib3x diff --git a/plugins/de.cau.cs.kieler.klighd.ui.emf/.classpath b/plugins/de.cau.cs.kieler.klighd.ui.emf/.classpath index eca7bdba8..e801ebfb4 100644 --- a/plugins/de.cau.cs.kieler.klighd.ui.emf/.classpath +++ b/plugins/de.cau.cs.kieler.klighd.ui.emf/.classpath @@ -1,6 +1,6 @@ - + diff --git a/plugins/de.cau.cs.kieler.klighd.ui.emf/META-INF/MANIFEST.MF b/plugins/de.cau.cs.kieler.klighd.ui.emf/META-INF/MANIFEST.MF index 380259f9c..9a597657c 100644 --- a/plugins/de.cau.cs.kieler.klighd.ui.emf/META-INF/MANIFEST.MF +++ b/plugins/de.cau.cs.kieler.klighd.ui.emf/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: KLighD Model Modification Extensions for EMF Domains Bundle-SymbolicName: de.cau.cs.kieler.klighd.ui.emf;singleton:=true Bundle-Version: 2.3.1.qualifier Fragment-Host: de.cau.cs.kieler.klighd.ui -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Require-Bundle: org.eclipse.emf.transaction, org.eclipse.emf.workspace Bundle-Vendor: Kiel University diff --git a/plugins/de.cau.cs.kieler.klighd.ui.view/.classpath b/plugins/de.cau.cs.kieler.klighd.ui.view/.classpath index eca7bdba8..e801ebfb4 100644 --- a/plugins/de.cau.cs.kieler.klighd.ui.view/.classpath +++ b/plugins/de.cau.cs.kieler.klighd.ui.view/.classpath @@ -1,6 +1,6 @@ - + diff --git a/plugins/de.cau.cs.kieler.klighd.ui.view/META-INF/MANIFEST.MF b/plugins/de.cau.cs.kieler.klighd.ui.view/META-INF/MANIFEST.MF index fceca165a..7f8a56046 100644 --- a/plugins/de.cau.cs.kieler.klighd.ui.view/META-INF/MANIFEST.MF +++ b/plugins/de.cau.cs.kieler.klighd.ui.view/META-INF/MANIFEST.MF @@ -15,7 +15,7 @@ Require-Bundle: org.eclipse.emf, org.eclipse.elk.alg.layered, de.cau.cs.kieler.klighd.kgraph, de.cau.cs.kieler.klighd.ide -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Bundle-ActivationPolicy: lazy Bundle-Vendor: Kiel University Export-Package: de.cau.cs.kieler.klighd.ui.view, diff --git a/plugins/de.cau.cs.kieler.klighd.ui.wizard/.classpath b/plugins/de.cau.cs.kieler.klighd.ui.wizard/.classpath index 428337e56..47ce7cd07 100644 --- a/plugins/de.cau.cs.kieler.klighd.ui.wizard/.classpath +++ b/plugins/de.cau.cs.kieler.klighd.ui.wizard/.classpath @@ -1,6 +1,6 @@ - + diff --git a/plugins/de.cau.cs.kieler.klighd.ui.wizard/META-INF/MANIFEST.MF b/plugins/de.cau.cs.kieler.klighd.ui.wizard/META-INF/MANIFEST.MF index 45a32a9ab..d7cea6946 100644 --- a/plugins/de.cau.cs.kieler.klighd.ui.wizard/META-INF/MANIFEST.MF +++ b/plugins/de.cau.cs.kieler.klighd.ui.wizard/META-INF/MANIFEST.MF @@ -19,7 +19,7 @@ Require-Bundle: org.apache.log4j, org.eclipse.xtext.xbase.lib, org.eclipse.xtext.ui, org.eclipse.xtext.ui.shared -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Bundle-ActivationPolicy: lazy Bundle-Vendor: Kiel University Automatic-Module-Name: de.cau.cs.kieler.klighd.ui.wizard diff --git a/plugins/de.cau.cs.kieler.klighd.ui.wizard/src/de/cau/cs/kieler/klighd/ui/wizard/KlighdProjectContributor.xtend b/plugins/de.cau.cs.kieler.klighd.ui.wizard/src/de/cau/cs/kieler/klighd/ui/wizard/KlighdProjectContributor.xtend index 65fda1d33..26de2e48e 100644 --- a/plugins/de.cau.cs.kieler.klighd.ui.wizard/src/de/cau/cs/kieler/klighd/ui/wizard/KlighdProjectContributor.xtend +++ b/plugins/de.cau.cs.kieler.klighd.ui.wizard/src/de/cau/cs/kieler/klighd/ui/wizard/KlighdProjectContributor.xtend @@ -64,7 +64,8 @@ class KlighdProjectContributor implements IProjectFactoryContributor { case "JavaSE-1.6": "1.6" case "JavaSE-1.7": "1.7" case "JavaSE-1.8": "1.8" - default: "1.8" + case "JavaSE-11" : "11" + default: "11" } ''' diff --git a/plugins/de.cau.cs.kieler.klighd.ui/.classpath b/plugins/de.cau.cs.kieler.klighd.ui/.classpath index eca7bdba8..e801ebfb4 100644 --- a/plugins/de.cau.cs.kieler.klighd.ui/.classpath +++ b/plugins/de.cau.cs.kieler.klighd.ui/.classpath @@ -1,6 +1,6 @@ - + diff --git a/plugins/de.cau.cs.kieler.klighd.ui/META-INF/MANIFEST.MF b/plugins/de.cau.cs.kieler.klighd.ui/META-INF/MANIFEST.MF index 36762da7f..c85ca4504 100644 --- a/plugins/de.cau.cs.kieler.klighd.ui/META-INF/MANIFEST.MF +++ b/plugins/de.cau.cs.kieler.klighd.ui/META-INF/MANIFEST.MF @@ -21,7 +21,7 @@ Require-Bundle: org.eclipse.core.expressions;bundle-version="3.4.400", org.eclipse.elk.core.service;bundle-version="0.1.0", org.eclipse.core.databinding.property;bundle-version="1.8.0" Bundle-ActivationPolicy: lazy -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Bundle-Vendor: Kiel University Export-Package: de.cau.cs.kieler.klighd.ui, de.cau.cs.kieler.klighd.ui.internal;x-friends:="de.cau.cs.kieler.klighd.ui.contrib3x", diff --git a/plugins/de.cau.cs.kieler.klighd/.classpath b/plugins/de.cau.cs.kieler.klighd/.classpath index 6122403cc..1d45a8a9f 100644 --- a/plugins/de.cau.cs.kieler.klighd/.classpath +++ b/plugins/de.cau.cs.kieler.klighd/.classpath @@ -1,6 +1,6 @@ - + diff --git a/plugins/de.cau.cs.kieler.klighd/META-INF/MANIFEST.MF b/plugins/de.cau.cs.kieler.klighd/META-INF/MANIFEST.MF index c065d4b46..4d9008e8a 100644 --- a/plugins/de.cau.cs.kieler.klighd/META-INF/MANIFEST.MF +++ b/plugins/de.cau.cs.kieler.klighd/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: KIELER Lightweight Diagrams (KLighD) Bundle-SymbolicName: de.cau.cs.kieler.klighd;singleton:=true Bundle-Version: 2.3.1.qualifier Bundle-Vendor: Kiel University -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Require-Bundle: de.cau.cs.kieler.klighd.kgraph, de.cau.cs.kieler.klighd.krendering;visibility:=reexport, org.eclipse.core.runtime;bundle-version="3.6.0";visibility:=reexport, diff --git a/pom.xml b/pom.xml index 9a4d3cc40..f0db7cb8a 100644 --- a/pom.xml +++ b/pom.xml @@ -82,12 +82,10 @@ UTF-8 UTF-8 - - 1.8 + + 11 - - + 11 @@ -399,6 +397,7 @@ maven-javadoc-plugin 3.5.0 + 8 diff --git a/test/de.cau.cs.kieler.klighd.piccolo.test/.classpath b/test/de.cau.cs.kieler.klighd.piccolo.test/.classpath index 428337e56..47ce7cd07 100644 --- a/test/de.cau.cs.kieler.klighd.piccolo.test/.classpath +++ b/test/de.cau.cs.kieler.klighd.piccolo.test/.classpath @@ -1,6 +1,6 @@ - + diff --git a/test/de.cau.cs.kieler.klighd.piccolo.test/runConfigs/AdapterTest.launch b/test/de.cau.cs.kieler.klighd.piccolo.test/runConfigs/AdapterTest.launch index c8f09e5ab..b0eff6b72 100644 --- a/test/de.cau.cs.kieler.klighd.piccolo.test/runConfigs/AdapterTest.launch +++ b/test/de.cau.cs.kieler.klighd.piccolo.test/runConfigs/AdapterTest.launch @@ -25,7 +25,7 @@ - + diff --git a/test/de.cau.cs.kieler.klighd.piccolo.test/runConfigs/DiagramClipGlobalPortLabelVisiblityConfigTest.launch b/test/de.cau.cs.kieler.klighd.piccolo.test/runConfigs/DiagramClipGlobalPortLabelVisiblityConfigTest.launch index d4eb4e7ed..2befe26ac 100644 --- a/test/de.cau.cs.kieler.klighd.piccolo.test/runConfigs/DiagramClipGlobalPortLabelVisiblityConfigTest.launch +++ b/test/de.cau.cs.kieler.klighd.piccolo.test/runConfigs/DiagramClipGlobalPortLabelVisiblityConfigTest.launch @@ -25,7 +25,7 @@ - + diff --git a/test/de.cau.cs.kieler.klighd.piccolo.test/runConfigs/DiagramClipPortLabelVisibilityTest.launch b/test/de.cau.cs.kieler.klighd.piccolo.test/runConfigs/DiagramClipPortLabelVisibilityTest.launch index bae5b84aa..fa93140b6 100644 --- a/test/de.cau.cs.kieler.klighd.piccolo.test/runConfigs/DiagramClipPortLabelVisibilityTest.launch +++ b/test/de.cau.cs.kieler.klighd.piccolo.test/runConfigs/DiagramClipPortLabelVisibilityTest.launch @@ -25,7 +25,7 @@ - + diff --git a/test/de.cau.cs.kieler.klighd.piccolo.test/runConfigs/DiagramClipTest.launch b/test/de.cau.cs.kieler.klighd.piccolo.test/runConfigs/DiagramClipTest.launch index 100cc1857..006490d0c 100644 --- a/test/de.cau.cs.kieler.klighd.piccolo.test/runConfigs/DiagramClipTest.launch +++ b/test/de.cau.cs.kieler.klighd.piccolo.test/runConfigs/DiagramClipTest.launch @@ -25,7 +25,7 @@ - + diff --git a/test/de.cau.cs.kieler.klighd.piccolo.test/runConfigs/DiagramZoomControllerBoundsComputerTest.launch b/test/de.cau.cs.kieler.klighd.piccolo.test/runConfigs/DiagramZoomControllerBoundsComputerTest.launch index 5d418e96a..2c526ce9c 100644 --- a/test/de.cau.cs.kieler.klighd.piccolo.test/runConfigs/DiagramZoomControllerBoundsComputerTest.launch +++ b/test/de.cau.cs.kieler.klighd.piccolo.test/runConfigs/DiagramZoomControllerBoundsComputerTest.launch @@ -25,7 +25,7 @@ - + diff --git a/test/de.cau.cs.kieler.klighd.piccolo.test/runConfigs/FreeHEPSVGOffscreenRenderingTest.launch b/test/de.cau.cs.kieler.klighd.piccolo.test/runConfigs/FreeHEPSVGOffscreenRenderingTest.launch index 3a6c88b70..8a7c8354e 100644 --- a/test/de.cau.cs.kieler.klighd.piccolo.test/runConfigs/FreeHEPSVGOffscreenRenderingTest.launch +++ b/test/de.cau.cs.kieler.klighd.piccolo.test/runConfigs/FreeHEPSVGOffscreenRenderingTest.launch @@ -26,7 +26,7 @@ - + diff --git a/test/de.cau.cs.kieler.klighd.piccolo.test/runConfigs/HighlightedEdgeToForegroundTest.launch b/test/de.cau.cs.kieler.klighd.piccolo.test/runConfigs/HighlightedEdgeToForegroundTest.launch index 1eaf256d3..745bc633b 100644 --- a/test/de.cau.cs.kieler.klighd.piccolo.test/runConfigs/HighlightedEdgeToForegroundTest.launch +++ b/test/de.cau.cs.kieler.klighd.piccolo.test/runConfigs/HighlightedEdgeToForegroundTest.launch @@ -26,7 +26,7 @@ - + diff --git a/test/de.cau.cs.kieler.klighd.piccolo.test/runConfigs/RenderingTest.launch b/test/de.cau.cs.kieler.klighd.piccolo.test/runConfigs/RenderingTest.launch index 291428ba0..c55e05e91 100644 --- a/test/de.cau.cs.kieler.klighd.piccolo.test/runConfigs/RenderingTest.launch +++ b/test/de.cau.cs.kieler.klighd.piccolo.test/runConfigs/RenderingTest.launch @@ -25,7 +25,7 @@ - + diff --git a/test/de.cau.cs.kieler.klighd.piccolo.test/runConfigs/de.cau.cs.kieler.klighd.piccolo.test.launch b/test/de.cau.cs.kieler.klighd.piccolo.test/runConfigs/de.cau.cs.kieler.klighd.piccolo.test.launch index acc444dc5..d637b0049 100644 --- a/test/de.cau.cs.kieler.klighd.piccolo.test/runConfigs/de.cau.cs.kieler.klighd.piccolo.test.launch +++ b/test/de.cau.cs.kieler.klighd.piccolo.test/runConfigs/de.cau.cs.kieler.klighd.piccolo.test.launch @@ -25,7 +25,7 @@ - + diff --git a/test/de.cau.cs.kieler.klighd.test/.classpath b/test/de.cau.cs.kieler.klighd.test/.classpath index eca7bdba8..e801ebfb4 100644 --- a/test/de.cau.cs.kieler.klighd.test/.classpath +++ b/test/de.cau.cs.kieler.klighd.test/.classpath @@ -1,6 +1,6 @@ - + diff --git a/test/de.cau.cs.kieler.klighd.test/META-INF/MANIFEST.MF b/test/de.cau.cs.kieler.klighd.test/META-INF/MANIFEST.MF index 76355fb24..760b8eb26 100644 --- a/test/de.cau.cs.kieler.klighd.test/META-INF/MANIFEST.MF +++ b/test/de.cau.cs.kieler.klighd.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: KLighD Tests Bundle-SymbolicName: de.cau.cs.kieler.klighd.test;singleton:=true Bundle-Version: 2.3.1.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Require-Bundle: org.junit;bundle-version="4.8.0", org.eclipse.core.runtime, org.eclipse.elk.core.service, diff --git a/test/de.cau.cs.kieler.klighd.test/runConfigs/ConnectedEdgesTest.launch b/test/de.cau.cs.kieler.klighd.test/runConfigs/ConnectedEdgesTest.launch index b0cc24401..960040f7d 100644 --- a/test/de.cau.cs.kieler.klighd.test/runConfigs/ConnectedEdgesTest.launch +++ b/test/de.cau.cs.kieler.klighd.test/runConfigs/ConnectedEdgesTest.launch @@ -25,7 +25,7 @@ - + diff --git a/test/de.cau.cs.kieler.klighd.test/runConfigs/IncrementalUpdateTest.launch b/test/de.cau.cs.kieler.klighd.test/runConfigs/IncrementalUpdateTest.launch index 635496efb..66307c027 100644 --- a/test/de.cau.cs.kieler.klighd.test/runConfigs/IncrementalUpdateTest.launch +++ b/test/de.cau.cs.kieler.klighd.test/runConfigs/IncrementalUpdateTest.launch @@ -26,7 +26,7 @@ - + diff --git a/test/de.cau.cs.kieler.klighd.test/runConfigs/Iterables2Test.launch b/test/de.cau.cs.kieler.klighd.test/runConfigs/Iterables2Test.launch index 2acd2050d..e936f6683 100644 --- a/test/de.cau.cs.kieler.klighd.test/runConfigs/Iterables2Test.launch +++ b/test/de.cau.cs.kieler.klighd.test/runConfigs/Iterables2Test.launch @@ -25,7 +25,7 @@ - + diff --git a/test/de.cau.cs.kieler.klighd.test/runConfigs/KGraphUtilTest.launch b/test/de.cau.cs.kieler.klighd.test/runConfigs/KGraphUtilTest.launch index 12b9c64bc..925808c3b 100644 --- a/test/de.cau.cs.kieler.klighd.test/runConfigs/KGraphUtilTest.launch +++ b/test/de.cau.cs.kieler.klighd.test/runConfigs/KGraphUtilTest.launch @@ -25,7 +25,7 @@ - + diff --git a/test/de.cau.cs.kieler.klighd.test/runConfigs/ModelingUtilTest.launch b/test/de.cau.cs.kieler.klighd.test/runConfigs/ModelingUtilTest.launch index aad6b0db1..43c3a7441 100644 --- a/test/de.cau.cs.kieler.klighd.test/runConfigs/ModelingUtilTest.launch +++ b/test/de.cau.cs.kieler.klighd.test/runConfigs/ModelingUtilTest.launch @@ -25,7 +25,7 @@ - + diff --git a/test/de.cau.cs.kieler.klighd.test/runConfigs/SizeEstimationTest.launch b/test/de.cau.cs.kieler.klighd.test/runConfigs/SizeEstimationTest.launch index 9b3cb36fd..84a56ec49 100644 --- a/test/de.cau.cs.kieler.klighd.test/runConfigs/SizeEstimationTest.launch +++ b/test/de.cau.cs.kieler.klighd.test/runConfigs/SizeEstimationTest.launch @@ -25,7 +25,7 @@ - + diff --git a/test/de.cau.cs.kieler.klighd.test/runConfigs/SizeEstimationTestWithFailings.launch b/test/de.cau.cs.kieler.klighd.test/runConfigs/SizeEstimationTestWithFailings.launch index 9b27a8b7c..561af6bba 100644 --- a/test/de.cau.cs.kieler.klighd.test/runConfigs/SizeEstimationTestWithFailings.launch +++ b/test/de.cau.cs.kieler.klighd.test/runConfigs/SizeEstimationTestWithFailings.launch @@ -25,7 +25,7 @@ - + diff --git a/test/de.cau.cs.kieler.klighd.test/runConfigs/ViewChangedNotificationSuppressionTest.launch b/test/de.cau.cs.kieler.klighd.test/runConfigs/ViewChangedNotificationSuppressionTest.launch index 8014f08cb..0997fe0aa 100644 --- a/test/de.cau.cs.kieler.klighd.test/runConfigs/ViewChangedNotificationSuppressionTest.launch +++ b/test/de.cau.cs.kieler.klighd.test/runConfigs/ViewChangedNotificationSuppressionTest.launch @@ -25,7 +25,7 @@ - + diff --git a/test/de.cau.cs.kieler.klighd.test/runConfigs/ViewChangedNotificationTest.launch b/test/de.cau.cs.kieler.klighd.test/runConfigs/ViewChangedNotificationTest.launch index 4067eb61c..f90365ece 100644 --- a/test/de.cau.cs.kieler.klighd.test/runConfigs/ViewChangedNotificationTest.launch +++ b/test/de.cau.cs.kieler.klighd.test/runConfigs/ViewChangedNotificationTest.launch @@ -26,7 +26,7 @@ - + diff --git a/test/de.cau.cs.kieler.klighd.test/runConfigs/ViewContextSourceModelTrackingTest.launch b/test/de.cau.cs.kieler.klighd.test/runConfigs/ViewContextSourceModelTrackingTest.launch index 796e576ff..8d6eb52bf 100644 --- a/test/de.cau.cs.kieler.klighd.test/runConfigs/ViewContextSourceModelTrackingTest.launch +++ b/test/de.cau.cs.kieler.klighd.test/runConfigs/ViewContextSourceModelTrackingTest.launch @@ -25,7 +25,7 @@ - + diff --git a/test/de.cau.cs.kieler.klighd.test/runConfigs/de.cau.cs.kieler.klighd.test.launch b/test/de.cau.cs.kieler.klighd.test/runConfigs/de.cau.cs.kieler.klighd.test.launch index 1a19cb1f7..b9e732a35 100644 --- a/test/de.cau.cs.kieler.klighd.test/runConfigs/de.cau.cs.kieler.klighd.test.launch +++ b/test/de.cau.cs.kieler.klighd.test/runConfigs/de.cau.cs.kieler.klighd.test.launch @@ -25,7 +25,7 @@ - + From 01eae363c199a3685a35660bb1a8c7ec3253e76d Mon Sep 17 00:00:00 2001 From: Niklas Rentz Date: Thu, 9 Nov 2023 16:25:58 +0100 Subject: [PATCH 3/7] re-inject diagram server fields because old javax.inject uses in dependent Sprotty release. --- .../klighd/lsp/KGraphDiagramServer.xtend | 49 +++++++++++++++++++ ...edInteractiveLanguageServerExtension.xtend | 2 +- ...ngInteractiveLanguageServerExtension.xtend | 2 +- 3 files changed, 51 insertions(+), 2 deletions(-) diff --git a/plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/KGraphDiagramServer.xtend b/plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/KGraphDiagramServer.xtend index aad234347..d67576498 100644 --- a/plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/KGraphDiagramServer.xtend +++ b/plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/KGraphDiagramServer.xtend @@ -61,8 +61,13 @@ import org.eclipse.elk.graph.properties.IProperty import org.eclipse.emf.ecore.EObject import org.eclipse.sprotty.Action import org.eclipse.sprotty.ActionMessage +import org.eclipse.sprotty.ComputedBoundsApplicator +import org.eclipse.sprotty.IDiagramExpansionListener +import org.eclipse.sprotty.IDiagramOpenListener +import org.eclipse.sprotty.IDiagramSelectionListener import org.eclipse.sprotty.ILayoutEngine import org.eclipse.sprotty.IModelUpdateListener +import org.eclipse.sprotty.IPopupModelFactory import org.eclipse.sprotty.LayoutAction import org.eclipse.sprotty.RejectAction import org.eclipse.sprotty.RequestBoundsAction @@ -638,4 +643,48 @@ class KGraphDiagramServer extends LanguageAwareDiagramServer { override SModelRoot getModel() { return currentRoot; } + + // Repeat injection of multiple methods of the DefaultDiagramServer as the javax.inject->jakarta.inject transition + // broke something here. + // TODO: remove when not necessary anymore + + @Inject + override setModelUpdateListener(IModelUpdateListener listener) { + super.modelUpdateListener = listener; + } + + @Inject + override setLayoutEngine(ILayoutEngine engine) { + super.layoutEngine = engine; + } + + @Inject + override setComputedBoundsApplicator(ComputedBoundsApplicator computedBoundsApplicator) { + super.computedBoundsApplicator = computedBoundsApplicator; + } + + @Inject + override setPopupModelFactory(IPopupModelFactory factory) { + super.popupModelFactory = factory; + } + + @Inject + override setSelectionListener(IDiagramSelectionListener listener) { + super.selectionListener = listener; + } + + @Inject + override setExpansionListener(IDiagramExpansionListener diagramExpansionListener) { + super.expansionListener = diagramExpansionListener; + } + + @Inject + override setOpenListener(IDiagramOpenListener diagramOpenListener) { + super.openListener = diagramOpenListener; + } + + @Inject + override setSModelCloner(SModelCloner smodelCloner) { + super.SModelCloner = smodelCloner; + } } diff --git a/plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/interactive/layered/LayeredInteractiveLanguageServerExtension.xtend b/plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/interactive/layered/LayeredInteractiveLanguageServerExtension.xtend index fa9819f16..a14cf6fe2 100644 --- a/plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/interactive/layered/LayeredInteractiveLanguageServerExtension.xtend +++ b/plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/interactive/layered/LayeredInteractiveLanguageServerExtension.xtend @@ -29,7 +29,7 @@ import java.io.ByteArrayOutputStream import java.util.HashMap import java.util.List import java.util.Map -import javax.inject.Singleton +import jakarta.inject.Singleton import org.eclipse.elk.alg.layered.options.LayeredOptions import org.eclipse.elk.graph.ElkNode import org.eclipse.elk.graph.properties.IProperty diff --git a/plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/interactive/rectpacking/RectpackingInteractiveLanguageServerExtension.xtend b/plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/interactive/rectpacking/RectpackingInteractiveLanguageServerExtension.xtend index 61ad1b56f..40ea40f4b 100644 --- a/plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/interactive/rectpacking/RectpackingInteractiveLanguageServerExtension.xtend +++ b/plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/interactive/rectpacking/RectpackingInteractiveLanguageServerExtension.xtend @@ -28,7 +28,7 @@ import java.io.ByteArrayOutputStream import java.util.Arrays import java.util.List import java.util.Map -import javax.inject.Singleton +import jakarta.inject.Singleton import org.eclipse.elk.alg.rectpacking.options.RectPackingOptions import org.eclipse.elk.core.options.CoreOptions import org.eclipse.elk.graph.ElkNode From 7e6552481e154d867e69527832913239dda665ee Mon Sep 17 00:00:00 2001 From: Niklas Rentz Date: Thu, 22 Feb 2024 12:50:49 +0100 Subject: [PATCH 4/7] updated to Eclipse 2023-12 release and ELK 0.9.0. Replaced all injections with com.google.inject (which in turn aliases jakarta.inject) --- .../category.xml | 8 +++--- .../pom.xml | 8 +++--- ...er.klighd.targetplatform-elkNightly.target | 7 ++--- ...d.targetplatform-piccolo-elkNightly.target | 7 ++--- ...ieler.klighd.targetplatform-piccolo.target | 9 +++--- ...cau.cs.kieler.klighd.targetplatform.target | 9 +++--- .../contentassist/KGraphProposalProvider.java | 4 +-- .../kgraph/text/KGraphValueConverters.java | 4 +-- .../META-INF/MANIFEST.MF | 3 +- plugins/de.cau.cs.kieler.klighd.ide/pom.xml | 5 ++++ .../syntheses/EObjectFallbackSynthesis.xtend | 2 +- .../ide/syntheses/ErrorModelSynthesis.xtend | 2 +- .../ide/syntheses/MessageModelSynthesis.xtend | 2 +- .../lsp/KGraphDiagramServerManager.xtend | 4 +-- ...edInteractiveLanguageServerExtension.xtend | 2 +- ...ngInteractiveLanguageServerExtension.xtend | 2 +- .../ui/wizard/KlighdProjectContributor.xtend | 2 +- .../syntheses/AbstractDiagramSynthesis.java | 4 +-- pom.xml | 28 +++++++++++-------- ...hlightedEdgeToForegroundTestModelGen.xtend | 2 +- 20 files changed, 61 insertions(+), 53 deletions(-) diff --git a/build/de.cau.cs.kieler.klighd.repository/category.xml b/build/de.cau.cs.kieler.klighd.repository/category.xml index d95c6d0f9..7d0c7f9d5 100644 --- a/build/de.cau.cs.kieler.klighd.repository/category.xml +++ b/build/de.cau.cs.kieler.klighd.repository/category.xml @@ -63,11 +63,11 @@ - + - - + + - + diff --git a/build/de.cau.cs.kieler.klighd.repository/pom.xml b/build/de.cau.cs.kieler.klighd.repository/pom.xml index 7ab1ceefb..eb94937db 100644 --- a/build/de.cau.cs.kieler.klighd.repository/pom.xml +++ b/build/de.cau.cs.kieler.klighd.repository/pom.xml @@ -52,17 +52,17 @@ - https://download.eclipse.org/releases/2023-09/ + https://download.eclipse.org/releases/2023-12/ https://download.eclipse.org/modeling/mdt/uml2/updates/5.4/ - https://download.eclipse.org/elk/updates/releases/0.8.1/> + https://download.eclipse.org/elk/updates/releases/0.9.0/> - https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.32.0/> + https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.33.0/> https://xtext.github.io/download/updates/releases/2.1.1/> - https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/release/4.29.0 + https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/release/4.30.0 https://rtsys.informatik.uni-kiel.de/~kieler/updatesite/sprotty/0.9.0/ diff --git a/build/de.cau.cs.kieler.klighd.targetplatform/de.cau.cs.kieler.klighd.targetplatform-elkNightly.target b/build/de.cau.cs.kieler.klighd.targetplatform/de.cau.cs.kieler.klighd.targetplatform-elkNightly.target index 378ba46eb..9a0a2908c 100644 --- a/build/de.cau.cs.kieler.klighd.targetplatform/de.cau.cs.kieler.klighd.targetplatform-elkNightly.target +++ b/build/de.cau.cs.kieler.klighd.targetplatform/de.cau.cs.kieler.klighd.targetplatform-elkNightly.target @@ -8,7 +8,7 @@ - + @@ -25,19 +25,18 @@ - + - - + diff --git a/build/de.cau.cs.kieler.klighd.targetplatform/de.cau.cs.kieler.klighd.targetplatform-piccolo-elkNightly.target b/build/de.cau.cs.kieler.klighd.targetplatform/de.cau.cs.kieler.klighd.targetplatform-piccolo-elkNightly.target index 15fa75331..d25ae8287 100644 --- a/build/de.cau.cs.kieler.klighd.targetplatform/de.cau.cs.kieler.klighd.targetplatform-piccolo-elkNightly.target +++ b/build/de.cau.cs.kieler.klighd.targetplatform/de.cau.cs.kieler.klighd.targetplatform-piccolo-elkNightly.target @@ -8,7 +8,7 @@ - + @@ -25,7 +25,7 @@ - + @@ -36,12 +36,11 @@ - - + diff --git a/build/de.cau.cs.kieler.klighd.targetplatform/de.cau.cs.kieler.klighd.targetplatform-piccolo.target b/build/de.cau.cs.kieler.klighd.targetplatform/de.cau.cs.kieler.klighd.targetplatform-piccolo.target index f7d9928be..f1cf44ae6 100644 --- a/build/de.cau.cs.kieler.klighd.targetplatform/de.cau.cs.kieler.klighd.targetplatform-piccolo.target +++ b/build/de.cau.cs.kieler.klighd.targetplatform/de.cau.cs.kieler.klighd.targetplatform-piccolo.target @@ -8,7 +8,7 @@ - + @@ -21,11 +21,11 @@ - + - + @@ -36,12 +36,11 @@ - - + diff --git a/build/de.cau.cs.kieler.klighd.targetplatform/de.cau.cs.kieler.klighd.targetplatform.target b/build/de.cau.cs.kieler.klighd.targetplatform/de.cau.cs.kieler.klighd.targetplatform.target index 2dfc84fb4..57ac08e32 100644 --- a/build/de.cau.cs.kieler.klighd.targetplatform/de.cau.cs.kieler.klighd.targetplatform.target +++ b/build/de.cau.cs.kieler.klighd.targetplatform/de.cau.cs.kieler.klighd.targetplatform.target @@ -8,7 +8,7 @@ - + @@ -21,23 +21,22 @@ - + - + - - + diff --git a/plugins/de.cau.cs.kieler.kgraph.text.ui/src/de/cau/cs/kieler/kgraph/text/ui/contentassist/KGraphProposalProvider.java b/plugins/de.cau.cs.kieler.kgraph.text.ui/src/de/cau/cs/kieler/kgraph/text/ui/contentassist/KGraphProposalProvider.java index ad211e736..fdf9c1c73 100644 --- a/plugins/de.cau.cs.kieler.kgraph.text.ui/src/de/cau/cs/kieler/kgraph/text/ui/contentassist/KGraphProposalProvider.java +++ b/plugins/de.cau.cs.kieler.kgraph.text.ui/src/de/cau/cs/kieler/kgraph/text/ui/contentassist/KGraphProposalProvider.java @@ -20,8 +20,6 @@ import java.lang.reflect.InvocationTargetException; import java.util.Arrays; -import jakarta.inject.Inject; - import org.eclipse.elk.core.data.LayoutAlgorithmData; import org.eclipse.elk.core.data.LayoutMetaDataService; import org.eclipse.elk.core.data.LayoutOptionData; @@ -46,6 +44,8 @@ import org.eclipse.xtext.ui.editor.contentassist.ICompletionProposalAcceptor; import org.eclipse.xtext.util.Strings; +import com.google.inject.Inject; + import de.cau.cs.kieler.kgraph.text.KGraphResource; import de.cau.cs.kieler.kgraph.text.services.KGraphGrammarAccess; import de.cau.cs.kieler.klighd.kgraph.PersistentEntry; diff --git a/plugins/de.cau.cs.kieler.kgraph.text/src/de/cau/cs/kieler/kgraph/text/KGraphValueConverters.java b/plugins/de.cau.cs.kieler.kgraph.text/src/de/cau/cs/kieler/kgraph/text/KGraphValueConverters.java index d02e2f691..17e29a109 100644 --- a/plugins/de.cau.cs.kieler.kgraph.text/src/de/cau/cs/kieler/kgraph/text/KGraphValueConverters.java +++ b/plugins/de.cau.cs.kieler.kgraph.text/src/de/cau/cs/kieler/kgraph/text/KGraphValueConverters.java @@ -18,8 +18,6 @@ import java.util.regex.Pattern; -import jakarta.inject.Inject; - import org.eclipse.xtext.conversion.IValueConverter; import org.eclipse.xtext.conversion.ValueConverter; import org.eclipse.xtext.conversion.ValueConverterException; @@ -32,6 +30,8 @@ import org.eclipse.xtext.nodemodel.INode; import org.eclipse.xtext.util.Strings; +import com.google.inject.Inject; + /** * Value converter for the KGraph grammar. diff --git a/plugins/de.cau.cs.kieler.klighd.ide/META-INF/MANIFEST.MF b/plugins/de.cau.cs.kieler.klighd.ide/META-INF/MANIFEST.MF index 36090a5ff..4dfd25fa7 100644 --- a/plugins/de.cau.cs.kieler.klighd.ide/META-INF/MANIFEST.MF +++ b/plugins/de.cau.cs.kieler.klighd.ide/META-INF/MANIFEST.MF @@ -4,7 +4,8 @@ Bundle-Name: KIELER Lightweight Diagrams Ide Components Bundle-SymbolicName: de.cau.cs.kieler.klighd.ide;singleton:=true Bundle-Version: 2.3.1.qualifier Automatic-Module-Name: de.cau.cs.kieler.klighd.ide -Require-Bundle: de.cau.cs.kieler.klighd;visibility:=reexport, +Require-Bundle: com.google.inject, + de.cau.cs.kieler.klighd;visibility:=reexport, de.cau.cs.kieler.klighd.kgraph, org.eclipse.xtext.xbase, de.cau.cs.kieler.klighd.krendering.extensions, diff --git a/plugins/de.cau.cs.kieler.klighd.ide/pom.xml b/plugins/de.cau.cs.kieler.klighd.ide/pom.xml index 6612f8570..880ba53d3 100644 --- a/plugins/de.cau.cs.kieler.klighd.ide/pom.xml +++ b/plugins/de.cau.cs.kieler.klighd.ide/pom.xml @@ -19,6 +19,11 @@ https://github.com/kieler/KLighD + + com.google.inject + guice + ${guice-version} + ${project.groupId} de.cau.cs.kieler.klighd diff --git a/plugins/de.cau.cs.kieler.klighd.ide/src/de/cau/cs/kieler/klighd/ide/syntheses/EObjectFallbackSynthesis.xtend b/plugins/de.cau.cs.kieler.klighd.ide/src/de/cau/cs/kieler/klighd/ide/syntheses/EObjectFallbackSynthesis.xtend index 4350cfc84..7692d8c14 100644 --- a/plugins/de.cau.cs.kieler.klighd.ide/src/de/cau/cs/kieler/klighd/ide/syntheses/EObjectFallbackSynthesis.xtend +++ b/plugins/de.cau.cs.kieler.klighd.ide/src/de/cau/cs/kieler/klighd/ide/syntheses/EObjectFallbackSynthesis.xtend @@ -18,6 +18,7 @@ package de.cau.cs.kieler.klighd.ide.syntheses import com.google.common.collect.HashBasedTable import com.google.common.collect.Table +import com.google.inject.Inject import de.cau.cs.kieler.klighd.KlighdConstants import de.cau.cs.kieler.klighd.SynthesisOption import de.cau.cs.kieler.klighd.kgraph.KNode @@ -39,7 +40,6 @@ import de.cau.cs.kieler.klighd.ide.syntheses.action.EcoreModelExpandDetailsActio import de.cau.cs.kieler.klighd.util.KlighdProperties import java.util.List import java.util.Map -import jakarta.inject.Inject import org.eclipse.elk.alg.layered.options.EdgeStraighteningStrategy import org.eclipse.elk.alg.layered.options.FixedAlignment import org.eclipse.elk.alg.layered.options.LayeredOptions diff --git a/plugins/de.cau.cs.kieler.klighd.ide/src/de/cau/cs/kieler/klighd/ide/syntheses/ErrorModelSynthesis.xtend b/plugins/de.cau.cs.kieler.klighd.ide/src/de/cau/cs/kieler/klighd/ide/syntheses/ErrorModelSynthesis.xtend index 69c3bb781..2ee5813eb 100644 --- a/plugins/de.cau.cs.kieler.klighd.ide/src/de/cau/cs/kieler/klighd/ide/syntheses/ErrorModelSynthesis.xtend +++ b/plugins/de.cau.cs.kieler.klighd.ide/src/de/cau/cs/kieler/klighd/ide/syntheses/ErrorModelSynthesis.xtend @@ -16,6 +16,7 @@ */ package de.cau.cs.kieler.klighd.ide.syntheses +import com.google.inject.Inject import de.cau.cs.kieler.klighd.ide.model.MessageModel import de.cau.cs.kieler.klighd.ide.syntheses.MessageModelSynthesis import de.cau.cs.kieler.klighd.kgraph.KNode @@ -27,7 +28,6 @@ import de.cau.cs.kieler.klighd.krendering.extensions.KRenderingExtensions import de.cau.cs.kieler.klighd.syntheses.AbstractDiagramSynthesis import de.cau.cs.kieler.klighd.ide.model.ErrorModel import de.cau.cs.kieler.klighd.ide.syntheses.action.AbstractErrorModelShowExceptionAction -import jakarta.inject.Inject /** * Diagram synthesis for a {@link MessageModel}. diff --git a/plugins/de.cau.cs.kieler.klighd.ide/src/de/cau/cs/kieler/klighd/ide/syntheses/MessageModelSynthesis.xtend b/plugins/de.cau.cs.kieler.klighd.ide/src/de/cau/cs/kieler/klighd/ide/syntheses/MessageModelSynthesis.xtend index 43287e19a..dbb44990b 100644 --- a/plugins/de.cau.cs.kieler.klighd.ide/src/de/cau/cs/kieler/klighd/ide/syntheses/MessageModelSynthesis.xtend +++ b/plugins/de.cau.cs.kieler.klighd.ide/src/de/cau/cs/kieler/klighd/ide/syntheses/MessageModelSynthesis.xtend @@ -16,13 +16,13 @@ */ package de.cau.cs.kieler.klighd.ide.syntheses +import com.google.inject.Inject import de.cau.cs.kieler.klighd.ide.model.MessageModel import de.cau.cs.kieler.klighd.kgraph.KNode import de.cau.cs.kieler.klighd.krendering.extensions.KContainerRenderingExtensions import de.cau.cs.kieler.klighd.krendering.extensions.KNodeExtensions import de.cau.cs.kieler.klighd.krendering.extensions.KRenderingExtensions import de.cau.cs.kieler.klighd.syntheses.AbstractDiagramSynthesis -import jakarta.inject.Inject import static extension de.cau.cs.kieler.klighd.syntheses.DiagramSyntheses.* diff --git a/plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/KGraphDiagramServerManager.xtend b/plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/KGraphDiagramServerManager.xtend index ade55703b..dcb15e8da 100644 --- a/plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/KGraphDiagramServerManager.xtend +++ b/plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/KGraphDiagramServerManager.xtend @@ -16,10 +16,10 @@ */ package de.cau.cs.kieler.klighd.lsp +import com.google.inject.Inject +import com.google.inject.Provider import java.util.ArrayList import java.util.List -import jakarta.inject.Inject -import jakarta.inject.Provider import org.eclipse.sprotty.xtext.IDiagramServerFactory import org.eclipse.sprotty.xtext.ls.DiagramServerManager diff --git a/plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/interactive/layered/LayeredInteractiveLanguageServerExtension.xtend b/plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/interactive/layered/LayeredInteractiveLanguageServerExtension.xtend index a14cf6fe2..0466b5320 100644 --- a/plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/interactive/layered/LayeredInteractiveLanguageServerExtension.xtend +++ b/plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/interactive/layered/LayeredInteractiveLanguageServerExtension.xtend @@ -17,6 +17,7 @@ package de.cau.cs.kieler.klighd.lsp.interactive.layered import com.google.inject.Inject +import com.google.inject.Singleton import de.cau.cs.kieler.klighd.internal.util.KlighdInternalProperties import de.cau.cs.kieler.klighd.kgraph.KNode import de.cau.cs.kieler.klighd.lsp.KGraphDiagramState @@ -29,7 +30,6 @@ import java.io.ByteArrayOutputStream import java.util.HashMap import java.util.List import java.util.Map -import jakarta.inject.Singleton import org.eclipse.elk.alg.layered.options.LayeredOptions import org.eclipse.elk.graph.ElkNode import org.eclipse.elk.graph.properties.IProperty diff --git a/plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/interactive/rectpacking/RectpackingInteractiveLanguageServerExtension.xtend b/plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/interactive/rectpacking/RectpackingInteractiveLanguageServerExtension.xtend index 40ea40f4b..5310c0c09 100644 --- a/plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/interactive/rectpacking/RectpackingInteractiveLanguageServerExtension.xtend +++ b/plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/interactive/rectpacking/RectpackingInteractiveLanguageServerExtension.xtend @@ -17,6 +17,7 @@ package de.cau.cs.kieler.klighd.lsp.interactive.rectpacking import com.google.inject.Inject +import com.google.inject.Singleton import de.cau.cs.kieler.klighd.internal.util.KlighdInternalProperties import de.cau.cs.kieler.klighd.kgraph.KNode import de.cau.cs.kieler.klighd.lsp.KGraphDiagramState @@ -28,7 +29,6 @@ import java.io.ByteArrayOutputStream import java.util.Arrays import java.util.List import java.util.Map -import jakarta.inject.Singleton import org.eclipse.elk.alg.rectpacking.options.RectPackingOptions import org.eclipse.elk.core.options.CoreOptions import org.eclipse.elk.graph.ElkNode diff --git a/plugins/de.cau.cs.kieler.klighd.ui.wizard/src/de/cau/cs/kieler/klighd/ui/wizard/KlighdProjectContributor.xtend b/plugins/de.cau.cs.kieler.klighd.ui.wizard/src/de/cau/cs/kieler/klighd/ui/wizard/KlighdProjectContributor.xtend index 26de2e48e..627559a0f 100644 --- a/plugins/de.cau.cs.kieler.klighd.ui.wizard/src/de/cau/cs/kieler/klighd/ui/wizard/KlighdProjectContributor.xtend +++ b/plugins/de.cau.cs.kieler.klighd.ui.wizard/src/de/cau/cs/kieler/klighd/ui/wizard/KlighdProjectContributor.xtend @@ -89,7 +89,7 @@ class KlighdProjectContributor implements IProjectFactoryContributor { ''' package «projectInfo.transformationPackage» - import jakarta.inject.Inject + import com.google.inject.Inject import de.cau.cs.kieler.klighd.kgraph.KNode import de.cau.cs.kieler.klighd.krendering.KRenderingFactory diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/syntheses/AbstractDiagramSynthesis.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/syntheses/AbstractDiagramSynthesis.java index e446eda77..38d806383 100644 --- a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/syntheses/AbstractDiagramSynthesis.java +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/syntheses/AbstractDiagramSynthesis.java @@ -58,7 +58,7 @@ * e.g. for accessing the transformation context, this can be realized by means of Guice, too. The * helper transformation implementation must declare an injected field of type * AbstractDiagramSynthesis<?>, the actual {@link AbstractDiagramSynthesis} implementation - * must be annotated with {@link javax.inject.Singleton @Singleton} on class level. This way the + * must be annotated with {@link com.google.inject.Singleton @Singleton} on class level. This way the * helper classes are provided with the current instance of the main transformation.
*
* Furthermore, diagram syntheses may leverage other ones, e.g. for realizing composed views. This @@ -68,7 +68,7 @@ * {@link com.google.inject.Provider Provider<yourTransformationClass>} can be declared. Each * time calling {@link com.google.inject.Provider#get() get()} on this provider a new instance will * be obtained as long as the provided class is not declared as singleton (via - * {@link javax.inject.Singleton @Singleton}). The + * {@link com.google.inject.Singleton @Singleton}). The * {@link de.cau.cs.kieler.klighd.krendering.ViewSynthesisShared ViewSynthesisShared} * annotation helps if the described feature of employing helper classes is required. * diff --git a/pom.xml b/pom.xml index f0db7cb8a..8a6fd02f4 100644 --- a/pom.xml +++ b/pom.xml @@ -51,26 +51,26 @@ - 0.8.1 + 0.9.0 2.10.1 - 32.1.2-jre + 32.1.3-jre 7.0.0 - 3.31.0 + 3.32.0 0.21.1 0.9.0 0.1.0 - 3.124.100 + 3.124.200 2.7.3 - 2.32.0 - 2.32.0 + 2.33.0 + 2.33.0 - 3.19.100 - 3.29.0 + 3.20.0 + 3.30.0 2.29.0 2.35.0 - 2.19.0 - 3.130.0 + 2.20.0 + 3.131.0 @@ -224,6 +224,12 @@ org.eclipse.emf.ecore.change 2.15.0 + + + xml-apis + xml-apis-ext + 1.3.04 + @@ -373,7 +379,7 @@ org.codehaus.mojo build-helper-maven-plugin - 1.3 + 3.5.0 add-source diff --git a/test/de.cau.cs.kieler.klighd.piccolo.test/src/de/cau/cs/kieler/klighd/piccolo/test/highlightedEdgeToForeground/HighlightedEdgeToForegroundTestModelGen.xtend b/test/de.cau.cs.kieler.klighd.piccolo.test/src/de/cau/cs/kieler/klighd/piccolo/test/highlightedEdgeToForeground/HighlightedEdgeToForegroundTestModelGen.xtend index 5f06724a3..6f32a8ee4 100644 --- a/test/de.cau.cs.kieler.klighd.piccolo.test/src/de/cau/cs/kieler/klighd/piccolo/test/highlightedEdgeToForeground/HighlightedEdgeToForegroundTestModelGen.xtend +++ b/test/de.cau.cs.kieler.klighd.piccolo.test/src/de/cau/cs/kieler/klighd/piccolo/test/highlightedEdgeToForeground/HighlightedEdgeToForegroundTestModelGen.xtend @@ -16,6 +16,7 @@ */ package de.cau.cs.kieler.klighd.piccolo.test.highlightedEdgeToForeground +import com.google.inject.Inject import de.cau.cs.kieler.klighd.kgraph.KNode import de.cau.cs.kieler.klighd.kgraph.KPort import de.cau.cs.kieler.klighd.krendering.Colors @@ -23,7 +24,6 @@ import de.cau.cs.kieler.klighd.krendering.extensions.KEdgeExtensions import de.cau.cs.kieler.klighd.krendering.extensions.KNodeExtensions import de.cau.cs.kieler.klighd.krendering.extensions.KPortExtensions import de.cau.cs.kieler.klighd.krendering.extensions.KRenderingExtensions -import jakarta.inject.Inject import org.eclipse.elk.core.options.EdgeRouting import org.eclipse.elk.core.options.PortConstraints import org.eclipse.elk.core.options.PortSide From 3359aa141fd1dba77a8693f041cec65027a79858 Mon Sep 17 00:00:00 2001 From: Niklas Rentz Date: Thu, 22 Feb 2024 16:37:00 +0100 Subject: [PATCH 5/7] fixed test execution in Maven build and from Eclipse --- ...er.klighd.targetplatform-elkNightly.target | 5 + ...d.targetplatform-piccolo-elkNightly.target | 5 + ...ieler.klighd.targetplatform-piccolo.target | 5 + ...cau.cs.kieler.klighd.targetplatform.target | 5 + .../pom.xml | 6 + .../runConfigs/AdapterTest.launch | 224 +++++++++--- ...pGlobalPortLabelVisiblityConfigTest.launch | 224 +++++++++--- .../DiagramClipPortLabelVisibilityTest.launch | 224 +++++++++--- .../runConfigs/DiagramClipTest.launch | 224 +++++++++--- ...ramZoomControllerBoundsComputerTest.launch | 224 +++++++++--- .../FreeHEPSVGOffscreenRenderingTest.launch | 53 ++- .../HighlightedEdgeToForegroundTest.launch | 52 ++- .../runConfigs/RenderingTest.launch | 224 +++++++++--- ...e.cau.cs.kieler.klighd.piccolo.test.launch | 224 +++++++++--- test/de.cau.cs.kieler.klighd.test/pom.xml | 6 + .../runConfigs/ConnectedEdgesTest.launch | 223 +++++++++--- .../runConfigs/IncrementalUpdateTest.launch | 324 ++++++++++-------- .../runConfigs/Iterables2Test.launch | 223 +++++++++--- .../runConfigs/KGraphUtilTest.launch | 223 +++++++++--- .../runConfigs/ModelingUtilTest.launch | 223 +++++++++--- .../runConfigs/SizeEstimationTest.launch | 223 +++++++++--- .../SizeEstimationTestWithFailings.launch | 223 +++++++++--- ...wChangedNotificationSuppressionTest.launch | 223 +++++++++--- .../ViewChangedNotificationTest.launch | 53 ++- .../ViewContextSourceModelTrackingTest.launch | 224 +++++++++--- .../de.cau.cs.kieler.klighd.test.launch | 146 +++++++- 26 files changed, 3175 insertions(+), 838 deletions(-) diff --git a/build/de.cau.cs.kieler.klighd.targetplatform/de.cau.cs.kieler.klighd.targetplatform-elkNightly.target b/build/de.cau.cs.kieler.klighd.targetplatform/de.cau.cs.kieler.klighd.targetplatform-elkNightly.target index 9a0a2908c..3d08e692f 100644 --- a/build/de.cau.cs.kieler.klighd.targetplatform/de.cau.cs.kieler.klighd.targetplatform-elkNightly.target +++ b/build/de.cau.cs.kieler.klighd.targetplatform/de.cau.cs.kieler.klighd.targetplatform-elkNightly.target @@ -31,6 +31,11 @@ + + + + + diff --git a/build/de.cau.cs.kieler.klighd.targetplatform/de.cau.cs.kieler.klighd.targetplatform-piccolo-elkNightly.target b/build/de.cau.cs.kieler.klighd.targetplatform/de.cau.cs.kieler.klighd.targetplatform-piccolo-elkNightly.target index d25ae8287..8f00f2b0c 100644 --- a/build/de.cau.cs.kieler.klighd.targetplatform/de.cau.cs.kieler.klighd.targetplatform-piccolo-elkNightly.target +++ b/build/de.cau.cs.kieler.klighd.targetplatform/de.cau.cs.kieler.klighd.targetplatform-piccolo-elkNightly.target @@ -35,6 +35,11 @@ + + + + + diff --git a/build/de.cau.cs.kieler.klighd.targetplatform/de.cau.cs.kieler.klighd.targetplatform-piccolo.target b/build/de.cau.cs.kieler.klighd.targetplatform/de.cau.cs.kieler.klighd.targetplatform-piccolo.target index f1cf44ae6..d1f752741 100644 --- a/build/de.cau.cs.kieler.klighd.targetplatform/de.cau.cs.kieler.klighd.targetplatform-piccolo.target +++ b/build/de.cau.cs.kieler.klighd.targetplatform/de.cau.cs.kieler.klighd.targetplatform-piccolo.target @@ -35,6 +35,11 @@ + + + + + diff --git a/build/de.cau.cs.kieler.klighd.targetplatform/de.cau.cs.kieler.klighd.targetplatform.target b/build/de.cau.cs.kieler.klighd.targetplatform/de.cau.cs.kieler.klighd.targetplatform.target index 57ac08e32..9ec8e1d19 100644 --- a/build/de.cau.cs.kieler.klighd.targetplatform/de.cau.cs.kieler.klighd.targetplatform.target +++ b/build/de.cau.cs.kieler.klighd.targetplatform/de.cau.cs.kieler.klighd.targetplatform.target @@ -31,6 +31,11 @@ + + + + + diff --git a/test/de.cau.cs.kieler.klighd.piccolo.test/pom.xml b/test/de.cau.cs.kieler.klighd.piccolo.test/pom.xml index 6e48ffc5a..f46957026 100644 --- a/test/de.cau.cs.kieler.klighd.piccolo.test/pom.xml +++ b/test/de.cau.cs.kieler.klighd.piccolo.test/pom.xml @@ -34,6 +34,12 @@ de.cau.cs.kieler.klighd.piccolo.freehep 0.0.0 + + + eclipse-plugin + javax.annotation + 0.0.0 + diff --git a/test/de.cau.cs.kieler.klighd.piccolo.test/runConfigs/AdapterTest.launch b/test/de.cau.cs.kieler.klighd.piccolo.test/runConfigs/AdapterTest.launch index b0eff6b72..eccfcc1b8 100644 --- a/test/de.cau.cs.kieler.klighd.piccolo.test/runConfigs/AdapterTest.launch +++ b/test/de.cau.cs.kieler.klighd.piccolo.test/runConfigs/AdapterTest.launch @@ -1,45 +1,185 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/test/de.cau.cs.kieler.klighd.piccolo.test/runConfigs/DiagramClipGlobalPortLabelVisiblityConfigTest.launch b/test/de.cau.cs.kieler.klighd.piccolo.test/runConfigs/DiagramClipGlobalPortLabelVisiblityConfigTest.launch index 2befe26ac..7ae5919f5 100644 --- a/test/de.cau.cs.kieler.klighd.piccolo.test/runConfigs/DiagramClipGlobalPortLabelVisiblityConfigTest.launch +++ b/test/de.cau.cs.kieler.klighd.piccolo.test/runConfigs/DiagramClipGlobalPortLabelVisiblityConfigTest.launch @@ -1,45 +1,185 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/test/de.cau.cs.kieler.klighd.piccolo.test/runConfigs/DiagramClipPortLabelVisibilityTest.launch b/test/de.cau.cs.kieler.klighd.piccolo.test/runConfigs/DiagramClipPortLabelVisibilityTest.launch index fa93140b6..366712e58 100644 --- a/test/de.cau.cs.kieler.klighd.piccolo.test/runConfigs/DiagramClipPortLabelVisibilityTest.launch +++ b/test/de.cau.cs.kieler.klighd.piccolo.test/runConfigs/DiagramClipPortLabelVisibilityTest.launch @@ -1,45 +1,185 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/test/de.cau.cs.kieler.klighd.piccolo.test/runConfigs/DiagramClipTest.launch b/test/de.cau.cs.kieler.klighd.piccolo.test/runConfigs/DiagramClipTest.launch index 006490d0c..6a2478e9f 100644 --- a/test/de.cau.cs.kieler.klighd.piccolo.test/runConfigs/DiagramClipTest.launch +++ b/test/de.cau.cs.kieler.klighd.piccolo.test/runConfigs/DiagramClipTest.launch @@ -1,45 +1,185 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/test/de.cau.cs.kieler.klighd.piccolo.test/runConfigs/DiagramZoomControllerBoundsComputerTest.launch b/test/de.cau.cs.kieler.klighd.piccolo.test/runConfigs/DiagramZoomControllerBoundsComputerTest.launch index 2c526ce9c..7729d79ed 100644 --- a/test/de.cau.cs.kieler.klighd.piccolo.test/runConfigs/DiagramZoomControllerBoundsComputerTest.launch +++ b/test/de.cau.cs.kieler.klighd.piccolo.test/runConfigs/DiagramZoomControllerBoundsComputerTest.launch @@ -1,45 +1,185 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/test/de.cau.cs.kieler.klighd.piccolo.test/runConfigs/FreeHEPSVGOffscreenRenderingTest.launch b/test/de.cau.cs.kieler.klighd.piccolo.test/runConfigs/FreeHEPSVGOffscreenRenderingTest.launch index 8a7c8354e..ed23bf4cc 100644 --- a/test/de.cau.cs.kieler.klighd.piccolo.test/runConfigs/FreeHEPSVGOffscreenRenderingTest.launch +++ b/test/de.cau.cs.kieler.klighd.piccolo.test/runConfigs/FreeHEPSVGOffscreenRenderingTest.launch @@ -15,6 +15,7 @@ + @@ -25,8 +26,10 @@ + + - + @@ -36,21 +39,23 @@ + - - + + + - + @@ -65,11 +70,8 @@ - - - @@ -90,9 +92,9 @@ + - @@ -113,21 +115,20 @@ + + + - - - + - - @@ -138,26 +139,40 @@ - + + + - - - - + + + + + + + + + + + + + + + + + - diff --git a/test/de.cau.cs.kieler.klighd.piccolo.test/runConfigs/HighlightedEdgeToForegroundTest.launch b/test/de.cau.cs.kieler.klighd.piccolo.test/runConfigs/HighlightedEdgeToForegroundTest.launch index 745bc633b..cee8dc0da 100644 --- a/test/de.cau.cs.kieler.klighd.piccolo.test/runConfigs/HighlightedEdgeToForegroundTest.launch +++ b/test/de.cau.cs.kieler.klighd.piccolo.test/runConfigs/HighlightedEdgeToForegroundTest.launch @@ -15,6 +15,7 @@ + @@ -25,8 +26,10 @@ + + - + @@ -36,21 +39,23 @@ + - - + + + - + @@ -65,12 +70,9 @@ - - - @@ -90,9 +92,9 @@ + - @@ -113,21 +115,20 @@ + + + - - - + - - @@ -138,20 +139,35 @@ - + + + - - - - + + + + + + + + + + + + + + + + + diff --git a/test/de.cau.cs.kieler.klighd.piccolo.test/runConfigs/RenderingTest.launch b/test/de.cau.cs.kieler.klighd.piccolo.test/runConfigs/RenderingTest.launch index c55e05e91..3f01f996a 100644 --- a/test/de.cau.cs.kieler.klighd.piccolo.test/runConfigs/RenderingTest.launch +++ b/test/de.cau.cs.kieler.klighd.piccolo.test/runConfigs/RenderingTest.launch @@ -1,45 +1,185 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/test/de.cau.cs.kieler.klighd.piccolo.test/runConfigs/de.cau.cs.kieler.klighd.piccolo.test.launch b/test/de.cau.cs.kieler.klighd.piccolo.test/runConfigs/de.cau.cs.kieler.klighd.piccolo.test.launch index d637b0049..2ae7622ee 100644 --- a/test/de.cau.cs.kieler.klighd.piccolo.test/runConfigs/de.cau.cs.kieler.klighd.piccolo.test.launch +++ b/test/de.cau.cs.kieler.klighd.piccolo.test/runConfigs/de.cau.cs.kieler.klighd.piccolo.test.launch @@ -1,45 +1,185 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/test/de.cau.cs.kieler.klighd.test/pom.xml b/test/de.cau.cs.kieler.klighd.test/pom.xml index 05c1bd1f0..6895bc375 100644 --- a/test/de.cau.cs.kieler.klighd.test/pom.xml +++ b/test/de.cau.cs.kieler.klighd.test/pom.xml @@ -26,6 +26,12 @@ org.eclipse.elk.alg.layered ${elk-version} + + + eclipse-plugin + javax.annotation + 0.0.0 + diff --git a/test/de.cau.cs.kieler.klighd.test/runConfigs/ConnectedEdgesTest.launch b/test/de.cau.cs.kieler.klighd.test/runConfigs/ConnectedEdgesTest.launch index 960040f7d..13b08295a 100644 --- a/test/de.cau.cs.kieler.klighd.test/runConfigs/ConnectedEdgesTest.launch +++ b/test/de.cau.cs.kieler.klighd.test/runConfigs/ConnectedEdgesTest.launch @@ -1,45 +1,184 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/test/de.cau.cs.kieler.klighd.test/runConfigs/IncrementalUpdateTest.launch b/test/de.cau.cs.kieler.klighd.test/runConfigs/IncrementalUpdateTest.launch index 66307c027..c18cf4ef5 100644 --- a/test/de.cau.cs.kieler.klighd.test/runConfigs/IncrementalUpdateTest.launch +++ b/test/de.cau.cs.kieler.klighd.test/runConfigs/IncrementalUpdateTest.launch @@ -1,153 +1,177 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/test/de.cau.cs.kieler.klighd.test/runConfigs/Iterables2Test.launch b/test/de.cau.cs.kieler.klighd.test/runConfigs/Iterables2Test.launch index e936f6683..c41fa7c4f 100644 --- a/test/de.cau.cs.kieler.klighd.test/runConfigs/Iterables2Test.launch +++ b/test/de.cau.cs.kieler.klighd.test/runConfigs/Iterables2Test.launch @@ -1,45 +1,184 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/test/de.cau.cs.kieler.klighd.test/runConfigs/KGraphUtilTest.launch b/test/de.cau.cs.kieler.klighd.test/runConfigs/KGraphUtilTest.launch index 925808c3b..947408325 100644 --- a/test/de.cau.cs.kieler.klighd.test/runConfigs/KGraphUtilTest.launch +++ b/test/de.cau.cs.kieler.klighd.test/runConfigs/KGraphUtilTest.launch @@ -1,45 +1,184 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/test/de.cau.cs.kieler.klighd.test/runConfigs/ModelingUtilTest.launch b/test/de.cau.cs.kieler.klighd.test/runConfigs/ModelingUtilTest.launch index 43c3a7441..156c447c2 100644 --- a/test/de.cau.cs.kieler.klighd.test/runConfigs/ModelingUtilTest.launch +++ b/test/de.cau.cs.kieler.klighd.test/runConfigs/ModelingUtilTest.launch @@ -1,45 +1,184 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/test/de.cau.cs.kieler.klighd.test/runConfigs/SizeEstimationTest.launch b/test/de.cau.cs.kieler.klighd.test/runConfigs/SizeEstimationTest.launch index 84a56ec49..9a9ab3be5 100644 --- a/test/de.cau.cs.kieler.klighd.test/runConfigs/SizeEstimationTest.launch +++ b/test/de.cau.cs.kieler.klighd.test/runConfigs/SizeEstimationTest.launch @@ -1,45 +1,184 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/test/de.cau.cs.kieler.klighd.test/runConfigs/SizeEstimationTestWithFailings.launch b/test/de.cau.cs.kieler.klighd.test/runConfigs/SizeEstimationTestWithFailings.launch index 561af6bba..002d29cea 100644 --- a/test/de.cau.cs.kieler.klighd.test/runConfigs/SizeEstimationTestWithFailings.launch +++ b/test/de.cau.cs.kieler.klighd.test/runConfigs/SizeEstimationTestWithFailings.launch @@ -1,45 +1,184 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/test/de.cau.cs.kieler.klighd.test/runConfigs/ViewChangedNotificationSuppressionTest.launch b/test/de.cau.cs.kieler.klighd.test/runConfigs/ViewChangedNotificationSuppressionTest.launch index 0997fe0aa..66b7db84d 100644 --- a/test/de.cau.cs.kieler.klighd.test/runConfigs/ViewChangedNotificationSuppressionTest.launch +++ b/test/de.cau.cs.kieler.klighd.test/runConfigs/ViewChangedNotificationSuppressionTest.launch @@ -1,45 +1,184 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/test/de.cau.cs.kieler.klighd.test/runConfigs/ViewChangedNotificationTest.launch b/test/de.cau.cs.kieler.klighd.test/runConfigs/ViewChangedNotificationTest.launch index f90365ece..1a302c429 100644 --- a/test/de.cau.cs.kieler.klighd.test/runConfigs/ViewChangedNotificationTest.launch +++ b/test/de.cau.cs.kieler.klighd.test/runConfigs/ViewChangedNotificationTest.launch @@ -15,6 +15,7 @@ + @@ -25,8 +26,10 @@ + + - + @@ -36,21 +39,23 @@ + - - + + + - + @@ -65,12 +70,9 @@ - - - @@ -90,9 +92,9 @@ + - @@ -113,21 +115,20 @@ + + + - - - + - - @@ -138,20 +139,36 @@ - + + + - - - - + + + + + + + + + + + + + + + + + + diff --git a/test/de.cau.cs.kieler.klighd.test/runConfigs/ViewContextSourceModelTrackingTest.launch b/test/de.cau.cs.kieler.klighd.test/runConfigs/ViewContextSourceModelTrackingTest.launch index 8d6eb52bf..9e75b4db3 100644 --- a/test/de.cau.cs.kieler.klighd.test/runConfigs/ViewContextSourceModelTrackingTest.launch +++ b/test/de.cau.cs.kieler.klighd.test/runConfigs/ViewContextSourceModelTrackingTest.launch @@ -1,45 +1,185 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/test/de.cau.cs.kieler.klighd.test/runConfigs/de.cau.cs.kieler.klighd.test.launch b/test/de.cau.cs.kieler.klighd.test/runConfigs/de.cau.cs.kieler.klighd.test.launch index b9e732a35..52f6d0faf 100644 --- a/test/de.cau.cs.kieler.klighd.test/runConfigs/de.cau.cs.kieler.klighd.test.launch +++ b/test/de.cau.cs.kieler.klighd.test/runConfigs/de.cau.cs.kieler.klighd.test.launch @@ -12,8 +12,10 @@ + + @@ -24,8 +26,10 @@ + + - + @@ -34,8 +38,144 @@ - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 4b6db2dcee1589d75f3a89173295443cd8de9d6c Mon Sep 17 00:00:00 2001 From: Niklas Rentz Date: Thu, 7 Sep 2023 16:38:18 +0200 Subject: [PATCH 6/7] lsp: improved ID generation to be consistent between syntheses, yet unique. With this, the LSP does not need to be run with the incremental update strategy anymore to show animations. --- .../klighd/lsp/KGraphLayoutEngine.xtend | 4 +- .../lsp/utils/KGraphElementIDGenerator.xtend | 56 ++++++++----------- .../klighd/lsp/utils/RenderingPreparer.xtend | 33 ++++++----- 3 files changed, 42 insertions(+), 51 deletions(-) diff --git a/plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/KGraphLayoutEngine.xtend b/plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/KGraphLayoutEngine.xtend index 9e7b91019..68be39e76 100644 --- a/plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/KGraphLayoutEngine.xtend +++ b/plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/KGraphLayoutEngine.xtend @@ -3,7 +3,7 @@ * * http://rtsys.informatik.uni-kiel.de/kieler * - * Copyright 2018,2019 by + * Copyright 2018-2023 by * + Kiel University * + Department of Computer Science * + Real-Time and Embedded Systems Group @@ -80,7 +80,7 @@ class KGraphLayoutEngine extends ElkLayoutEngine { synchronized (kGraphContext.viewModel) { lightDiagramLayoutConfig.performLayout - RenderingPreparer.prepareRendering(kGraphContext.viewModel) + RenderingPreparer.prepareRendering(kGraphContext.viewModel, diagramState.getKGraphToSModelElementMap(uri)) } } diff --git a/plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/utils/KGraphElementIDGenerator.xtend b/plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/utils/KGraphElementIDGenerator.xtend index 73c73ac12..69dc8b628 100644 --- a/plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/utils/KGraphElementIDGenerator.xtend +++ b/plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/utils/KGraphElementIDGenerator.xtend @@ -3,7 +3,7 @@ * * http://rtsys.informatik.uni-kiel.de/kieler * - * Copyright 2018,2019 by + * Copyright 2018-2023 by * + Kiel University * + Department of Computer Science * + Real-Time and Embedded Systems Group @@ -34,8 +34,7 @@ import static extension de.cau.cs.kieler.klighd.lsp.utils.SprottyProperties.* /** * Class for generating unique IDs for any {@link KGraphElement}. Use a single instance of this and call getId() for all - * the elements you need IDs for. IDs will be unique, assuming that hashCode() on KGraphElements returns unique hashes - * per instance. + * the elements you need IDs for. IDs will be unique, based on the position in their parent graph element. * * @author nre */ @@ -109,9 +108,7 @@ class KGraphElementIdGenerator { // the root node is just called $root val parent = element.eContainer as KGraphElement var String parentId = null - if (parent !== null) { - parentId = getId(parent) - } else { + if (parent === null) { id = ID_SEPARATOR + 'root' if (idToElementMap.get(id) !== null) { // The graph already contains a root node, this is a connected node dangling without a parent and will @@ -122,6 +119,7 @@ class KGraphElementIdGenerator { idToElementMap.put(id, element) return id } + parentId = getId(parent) // use a prefix depending on the class of the element + the {@link KIdentifier} as id if an identifier is // defined, otherwise make up a new id based on the position in the model hierarchy with a Separator not @@ -130,19 +128,24 @@ class KGraphElementIdGenerator { val identifier = element.data.filter(KIdentifier) var char elementSeparator + var int index switch (element) { KNode: { elementSeparator = NODE_SEPARATOR + index = element.parent.children.indexOf(element) } KEdge: { elementSeparator = EDGE_SEPARATOR + index = element.source.outgoingEdges.indexOf(element) } KLabel: { elementSeparator = LABEL_SEPARATOR + index = element.parent.labels.indexOf(element) } KPort: { elementSeparator = PORT_SEPARATOR + index = element.node.ports.indexOf(element) } default: { throw new IllegalArgumentException("Can not generate an id for element of type " + element.class) @@ -150,7 +153,7 @@ class KGraphElementIdGenerator { } if (identifier.empty) { - elementId = "" + ID_SEPARATOR + elementSeparator + element.hashCode + elementId = "" + ID_SEPARATOR + elementSeparator + index } else { elementId = elementSeparator + identifier.head.id } @@ -169,8 +172,8 @@ class KGraphElementIdGenerator { } /** - * Class for generating unique IDs for any {@link KRendering}. IDs will be unique, assuming that hashCode() on - * KRenderings returns unique hashes per instance. + * Class for generating unique IDs for any {@link KRendering}. IDs will be unique, based on the position in their + * parent graph element / rendering. * * @author nre */ @@ -196,21 +199,11 @@ class KRenderingIdGenerator { * and puts it in the {@link SprottyProperties#RENDERING_ID} property. This ID can be used for uniquely identifying * renderings between systems. * - * @param rendering The rendering - */ - static def void generateIdsRecursive(KRendering rendering) { - if (rendering !== null) { - generateIdsRecursive(rendering, null) - } - } - - /** - * Recursive method implementing the behavior described in {@link #generateIdsRecursive(KStyleHolder)}. - * * @param rendering The rendering that should currently get an ID. - * @paran parentRendering The parent rendering of the current rendering, for convenience. + * @param parentId The ID of the parent to be added as the ID's prefix. + * @param renderingIndex The index of this rendering in relation to the parent. */ - private static def void generateIdsRecursive(KRendering rendering, KContainerRendering parentRendering) { + static def void generateIdsRecursive(KRendering rendering, String parentId, int renderingIndex) { if (rendering === null) { return } @@ -220,15 +213,10 @@ class KRenderingIdGenerator { return } - if (parentRendering === null) { - rendering.renderingId = "" + RENDERING_SEPERATOR + rendering.hashCode - } else { - val parentId = parentRendering.renderingId - // Generate a new ID based on the parent rendering's ID. - rendering.renderingId = parentId - + ID_SEPARATOR + RENDERING_SEPERATOR - + rendering.hashCode - } + // Generate a new ID based on the parent rendering's ID. + rendering.renderingId = parentId + + ID_SEPARATOR + RENDERING_SEPERATOR + + renderingIndex if (rendering instanceof KPolyline) { // Special case for KPolyline: It has a junctionPointRendering that also needs an ID. // Use a new separator and think of this as a new rendering hierarchy with possible children. @@ -240,8 +228,8 @@ class KRenderingIdGenerator { } if (rendering instanceof KContainerRendering) { // Each KContainerRendering has child renderings that also need new IDs. - for (childRendering : rendering.children) { - generateIdsRecursive(childRendering, rendering) + for (var int i = 0; i < rendering.children.size; i++) { + generateIdsRecursive(rendering.children.get(i), rendering.renderingId, i) } } } @@ -255,7 +243,7 @@ class KRenderingIdGenerator { * @return The {@link KRendering} with the given ID. */ static def findRenderingById(KGraphElement element, String id) { - val ids = id.split("\\" + ID_SEPARATOR) + val ids = id.split("\\" + ID_SEPARATOR + "\\" + ID_SEPARATOR + "\\" + ID_SEPARATOR).get(1).split("\\" + ID_SEPARATOR) // Every rendering ID is built hierarchically, separated by the RENDERING_SEPERATOR symbol. val renderings = element.data.filter(KRendering) + element.data.filter(KRenderingRef) diff --git a/plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/utils/RenderingPreparer.xtend b/plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/utils/RenderingPreparer.xtend index 596633a5a..b52bd17f5 100644 --- a/plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/utils/RenderingPreparer.xtend +++ b/plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/utils/RenderingPreparer.xtend @@ -51,6 +51,7 @@ import java.util.ArrayList import java.util.HashMap import java.util.List import java.util.Map +import org.eclipse.sprotty.SModelElement import static com.google.common.collect.Iterables.filter @@ -76,17 +77,20 @@ final class RenderingPreparer { * Finally, modifiable styles defined by the synthesis are processed for the rendering. * * @param element The parent element containing the graph to calculate all rendering bounds for. + * @param kGraphToSGraph A map for identifying the SGraph element for each KGraph element in this graph. */ - static def void prepareRendering(KGraphElement element) { + static def void prepareRendering(KGraphElement element, Map kGraphToSGraph) { // calculate the sizes of all renderings: - for (data : element.data) { + for (var int i = 0; i < element.data.size; i++) { + val data = element.data.get(i) switch(data) { KRenderingLibrary: { // The library needs to generate ids for all later KRenderingRefs to refer to, but no own bounds, // since these are generic renderings. - for (rendering : data.renderings) { + for (var int j = 0; j < data.renderings.size; j++) { + val rendering = data.renderings.get(j) if (rendering instanceof KRendering) { - KRenderingIdGenerator.generateIdsRecursive(rendering) + KRenderingIdGenerator.generateIdsRecursive(rendering, "$$lib$$", j) } } } @@ -101,12 +105,11 @@ final class RenderingPreparer { // and the decorationMap data.properties.put(CALCULATED_DECORATION_MAP, decorationMap) // remember the id of the rendering in the reference - data.renderingId = data.rendering.renderingId - + data.renderingId = kGraphToSGraph.get(element)?.id + data.rendering.renderingId } KRendering: { // every rendering needs an ID, generate it here - KRenderingIdGenerator.generateIdsRecursive(data) + KRenderingIdGenerator.generateIdsRecursive(data, kGraphToSGraph.get(element)?.id + "$$", i) handleKRendering(element, data, null, null) } } @@ -117,25 +120,26 @@ final class RenderingPreparer { if (element instanceof KLabeledGraphElement) { for (label : element.labels) { - prepareRendering(label) + prepareRendering(label, kGraphToSGraph) } } if (element instanceof KNode) { for (node : element.children) { - prepareRendering(node) + prepareRendering(node, kGraphToSGraph) } for (edge : element.outgoingEdges) { - prepareRendering(edge) + prepareRendering(edge, kGraphToSGraph) } for (port : element.ports) { - prepareRendering(port) + prepareRendering(port, kGraphToSGraph) } } // Also calculate the sizes of all proxy-renderings val proxyRendering = element.getProperty(KlighdProperties.PROXY_VIEW_PROXY_RENDERING) if (element.getProperty(KlighdProperties.PROXY_VIEW_RENDER_NODE_AS_PROXY) && proxyRendering !== null) { - for (data : proxyRendering) { + for (var int i = 0; i < proxyRendering.size; i++) { + val data = proxyRendering.get(i) switch(data) { KRenderingRef: { // all references to KRenderings need to place a map with the ids of the renderings and their @@ -148,12 +152,12 @@ final class RenderingPreparer { // and the decorationMap data.properties.put(CALCULATED_DECORATION_MAP, decorationMap) // remember the id of the rendering in the reference - data.renderingId = data.rendering.renderingId + data.renderingId = kGraphToSGraph.get(element)?.id + data.rendering.renderingId } KRendering: { // every rendering needs an ID, generate it here - KRenderingIdGenerator.generateIdsRecursive(data) + KRenderingIdGenerator.generateIdsRecursive(data, kGraphToSGraph.get(element)?.id + "$$", i) if (data.eContainer instanceof KNode) { // Calculate the size and layout of the proxy first. val parent = data.eContainer as KNode @@ -331,7 +335,6 @@ final class RenderingPreparer { // to call KLighD's DecoratorPlacementUtil#evaluateDecoratorPlacement the points of the path of the // parent rendering have to be stored. var Point2D[] path = #[] -// var path = new KlighdPath(rendering) // TODO: Can I also only use the points of the rendering? val parentRendering = rendering.eContainer // Get inset from parent region From 8ac15941ed6ec9981cdecb90aff19449116216ce Mon Sep 17 00:00:00 2001 From: Niklas Rentz Date: Wed, 28 Feb 2024 12:02:52 +0100 Subject: [PATCH 7/7] Deprecated the miss-spelled MODEL_ELEMEMT internal property for a new MODEL_ELEMENT property. --- ...edInteractiveLanguageServerExtension.xtend | 4 +- ...ngInteractiveLanguageServerExtension.xtend | 6 +- .../klighd/lsp/utils/LazyTraceProvider.xtend | 4 +- .../de/cau/cs/kieler/klighd/KlighdSetup.java | 2 +- .../de/cau/cs/kieler/klighd/ViewContext.java | 4 +- .../KlighdLayoutConfigurationStore.java | 2 +- .../util/KlighdInternalProperties.java | 9 ++- .../util/SourceModelTrackingAdapter.java | 2 +- .../klighd/test/IncrementalUpdateTest.java | 62 +++++++++---------- .../ViewContextSourceModelTrackingTest.java | 14 ++--- 10 files changed, 58 insertions(+), 51 deletions(-) diff --git a/plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/interactive/layered/LayeredInteractiveLanguageServerExtension.xtend b/plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/interactive/layered/LayeredInteractiveLanguageServerExtension.xtend index 0466b5320..0b34f516b 100644 --- a/plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/interactive/layered/LayeredInteractiveLanguageServerExtension.xtend +++ b/plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/interactive/layered/LayeredInteractiveLanguageServerExtension.xtend @@ -239,7 +239,7 @@ class LayeredInteractiveLanguageServerExtension implements ILanguageServerExtens for (entry : changedNodes.keySet) { // set Property of corresponding elkNode val kNode = entry.KNode - val elkNode = kNode.getProperty(KlighdInternalProperties.MODEL_ELEMEMT) + val elkNode = kNode.getProperty(KlighdInternalProperties.MODEL_ELEMENT) if (elkNode instanceof ElkNode) { val value = changedNodes.get(entry) @@ -251,7 +251,7 @@ class LayeredInteractiveLanguageServerExtension implements ILanguageServerExtens } } - val elkNode = changedNodes.keySet().head.KNode.getProperty(KlighdInternalProperties.MODEL_ELEMEMT) + val elkNode = changedNodes.keySet().head.KNode.getProperty(KlighdInternalProperties.MODEL_ELEMENT) if (elkNode instanceof ElkNode && changed) { val Map> changes = newHashMap diff --git a/plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/interactive/rectpacking/RectpackingInteractiveLanguageServerExtension.xtend b/plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/interactive/rectpacking/RectpackingInteractiveLanguageServerExtension.xtend index 5310c0c09..7d9ef43d0 100644 --- a/plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/interactive/rectpacking/RectpackingInteractiveLanguageServerExtension.xtend +++ b/plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/interactive/rectpacking/RectpackingInteractiveLanguageServerExtension.xtend @@ -165,7 +165,7 @@ class RectpackingInteractiveLanguageServerExtension implements ILanguageServerEx resource.save(outputStream, emptyMap) val codeBefore = outputStream.toString - val elkNode = kNode.getProperty(KlighdInternalProperties.MODEL_ELEMEMT) + val elkNode = kNode.getProperty(KlighdInternalProperties.MODEL_ELEMENT) if (elkNode instanceof ElkNode) { val Map> changes = newHashMap elkNode.setProperty(RectPackingOptions.ASPECT_RATIO, constraint.aspectRatio) @@ -199,12 +199,12 @@ class RectpackingInteractiveLanguageServerExtension implements ILanguageServerEx val codeBefore = outputStream.toString for (node : changedNodes) { - val elkNode = node.getProperty(KlighdInternalProperties.MODEL_ELEMEMT) + val elkNode = node.getProperty(KlighdInternalProperties.MODEL_ELEMENT) if (elkNode instanceof ElkNode) { InteractiveUtil.copyAllConstraints(elkNode, node) } } - val elkNode = changedNodes.get(0).getProperty(KlighdInternalProperties.MODEL_ELEMEMT) + val elkNode = changedNodes.get(0).getProperty(KlighdInternalProperties.MODEL_ELEMENT) if (elkNode instanceof ElkNode) { val Map> changes = newHashMap diff --git a/plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/utils/LazyTraceProvider.xtend b/plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/utils/LazyTraceProvider.xtend index d93372c48..fd389c7f0 100644 --- a/plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/utils/LazyTraceProvider.xtend +++ b/plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/utils/LazyTraceProvider.xtend @@ -77,7 +77,7 @@ class LazyTraceProvider extends XtextTraceProvider { /** * Generates a trace for the {@code kElement}'s source EObject on the {@code sElement}. * The kElement must be synthesized by a KLighD synthesis before and must have its source EObject stored in the - * {@link KlighdInternalProperties#MODEL_ELEMEMT} property. + * {@link KlighdInternalProperties#MODEL_ELEMENT} property. * * @param sElement The SModelElement that needs a trace to its model element. * @param kElement The KGraphElement that was generated from some model element. @@ -86,7 +86,7 @@ class LazyTraceProvider extends XtextTraceProvider { // The real model element that can be traced is the EObject that got synthesized in the // {@link KGraphDiagramGenerator#translateModel} function. That model element has to be stored in the properties // during the synthesis. Otherwise the tracing will not work. - val modelElement = kElement.properties.get(KlighdInternalProperties.MODEL_ELEMEMT) + val modelElement = kElement.properties.get(KlighdInternalProperties.MODEL_ELEMENT) if (modelElement instanceof EObject) { if (modelElement.eResource instanceof XtextResource) { trace(sElement, modelElement) diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/KlighdSetup.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/KlighdSetup.java index 8baa308cb..fd58a23d8 100644 --- a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/KlighdSetup.java +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/KlighdSetup.java @@ -33,7 +33,7 @@ public class KlighdSetup implements IKlighdStartupHook { @Override public void execute() { KlighdDataManager.getInstance() - .registerBlacklistedProperty(KlighdInternalProperties.MODEL_ELEMEMT) + .registerBlacklistedProperty(KlighdInternalProperties.MODEL_ELEMENT) .registerBlacklistedProperty(LabelManagementOptions.LABEL_MANAGER) .registerBlacklistedProperty(GridPlacementUtil.ESTIMATED_GRID_DATA) .registerBlacklistedProperty(GridPlacementUtil.CHILD_AREA_POSITION); diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/ViewContext.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/ViewContext.java index 5325f9a48..cbce20a6d 100644 --- a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/ViewContext.java +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/ViewContext.java @@ -654,10 +654,10 @@ public void setZoomStyle(final ZoomStyle zoomStyle) { */ public void associateSourceTargetPair(final Object source, final EObject target) { if (KGraphPackage.eINSTANCE.getKGraphData().isInstance(target)) { - ((KGraphData) target).setProperty(KlighdInternalProperties.MODEL_ELEMEMT, source); + ((KGraphData) target).setProperty(KlighdInternalProperties.MODEL_ELEMENT, source); } else if (KGraphPackage.eINSTANCE.getKGraphElement().isInstance(target)) { - ((KGraphElement) target).setProperty(KlighdInternalProperties.MODEL_ELEMEMT, source); + ((KGraphElement) target).setProperty(KlighdInternalProperties.MODEL_ELEMENT, source); } } diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/internal/macrolayout/KlighdLayoutConfigurationStore.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/internal/macrolayout/KlighdLayoutConfigurationStore.java index 552ab7bef..d44e5fe2b 100644 --- a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/internal/macrolayout/KlighdLayoutConfigurationStore.java +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/internal/macrolayout/KlighdLayoutConfigurationStore.java @@ -283,7 +283,7 @@ public Collection getAffectedOptions() { final String msg = "Concurrent modification in KGraphPropertyLayoutConfig:" + Klighd.LINE_SEPARATOR + " element == " + graphElement + Klighd.LINE_SEPARATOR + " sourceElement == " - + graphElement.getProperty(KlighdInternalProperties.MODEL_ELEMEMT); + + graphElement.getProperty(KlighdInternalProperties.MODEL_ELEMENT); Klighd.log(new Status(IStatus.ERROR, Klighd.PLUGIN_ID, msg)); } diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/internal/util/KlighdInternalProperties.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/internal/util/KlighdInternalProperties.java index c7dada30a..570c9f0d5 100644 --- a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/internal/util/KlighdInternalProperties.java +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/internal/util/KlighdInternalProperties.java @@ -47,7 +47,14 @@ private KlighdInternalProperties() { * KGraphData}, for {@link de.cau.cs.kieler.klighd.kgraph.KGraphElement KGraphElements} it is to * be attached to their layout data. */ - public static final IProperty MODEL_ELEMEMT = new Property("klighd.modelElement"); + public static final IProperty MODEL_ELEMENT = new Property("klighd.modelElement"); + + /** + * Deprecated property with a typo, see {@link #MODEL_ELEMENT} as the replacement. + * + * @deprecated + */ + public static final IProperty MODEL_ELEMEMT = MODEL_ELEMENT; /** * Property indicating that the node has been populated. A node is populated, if and only if the diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/internal/util/SourceModelTrackingAdapter.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/internal/util/SourceModelTrackingAdapter.java index 809a5ecae..b3117f26d 100644 --- a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/internal/util/SourceModelTrackingAdapter.java +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/internal/util/SourceModelTrackingAdapter.java @@ -53,7 +53,7 @@ public class SourceModelTrackingAdapter extends EContentAdapter { private static final Predicate CANDIDATES = KlighdPredicates.instanceOf( KGraphElement.class, KRendering.class, IPropertyToObjectMapImpl.class); - private static final IProperty MODEL_ELEMENT = KlighdInternalProperties.MODEL_ELEMEMT; + private static final IProperty MODEL_ELEMENT = KlighdInternalProperties.MODEL_ELEMENT; private Object mapsMonitor = this; private Multimap sourceTargetsMap = ArrayListMultimap.create(); diff --git a/test/de.cau.cs.kieler.klighd.test/src/de/cau/cs/kieler/klighd/test/IncrementalUpdateTest.java b/test/de.cau.cs.kieler.klighd.test/src/de/cau/cs/kieler/klighd/test/IncrementalUpdateTest.java index 4e266b958..3fac91d95 100644 --- a/test/de.cau.cs.kieler.klighd.test/src/de/cau/cs/kieler/klighd/test/IncrementalUpdateTest.java +++ b/test/de.cau.cs.kieler.klighd.test/src/de/cau/cs/kieler/klighd/test/IncrementalUpdateTest.java @@ -168,7 +168,7 @@ public void testAddNode() { final KNode newNode = KGraphUtil.createInitializedNode(); final EObject newNodeSource = new EObjectImpl() { }; - newNode.setProperty(KlighdInternalProperties.MODEL_ELEMEMT, newNodeSource); + newNode.setProperty(KlighdInternalProperties.MODEL_ELEMENT, newNodeSource); final int newNodePosition = 0; newGraph.getChildren().add(newNodePosition, newNode); @@ -208,9 +208,9 @@ public void testAddMultipleNodes() { final EObject newNodeSource0 = new EObjectImpl() { }; final EObject newNodeSource1 = new EObjectImpl() { }; final EObject newNodeSource2 = new EObjectImpl() { }; - newNode0.setProperty(KlighdInternalProperties.MODEL_ELEMEMT, newNodeSource0); - newNode1.setProperty(KlighdInternalProperties.MODEL_ELEMEMT, newNodeSource1); - newNode2.setProperty(KlighdInternalProperties.MODEL_ELEMEMT, newNodeSource2); + newNode0.setProperty(KlighdInternalProperties.MODEL_ELEMENT, newNodeSource0); + newNode1.setProperty(KlighdInternalProperties.MODEL_ELEMENT, newNodeSource1); + newNode2.setProperty(KlighdInternalProperties.MODEL_ELEMENT, newNodeSource2); final int newNode0Position = 0; final int newNode1Position = 1; final int newNode2Position = 2; @@ -253,7 +253,7 @@ public void testRemoveNode() { final KNode baseGraph = createTestGraph(); final KNode baseNodeToRemove = baseGraph.getChildren().get(toRemovePosition); final EObject baseNodeToRemoveSource = new EObjectImpl() { }; - baseNodeToRemove.setProperty(KlighdInternalProperties.MODEL_ELEMEMT, baseNodeToRemoveSource); + baseNodeToRemove.setProperty(KlighdInternalProperties.MODEL_ELEMENT, baseNodeToRemoveSource); final KNode newGraph = createTestGraph(); @@ -281,11 +281,11 @@ public void testUpdateNodePosition() { final KNode baseGraph = createTestGraph(); final KNode baseNodeToMove = baseGraph.getChildren().get(oldPosition); final EObject nodeToMoveSource = new EObjectImpl() { }; - baseNodeToMove.setProperty(KlighdInternalProperties.MODEL_ELEMEMT, nodeToMoveSource); + baseNodeToMove.setProperty(KlighdInternalProperties.MODEL_ELEMENT, nodeToMoveSource); final KNode newGraph = createTestGraph(); final KNode newNodeToMove = newGraph.getChildren().get(oldPosition); - newNodeToMove.setProperty(KlighdInternalProperties.MODEL_ELEMEMT, nodeToMoveSource); + newNodeToMove.setProperty(KlighdInternalProperties.MODEL_ELEMENT, nodeToMoveSource); newGraph.getChildren().move(newPosition, newNodeToMove); @@ -314,7 +314,7 @@ public void testAddPort() { final KPort newPort = KGraphUtil.createInitializedPort(); final EObject newPortSource = new EObjectImpl() { }; - newPort.setProperty(KlighdInternalProperties.MODEL_ELEMEMT, newPortSource); + newPort.setProperty(KlighdInternalProperties.MODEL_ELEMENT, newPortSource); final int parentNodePosition = 0; final int newPortPosition = 0; @@ -346,7 +346,7 @@ public void testRemovePort() { final KNode baseGraph = createTestGraph(); final KPort basePortToRemove = baseGraph.getChildren().get(parentNodePosition).getPorts().get(toRemovePosition); final EObject basePortToRemoveSource = new EObjectImpl() { }; - basePortToRemove.setProperty(KlighdInternalProperties.MODEL_ELEMEMT, basePortToRemoveSource); + basePortToRemove.setProperty(KlighdInternalProperties.MODEL_ELEMENT, basePortToRemoveSource); final KNode newGraph = createTestGraph(); @@ -375,11 +375,11 @@ public void testUpdatePortPosition() { final KNode baseGraph = createTestGraph(); final KPort basePortToMove = baseGraph.getChildren().get(parentNodePosition).getPorts().get(oldPosition); final EObject portToMoveSource = new EObjectImpl() { }; - basePortToMove.setProperty(KlighdInternalProperties.MODEL_ELEMEMT, portToMoveSource); + basePortToMove.setProperty(KlighdInternalProperties.MODEL_ELEMENT, portToMoveSource); final KNode newGraph = createTestGraph(); final KPort newPortToMove = newGraph.getChildren().get(parentNodePosition).getPorts().get(oldPosition); - newPortToMove.setProperty(KlighdInternalProperties.MODEL_ELEMEMT, portToMoveSource); + newPortToMove.setProperty(KlighdInternalProperties.MODEL_ELEMENT, portToMoveSource); newGraph.getChildren().get(parentNodePosition).getPorts().move(newPosition, newPortToMove); @@ -412,7 +412,7 @@ public void testAddLabel() { final KNode parentNode = newGraph.getChildren().get(parentNodePosition); final KLabel newLabel = KGraphUtil.createInitializedLabel(parentNode); final EObject newLabelSource = new EObjectImpl() { }; - newLabel.setProperty(KlighdInternalProperties.MODEL_ELEMEMT, newLabelSource); + newLabel.setProperty(KlighdInternalProperties.MODEL_ELEMENT, newLabelSource); parentNode.getLabels().move(newLabelPosition, newLabel); final ViewContext viewContext = createViewContext(); @@ -441,7 +441,7 @@ public void testRemoveLabel() { final KNode baseGraph = createTestGraph(); final KLabel baseLabelToRemove = baseGraph.getChildren().get(parentNodePosition).getLabels().get(toRemovePosition); final EObject baseLabelToRemoveSource = new EObjectImpl() { }; - baseLabelToRemove.setProperty(KlighdInternalProperties.MODEL_ELEMEMT, baseLabelToRemoveSource); + baseLabelToRemove.setProperty(KlighdInternalProperties.MODEL_ELEMENT, baseLabelToRemoveSource); final KNode newGraph = createTestGraph(); @@ -470,11 +470,11 @@ public void testUpdateLabelPosition() { final KNode baseGraph = createTestGraph(); final KLabel baseLabelToMove = baseGraph.getChildren().get(parentNodePosition).getLabels().get(oldPosition); final EObject labelToMoveSource = new EObjectImpl() { }; - baseLabelToMove.setProperty(KlighdInternalProperties.MODEL_ELEMEMT, labelToMoveSource); + baseLabelToMove.setProperty(KlighdInternalProperties.MODEL_ELEMENT, labelToMoveSource); final KNode newGraph = createTestGraph(); final KLabel newLabelToMove = newGraph.getChildren().get(parentNodePosition).getLabels().get(oldPosition); - newLabelToMove.setProperty(KlighdInternalProperties.MODEL_ELEMEMT, labelToMoveSource); + newLabelToMove.setProperty(KlighdInternalProperties.MODEL_ELEMENT, labelToMoveSource); newGraph.getChildren().get(parentNodePosition).getLabels().move(newPosition, newLabelToMove); @@ -505,7 +505,7 @@ public void testAddEdgePlain() { final KEdge newEdge = KGraphUtil.createInitializedEdge(); final EObject newEdgeSource = new EObjectImpl() { }; - newEdge.setProperty(KlighdInternalProperties.MODEL_ELEMEMT, newEdgeSource); + newEdge.setProperty(KlighdInternalProperties.MODEL_ELEMENT, newEdgeSource); final int sourceNodePosition = 0; final int targetNodePosition = 1; @@ -548,7 +548,7 @@ public void testAddEdgeOnPort() { final KEdge newEdge = KGraphUtil.createInitializedEdge(); final EObject newEdgeSource = new EObjectImpl() { }; - newEdge.setProperty(KlighdInternalProperties.MODEL_ELEMEMT, newEdgeSource); + newEdge.setProperty(KlighdInternalProperties.MODEL_ELEMENT, newEdgeSource); final int sourceNodePosition = 0; final int targetNodePosition = 1; @@ -598,7 +598,7 @@ public void testAddEdgeNewNodeToNewTargetPort() { // Create a new source node on index 0. final KNode newSourceNode = KGraphUtil.createInitializedNode(); final EObject newSourceNodeSource = new EObjectImpl() { }; - newSourceNode.setProperty(KlighdInternalProperties.MODEL_ELEMEMT, newSourceNodeSource); + newSourceNode.setProperty(KlighdInternalProperties.MODEL_ELEMENT, newSourceNodeSource); final int newSourceNodePosition = 0; newGraph.getChildren().add(newSourceNodePosition, newSourceNode); @@ -606,7 +606,7 @@ public void testAddEdgeNewNodeToNewTargetPort() { // Create the new target port on another node with index 1. final KPort newTargetPort = KGraphUtil.createInitializedPort(); final EObject newTargetPortSource = new EObjectImpl() { }; - newTargetPort.setProperty(KlighdInternalProperties.MODEL_ELEMEMT, newTargetPortSource); + newTargetPort.setProperty(KlighdInternalProperties.MODEL_ELEMENT, newTargetPortSource); final int targetNodePosition = 1; final int newTargetPortPosition = 0; @@ -616,7 +616,7 @@ public void testAddEdgeNewNodeToNewTargetPort() { // Create a new edge from the new source node to the new target port. final KEdge newEdge = KGraphUtil.createInitializedEdge(); final EObject newEdgeSource = new EObjectImpl() { }; - newEdge.setProperty(KlighdInternalProperties.MODEL_ELEMEMT, newEdgeSource); + newEdge.setProperty(KlighdInternalProperties.MODEL_ELEMENT, newEdgeSource); newEdge.setSource(newSourceNode); newEdge.setTargetPort(newTargetPort); @@ -684,7 +684,7 @@ public void testRemoveEdgePlain() { final KEdge baseEdgeToRemove = baseGraph.getChildren().get(sourceNodePosition).getOutgoingEdges() .get(toRemovePosition); final EObject baseEdgeToRemoveSource = new EObjectImpl() { }; - baseEdgeToRemove.setProperty(KlighdInternalProperties.MODEL_ELEMEMT, baseEdgeToRemoveSource); + baseEdgeToRemove.setProperty(KlighdInternalProperties.MODEL_ELEMENT, baseEdgeToRemoveSource); final KNode newGraph = createTestGraph(); @@ -714,7 +714,7 @@ public void testRemoveEdgeOnPort() { final KEdge baseEdgeToRemove = baseGraph.getChildren().get(sourceNodePosition).getPorts() .get(sourceNodePortPosition).getEdges().get(toRemovePosition); final EObject baseEdgeToRemoveSource = new EObjectImpl() { }; - baseEdgeToRemove.setProperty(KlighdInternalProperties.MODEL_ELEMEMT, baseEdgeToRemoveSource); + baseEdgeToRemove.setProperty(KlighdInternalProperties.MODEL_ELEMENT, baseEdgeToRemoveSource); final KNode newGraph = createTestGraph(); @@ -746,12 +746,12 @@ public void testUpdateEdgePositionPlain() { final KEdge baseEdgeToMove = baseGraph.getChildren().get(sourceNodePosition).getOutgoingEdges() .get(oldSourcePosition); final EObject edgeToMoveSource = new EObjectImpl() { }; - baseEdgeToMove.setProperty(KlighdInternalProperties.MODEL_ELEMEMT, edgeToMoveSource); + baseEdgeToMove.setProperty(KlighdInternalProperties.MODEL_ELEMENT, edgeToMoveSource); final KNode newGraph = createTestGraph(); final KEdge newEdgeToMove = newGraph.getChildren().get(sourceNodePosition).getOutgoingEdges() .get(oldSourcePosition); - newEdgeToMove.setProperty(KlighdInternalProperties.MODEL_ELEMEMT, edgeToMoveSource); + newEdgeToMove.setProperty(KlighdInternalProperties.MODEL_ELEMENT, edgeToMoveSource); final KNode newTargetNode = newEdgeToMove.getTarget(); newGraph.getChildren().get(sourceNodePosition).getOutgoingEdges().move(newSourcePosition, newEdgeToMove); newTargetNode.getIncomingEdges().move(newTargetPosition, newEdgeToMove); @@ -789,12 +789,12 @@ public void testUpdateEdgePositionOnPort() { final KEdge baseEdgeToMove = baseGraph.getChildren().get(sourceNodePosition).getPorts() .get(sourceNodePortPosition).getEdges().get(oldSourcePosition); final EObject edgeToMoveSource = new EObjectImpl() { }; - baseEdgeToMove.setProperty(KlighdInternalProperties.MODEL_ELEMEMT, edgeToMoveSource); + baseEdgeToMove.setProperty(KlighdInternalProperties.MODEL_ELEMENT, edgeToMoveSource); final KNode newGraph = createTestGraph(); final KEdge newEdgeToMove = newGraph.getChildren().get(sourceNodePosition).getPorts() .get(sourceNodePortPosition).getEdges().get(oldSourcePosition); - newEdgeToMove.setProperty(KlighdInternalProperties.MODEL_ELEMEMT, edgeToMoveSource); + newEdgeToMove.setProperty(KlighdInternalProperties.MODEL_ELEMENT, edgeToMoveSource); final KPort newTargetPort = newEdgeToMove.getTargetPort(); newGraph.getChildren().get(sourceNodePosition).getPorts().get(sourceNodePortPosition).getEdges() .move(newSourcePosition, newEdgeToMove); @@ -897,11 +897,11 @@ public void testIssue48() { final EObject newNodeSource3 = new EObjectImpl() { }; final EObject newNodeSourceL = new EObjectImpl() { }; final EObject newNodeSource2 = new EObjectImpl() { }; - newNodeC.setProperty(KlighdInternalProperties.MODEL_ELEMEMT, newNodeSourceC); - newNode1.setProperty(KlighdInternalProperties.MODEL_ELEMEMT, newNodeSource1); - newNode3.setProperty(KlighdInternalProperties.MODEL_ELEMEMT, newNodeSource3); - newNodeL.setProperty(KlighdInternalProperties.MODEL_ELEMEMT, newNodeSourceL); - newNode2.setProperty(KlighdInternalProperties.MODEL_ELEMEMT, newNodeSource2); + newNodeC.setProperty(KlighdInternalProperties.MODEL_ELEMENT, newNodeSourceC); + newNode1.setProperty(KlighdInternalProperties.MODEL_ELEMENT, newNodeSource1); + newNode3.setProperty(KlighdInternalProperties.MODEL_ELEMENT, newNodeSource3); + newNodeL.setProperty(KlighdInternalProperties.MODEL_ELEMENT, newNodeSourceL); + newNode2.setProperty(KlighdInternalProperties.MODEL_ELEMENT, newNodeSource2); final KPort newPortCOut = KGraphUtil.createInitializedPort(); newPortCOut.setNode(newNodeC); diff --git a/test/de.cau.cs.kieler.klighd.test/src/de/cau/cs/kieler/klighd/test/ViewContextSourceModelTrackingTest.java b/test/de.cau.cs.kieler.klighd.test/src/de/cau/cs/kieler/klighd/test/ViewContextSourceModelTrackingTest.java index db2f4f725..550f9bd98 100644 --- a/test/de.cau.cs.kieler.klighd.test/src/de/cau/cs/kieler/klighd/test/ViewContextSourceModelTrackingTest.java +++ b/test/de.cau.cs.kieler.klighd.test/src/de/cau/cs/kieler/klighd/test/ViewContextSourceModelTrackingTest.java @@ -108,11 +108,11 @@ private void checkTracerMaps(final ViewContext viewContext, final int expectedEn public void test00() { final Object elementB = new Object(); final KNode nodeB = KGraphUtil.createInitializedNode(); - nodeB.setProperty(KlighdInternalProperties.MODEL_ELEMEMT, elementB); + nodeB.setProperty(KlighdInternalProperties.MODEL_ELEMENT, elementB); final Object elementA = new Object(); final KNode nodeA = KGraphUtil.createInitializedNode(); - nodeA.setProperty(KlighdInternalProperties.MODEL_ELEMEMT, elementA); + nodeA.setProperty(KlighdInternalProperties.MODEL_ELEMENT, elementA); nodeA.getChildren().add(nodeB); final KNode root = KGraphUtil.createInitializedNode(); @@ -160,7 +160,7 @@ private ViewContext updateViewModelRootSourceElement(final ViewContext viewConte final EObject sourceModel = new EObjectImpl() { }; final KNode newModel = KGraphUtil.createInitializedNode(); - newModel.setProperty(KlighdInternalProperties.MODEL_ELEMEMT, sourceModel); + newModel.setProperty(KlighdInternalProperties.MODEL_ELEMENT, sourceModel); UPDATE_STRATEGY.update(viewModel, newModel, viewContext); @@ -484,8 +484,8 @@ public void testIncrementalUpdate() { final EObject rootSource = new EObjectImpl() { }; final EObject childSource = new EObjectImpl() { }; - rootNode.setProperty(KlighdInternalProperties.MODEL_ELEMEMT, rootSource); - childNode.setProperty(KlighdInternalProperties.MODEL_ELEMEMT, childSource); + rootNode.setProperty(KlighdInternalProperties.MODEL_ELEMENT, rootSource); + childNode.setProperty(KlighdInternalProperties.MODEL_ELEMENT, childSource); final ViewContext viewContext = createViewContext(); INCREMENTAL_UPDATE_STRATEGY.update(viewContext.getViewModel(), rootNode, viewContext); @@ -498,8 +498,8 @@ public void testIncrementalUpdate() { final KNode newRoot = createSimpleNetwork(); final KNode newChildNode = newRoot.getChildren().get(1); - newRoot.setProperty(KlighdInternalProperties.MODEL_ELEMEMT, rootSource); - newChildNode.setProperty(KlighdInternalProperties.MODEL_ELEMEMT, childSource); + newRoot.setProperty(KlighdInternalProperties.MODEL_ELEMENT, rootSource); + newChildNode.setProperty(KlighdInternalProperties.MODEL_ELEMENT, childSource); final ViewContext newViewContext = createViewContext(); INCREMENTAL_UPDATE_STRATEGY.update(newViewContext.getViewModel(), newRoot, newViewContext);