From 4dd87625a83d882eac61534ab21ce7f883892394 Mon Sep 17 00:00:00 2001 From: Arnaud Dieumegard Date: Mon, 9 Aug 2021 16:40:25 +0200 Subject: [PATCH] #41 Migrate to Eclipse 2021-06 - Update TP - Eclipse 2021-06 - Sirius 7.0.0 stable - Add batik bridge and script dependencies necessary for Sirius - Tycho 2.0.0 - Explicit Java 11 (toolchains and MANIFESTs) - Remove use of pack200 - Update eclipse-jarsigner-plugin to 1.3.2 (see #42) - Impact of software dependencies modifications: Sirius API changes Change-Id: I0c975a4d7fe2a83a193257094266ff31b7ce93d1 --- Jenkinsfile | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../pom.xml | 33 +++---------------- .../toolchains-hipp.xml | 9 +++++ .../META-INF/MANIFEST.MF | 2 +- ...lipse.emf.diffmerge.patterns.target.target | 19 +++++++---- ....eclipse.emf.diffmerge.patterns.target.tpd | 11 +++++-- .../META-INF/MANIFEST.MF | 2 +- .../diagrams/sirius/util/SiriusUtil.java | 20 ++++++----- .../META-INF/MANIFEST.MF | 2 +- 23 files changed, 64 insertions(+), 64 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index fcf7030..22029e3 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -2,7 +2,7 @@ pipeline { agent { label 'migration' } tools { maven 'apache-maven-latest' - jdk 'oracle-jdk8-latest' + jdk 'openjdk-jdk11-latest' } parameters { string(name: 'CORE_BRANCH', defaultValue: 'master', description: 'When build is not triggered by diffmerge-core build, set the branch of diffmerge-core') diff --git a/core/plugins/org.eclipse.emf.diffmerge.patterns.core.gen.edit/META-INF/MANIFEST.MF b/core/plugins/org.eclipse.emf.diffmerge.patterns.core.gen.edit/META-INF/MANIFEST.MF index f77b276..9261cc5 100644 --- a/core/plugins/org.eclipse.emf.diffmerge.patterns.core.gen.edit/META-INF/MANIFEST.MF +++ b/core/plugins/org.eclipse.emf.diffmerge.patterns.core.gen.edit/META-INF/MANIFEST.MF @@ -8,7 +8,7 @@ Bundle-ActivationPolicy: lazy Bundle-ClassPath: . Bundle-Name: %pluginName Bundle-Localization: plugin -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Require-Bundle: org.eclipse.core.runtime,org.eclipse.emf.diffmerge.patterns.core,org.eclipse.emf.diffmerge.patterns.core.gen;visibility:= reexport,org.eclipse.emf.edit;visibility:=reexport,org.eclipse.emf.ec ore;visibility:=reexport,org.eclipse.emf.ecore.edit;visibility:=reexp diff --git a/core/plugins/org.eclipse.emf.diffmerge.patterns.core.gen/META-INF/MANIFEST.MF b/core/plugins/org.eclipse.emf.diffmerge.patterns.core.gen/META-INF/MANIFEST.MF index 4110d6d..5f91bd1 100644 --- a/core/plugins/org.eclipse.emf.diffmerge.patterns.core.gen/META-INF/MANIFEST.MF +++ b/core/plugins/org.eclipse.emf.diffmerge.patterns.core.gen/META-INF/MANIFEST.MF @@ -14,6 +14,6 @@ Bundle-Name: %pluginName Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.emf.diffmerge.patterns.core.gen;sing leton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Automatic-Module-Name: org.eclipse.emf.diffmerge.patterns.core.gen diff --git a/core/plugins/org.eclipse.emf.diffmerge.patterns.core/META-INF/MANIFEST.MF b/core/plugins/org.eclipse.emf.diffmerge.patterns.core/META-INF/MANIFEST.MF index 494cf5e..dd408d9 100644 --- a/core/plugins/org.eclipse.emf.diffmerge.patterns.core/META-INF/MANIFEST.MF +++ b/core/plugins/org.eclipse.emf.diffmerge.patterns.core/META-INF/MANIFEST.MF @@ -13,7 +13,7 @@ Export-Package: org.eclipse.emf.diffmerge.patterns.core;uses:="org.eclipse.osgi. Bundle-ActivationPolicy: lazy Bundle-Name: %pluginName Bundle-Localization: plugin -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Require-Bundle: org.eclipse.core.runtime, org.eclipse.emf.ecore, org.eclipse.emf.edit, diff --git a/core/plugins/org.eclipse.emf.diffmerge.patterns.diagrams/META-INF/MANIFEST.MF b/core/plugins/org.eclipse.emf.diffmerge.patterns.diagrams/META-INF/MANIFEST.MF index c972515..7f2dd36 100644 --- a/core/plugins/org.eclipse.emf.diffmerge.patterns.diagrams/META-INF/MANIFEST.MF +++ b/core/plugins/org.eclipse.emf.diffmerge.patterns.diagrams/META-INF/MANIFEST.MF @@ -10,7 +10,7 @@ Require-Bundle: org.eclipse.core.runtime, org.eclipse.emf.diffmerge.patterns.templates.engine, org.eclipse.emf.diffmerge.patterns.repositories.catalogs, org.eclipse.emf.diffmerge.patterns.core.gen.edit -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Bundle-ActivationPolicy: lazy Export-Package: org.eclipse.emf.diffmerge.patterns.diagrams, org.eclipse.emf.diffmerge.patterns.diagrams.extensions, diff --git a/core/plugins/org.eclipse.emf.diffmerge.patterns.repositories.catalogs/META-INF/MANIFEST.MF b/core/plugins/org.eclipse.emf.diffmerge.patterns.repositories.catalogs/META-INF/MANIFEST.MF index 640f172..dd50a22 100644 --- a/core/plugins/org.eclipse.emf.diffmerge.patterns.repositories.catalogs/META-INF/MANIFEST.MF +++ b/core/plugins/org.eclipse.emf.diffmerge.patterns.repositories.catalogs/META-INF/MANIFEST.MF @@ -21,6 +21,6 @@ Bundle-Name: %pluginName Bundle-Activator: org.eclipse.emf.diffmerge.patterns.repositories.catalogs.PatternCatalogsPlugin Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.emf.diffmerge.patterns.repositories.catalogs;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Automatic-Module-Name: org.eclipse.emf.diffmerge.patterns.repositories.catalogs diff --git a/core/plugins/org.eclipse.emf.diffmerge.patterns.support.gen.edit/META-INF/MANIFEST.MF b/core/plugins/org.eclipse.emf.diffmerge.patterns.support.gen.edit/META-INF/MANIFEST.MF index 62780f8..62f863c 100644 --- a/core/plugins/org.eclipse.emf.diffmerge.patterns.support.gen.edit/META-INF/MANIFEST.MF +++ b/core/plugins/org.eclipse.emf.diffmerge.patterns.support.gen.edit/META-INF/MANIFEST.MF @@ -7,7 +7,7 @@ Bundle-ClassPath: . Bundle-Activator: org.eclipse.emf.diffmerge.patterns.support.gen.commonpatternsupport.provider.CommonPatternSupportEditPlugin$Implementation Bundle-Vendor: %providerName Bundle-Localization: plugin -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Export-Package: org.eclipse.emf.diffmerge.patterns.support.gen.commonpatternsupport.provider Require-Bundle: org.eclipse.core.runtime, org.eclipse.emf.diffmerge.patterns.support.gen;visibility:=reexport, diff --git a/core/plugins/org.eclipse.emf.diffmerge.patterns.support.gen/META-INF/MANIFEST.MF b/core/plugins/org.eclipse.emf.diffmerge.patterns.support.gen/META-INF/MANIFEST.MF index 2f164e9..c762193 100644 --- a/core/plugins/org.eclipse.emf.diffmerge.patterns.support.gen/META-INF/MANIFEST.MF +++ b/core/plugins/org.eclipse.emf.diffmerge.patterns.support.gen/META-INF/MANIFEST.MF @@ -11,7 +11,7 @@ Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, org.eclipse.emf.diffmerge.patterns.core.gen;visibility:=reexport, org.eclipse.emf.edit -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Export-Package: org.eclipse.emf.diffmerge.patterns.support.gen, org.eclipse.emf.diffmerge.patterns.support.gen.commonpatternsupport, org.eclipse.emf.diffmerge.patterns.support.gen.commonpatternsupport.impl, diff --git a/core/plugins/org.eclipse.emf.diffmerge.patterns.support/META-INF/MANIFEST.MF b/core/plugins/org.eclipse.emf.diffmerge.patterns.support/META-INF/MANIFEST.MF index 70fe37d..b8c67f9 100644 --- a/core/plugins/org.eclipse.emf.diffmerge.patterns.support/META-INF/MANIFEST.MF +++ b/core/plugins/org.eclipse.emf.diffmerge.patterns.support/META-INF/MANIFEST.MF @@ -10,7 +10,7 @@ Require-Bundle: org.eclipse.core.runtime, org.eclipse.emf.ecore.xmi, org.eclipse.core.resources, org.eclipse.emf.transaction -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Bundle-ActivationPolicy: lazy Export-Package: org.eclipse.emf.diffmerge.patterns.support, org.eclipse.emf.diffmerge.patterns.support.contributions, diff --git a/core/plugins/org.eclipse.emf.diffmerge.patterns.templates.engine/META-INF/MANIFEST.MF b/core/plugins/org.eclipse.emf.diffmerge.patterns.templates.engine/META-INF/MANIFEST.MF index eff17a8..ac6b134 100644 --- a/core/plugins/org.eclipse.emf.diffmerge.patterns.templates.engine/META-INF/MANIFEST.MF +++ b/core/plugins/org.eclipse.emf.diffmerge.patterns.templates.engine/META-INF/MANIFEST.MF @@ -28,6 +28,6 @@ Bundle-Activator: org.eclipse.emf.diffmerge.patterns.templates.engine Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.emf.diffmerge.patterns.templates.eng ine;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Automatic-Module-Name: org.eclipse.emf.diffmerge.patterns.templates.engine diff --git a/core/plugins/org.eclipse.emf.diffmerge.patterns.templates.gen.edit/META-INF/MANIFEST.MF b/core/plugins/org.eclipse.emf.diffmerge.patterns.templates.gen.edit/META-INF/MANIFEST.MF index 41e251a..4fe3459 100644 --- a/core/plugins/org.eclipse.emf.diffmerge.patterns.templates.gen.edit/META-INF/MANIFEST.MF +++ b/core/plugins/org.eclipse.emf.diffmerge.patterns.templates.gen.edit/META-INF/MANIFEST.MF @@ -9,7 +9,7 @@ Bundle-ClassPath: . Bundle-Activator: org.eclipse.emf.diffmerge.patterns.templates.gen.templatepatterns.provider.TemplatePatternsEditPlugin$Implementation Bundle-Vendor: %providerName Bundle-Localization: plugin -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Export-Package: org.eclipse.emf.diffmerge.patterns.templates.gen.templatepatterns.provider Require-Bundle: org.eclipse.core.runtime,org.eclipse.emf.diffmerge.patterns.templates.gen;visibility:=reexport,org.eclipse.emf.edit;visibi lity:=reexport,org.eclipse.emf.diffmerge.patterns.core.gen;visibilit diff --git a/core/plugins/org.eclipse.emf.diffmerge.patterns.templates.gen.editor/META-INF/MANIFEST.MF b/core/plugins/org.eclipse.emf.diffmerge.patterns.templates.gen.editor/META-INF/MANIFEST.MF index ca6cb24..a2228d0 100644 --- a/core/plugins/org.eclipse.emf.diffmerge.patterns.templates.gen.editor/META-INF/MANIFEST.MF +++ b/core/plugins/org.eclipse.emf.diffmerge.patterns.templates.gen.editor/META-INF/MANIFEST.MF @@ -7,7 +7,7 @@ Bundle-ClassPath: . Bundle-Activator: org.eclipse.emf.diffmerge.patterns.templates.gen.templatepatterns.presentation.TemplatePatternsEditorPlugin$Implementation Bundle-Vendor: %providerName Bundle-Localization: plugin -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Export-Package: org.eclipse.emf.diffmerge.patterns.templates.gen.templatepatterns.presentation Require-Bundle: org.eclipse.core.runtime, org.eclipse.core.resources;visibility:=reexport, diff --git a/core/plugins/org.eclipse.emf.diffmerge.patterns.templates.gen/META-INF/MANIFEST.MF b/core/plugins/org.eclipse.emf.diffmerge.patterns.templates.gen/META-INF/MANIFEST.MF index 093007d..d72a5df 100644 --- a/core/plugins/org.eclipse.emf.diffmerge.patterns.templates.gen/META-INF/MANIFEST.MF +++ b/core/plugins/org.eclipse.emf.diffmerge.patterns.templates.gen/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Export-Package: org.eclipse.emf.diffmerge.patterns.templates.gen,org.eclipse.emf Bundle-ClassPath: . Bundle-Name: %pluginName Bundle-Localization: plugin -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Require-Bundle: org.eclipse.core.runtime, org.eclipse.emf.ecore;visibility:=reexport, org.eclipse.emf.diffmerge.patterns.core;visibility:=reexport, diff --git a/core/plugins/org.eclipse.emf.diffmerge.patterns.templates.ocl/META-INF/MANIFEST.MF b/core/plugins/org.eclipse.emf.diffmerge.patterns.templates.ocl/META-INF/MANIFEST.MF index bd4f72e..641d5f3 100644 --- a/core/plugins/org.eclipse.emf.diffmerge.patterns.templates.ocl/META-INF/MANIFEST.MF +++ b/core/plugins/org.eclipse.emf.diffmerge.patterns.templates.ocl/META-INF/MANIFEST.MF @@ -14,6 +14,6 @@ Bundle-Name: %pluginName Bundle-Activator: org.eclipse.emf.diffmerge.patterns.templates.ocl.OclPatternsPlugin Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.emf.diffmerge.patterns.templates.ocl;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Automatic-Module-Name: org.eclipse.emf.diffmerge.patterns.templates.ocl diff --git a/core/plugins/org.eclipse.emf.diffmerge.patterns.ui/META-INF/MANIFEST.MF b/core/plugins/org.eclipse.emf.diffmerge.patterns.ui/META-INF/MANIFEST.MF index d34a329..356fc82 100644 --- a/core/plugins/org.eclipse.emf.diffmerge.patterns.ui/META-INF/MANIFEST.MF +++ b/core/plugins/org.eclipse.emf.diffmerge.patterns.ui/META-INF/MANIFEST.MF @@ -17,7 +17,7 @@ Require-Bundle: org.eclipse.gmf.runtime.diagram.ui, org.eclipse.emf.ecore.editor, org.eclipse.emf.diffmerge.patterns.templates.gen.editor, org.eclipse.emf.ecore -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Bundle-ActivationPolicy: lazy Export-Package: org.eclipse.emf.diffmerge.patterns.ui, org.eclipse.emf.diffmerge.patterns.ui.actions, diff --git a/releng/org.eclipse.emf.diffmerge.patterns.configuration/pom.xml b/releng/org.eclipse.emf.diffmerge.patterns.configuration/pom.xml index 82ee5a9..53c4db3 100644 --- a/releng/org.eclipse.emf.diffmerge.patterns.configuration/pom.xml +++ b/releng/org.eclipse.emf.diffmerge.patterns.configuration/pom.xml @@ -6,13 +6,13 @@ pom - 1.1.3 + 1.3.2 diffmerge/lastSuccessfulBuild/artifact/releng/org.eclipse.emf.diffmerge.update/target - 1.8 + 11 ${java.version} ${java.version} UTF-8 - 1.7.0 + 2.0.0 ${tycho.version} @@ -41,6 +41,7 @@ target-platform-configuration ${tycho.version} + JavaSE-11 org.eclipse.emf.diffmerge @@ -113,19 +114,6 @@ - - org.eclipse.tycho.extras - tycho-pack200a-plugin - ${tycho.version} - - - pack200-normalize - - normalize - - - - org.eclipse.cbi.maven.plugins eclipse-jarsigner-plugin @@ -140,19 +128,6 @@ - - org.eclipse.tycho.extras - tycho-pack200b-plugin - ${tycho.version} - - - pack200-pack - - pack - - - - org.eclipse.tycho tycho-p2-plugin diff --git a/releng/org.eclipse.emf.diffmerge.patterns.configuration/toolchains-hipp.xml b/releng/org.eclipse.emf.diffmerge.patterns.configuration/toolchains-hipp.xml index 32de151..cbfbd2b 100644 --- a/releng/org.eclipse.emf.diffmerge.patterns.configuration/toolchains-hipp.xml +++ b/releng/org.eclipse.emf.diffmerge.patterns.configuration/toolchains-hipp.xml @@ -1,4 +1,13 @@ + + jdk + + JavaSE-11 + + + /opt/tools/java/openjdk/jdk-11/latest + + jdk diff --git a/releng/org.eclipse.emf.diffmerge.patterns.javadoc/META-INF/MANIFEST.MF b/releng/org.eclipse.emf.diffmerge.patterns.javadoc/META-INF/MANIFEST.MF index b56d06e..7deb919 100644 --- a/releng/org.eclipse.emf.diffmerge.patterns.javadoc/META-INF/MANIFEST.MF +++ b/releng/org.eclipse.emf.diffmerge.patterns.javadoc/META-INF/MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: Javadoc for Diff/Merge Core (Incubation) Bundle-SymbolicName: org.eclipse.emf.diffmerge.patterns.javadoc Bundle-Version: 0.14.0.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Automatic-Module-Name: org.eclipse.emf.diffmerge.patterns.javadoc diff --git a/releng/org.eclipse.emf.diffmerge.patterns.target/org.eclipse.emf.diffmerge.patterns.target.target b/releng/org.eclipse.emf.diffmerge.patterns.target/org.eclipse.emf.diffmerge.patterns.target.target index 5e77574..06e01b2 100644 --- a/releng/org.eclipse.emf.diffmerge.patterns.target/org.eclipse.emf.diffmerge.patterns.target.target +++ b/releng/org.eclipse.emf.diffmerge.patterns.target/org.eclipse.emf.diffmerge.patterns.target.target @@ -1,20 +1,20 @@ - + - + - + - + @@ -26,14 +26,19 @@ - + - + - + + + + + + diff --git a/releng/org.eclipse.emf.diffmerge.patterns.target/org.eclipse.emf.diffmerge.patterns.target.tpd b/releng/org.eclipse.emf.diffmerge.patterns.target/org.eclipse.emf.diffmerge.patterns.target.tpd index 4f982cf..f243ac8 100644 --- a/releng/org.eclipse.emf.diffmerge.patterns.target/org.eclipse.emf.diffmerge.patterns.target.tpd +++ b/releng/org.eclipse.emf.diffmerge.patterns.target/org.eclipse.emf.diffmerge.patterns.target.tpd @@ -1,10 +1,12 @@ target "org.eclipse.emf.diffmerge.patterns" +with source + location "http://download.eclipse.org/cbi/updates/license/" { org.eclipse.license.feature.group [2.0.2.v20181016-2210,2.0.2.v20181016-2210] } -location "http://download.eclipse.org/releases/2020-06" { +location "http://download.eclipse.org/releases/2021-06" { org.eclipse.equinox.executable.feature.group lazy org.eclipse.platform.sdk lazy org.eclipse.jdt.feature.group lazy @@ -25,9 +27,14 @@ location "http://download.eclipse.org/releases/2020-06" { com.google.guava lazy } -location "https://download.eclipse.org/sirius/updates/stable/6.4.0-S20200921-043506/2020-06" { +location "https://download.eclipse.org/sirius/updates/stable/7.0.0-S20210722-123507/2021-06" { org.eclipse.sirius.runtime.feature.group lazy org.eclipse.sirius.runtime.ide.ui.feature.group lazy org.eclipse.sirius.specifier.feature.group lazy org.eclipse.sirius.specifier.ide.ui.feature.group lazy +} + +location Orbit "https://download.eclipse.org/tools/orbit/downloads/drops/R20210602031627/repository" { + org.apache.batik.bridge.source lazy + org.apache.batik.script.source lazy } \ No newline at end of file diff --git a/sirius/plugins/org.eclipse.emf.diffmerge.patterns.diagrams.sirius/META-INF/MANIFEST.MF b/sirius/plugins/org.eclipse.emf.diffmerge.patterns.diagrams.sirius/META-INF/MANIFEST.MF index 19a781b..50c81cb 100644 --- a/sirius/plugins/org.eclipse.emf.diffmerge.patterns.diagrams.sirius/META-INF/MANIFEST.MF +++ b/sirius/plugins/org.eclipse.emf.diffmerge.patterns.diagrams.sirius/META-INF/MANIFEST.MF @@ -18,7 +18,7 @@ Require-Bundle: org.eclipse.emf.diffmerge, org.eclipse.sirius.common;bundle-version="6.2.0", org.eclipse.sirius.diagram.ui;bundle-version="6.2.0" Comment: fr.obeo.dsl.viewpoint, fr.obeo.dsl.viewpoint.diagram, fr.obeo.mda.ecore.extender -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Bundle-ActivationPolicy: lazy Export-Package: org.eclipse.emf.diffmerge.patterns.diagrams.sirius, org.eclipse.emf.diffmerge.patterns.diagrams.sirius.extensions, diff --git a/sirius/plugins/org.eclipse.emf.diffmerge.patterns.diagrams.sirius/src/org/eclipse/emf/diffmerge/patterns/diagrams/sirius/util/SiriusUtil.java b/sirius/plugins/org.eclipse.emf.diffmerge.patterns.diagrams.sirius/src/org/eclipse/emf/diffmerge/patterns/diagrams/sirius/util/SiriusUtil.java index 7717664..30d6f86 100644 --- a/sirius/plugins/org.eclipse.emf.diffmerge.patterns.diagrams.sirius/src/org/eclipse/emf/diffmerge/patterns/diagrams/sirius/util/SiriusUtil.java +++ b/sirius/plugins/org.eclipse.emf.diffmerge.patterns.diagrams.sirius/src/org/eclipse/emf/diffmerge/patterns/diagrams/sirius/util/SiriusUtil.java @@ -17,6 +17,7 @@ import java.util.List; import org.eclipse.core.runtime.NullProgressMonitor; +import org.eclipse.emf.common.util.BasicEList; import org.eclipse.emf.common.util.EList; import org.eclipse.emf.common.util.UniqueEList; import org.eclipse.emf.ecore.EObject; @@ -35,6 +36,7 @@ import org.eclipse.sirius.diagram.business.internal.metamodel.description.operations.SiriusElementMappingSpecOperations; import org.eclipse.sirius.diagram.business.internal.metamodel.helper.ContainerMappingWithInterpreterHelper; import org.eclipse.sirius.diagram.business.internal.metamodel.helper.NodeMappingHelper; +import org.eclipse.sirius.diagram.business.internal.metamodel.operations.DDiagramElementContainerOperations; import org.eclipse.sirius.diagram.description.AbstractNodeMapping; import org.eclipse.sirius.diagram.description.ContainerMapping; import org.eclipse.sirius.diagram.description.ContainerMappingImport; @@ -83,7 +85,7 @@ public static boolean conformsToMapping(EObject semanticElt_p, AbstractNodeMappi boolean considerPrecondition_p, boolean considerCandidates_p, Object graphicalContainer_p) { boolean result = false; if((graphicalContainer_p instanceof DDiagram) || (graphicalContainer_p instanceof DDiagramElementContainer) ){ - EObject container = (EObject)graphicalContainer_p; + DDiagramElementContainer container = (DDiagramElementContainer)graphicalContainer_p; //ModelAccessorsRegistry reg = ViewpointPlugin.getDefault().getModelAccessorRegistry(); ModelAccessorsRegistry reg = SiriusPlugin.getDefault().getModelAccessorRegistry(); ModelAccessor accessor = reg.getModelAccessor(semanticElt_p); @@ -99,22 +101,24 @@ public static boolean conformsToMapping(EObject semanticElt_p, AbstractNodeMappi } // Check semantic candidates if (result && considerCandidates_p) { - List candidates = null; + List candidates = new BasicEList<>(); if (mapping_p instanceof INodeMappingExt) { INodeMappingExt nm = (INodeMappingExt)mapping_p; // We need to call the method below to clear the cache. Otherwise, sometimes the cache is not up to date. NodeMappingHelper.clearDNodesDone(nm); - candidates = NodeMappingHelper.getNodesCandidates( - nm, semanticOfGraphicalContainer, semanticOfGraphicalContainer, container); + candidates.addAll(DDiagramElementContainerOperations.getNodesFromMapping(container, nm)); +// candidates = NodeMappingHelper.getNodesCandidates( +// nm, semanticOfGraphicalContainer, semanticOfGraphicalContainer, container); } else if (mapping_p instanceof IContainerMappingExt) { IContainerMappingExt cm = (IContainerMappingExt)mapping_p; // We need to call the method below to clear the cache. Otherwise, sometimes the cache is not up to date. ContainerMappingWithInterpreterHelper.clearDNodesDone(cm); - candidates = ContainerMappingWithInterpreterHelper.getNodesCandidates( - cm, semanticOfGraphicalContainer, - semanticOfGraphicalContainer, container); + candidates.addAll(DDiagramElementContainerOperations.getContainersFromMapping(container, cm)); +// candidates = ContainerMappingWithInterpreterHelper.getNodesCandidates( +// cm, semanticOfGraphicalContainer, +// semanticOfGraphicalContainer, container); } - result = null != candidates && candidates.contains(semanticElt_p); + result = candidates.contains(semanticElt_p); } } } diff --git a/sirius/plugins/org.eclipse.emf.diffmerge.patterns.ui.sirius/META-INF/MANIFEST.MF b/sirius/plugins/org.eclipse.emf.diffmerge.patterns.ui.sirius/META-INF/MANIFEST.MF index 1b0a7be..0a1a47a 100644 --- a/sirius/plugins/org.eclipse.emf.diffmerge.patterns.ui.sirius/META-INF/MANIFEST.MF +++ b/sirius/plugins/org.eclipse.emf.diffmerge.patterns.ui.sirius/META-INF/MANIFEST.MF @@ -18,7 +18,7 @@ Require-Bundle: org.eclipse.emf.diffmerge.patterns.templates.engine, org.eclipse.sirius.diagram;bundle-version="6.0.0", org.eclipse.ui.ide Comment: fr.obeo.dsl.viewpoint.diagram.sequence -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Bundle-ActivationPolicy: lazy Export-Package: org.eclipse.emf.diffmerge.patterns.ui.sirius, org.eclipse.emf.diffmerge.patterns.ui.sirius.dialogs,