diff --git a/build/de.cau.cs.kieler.klighd.repository/category.xml b/build/de.cau.cs.kieler.klighd.repository/category.xml index ce72249af..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 3c96be4a1..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/2022-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.28.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/downloads/drops/R20220830213456/repository/ + 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 7c913547e..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 @@ -8,7 +8,7 @@ - + @@ -25,18 +25,23 @@ - + - + + + + + - - + + + 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..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 @@ -8,7 +8,7 @@ - + @@ -25,7 +25,7 @@ - + @@ -36,11 +36,16 @@ - + + + + + - - + + + 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..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 @@ -8,7 +8,7 @@ - + @@ -21,11 +21,11 @@ - + - + @@ -36,11 +36,16 @@ - + + + + + - - + + + 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..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 @@ -8,7 +8,7 @@ - + @@ -21,22 +21,27 @@ - + - + - + + + + + - - + + + 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.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..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 javax.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/.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.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..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 javax.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/.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..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,14 +4,15 @@ 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, 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.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 c594c448d..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 javax.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..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 javax.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..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 javax.inject.Inject import static extension de.cau.cs.kieler.klighd.syntheses.DiagramSyntheses.* 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 d4cbf9620..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 @@ -6,13 +6,13 @@ 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", 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.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/KGraphDiagramServerManager.xtend b/plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/KGraphDiagramServerManager.xtend index 964adab69..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 javax.inject.Inject -import javax.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 fa9819f16..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 javax.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..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 javax.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.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 c1a37ba46..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 @@ -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" } ''' @@ -88,7 +89,7 @@ class KlighdProjectContributor implements IProjectFactoryContributor { ''' package «projectInfo.transformationPackage» - import javax.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.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 d718971e1..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, @@ -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/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 3d7756eb3..8a6fd02f4 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 + 0.9.0 + 2.10.1 + 32.1.3-jre + 7.0.0 + 3.32.0 + 0.21.1 0.9.0 0.1.0 - 3.121.0 + 3.124.200 2.7.3 - 3.126.0 - 2.28.0 - 2.28.0 + 2.33.0 + 2.33.0 + + + 3.20.0 + 3.30.0 + 2.29.0 + 2.35.0 + 2.20.0 + 3.131.0 @@ -80,12 +82,10 @@ UTF-8 UTF-8 - - 1.8 + + 11 - - + 11 @@ -189,7 +189,7 @@ org.eclipse.platform org.eclipse.ui.workbench - 3.110.0 + ${ui-workbench-version} org.eclipse.platform @@ -217,12 +217,18 @@ 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 + + + + xml-apis + xml-apis-ext + 1.3.04 @@ -331,7 +337,7 @@ org.eclipse.xtend xtend-maven-plugin - ${xtext-version} + ${xtend-version} @@ -373,7 +379,7 @@ org.codehaus.mojo build-helper-maven-plugin - 1.3 + 3.5.0 add-source @@ -397,6 +403,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/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 c8f09e5ab..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 d4eb4e7ed..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 bae5b84aa..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 100cc1857..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 5d418e96a..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 3a6c88b70..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 1eaf256d3..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 291428ba0..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 acc444dc5..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.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..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 javax.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/.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 abf2acd1e..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,11 +3,12 @@ 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, - 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, 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 b0cc24401..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 635496efb..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 2acd2050d..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 12b9c64bc..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 aad6b0db1..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 9b3cb36fd..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 9b27a8b7c..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 8014f08cb..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 4067eb61c..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 796e576ff..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 1a19cb1f7..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 @@ - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +