diff options
Diffstat (limited to 'plugins/infra')
562 files changed, 2766 insertions, 1205 deletions
diff --git a/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation.edit/.classpath b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation.edit/.classpath index 0fa64c8e5fc..b5e203ff5c7 100644 --- a/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation.edit/.classpath +++ b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation.edit/.classpath @@ -2,7 +2,7 @@ <classpath> <classpathentry kind="src" path="src"/> <classpathentry kind="src" path="src-gen"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="output" path="bin"/> </classpath> diff --git a/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation.edit/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation.edit/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation.edit/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation.edit/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -12,7 +12,7 @@ org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 diff --git a/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation.edit/META-INF/MANIFEST.MF b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation.edit/META-INF/MANIFEST.MF index 597a8f358d5..f1648d11770 100644 --- a/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation.edit/META-INF/MANIFEST.MF +++ b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation.edit/META-INF/MANIFEST.MF @@ -7,7 +7,7 @@ Bundle-ClassPath: . Bundle-Activator: org.eclipse.papyrus.infra.architecture.representation.provider.RepresentationEditPlugin$Implementation Bundle-Vendor: %providerName Bundle-Localization: plugin -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.eclipse.papyrus.infra.architecture.representation.provider Require-Bundle: org.eclipse.gmf.runtime.emf.type.core;bundle-version="[1.9.0,2.0.0)", org.eclipse.core.runtime;bundle-version="[3.20.0,4.0.0)", diff --git a/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation/.classpath b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation/.classpath index ad5e13cce77..946fb3d346f 100644 --- a/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation/.classpath +++ b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src"/> <classpathentry kind="src" path="src-gen"/> diff --git a/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -12,7 +12,7 @@ org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 diff --git a/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation/META-INF/MANIFEST.MF b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation/META-INF/MANIFEST.MF index d3d52cf97e9..c7b1f1ae386 100644 --- a/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation/META-INF/MANIFEST.MF +++ b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation/META-INF/MANIFEST.MF @@ -6,7 +6,7 @@ Bundle-Version: 3.0.0.qualifier Bundle-ClassPath: . Bundle-Vendor: %providerName Bundle-Localization: plugin -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.eclipse.papyrus.infra.architecture.representation, org.eclipse.papyrus.infra.architecture.representation.impl, org.eclipse.papyrus.infra.architecture.representation.util diff --git a/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture/.classpath b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture/.classpath index 47ce7cd0756..5bfb3c39906 100644 --- a/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture/.classpath +++ b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src"/> <classpathentry kind="src" path="xtend-gen"/> diff --git a/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -12,7 +12,7 @@ org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 diff --git a/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture/META-INF/MANIFEST.MF b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture/META-INF/MANIFEST.MF index 0b8cb68f24d..bcb4103809d 100644 --- a/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture/META-INF/MANIFEST.MF +++ b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture/META-INF/MANIFEST.MF @@ -2,9 +2,9 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.papyrus.infra.architecture;singleton:=true -Bundle-Version: 3.2.0.qualifier +Bundle-Version: 3.3.0.qualifier Bundle-Localization: plugin -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.eclipse.papyrus.infra.architecture, org.eclipse.papyrus.infra.architecture.commands, org.eclipse.papyrus.infra.architecture.listeners, @@ -20,10 +20,9 @@ Require-Bundle: org.eclipse.gmf.runtime.emf.type.core;bundle-version="[1.9.0,2.0 org.eclipse.uml2.types;bundle-version="[2.5.0,3.0.0)", org.eclipse.papyrus.infra.emf;bundle-version="[4.0.0,5.0.0)", org.eclipse.xtend.lib;bundle-version="[2.24.0,3.0.0)", - com.google.inject;bundle-version="[3.0.0,4.0.0)", + com.google.inject;bundle-version="[7.0.0,8.0.0)", org.eclipse.emf.common;bundle-version="[2.21.0,3.0.0)" Bundle-ActivationPolicy: lazy Bundle-Activator: org.eclipse.papyrus.infra.architecture.Activator Bundle-Vendor: %providerName Automatic-Module-Name: org.eclipse.papyrus.infra.architecture -Import-Package: javax.inject;version="[1.0.0,2.0.0)" diff --git a/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture/pom.xml b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture/pom.xml index d0927eedd49..fe8d08a83f1 100644 --- a/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture/pom.xml +++ b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture/pom.xml @@ -9,7 +9,7 @@ <version>0.0.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.papyrus.infra.architecture</artifactId> - <version>3.2.0-SNAPSHOT</version> + <version>3.3.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> <build> diff --git a/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture/src/org/eclipse/papyrus/infra/core/internal/architecture/merger/ArchitectureContextInheritanceRule.xtend b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture/src/org/eclipse/papyrus/infra/core/internal/architecture/merger/ArchitectureContextInheritanceRule.xtend index 7bb8db2d1aa..d1e42940075 100644 --- a/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture/src/org/eclipse/papyrus/infra/core/internal/architecture/merger/ArchitectureContextInheritanceRule.xtend +++ b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture/src/org/eclipse/papyrus/infra/core/internal/architecture/merger/ArchitectureContextInheritanceRule.xtend @@ -1,5 +1,5 @@ /***************************************************************************** - * Copyright (c) 2021 Christian W. Damus, CEA LIST, and others. + * Copyright (c) 2021, 2023 Christian W. Damus, CEA LIST, and others. * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 @@ -10,13 +10,14 @@ * * Contributors: * Christian W. Damus - Initial API and implementation + * Ansgar Radermacher - bug 582492, move to com.google.inject * *****************************************************************************/ package org.eclipse.papyrus.infra.core.internal.architecture.merger -import javax.inject.Inject -import javax.inject.Singleton +import com.google.inject.Inject +import com.google.inject.Singleton import org.eclipse.papyrus.infra.core.architecture.ArchitectureContext import static org.eclipse.papyrus.infra.core.architecture.ArchitecturePackage.Literals.* diff --git a/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture/src/org/eclipse/papyrus/infra/core/internal/architecture/merger/ArchitectureContextRule.xtend b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture/src/org/eclipse/papyrus/infra/core/internal/architecture/merger/ArchitectureContextRule.xtend index 4bffb2cce86..78018fef386 100644 --- a/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture/src/org/eclipse/papyrus/infra/core/internal/architecture/merger/ArchitectureContextRule.xtend +++ b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture/src/org/eclipse/papyrus/infra/core/internal/architecture/merger/ArchitectureContextRule.xtend @@ -1,5 +1,5 @@ /***************************************************************************** - * Copyright (c) 2021 Christian W. Damus, CEA LIST, and others. + * Copyright (c) 2021, 2023 Christian W. Damus, CEA LIST, and others. * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 @@ -10,15 +10,16 @@ * * Contributors: * Christian W. Damus - Initial API and implementation + * Ansgar Radermacher - bug 582492, move to com.google.inject * *****************************************************************************/ package org.eclipse.papyrus.infra.core.internal.architecture.merger +import com.google.inject.Inject +import com.google.inject.Singleton import java.util.Set import java.util.function.Consumer -import javax.inject.Inject -import javax.inject.Singleton import org.eclipse.papyrus.infra.core.architecture.ArchitectureContext import org.eclipse.papyrus.infra.core.architecture.ArchitectureDescriptionLanguage import org.eclipse.papyrus.infra.core.architecture.ArchitectureFactory diff --git a/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture/src/org/eclipse/papyrus/infra/core/internal/architecture/merger/ArchitectureDomainRule.xtend b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture/src/org/eclipse/papyrus/infra/core/internal/architecture/merger/ArchitectureDomainRule.xtend index 40ef90d1c29..7e03fac9049 100644 --- a/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture/src/org/eclipse/papyrus/infra/core/internal/architecture/merger/ArchitectureDomainRule.xtend +++ b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture/src/org/eclipse/papyrus/infra/core/internal/architecture/merger/ArchitectureDomainRule.xtend @@ -1,5 +1,5 @@ /***************************************************************************** - * Copyright (c) 2021 Christian W. Damus, CEA LIST, and others. + * Copyright (c) 2021, 2023 Christian W. Damus, CEA LIST, and others. * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 @@ -10,16 +10,17 @@ * * Contributors: * Christian W. Damus - Initial API and implementation + * Ansgar Radermacher - bug 582492, move to com.google.inject * *****************************************************************************/ package org.eclipse.papyrus.infra.core.internal.architecture.merger +import com.google.inject.Inject +import com.google.inject.Singleton +import java.util.Set import org.eclipse.papyrus.infra.core.architecture.ArchitectureDomain -import javax.inject.Inject import org.eclipse.papyrus.infra.core.architecture.ArchitectureFactory -import javax.inject.Singleton -import java.util.Set /** * Merge rule for {@link Architecture Domain}s. diff --git a/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture/src/org/eclipse/papyrus/infra/core/internal/architecture/merger/ArchitectureExtensions.xtend b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture/src/org/eclipse/papyrus/infra/core/internal/architecture/merger/ArchitectureExtensions.xtend index b9510518246..76e793a06fb 100644 --- a/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture/src/org/eclipse/papyrus/infra/core/internal/architecture/merger/ArchitectureExtensions.xtend +++ b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture/src/org/eclipse/papyrus/infra/core/internal/architecture/merger/ArchitectureExtensions.xtend @@ -1,5 +1,5 @@ /***************************************************************************** - * Copyright (c) 2021 Christian W. Damus, CEA LIST, and others. + * Copyright (c) 2021, 2023 Christian W. Damus, CEA LIST, and others. * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 @@ -10,36 +10,37 @@ * * Contributors: * Christian W. Damus - Initial API and implementation + * Ansgar Radermacher - bug 582492, move to com.google.inject * *****************************************************************************/ package org.eclipse.papyrus.infra.core.internal.architecture.merger +import com.google.common.collect.AbstractIterator +import com.google.inject.Inject +import com.google.inject.Singleton +import com.google.inject.name.Named +import java.util.Set +import java.util.function.BiConsumer +import org.eclipse.emf.common.util.BasicEList +import org.eclipse.emf.common.util.EList import org.eclipse.emf.ecore.EObject import org.eclipse.emf.ecore.EReference +import org.eclipse.emf.ecore.EStructuralFeature +import org.eclipse.emf.ecore.InternalEObject +import org.eclipse.emf.ecore.resource.Resource import org.eclipse.emf.ecore.util.ECrossReferenceAdapter -import org.eclipse.papyrus.infra.core.architecture.ADElement import org.eclipse.emf.ecore.util.EcoreUtil +import org.eclipse.papyrus.infra.architecture.Activator +import org.eclipse.papyrus.infra.core.architecture.ADElement +import org.eclipse.papyrus.infra.core.architecture.ArchitectureDomain +import org.eclipse.papyrus.infra.core.architecture.ArchitectureFactory import org.eclipse.papyrus.infra.core.architecture.TreeViewerConfiguration -import javax.inject.Singleton -import java.util.Set -import com.google.common.collect.AbstractIterator -import javax.inject.Inject -import javax.inject.Named -import java.util.function.BiConsumer -import org.eclipse.xtext.xbase.lib.Functions.Function1 +import org.eclipse.papyrus.infra.core.architecture.util.FormattableADElement import org.eclipse.papyrus.infra.core.architecture.util.MergeTraceAdapter -import org.eclipse.papyrus.infra.core.architecture.ArchitectureFactory -import org.eclipse.papyrus.infra.core.architecture.ArchitectureDomain -import org.eclipse.emf.common.util.EList -import org.eclipse.emf.ecore.EStructuralFeature -import org.eclipse.emf.common.util.BasicEList -import org.eclipse.emf.ecore.resource.Resource -import org.eclipse.emf.ecore.InternalEObject import org.eclipse.xtext.xbase.lib.Functions.Function0 +import org.eclipse.xtext.xbase.lib.Functions.Function1 import org.eclipse.xtext.xbase.lib.Procedures.Procedure0 -import org.eclipse.papyrus.infra.architecture.Activator -import org.eclipse.papyrus.infra.core.architecture.util.FormattableADElement /** * Utility extensions for the <em>Architecture Description</em> model. diff --git a/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture/src/org/eclipse/papyrus/infra/core/internal/architecture/merger/ArchitectureViewpointRule.xtend b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture/src/org/eclipse/papyrus/infra/core/internal/architecture/merger/ArchitectureViewpointRule.xtend index 35c65177afb..c79d0746090 100644 --- a/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture/src/org/eclipse/papyrus/infra/core/internal/architecture/merger/ArchitectureViewpointRule.xtend +++ b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture/src/org/eclipse/papyrus/infra/core/internal/architecture/merger/ArchitectureViewpointRule.xtend @@ -1,5 +1,5 @@ /***************************************************************************** - * Copyright (c) 2021 Christian W. Damus, CEA LIST, and others. + * Copyright (c) 2021, 2023 Christian W. Damus, CEA LIST, and others. * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 @@ -10,14 +10,15 @@ * * Contributors: * Christian W. Damus - Initial API and implementation - * + * Ansgar Radermacher - bug 582492, move to com.google.inject + * *****************************************************************************/ package org.eclipse.papyrus.infra.core.internal.architecture.merger +import com.google.inject.Inject +import com.google.inject.Singleton import java.util.Set -import javax.inject.Inject -import javax.inject.Singleton import org.eclipse.papyrus.infra.core.architecture.ArchitectureContext import org.eclipse.papyrus.infra.core.architecture.ArchitectureFactory import org.eclipse.papyrus.infra.core.architecture.ArchitectureViewpoint diff --git a/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture/src/org/eclipse/papyrus/infra/core/internal/architecture/merger/InternalArchitectureDomainMerger.xtend b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture/src/org/eclipse/papyrus/infra/core/internal/architecture/merger/InternalArchitectureDomainMerger.xtend index 75e5dfab8c7..a27c54810fa 100644 --- a/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture/src/org/eclipse/papyrus/infra/core/internal/architecture/merger/InternalArchitectureDomainMerger.xtend +++ b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture/src/org/eclipse/papyrus/infra/core/internal/architecture/merger/InternalArchitectureDomainMerger.xtend @@ -1,5 +1,5 @@ /***************************************************************************** - * Copyright (c) 2021 Christian W. Damus, CEA LIST, and others. + * Copyright (c) 2021, 2023 Christian W. Damus, CEA LIST, and others. * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 @@ -10,6 +10,7 @@ * * Contributors: * Christian W. Damus - Initial API and implementation + * Ansgar Radermacher - bug 582492, move to com.google.inject * *****************************************************************************/ @@ -17,9 +18,12 @@ package org.eclipse.papyrus.infra.core.internal.architecture.merger import com.google.inject.AbstractModule import com.google.inject.Guice +import com.google.inject.Inject +import com.google.inject.Singleton +import java.util.Formatter import java.util.Map -import javax.inject.Inject -import javax.inject.Singleton +import org.eclipse.emf.common.util.URI +import org.eclipse.emf.ecore.EObject import org.eclipse.emf.ecore.resource.Resource import org.eclipse.emf.ecore.resource.ResourceSet import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl @@ -39,9 +43,6 @@ import org.eclipse.papyrus.infra.emf.utils.ResourceUtils import static extension org.eclipse.papyrus.infra.core.internal.architecture.merger.ArchitectureExtensions.logf import static extension org.eclipse.papyrus.infra.emf.utils.EMFHelper.* -import org.eclipse.emf.common.util.URI -import org.eclipse.emf.ecore.EObject -import java.util.Formatter /** * Model-to-model transformation that generates merged <em>Architecture Description</em> model instances diff --git a/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture/src/org/eclipse/papyrus/infra/core/internal/architecture/merger/MergeState.xtend b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture/src/org/eclipse/papyrus/infra/core/internal/architecture/merger/MergeState.xtend index d609b3ff47b..b75620c4ef9 100644 --- a/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture/src/org/eclipse/papyrus/infra/core/internal/architecture/merger/MergeState.xtend +++ b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture/src/org/eclipse/papyrus/infra/core/internal/architecture/merger/MergeState.xtend @@ -1,5 +1,5 @@ /***************************************************************************** - * Copyright (c) 2021 Christian W. Damus, CEA LIST, and others. + * Copyright (c) 2021, 2023 Christian W. Damus, CEA LIST, and others. * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 @@ -10,14 +10,15 @@ * * Contributors: * Christian W. Damus - Initial API and implementation + * Ansgar Radermacher - bug 582492, move to com.google.inject * *****************************************************************************/ package org.eclipse.papyrus.infra.core.internal.architecture.merger -import javax.inject.Singleton -import org.eclipse.papyrus.infra.core.architecture.ArchitectureDomain +import com.google.inject.Singleton import java.util.Set +import org.eclipse.papyrus.infra.core.architecture.ArchitectureDomain import org.eclipse.xtext.xbase.lib.Functions.Function0 /** diff --git a/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture/src/org/eclipse/papyrus/infra/core/internal/architecture/merger/RepresentationKindRule.xtend b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture/src/org/eclipse/papyrus/infra/core/internal/architecture/merger/RepresentationKindRule.xtend index 3f869ca888e..e10dc6ab473 100644 --- a/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture/src/org/eclipse/papyrus/infra/core/internal/architecture/merger/RepresentationKindRule.xtend +++ b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture/src/org/eclipse/papyrus/infra/core/internal/architecture/merger/RepresentationKindRule.xtend @@ -1,5 +1,5 @@ /***************************************************************************** - * Copyright (c) 2021 Christian W. Damus, CEA LIST, and others. + * Copyright (c) 2021, 2023 Christian W. Damus, CEA LIST, and others. * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 @@ -10,21 +10,22 @@ * * Contributors: * Christian W. Damus - Initial API and implementation + * Ansgar Radermacher - bug 582492, move to com.google.inject * *****************************************************************************/ package org.eclipse.papyrus.infra.core.internal.architecture.merger -import static org.eclipse.papyrus.infra.core.architecture.ArchitecturePackage.Literals.* - -import javax.inject.Inject +import com.google.inject.Inject +import com.google.inject.Singleton import org.eclipse.emf.ecore.util.EcoreUtil -import org.eclipse.papyrus.infra.core.architecture.RepresentationKind -import javax.inject.Singleton +import org.eclipse.papyrus.infra.core.architecture.ArchitectureContext import org.eclipse.papyrus.infra.core.architecture.ArchitectureDomain import org.eclipse.papyrus.infra.core.architecture.Concern +import org.eclipse.papyrus.infra.core.architecture.RepresentationKind import org.eclipse.papyrus.infra.core.architecture.Stakeholder -import org.eclipse.papyrus.infra.core.architecture.ArchitectureContext + +import static org.eclipse.papyrus.infra.core.architecture.ArchitecturePackage.Literals.* import static extension org.eclipse.papyrus.infra.core.internal.architecture.merger.ArchitectureExtensions.logf diff --git a/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.edit/.classpath b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.edit/.classpath index e9c6eafb6fa..abaf32b3e99 100644 --- a/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.edit/.classpath +++ b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.edit/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src-gen"/> <classpathentry kind="output" path="bin"/> diff --git a/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.edit/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.edit/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.edit/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.edit/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -12,7 +12,7 @@ org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 diff --git a/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.edit/META-INF/MANIFEST.MF b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.edit/META-INF/MANIFEST.MF index 31b29ad0cd7..914bd5ee5b1 100644 --- a/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.edit/META-INF/MANIFEST.MF +++ b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.edit/META-INF/MANIFEST.MF @@ -13,5 +13,5 @@ Bundle-Name: %pluginName Bundle-Activator: org.eclipse.papyrus.infra.constraints.provider.ConstraintsEditPlugin$Implementation Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.infra.constraints.edit;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.infra.constraints.edit diff --git a/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.editor/.classpath b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.editor/.classpath index e9c6eafb6fa..abaf32b3e99 100644 --- a/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.editor/.classpath +++ b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.editor/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src-gen"/> <classpathentry kind="output" path="bin"/> diff --git a/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.editor/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.editor/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.editor/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.editor/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -12,7 +12,7 @@ org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 diff --git a/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.editor/META-INF/MANIFEST.MF b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.editor/META-INF/MANIFEST.MF index 9994e71b090..1727d4b76b3 100644 --- a/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.editor/META-INF/MANIFEST.MF +++ b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.editor/META-INF/MANIFEST.MF @@ -17,5 +17,5 @@ Bundle-Name: %pluginName Bundle-Activator: org.eclipse.papyrus.infra.constraints.presentation.ConstraintsEditorPlugin$Implementation Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.infra.constraints.editor;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.infra.constraints.editor diff --git a/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.ui/.classpath b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.ui/.classpath index e801ebfb468..81fe078c20c 100644 --- a/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.ui/.classpath +++ b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.ui/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src"/> <classpathentry kind="output" path="bin"/> diff --git a/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.ui/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.ui/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.ui/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.ui/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -12,7 +12,7 @@ org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 diff --git a/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.ui/META-INF/MANIFEST.MF b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.ui/META-INF/MANIFEST.MF index 90c47eba881..a02ac2f9fb1 100644 --- a/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.ui/META-INF/MANIFEST.MF +++ b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints.ui/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-ActivationPolicy: lazy Bundle-ClassPath: . Bundle-Name: %pluginName Bundle-Localization: plugin -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Require-Bundle: org.eclipse.emf.transaction;bundle-version="[1.9.0,2.0.0)", org.eclipse.papyrus.infra.constraints;bundle-version="[3.0.0,4.0.0)", org.eclipse.papyrus.infra.core.log;bundle-version="[2.0.0,3.0.0)", diff --git a/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints/.classpath b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints/.classpath index bb642933501..f574c0cbd4d 100644 --- a/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints/.classpath +++ b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src-gen"/> <classpathentry kind="src" path="src"/> diff --git a/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -12,7 +12,7 @@ org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 diff --git a/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints/META-INF/MANIFEST.MF b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints/META-INF/MANIFEST.MF index 220dbb370a3..9fa2cef5d4c 100644 --- a/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints/META-INF/MANIFEST.MF +++ b/plugins/infra/constraints/org.eclipse.papyrus.infra.constraints/META-INF/MANIFEST.MF @@ -11,7 +11,7 @@ Bundle-ActivationPolicy: lazy Bundle-ClassPath: . Bundle-Name: %pluginName Bundle-Localization: plugin -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Require-Bundle: org.eclipse.gmf.runtime.emf.type.core;bundle-version="[1.9.0,2.0.0)", org.eclipse.papyrus.infra.core.log;bundle-version="[2.0.0,3.0.0)", org.eclipse.papyrus.infra.emf;bundle-version="[4.0.0,5.0.0)", diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture.edit/.classpath b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture.edit/.classpath index 0fa64c8e5fc..b5e203ff5c7 100644 --- a/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture.edit/.classpath +++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture.edit/.classpath @@ -2,7 +2,7 @@ <classpath> <classpathentry kind="src" path="src"/> <classpathentry kind="src" path="src-gen"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="output" path="bin"/> </classpath> diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture.edit/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture.edit/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture.edit/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture.edit/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -12,7 +12,7 @@ org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture.edit/META-INF/MANIFEST.MF b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture.edit/META-INF/MANIFEST.MF index 7f63c291e8f..1f1cf655e30 100644 --- a/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture.edit/META-INF/MANIFEST.MF +++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture.edit/META-INF/MANIFEST.MF @@ -7,7 +7,7 @@ Bundle-ClassPath: . Bundle-Activator: org.eclipse.papyrus.infra.core.architecture.provider.ArchitectureEditPlugin$Implementation Bundle-Vendor: %providerName Bundle-Localization: plugin -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.eclipse.papyrus.infra.core.architecture.provider Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.18.0,4.0.0)", org.eclipse.emf.ecore.xmi;bundle-version="[2.16.0,3.0.0)", diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/.classpath b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/.classpath index 099e24f14fc..c3f9cf33e92 100644 --- a/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/.classpath +++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/.classpath @@ -2,7 +2,7 @@ <classpath> <classpathentry kind="src" path="src-gen"/> <classpathentry kind="src" path="src"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="output" path="bin"/> </classpath> diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -12,7 +12,7 @@ org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/META-INF/MANIFEST.MF b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/META-INF/MANIFEST.MF index 15eb309c8b0..9565786776b 100644 --- a/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/META-INF/MANIFEST.MF +++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/META-INF/MANIFEST.MF @@ -8,7 +8,7 @@ Bundle-ClassPath: . Bundle-Activator: org.eclipse.papyrus.infra.core.architecture.impl.ArchitecturePlugin$Implementation Bundle-Vendor: %providerName Bundle-Localization: plugin -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.eclipse.papyrus.infra.core.architecture, org.eclipse.papyrus.infra.core.architecture.impl, org.eclipse.papyrus.infra.core.architecture.internal.operations;x-friends:="org.eclipse.papyrus.infra.core.architecture.cdo", diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.log/.classpath b/plugins/infra/core/org.eclipse.papyrus.infra.core.log/.classpath index e801ebfb468..81fe078c20c 100644 --- a/plugins/infra/core/org.eclipse.papyrus.infra.core.log/.classpath +++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.log/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src"/> <classpathentry kind="output" path="bin"/> diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.log/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/core/org.eclipse.papyrus.infra.core.log/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/infra/core/org.eclipse.papyrus.infra.core.log/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.log/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -12,7 +12,7 @@ org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.log/META-INF/MANIFEST.MF b/plugins/infra/core/org.eclipse.papyrus.infra.core.log/META-INF/MANIFEST.MF index 61ee3f31703..9bfc5125643 100644 --- a/plugins/infra/core/org.eclipse.papyrus.infra.core.log/META-INF/MANIFEST.MF +++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.log/META-INF/MANIFEST.MF @@ -9,5 +9,5 @@ Bundle-Localization: plugin Bundle-ManifestVersion: 2 Bundle-Activator: org.eclipse.papyrus.infra.core.log.internal.Activator Bundle-SymbolicName: org.eclipse.papyrus.infra.core.log;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.infra.core.log diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/.classpath b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/.classpath index 9f171deefe2..e36f84c0dc8 100644 --- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/.classpath +++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="custom-src"/> <classpathentry kind="output" path="bin"/> diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -12,7 +12,7 @@ org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/META-INF/MANIFEST.MF b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/META-INF/MANIFEST.MF index 067bd64d232..e1f36e34219 100755 --- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/META-INF/MANIFEST.MF +++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/META-INF/MANIFEST.MF @@ -7,7 +7,7 @@ Bundle-ActivationPolicy: lazy Bundle-ClassPath: . Bundle-Localization: plugin Bundle-Name: %pluginName -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Require-Bundle: org.eclipse.emf.ecore.xmi;bundle-version="[2.16.0,3.0.0)", org.eclipse.emf.transaction;bundle-version="[1.9.0,2.0.0)", org.eclipse.papyrus.infra.core;bundle-version="[4.0.0,5.0.0)", diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/.classpath b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/.classpath index e801ebfb468..81fe078c20c 100644 --- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/.classpath +++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src"/> <classpathentry kind="output" path="bin"/> diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -12,7 +12,7 @@ org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/META-INF/MANIFEST.MF b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/META-INF/MANIFEST.MF index 69e97928348..0dc88b54af3 100644 --- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/META-INF/MANIFEST.MF +++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/META-INF/MANIFEST.MF @@ -13,7 +13,7 @@ Bundle-ActivationPolicy: lazy Bundle-ClassPath: . Bundle-Name: %pluginName Bundle-Localization: plugin -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Require-Bundle: org.eclipse.core.expressions;bundle-version="[3.6.0,4.0.0)", org.eclipse.core.runtime;bundle-version="[3.18.0,4.0.0)", org.eclipse.e4.core.contexts;bundle-version="[1.8.0,2.0.0)", diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/eclipsecopy/MultiPageEditorSite.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/eclipsecopy/MultiPageEditorSite.java index cf1db769afc..efb61e369ce 100644 --- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/eclipsecopy/MultiPageEditorSite.java +++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/eclipsecopy/MultiPageEditorSite.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2015 IBM Corporation, Christian W. Damus, and others. + * Copyright (c) 2000, 2015, 2023 IBM Corporation, Christian W. Damus, and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at @@ -10,10 +10,12 @@ * Contributors: * IBM Corporation - initial API and implementation * Christian W. Damus - bug 403755 + * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - bug 581660 *******************************************************************************/ package org.eclipse.papyrus.infra.core.sasheditor.internal.eclipsecopy; import java.util.ArrayList; +import java.util.List; import org.eclipse.core.runtime.Assert; import org.eclipse.e4.core.contexts.ContextFunction; @@ -87,7 +89,7 @@ public class MultiPageEditorSite implements IMultiPageEditorSite, INestable { /** * The list of popup menu extenders; <code>null</code> if none registered. */ - private ArrayList menuExtenders; + private List<PopupMenuExtender> menuExtenders; /** * The main editor EditorSite. @@ -302,7 +304,7 @@ public class MultiPageEditorSite implements IMultiPageEditorSite, INestable { public void dispose() { if (menuExtenders != null) { for (int i = 0; i < menuExtenders.size(); i++) { - ((PopupMenuExtender) menuExtenders.get(i)).dispose(); + menuExtenders.get(i).dispose(); } menuExtenders = null; } @@ -335,6 +337,17 @@ public class MultiPageEditorSite implements IMultiPageEditorSite, INestable { contextFunction.dispose(); contextFunction = null; + + this.selectionProvider.removeSelectionChangedListener(getSelectionChangedListener()); + if (selectionProvider instanceof IPostSelectionProvider) { + ((IPostSelectionProvider) selectionProvider).removePostSelectionChangedListener(getPostSelectionChangedListener()); + } else { + selectionProvider.removeSelectionChangedListener(getPostSelectionChangedListener()); + } + this.postSelectionChangedListener = null; + this.selectionChangedListener = null; + this.editor = null; + this.actionBarContributor = null; } /** @@ -634,7 +647,7 @@ public class MultiPageEditorSite implements IMultiPageEditorSite, INestable { @Override public void registerContextMenu(String menuID, MenuManager menuMgr, ISelectionProvider selProvider) { if (menuExtenders == null) { - menuExtenders = new ArrayList(1); + menuExtenders = new ArrayList<>(1); } PartSite.registerContextMenu(menuID, menuMgr, selProvider, true, editor, context, menuExtenders); } @@ -642,7 +655,7 @@ public class MultiPageEditorSite implements IMultiPageEditorSite, INestable { @Override public final void registerContextMenu(final String menuId, final MenuManager menuManager, final ISelectionProvider selectionProvider, final boolean includeEditorInput) { if (menuExtenders == null) { - menuExtenders = new ArrayList(1); + menuExtenders = new ArrayList<>(1); } PartSite.registerContextMenu(menuId, menuManager, selectionProvider, includeEditorInput, editor, context, menuExtenders); } diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sashwindows.di/.classpath b/plugins/infra/core/org.eclipse.papyrus.infra.core.sashwindows.di/.classpath index bb642933501..f574c0cbd4d 100644 --- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sashwindows.di/.classpath +++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sashwindows.di/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src-gen"/> <classpathentry kind="src" path="src"/> diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sashwindows.di/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/core/org.eclipse.papyrus.infra.core.sashwindows.di/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sashwindows.di/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sashwindows.di/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -12,7 +12,7 @@ org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sashwindows.di/META-INF/MANIFEST.MF b/plugins/infra/core/org.eclipse.papyrus.infra.core.sashwindows.di/META-INF/MANIFEST.MF index 3ee7f88c9fe..6a3d92df0cf 100644 --- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sashwindows.di/META-INF/MANIFEST.MF +++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sashwindows.di/META-INF/MANIFEST.MF @@ -8,7 +8,7 @@ Bundle-ActivationPolicy: lazy Bundle-ClassPath: . Bundle-Localization: plugin Bundle-Name: %pluginName -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Require-Bundle: org.eclipse.emf.ecore.xmi;bundle-version="[2.16.0,3.0.0)", org.eclipse.emf.transaction;bundle-version="[1.9.0,2.0.0)", org.eclipse.uml2.types;bundle-version="[2.5.0,3.0.0)" diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/.classpath b/plugins/infra/core/org.eclipse.papyrus.infra.core/.classpath index e801ebfb468..81fe078c20c 100644 --- a/plugins/infra/core/org.eclipse.papyrus.infra.core/.classpath +++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src"/> <classpathentry kind="output" path="bin"/> diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/core/org.eclipse.papyrus.infra.core/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/infra/core/org.eclipse.papyrus.infra.core/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -12,7 +12,7 @@ org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/META-INF/MANIFEST.MF b/plugins/infra/core/org.eclipse.papyrus.infra.core/META-INF/MANIFEST.MF index 3b762ceda49..8f41f1fe1b6 100644 --- a/plugins/infra/core/org.eclipse.papyrus.infra.core/META-INF/MANIFEST.MF +++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/META-INF/MANIFEST.MF @@ -1,5 +1,6 @@ Manifest-Version: 1.0 Export-Package: org.eclipse.papyrus.infra.core, + org.eclipse.papyrus.infra.core.api, org.eclipse.papyrus.infra.core.clipboard, org.eclipse.papyrus.infra.core.editor, org.eclipse.papyrus.infra.core.extension, @@ -24,6 +25,7 @@ Require-Bundle: org.eclipse.core.expressions;bundle-version="[3.6.0,4.0.0)", org.eclipse.core.filesystem;bundle-version="[1.7.0,2.0.0)", org.eclipse.emf.ecore.xmi;bundle-version="[2.16.0,3.0.0)", org.eclipse.emf.workspace;bundle-version="[1.5.0,2.0.0)", + org.eclipse.papyrus.emf;bundle-version="[2.0.0,3.0.0)", org.eclipse.papyrus.infra.core.architecture;bundle-version="[3.0.0,4.0.0)", org.eclipse.papyrus.infra.core.log;bundle-version="[2.0.0,3.0.0)", org.eclipse.papyrus.infra.core.sashwindows.di;bundle-version="[2.0.0,3.0.0)", @@ -31,15 +33,15 @@ Require-Bundle: org.eclipse.core.expressions;bundle-version="[3.6.0,4.0.0)", org.eclipse.uml2.types;bundle-version="[2.5.0,3.0.0)" Bundle-Vendor: %providerName Bundle-ActivationPolicy: lazy -Bundle-Version: 4.3.0.qualifier +Bundle-Version: 4.4.0.qualifier Bundle-Name: %pluginName Bundle-Localization: plugin Bundle-Activator: org.eclipse.papyrus.infra.core.Activator Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.infra.core;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 -Import-Package: com.google.common.base;version="[30.1.0, 31.0.0)", - com.google.common.collect;version="[30.1.0, 31.0.0)", - com.google.common.io;version="[30.1.0, 31.0.0)", - com.google.common.util.concurrent;version="[30.1.0, 31.0.0)" +Bundle-RequiredExecutionEnvironment: JavaSE-17 +Import-Package: com.google.common.base;version="[33.1.0,33.2.0)", + com.google.common.collect;version="[33.1.0,33.2.0)", + com.google.common.io;version="[33.1.0,33.2.0)", + com.google.common.util.concurrent;version="[33.1.0,33.2.0)" Automatic-Module-Name: org.eclipse.papyrus.infra.core diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/PapyrusInfraCore.usecases b/plugins/infra/core/org.eclipse.papyrus.infra.core/PapyrusInfraCore.usecases new file mode 100644 index 00000000000..d48177ce10a --- /dev/null +++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/PapyrusInfraCore.usecases @@ -0,0 +1,9 @@ +# Requirements defined for the papyrus infra Core + +# General Requirements +Requirement: Req_001: not matter what ever, papyrus core provides the ability to load a model set from a service registry. +Requirement: Req_002: not matter what ever, papyrus core provides the ability to create a model set. +Requirement: Req_003: not matter what ever, papyrus core provides the ability to get the model set from a service registry. +Requirement: Req_004: not matter what ever, papyrus core provides the ability to get all service registry that is associate to objects. +Requirement: Req_005: not matter what ever, papyrus core provides the ability to create a service registry associated to an object (RessourceSet or Editor). +Requirement: Req_006: not matter what ever, papyrus core provides the ability to associate a service registry associated to an object (RessourceSet or Editor).
\ No newline at end of file diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/build.properties b/plugins/infra/core/org.eclipse.papyrus.infra.core/build.properties index 29273d86b39..29273d86b39 100644..100755 --- a/plugins/infra/core/org.eclipse.papyrus.infra.core/build.properties +++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/build.properties diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/pom.xml b/plugins/infra/core/org.eclipse.papyrus.infra.core/pom.xml index 905303f7a81..1f87a2f4551 100644 --- a/plugins/infra/core/org.eclipse.papyrus.infra.core/pom.xml +++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/pom.xml @@ -9,6 +9,6 @@ <version>0.0.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.papyrus.infra.core</artifactId> - <version>4.3.0-SNAPSHOT</version> + <version>4.4.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project>
\ No newline at end of file diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/Activator.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/Activator.java index 97a064b8d0d..af6e4d11263 100644 --- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/Activator.java +++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/Activator.java @@ -1,5 +1,5 @@ /***************************************************************************** - * Copyright (c) 2008, 2016 CEA LIST, Christian W. Damus, and others. + * Copyright (c) 2008, 2016, 2023, CEA LIST, Christian W. Damus, and others. * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 @@ -11,11 +11,15 @@ * Contributors: * Cedric Dumoulin Cedric.dumoulin@lifl.fr - Initial API and implementation * Christian W. Damus - bug 485220 - * + * Patrick Tessier - bug 562218 *****************************************************************************/ package org.eclipse.papyrus.infra.core; +import java.util.Hashtable; + import org.eclipse.core.runtime.Plugin; +import org.eclipse.papyrus.infra.core.api.IServiceRegistryIndexer; +import org.eclipse.papyrus.infra.core.internal.ServiceRegistryIndexer; import org.eclipse.papyrus.infra.core.log.LogHelper; import org.eclipse.papyrus.infra.core.services.spi.IContextualServiceRegistryTracker; import org.osgi.framework.BundleContext; @@ -27,7 +31,7 @@ import org.osgi.util.tracker.ServiceTracker; public class Activator extends Plugin { // The plug-in ID - public static final String PLUGIN_ID = "org.eclipse.papyrus.infra.core"; + public static final String PLUGIN_ID = "org.eclipse.papyrus.infra.core"; //$NON-NLS-1$ // The shared instance private static Activator plugin; @@ -52,6 +56,13 @@ public class Activator extends Plugin { serviceRegistryTrackerTracker = new ServiceTracker<>(context, IContextualServiceRegistryTracker.class, null); serviceRegistryTrackerTracker.open(); + // install OSGI Service about IserviceRegistryIndexer + Hashtable<String, String> props = new Hashtable<>(); + props.put("description", "This service is used to create of find a Papyrus service registry"); //$NON-NLS-1$ //$NON-NLS-2$ + context.registerService(IServiceRegistryIndexer.class, new ServiceRegistryIndexer(), props); + log.debug("IServiceRegistry Indexer OSGI service installed"); //$NON-NLS-1$ + + } @Override @@ -75,7 +86,7 @@ public class Activator extends Plugin { /** * Obtain the instance of the contextual service-registry tracker service, if any. - * + * * @return the service-registry tracker service, or {@code null} if none (probably * because there is no UI and, therefore, no user to be editing any Papyrus models) * @since 2.0 diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/api/IServiceRegistryIndexer.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/api/IServiceRegistryIndexer.java new file mode 100644 index 00000000000..f13153834db --- /dev/null +++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/api/IServiceRegistryIndexer.java @@ -0,0 +1,67 @@ +/***************************************************************************** + * Copyright (c) 2023 CEA LIST and others. + * + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * + * Contributors: + * Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation + * + *****************************************************************************/ + +package org.eclipse.papyrus.infra.core.api; + +import java.util.HashMap; + +import org.eclipse.emf.ecore.resource.ResourceSet; +import org.eclipse.papyrus.infra.core.services.ServicesRegistry; + +/** + * The papyrus core has got all servicesRegistries. It is responsible of serviceRegistry creation. + * I contains an hashmap of object : the stakeholder, service registry. + * the stakeholder may be editor for example. + * if you want to create a service registry to only create file, you can create a dummy stakeholder, but after delete it ;D + * to acces to an instance use the OSGI service with this interface as parameter. + * + * @since 4.4 + */ +public interface IServiceRegistryIndexer { + + + /** + * @return the list of all services registry created into an instance of eclipse + */ + public HashMap<Object, ServicesRegistry> getServiceRegistryMap(); + + /** + * create a service registry associated to the given object stakeholder, + * I advice you to associate the services registry to the object modelSet that is a resourceSet + **/ + public ServicesRegistry createServiceRegistryAttachTo(Object stakeholder); + + /** + * associate an existing a service registry associated to the given object stakeholder, + * I advice you to associate the services registry to the object modelSet that is a resourceSet + * + * @param stakeholder + * the element that will be associated the services registry. + * @param servicesRegistry + * the service registry to associate to the stakeholder + **/ + public void associateServiceRegistry(Object stakeholder, ServicesRegistry servicesRegistry); + + /** + * associate an existing a service registry associated to a resourceSet stakeholder, + * I advice you to associate the services registry to the object modelSet that is a resourceSet + * + * @param stakeholder + * the element that will be associated the services registry. + * @param servicesRegistry + * the service registry to associate to the stakeholder + **/ + public void associateServiceRegistry(ResourceSet stakeholder, ServicesRegistry servicesRegistry); +} diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/internal/ServiceRegistryIndexer.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/internal/ServiceRegistryIndexer.java new file mode 100644 index 00000000000..d63cb20125f --- /dev/null +++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/internal/ServiceRegistryIndexer.java @@ -0,0 +1,97 @@ +/***************************************************************************** + * Copyright (c) 2023 CEA LIST and others. + * + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * + * Contributors: + * Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation + * + *****************************************************************************/ + +package org.eclipse.papyrus.infra.core.internal; + +import static org.eclipse.papyrus.infra.core.Activator.log; + +import java.util.HashMap; + +import org.eclipse.emf.ecore.resource.ResourceSet; +import org.eclipse.papyrus.infra.core.api.IServiceRegistryIndexer; +import org.eclipse.papyrus.infra.core.services.ExtensionServicesRegistry; +import org.eclipse.papyrus.infra.core.services.ServiceException; +import org.eclipse.papyrus.infra.core.services.ServicesRegistry; + +/** + * The papyrus core has got all servicesRegistry. It is responsible of serviceRegistry creation. + * I contains an hashmap of object : the stakeholder, service registry. + * the stakeholder may be editor for example. + * if you want to create a service registry to only create file, you can create a dummy stakeholder but after delete it ;D + * this class is only accessible by calling OSGI Service mechanism + */ +public class ServiceRegistryIndexer implements IServiceRegistryIndexer { + + private HashMap<Object, ServicesRegistry> servicesRegistryMap = new HashMap<>(); + + + /** + * Constructor. + * + */ + public ServiceRegistryIndexer() { + + } + + /** + * @return the list of all services registry created into an instance of eclipse + */ + @Override + public HashMap<Object, ServicesRegistry> getServiceRegistryMap() { + return servicesRegistryMap; + } + + /** + * + * @see org.eclipse.papyrus.infra.core.api.IServiceRegistryIndexer#createServiceRegistryAttachTo(java.lang.Object) + * + * @param stakeholder + * @return + */ + @Override + public ServicesRegistry createServiceRegistryAttachTo(Object stakeholder) { + try { + ServicesRegistry servicesRegistry = new ExtensionServicesRegistry(org.eclipse.papyrus.infra.core.Activator.PLUGIN_ID); + servicesRegistryMap.put(stakeholder, servicesRegistry); + return servicesRegistry; + } catch (ServiceException e) { + // Show log and error + log.error(e.getMessage(), e); + } + return null; + } + + /** + * @see org.eclipse.papyrus.infra.core.api.IServiceRegistryIndexer#associateServiceRegistry(java.lang.Object) + * + * @param stakeholder + */ + @Override + public void associateServiceRegistry(Object stakeholder, ServicesRegistry servicesRegistry) { + servicesRegistryMap.put(stakeholder, servicesRegistry); + + } + + /** + * @see org.eclipse.papyrus.infra.core.api.IServiceRegistryIndexer#associateServiceRegistry(org.eclipse.emf.ecore.resource.ResourceSet) + * + * @param stakeholder + */ + @Override + public void associateServiceRegistry(ResourceSet stakeholder, ServicesRegistry servicesRegistry) { + servicesRegistryMap.put(stakeholder, servicesRegistry); + + } +} diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/ModelSet.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/ModelSet.java index 6b43b97a8b2..8b4c12ddda4 100644 --- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/ModelSet.java +++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/ModelSet.java @@ -100,7 +100,7 @@ public class ModelSet extends ResourceSetImpl { public static final String PAPYRUS_EDITING_DOMAIN_ID = "org.eclipse.papyrus.SharedEditingDomainID"; /** The associated IModels. */ - protected Map<String, IModel> models = new HashMap<String, IModel>(); + protected Map<String, IModel> models = new HashMap<>(); /** The snippets. */ protected ModelSetSnippetList snippets = new ModelSetSnippetList(); @@ -125,13 +125,13 @@ public class ModelSet extends ResourceSetImpl { * URI pointing to resource on which back end should be deleted on save * One example of use is empty uncontrolled resources */ - protected Set<URI> toDeleteOnSave = new HashSet<URI>(); + protected Set<URI> toDeleteOnSave = new HashSet<>(); /** list of listeners of resources to know if the resource are loaded or not */ protected ArrayList<IResourceLoadStateListener> resourceLoadStateListeners; /** map of resource loaded in the resource set, with resource as the key and a boolean indicating if the resource is loaded or not has the valuer */ - protected Map<Resource, Boolean> resourcesToLoadState = new HashMap<Resource, Boolean>(); + protected Map<Resource, Boolean> resourcesToLoadState = new HashMap<>(); private List<ILanguage> languages; @@ -735,7 +735,7 @@ public class ModelSet extends ResourceSetImpl { IReadOnlyHandler2 roHandler = getReadOnlyHandler(); if (isTrackingModification() && (roHandler != null)) { - Set<URI> roUris = new HashSet<URI>(); + Set<URI> roUris = new HashSet<>(); for (IModel model : modelList) { Set<URI> uris = model.getModifiedURIs(); for (URI u : uris) { @@ -1163,9 +1163,9 @@ public class ModelSet extends ResourceSetImpl { * @param target */ public void saveCopy(IPath targetPathWithoutExtension) { - List<IVersionableModel> versionableModels = new LinkedList<IVersionableModel>(); + List<IVersionableModel> versionableModels = new LinkedList<>(); - Map<Object, Object> targetMap = new HashMap<Object, Object>(); + Map<Object, Object> targetMap = new HashMap<>(); for (IModel model : models.values()) { if (model instanceof IVersionableModel) { diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/services/ExtensionServicesRegistry.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/services/ExtensionServicesRegistry.java index ddbbabefbf6..08b330b08a5 100644 --- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/services/ExtensionServicesRegistry.java +++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/services/ExtensionServicesRegistry.java @@ -60,7 +60,7 @@ public class ExtensionServicesRegistry extends ServicesRegistry { /** * Initializes me with the default extension-point namespace from which to load * registered services. - * + * * @throws ServiceException * on any problem in the loading of service registrations * @since 2.0 @@ -72,11 +72,12 @@ public class ExtensionServicesRegistry extends ServicesRegistry { /** * Initializes me with the specified extension-point namespace from which to load * registered services. - * + * Only the plug-in infra core can create instance, it is forbidden outside this plugins + * * @param extensionPointNamespace * the extension point namespace from which to * load service registration extensions - * + * * @throws ServiceException * on any problem in the loading of service registrations */ @@ -92,7 +93,7 @@ public class ExtensionServicesRegistry extends ServicesRegistry { */ private void registerDeclaredExtensions() throws ServiceException { - List<ServiceDescriptor> descriptors = new ArrayList<ServiceDescriptor>(); + List<ServiceDescriptor> descriptors = new ArrayList<>(); List<ServiceException> exceptions = null; // Reading data from plugins @@ -110,7 +111,7 @@ public class ExtensionServicesRegistry extends ServicesRegistry { } catch (ServiceException e) { // record exceptions if (exceptions == null) { - exceptions = new ArrayList<ServiceException>(); + exceptions = new ArrayList<>(); } exceptions.add(e); } @@ -124,7 +125,7 @@ public class ExtensionServicesRegistry extends ServicesRegistry { } catch (ServiceException e) { // record exceptions if (exceptions == null) { - exceptions = new ArrayList<ServiceException>(); + exceptions = new ArrayList<>(); } exceptions.add(e); } @@ -210,7 +211,7 @@ public class ExtensionServicesRegistry extends ServicesRegistry { */ private List<String> getDependsOn(IConfigurationElement parentElement) { - List<String> keys = new ArrayList<String>(); + List<String> keys = new ArrayList<>(); // Get children IConfigurationElement[] configElements = parentElement.getChildren(DEPENDSON_ELEMENT_NAME); diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/services/ServicesRegistry.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/services/ServicesRegistry.java index 78ba895152f..00893e73b3c 100644 --- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/services/ServicesRegistry.java +++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/services/ServicesRegistry.java @@ -85,7 +85,7 @@ import org.eclipse.papyrus.infra.core.utils.AdapterUtils; * </ul> * * @author cedric dumoulin - * + * remark this this not a service registry but an instance of Papyrus in memory. It should be renamed into PapyrusHeadless * */ public class ServicesRegistry { @@ -108,18 +108,18 @@ public class ServicesRegistry { * A Map of services added to the register (thow the addXxx() methods), but * not yet registered. They will be registered after a call to startXxx(). */ - private Map<String, ServiceStartupEntry> addedServices = new HashMap<String, ServiceStartupEntry>(); + private Map<String, ServiceStartupEntry> addedServices = new HashMap<>(); /** * Map of services registered with a name. */ - private Map<String, ServiceStartupEntry> namedServices = new HashMap<String, ServiceStartupEntry>(); + private Map<String, ServiceStartupEntry> namedServices = new HashMap<>(); /** * Map of services registered without a name (anonymous). Such services * can't be retrieved. */ - private List<ServiceStartupEntry> anonymousServices = new ArrayList<ServiceStartupEntry>(); + private List<ServiceStartupEntry> anonymousServices = new ArrayList<>(); /** * Constructor. @@ -667,7 +667,7 @@ public class ServicesRegistry { */ private List<ServiceStartupEntry> keysToServices(List<String> serviceKeys, LookupMap map) throws ServiceNotFoundException { - List<ServiceStartupEntry> result = new ArrayList<ServiceStartupEntry>(serviceKeys.size()); + List<ServiceStartupEntry> result = new ArrayList<>(serviceKeys.size()); for (String key : serviceKeys) { result.add(map.getChecked(key)); @@ -686,7 +686,7 @@ public class ServicesRegistry { */ private List<ServiceStartupEntry> classKeysToServices(List<Class<?>> serviceKeys, LookupMap map) throws ServiceNotFoundException { - List<ServiceStartupEntry> result = new ArrayList<ServiceStartupEntry>(serviceKeys.size()); + List<ServiceStartupEntry> result = new ArrayList<>(serviceKeys.size()); for (Class<?> key : serviceKeys) { result.add(map.getChecked(key.getName())); @@ -759,7 +759,7 @@ public class ServicesRegistry { */ private List<ServiceStartupEntry> retainsToStartServices(Collection<ServiceStartupEntry> services) { - List<ServiceStartupEntry> result = new ArrayList<ServiceStartupEntry>(); + List<ServiceStartupEntry> result = new ArrayList<>(); for (ServiceStartupEntry service : services) { ServiceDescriptor desc = service.getDescriptor(); if (service.getState() == ServiceState.registered && desc.isStartAtStartup()) { @@ -778,7 +778,7 @@ public class ServicesRegistry { * @return a new Collection containing the registered services */ private List<ServiceStartupEntry> retainUnstartedServices(Collection<ServiceStartupEntry> services) { - List<ServiceStartupEntry> result = new ArrayList<ServiceStartupEntry>(services.size()); + List<ServiceStartupEntry> result = new ArrayList<>(services.size()); for (ServiceStartupEntry service : services) { if (service.getState() == ServiceState.registered) { result.add(service); @@ -796,7 +796,7 @@ public class ServicesRegistry { * @param map */ private void checkCycle(Collection<ServiceStartupEntry> roots, LookupMap map) { - + } @@ -812,7 +812,7 @@ public class ServicesRegistry { */ private List<ServiceStartupEntry> buildTopologicalListOfServicesToStart(Collection<ServiceStartupEntry> roots, LookupMap map) { - List<ServiceStartupEntry> result = new ArrayList<ServiceStartupEntry>(); + List<ServiceStartupEntry> result = new ArrayList<>(); // Each root represent a graph. Walk the root and its child in the list, // in the right order. @@ -867,9 +867,9 @@ public class ServicesRegistry { private Collection<ServiceStartupEntry> getServiceRoots(Collection<ServiceStartupEntry> addedServices, LookupMap keyServiceMap) { // Create a copy of the list of services - Collection<ServiceStartupEntry> services = new ArrayList<ServiceStartupEntry>(addedServices); + Collection<ServiceStartupEntry> services = new ArrayList<>(addedServices); - List<ServiceStartupEntry> allRequired = new ArrayList<ServiceStartupEntry>(); + List<ServiceStartupEntry> allRequired = new ArrayList<>(); // The roots are services that are not required by any service. // Build a list of the services required by all other services. diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.tools/.classpath b/plugins/infra/core/org.eclipse.papyrus.infra.tools/.classpath index e801ebfb468..81fe078c20c 100644 --- a/plugins/infra/core/org.eclipse.papyrus.infra.tools/.classpath +++ b/plugins/infra/core/org.eclipse.papyrus.infra.tools/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src"/> <classpathentry kind="output" path="bin"/> diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.tools/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/core/org.eclipse.papyrus.infra.tools/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/infra/core/org.eclipse.papyrus.infra.tools/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/infra/core/org.eclipse.papyrus.infra.tools/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -12,7 +12,7 @@ org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.tools/META-INF/MANIFEST.MF b/plugins/infra/core/org.eclipse.papyrus.infra.tools/META-INF/MANIFEST.MF index c212792cf0f..5e3f686284c 100644 --- a/plugins/infra/core/org.eclipse.papyrus.infra.tools/META-INF/MANIFEST.MF +++ b/plugins/infra/core/org.eclipse.papyrus.infra.tools/META-INF/MANIFEST.MF @@ -21,8 +21,8 @@ Bundle-Name: %Bundle-Name Bundle-Activator: org.eclipse.papyrus.infra.tools.Activator Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.infra.tools;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 -Import-Package: com.google.common.base;version="[30.1.0, 31.0.0)", - com.google.common.collect;version="[30.1.0, 31.0.0)", - com.google.common.util.concurrent;version="[30.1.0, 31.0.0)" +Bundle-RequiredExecutionEnvironment: JavaSE-17 +Import-Package: com.google.common.base;version="[33.1.0,33.2.0)", + com.google.common.collect;version="[33.1.0,33.2.0)", + com.google.common.util.concurrent;version="[33.1.0,33.2.0)" Automatic-Module-Name: org.eclipse.papyrus.infra.tools diff --git a/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome.nattable/.classpath b/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome.nattable/.classpath index e801ebfb468..81fe078c20c 100644 --- a/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome.nattable/.classpath +++ b/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome.nattable/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src"/> <classpathentry kind="output" path="bin"/> diff --git a/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome.nattable/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome.nattable/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome.nattable/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome.nattable/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -12,7 +12,7 @@ org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 diff --git a/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome.nattable/META-INF/MANIFEST.MF b/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome.nattable/META-INF/MANIFEST.MF index 30738c6923f..031fc6fd63e 100644 --- a/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome.nattable/META-INF/MANIFEST.MF +++ b/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome.nattable/META-INF/MANIFEST.MF @@ -32,5 +32,5 @@ Bundle-Name: %pluginName Bundle-Activator: org.eclipse.papyrus.infra.editor.welcome.nattable.internal.Activator Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.infra.editor.welcome.nattable;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.infra.editor.welcome.nattable diff --git a/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome/.classpath b/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome/.classpath index bb642933501..f574c0cbd4d 100644 --- a/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome/.classpath +++ b/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src-gen"/> <classpathentry kind="src" path="src"/> diff --git a/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -12,7 +12,7 @@ org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 diff --git a/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome/META-INF/MANIFEST.MF b/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome/META-INF/MANIFEST.MF index 35e55c4e347..28ecd7e1544 100644 --- a/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome/META-INF/MANIFEST.MF +++ b/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome/META-INF/MANIFEST.MF @@ -37,5 +37,5 @@ Bundle-Name: %pluginName Bundle-Activator: org.eclipse.papyrus.infra.editor.welcome.internal.Activator Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.infra.editor.welcome;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.infra.editor.welcome diff --git a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.edit/.classpath b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.edit/.classpath index bb642933501..f574c0cbd4d 100755 --- a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.edit/.classpath +++ b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.edit/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src-gen"/> <classpathentry kind="src" path="src"/> diff --git a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.edit/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.edit/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.edit/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.edit/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -12,7 +12,7 @@ org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 diff --git a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.edit/META-INF/MANIFEST.MF b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.edit/META-INF/MANIFEST.MF index 41401a1c783..dc755ae8031 100755 --- a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.edit/META-INF/MANIFEST.MF +++ b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.edit/META-INF/MANIFEST.MF @@ -7,7 +7,7 @@ Bundle-ClassPath: . Bundle-Activator: org.eclipse.papyrus.infra.emf.expressions.provider.ExpressionsEditPlugin$Implementation$Activator Bundle-Vendor: %providerName Bundle-Localization: plugin -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.provider, org.eclipse.papyrus.infra.emf.expressions.provider Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.18.0,4.0.0)", diff --git a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.editor/.classpath b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.editor/.classpath index e9c6eafb6fa..abaf32b3e99 100755 --- a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.editor/.classpath +++ b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.editor/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src-gen"/> <classpathentry kind="output" path="bin"/> diff --git a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.editor/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.editor/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.editor/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.editor/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -12,7 +12,7 @@ org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 diff --git a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.editor/META-INF/MANIFEST.MF b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.editor/META-INF/MANIFEST.MF index 9ada375429b..ebaea69b6ed 100755 --- a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.editor/META-INF/MANIFEST.MF +++ b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.editor/META-INF/MANIFEST.MF @@ -7,7 +7,7 @@ Bundle-ClassPath: . Bundle-Activator: org.eclipse.papyrus.infra.emf.expressions.presentation.ExpressionsEditorPlugin$Implementation Bundle-Vendor: %providerName Bundle-Localization: plugin -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.presentation, org.eclipse.papyrus.infra.emf.expressions.presentation Require-Bundle: org.eclipse.core.resources;bundle-version="[3.13.0,4.0.0)", diff --git a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.properties/.classpath b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.properties/.classpath index e801ebfb468..81fe078c20c 100755 --- a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.properties/.classpath +++ b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.properties/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src"/> <classpathentry kind="output" path="bin"/> diff --git a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.properties/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.properties/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.properties/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.properties/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -12,7 +12,7 @@ org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 diff --git a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.properties/META-INF/MANIFEST.MF b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.properties/META-INF/MANIFEST.MF index aeedb88a953..66497e78d24 100755 --- a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.properties/META-INF/MANIFEST.MF +++ b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.properties/META-INF/MANIFEST.MF @@ -23,6 +23,6 @@ Bundle-Activator: org.eclipse.papyrus.infra.emf.expressions.properties.Activator Bundle-ManifestVersion: 2 Bundle-Description: %pluginDescription Bundle-SymbolicName: org.eclipse.papyrus.infra.emf.expressions.properties;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.eclipse.papyrus.infra.emf.expressions.properties.utils Automatic-Module-Name: org.eclipse.papyrus.infra.emf.expressions.properties diff --git a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/.classpath b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/.classpath index bb642933501..f574c0cbd4d 100755 --- a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/.classpath +++ b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src-gen"/> <classpathentry kind="src" path="src"/> diff --git a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -12,7 +12,7 @@ org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 diff --git a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/META-INF/MANIFEST.MF b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/META-INF/MANIFEST.MF index 69b8207c7ee..ec1fbcb7745 100755 --- a/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/META-INF/MANIFEST.MF +++ b/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions/META-INF/MANIFEST.MF @@ -6,7 +6,7 @@ Bundle-Version: 2.0.0.qualifier Bundle-ClassPath: . Bundle-Vendor: %providerName Bundle-Localization: plugin -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.eclipse.papyrus.infra.emf.expressions, org.eclipse.papyrus.infra.emf.expressions.booleanexpressions, org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.custom, diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.appearance/.classpath b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.appearance/.classpath index e801ebfb468..81fe078c20c 100644 --- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.appearance/.classpath +++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.appearance/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src"/> <classpathentry kind="output" path="bin"/> diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.appearance/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.appearance/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.appearance/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.appearance/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -12,7 +12,7 @@ org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.appearance/META-INF/MANIFEST.MF b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.appearance/META-INF/MANIFEST.MF index 7794962101a..0a0a1297c09 100644 --- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.appearance/META-INF/MANIFEST.MF +++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.appearance/META-INF/MANIFEST.MF @@ -16,5 +16,5 @@ Bundle-Name: %Bundle-Name Bundle-Activator: org.eclipse.papyrus.infra.emf.appearance.Activator Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.infra.emf.appearance;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.infra.emf.appearance diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.diagram.common/.classpath b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.diagram.common/.classpath index e801ebfb468..81fe078c20c 100644 --- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.diagram.common/.classpath +++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.diagram.common/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src"/> <classpathentry kind="output" path="bin"/> diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.diagram.common/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.diagram.common/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.diagram.common/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.diagram.common/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -12,7 +12,7 @@ org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.diagram.common/META-INF/MANIFEST.MF b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.diagram.common/META-INF/MANIFEST.MF index 7955786dc57..58b87265b14 100644 --- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.diagram.common/META-INF/MANIFEST.MF +++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.diagram.common/META-INF/MANIFEST.MF @@ -18,5 +18,5 @@ Bundle-Localization: plugin Bundle-Activator: org.eclipse.papyrus.infra.emf.diagram.common.Activator Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.infra.emf.diagram.common;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.infra.emf.diagram.common diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.gmf/.classpath b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.gmf/.classpath index e801ebfb468..81fe078c20c 100644 --- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.gmf/.classpath +++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.gmf/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src"/> <classpathentry kind="output" path="bin"/> diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.gmf/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.gmf/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.gmf/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.gmf/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -12,7 +12,7 @@ org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.gmf/META-INF/MANIFEST.MF b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.gmf/META-INF/MANIFEST.MF index 79b1bdc1b51..470b3e3c33f 100644 --- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.gmf/META-INF/MANIFEST.MF +++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.gmf/META-INF/MANIFEST.MF @@ -12,7 +12,7 @@ Bundle-Name: %pluginName Bundle-Activator: org.eclipse.papyrus.infra.emf.internal.gmf.Activator Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.infra.emf.gmf;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-Localization: plugin -Import-Package: com.google.common.collect;version="[30.1.0, 31.0.0)" +Import-Package: com.google.common.collect;version="[33.1.0,33.2.0)" Automatic-Module-Name: org.eclipse.papyrus.infra.emf.gmf diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly/.classpath b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly/.classpath index e801ebfb468..81fe078c20c 100644 --- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly/.classpath +++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src"/> <classpathentry kind="output" path="bin"/> diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -12,7 +12,7 @@ org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly/META-INF/MANIFEST.MF b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly/META-INF/MANIFEST.MF index 189d30d6bae..6fe29f2ccc1 100644 --- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly/META-INF/MANIFEST.MF +++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly/META-INF/MANIFEST.MF @@ -20,7 +20,7 @@ Bundle-Localization: plugin Bundle-ManifestVersion: 2 Bundle-Activator: org.eclipse.papyrus.infra.emf.readonly.Activator Bundle-SymbolicName: org.eclipse.papyrus.infra.emf.readonly;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 -Import-Package: com.google.common.base;version="[30.1.0, 31.0.0)", - com.google.common.collect;version="[30.1.0, 31.0.0)" +Bundle-RequiredExecutionEnvironment: JavaSE-17 +Import-Package: com.google.common.base;version="[33.1.0,33.2.0)", + com.google.common.collect;version="[33.1.0,33.2.0)" Automatic-Module-Name: org.eclipse.papyrus.infra.emf.readonly diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui.properties/.classpath b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui.properties/.classpath index e801ebfb468..81fe078c20c 100644 --- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui.properties/.classpath +++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui.properties/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src"/> <classpathentry kind="output" path="bin"/> diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui.properties/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui.properties/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui.properties/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui.properties/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -12,7 +12,7 @@ org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui.properties/META-INF/MANIFEST.MF b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui.properties/META-INF/MANIFEST.MF index 634d59ee545..2026012433a 100644 --- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui.properties/META-INF/MANIFEST.MF +++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui.properties/META-INF/MANIFEST.MF @@ -22,7 +22,7 @@ Bundle-Name: %pluginName Bundle-Localization: plugin Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.infra.emf.types.ui.properties;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.eclipse.papyrus.infra.emf.types.ui.properties, org.eclipse.papyrus.infra.emf.types.ui.properties.modelelements, org.eclipse.papyrus.infra.emf.types.ui.properties.providers, diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui/.classpath b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui/.classpath index bb642933501..f574c0cbd4d 100644 --- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui/.classpath +++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src-gen"/> <classpathentry kind="src" path="src"/> diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -12,7 +12,7 @@ org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui/META-INF/MANIFEST.MF b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui/META-INF/MANIFEST.MF index 8eac4c943f5..14e13d28234 100644 --- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui/META-INF/MANIFEST.MF +++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui/META-INF/MANIFEST.MF @@ -21,7 +21,7 @@ Require-Bundle: org.eclipse.draw2d;bundle-version="[3.10.0,4.0.0)", org.eclipse.ui.views.properties.tabbed;bundle-version="[3.8.0,4.0.0)", org.eclipse.uml2.common.edit;bundle-version="[2.5.0,3.0.0)", org.eclipse.uml2.types;bundle-version="[2.5.0,3.0.0)" -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-ActivationPolicy: lazy Bundle-Localization: plugin Bundle-Vendor: %providerName diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/.classpath b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/.classpath index ad5e13cce77..946fb3d346f 100644 --- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/.classpath +++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src"/> <classpathentry kind="src" path="src-gen"/> diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -12,7 +12,7 @@ org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/META-INF/MANIFEST.MF b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/META-INF/MANIFEST.MF index 57737dece78..5191b038447 100644 --- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/META-INF/MANIFEST.MF +++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/META-INF/MANIFEST.MF @@ -1,6 +1,7 @@ Manifest-Version: 1.0 Require-Bundle: org.eclipse.core.databinding;bundle-version="[1.9.0,2.0.0)", org.eclipse.gmf.runtime.emf.type.core;bundle-version="[1.9.0,2.0.0)", + org.eclipse.papyrus.infra.architecture;bundle-version="[3.2.0,4.0.0)", org.eclipse.papyrus.infra.core;bundle-version="[4.0.0,5.0.0)", org.eclipse.papyrus.infra.core.log;bundle-version="[2.0.0,3.0.0)", org.eclipse.papyrus.infra.services.edit;bundle-version="[4.0.0,5.0.0)", @@ -34,11 +35,11 @@ Export-Package: org.eclipse.papyrus.infra.emf.types, Bundle-Vendor: %providerName Bundle-ActivationPolicy: lazy Bundle-ClassPath: . -Bundle-Version: 5.0.0.qualifier +Bundle-Version: 5.0.100.qualifier Bundle-Name: %pluginName Bundle-Localization: plugin Bundle-ManifestVersion: 2 Bundle-Activator: org.eclipse.papyrus.infra.emf.types.rules.container.provider.InvariantContainerRuleEditPlugin$Implementation Bundle-SymbolicName: org.eclipse.papyrus.infra.emf.types;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.infra.emf.types diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/pom.xml b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/pom.xml index be2c9e977d8..3f20a1fae65 100644 --- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/pom.xml +++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/pom.xml @@ -9,6 +9,6 @@ <version>0.0.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.papyrus.infra.emf.types</artifactId> - <version>5.0.0-SNAPSHOT</version> + <version>5.0.100-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project>
\ No newline at end of file diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/src-gen/org/eclipse/papyrus/infra/emf/types/constraints/operations/ElementTypeFilterOperations.java b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/src-gen/org/eclipse/papyrus/infra/emf/types/constraints/operations/ElementTypeFilterOperations.java index 874519c9e15..7c0a13c5444 100644 --- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/src-gen/org/eclipse/papyrus/infra/emf/types/constraints/operations/ElementTypeFilterOperations.java +++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/src-gen/org/eclipse/papyrus/infra/emf/types/constraints/operations/ElementTypeFilterOperations.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2021 Christian W. Damus, CEA LIST, and others. + * Copyright (c) 2021, 2023 Christian W. Damus, CEA LIST, and others. * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 @@ -10,6 +10,7 @@ * * Contributors: * Christian W. Damus - Initial API and implementation + * Vincent Lorenzo CEA LIST - vincent.lorenzo@cea.fr - Bug 582130 */ package org.eclipse.papyrus.infra.emf.types.constraints.operations; @@ -24,8 +25,11 @@ import org.eclipse.emf.ecore.EObject; import org.eclipse.gmf.runtime.emf.type.core.ElementTypeRegistry; import org.eclipse.gmf.runtime.emf.type.core.IClientContext; import org.eclipse.gmf.runtime.emf.type.core.IElementType; +import org.eclipse.papyrus.infra.core.services.ServiceException; +import org.eclipse.papyrus.infra.emf.types.Activator; import org.eclipse.papyrus.infra.emf.types.constraints.ElementTypeFilter; import org.eclipse.papyrus.infra.emf.types.constraints.ElementTypeRelationshipKind; +import org.eclipse.papyrus.infra.services.edit.context.TypeContext; import org.eclipse.papyrus.infra.types.ElementTypeConfiguration; /** @@ -118,6 +122,11 @@ public class ElementTypeFilterOperations { IClientContext context = getClientContext(); if (context == null) { + // see bug 582130 + context = getContext(eObject); + } + + if (context == null) { result = Arrays.asList(ElementTypeRegistry.getInstance().getAllTypesMatching(eObject)); } else { result = Arrays.asList(ElementTypeRegistry.getInstance().getAllTypesMatching(eObject, context)); @@ -129,6 +138,23 @@ public class ElementTypeFilterOperations { return result; } + /** + * + * @param eObject + * an eObject + * @return + * the context associated to this EObject, or <code>null</code> when not found + */ + private static final IClientContext getContext(final EObject eObject) { + try { + return TypeContext.getContext(eObject); + } catch (ServiceException e) { + Activator.log.error(e); + } + return null; + } + + private static boolean anyMatches(Collection<IElementType> actual, ElementTypeRelationshipKind relationship, IElementType expected) { // All relationship match kinds are satisfied by an exact match boolean result = actual.contains(expected); diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf/.classpath b/plugins/infra/emf/org.eclipse.papyrus.infra.emf/.classpath index e801ebfb468..81fe078c20c 100644 --- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf/.classpath +++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src"/> <classpathentry kind="output" path="bin"/> diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/emf/org.eclipse.papyrus.infra.emf/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -12,7 +12,7 @@ org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf/META-INF/MANIFEST.MF b/plugins/infra/emf/org.eclipse.papyrus.infra.emf/META-INF/MANIFEST.MF index 7c36ce8a009..3aa62320518 100644 --- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf/META-INF/MANIFEST.MF +++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf/META-INF/MANIFEST.MF @@ -2,6 +2,7 @@ Manifest-Version: 1.0 Export-Package: org.eclipse.papyrus.infra.emf, org.eclipse.papyrus.infra.emf.adapters, org.eclipse.papyrus.infra.emf.advice, + org.eclipse.papyrus.infra.emf.api, org.eclipse.papyrus.infra.emf.commands, org.eclipse.papyrus.infra.emf.edit.domain, org.eclipse.papyrus.infra.emf.internal.resource;x-internal:=true, @@ -23,14 +24,14 @@ Require-Bundle: org.eclipse.core.expressions;bundle-version="[3.6.0,4.0.0)", org.eclipse.pde.core;bundle-version="[3.14.100,4.0.0)";resolution:=optional Bundle-Vendor: Eclipse Modeling Project Bundle-ActivationPolicy: lazy -Bundle-Version: 4.2.0.qualifier +Bundle-Version: 4.4.0.qualifier Bundle-Name: EMF Tools Bundle-Activator: org.eclipse.papyrus.infra.emf.Activator Bundle-ManifestVersion: 2 Bundle-Description: %pluginDescription Bundle-SymbolicName: org.eclipse.papyrus.infra.emf;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 -Import-Package: com.google.common.base;version="[30.1.0, 31.0.0)", - com.google.common.collect;version="[30.1.0, 31.0.0)", - com.google.common.util.concurrent;version="[30.1.0, 31.0.0)" +Bundle-RequiredExecutionEnvironment: JavaSE-17 +Import-Package: com.google.common.base;version="[33.1.0,33.2.0)", + com.google.common.collect;version="[33.1.0,33.2.0)", + com.google.common.util.concurrent;version="[33.1.0,33.2.0)" Automatic-Module-Name: org.eclipse.papyrus.infra.emf diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf/pom.xml b/plugins/infra/emf/org.eclipse.papyrus.infra.emf/pom.xml index bb602340d1a..0001062f524 100644 --- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf/pom.xml +++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf/pom.xml @@ -9,6 +9,6 @@ <version>0.0.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.papyrus.infra.emf</artifactId> - <version>4.2.0-SNAPSHOT</version> + <version>4.4.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project>
\ No newline at end of file diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/Activator.java b/plugins/infra/emf/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/Activator.java index 7834e664f31..8df894c2ed8 100644 --- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/Activator.java +++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/Activator.java @@ -1,5 +1,5 @@ /***************************************************************************** - * Copyright (c) 2013, 2016 CEA LIST, Christian W. Damus, and others. + * Copyright (c) 2013, 2016, 2023 CEA LIST, Christian W. Damus, and others. * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 @@ -11,12 +11,13 @@ * Contributors: * Camille Letavernier (camille.letavernier@cea.fr) - Initial API and implementation * Christian W. Damus - bugs 485220, 496299, 500990 - * + * Patrick Tessier - bug 562217 *****************************************************************************/ package org.eclipse.papyrus.infra.emf; import java.util.ArrayList; import java.util.Arrays; +import java.util.Hashtable; import java.util.List; import org.eclipse.core.resources.ISavedState; @@ -30,6 +31,8 @@ import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl; import org.eclipse.papyrus.emf.facet.custom.core.ICustomizationManager; import org.eclipse.papyrus.emf.facet.custom.core.ICustomizationManagerFactory; import org.eclipse.papyrus.infra.core.log.LogHelper; +import org.eclipse.papyrus.infra.emf.api.IModelSetService; +import org.eclipse.papyrus.infra.emf.internal.ModelSetService; import org.eclipse.papyrus.infra.emf.internal.resource.index.IndexPersistenceManager; import org.eclipse.papyrus.infra.emf.spi.resolver.EObjectResolverService; import org.eclipse.papyrus.infra.emf.spi.resolver.IEObjectResolver; @@ -83,6 +86,12 @@ public class Activator extends Plugin { if ((state != null) && (state.getSaveNumber() != 0)) { saveHelper.initializeSaveDelegates(state, saveDelegates); } + + // install OSGI Service about IModelService + Hashtable<String, String> props = new Hashtable<>(); + props.put("description", "This service is used to create or assocte to a service registry a model set"); //$NON-NLS-1$ //$NON-NLS-2$ + context.registerService(IModelSetService.class, new ModelSetService(), props); + log.debug("IServiceModelSet OSGI service installed"); //$NON-NLS-1$ } @Override @@ -116,7 +125,7 @@ public class Activator extends Plugin { /** @return the qualified name of the given metaclass */ public static String getMetaclassQualifiedName(final EClassifier eClass) { - final ArrayList<String> qualifiedNameParts = new ArrayList<String>(); + final ArrayList<String> qualifiedNameParts = new ArrayList<>(); final StringBuilder builder = new StringBuilder(); EPackage ePackage = eClass.getEPackage(); @@ -136,7 +145,7 @@ public class Activator extends Plugin { /** * Obtain the instance of the {@link EObject} resolver service, if any. - * + * * @return the object resolver service (never {@code null} while this bundle is active) * @since 2.0 */ diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/api/IModelSetService.java b/plugins/infra/emf/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/api/IModelSetService.java new file mode 100644 index 00000000000..5f6d369c0b1 --- /dev/null +++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/api/IModelSetService.java @@ -0,0 +1,72 @@ +/***************************************************************************** + * Copyright (c) 2023 CEA LIST and others. + * + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * + * Contributors: + * Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation + * Pauline DEVILLE (CEA LIST) pauline.deville@cea.fr - Bug 582415 + * + *****************************************************************************/ + +package org.eclipse.papyrus.infra.emf.api; + +import org.eclipse.core.resources.IProject; +import org.eclipse.emf.common.util.URI; +import org.eclipse.papyrus.infra.core.resource.ModelSet; +import org.eclipse.papyrus.infra.core.services.ServicesRegistry; + +/** + * This class has all methods that implements use cases around model set. + * + * @since 4.3 + * + */ +public interface IModelSetService { + + /** + * Get the current modelSet from a services registry + * + * @param servicesRegistry + * the services registry see Papyrus core + * @return the ModelSet associated to the servicesRegistry if any, null otherwise + **/ + public ModelSet getModelSet(ServicesRegistry servicesRegistry); + + /** + * Create a modelSet, a command is executed in the command stack, for info + * + * @param project + * the project where we want to create a modelSet + * @return the newly created ModelSet of null if cannot + **/ + public ModelSet createModelSet(IProject project); + + /** + * Create a modelSet, a command is executed in the command stack, for info + * + * @param uri + * the uri of the project where we want to create a modelSet + * @param modelName + * the model name + * @return the newly created ModelSet of null if cannot + */ + ModelSet createModelSet(URI uri, String modelName); + + /** + * Load a model set from a given uri and given services registry + * + * @param uri + * the uri of the model to load + * @param servicesRegistry + * the service registry associated + * @return the model set associated to the uri and services registry. + */ + public ModelSet loadModelSet(URI uri, ServicesRegistry servicesRegistry); + +} diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/commands/CreateModelInModelSetCommand.java b/plugins/infra/emf/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/commands/CreateModelInModelSetCommand.java new file mode 100644 index 00000000000..fa396f02dd9 --- /dev/null +++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/commands/CreateModelInModelSetCommand.java @@ -0,0 +1,63 @@ +/***************************************************************************** + * Copyright (c) 2023 CEA LIST. + * + * + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 + * which accompanies this distribution, and is available at + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * + * Contributors: + * Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation + * + *****************************************************************************/ +package org.eclipse.papyrus.infra.emf.commands; + +import org.eclipse.emf.common.util.URI; +import org.eclipse.emf.transaction.RecordingCommand; +import org.eclipse.papyrus.infra.core.resource.ModelSet; + +/** + * The Command to create a new Papyrus Model. + * + * @since 4.3 + */ +public class CreateModelInModelSetCommand extends RecordingCommand { + + /** The my model set. */ + private final ModelSet myModelSet; + + /** The URI of the model to create. */ + private final URI myURI; + + /** + * Instantiates a new new papyrus model command. + * + * @param modelSet + * the di resource set + * @param newURI + * the URI of the new model's principal resource + * @param contextId + * the id of the architecture context + * @param viewpointIds + * the ids of the architecture viewpoints + */ + public CreateModelInModelSetCommand(ModelSet modelSet, URI newURI) { + super(modelSet.getTransactionalEditingDomain()); + myModelSet = modelSet; + myURI = newURI; + } + + /** + * + * @see org.eclipse.emf.transaction.RecordingCommand#doExecute() + * + */ + @Override + protected void doExecute() { + myModelSet.createModels(myURI); + } + +} diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/internal/ModelSetService.java b/plugins/infra/emf/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/internal/ModelSetService.java new file mode 100644 index 00000000000..c95678e4293 --- /dev/null +++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/internal/ModelSetService.java @@ -0,0 +1,210 @@ +/***************************************************************************** + * Copyright (c) 2023 CEA LIST and others. + * + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * + * Contributors: + * Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation + * Pauline DEVILLE (CEA LIST) pauline.deville@cea.fr - Bug 582415 + * + *****************************************************************************/ + +package org.eclipse.papyrus.infra.emf.internal; + +import java.util.Set; + +import org.eclipse.core.resources.IProject; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.emf.common.command.Command; +import org.eclipse.emf.common.command.CommandStack; +import org.eclipse.emf.common.util.URI; +import org.eclipse.papyrus.infra.core.Activator; +import org.eclipse.papyrus.infra.core.resource.ModelMultiException; +import org.eclipse.papyrus.infra.core.resource.ModelSet; +import org.eclipse.papyrus.infra.core.resource.sasheditor.DiModel; +import org.eclipse.papyrus.infra.core.sashwindows.di.service.IPageManager; +import org.eclipse.papyrus.infra.core.services.ExtensionServicesRegistry; +import org.eclipse.papyrus.infra.core.services.ServiceException; +import org.eclipse.papyrus.infra.core.services.ServiceMultiException; +import org.eclipse.papyrus.infra.core.services.ServicesRegistry; +import org.eclipse.papyrus.infra.emf.api.IModelSetService; +import org.eclipse.papyrus.infra.emf.commands.CreateModelInModelSetCommand; +import org.eclipse.papyrus.infra.emf.resource.ICrossReferenceIndex; +import org.eclipse.papyrus.infra.emf.resource.ShardResourceHelper; +import org.eclipse.papyrus.infra.emf.resource.ShardResourceLocator; + +import com.google.common.collect.Iterables; + +/** + * this class has all methods that implements use cases around model set. + * + */ +public class ModelSetService implements IModelSetService { + + /** + * + * @see org.eclipse.papyrus.infra.emf.api.IModelSetService#getModelSet(org.eclipse.papyrus.infra.core.services.ServicesRegistry) + * + * @param servicesRegistry + * the services registry see Papyrus core + * @return the ModelSet associated to the servicesRegistry if any, null otherwise + */ + @Override + public ModelSet getModelSet(ServicesRegistry servicesRegistry) { + try { + return servicesRegistry.getService(ModelSet.class); + } catch (ServiceException e) { + Activator.log.error("The model set has been loaded in the services registry", e); //$NON-NLS-1$ + } + return null; + } + + /** + * + * @see org.eclipse.papyrus.infra.emf.api.IModelSetService#createModelSet(org.eclipse.core.resources.IProject) + * + * @param project + * the project where we want to create a modelSet + * @return the newly created ModelSet of null if cannot + */ + @Override + public ModelSet createModelSet(IProject project) { + URI diURI = URI.createPlatformResourceURI(project.getName(), false);// the name of the project + return createModelSet(diURI, project.getName()); + } + + /** + * + * @see org.eclipse.papyrus.infra.emf.api.IModelSetService#createModelSet(org.eclipse.emf.common.util.URI, java.lang.String) + * + * @param uri + * the uri of the project where we want to create a modelSet + * @param modelName + * the model name + * @return the newly created ModelSet of null if cannot + */ + @Override + public ModelSet createModelSet(final URI uri, final String modelName) { + ModelSet modelSet = null; + ServicesRegistry registry = null; + try { + registry = new ExtensionServicesRegistry(org.eclipse.papyrus.infra.core.Activator.PLUGIN_ID); + } catch (ServiceException e) { + // Silently catch exception + } + if (registry != null) { + try { + registry.startServicesByClassKeys(ModelSet.class); + } catch (ServiceException ex) { + // Silently catch exception + } + try { + modelSet = registry.getService(ModelSet.class); + } catch (ServiceException e1) { + // Silently catch exception + } + if (modelSet != null) { + CommandStack stack = modelSet.getTransactionalEditingDomain().getCommandStack(); + URI diURI = uri.appendSegment(modelName).appendFileExtension(DiModel.DI_FILE_EXTENSION); + Command command = new CreateModelInModelSetCommand(modelSet, diURI); + + if (stack != null && command.canExecute()) { + stack.execute(command); + } + try { + registry.startRegistry(); + } catch (ServiceMultiException e) { + // Silently catch exception + } + try { + registry.getService(IPageManager.class); + } catch (ServiceException e) { + // Silently catch exception + } + } + } + return modelSet; + } + + /** + * + * @see org.eclipse.papyrus.infra.emf.api.IModelSetService#loadModelSet(org.eclipse.emf.common.util.URI, org.eclipse.papyrus.infra.core.services.ServicesRegistry) + * + * @param uri + * the uri of the model to load + * @param servicesRegistry + * the service registry associated + * @return the model set associated to the uri and services registry. + */ + @Override + public ModelSet loadModelSet(URI uri, ServicesRegistry registry) { + ModelSet modelSet = null; + if (registry != null) { + try { + registry.startServicesByClassKeys(ModelSet.class); + } catch (ServiceException ex) { + Activator.log.error("Impossible to launch the service ModelSet", ex); //$NON-NLS-1$ + } + try { + modelSet = registry.getService(ModelSet.class); + } catch (ServiceException e1) { + Activator.log.error("Impossible to get the service ModelSet", e1); //$NON-NLS-1$ + } + + if (modelSet.isShardingSupported()) { + // Resolve a possible shard URI + new ShardResourceLocator(modelSet); + uri = ModelSetService.resolveSharedRoot( + ICrossReferenceIndex.getInstance(modelSet), uri); + } + // Load it up + try { + modelSet.loadModels(uri); + } catch (ModelMultiException e) { + Activator.log.error("Problem during the loading of models inside the ModelSet", e); //$NON-NLS-1$ + } + + } + return modelSet; + + } + + /** + * Resolves the root resource URI from the URI of a resource that may be a + * shared or may be an independent model unit. + * + * @param index + * the share index to consult + * @param resourceURI + * a resource URI + * + * @return the root, which may just be the input resource URI if it is a root + * + * @see ShardResourceHelper + * @see ICrossReferenceIndex#getRoots(URI) + */ + private static URI resolveSharedRoot(ICrossReferenceIndex index, URI resourceURI) { + URI result; + + try { + // Editor matching is done in contexts where waiting for the + // index causes deadlocks, (e.g., bug 500046), so hit the + // index only if it is already available + Set<URI> roots = index.getRoots(resourceURI, + ICrossReferenceIndex.getAlternate(index, null)); + + // TODO: Handle case of multiple roots + result = Iterables.getFirst(roots, resourceURI); + } catch (CoreException e) { + Activator.log.log(e.getStatus()); + result = resourceURI; + } + + return result; + } +} diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/utils/InternalCrossReferencer.java b/plugins/infra/emf/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/utils/InternalCrossReferencer.java index 8eda5d34b49..7b6682abba3 100644 --- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/utils/InternalCrossReferencer.java +++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/utils/InternalCrossReferencer.java @@ -39,7 +39,7 @@ import org.eclipse.emf.ecore.util.EcoreUtil; * perhaps more capable. * </p> * - * @since 4.1 + * @since 4.2 */ @SuppressWarnings("serial") public class InternalCrossReferencer extends EcoreUtil.CrossReferencer { diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/utils/ResourceUtils.java b/plugins/infra/emf/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/utils/ResourceUtils.java index d034e18b84e..5deb76d4460 100644 --- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/utils/ResourceUtils.java +++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/utils/ResourceUtils.java @@ -127,6 +127,8 @@ public class ResourceUtils { * Return an encoded path string that can be used as a path attribute in a an extension for the given file. * If an Ecore URI mapping exists for the path, it will be used as a path segment. * Otherwise, a project-relative encoded path will be returned. + * + * @since 4.2 */ public static String mapAndEncodePath(IFile file) { // check if we have a mapping that we can use @@ -164,6 +166,7 @@ public class ResourceUtils { * @see ExtensibleURIConverterImpl#getURIMap() * @see #getLocalUriMappings(IProject) * @see #computePlatformResourceMap() + * @since 4.2 */ public static URIConverter createWorkspaceAwareURIConverter() { URIConverter result = new ExtensibleURIConverterImpl(); @@ -186,12 +189,20 @@ public class ResourceUtils { return result; } - /** Return the {@code org.eclipse.emf.ecore.uri_mapping} extension declarations in the given {@code project}. */ + /** + * Return the {@code org.eclipse.emf.ecore.uri_mapping} extension declarations in the given {@code project}. + * + * @since 4.2 + */ public static Map<String, String> getLocalUriMappings(IProject project) { return PlatformHelper.INSTANCE.getLocalUriMappings(project); } - /** Returns an encoded string representation of the path. */ + /** + * Returns an encoded string representation of the path. + * + * @since 4.2 + */ public static String getStringURI(IPath path) { return Arrays.stream(path.segments()) .map(segment -> URI.encodeSegment(segment, false)) @@ -212,6 +223,7 @@ public class ResourceUtils { * @see getSaveOptions() * @see EcorePlugin#computePlatformPluginToPlatformResourceMap() * @see EcorePlugin#computePlatformResourceToPlatformPluginMap(Collection) + * @since 4.2 */ public static Map<URI, URI> computePlatformResourceMap() { Map<URI, URI> result = new HashMap<>(); @@ -229,6 +241,7 @@ public class ResourceUtils { * Create a package registry that, if possible, includes also packages registered by plug-ing projects in the workspace. * * @return a new workspace-aware (as much as possible) package registry + * @since 4.2 */ public static EPackage.Registry createWorkspaceAwarePackageRegistry() { return PlatformHelper.INSTANCE.createWorkspacePackageRegistry(); diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.ui.emf/.classpath b/plugins/infra/emf/org.eclipse.papyrus.infra.ui.emf/.classpath index e801ebfb468..81fe078c20c 100644 --- a/plugins/infra/emf/org.eclipse.papyrus.infra.ui.emf/.classpath +++ b/plugins/infra/emf/org.eclipse.papyrus.infra.ui.emf/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src"/> <classpathentry kind="output" path="bin"/> diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.ui.emf/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/emf/org.eclipse.papyrus.infra.ui.emf/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/infra/emf/org.eclipse.papyrus.infra.ui.emf/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/infra/emf/org.eclipse.papyrus.infra.ui.emf/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -12,7 +12,7 @@ org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.ui.emf/META-INF/MANIFEST.MF b/plugins/infra/emf/org.eclipse.papyrus.infra.ui.emf/META-INF/MANIFEST.MF index f1f7a8a17b5..316a185d12d 100644 --- a/plugins/infra/emf/org.eclipse.papyrus.infra.ui.emf/META-INF/MANIFEST.MF +++ b/plugins/infra/emf/org.eclipse.papyrus.infra.ui.emf/META-INF/MANIFEST.MF @@ -41,7 +41,7 @@ Bundle-Localization: plugin Bundle-Activator: org.eclipse.papyrus.infra.ui.internal.emf.Activator Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.infra.ui.emf;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 -Import-Package: com.google.common.base;version="[30.1.0, 31.0.0)", - com.google.common.collect;version="[30.1.0, 31.0.0)" +Bundle-RequiredExecutionEnvironment: JavaSE-17 +Import-Package: com.google.common.base;version="[33.1.0,33.2.0)", + com.google.common.collect;version="[33.1.0,33.2.0)" Automatic-Module-Name: org.eclipse.papyrus.infra.ui.emf diff --git a/plugins/infra/filters/org.eclipse.papyrus.infra.filters.edit/.classpath b/plugins/infra/filters/org.eclipse.papyrus.infra.filters.edit/.classpath index e9c6eafb6fa..abaf32b3e99 100644 --- a/plugins/infra/filters/org.eclipse.papyrus.infra.filters.edit/.classpath +++ b/plugins/infra/filters/org.eclipse.papyrus.infra.filters.edit/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src-gen"/> <classpathentry kind="output" path="bin"/> diff --git a/plugins/infra/filters/org.eclipse.papyrus.infra.filters.edit/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/filters/org.eclipse.papyrus.infra.filters.edit/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/infra/filters/org.eclipse.papyrus.infra.filters.edit/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/infra/filters/org.eclipse.papyrus.infra.filters.edit/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -12,7 +12,7 @@ org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 diff --git a/plugins/infra/filters/org.eclipse.papyrus.infra.filters.edit/META-INF/MANIFEST.MF b/plugins/infra/filters/org.eclipse.papyrus.infra.filters.edit/META-INF/MANIFEST.MF index 605999c793d..e70181f80bf 100644 --- a/plugins/infra/filters/org.eclipse.papyrus.infra.filters.edit/META-INF/MANIFEST.MF +++ b/plugins/infra/filters/org.eclipse.papyrus.infra.filters.edit/META-INF/MANIFEST.MF @@ -14,5 +14,5 @@ Bundle-Localization: plugin Bundle-ManifestVersion: 2 Bundle-Activator: org.eclipse.papyrus.infra.filters.provider.FiltersEditPlugin$Implementation Bundle-SymbolicName: org.eclipse.papyrus.infra.filters.edit;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.infra.filters.edit diff --git a/plugins/infra/filters/org.eclipse.papyrus.infra.filters/.classpath b/plugins/infra/filters/org.eclipse.papyrus.infra.filters/.classpath index 33577510720..fd01258584d 100644 --- a/plugins/infra/filters/org.eclipse.papyrus.infra.filters/.classpath +++ b/plugins/infra/filters/org.eclipse.papyrus.infra.filters/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src-gen"/> <classpathentry kind="src" path="src"/> diff --git a/plugins/infra/filters/org.eclipse.papyrus.infra.filters/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/filters/org.eclipse.papyrus.infra.filters/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/infra/filters/org.eclipse.papyrus.infra.filters/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/infra/filters/org.eclipse.papyrus.infra.filters/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -12,7 +12,7 @@ org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 diff --git a/plugins/infra/filters/org.eclipse.papyrus.infra.filters/META-INF/MANIFEST.MF b/plugins/infra/filters/org.eclipse.papyrus.infra.filters/META-INF/MANIFEST.MF index 618be390e94..c7bab7878ed 100644 --- a/plugins/infra/filters/org.eclipse.papyrus.infra.filters/META-INF/MANIFEST.MF +++ b/plugins/infra/filters/org.eclipse.papyrus.infra.filters/META-INF/MANIFEST.MF @@ -19,5 +19,5 @@ Bundle-Activator: org.eclipse.papyrus.infra.filters.internal.FiltersPlugin$Imple Bundle-ManifestVersion: 2 Bundle-Description: %pluginDescription Bundle-SymbolicName: org.eclipse.papyrus.infra.filters;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.infra.filters diff --git a/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.edit/.classpath b/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.edit/.classpath index e9c6eafb6fa..abaf32b3e99 100644 --- a/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.edit/.classpath +++ b/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.edit/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src-gen"/> <classpathentry kind="output" path="bin"/> diff --git a/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.edit/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.edit/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.edit/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.edit/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -12,7 +12,7 @@ org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 diff --git a/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.edit/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.edit/META-INF/MANIFEST.MF index 169922c4af1..2207910048a 100644 --- a/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.edit/META-INF/MANIFEST.MF +++ b/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.edit/META-INF/MANIFEST.MF @@ -17,5 +17,5 @@ Bundle-Localization: plugin Bundle-ManifestVersion: 2 Bundle-Activator: org.eclipse.papyrus.infra.gmfdiag.assistant.provider.AssistantEditPlugin$Implementation Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.assistant.edit;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.infra.gmfdiag.assistant.edit diff --git a/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.editor/.classpath b/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.editor/.classpath index e9c6eafb6fa..abaf32b3e99 100644 --- a/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.editor/.classpath +++ b/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.editor/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src-gen"/> <classpathentry kind="output" path="bin"/> diff --git a/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.editor/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.editor/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.editor/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.editor/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -12,7 +12,7 @@ org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 diff --git a/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.editor/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.editor/META-INF/MANIFEST.MF index 79503b51089..f000065d012 100644 --- a/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.editor/META-INF/MANIFEST.MF +++ b/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.editor/META-INF/MANIFEST.MF @@ -20,5 +20,5 @@ Bundle-Localization: plugin Bundle-ManifestVersion: 2 Bundle-Activator: org.eclipse.papyrus.infra.gmfdiag.assistant.presentation.AssistantEditorPlugin$Implementation Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.assistant.editor;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.infra.gmfdiag.assistant.editor diff --git a/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.ui/.classpath b/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.ui/.classpath index e801ebfb468..81fe078c20c 100644 --- a/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.ui/.classpath +++ b/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.ui/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src"/> <classpathentry kind="output" path="bin"/> diff --git a/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.ui/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.ui/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.ui/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.ui/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -12,7 +12,7 @@ org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 diff --git a/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.ui/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.ui/META-INF/MANIFEST.MF index 6c78a320b0b..d2e2342446c 100644 --- a/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.ui/META-INF/MANIFEST.MF +++ b/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.ui/META-INF/MANIFEST.MF @@ -18,6 +18,6 @@ Bundle-Activator: org.eclipse.papyrus.infra.gmfdiag.assistant.internal.ui.Activa Bundle-ManifestVersion: 2 Bundle-Description: %pluginDescription Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.assistant.ui;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 -Import-Package: com.google.common.base;version="[30.1.0, 31.0.0)" +Bundle-RequiredExecutionEnvironment: JavaSE-17 +Import-Package: com.google.common.base;version="[33.1.0,33.2.0)" Automatic-Module-Name: org.eclipse.papyrus.infra.gmfdiag.assistant.ui diff --git a/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant/.classpath b/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant/.classpath index ad5e13cce77..946fb3d346f 100644 --- a/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant/.classpath +++ b/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src"/> <classpathentry kind="src" path="src-gen"/> diff --git a/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -12,7 +12,7 @@ org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 diff --git a/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant/META-INF/MANIFEST.MF index f2f43f6b9b3..4b5b77232d4 100644 --- a/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant/META-INF/MANIFEST.MF +++ b/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant/META-INF/MANIFEST.MF @@ -25,14 +25,14 @@ Export-Package: org.eclipse.papyrus.infra.gmfdiag.assistant, Bundle-Vendor: %providerName Bundle-ActivationPolicy: lazy Bundle-ClassPath: . -Bundle-Version: 2.1.0.qualifier +Bundle-Version: 2.1.100.qualifier Bundle-Localization: plugin Bundle-Name: %pluginName Bundle-Activator: org.eclipse.papyrus.infra.gmfdiag.assistant.internal.core.AssistantPlugin$Implementation Bundle-ManifestVersion: 2 Bundle-Description: %pluginDescription Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.assistant;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 -Import-Package: com.google.common.base;version="[30.1.0, 31.0.0)", - com.google.common.collect;version="[30.1.0, 31.0.0)" +Bundle-RequiredExecutionEnvironment: JavaSE-17 +Import-Package: com.google.common.base;version="[33.1.0,33.2.0)", + com.google.common.collect;version="[33.1.0,33.2.0)" Automatic-Module-Name: org.eclipse.papyrus.infra.gmfdiag.assistant diff --git a/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant/pom.xml b/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant/pom.xml index ef06f423ebe..a40b4f4b95c 100644 --- a/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant/pom.xml +++ b/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant/pom.xml @@ -9,6 +9,6 @@ <version>0.0.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.papyrus.infra.gmfdiag.assistant</artifactId> - <version>2.1.0-SNAPSHOT</version> + <version>2.1.100-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project>
\ No newline at end of file diff --git a/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant/src/org/eclipse/papyrus/infra/gmfdiag/assistant/internal/core/DelegatingModelingAssistantProvider.java b/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant/src/org/eclipse/papyrus/infra/gmfdiag/assistant/internal/core/DelegatingModelingAssistantProvider.java index c3e96fefded..0ee0c4fa40f 100644 --- a/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant/src/org/eclipse/papyrus/infra/gmfdiag/assistant/internal/core/DelegatingModelingAssistantProvider.java +++ b/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant/src/org/eclipse/papyrus/infra/gmfdiag/assistant/internal/core/DelegatingModelingAssistantProvider.java @@ -1,6 +1,6 @@ /***************************************************************************** - * Copyright (c) 2014, 2015 Christian W. Damus and others. - * + * Copyright (c) 2014, 2015, 2023 Christian W. Damus and others. + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at @@ -10,7 +10,7 @@ * * Contributors: * Christian W. Damus - Initial API and implementation - * + * Vincent Lorenzo (CEA-LIST) <vincent.lorenzo@cea.fr> - bug 582023 *****************************************************************************/ package org.eclipse.papyrus.infra.gmfdiag.assistant.internal.core; @@ -21,16 +21,18 @@ import java.util.concurrent.CopyOnWriteArrayList; import org.eclipse.core.runtime.IAdaptable; import org.eclipse.emf.ecore.EObject; +import org.eclipse.gef.EditPart; import org.eclipse.gmf.runtime.common.core.service.IOperation; import org.eclipse.gmf.runtime.common.core.service.IProviderChangeListener; import org.eclipse.gmf.runtime.common.core.service.ProviderChangeEvent; import org.eclipse.gmf.runtime.emf.type.core.IElementType; +import org.eclipse.gmf.runtime.emf.ui.services.modelingassistant.IModelingAssistantOperation; import org.eclipse.gmf.runtime.emf.ui.services.modelingassistant.IModelingAssistantProvider; import org.eclipse.gmf.runtime.notation.Diagram; import org.eclipse.gmf.runtime.notation.View; import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils; import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker; -import org.eclipse.papyrus.infra.core.architecture.merged.MergedADElement; + import com.google.common.collect.Lists; /** @@ -40,7 +42,7 @@ public class DelegatingModelingAssistantProvider implements IModelingAssistantPr private final CopyOnWriteArrayList<IProviderChangeListener> listeners = new CopyOnWriteArrayList<>(); - private final ThreadLocal<List<IModelingAssistantProvider>> currentProviders = new ThreadLocal<List<IModelingAssistantProvider>>() { + private final ThreadLocal<List<IModelingAssistantProvider>> currentProviders = new ThreadLocal<>() { @Override protected List<IModelingAssistantProvider> initialValue() { return Lists.newArrayList(); @@ -53,6 +55,20 @@ public class DelegatingModelingAssistantProvider implements IModelingAssistantPr @Override public boolean provides(IOperation operation) { + // we only expect IModelingAssistantOperation + if ((false == operation instanceof IModelingAssistantOperation) && ((IModelingAssistantOperation) operation).getContext() != null) { + return false; + } + final IModelingAssistantOperation op = (IModelingAssistantOperation) operation; + final IAdaptable adaptable = op.getContext(); + final EditPart editPart = adaptable.getAdapter(EditPart.class); + final Diagram diag = DiagramUtils.getDiagramFrom(editPart); + + // nothing to do on Papyrus-Sirius diagram + if (diag != null && !DiagramUtils.isPapyrusGMFDiagram(diag)) { + return false; + } + // Query my providers List<IModelingAssistantProvider> current = currentProviders.get(); current.clear(); diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.configuration/.classpath b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.configuration/.classpath index e801ebfb468..81fe078c20c 100644 --- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.configuration/.classpath +++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.configuration/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src"/> <classpathentry kind="output" path="bin"/> diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.configuration/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.configuration/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.configuration/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.configuration/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -12,7 +12,7 @@ org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.configuration/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.configuration/META-INF/MANIFEST.MF index 95a9b04ce20..4ca6c55387e 100644 --- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.configuration/META-INF/MANIFEST.MF +++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.configuration/META-INF/MANIFEST.MF @@ -28,5 +28,5 @@ Bundle-Name: CSS Configuration Bundle-Activator: org.eclipse.papyrus.infra.gmfdiag.css.configuration.Activator Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.css.configuration;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.infra.gmfdiag.css.configuration diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/.classpath b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/.classpath index 18aabea9777..1fbf7ad5c53 100644 --- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/.classpath +++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="output" path="bin"/> <classpathentry kind="src" path="src"/> diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -12,7 +12,7 @@ org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/META-INF/MANIFEST.MF index d25b7a5637b..7d1e37e41da 100644 --- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/META-INF/MANIFEST.MF +++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/META-INF/MANIFEST.MF @@ -31,7 +31,7 @@ Bundle-Name: CSS Properties Bundle-Activator: org.eclipse.papyrus.infra.gmfdiag.css.properties.Activator Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.css.properties;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 -Import-Package: com.google.common.base;version="[30.1.0, 31.0.0)", - com.google.common.collect;version="[30.1.0, 31.0.0)" +Bundle-RequiredExecutionEnvironment: JavaSE-17 +Import-Package: com.google.common.base;version="[33.1.0,33.2.0)", + com.google.common.collect;version="[33.1.0,33.2.0)" Automatic-Module-Name: org.eclipse.papyrus.infra.gmfdiag.css.properties diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/.classpath b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/.classpath index e801ebfb468..81fe078c20c 100644 --- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/.classpath +++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src"/> <classpathentry kind="output" path="bin"/> diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -12,7 +12,7 @@ org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/META-INF/MANIFEST.MF index e6eda5122b8..ee5adbae0ec 100644 --- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/META-INF/MANIFEST.MF +++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/META-INF/MANIFEST.MF @@ -40,16 +40,15 @@ Require-Bundle: org.eclipse.e4.ui.css.core;bundle-version="[0.12.0,1.0.0)", org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="[4.0.0,5.0.0)", org.eclipse.papyrus.infra.widgets;bundle-version="[4.0.0,5.0.0)", org.eclipse.uml2.types;bundle-version="[2.5.0,3.0.0)", - org.w3c.css.sac;bundle-version="[1.3.0,2.0.0)", - org.w3c.dom.svg;bundle-version="[1.1.0,2.0.0)" + org.eclipse.orbit.xml-apis-ext;bundle-version="[1.0.0,2.0.0)" Bundle-Vendor: %providerName Bundle-ActivationPolicy: lazy -Bundle-Version: 3.0.0.qualifier +Bundle-Version: 3.0.100.qualifier Bundle-Localization: plugin Bundle-Name: %pluginName Bundle-Activator: org.eclipse.papyrus.infra.gmfdiag.css.Activator Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.css;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 -Import-Package: com.google.common.collect;version="[30.1.0, 31.0.0)" +Bundle-RequiredExecutionEnvironment: JavaSE-17 +Import-Package: com.google.common.collect;version="[33.1.0,33.2.0)" Automatic-Module-Name: org.eclipse.papyrus.infra.gmfdiag.css diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/pom.xml b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/pom.xml index 82575da7022..a7f0916ab35 100644 --- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/pom.xml +++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/pom.xml @@ -9,6 +9,6 @@ <version>0.0.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.papyrus.infra.gmfdiag.css</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.100-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project>
\ No newline at end of file diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/.classpath b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/.classpath index 95cdcb1209f..108dc438a4a 100644 --- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/.classpath +++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src"/> <classpathentry kind="src" path="src-gen"/> diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -12,7 +12,7 @@ org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/META-INF/MANIFEST.MF index 74a55cf3b3a..0b106f21080 100644 --- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/META-INF/MANIFEST.MF +++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui/META-INF/MANIFEST.MF @@ -26,5 +26,5 @@ Bundle-ManifestVersion: 2 Bundle-Activator: org.eclipse.papyrus.infra.gmfdiag.css3.ui.internal.CSSActivator Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui;singleton:=true Import-Package: org.apache.log4j;version="[1.2.0,2.0.0)" -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/.classpath b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/.classpath index a61354428b8..7e7c8905e60 100644 --- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/.classpath +++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/.classpath @@ -3,7 +3,7 @@ <classpathentry kind="src" path="src"/> <classpathentry kind="src" path="src-gen"/> <classpathentry kind="src" path="xtend-gen"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="output" path="bin"/> </classpath> diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -12,7 +12,7 @@ org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/META-INF/MANIFEST.MF index 241ea3951b0..35f5691d516 100755 --- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/META-INF/MANIFEST.MF +++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/META-INF/MANIFEST.MF @@ -1,6 +1,6 @@ Manifest-Version: 1.0 Require-Bundle: org.eclipse.emf.mwe2.launch;bundle-version="[2.11.0,3.0.0)", - org.eclipse.xtext.generator;bundle-version="[2.22.0,3.0.0)", + org.eclipse.xtext.xtext.generator;bundle-version="[2.22.0,3.0.0)", org.eclipse.xtext.xbase;bundle-version="[2.22.0,3.0.0)" Export-Package: org.eclipse.papyrus.infra.gmfdiag.css3, org.eclipse.papyrus.infra.gmfdiag.css3.services, @@ -16,10 +16,10 @@ Export-Package: org.eclipse.papyrus.infra.gmfdiag.css3, org.eclipse.papyrus.infra.gmfdiag.css3.formatting2 Bundle-Vendor: Eclipse Modeling Project Bundle-ActivationPolicy: lazy -Bundle-Version: 4.0.0.qualifier +Bundle-Version: 4.0.100.qualifier Bundle-Name: CSS3 Xtext Editor Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.css3.xtext;singleton:=true Import-Package: org.apache.log4j;version="[1.2.0,2.0.0)" -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.infra.gmfdiag.css3.xtext diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/pom.xml b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/pom.xml index 46cadeb1959..5a4b6de8c32 100644 --- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/pom.xml +++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/pom.xml @@ -7,7 +7,7 @@ <version>0.0.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.papyrus.infra.gmfdiag.css3.xtext</artifactId> - <version>4.0.0-SNAPSHOT</version> + <version>4.0.100-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> <build> diff --git a/plugins/infra/gmfdiag/expansion/org.eclipse.papyrus.infra.gmfdiag.expansion.edit/.classpath b/plugins/infra/gmfdiag/expansion/org.eclipse.papyrus.infra.gmfdiag.expansion.edit/.classpath index 004db3fba20..2377d859931 100644 --- a/plugins/infra/gmfdiag/expansion/org.eclipse.papyrus.infra.gmfdiag.expansion.edit/.classpath +++ b/plugins/infra/gmfdiag/expansion/org.eclipse.papyrus.infra.gmfdiag.expansion.edit/.classpath @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> <classpathentry kind="src" path="src-gen"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="output" path="bin"/> </classpath> diff --git a/plugins/infra/gmfdiag/expansion/org.eclipse.papyrus.infra.gmfdiag.expansion.edit/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/gmfdiag/expansion/org.eclipse.papyrus.infra.gmfdiag.expansion.edit/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/infra/gmfdiag/expansion/org.eclipse.papyrus.infra.gmfdiag.expansion.edit/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/infra/gmfdiag/expansion/org.eclipse.papyrus.infra.gmfdiag.expansion.edit/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -12,7 +12,7 @@ org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 diff --git a/plugins/infra/gmfdiag/expansion/org.eclipse.papyrus.infra.gmfdiag.expansion.edit/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/expansion/org.eclipse.papyrus.infra.gmfdiag.expansion.edit/META-INF/MANIFEST.MF index 23b8e2ec5b3..3b669e17851 100644 --- a/plugins/infra/gmfdiag/expansion/org.eclipse.papyrus.infra.gmfdiag.expansion.edit/META-INF/MANIFEST.MF +++ b/plugins/infra/gmfdiag/expansion/org.eclipse.papyrus.infra.gmfdiag.expansion.edit/META-INF/MANIFEST.MF @@ -17,5 +17,5 @@ Bundle-Localization: plugin Bundle-ManifestVersion: 2 Bundle-Activator: org.eclipse.papyrus.infra.gmfdiag.expansion.provider.ExpandModelEditPlugin$Implementation Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.expansion.edit;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.infra.gmfdiag.expansion.edit diff --git a/plugins/infra/gmfdiag/expansion/org.eclipse.papyrus.infra.gmfdiag.expansion.editor/.classpath b/plugins/infra/gmfdiag/expansion/org.eclipse.papyrus.infra.gmfdiag.expansion.editor/.classpath index 004db3fba20..2377d859931 100644 --- a/plugins/infra/gmfdiag/expansion/org.eclipse.papyrus.infra.gmfdiag.expansion.editor/.classpath +++ b/plugins/infra/gmfdiag/expansion/org.eclipse.papyrus.infra.gmfdiag.expansion.editor/.classpath @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> <classpathentry kind="src" path="src-gen"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="output" path="bin"/> </classpath> diff --git a/plugins/infra/gmfdiag/expansion/org.eclipse.papyrus.infra.gmfdiag.expansion.editor/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/gmfdiag/expansion/org.eclipse.papyrus.infra.gmfdiag.expansion.editor/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/infra/gmfdiag/expansion/org.eclipse.papyrus.infra.gmfdiag.expansion.editor/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/infra/gmfdiag/expansion/org.eclipse.papyrus.infra.gmfdiag.expansion.editor/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -12,7 +12,7 @@ org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 diff --git a/plugins/infra/gmfdiag/expansion/org.eclipse.papyrus.infra.gmfdiag.expansion.editor/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/expansion/org.eclipse.papyrus.infra.gmfdiag.expansion.editor/META-INF/MANIFEST.MF index 0adf72b9214..25467856318 100644 --- a/plugins/infra/gmfdiag/expansion/org.eclipse.papyrus.infra.gmfdiag.expansion.editor/META-INF/MANIFEST.MF +++ b/plugins/infra/gmfdiag/expansion/org.eclipse.papyrus.infra.gmfdiag.expansion.editor/META-INF/MANIFEST.MF @@ -20,5 +20,5 @@ Bundle-Localization: plugin Bundle-ManifestVersion: 2 Bundle-Activator: org.eclipse.papyrus.infra.gmfdiag.expansion.presentation.ExpandModelEditor$Implementation Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.expansion.editor;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.infra.gmfdiag.expansion.editor diff --git a/plugins/infra/gmfdiag/expansion/org.eclipse.papyrus.infra.gmfdiag.expansion/.classpath b/plugins/infra/gmfdiag/expansion/org.eclipse.papyrus.infra.gmfdiag.expansion/.classpath index 940ace7c3c2..b486adc2d3f 100644 --- a/plugins/infra/gmfdiag/expansion/org.eclipse.papyrus.infra.gmfdiag.expansion/.classpath +++ b/plugins/infra/gmfdiag/expansion/org.eclipse.papyrus.infra.gmfdiag.expansion/.classpath @@ -2,7 +2,7 @@ <classpath> <classpathentry kind="src" path="src-gen"/> <classpathentry kind="src" path="src/main/java"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="output" path="bin/"/> </classpath> diff --git a/plugins/infra/gmfdiag/expansion/org.eclipse.papyrus.infra.gmfdiag.expansion/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/gmfdiag/expansion/org.eclipse.papyrus.infra.gmfdiag.expansion/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/infra/gmfdiag/expansion/org.eclipse.papyrus.infra.gmfdiag.expansion/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/infra/gmfdiag/expansion/org.eclipse.papyrus.infra.gmfdiag.expansion/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -12,7 +12,7 @@ org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 diff --git a/plugins/infra/gmfdiag/expansion/org.eclipse.papyrus.infra.gmfdiag.expansion/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/expansion/org.eclipse.papyrus.infra.gmfdiag.expansion/META-INF/MANIFEST.MF index 0d54b72d5dc..203edb51b4f 100644 --- a/plugins/infra/gmfdiag/expansion/org.eclipse.papyrus.infra.gmfdiag.expansion/META-INF/MANIFEST.MF +++ b/plugins/infra/gmfdiag/expansion/org.eclipse.papyrus.infra.gmfdiag.expansion/META-INF/MANIFEST.MF @@ -26,5 +26,5 @@ Bundle-Localization: plugin Bundle-ManifestVersion: 2 Bundle-Activator: org.eclipse.papyrus.infra.gmfdiag.expansion.Activator Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.expansion;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.infra.gmfdiag.expansion diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.extensionpoints.editors/.classpath b/plugins/infra/gmfdiag/org.eclipse.papyrus.extensionpoints.editors/.classpath index e801ebfb468..81fe078c20c 100644 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.extensionpoints.editors/.classpath +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.extensionpoints.editors/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src"/> <classpathentry kind="output" path="bin"/> diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.extensionpoints.editors/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/gmfdiag/org.eclipse.papyrus.extensionpoints.editors/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.extensionpoints.editors/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.extensionpoints.editors/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -12,7 +12,7 @@ org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.extensionpoints.editors/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/org.eclipse.papyrus.extensionpoints.editors/META-INF/MANIFEST.MF index d54913b1f06..1d9a984fda0 100644 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.extensionpoints.editors/META-INF/MANIFEST.MF +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.extensionpoints.editors/META-INF/MANIFEST.MF @@ -17,5 +17,5 @@ Bundle-Localization: plugin Bundle-Activator: org.eclipse.papyrus.extensionpoints.editors.Activator Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.extensionpoints.editors;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.extensionpoints.editors diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical/.classpath b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical/.classpath index e801ebfb468..81fe078c20c 100644 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical/.classpath +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src"/> <classpathentry kind="output" path="bin"/> diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -12,7 +12,7 @@ org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical/META-INF/MANIFEST.MF index dd14b885c19..f389529d08e 100644 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical/META-INF/MANIFEST.MF +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical/META-INF/MANIFEST.MF @@ -15,15 +15,15 @@ Export-Package: org.eclipse.papyrus.infra.gmfdiag.canonical.editpolicy, org.eclipse.papyrus.infra.gmfdiag.canonical.strategy Bundle-Vendor: %providerName Bundle-ActivationPolicy: lazy -Bundle-Version: 3.1.0.qualifier +Bundle-Version: 3.1.100.qualifier Bundle-Name: %pluginName Bundle-Localization: plugin Bundle-Activator: org.eclipse.papyrus.infra.gmfdiag.canonical.internal.Activator Bundle-ManifestVersion: 2 Bundle-Description: %pluginDescription Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.canonical;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 -Import-Package: com.google.common.base;version="[30.1.0, 31.0.0)", - com.google.common.collect;version="[30.1.0, 31.0.0)", - com.google.common.util.concurrent;version="[30.1.0, 31.0.0)" +Bundle-RequiredExecutionEnvironment: JavaSE-17 +Import-Package: com.google.common.base;version="[33.1.0,33.2.0)", + com.google.common.collect;version="[33.1.0,33.2.0)", + com.google.common.util.concurrent;version="[33.1.0,33.2.0)" Automatic-Module-Name: org.eclipse.papyrus.infra.gmfdiag.canonical diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical/pom.xml b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical/pom.xml index b5c5a302fb9..1e23a7dd3ba 100644 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical/pom.xml +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical/pom.xml @@ -10,6 +10,6 @@ </parent> <artifactId>org.eclipse.papyrus.infra.gmfdiag.canonical</artifactId> - <version>3.1.0-SNAPSHOT</version> + <version>3.1.100-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project>
\ No newline at end of file diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical/src/org/eclipse/papyrus/infra/gmfdiag/canonical/internal/provider/PapyrusCanonicalEditPolicyProvider.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical/src/org/eclipse/papyrus/infra/gmfdiag/canonical/internal/provider/PapyrusCanonicalEditPolicyProvider.java index d40488cf8b6..9ae405bdff8 100644 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical/src/org/eclipse/papyrus/infra/gmfdiag/canonical/internal/provider/PapyrusCanonicalEditPolicyProvider.java +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical/src/org/eclipse/papyrus/infra/gmfdiag/canonical/internal/provider/PapyrusCanonicalEditPolicyProvider.java @@ -1,5 +1,5 @@ /***************************************************************************** - * Copyright (c) 2014, 2015 CEA LIST, Christian W. Damus, and others. + * Copyright (c) 2014, 2015, 2023 CEA LIST, Christian W. Damus, and others. * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 @@ -11,6 +11,7 @@ * Contributors: * Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation * Christian W. Damus - bug 433206 + * Vincent LORENZO (CEA LIST) vincent.lorenzo@cea.fr - bug 577845 * *****************************************************************************/ package org.eclipse.papyrus.infra.gmfdiag.canonical.internal.provider; @@ -26,6 +27,7 @@ import org.eclipse.gmf.runtime.diagram.ui.services.editpolicy.CreateEditPolicies import org.eclipse.gmf.runtime.diagram.ui.services.editpolicy.IEditPolicyProvider; import org.eclipse.papyrus.infra.core.services.ServiceException; import org.eclipse.papyrus.infra.gmfdiag.canonical.editpolicy.PapyrusCanonicalEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.service.ProviderServiceUtil; import org.eclipse.papyrus.infra.gmfdiag.common.utils.ServiceUtilsForEditPart; /** @@ -59,6 +61,9 @@ public class PapyrusCanonicalEditPolicyProvider extends AbstractProvider impleme CreateEditPoliciesOperation epOperation = (CreateEditPoliciesOperation) operation; EditPart gep = epOperation.getEditPart(); + if (!ProviderServiceUtil.isPapyrusPart(gep)) { + return false; + } // test if the edipart is a papyrus editpart try { if (ServiceUtilsForEditPart.getInstance().getServiceRegistry(gep) == null) { diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/.classpath b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/.classpath index e801ebfb468..81fe078c20c 100644 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/.classpath +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src"/> <classpathentry kind="output" path="bin"/> diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -12,7 +12,7 @@ org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/META-INF/MANIFEST.MF index c8e8fc56350..049761504d9 100644 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/META-INF/MANIFEST.MF +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/META-INF/MANIFEST.MF @@ -27,5 +27,5 @@ Bundle-Name: %pluginName Bundle-ManifestVersion: 2 Bundle-Activator: org.eclipse.papyrus.commands.Activator Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.commands;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.infra.gmfdiag.commands diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/src/org/eclipse/papyrus/commands/DestroyElementPapyrusCommand.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/src/org/eclipse/papyrus/commands/DestroyElementPapyrusCommand.java index 2d2865450c0..6388a2b7950 100644 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/src/org/eclipse/papyrus/commands/DestroyElementPapyrusCommand.java +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/src/org/eclipse/papyrus/commands/DestroyElementPapyrusCommand.java @@ -18,12 +18,17 @@ package org.eclipse.papyrus.commands; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; +import java.util.HashSet; import java.util.List; +import java.util.Set; +import org.eclipse.core.resources.IFile; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.EReference; import org.eclipse.emf.ecore.EStructuralFeature.Setting; +import org.eclipse.emf.ecore.resource.Resource; import org.eclipse.emf.ecore.util.EcoreUtil; +import org.eclipse.emf.workspace.util.WorkspaceSynchronizer; import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand; import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest; import org.eclipse.papyrus.infra.emf.utils.EMFHelper; @@ -65,18 +70,27 @@ public class DestroyElementPapyrusCommand extends DestroyElementCommand { protected List fileOfIncomingReferences(EObject destructee) { if (destructee != null) { Collection<Setting> usages = EMFHelper.getUsages(destructee); - List<Object> result = new ArrayList<Object>(); + List<Object> result = new ArrayList<>(); + Set<Resource> resources = new HashSet<>(); for (Setting setting : usages) { if (setting.getEStructuralFeature() instanceof EReference) { EReference eRef = (EReference) setting.getEStructuralFeature(); if (eRef.isChangeable() && (eRef.isDerived() == false) && (eRef.isContainment() == false) && (eRef.isContainer() == false)) { - List files = getWorkspaceFiles(setting.getEObject()); - if (files != null) { - result.addAll(files); + Resource resource = setting.getEObject().eResource(); + if (resource != null) { + resources.add(resource); } } } } + for (Resource resource : resources) { + IFile file = WorkspaceSynchronizer.getFile(resource); + if (file != null) { + result.add(file); + } + } + + return result; } return Collections.emptyList(); diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/.classpath b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/.classpath index e801ebfb468..81fe078c20c 100644 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/.classpath +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src"/> <classpathentry kind="output" path="bin"/> diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/.settings/org.eclipse.jdt.core.prefs index f09f5504dea..fcf1425718d 100755 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -12,7 +12,7 @@ org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns=false org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/META-INF/MANIFEST.MF index 3a5765238fb..15a3877dc33 100755 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/META-INF/MANIFEST.MF +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/META-INF/MANIFEST.MF @@ -1,9 +1,11 @@ Manifest-Version: 1.0 Require-Bundle: com.ibm.icu, - org.apache.batik.dom;bundle-version="[1.6.0,1.7.0)", - org.apache.batik.dom.svg;bundle-version="[1.6.0,1.7.0)", - org.apache.batik.util;bundle-version="[1.6.0,1.7.0)", - org.apache.batik.xml;bundle-version="[1.6.0,1.7.0)", + org.apache.batik.dom;bundle-version="[1.17.0,1.18.0)", + org.apache.batik.dom.svg;bundle-version="[1.17.0,1.18.0)", + org.apache.batik.util;bundle-version="[1.17.0,1.18.0)", + org.apache.batik.xml;bundle-version="[1.17.0,1.18.0)", + org.apache.batik.anim;bundle-version="[1.17.0,1.18.0)", + org.apache.batik.constants;bundle-version="[1.17.0,1.18.0)", org.eclipse.core.databinding.property;bundle-version="[1.8.0,2.0.0)", org.eclipse.core.expressions;bundle-version="[3.6.0,4.0.0)", org.eclipse.emf.databinding;bundle-version="[1.5.0,2.0.0)", @@ -47,9 +49,9 @@ Require-Bundle: com.ibm.icu, org.eclipse.papyrus.infra.widgets;bundle-version="[4.0.0,5.0.0)", org.eclipse.ui.ide;bundle-version="[3.17.0,4.0.0)", org.eclipse.uml2.types;bundle-version="[2.5.0,3.0.0)", - org.w3c.dom.svg;bundle-version="[1.1.0,2.0.0)", org.eclipse.gmf.runtime.diagram.ui.providers;bundle-version="[1.7.0,2.0.0)", - org.eclipse.papyrus.infra.guava;bundle-version="[1.0.0,2.0.0)" + org.eclipse.papyrus.infra.guava;bundle-version="[1.0.0,2.0.0)", + org.eclipse.orbit.xml-apis-ext;bundle-version="[1.0.0,2.0.0)" Export-Package: org.eclipse.papyrus.infra.gmfdiag.common, org.eclipse.papyrus.infra.gmfdiag.common.adapter, org.eclipse.papyrus.infra.gmfdiag.common.advice, @@ -94,20 +96,20 @@ Export-Package: org.eclipse.papyrus.infra.gmfdiag.common, org.eclipse.papyrus.infra.gmfdiag.common.utils, org.eclipse.papyrus.infra.gmfdiag.internal.common.expressions;x-internal:=true, org.eclipse.papyrus.infra.gmfdiag.internal.common.model;x-internal:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-Activator: org.eclipse.papyrus.infra.gmfdiag.common.Activator Bundle-Vendor: %providerName Bundle-ActivationPolicy: lazy Bundle-ClassPath: . -Bundle-Version: 4.2.0.qualifier +Bundle-Version: 4.3.300.qualifier Bundle-Localization: plugin Bundle-Name: %pluginName Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.common;singleton:=true -Import-Package: com.google.common.base;version="[30.1.0, 31.0.0)", - com.google.common.collect;version="[30.1.0, 31.0.0)", - com.google.common.util.concurrent;version="[30.1.0, 31.0.0)", +Import-Package: com.google.common.base;version="[33.1.0,33.2.0)", + com.google.common.collect;version="[33.1.0,33.2.0)", + com.google.common.util.concurrent;version="[33.1.0,33.2.0)", org.osgi.service.component.annotations;version="1.3.0";resolution:=optional Automatic-Module-Name: org.eclipse.papyrus.infra.gmfdiag.common -Service-Component: OSGI-INF/org.eclipse.papyrus.infra.gmfdiag.common.internal.service.ViewProviderServiceImpl.xml, - OSGI-INF/org.eclipse.papyrus.infra.gmfdiag.common.internal.service.EditPolicyProviderServiceImpl.xml +Service-Component: OSGI-INF/org.eclipse.papyrus.infra.gmfdiag.common.internal.service.EditPolicyProviderServiceImpl.xml, + OSGI-INF/org.eclipse.papyrus.infra.gmfdiag.common.internal.service.ViewProviderServiceImpl.xml diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/plugin.xml b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/plugin.xml index fd848859279..84919191723 100644 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/plugin.xml +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/plugin.xml @@ -43,14 +43,17 @@ label="Refresh" style="push" tooltip="Refresh the current diagram"> - <visibleWhen - checkEnabled="false"> - <with - variable="activeEditorId"> - <equals - value="org.eclipse.papyrus.infra.core.papyrusEditor"> - </equals> - </with> + <visibleWhen> + <and> + <with + variable="selection"> + <test + forcePluginActivation="false" + property="org.eclipse.papyrus.infra.gmfdiag.internal.common.expressions.PapyrusGMFDiagramTester.isPapyrusGMFDiagramActive" + value="true"> + </test> + </with> + </and> </visibleWhen> </command> </menuContribution> @@ -220,6 +223,13 @@ properties="canDelete,isSemanticDeletion" type="org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart"> </propertyTester> + <propertyTester + class="org.eclipse.papyrus.infra.gmfdiag.internal.common.expressions.PapyrusGMFDiagramTester" + id="org.eclipse.papyrus.infra.gmfdiag.internal.common.expressions.PapyrusGMFDiagramTester" + namespace="org.eclipse.papyrus.infra.gmfdiag.internal.common.expressions.PapyrusGMFDiagramTester" + properties="isPapyrusGMFDiagramActive" + type="org.eclipse.jface.viewers.IStructuredSelection"> + </propertyTester> </extension> <extension point="org.eclipse.ui.menus"> diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/pom.xml b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/pom.xml index 5a748174bbb..f852adb88e7 100644 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/pom.xml +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/pom.xml @@ -9,6 +9,6 @@ <version>0.0.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.papyrus.infra.gmfdiag.common</artifactId> - <version>4.2.0-SNAPSHOT</version> + <version>4.3.300-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project>
\ No newline at end of file diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpolicies/PapyrusResizableShapeEditPolicy.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpolicies/PapyrusResizableShapeEditPolicy.java index ef91f12970c..8ae47a3019a 100644 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpolicies/PapyrusResizableShapeEditPolicy.java +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpolicies/PapyrusResizableShapeEditPolicy.java @@ -1,5 +1,5 @@ /***************************************************************************** - * Copyright (c) 2013 CEA LIST. + * Copyright (c) 2013, 2023 CEA LIST. * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 @@ -9,8 +9,8 @@ * SPDX-License-Identifier: EPL-2.0 * * Contributors: - * - * CEA LIST - Initial API and implementation + * CEA LIST - Initial API and implementation + * Pauline DEVILLE (CEA LIST) <pauline.deville@cea.fr> - Bug 582075 * *****************************************************************************/ package org.eclipse.papyrus.infra.gmfdiag.common.editpolicies; @@ -23,7 +23,6 @@ import java.util.Map; import java.util.Set; import org.eclipse.gef.EditPart; -import org.eclipse.gef.GraphicalEditPart; import org.eclipse.gef.commands.Command; import org.eclipse.gef.requests.ChangeBoundsRequest; import org.eclipse.gef.tools.ResizeTracker; @@ -132,7 +131,7 @@ public class PapyrusResizableShapeEditPolicy extends ResizableShapeEditPolicy { */ @Override protected ResizeTracker getResizeTracker(int direction) { - return new ResizeTrackerWithPreferences((GraphicalEditPart) getHost(), direction); + return new ResizeTrackerWithPreferences(getHost(), direction); } protected static enum MovedNodeKind { @@ -147,7 +146,7 @@ public class PapyrusResizableShapeEditPolicy extends ResizableShapeEditPolicy { private final Set<EditPart> myKnownIndirectlyNo; - public CachedEditPartsSet(List<EditPart> directlyMoved) { + public CachedEditPartsSet(List<? extends EditPart> directlyMoved) { myDirectlyMoved = new HashSet<>(directlyMoved); myKnownIndirectlyNo = new HashSet<>(directlyMoved.size() * 5 + 1); myKnownIndirectlyYes = new HashSet<>(directlyMoved.size() * 5 + 1); diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/figure/node/SVGNodePlateFigure.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/figure/node/SVGNodePlateFigure.java index 6f69ce0f689..d319824483d 100644 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/figure/node/SVGNodePlateFigure.java +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/figure/node/SVGNodePlateFigure.java @@ -1,5 +1,5 @@ /***************************************************************************** - * Copyright (c) 2010, 2014, 2018 CEA LIST and others. + * Copyright (c) 2010, 2014, 2018, 2023 CEA LIST and others. * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 @@ -13,6 +13,7 @@ * Laurent Wouters (CEA LIST) laurent.wouters@cea.fr - Refactoring, cleanup, added support for PapyrusLabel element * Mickael ADAM (ALL4TEC) mickael.adam@all4tec.net - Add IRoundedRectangleFigure use case(436547) * Ansgar Radermacher (CEA LIST) ansgar.radermacher@cea.fr - NPE if SVG unit is not in pixels (521232) + * Pascal Bannerot (CEA LIST) pascal.bannerot@cea.fr - Bug 582007 * *****************************************************************************/ package org.eclipse.papyrus.infra.gmfdiag.common.figure.node; @@ -173,6 +174,8 @@ public class SVGNodePlateFigure extends DefaultSizeNodeFigure { element = svgDocument.getElementById("PapyrusLabel"); if (element != null) { labelBounds = toDraw2DRectangle((SVGRectElement) element); + // Bug 582007: force labelBounds value to null to prevent freeze (infinite refresh loop) + labelBounds = null; } } else { this.svgDimension = null; @@ -395,7 +398,7 @@ public class SVGNodePlateFigure extends DefaultSizeNodeFigure { */ private Rectangle getDraw2DAnchor() { if (this.getChildren().size() > 0 && this.getChildren().get(0) instanceof IFigure) { - IFigure primaryShape = (IFigure) this.getChildren().get(0); + IFigure primaryShape = this.getChildren().get(0); for (Object subFigure : primaryShape.getChildren()) { if (subFigure instanceof ScalableCompartmentFigure) { return ((IFigure) subFigure).getBounds(); diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/providers/PopupBarEditPolicyProvider.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/providers/PopupBarEditPolicyProvider.java index 3a0a1273a62..1d8f0ccdbe2 100644 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/providers/PopupBarEditPolicyProvider.java +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/providers/PopupBarEditPolicyProvider.java @@ -1,5 +1,5 @@ /***************************************************************************** - * Copyright (c) 2012, 2014 CEA LIST, Christian W. Damus, and others. + * Copyright (c) 2012, 2014, 2023 CEA LIST, Christian W. Damus, and others. * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 @@ -12,7 +12,7 @@ * Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation * Christian W. Damus - bug 451230 * Shuai Li - * + * Vincent LORENZO (CEA LIST) vincent.lorenzo@cea.fr - bug 577845 *****************************************************************************/ package org.eclipse.papyrus.infra.gmfdiag.common.providers; @@ -27,6 +27,7 @@ import org.eclipse.gmf.runtime.diagram.ui.services.editpolicy.IEditPolicyProvide import org.eclipse.papyrus.infra.core.services.ServiceException; import org.eclipse.papyrus.infra.core.services.ServicesRegistry; import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.PapyrusPopupBarEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.service.ProviderServiceUtil; import org.eclipse.papyrus.infra.gmfdiag.common.utils.ServiceUtilsForEditPart; /** @@ -47,6 +48,9 @@ public class PopupBarEditPolicyProvider extends AbstractProvider implements IEdi if (operation instanceof CreateEditPoliciesOperation) { CreateEditPoliciesOperation epOperation = (CreateEditPoliciesOperation) operation; EditPart editPart = epOperation.getEditPart(); + if (!ProviderServiceUtil.isPapyrusPart(editPart)) { + return false; + } try { ServicesRegistry registry = ServiceUtilsForEditPart.getInstance().getServiceRegistry(editPart); if (registry == null) { diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/selection/PapyrusRubberbandSelectionTool.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/selection/PapyrusRubberbandSelectionTool.java index 63c10b3b6a8..2eb7bab9516 100644 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/selection/PapyrusRubberbandSelectionTool.java +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/selection/PapyrusRubberbandSelectionTool.java @@ -455,7 +455,7 @@ public class PapyrusRubberbandSelectionTool extends AbstractTool { private HashSet<EditPart> getAllChildren(EditPart editPart, HashSet<EditPart> currentSelection) { // List all the editPart children - List<EditPart> children = editPart.getChildren(); + List<? extends EditPart> children = editPart.getChildren(); // for each child, add the child and all its connections to the currentSelection for (int i = 0; i < children.size(); i++) { diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/service/ProviderServiceUtil.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/service/ProviderServiceUtil.java index c7dadd06b19..a9d2887378f 100644 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/service/ProviderServiceUtil.java +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/service/ProviderServiceUtil.java @@ -1,5 +1,5 @@ /***************************************************************************** - * Copyright (c) 2018 EclipseSource and others. + * Copyright (c) 2018, 2022 EclipseSource and others. * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 @@ -10,16 +10,18 @@ * * Contributors: * EclipseSource - Initial API and implementation (Bug 533701) - * + * Vincent Lorenzo (CEA LIST) - vincent.lorenzo@cea.fr - Bug 577845 *****************************************************************************/ package org.eclipse.papyrus.infra.gmfdiag.common.service; import org.eclipse.gef.EditPart; import org.eclipse.gmf.runtime.diagram.core.providers.IViewProvider; import org.eclipse.gmf.runtime.diagram.ui.services.editpolicy.IEditPolicyProvider; +import org.eclipse.gmf.runtime.notation.Diagram; import org.eclipse.gmf.runtime.notation.View; import org.eclipse.papyrus.infra.core.services.ServicesRegistry; import org.eclipse.papyrus.infra.emf.utils.ServiceUtilsForEObject; +import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils; import org.eclipse.papyrus.infra.gmfdiag.common.utils.ServiceUtilsForEditPart; /** @@ -32,6 +34,46 @@ import org.eclipse.papyrus.infra.gmfdiag.common.utils.ServiceUtilsForEditPart; public class ProviderServiceUtil { /** + * this method allows to identify if the editpart is associated to a Papyrus GMF Diagram (diagram.eContainer()==null) + * + * @param editPart + * an edit part + * @return + * <code>true</code> if the editPart probably concerns the Papyrus GMF Diagram + * <code>false</code> otherwise (editPart is <code>null</code> or diagram.eContainer()!=null in case of a Papyrus Sirius Diagram) + * + */ + private static final boolean isPapyrusGMFPart(final EditPart editPart) { + if (editPart != null) { + final Object model = editPart.getModel(); + if (model instanceof View) { + return isPapyrusGMFView((View) model); + } + } + return false; + } + + /** + * this method allows to identify if the view is associated to a Papyrus GMF Diagram (diagram.eContainer()==null) + * + * @param view + * a view + * @return + * <code>true</code> if the view probably concerns the Papyrus GMF Diagram + * <code>false</code> otherwise (view is <code>null</code> or diagram.eContainer()!=null in case of a Papyrus Sirius Diagram) + * + */ + private static final boolean isPapyrusGMFView(final View view) { + if (view != null) { + final Diagram d = view.getDiagram(); + if (d != null) { + return DiagramUtils.isPapyrusGMFDiagram(d); + } + } + return false; + } + + /** * <p> * Tests if the given edit part is a Papyrus Edit Part, by testing if a Papyrus {@link ServicesRegistry} * is present. @@ -43,6 +85,9 @@ public class ProviderServiceUtil { * <code>true</code> if this edit part is part of a Papyrus environment (Using a Papyrus {@link ServicesRegistry}), <code>false</code> otherwise */ public static boolean isPapyrusPart(EditPart editPart) { + if (!isPapyrusGMFPart(editPart)) { + return false; + } try { return ServiceUtilsForEditPart.getInstance().getServiceRegistry(editPart) != null; } catch (Exception ex) { @@ -63,6 +108,9 @@ public class ProviderServiceUtil { * <code>true</code> if this view is part of a Papyrus environment (Using a Papyrus {@link ServicesRegistry}), <code>false</code> otherwise */ public static boolean isPapyrusView(View view) { + if (!isPapyrusGMFView(view)) { + return false; + } try { return ServiceUtilsForEObject.getInstance().getServiceRegistry(view) != null; } catch (Exception ex) { diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/service/palette/PaletteUtil.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/service/palette/PaletteUtil.java index f8a494da2e3..004a22d0c5f 100644 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/service/palette/PaletteUtil.java +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/service/palette/PaletteUtil.java @@ -127,7 +127,7 @@ public class PaletteUtil { @SuppressWarnings("unchecked") public static List<PaletteContainer> getDirectChildContainers(PaletteContainer container) { List<PaletteContainer> containers = new ArrayList<>(); - Iterator<PaletteEntry> it = container.getChildren().iterator(); + Iterator<PaletteEntry> it = container.getChildren().stream().filter(PaletteEntry.class::isInstance).map(PaletteEntry.class::cast).toList().iterator(); while (it.hasNext()) { PaletteEntry entry = it.next(); if (entry instanceof PaletteContainer) { @@ -183,7 +183,7 @@ public class PaletteUtil { */ public static List<ToolEntry> getAllToolEntries(PaletteContainer container) { final List<ToolEntry> entries = new ArrayList<>(); - Iterator<PaletteEntry> it = container.getChildren().iterator(); + Iterator<PaletteEntry> it = container.getChildren().stream().filter(PaletteEntry.class::isInstance).map(PaletteEntry.class::cast).toList().iterator(); while (it.hasNext()) { PaletteEntry entry = it.next(); if (entry instanceof ToolEntry) { diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/service/shape/AbstractShapeProvider.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/service/shape/AbstractShapeProvider.java index c2f15ec90db..29593dc9533 100644 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/service/shape/AbstractShapeProvider.java +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/service/shape/AbstractShapeProvider.java @@ -22,7 +22,7 @@ import java.util.HashMap; import java.util.Map; import java.util.WeakHashMap; -import org.apache.batik.dom.svg.SAXSVGDocumentFactory; +import org.apache.batik.anim.dom.SAXSVGDocumentFactory; import org.apache.batik.dom.util.DOMUtilities; import org.eclipse.core.runtime.IConfigurationElement; import org.eclipse.draw2d.PositionConstants; diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/sync/ContainerChildrenSyncFeature.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/sync/ContainerChildrenSyncFeature.java index 567c615d400..da5f07b88f3 100644 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/sync/ContainerChildrenSyncFeature.java +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/sync/ContainerChildrenSyncFeature.java @@ -73,6 +73,6 @@ public abstract class ContainerChildrenSyncFeature<M extends EObject, N extends @SuppressWarnings("unchecked") @Override Iterable<? extends T> basicGetContents(T backend) { - return getEffectiveEditPart(backend).getChildren(); + return (Iterable<? extends T>) getEffectiveEditPart(backend).getChildren(); } } diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/utils/DiagramEditPartsUtil.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/utils/DiagramEditPartsUtil.java index a3da4d4cfb5..8040ffbd293 100644 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/utils/DiagramEditPartsUtil.java +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/utils/DiagramEditPartsUtil.java @@ -570,7 +570,7 @@ public class DiagramEditPartsUtil { return; } - List<EditPart> children = editPart.getChildren(); + List<? extends EditPart> children = editPart.getChildren(); for (EditPart ep : children) { if (ep instanceof IGraphicalEditPart) { diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/utils/DiagramUtils.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/utils/DiagramUtils.java index 2c7fed7f86b..5ab212de21a 100644 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/utils/DiagramUtils.java +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/utils/DiagramUtils.java @@ -1,5 +1,5 @@ /***************************************************************************** - * Copyright (c) 2013, 2017, 2019, 2020 CEA LIST and others. + * Copyright (c) 2013, 2017, 2019, 2020, 2022 CEA LIST and others. * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 @@ -15,8 +15,7 @@ * Christian W. Damus - bug 527580 * Ansgar Radermacher - bug 539754 * Nicolas FAUVERGUE (CEA LIST) nicolas.fauvergue@cea.fr - Bug 550568 - * Vincent LORENZO (CEA LIST) vincent.lorenzo@cea.fr - Bug 560644 - * + * Vincent LORENZO (CEA LIST) vincent.lorenzo@cea.fr - Bug 560644, 577845 *****************************************************************************/ package org.eclipse.papyrus.infra.gmfdiag.common.utils; @@ -412,4 +411,17 @@ public class DiagramUtils { return null; } + /** + * + * @param diagram + * a diagram, can't be <code>null</code> + * @return + * <code>true</code> if the view probably concerns the Papyrus GMF Diagram (diagram.eContainer()==null) + * <code>false</code> the view probably concerns a Papyrus Sirius Diagram (diagram.eContainer()!=null) + * @since 4.3 + */ + public static final boolean isPapyrusGMFDiagram(final Diagram diagram) { + return diagram.eContainer() == null; // diagram.eContainer()!=null for papyrus sirius diagram + } + } diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/utils/EditPartUtils.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/utils/EditPartUtils.java index 29973c9bf12..9ca64b3bde7 100644 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/utils/EditPartUtils.java +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/utils/EditPartUtils.java @@ -52,8 +52,7 @@ public class EditPartUtils { } } } - @SuppressWarnings("unchecked") - final List<EditPart> children = editPart.getChildren(); + final List<? extends EditPart> children = editPart.getChildren(); for (final EditPart child : children) { internalFindChildEditPartsWithId(child, visualId, result); } diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/utils/FigureUtils.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/utils/FigureUtils.java index ccd530091c6..e64f90674ab 100644 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/utils/FigureUtils.java +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/utils/FigureUtils.java @@ -1,5 +1,5 @@ /***************************************************************************** - * Copyright (c) 2012 CEA LIST. + * Copyright (c) 2012, 2023 CEA LIST. * * * All rights reserved. This program and the accompanying materials @@ -8,7 +8,7 @@ * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * Vincent LORENZO (CEA LIST) vincent.lorenzo@cea.fr - Bug 581898 *****************************************************************************/ package org.eclipse.papyrus.infra.gmfdiag.common.utils; @@ -41,7 +41,7 @@ public final class FigureUtils { */ @SuppressWarnings("unchecked") public static <T extends IFigure> T findChildFigureInstance(final IFigure parent, final Class<T> childFigureClass) { - final List<IFigure> children = parent.getChildren(); + final List<? extends IFigure> children = parent.getChildren(); for (final IFigure child : children) { if (childFigureClass.isAssignableFrom(child.getClass())) { return (T) child; @@ -67,7 +67,7 @@ public final class FigureUtils { if (parent == null) { return; } - final List<IFigure> children = parent.getChildren(); + final List<? extends IFigure> children = parent.getChildren(); for (final IFigure child : children) { if (childFigureClass.isAssignableFrom(child.getClass())) { result.add((T) child); diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/internal/common/expressions/PapyrusGMFDiagramTester.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/internal/common/expressions/PapyrusGMFDiagramTester.java new file mode 100644 index 00000000000..776ba74e5b6 --- /dev/null +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/internal/common/expressions/PapyrusGMFDiagramTester.java @@ -0,0 +1,66 @@ +/***************************************************************************** + * Copyright (c) 2021 CEA LIST. + * + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 + * which accompanies this distribution, and is available at + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * + * Contributors: + * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation + *****************************************************************************/ +package org.eclipse.papyrus.infra.gmfdiag.internal.common.expressions; + +import org.eclipse.core.expressions.PropertyTester; +import org.eclipse.jface.viewers.IStructuredSelection; +import org.eclipse.papyrus.infra.gmfdiag.common.SynchronizableGmfDiagramEditor; +import org.eclipse.papyrus.infra.ui.editor.IMultiDiagramEditor; +import org.eclipse.papyrus.infra.ui.util.EditorHelper; +import org.eclipse.ui.IEditorPart; + +/** + * This tester is used to check if the current Editor is a Papyrus GMF diagram (and not a papyrus Sirius Diagram) (see bug 577822) + */ +public class PapyrusGMFDiagramTester extends PropertyTester { + + /** + * this property is used to know is the current Editor is a Papyrus GMF diagram (and not a papyrus Sirius Diagram) + */ + private static final String IS_PAPYRUS_GMF_DIAGRAM_ACTIVE = "isPapyrusGMFDiagramActive";//$NON-NLS-1$ + + + /** + * + * @see org.eclipse.core.expressions.IPropertyTester#test(java.lang.Object, java.lang.String, java.lang.Object[], java.lang.Object) + * + * @param receiver + * @param property + * @param args + * @param expectedValue + * @return + */ + @Override + public boolean test(Object receiver, String property, Object[] args, Object expectedValue) { + if (IS_PAPYRUS_GMF_DIAGRAM_ACTIVE.equals(property) && receiver instanceof IStructuredSelection && expectedValue instanceof Boolean) { + return expectedValue.equals(isPapyrusGMFDiagramActive()); + } + return false; + } + + + /** + * + * @return + * <code>true</code> if the current active editor represents a Papyrus GMF Editor + */ + private final boolean isPapyrusGMFDiagramActive() { + IEditorPart editorPart = EditorHelper.getCurrentEditor(); + // this code also should work when the SynchronizableGmfDiagramEditor is not embedded in the IMultiDiagramEditor + if (editorPart instanceof IMultiDiagramEditor) { + editorPart = ((IMultiDiagramEditor) editorPart).getActiveEditor(); + } + return editorPart instanceof SynchronizableGmfDiagramEditor; + } +} diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.controlmode/.classpath b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.controlmode/.classpath index e801ebfb468..81fe078c20c 100644 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.controlmode/.classpath +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.controlmode/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src"/> <classpathentry kind="output" path="bin"/> diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.controlmode/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.controlmode/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.controlmode/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.controlmode/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -12,7 +12,7 @@ org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.controlmode/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.controlmode/META-INF/MANIFEST.MF index f64fd7d6f93..1510caa24ed 100644 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.controlmode/META-INF/MANIFEST.MF +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.controlmode/META-INF/MANIFEST.MF @@ -15,5 +15,5 @@ Bundle-Name: GMF-specific control mode behavior Bundle-Activator: org.eclipse.papyrus.infra.gmfdiag.controlmode.Activator Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.controlmode;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.infra.gmfdiag.controlmode diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.model.edit/.classpath b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.model.edit/.classpath index e9c6eafb6fa..abaf32b3e99 100755 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.model.edit/.classpath +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.model.edit/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src-gen"/> <classpathentry kind="output" path="bin"/> diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.model.edit/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.model.edit/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.model.edit/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.model.edit/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -12,7 +12,7 @@ org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.model.edit/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.model.edit/META-INF/MANIFEST.MF index c6b486cf17d..481c3ad9638 100755 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.model.edit/META-INF/MANIFEST.MF +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.model.edit/META-INF/MANIFEST.MF @@ -7,7 +7,7 @@ Bundle-ClassPath: . Bundle-Activator: org.eclipse.papyrus.infra.gmfdiag.css.stylesheets.provider.StyleSheetsEditPlugin$Implementation$Activator Bundle-Vendor: %providerName Bundle-Localization: plugin -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.eclipse.papyrus.infra.gmfdiag.css.stylesheets.provider Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.18.0,4.0.0)", org.eclipse.papyrus.infra.gmfdiag.css.model;bundle-version="[2.0.0,3.0.0)", diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.model/.classpath b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.model/.classpath index bb642933501..f574c0cbd4d 100644 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.model/.classpath +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.model/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src-gen"/> <classpathentry kind="src" path="src"/> diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.model/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.model/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.model/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.model/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -12,7 +12,7 @@ org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.model/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.model/META-INF/MANIFEST.MF index 4493a3bc4ad..09563ec837e 100644 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.model/META-INF/MANIFEST.MF +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.model/META-INF/MANIFEST.MF @@ -15,5 +15,5 @@ Bundle-Localization: plugin Bundle-Name: %pluginName Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.css.model;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.infra.gmfdiag.css.model diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.dnd/.classpath b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.dnd/.classpath index e801ebfb468..81fe078c20c 100644 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.dnd/.classpath +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.dnd/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src"/> <classpathentry kind="output" path="bin"/> diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.dnd/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.dnd/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.dnd/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.dnd/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -12,7 +12,7 @@ org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.dnd/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.dnd/META-INF/MANIFEST.MF index a42ece84579..c5ee37dec36 100644 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.dnd/META-INF/MANIFEST.MF +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.dnd/META-INF/MANIFEST.MF @@ -17,10 +17,10 @@ Require-Bundle: org.eclipse.emf.databinding;bundle-version="[1.5.0,2.0.0)", org.eclipse.uml2.types;bundle-version="[2.5.0,3.0.0)" Bundle-Vendor: Eclipse Modeling Project Bundle-ActivationPolicy: lazy -Bundle-Version: 2.0.0.qualifier +Bundle-Version: 2.0.100.qualifier Bundle-Name: Customizable Drag and Drop Bundle-Activator: org.eclipse.papyrus.infra.gmfdiag.dnd.Activator Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.dnd;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.infra.gmfdiag.dnd diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.dnd/pom.xml b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.dnd/pom.xml index 6b01a37952f..28a6e3ef998 100644 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.dnd/pom.xml +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.dnd/pom.xml @@ -9,6 +9,6 @@ <version>0.0.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.papyrus.infra.gmfdiag.dnd</artifactId> - <version>2.0.0-SNAPSHOT</version> + <version>2.0.100-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project>
\ No newline at end of file diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.dnd/src/org/eclipse/papyrus/infra/gmfdiag/dnd/strategy/AbstractDropStrategy.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.dnd/src/org/eclipse/papyrus/infra/gmfdiag/dnd/strategy/AbstractDropStrategy.java index 2c857c9f952..59706e9a5d9 100644 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.dnd/src/org/eclipse/papyrus/infra/gmfdiag/dnd/strategy/AbstractDropStrategy.java +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.dnd/src/org/eclipse/papyrus/infra/gmfdiag/dnd/strategy/AbstractDropStrategy.java @@ -127,7 +127,7 @@ public abstract class AbstractDropStrategy implements DropStrategy { // Adapted from org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy#castToDropObjectsRequest if (request instanceof ChangeBoundsRequest) { ChangeBoundsRequest changeBoundsRequest = (ChangeBoundsRequest) request; - Iterator<EditPart> editParts = ToolUtilities.getSelectionWithoutDependants(changeBoundsRequest.getEditParts()).iterator(); + Iterator<EditPart> editParts = ToolUtilities.getSelectionWithoutDependants(changeBoundsRequest.getEditParts()).stream().filter(EditPart.class::isInstance).map(EditPart.class::cast).toList().iterator(); List<EObject> elements = new LinkedList<>(); while (editParts.hasNext()) { diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.export/.classpath b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.export/.classpath index e801ebfb468..81fe078c20c 100644 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.export/.classpath +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.export/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src"/> <classpathentry kind="output" path="bin"/> diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.export/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.export/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.export/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.export/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -12,7 +12,7 @@ org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.export/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.export/META-INF/MANIFEST.MF index 7cec139ad14..c549b3aff61 100644 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.export/META-INF/MANIFEST.MF +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.export/META-INF/MANIFEST.MF @@ -32,5 +32,5 @@ Bundle-Name: %pluginName Bundle-Activator: org.eclipse.papyrus.infra.gmfdiag.export.Activator Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.export;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.infra.gmfdiag.export diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors/.classpath b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors/.classpath index e801ebfb468..81fe078c20c 100644 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors/.classpath +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src"/> <classpathentry kind="output" path="bin"/> diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -12,7 +12,7 @@ org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors/META-INF/MANIFEST.MF index cd528f7abde..dfd02e7c58f 100644 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors/META-INF/MANIFEST.MF +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors/META-INF/MANIFEST.MF @@ -20,5 +20,5 @@ Bundle-Localization: plugin Bundle-Activator: org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.Activator Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.gef/.classpath b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.gef/.classpath index e801ebfb468..81fe078c20c 100644 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.gef/.classpath +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.gef/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src"/> <classpathentry kind="output" path="bin"/> diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.gef/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.gef/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.gef/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.gef/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -12,7 +12,7 @@ org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.gef/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.gef/META-INF/MANIFEST.MF index 9176268cf3f..929ca2f9adb 100644 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.gef/META-INF/MANIFEST.MF +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.gef/META-INF/MANIFEST.MF @@ -17,5 +17,5 @@ Bundle-Name: %pluginName Bundle-Activator: org.eclipse.papyrus.infra.gmfdiag.gef.internal.Activator Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.gef;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.infra.gmfdiag.gef diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.gmfmenu.filter/.classpath b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.gmfmenu.filter/.classpath index e801ebfb468..81fe078c20c 100644 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.gmfmenu.filter/.classpath +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.gmfmenu.filter/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src"/> <classpathentry kind="output" path="bin"/> diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.gmfmenu.filter/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.gmfmenu.filter/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.gmfmenu.filter/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.gmfmenu.filter/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -12,7 +12,7 @@ org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.gmfmenu.filter/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.gmfmenu.filter/META-INF/MANIFEST.MF index a214217e736..cd4e1bfff6f 100644 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.gmfmenu.filter/META-INF/MANIFEST.MF +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.gmfmenu.filter/META-INF/MANIFEST.MF @@ -11,5 +11,5 @@ Bundle-Name: %Bundle-Name Bundle-ManifestVersion: 2 Bundle-Description: %pluginDescription Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.gmfmenu.filter;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.infra.gmfdiag.gmfmenu.filter diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.gmfmenu.filter/plugin.xml b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.gmfmenu.filter/plugin.xml index 6d9f5811181..a5ecc441667 100644 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.gmfmenu.filter/plugin.xml +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.gmfmenu.filter/plugin.xml @@ -478,6 +478,26 @@ removeFromMenubar="false" removeFromToolbar="true"> </partPredefinedItem> + <partPredefinedItem + id="toolbarFontGroup" + removeFromMenubar="false" + removeFromToolbar="true"> + </partPredefinedItem> + <partPredefinedItem + id="fontColorContributionItem" + removeFromMenubar="false" + removeFromToolbar="true"> + </partPredefinedItem> + <partPredefinedItem + id="fillColorContributionItem" + removeFromMenubar="false" + removeFromToolbar="true"> + </partPredefinedItem> + <partPredefinedItem + id="lineColorContributionItem" + removeFromMenubar="false" + removeFromToolbar="true"> + </partPredefinedItem> </partContribution> <popupContribution class="org.eclipse.gmf.runtime.diagram.ui.providers.DiagramContextMenuProvider"> diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.hyperlink/.classpath b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.hyperlink/.classpath index e801ebfb468..81fe078c20c 100644 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.hyperlink/.classpath +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.hyperlink/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src"/> <classpathentry kind="output" path="bin"/> diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.hyperlink/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.hyperlink/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.hyperlink/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.hyperlink/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -12,7 +12,7 @@ org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.hyperlink/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.hyperlink/META-INF/MANIFEST.MF index 3e9da4ef51e..1fcbe239690 100644 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.hyperlink/META-INF/MANIFEST.MF +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.hyperlink/META-INF/MANIFEST.MF @@ -43,5 +43,5 @@ Bundle-Name: %pluginName Bundle-ManifestVersion: 2 Bundle-Activator: org.eclipse.papyrus.infra.gmfdiag.hyperlink.Activator Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.hyperlink;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.infra.gmfdiag.hyperlink diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.menu/.classpath b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.menu/.classpath index e801ebfb468..81fe078c20c 100644 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.menu/.classpath +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.menu/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src"/> <classpathentry kind="output" path="bin"/> diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.menu/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.menu/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.menu/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.menu/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -12,7 +12,7 @@ org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.menu/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.menu/META-INF/MANIFEST.MF index 60e8c099de4..4d7d8ed153e 100644 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.menu/META-INF/MANIFEST.MF +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.menu/META-INF/MANIFEST.MF @@ -23,6 +23,6 @@ Bundle-Activator: org.eclipse.papyrus.infra.gmfdiag.menu.Activator Bundle-ManifestVersion: 2 Bundle-Description: %pluginDescription Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.menu;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 -Import-Package: com.google.common.base;version="[30.1.0, 31.0.0)" +Bundle-RequiredExecutionEnvironment: JavaSE-17 +Import-Package: com.google.common.base;version="[33.1.0,33.2.0)" Automatic-Module-Name: org.eclipse.papyrus.infra.gmfdiag.menu diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/.classpath b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/.classpath index 8b41e2c3679..a1dd721574e 100644 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/.classpath +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src"/> <classpathentry kind="var" path="ECLIPSE_HOME"> diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -12,7 +12,7 @@ org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/META-INF/MANIFEST.MF index c8f72e5c3d9..7eb8b992952 100644 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/META-INF/MANIFEST.MF +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/META-INF/MANIFEST.MF @@ -24,12 +24,12 @@ Require-Bundle: org.eclipse.core.expressions;bundle-version="[3.6.0,4.0.0)", org.eclipse.uml2.types;bundle-version="[2.5.0,3.0.0)" Bundle-Vendor: %providerName Bundle-ActivationPolicy: lazy -Bundle-Version: 2.0.0.qualifier +Bundle-Version: 2.0.100.qualifier Bundle-Name: %pluginName Bundle-Localization: plugin Bundle-ManifestVersion: 2 Bundle-Activator: org.eclipse.papyrus.infra.gmfdiag.modelexplorer.Activator Bundle-Description: %pluginDescription Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.modelexplorer;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.infra.gmfdiag.modelexplorer diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/pom.xml b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/pom.xml index c20a10b90dd..1ce8ff3cc15 100644 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/pom.xml +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/pom.xml @@ -9,7 +9,7 @@ <version>0.0.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.papyrus.infra.gmfdiag.modelexplorer</artifactId> - <version>2.0.0-SNAPSHOT</version> + <version>2.0.100-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> <description>This plugin provides : - the facets and the customization to display the GMF Diagrams in the ModelExplorer</description> </project>
\ No newline at end of file diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/src/org/eclipse/papyrus/infra/gmfdiag/modelexplorer/queries/GetContainedDiagrams.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/src/org/eclipse/papyrus/infra/gmfdiag/modelexplorer/queries/GetContainedDiagrams.java index 0c7f563759e..522b0210ea3 100644 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/src/org/eclipse/papyrus/infra/gmfdiag/modelexplorer/queries/GetContainedDiagrams.java +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/src/org/eclipse/papyrus/infra/gmfdiag/modelexplorer/queries/GetContainedDiagrams.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011 Atos, Christian W. Damus, and others. + * Copyright (c) 2011, 2022 Atos, Christian W. Damus, and others. * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 @@ -11,7 +11,7 @@ * Contributors: * Atos - Initial API and implementation * Christian W. Damus - bug 485220 - * + * Vincent Lorenzo (CEA LIST) - vincent.lorenzo@cea.fr - Bug 577843 */ package org.eclipse.papyrus.infra.gmfdiag.modelexplorer.queries; @@ -28,19 +28,21 @@ import org.eclipse.papyrus.emf.facet.query.java.core.IJavaQuery2; import org.eclipse.papyrus.emf.facet.query.java.core.IParameterValueList2; import org.eclipse.papyrus.infra.emf.utils.EMFHelper; import org.eclipse.papyrus.infra.gmfdiag.common.model.NotationUtils; +import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils; /** Get the collection of all contained diagrams */ public class GetContainedDiagrams implements IJavaQuery2<EObject, Collection<org.eclipse.gmf.runtime.notation.Diagram>> { + @Override public Collection<Diagram> evaluate(EObject source, IParameterValueList2 parameterValues, IFacetManager facetManager) throws DerivedTypedElementException { - List<Diagram> result = new ArrayList<Diagram>(); + List<Diagram> result = new ArrayList<>(); Collection<Setting> settings = EMFHelper.getUsages(source); if (settings != null) { for (Setting setting : settings) { Diagram diagram = NotationUtils.getOwnedDiagram(setting.getEObject(), source); - if (diagram != null) { + if (diagram != null && DiagramUtils.isPapyrusGMFDiagram(diagram)) { result.add(diagram); } } diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/src/org/eclipse/papyrus/infra/gmfdiag/modelexplorer/queries/IsDiagramContainer.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/src/org/eclipse/papyrus/infra/gmfdiag/modelexplorer/queries/IsDiagramContainer.java index ae9c064a156..9a4e8e66d97 100644 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/src/org/eclipse/papyrus/infra/gmfdiag/modelexplorer/queries/IsDiagramContainer.java +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/src/org/eclipse/papyrus/infra/gmfdiag/modelexplorer/queries/IsDiagramContainer.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011 Atos, Christian W. Damus, and others. + * Copyright (c) 2011, 2022 Atos, Christian W. Damus, and others. * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 @@ -11,7 +11,7 @@ * Contributors: * Atos - Initial API and implementation * Christian W. Damus - bug 485220 - * + * Vincent Lorenzo (CEA LIST) - vincent.lorenzo@cea.fr - Bug 577843 */ package org.eclipse.papyrus.infra.gmfdiag.modelexplorer.queries; @@ -26,18 +26,20 @@ import org.eclipse.papyrus.emf.facet.query.java.core.IJavaQuery2; import org.eclipse.papyrus.emf.facet.query.java.core.IParameterValueList2; import org.eclipse.papyrus.infra.emf.utils.EMFHelper; import org.eclipse.papyrus.infra.gmfdiag.common.model.NotationUtils; +import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils; public class IsDiagramContainer implements IJavaQuery2<EObject, Boolean> { /** * Return true if the element is a Diagram Container */ + @Override public Boolean evaluate(EObject source, IParameterValueList2 parameterValues, IFacetManager facetManager) throws DerivedTypedElementException { Collection<Setting> settings = EMFHelper.getUsages(source); if (settings != null) { for (Setting setting : settings) { Diagram diagram = NotationUtils.getOwnedDiagram(setting.getEObject(), source); - if (diagram != null) { + if (diagram != null && DiagramUtils.isPapyrusGMFDiagram(diagram)) { return true; } } diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.navigation/.classpath b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.navigation/.classpath index e801ebfb468..81fe078c20c 100644 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.navigation/.classpath +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.navigation/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src"/> <classpathentry kind="output" path="bin"/> diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.navigation/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.navigation/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.navigation/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.navigation/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -12,7 +12,7 @@ org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.navigation/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.navigation/META-INF/MANIFEST.MF index 9a90a804f12..8f2dc460974 100644 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.navigation/META-INF/MANIFEST.MF +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.navigation/META-INF/MANIFEST.MF @@ -32,5 +32,5 @@ Bundle-Localization: plugin Bundle-ManifestVersion: 2 Bundle-Activator: org.eclipse.papyrus.infra.gmfdiag.navigation.Activator Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.navigation;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.infra.gmfdiag.navigation diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.outline/.classpath b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.outline/.classpath index e801ebfb468..81fe078c20c 100644 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.outline/.classpath +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.outline/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src"/> <classpathentry kind="output" path="bin"/> diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.outline/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.outline/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.outline/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.outline/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -12,7 +12,7 @@ org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.outline/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.outline/META-INF/MANIFEST.MF index 9512eb49a9a..79b8ae916c5 100644 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.outline/META-INF/MANIFEST.MF +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.outline/META-INF/MANIFEST.MF @@ -21,5 +21,5 @@ Bundle-Localization: plugin Bundle-Activator: org.eclipse.papyrus.infra.gmfdiag.outline.internal.Activator Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.outline;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.infra.gmfdiag.outline diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/.classpath b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/.classpath index e801ebfb468..81fe078c20c 100644 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/.classpath +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src"/> <classpathentry kind="output" path="bin"/> diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -12,7 +12,7 @@ org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/META-INF/MANIFEST.MF index 08ab78ad961..97825f9d1d9 100644 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/META-INF/MANIFEST.MF +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/META-INF/MANIFEST.MF @@ -24,5 +24,5 @@ Bundle-Name: %pluginName Bundle-Activator: org.eclipse.papyrus.infra.gmfdiag.preferences.Activator Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.preferences;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.infra.gmfdiag.preferences diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/.classpath b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/.classpath index e801ebfb468..81fe078c20c 100644 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/.classpath +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src"/> <classpathentry kind="output" path="bin"/> diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -12,7 +12,7 @@ org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/META-INF/MANIFEST.MF index 532bed8fcab..323674d087e 100644 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/META-INF/MANIFEST.MF +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/META-INF/MANIFEST.MF @@ -37,6 +37,6 @@ Bundle-Activator: org.eclipse.papyrus.infra.gmfdiag.properties.Activator Bundle-ManifestVersion: 2 Bundle-Description: %pluginDescription Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.properties;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 -Import-Package: com.google.common.base;version="[30.1.0, 31.0.0)" +Bundle-RequiredExecutionEnvironment: JavaSE-17 +Import-Package: com.google.common.base;version="[33.1.0,33.2.0)" Automatic-Module-Name: org.eclipse.papyrus.infra.gmfdiag.properties diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation.edit/.classpath b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation.edit/.classpath index 0fa64c8e5fc..b5e203ff5c7 100644 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation.edit/.classpath +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation.edit/.classpath @@ -2,7 +2,7 @@ <classpath> <classpathentry kind="src" path="src"/> <classpathentry kind="src" path="src-gen"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="output" path="bin"/> </classpath> diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation.edit/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation.edit/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation.edit/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation.edit/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -12,7 +12,7 @@ org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation.edit/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation.edit/META-INF/MANIFEST.MF index d9f2a285ab6..71ace326e27 100644 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation.edit/META-INF/MANIFEST.MF +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation.edit/META-INF/MANIFEST.MF @@ -7,7 +7,7 @@ Bundle-ClassPath: . Bundle-Activator: org.eclipse.papyrus.infra.gmfdiag.representation.provider.RepresentationEditPlugin$Implementation Bundle-Vendor: %providerName Bundle-Localization: plugin -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.eclipse.papyrus.infra.gmfdiag.representation.provider Require-Bundle: org.eclipse.emf.databinding;bundle-version="[1.5.0,2.0.0)", org.eclipse.emf.edit.ui;bundle-version="[2.18.0,3.0.0)", diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/.classpath b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/.classpath index ad5e13cce77..946fb3d346f 100644 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/.classpath +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src"/> <classpathentry kind="src" path="src-gen"/> diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -12,7 +12,7 @@ org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/META-INF/MANIFEST.MF index 7573e385805..9aac523bff5 100644 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/META-INF/MANIFEST.MF +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/META-INF/MANIFEST.MF @@ -7,7 +7,7 @@ Bundle-ClassPath: . Bundle-Activator: org.eclipse.papyrus.infra.gmfdiag.representation.impl.RepresentationPlugin$Implementation Bundle-Vendor: %providerName Bundle-Localization: plugin -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.eclipse.papyrus.infra.gmfdiag.representation, org.eclipse.papyrus.infra.gmfdiag.representation.impl, org.eclipse.papyrus.infra.gmfdiag.representation.util diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.style.edit/.classpath b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.style.edit/.classpath index 004db3fba20..2377d859931 100644 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.style.edit/.classpath +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.style.edit/.classpath @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> <classpathentry kind="src" path="src-gen"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="output" path="bin"/> </classpath> diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.style.edit/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.style.edit/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.style.edit/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.style.edit/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -12,7 +12,7 @@ org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.style.edit/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.style.edit/META-INF/MANIFEST.MF index 8c4889a8945..85df54a8ce6 100644 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.style.edit/META-INF/MANIFEST.MF +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.style.edit/META-INF/MANIFEST.MF @@ -7,7 +7,7 @@ Bundle-ClassPath: . Bundle-Activator: org.eclipse.papyrus.infra.gmfdiag.style.provider.StyleEditPlugin$Implementation Bundle-Vendor: %providerName Bundle-Localization: plugin -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.eclipse.papyrus.infra.gmfdiag.style.provider Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.18.0,4.0.0)", org.eclipse.emf.ecore.xmi;bundle-version="[2.16.0,3.0.0)", diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.style/.classpath b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.style/.classpath index e9c6eafb6fa..abaf32b3e99 100644 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.style/.classpath +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.style/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src-gen"/> <classpathentry kind="output" path="bin"/> diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.style/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.style/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.style/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.style/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -12,7 +12,7 @@ org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.style/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.style/META-INF/MANIFEST.MF index 98a199515f8..b6b10c68015 100644 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.style/META-INF/MANIFEST.MF +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.style/META-INF/MANIFEST.MF @@ -6,7 +6,7 @@ Bundle-Version: 3.0.0.qualifier Bundle-ClassPath: . Bundle-Vendor: %providerName Bundle-Localization: plugin -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.eclipse.papyrus.infra.gmfdiag.style, org.eclipse.papyrus.infra.gmfdiag.style.impl, org.eclipse.papyrus.infra.gmfdiag.style.util diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/.classpath b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/.classpath index 675dd424025..04d5c2e08d7 100755 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/.classpath +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"> <accessrules> <accessrule kind="accessible" pattern="**"/> diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -12,7 +12,7 @@ org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/META-INF/MANIFEST.MF index a4a61333387..ec098b9a924 100755 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/META-INF/MANIFEST.MF +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.tooling.runtime;singleton:=true -Bundle-Version: 4.1.0.qualifier +Bundle-Version: 4.1.100.qualifier Bundle-Vendor: %providerName Bundle-Description: %Bundle-Description Bundle-Localization: plugin @@ -10,7 +10,7 @@ Require-Bundle: org.eclipse.gmf.runtime.diagram.ui.properties;bundle-version="[1 org.eclipse.gmf.runtime.diagram.ui.render;bundle-version="[1.7.0,2.0.0)", org.eclipse.ocl.ecore;bundle-version="[3.15.0,4.0.0)" Bundle-ActivationPolicy: lazy -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-Activator: org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.GMFToolingRuntimePlugin Export-Package: org.eclipse.papyrus.infra.gmfdiag.tooling.runtime, org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.actions, diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/pom.xml b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/pom.xml index b15fbab72c1..41de5c00493 100755 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/pom.xml +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/pom.xml @@ -9,7 +9,7 @@ <version>0.0.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.papyrus.infra.gmfdiag.tooling.runtime</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.1.100-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> <description>Papyrus fork of org.eclipse.gmf.tooling.runtime to remain in the release train</description> </project>
\ No newline at end of file diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/src/org/eclipse/papyrus/infra/gmfdiag/tooling/runtime/linklf/policies/AdjustAbsoluteBendpointsEditPolicyBase.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/src/org/eclipse/papyrus/infra/gmfdiag/tooling/runtime/linklf/policies/AdjustAbsoluteBendpointsEditPolicyBase.java index 7048b0dccba..48e5e800104 100755 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/src/org/eclipse/papyrus/infra/gmfdiag/tooling/runtime/linklf/policies/AdjustAbsoluteBendpointsEditPolicyBase.java +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/src/org/eclipse/papyrus/infra/gmfdiag/tooling/runtime/linklf/policies/AdjustAbsoluteBendpointsEditPolicyBase.java @@ -1,4 +1,20 @@ -package org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.linklf.policies; +/***************************************************************************** + * Copyright (c) 2017, 2023 CEA LIST. + * + * + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 + * which accompanies this distribution, and is available at + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * + * Contributors: + * Initial API and implementation + * Pauline DEVILLE (CEA LIST) <pauline.deville@cea.fr> - Bug 582075 + * + *****************************************************************************/ +package org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.linklf.policies; import java.util.Arrays; import java.util.HashSet; @@ -27,7 +43,7 @@ import org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.linklf.AbsoluteBendpoin * boilerplate for edit policies that handles different aspects of this * adjustment. * <p/> - * + * * @since 3.3 */ public abstract class AdjustAbsoluteBendpointsEditPolicyBase extends @@ -45,7 +61,7 @@ public abstract class AdjustAbsoluteBendpointsEditPolicyBase extends * Tries to find the cached instance of {@link CachedEditPartsSet} in the * request extended data map. If not found, initializes the new instance and * caches it in request for other edit-policy instances. - * + * * @param req * @return never returns <code>null</code> */ @@ -95,16 +111,16 @@ public abstract class AdjustAbsoluteBendpointsEditPolicyBase extends private final Set<EditPart> myKnownIndirectlyNo; - public CachedEditPartsSet(List<EditPart> directlyMoved) { - myDirectlyMoved = new HashSet<EditPart>(directlyMoved); - myKnownIndirectlyNo = new HashSet<EditPart>( + public CachedEditPartsSet(List<? extends EditPart> directlyMoved) { + myDirectlyMoved = new HashSet<>(directlyMoved); + myKnownIndirectlyNo = new HashSet<>( directlyMoved.size() * 5 + 1); - myKnownIndirectlyYes = new HashSet<EditPart>( + myKnownIndirectlyYes = new HashSet<>( directlyMoved.size() * 5 + 1); } public MovedNodeKind isMoved(EditPart ep) { - List<EditPart> chainUp = new LinkedList<EditPart>(); + List<EditPart> chainUp = new LinkedList<>(); EditPart cur = ep; MovedNodeKind kind = null; while (cur != null) { diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/src/org/eclipse/papyrus/infra/gmfdiag/tooling/runtime/linklf/policies/AdjustImplicitlyMovedLinksEditPolicy.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/src/org/eclipse/papyrus/infra/gmfdiag/tooling/runtime/linklf/policies/AdjustImplicitlyMovedLinksEditPolicy.java index 76f6f39fdc8..f5f59d4ade5 100755 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/src/org/eclipse/papyrus/infra/gmfdiag/tooling/runtime/linklf/policies/AdjustImplicitlyMovedLinksEditPolicy.java +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/src/org/eclipse/papyrus/infra/gmfdiag/tooling/runtime/linklf/policies/AdjustImplicitlyMovedLinksEditPolicy.java @@ -1,7 +1,7 @@ /***************************************************************************** * Copyright (c) 2014 Montages AG and others * - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at @@ -10,10 +10,10 @@ * SPDX-License-Identifier: EPL-2.0 * * Contributors: - * Michael Golubev (Montages) - Initial API and implementation + * Michael Golubev (Montages) - Initial API and implementation * Anatoly Tishenko (ticher777@gmail.com) - Initial API and implementation */ -package org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.linklf.policies; +package org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.linklf.policies; import java.util.Collection; import java.util.LinkedList; @@ -37,7 +37,7 @@ import org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.linklf.AbsoluteBendpoin * same time. Only absolute bendpoints (also possibly stored as relative, see * {@link AbsoluteBendpointsConvention}) require adjustment. * <p/> - * + * * @since 3.3 */ public class AdjustImplicitlyMovedLinksEditPolicy extends @@ -78,7 +78,7 @@ public class AdjustImplicitlyMovedLinksEditPolicy extends CachedEditPartsSet allMoved = getMovedEditPartsSet(req); ICommand result = null; - LinkedList<GraphicalEditPart> queue = new LinkedList<GraphicalEditPart>(); + LinkedList<GraphicalEditPart> queue = new LinkedList<>(); queue.add(getHost()); while (!queue.isEmpty()) { @@ -97,8 +97,7 @@ public class AdjustImplicitlyMovedLinksEditPolicy extends } } - @SuppressWarnings("unchecked") - Collection<GraphicalEditPart> children = cur.getChildren(); + Collection<? extends GraphicalEditPart> children = cur.getChildren(); queue.addAll(children); } return result == null ? null : new ICommandProxy(result.reduce()); diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/src/org/eclipse/papyrus/infra/gmfdiag/tooling/runtime/linklf/policies/AdjustSyntheticBendpointsEditPolicy.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/src/org/eclipse/papyrus/infra/gmfdiag/tooling/runtime/linklf/policies/AdjustSyntheticBendpointsEditPolicy.java index 120c19da4fe..998e938b1ac 100755 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/src/org/eclipse/papyrus/infra/gmfdiag/tooling/runtime/linklf/policies/AdjustSyntheticBendpointsEditPolicy.java +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.tooling.runtime/src/org/eclipse/papyrus/infra/gmfdiag/tooling/runtime/linklf/policies/AdjustSyntheticBendpointsEditPolicy.java @@ -1,4 +1,4 @@ -package org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.linklf.policies; +package org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.linklf.policies; import java.util.Collection; import java.util.LinkedList; @@ -23,7 +23,7 @@ import org.eclipse.gmf.runtime.notation.Edge; * and not yet serialized in the model. It should be registered before other * adjusting edit policies for the same node. * <p/> - * + * * @since 3.3 */ public class AdjustSyntheticBendpointsEditPolicy extends @@ -47,7 +47,7 @@ public class AdjustSyntheticBendpointsEditPolicy extends CachedEditPartsSet allMoved = getMovedEditPartsSet(req); ICommand result = null; - LinkedList<GraphicalEditPart> queue = new LinkedList<GraphicalEditPart>(); + LinkedList<GraphicalEditPart> queue = new LinkedList<>(); queue.add(getHost()); while (!queue.isEmpty()) { @@ -77,8 +77,7 @@ public class AdjustSyntheticBendpointsEditPolicy extends } } - @SuppressWarnings("unchecked") - Collection<GraphicalEditPart> children = cur.getChildren(); + Collection<? extends GraphicalEditPart> children = cur.getChildren(); queue.addAll(children); } return result == null ? null : new ICommandProxy(result.reduce()); diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.viewersearcher/.classpath b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.viewersearcher/.classpath index edc8895124d..a7bc712151f 100644 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.viewersearcher/.classpath +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.viewersearcher/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src/"/> <classpathentry kind="output" path="bin"/> diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.viewersearcher/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.viewersearcher/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.viewersearcher/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.viewersearcher/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -12,7 +12,7 @@ org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.viewersearcher/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.viewersearcher/META-INF/MANIFEST.MF index c9e98fe48e8..320450cd2e1 100644 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.viewersearcher/META-INF/MANIFEST.MF +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.viewersearcher/META-INF/MANIFEST.MF @@ -16,5 +16,5 @@ Bundle-Name: %pluginName Bundle-Activator: org.eclipse.papyrus.infra.gmfdiag.viewersearcher.Activator Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.viewersearcher;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.infra.gmfdiag.viewersearcher diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.welcome/.classpath b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.welcome/.classpath index e801ebfb468..81fe078c20c 100644 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.welcome/.classpath +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.welcome/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src"/> <classpathentry kind="output" path="bin"/> diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.welcome/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.welcome/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.welcome/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.welcome/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -12,7 +12,7 @@ org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.welcome/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.welcome/META-INF/MANIFEST.MF index fec0b50e5ab..82299db258f 100644 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.welcome/META-INF/MANIFEST.MF +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.welcome/META-INF/MANIFEST.MF @@ -30,5 +30,5 @@ Bundle-Name: %pluginName Bundle-Activator: org.eclipse.papyrus.infra.gmfdiag.welcome.internal.Activator Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.welcome;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.infra.gmfdiag.welcome diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.widgets/.classpath b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.widgets/.classpath index e801ebfb468..81fe078c20c 100644 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.widgets/.classpath +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.widgets/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src"/> <classpathentry kind="output" path="bin"/> diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.widgets/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.widgets/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.widgets/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.widgets/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -12,7 +12,7 @@ org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.widgets/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.widgets/META-INF/MANIFEST.MF index 95d28a82b84..d8208843835 100644 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.widgets/META-INF/MANIFEST.MF +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.widgets/META-INF/MANIFEST.MF @@ -15,5 +15,5 @@ Bundle-Activator: org.eclipse.papyrus.infra.gmfdiag.widgets.Activator Bundle-ManifestVersion: 2 Bundle-Description: %pluginDescription Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.widgets;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.infra.gmfdiag.widgets diff --git a/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.edit/.classpath b/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.edit/.classpath index bb642933501..f574c0cbd4d 100644 --- a/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.edit/.classpath +++ b/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.edit/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src-gen"/> <classpathentry kind="src" path="src"/> diff --git a/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.edit/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.edit/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.edit/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.edit/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -12,7 +12,7 @@ org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 diff --git a/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.edit/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.edit/META-INF/MANIFEST.MF index 01a2668c8d6..8140379437c 100644 --- a/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.edit/META-INF/MANIFEST.MF +++ b/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.edit/META-INF/MANIFEST.MF @@ -24,5 +24,5 @@ Bundle-Name: %pluginName Bundle-Activator: org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.provider.PaletteConfigurationEditPlugin$Implementation Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.edit;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.edit diff --git a/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.editor/.classpath b/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.editor/.classpath index bb642933501..f574c0cbd4d 100644 --- a/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.editor/.classpath +++ b/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.editor/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src-gen"/> <classpathentry kind="src" path="src"/> diff --git a/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.editor/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.editor/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.editor/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.editor/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -12,7 +12,7 @@ org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 diff --git a/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.editor/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.editor/META-INF/MANIFEST.MF index 0041a47ae38..d9aca41fd77 100644 --- a/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.editor/META-INF/MANIFEST.MF +++ b/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.editor/META-INF/MANIFEST.MF @@ -7,7 +7,7 @@ Bundle-ClassPath: . Bundle-Activator: org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.presentation.PaletteConfigurationEditorPlugin$Implementation Bundle-Vendor: %providerName Bundle-Localization: plugin -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.presentation, org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.widgets.editors Require-Bundle: org.eclipse.emf.databinding;bundle-version="[1.5.0,2.0.0)", @@ -29,5 +29,5 @@ Require-Bundle: org.eclipse.emf.databinding;bundle-version="[1.5.0,2.0.0)", org.eclipse.ui.ide;bundle-version="[3.17.0,4.0.0)", org.eclipse.uml2.uml.edit;bundle-version="[5.5.0,6.0.0)" Bundle-ActivationPolicy: lazy -Import-Package: com.google.common.base;version="[30.1.0, 31.0.0)" +Import-Package: com.google.common.base;version="[33.1.0,33.2.0)" Automatic-Module-Name: org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.editor diff --git a/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration/.classpath b/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration/.classpath index bb642933501..f574c0cbd4d 100644 --- a/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration/.classpath +++ b/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src-gen"/> <classpathentry kind="src" path="src"/> diff --git a/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -12,7 +12,7 @@ org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 diff --git a/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration/META-INF/MANIFEST.MF index 0946ff9e3d3..3e8762deb4e 100644 --- a/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration/META-INF/MANIFEST.MF +++ b/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration/META-INF/MANIFEST.MF @@ -30,4 +30,4 @@ Bundle-Activator: org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.Activat Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration;singleton:=true Automatic-Module-Name: org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/plugins/infra/internationalization/org.eclipse.papyrus.infra.editor.welcome.internationalization/.classpath b/plugins/infra/internationalization/org.eclipse.papyrus.infra.editor.welcome.internationalization/.classpath index e801ebfb468..81fe078c20c 100644 --- a/plugins/infra/internationalization/org.eclipse.papyrus.infra.editor.welcome.internationalization/.classpath +++ b/plugins/infra/internationalization/org.eclipse.papyrus.infra.editor.welcome.internationalization/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src"/> <classpathentry kind="output" path="bin"/> diff --git a/plugins/infra/internationalization/org.eclipse.papyrus.infra.editor.welcome.internationalization/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/internationalization/org.eclipse.papyrus.infra.editor.welcome.internationalization/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/infra/internationalization/org.eclipse.papyrus.infra.editor.welcome.internationalization/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/infra/internationalization/org.eclipse.papyrus.infra.editor.welcome.internationalization/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -12,7 +12,7 @@ org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 diff --git a/plugins/infra/internationalization/org.eclipse.papyrus.infra.editor.welcome.internationalization/META-INF/MANIFEST.MF b/plugins/infra/internationalization/org.eclipse.papyrus.infra.editor.welcome.internationalization/META-INF/MANIFEST.MF index d68e6b8387b..f57b73ebd60 100644 --- a/plugins/infra/internationalization/org.eclipse.papyrus.infra.editor.welcome.internationalization/META-INF/MANIFEST.MF +++ b/plugins/infra/internationalization/org.eclipse.papyrus.infra.editor.welcome.internationalization/META-INF/MANIFEST.MF @@ -28,5 +28,5 @@ Bundle-Name: %pluginName Bundle-Activator: org.eclipse.papyrus.infra.editor.welcome.internationalization.Activator Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.infra.editor.welcome.internationalization;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.infra.editor.welcome.internationalization diff --git a/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization.common/.classpath b/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization.common/.classpath index e801ebfb468..81fe078c20c 100644 --- a/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization.common/.classpath +++ b/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization.common/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src"/> <classpathentry kind="output" path="bin"/> diff --git a/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization.common/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization.common/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization.common/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization.common/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -12,7 +12,7 @@ org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 diff --git a/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization.common/META-INF/MANIFEST.MF b/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization.common/META-INF/MANIFEST.MF index bf196015158..afc83c3bc6f 100644 --- a/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization.common/META-INF/MANIFEST.MF +++ b/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization.common/META-INF/MANIFEST.MF @@ -6,7 +6,7 @@ Bundle-Version: 2.0.0.qualifier Bundle-ClassPath: . Bundle-Vendor: %providerName Bundle-Localization: plugin -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.eclipse.papyrus.infra.internationalization.common, org.eclipse.papyrus.infra.internationalization.common.command, org.eclipse.papyrus.infra.internationalization.common.editor, diff --git a/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization.controlmode/.classpath b/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization.controlmode/.classpath index e801ebfb468..81fe078c20c 100644 --- a/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization.controlmode/.classpath +++ b/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization.controlmode/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src"/> <classpathentry kind="output" path="bin"/> diff --git a/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization.controlmode/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization.controlmode/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization.controlmode/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization.controlmode/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -12,7 +12,7 @@ org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 diff --git a/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization.controlmode/META-INF/MANIFEST.MF b/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization.controlmode/META-INF/MANIFEST.MF index 45fc1fe48e7..34bb1d7891d 100644 --- a/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization.controlmode/META-INF/MANIFEST.MF +++ b/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization.controlmode/META-INF/MANIFEST.MF @@ -6,7 +6,7 @@ Bundle-Version: 2.0.0.qualifier Bundle-ClassPath: . Bundle-Vendor: %providerName Bundle-Localization: plugin -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.eclipse.papyrus.infra.internationalization.controlmode, org.eclipse.papyrus.infra.internationalization.controlmode.commands, org.eclipse.papyrus.infra.internationalization.controlmode.participants diff --git a/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization.edit/.classpath b/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization.edit/.classpath index bb642933501..f574c0cbd4d 100644 --- a/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization.edit/.classpath +++ b/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization.edit/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src-gen"/> <classpathentry kind="src" path="src"/> diff --git a/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization.edit/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization.edit/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization.edit/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization.edit/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -12,7 +12,7 @@ org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 diff --git a/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization.edit/META-INF/MANIFEST.MF b/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization.edit/META-INF/MANIFEST.MF index c76e3227a7d..e939f647cea 100644 --- a/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization.edit/META-INF/MANIFEST.MF +++ b/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization.edit/META-INF/MANIFEST.MF @@ -7,7 +7,7 @@ Bundle-ClassPath: . Bundle-Activator: org.eclipse.papyrus.infra.internationalization.provider.InternationalizationEditPlugin$Implementation Bundle-Vendor: %providerName Bundle-Localization: plugin -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.eclipse.papyrus.infra.internationalization.edit.provider, org.eclipse.papyrus.infra.internationalization.provider Require-Bundle: org.eclipse.gmf.runtime.emf.type.core;bundle-version="[1.9.0,2.0.0)", diff --git a/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization.readonly/.classpath b/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization.readonly/.classpath index e801ebfb468..81fe078c20c 100644 --- a/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization.readonly/.classpath +++ b/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization.readonly/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src"/> <classpathentry kind="output" path="bin"/> diff --git a/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization.readonly/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization.readonly/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization.readonly/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization.readonly/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -12,7 +12,7 @@ org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 diff --git a/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization.readonly/META-INF/MANIFEST.MF b/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization.readonly/META-INF/MANIFEST.MF index c3ea6f38d94..a7812234de5 100644 --- a/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization.readonly/META-INF/MANIFEST.MF +++ b/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization.readonly/META-INF/MANIFEST.MF @@ -6,11 +6,11 @@ Bundle-Version: 2.1.0.qualifier Bundle-ClassPath: . Bundle-Vendor: %providerName Bundle-Localization: plugin -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Require-Bundle: org.eclipse.gmf.runtime.emf.type.core;bundle-version="[1.9.0,2.0.0)", org.eclipse.papyrus.infra.core;bundle-version="[4.0.0,5.0.0)", org.eclipse.papyrus.infra.internationalization;bundle-version="[2.0.0,3.0.0)", org.eclipse.uml2.types;bundle-version="[2.5.0,3.0.0)" Bundle-ActivationPolicy: lazy -Import-Package: com.google.common.base;version="[30.1.0, 31.0.0)" +Import-Package: com.google.common.base;version="[33.1.0,33.2.0)" Automatic-Module-Name: org.eclipse.papyrus.infra.internationalization.readonly diff --git a/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization.ui/.classpath b/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization.ui/.classpath index e801ebfb468..81fe078c20c 100644 --- a/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization.ui/.classpath +++ b/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization.ui/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src"/> <classpathentry kind="output" path="bin"/> diff --git a/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization.ui/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization.ui/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization.ui/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization.ui/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -12,7 +12,7 @@ org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 diff --git a/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization.ui/META-INF/MANIFEST.MF b/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization.ui/META-INF/MANIFEST.MF index 89e976b9211..91e130905ae 100644 --- a/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization.ui/META-INF/MANIFEST.MF +++ b/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization.ui/META-INF/MANIFEST.MF @@ -6,7 +6,7 @@ Bundle-Version: 2.0.0.qualifier Bundle-ClassPath: . Bundle-Vendor: %providerName Bundle-Localization: plugin -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.eclipse.papyrus.infra.internationalization.ui, org.eclipse.papyrus.infra.internationalization.ui.dialogs, org.eclipse.papyrus.infra.internationalization.ui.handlers diff --git a/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization.utils/.classpath b/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization.utils/.classpath index e801ebfb468..81fe078c20c 100644 --- a/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization.utils/.classpath +++ b/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization.utils/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src"/> <classpathentry kind="output" path="bin"/> diff --git a/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization.utils/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization.utils/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization.utils/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization.utils/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -12,7 +12,7 @@ org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 diff --git a/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization.utils/META-INF/MANIFEST.MF b/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization.utils/META-INF/MANIFEST.MF index 5a6ace909eb..2baadc51c95 100644 --- a/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization.utils/META-INF/MANIFEST.MF +++ b/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization.utils/META-INF/MANIFEST.MF @@ -6,7 +6,7 @@ Bundle-Version: 2.0.0.qualifier Bundle-ClassPath: . Bundle-Vendor: %providerName Bundle-Localization: plugin -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.eclipse.papyrus.infra.internationalization.utils.commands, org.eclipse.papyrus.infra.internationalization.utils.utils Require-Bundle: org.eclipse.gmf.runtime.emf.type.core;bundle-version="[1.9.0,2.0.0)", diff --git a/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization/.classpath b/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization/.classpath index 9404e3d0f26..ee87847c66c 100644 --- a/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization/.classpath +++ b/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization/.classpath @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> <classpathentry kind="src" path="src-gen"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src"/> <classpathentry kind="output" path="bin"/> diff --git a/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -12,7 +12,7 @@ org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 diff --git a/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization/META-INF/MANIFEST.MF b/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization/META-INF/MANIFEST.MF index c4671010599..cbaaee0db79 100644 --- a/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization/META-INF/MANIFEST.MF +++ b/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization/META-INF/MANIFEST.MF @@ -6,7 +6,7 @@ Bundle-Version: 2.1.0.qualifier Bundle-ClassPath: . Bundle-Vendor: %providerName Bundle-Localization: plugin -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.eclipse.papyrus.infra.internationalization, org.eclipse.papyrus.infra.internationalization.commands, org.eclipse.papyrus.infra.internationalization.helper, @@ -28,6 +28,6 @@ Require-Bundle: org.eclipse.gmf.runtime.emf.type.core;bundle-version="[1.9.0,2.0 org.eclipse.uml2.types;bundle-version="[2.5.0,3.0.0)" Bundle-ActivationPolicy: lazy Bundle-Activator: org.eclipse.papyrus.infra.internationalization.Activator -Import-Package: com.google.common.base;version="[30.1.0, 31.0.0)", - com.google.common.collect;version="[30.1.0, 31.0.0)" +Import-Package: com.google.common.base;version="[33.1.0,33.2.0)", + com.google.common.collect;version="[33.1.0,33.2.0)" Automatic-Module-Name: org.eclipse.papyrus.infra.internationalization diff --git a/plugins/infra/misc/org.eclipse.papyrus.infra.guava/.classpath b/plugins/infra/misc/org.eclipse.papyrus.infra.guava/.classpath index e801ebfb468..81fe078c20c 100755 --- a/plugins/infra/misc/org.eclipse.papyrus.infra.guava/.classpath +++ b/plugins/infra/misc/org.eclipse.papyrus.infra.guava/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src"/> <classpathentry kind="output" path="bin"/> diff --git a/plugins/infra/misc/org.eclipse.papyrus.infra.guava/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/misc/org.eclipse.papyrus.infra.guava/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/infra/misc/org.eclipse.papyrus.infra.guava/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/infra/misc/org.eclipse.papyrus.infra.guava/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -12,7 +12,7 @@ org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 diff --git a/plugins/infra/misc/org.eclipse.papyrus.infra.guava/META-INF/MANIFEST.MF b/plugins/infra/misc/org.eclipse.papyrus.infra.guava/META-INF/MANIFEST.MF index 543ea217174..334fcb784da 100755 --- a/plugins/infra/misc/org.eclipse.papyrus.infra.guava/META-INF/MANIFEST.MF +++ b/plugins/infra/misc/org.eclipse.papyrus.infra.guava/META-INF/MANIFEST.MF @@ -1,5 +1,5 @@ Manifest-Version: 1.0 -Require-Bundle: com.google.guava;bundle-version="[30.1.0,31.0.0)", +Require-Bundle: com.google.guava;bundle-version="[33.1.0,33.2.0)", org.eclipse.osgi;bundle-version="[3.0.0,4.0.0)", org.eclipse.papyrus.infra.core.log;bundle-version="[2.0.0,3.0.0)", org.eclipse.core.runtime;bundle-version="[3.18.0,4.0.0)" @@ -12,9 +12,9 @@ Bundle-Localization: plugin Bundle-ManifestVersion: 2 Bundle-Activator: org.eclipse.papyrus.infra.guava.Activator Bundle-SymbolicName: org.eclipse.papyrus.infra.guava;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 -Import-Package: com.google.common.base;version="[30.1.0, 31.0.0)", - com.google.common.collect;version="[30.1.0, 31.0.0)", - com.google.common.reflect;version="[30.1.0, 31.0.0)", - com.google.common.util.concurrent;version="[30.1.0, 31.0.0)" +Bundle-RequiredExecutionEnvironment: JavaSE-17 +Import-Package: com.google.common.base;version="[33.1.0,33.2.0)", + com.google.common.collect;version="[33.1.0,33.2.0)", + com.google.common.reflect;version="[33.1.0,33.2.0)", + com.google.common.util.concurrent;version="[33.1.0,33.2.0)" Automatic-Module-Name: org.eclipse.papyrus.infra.guava diff --git a/plugins/infra/misc/org.eclipse.papyrus.infra.hyperlink/.classpath b/plugins/infra/misc/org.eclipse.papyrus.infra.hyperlink/.classpath index e801ebfb468..81fe078c20c 100644 --- a/plugins/infra/misc/org.eclipse.papyrus.infra.hyperlink/.classpath +++ b/plugins/infra/misc/org.eclipse.papyrus.infra.hyperlink/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src"/> <classpathentry kind="output" path="bin"/> diff --git a/plugins/infra/misc/org.eclipse.papyrus.infra.hyperlink/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/misc/org.eclipse.papyrus.infra.hyperlink/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/infra/misc/org.eclipse.papyrus.infra.hyperlink/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/infra/misc/org.eclipse.papyrus.infra.hyperlink/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -12,7 +12,7 @@ org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 diff --git a/plugins/infra/misc/org.eclipse.papyrus.infra.hyperlink/META-INF/MANIFEST.MF b/plugins/infra/misc/org.eclipse.papyrus.infra.hyperlink/META-INF/MANIFEST.MF index 4f4fed4ea5d..5914c2392ca 100644 --- a/plugins/infra/misc/org.eclipse.papyrus.infra.hyperlink/META-INF/MANIFEST.MF +++ b/plugins/infra/misc/org.eclipse.papyrus.infra.hyperlink/META-INF/MANIFEST.MF @@ -34,5 +34,5 @@ Bundle-ManifestVersion: 2 Bundle-Activator: org.eclipse.papyrus.infra.hyperlink.Activator Bundle-Description: %pluginDescription Bundle-SymbolicName: org.eclipse.papyrus.infra.hyperlink;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.infra.hyperlink diff --git a/plugins/infra/misc/org.eclipse.papyrus.infra.psf/.classpath b/plugins/infra/misc/org.eclipse.papyrus.infra.psf/.classpath index e801ebfb468..81fe078c20c 100644 --- a/plugins/infra/misc/org.eclipse.papyrus.infra.psf/.classpath +++ b/plugins/infra/misc/org.eclipse.papyrus.infra.psf/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src"/> <classpathentry kind="output" path="bin"/> diff --git a/plugins/infra/misc/org.eclipse.papyrus.infra.psf/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/misc/org.eclipse.papyrus.infra.psf/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/infra/misc/org.eclipse.papyrus.infra.psf/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/infra/misc/org.eclipse.papyrus.infra.psf/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -12,7 +12,7 @@ org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 diff --git a/plugins/infra/misc/org.eclipse.papyrus.infra.psf/META-INF/MANIFEST.MF b/plugins/infra/misc/org.eclipse.papyrus.infra.psf/META-INF/MANIFEST.MF index 4605bc064c6..0a189e09aed 100644 --- a/plugins/infra/misc/org.eclipse.papyrus.infra.psf/META-INF/MANIFEST.MF +++ b/plugins/infra/misc/org.eclipse.papyrus.infra.psf/META-INF/MANIFEST.MF @@ -13,5 +13,5 @@ Bundle-Name: Papyrus PSF support Bundle-Activator: org.eclipse.papyrus.infra.psf.Activator Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.infra.psf;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.infra.psf diff --git a/plugins/infra/misc/org.eclipse.papyrus.infra.sync/.classpath b/plugins/infra/misc/org.eclipse.papyrus.infra.sync/.classpath index e801ebfb468..81fe078c20c 100755 --- a/plugins/infra/misc/org.eclipse.papyrus.infra.sync/.classpath +++ b/plugins/infra/misc/org.eclipse.papyrus.infra.sync/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src"/> <classpathentry kind="output" path="bin"/> diff --git a/plugins/infra/misc/org.eclipse.papyrus.infra.sync/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/misc/org.eclipse.papyrus.infra.sync/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/infra/misc/org.eclipse.papyrus.infra.sync/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/infra/misc/org.eclipse.papyrus.infra.sync/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -12,7 +12,7 @@ org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 diff --git a/plugins/infra/misc/org.eclipse.papyrus.infra.sync/META-INF/MANIFEST.MF b/plugins/infra/misc/org.eclipse.papyrus.infra.sync/META-INF/MANIFEST.MF index 9df0636da3c..14c22b8ba95 100755 --- a/plugins/infra/misc/org.eclipse.papyrus.infra.sync/META-INF/MANIFEST.MF +++ b/plugins/infra/misc/org.eclipse.papyrus.infra.sync/META-INF/MANIFEST.MF @@ -19,9 +19,9 @@ Bundle-Localization: plugin Bundle-ManifestVersion: 2 Bundle-Activator: org.eclipse.papyrus.infra.sync.Activator Bundle-SymbolicName: org.eclipse.papyrus.infra.sync;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 -Import-Package: com.google.common.base;version="[30.1.0, 31.0.0)", - com.google.common.collect;version="[30.1.0, 31.0.0)", - com.google.common.reflect;version="[30.1.0, 31.0.0)", - com.google.common.util.concurrent;version="[30.1.0, 31.0.0)" +Bundle-RequiredExecutionEnvironment: JavaSE-17 +Import-Package: com.google.common.base;version="[33.1.0,33.2.0)", + com.google.common.collect;version="[33.1.0,33.2.0)", + com.google.common.reflect;version="[33.1.0,33.2.0)", + com.google.common.util.concurrent;version="[33.1.0,33.2.0)" Automatic-Module-Name: org.eclipse.papyrus.infra.sync diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/.classpath b/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/.classpath index e801ebfb468..81fe078c20c 100644 --- a/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/.classpath +++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src"/> <classpathentry kind="output" path="bin"/> diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -12,7 +12,7 @@ org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/META-INF/MANIFEST.MF b/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/META-INF/MANIFEST.MF index ae412a0b206..911213dd42b 100644 --- a/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/META-INF/MANIFEST.MF +++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/META-INF/MANIFEST.MF @@ -40,5 +40,5 @@ Bundle-Activator: org.eclipse.papyrus.infra.emf.nattable.Activator Bundle-ManifestVersion: 2 Bundle-Description: %pluginDescription Bundle-SymbolicName: org.eclipse.papyrus.infra.emf.nattable;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.infra.emf.nattable diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/.classpath b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/.classpath index e801ebfb468..81fe078c20c 100644 --- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/.classpath +++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src"/> <classpathentry kind="output" path="bin"/> diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -12,7 +12,7 @@ org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/META-INF/MANIFEST.MF b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/META-INF/MANIFEST.MF index cd5d9d04786..2a3acb1cb78 100644 --- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/META-INF/MANIFEST.MF +++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/META-INF/MANIFEST.MF @@ -50,6 +50,6 @@ Bundle-Name: %Bundle-Name Bundle-Activator: org.eclipse.papyrus.infra.nattable.common.Activator Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.infra.nattable.common;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 -Import-Package: com.google.common.collect;version="[30.1.0, 31.0.0)" +Bundle-RequiredExecutionEnvironment: JavaSE-17 +Import-Package: com.google.common.collect;version="[33.1.0,33.2.0)" Automatic-Module-Name: org.eclipse.papyrus.infra.nattable.common diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.controlmode/.classpath b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.controlmode/.classpath index e801ebfb468..81fe078c20c 100644 --- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.controlmode/.classpath +++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.controlmode/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src"/> <classpathentry kind="output" path="bin"/> diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.controlmode/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.controlmode/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.controlmode/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.controlmode/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -12,7 +12,7 @@ org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.controlmode/META-INF/MANIFEST.MF b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.controlmode/META-INF/MANIFEST.MF index 8a95544bb30..32a5f79320f 100644 --- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.controlmode/META-INF/MANIFEST.MF +++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.controlmode/META-INF/MANIFEST.MF @@ -21,7 +21,7 @@ Bundle-Activator: org.eclipse.papyrus.infra.nattable.controlmode.Activator Bundle-ManifestVersion: 2 Bundle-Description: %pluginDescription Bundle-SymbolicName: org.eclipse.papyrus.infra.nattable.controlmode;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 -Import-Package: com.google.common.base;version="[30.1.0, 31.0.0)", - com.google.common.collect;version="[30.1.0, 31.0.0)" +Bundle-RequiredExecutionEnvironment: JavaSE-17 +Import-Package: com.google.common.base;version="[33.1.0,33.2.0)", + com.google.common.collect;version="[33.1.0,33.2.0)" Automatic-Module-Name: org.eclipse.papyrus.infra.nattable.controlmode diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.gmfdiag/.classpath b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.gmfdiag/.classpath index e801ebfb468..81fe078c20c 100644 --- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.gmfdiag/.classpath +++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.gmfdiag/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src"/> <classpathentry kind="output" path="bin"/> diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.gmfdiag/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.gmfdiag/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.gmfdiag/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.gmfdiag/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -12,7 +12,7 @@ org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.gmfdiag/META-INF/MANIFEST.MF b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.gmfdiag/META-INF/MANIFEST.MF index b44181d8945..69be6169e3f 100644 --- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.gmfdiag/META-INF/MANIFEST.MF +++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.gmfdiag/META-INF/MANIFEST.MF @@ -15,7 +15,7 @@ Bundle-Name: %Bundle-Name Bundle-Activator: org.eclipse.papyrus.infra.nattable.internal.gmfdiag.Activator Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.infra.nattable.gmfdiag;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.eclipse.papyrus.infra.nattable.internal.gmfdiag;x-internal:=true, org.eclipse.papyrus.infra.nattable.internal.gmfdiag.strategy.paste;x-internal:=true Automatic-Module-Name: org.eclipse.papyrus.infra.nattable.gmfdiag diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/.classpath b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/.classpath index bb642933501..f574c0cbd4d 100644 --- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/.classpath +++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src-gen"/> <classpathentry kind="src" path="src"/> diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -12,7 +12,7 @@ org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/META-INF/MANIFEST.MF b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/META-INF/MANIFEST.MF index 7afb4ef9562..686ba12c3a0 100644 --- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/META-INF/MANIFEST.MF +++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/META-INF/MANIFEST.MF @@ -28,5 +28,5 @@ Bundle-Activator: org.eclipse.papyrus.infra.nattable.model.nattable.provider.Nat Bundle-ManifestVersion: 2 Bundle-Description: %pluginDescription Bundle-SymbolicName: org.eclipse.papyrus.infra.nattable.model.edit;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.infra.nattable.model.edit diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/.classpath b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/.classpath index e9c6eafb6fa..abaf32b3e99 100644 --- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/.classpath +++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src-gen"/> <classpathentry kind="output" path="bin"/> diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -12,7 +12,7 @@ org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/META-INF/MANIFEST.MF b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/META-INF/MANIFEST.MF index aa8f01390b7..a045cb692ef 100644 --- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/META-INF/MANIFEST.MF +++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/META-INF/MANIFEST.MF @@ -34,5 +34,5 @@ Bundle-Activator: org.eclipse.papyrus.infra.nattable.model.nattable.presentation Bundle-ManifestVersion: 2 Bundle-Description: %pluginDescription Bundle-SymbolicName: org.eclipse.papyrus.infra.nattable.model.editor;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.infra.nattable.model.editor diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/.classpath b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/.classpath index bb642933501..f574c0cbd4d 100644 --- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/.classpath +++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src-gen"/> <classpathentry kind="src" path="src"/> diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -12,7 +12,7 @@ org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/META-INF/MANIFEST.MF b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/META-INF/MANIFEST.MF index d1851501a25..25309315d7e 100644 --- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/META-INF/MANIFEST.MF +++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/META-INF/MANIFEST.MF @@ -53,5 +53,5 @@ Bundle-Activator: org.eclipse.papyrus.infra.nattable.model.Activator Bundle-ManifestVersion: 2 Bundle-Description: %pluginDescription Bundle-SymbolicName: org.eclipse.papyrus.infra.nattable.model;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.infra.nattable.model diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/.classpath b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/.classpath index e801ebfb468..81fe078c20c 100644 --- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/.classpath +++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src"/> <classpathentry kind="output" path="bin"/> diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -12,7 +12,7 @@ org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/META-INF/MANIFEST.MF b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/META-INF/MANIFEST.MF index 73c734449ed..82f4ac07d60 100644 --- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/META-INF/MANIFEST.MF +++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/META-INF/MANIFEST.MF @@ -7,7 +7,7 @@ Export-Package: org.eclipse.papyrus.infra.nattable.modelexplorer, Bundle-ActivationPolicy: lazy Bundle-ClassPath: . Bundle-Name: %Bundle-Name -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Require-Bundle: org.eclipse.core.expressions;bundle-version="[3.6.0,4.0.0)", org.eclipse.emf.databinding;bundle-version="[1.5.0,2.0.0)", org.eclipse.emf.edit.ui;bundle-version="[2.18.0,3.0.0)", diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/.classpath b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/.classpath index e801ebfb468..81fe078c20c 100644 --- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/.classpath +++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src"/> <classpathentry kind="output" path="bin"/> diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -12,7 +12,7 @@ org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/META-INF/MANIFEST.MF b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/META-INF/MANIFEST.MF index 71c362527f5..36b7cdca453 100644 --- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/META-INF/MANIFEST.MF +++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/META-INF/MANIFEST.MF @@ -42,5 +42,5 @@ Bundle-Activator: org.eclipse.papyrus.infra.nattable.properties.Activator Bundle-ManifestVersion: 2 Bundle-Description: %pluginDescription Bundle-SymbolicName: org.eclipse.papyrus.infra.nattable.properties;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.infra.nattable.properties diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation.edit/.classpath b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation.edit/.classpath index 004db3fba20..2377d859931 100644 --- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation.edit/.classpath +++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation.edit/.classpath @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> <classpathentry kind="src" path="src-gen"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="output" path="bin"/> </classpath> diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation.edit/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation.edit/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation.edit/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation.edit/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -12,7 +12,7 @@ org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation.edit/META-INF/MANIFEST.MF b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation.edit/META-INF/MANIFEST.MF index 1099103a9e2..40ef8a0b1e6 100644 --- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation.edit/META-INF/MANIFEST.MF +++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation.edit/META-INF/MANIFEST.MF @@ -7,7 +7,7 @@ Bundle-ClassPath: . Bundle-Activator: org.eclipse.papyrus.infra.nattable.representation.provider.RepresentationEditPlugin$Implementation Bundle-Vendor: %providerName Bundle-Localization: plugin -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.eclipse.papyrus.infra.nattable.representation.provider Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.18.0,4.0.0)", org.eclipse.emf.ecore.xmi;bundle-version="[2.16.0,3.0.0)", diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation/.classpath b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation/.classpath index 004db3fba20..2377d859931 100644 --- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation/.classpath +++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation/.classpath @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> <classpathentry kind="src" path="src-gen"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="output" path="bin"/> </classpath> diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -12,7 +12,7 @@ org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation/META-INF/MANIFEST.MF b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation/META-INF/MANIFEST.MF index 58b882c2745..c6082a666a2 100644 --- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation/META-INF/MANIFEST.MF +++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation/META-INF/MANIFEST.MF @@ -6,7 +6,7 @@ Bundle-Version: 3.0.0.qualifier Bundle-ClassPath: . Bundle-Vendor: %providerName Bundle-Localization: plugin -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.eclipse.papyrus.infra.nattable.representation, org.eclipse.papyrus.infra.nattable.representation.impl, org.eclipse.papyrus.infra.nattable.representation.util diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.config/.classpath b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.config/.classpath index e801ebfb468..81fe078c20c 100644 --- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.config/.classpath +++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.config/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src"/> <classpathentry kind="output" path="bin"/> diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.config/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.config/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.config/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.config/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -12,7 +12,7 @@ org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.config/META-INF/MANIFEST.MF b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.config/META-INF/MANIFEST.MF index 198563f4724..95fe1dea05f 100644 --- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.config/META-INF/MANIFEST.MF +++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.config/META-INF/MANIFEST.MF @@ -32,5 +32,5 @@ Bundle-Name: %Bundle-Name Bundle-Activator: org.eclipse.papyrus.infra.nattable.views.config.Activator Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.infra.nattable.views.config;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.infra.nattable.views.config diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.editor/.classpath b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.editor/.classpath index bc3587db485..a7a673fa7ab 100644 --- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.editor/.classpath +++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.editor/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="output" path="bin"/> </classpath> diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.editor/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.editor/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.editor/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.editor/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -12,7 +12,7 @@ org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.editor/META-INF/MANIFEST.MF b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.editor/META-INF/MANIFEST.MF index 0a85db3f499..2ec83a16034 100644 --- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.editor/META-INF/MANIFEST.MF +++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.editor/META-INF/MANIFEST.MF @@ -5,5 +5,5 @@ Bundle-Version: 2.0.0.qualifier Bundle-Name: %Bundle-Name Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.infra.nattable.views.editor;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.infra.nattable.views.editor diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/.classpath b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/.classpath index e801ebfb468..81fe078c20c 100644 --- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/.classpath +++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src"/> <classpathentry kind="output" path="bin"/> diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -12,7 +12,7 @@ org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/META-INF/MANIFEST.MF b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/META-INF/MANIFEST.MF index c628a45b285..f1ddb451e90 100644 --- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/META-INF/MANIFEST.MF +++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/META-INF/MANIFEST.MF @@ -56,7 +56,6 @@ Export-Package: org.eclipse.papyrus.infra.nattable, org.eclipse.papyrus.infra.nattable.wizard, org.eclipse.papyrus.infra.nattable.wizard.pages Require-Bundle: ca.odell.glazedlists;bundle-version="[1.9.0,2.0.0)", - javax.inject;bundle-version="[1.0.0,2.0.0)", org.eclipse.core.expressions;bundle-version="[3.6.0,4.0.0)", org.eclipse.draw2d;bundle-version="[3.10.0,4.0.0)", org.eclipse.emf.databinding;bundle-version="[1.5.0,2.0.0)", @@ -92,12 +91,12 @@ Require-Bundle: ca.odell.glazedlists;bundle-version="[1.9.0,2.0.0)", org.eclipse.uml2.types;bundle-version="[2.5.0,3.0.0)" Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy -Bundle-Version: 7.1.0.qualifier +Bundle-Version: 7.1.100.qualifier Bundle-Name: %Bundle-Name Bundle-Activator: org.eclipse.papyrus.infra.nattable.Activator Bundle-ManifestVersion: 2 Bundle-Description: %pluginDescription Bundle-SymbolicName: org.eclipse.papyrus.infra.nattable;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 -Import-Package: com.google.common.collect;version="[30.1.0, 31.0.0)" +Bundle-RequiredExecutionEnvironment: JavaSE-17 +Import-Package: com.google.common.collect;version="[33.1.0,33.2.0)" Automatic-Module-Name: org.eclipse.papyrus.infra.nattable diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/pom.xml b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/pom.xml index 731eab8f9d9..3663c176e91 100644 --- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/pom.xml +++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/pom.xml @@ -9,6 +9,6 @@ <version>0.0.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.papyrus.infra.nattable</artifactId> - <version>7.1.0-SNAPSHOT</version> + <version>7.1.100-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project>
\ No newline at end of file diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/messages/Messages.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/messages/Messages.java index 7fc0c264431..fbec094c5f3 100755 --- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/messages/Messages.java +++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/messages/Messages.java @@ -1,5 +1,5 @@ /***************************************************************************** - * Copyright (c) 2012, 2017 CEA LIST. + * Copyright (c) 2012, 2017, 2023 CEA LIST. * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 @@ -11,11 +11,10 @@ * Contributors: * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation * Thanh Liem PHAN (ALL4TEC) thanhliem.phan@all4tec.net - Bug 417095, 515806 + * Ansgar Radermacher - bug 582492, removed unused javax.inject import *****************************************************************************/ package org.eclipse.papyrus.infra.nattable.messages; -import javax.inject.Singleton; - import org.eclipse.osgi.util.NLS; public class Messages extends NLS { diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/wizard/ConfigureTableCategoriesWizard.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/wizard/ConfigureTableCategoriesWizard.java index c0a08fb9d2b..244d41a9676 100755 --- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/wizard/ConfigureTableCategoriesWizard.java +++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/wizard/ConfigureTableCategoriesWizard.java @@ -1,6 +1,6 @@ /***************************************************************************** - * Copyright (c) 2014 CEA LIST and others. - * + * Copyright (c) 2014, 2022 CEA LIST and others. + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at @@ -11,7 +11,7 @@ * Contributors: * CEA LIST - Initial API and implementation * Nicolas FAUVERGUE (ALL4TEC) nicolas.fauvergue@all4tec.ne - Bug 455060 - * + * Vincent LORENZO (CEA LIST) vincent.lorenzo@cea.fr - Bug 579399 *****************************************************************************/ package org.eclipse.papyrus.infra.nattable.wizard; @@ -142,7 +142,7 @@ public class ConfigureTableCategoriesWizard extends AbstractTableWizard implemen @Override public boolean isValidValue(Object element) { // EMF dependency, must not be done here, it should be better with a new content provider service - return element instanceof EReference && ((EReference) element).isMany() && element != EcorePackage.eINSTANCE.getEModelElement_EAnnotations(); + return element instanceof EReference && element != EcorePackage.eINSTANCE.getEModelElement_EAnnotations(); } }; diff --git a/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.edit/.classpath b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.edit/.classpath index e9c6eafb6fa..abaf32b3e99 100644 --- a/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.edit/.classpath +++ b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.edit/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src-gen"/> <classpathentry kind="output" path="bin"/> diff --git a/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.edit/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.edit/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.edit/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.edit/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -12,7 +12,7 @@ org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 diff --git a/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.edit/META-INF/MANIFEST.MF b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.edit/META-INF/MANIFEST.MF index 9c0669ba154..57a94dfd372 100644 --- a/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.edit/META-INF/MANIFEST.MF +++ b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.edit/META-INF/MANIFEST.MF @@ -17,5 +17,5 @@ Bundle-ManifestVersion: 2 Bundle-Activator: org.eclipse.papyrus.infra.newchild.elementcreationmenumodel.provider.ElementCreationMenuModelEditPlugin$Implementation Bundle-Description: %pluginDescription Bundle-SymbolicName: org.eclipse.papyrus.infra.newchild.edit;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.infra.newchild.edit diff --git a/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.editor/.classpath b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.editor/.classpath index e9c6eafb6fa..abaf32b3e99 100644 --- a/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.editor/.classpath +++ b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.editor/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src-gen"/> <classpathentry kind="output" path="bin"/> diff --git a/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.editor/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.editor/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.editor/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.editor/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -12,7 +12,7 @@ org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 diff --git a/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.editor/META-INF/MANIFEST.MF b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.editor/META-INF/MANIFEST.MF index a4749d8f692..661d9a38f60 100644 --- a/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.editor/META-INF/MANIFEST.MF +++ b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild.editor/META-INF/MANIFEST.MF @@ -16,5 +16,5 @@ Bundle-Localization: plugin Bundle-ManifestVersion: 2 Bundle-Activator: org.eclipse.papyrus.infra.newchild.elementcreationmenumodel.presentation.ElementCreationMenuModelEditorPlugin$Implementation Bundle-SymbolicName: org.eclipse.papyrus.infra.newchild.editor;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.infra.newchild.editor diff --git a/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/.classpath b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/.classpath index bb642933501..f574c0cbd4d 100644 --- a/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/.classpath +++ b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src-gen"/> <classpathentry kind="src" path="src"/> diff --git a/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -12,7 +12,7 @@ org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 diff --git a/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/META-INF/MANIFEST.MF b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/META-INF/MANIFEST.MF index 49e9a47078f..d9f6f42e1cc 100644 --- a/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/META-INF/MANIFEST.MF +++ b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/META-INF/MANIFEST.MF @@ -34,5 +34,5 @@ Bundle-ManifestVersion: 2 Bundle-Activator: org.eclipse.papyrus.infra.newchild.Activator Bundle-Description: %pluginDescription Bundle-SymbolicName: org.eclipse.papyrus.infra.newchild;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.infra.newchild diff --git a/plugins/infra/onefile/org.eclipse.papyrus.infra.onefile/.classpath b/plugins/infra/onefile/org.eclipse.papyrus.infra.onefile/.classpath index e801ebfb468..81fe078c20c 100644 --- a/plugins/infra/onefile/org.eclipse.papyrus.infra.onefile/.classpath +++ b/plugins/infra/onefile/org.eclipse.papyrus.infra.onefile/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src"/> <classpathentry kind="output" path="bin"/> diff --git a/plugins/infra/onefile/org.eclipse.papyrus.infra.onefile/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/onefile/org.eclipse.papyrus.infra.onefile/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/infra/onefile/org.eclipse.papyrus.infra.onefile/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/infra/onefile/org.eclipse.papyrus.infra.onefile/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -12,7 +12,7 @@ org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 diff --git a/plugins/infra/onefile/org.eclipse.papyrus.infra.onefile/META-INF/MANIFEST.MF b/plugins/infra/onefile/org.eclipse.papyrus.infra.onefile/META-INF/MANIFEST.MF index 93887eadd92..e0cb70c0013 100644 --- a/plugins/infra/onefile/org.eclipse.papyrus.infra.onefile/META-INF/MANIFEST.MF +++ b/plugins/infra/onefile/org.eclipse.papyrus.infra.onefile/META-INF/MANIFEST.MF @@ -8,11 +8,11 @@ Require-Bundle: org.eclipse.emf.transaction;bundle-version="[1.9.0,2.0.0)", org.eclipse.papyrus.infra.internationalization;bundle-version="[2.0.0,3.0.0)" Bundle-Vendor: %providerName Bundle-ActivationPolicy: lazy -Bundle-Version: 3.0.0.qualifier +Bundle-Version: 3.1.0.qualifier Bundle-Localization: plugin Bundle-Name: %pluginName Bundle-Activator: org.eclipse.papyrus.infra.onefile.Activator Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.infra.onefile;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.infra.onefile diff --git a/plugins/infra/onefile/org.eclipse.papyrus.infra.onefile/pom.xml b/plugins/infra/onefile/org.eclipse.papyrus.infra.onefile/pom.xml index e0a755aee0c..e752ddc3ec0 100644 --- a/plugins/infra/onefile/org.eclipse.papyrus.infra.onefile/pom.xml +++ b/plugins/infra/onefile/org.eclipse.papyrus.infra.onefile/pom.xml @@ -9,6 +9,6 @@ <version>0.0.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.papyrus.infra.onefile</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.1.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project>
\ No newline at end of file diff --git a/plugins/infra/onefile/org.eclipse.papyrus.infra.onefile/src/org/eclipse/papyrus/infra/onefile/utils/OneFileUtils.java b/plugins/infra/onefile/org.eclipse.papyrus.infra.onefile/src/org/eclipse/papyrus/infra/onefile/utils/OneFileUtils.java index bbffed52975..a3541907725 100644 --- a/plugins/infra/onefile/org.eclipse.papyrus.infra.onefile/src/org/eclipse/papyrus/infra/onefile/utils/OneFileUtils.java +++ b/plugins/infra/onefile/org.eclipse.papyrus.infra.onefile/src/org/eclipse/papyrus/infra/onefile/utils/OneFileUtils.java @@ -1,5 +1,5 @@ /***************************************************************************** - * Copyright (c) 2011, 2016 Atos Origin Integration, Christian W. Damus, and others. + * Copyright (c) 2011, 2016, 2022 Atos Origin Integration, Christian W. Damus, and others. * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 @@ -12,11 +12,14 @@ * Tristan Faure (Atos Origin Integration) tristan.faure@atosorigin.com - Initial API and implementation * Christian W. Damus - bug 485220 * Nicolas FAUVERGUE (ALL4TEC) nicolas.fauvergue@all4tec.net - Bug 496905 - * + * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Bug 578434 *****************************************************************************/ package org.eclipse.papyrus.infra.onefile.utils; import java.util.ArrayList; +import java.util.Collection; +import java.util.Iterator; +import java.util.List; import org.eclipse.core.resources.IContainer; import org.eclipse.core.resources.IFile; @@ -59,7 +62,7 @@ public class OneFileUtils { return null; } final String substring = getFileNameForDi(fileName, parent); - IFile file = parent.getFile(new Path(substring + "." + DiModel.DI_FILE_EXTENSION)); + IFile file = parent.getFile(new Path(substring + "." + DiModel.DI_FILE_EXTENSION)); //$NON-NLS-1$ if (file.exists()) { return file; } @@ -138,6 +141,24 @@ public class OneFileUtils { } /** + * @param resources + * a list of {@link IResource} + * @return <code>true</code> if the list contains a di file + * @since 3.1 + */ + public static boolean containsDi(final Collection<IResource> resources) { + final Iterator<IResource> iter = resources.iterator(); + while (iter.hasNext()) { + final IResource current = iter.next(); + if (isDi(current)) { + return true; + } + } + return false; + + } + + /** * Returns the name without the extension of the file * * @param res @@ -180,7 +201,7 @@ public class OneFileUtils { } public static IFile[] getAssociatedFiles(IPapyrusFile papyrusFile) { - ArrayList<IFile> files = new ArrayList<IFile>(); + List<IFile> files = new ArrayList<>(); for (IResource res : papyrusFile.getAssociatedResources()) { if (res instanceof IFile) { files.add((IFile) res); diff --git a/plugins/infra/properties/org.eclipse.papyrus.infra.properties.edit/.classpath b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.edit/.classpath index bb642933501..f574c0cbd4d 100644 --- a/plugins/infra/properties/org.eclipse.papyrus.infra.properties.edit/.classpath +++ b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.edit/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src-gen"/> <classpathentry kind="src" path="src"/> diff --git a/plugins/infra/properties/org.eclipse.papyrus.infra.properties.edit/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.edit/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/infra/properties/org.eclipse.papyrus.infra.properties.edit/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.edit/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -12,7 +12,7 @@ org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 diff --git a/plugins/infra/properties/org.eclipse.papyrus.infra.properties.edit/META-INF/MANIFEST.MF b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.edit/META-INF/MANIFEST.MF index 15669bd3de0..d9ed2413202 100644 --- a/plugins/infra/properties/org.eclipse.papyrus.infra.properties.edit/META-INF/MANIFEST.MF +++ b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.edit/META-INF/MANIFEST.MF @@ -22,5 +22,5 @@ Bundle-Name: %pluginName Bundle-Activator: org.eclipse.papyrus.infra.properties.environment.provider.PropertiesEditPlugin$Implementation Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.infra.properties.edit;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.infra.properties.edit diff --git a/plugins/infra/properties/org.eclipse.papyrus.infra.properties.editor/.classpath b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.editor/.classpath index e9c6eafb6fa..abaf32b3e99 100644 --- a/plugins/infra/properties/org.eclipse.papyrus.infra.properties.editor/.classpath +++ b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.editor/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src-gen"/> <classpathentry kind="output" path="bin"/> diff --git a/plugins/infra/properties/org.eclipse.papyrus.infra.properties.editor/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.editor/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/infra/properties/org.eclipse.papyrus.infra.properties.editor/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.editor/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -12,7 +12,7 @@ org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 diff --git a/plugins/infra/properties/org.eclipse.papyrus.infra.properties.editor/META-INF/MANIFEST.MF b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.editor/META-INF/MANIFEST.MF index 7c3de276bc6..7ad0aea91c0 100644 --- a/plugins/infra/properties/org.eclipse.papyrus.infra.properties.editor/META-INF/MANIFEST.MF +++ b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.editor/META-INF/MANIFEST.MF @@ -22,5 +22,5 @@ Bundle-Name: %pluginName Bundle-Activator: org.eclipse.papyrus.infra.properties.environment.presentation.PropertiesEditorPlugin$Implementation Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.infra.properties.editor;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.infra.properties.editor diff --git a/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/.classpath b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/.classpath index e801ebfb468..81fe078c20c 100644 --- a/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/.classpath +++ b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src"/> <classpathentry kind="output" path="bin"/> diff --git a/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -12,7 +12,7 @@ org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 diff --git a/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/META-INF/MANIFEST.MF b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/META-INF/MANIFEST.MF index 8cd07d2e52e..57d15507f16 100644 --- a/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/META-INF/MANIFEST.MF +++ b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/META-INF/MANIFEST.MF @@ -19,7 +19,7 @@ Bundle-ActivationPolicy: lazy Bundle-ClassPath: . Bundle-Name: %pluginName Bundle-Localization: plugin -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Require-Bundle: org.eclipse.core.databinding.property;bundle-version="[1.8.0,2.0.0)", org.eclipse.draw2d;bundle-version="[3.10.0,4.0.0)", org.eclipse.emf.databinding;bundle-version="[1.5.0,2.0.0)", diff --git a/plugins/infra/properties/org.eclipse.papyrus.infra.properties/.classpath b/plugins/infra/properties/org.eclipse.papyrus.infra.properties/.classpath index bb642933501..f574c0cbd4d 100644 --- a/plugins/infra/properties/org.eclipse.papyrus.infra.properties/.classpath +++ b/plugins/infra/properties/org.eclipse.papyrus.infra.properties/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src-gen"/> <classpathentry kind="src" path="src"/> diff --git a/plugins/infra/properties/org.eclipse.papyrus.infra.properties/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/properties/org.eclipse.papyrus.infra.properties/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/infra/properties/org.eclipse.papyrus.infra.properties/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/infra/properties/org.eclipse.papyrus.infra.properties/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -12,7 +12,7 @@ org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 diff --git a/plugins/infra/properties/org.eclipse.papyrus.infra.properties/META-INF/MANIFEST.MF b/plugins/infra/properties/org.eclipse.papyrus.infra.properties/META-INF/MANIFEST.MF index d15b6db8fb7..6c7a593a9d6 100644 --- a/plugins/infra/properties/org.eclipse.papyrus.infra.properties/META-INF/MANIFEST.MF +++ b/plugins/infra/properties/org.eclipse.papyrus.infra.properties/META-INF/MANIFEST.MF @@ -30,6 +30,6 @@ Bundle-Localization: plugin Bundle-ManifestVersion: 2 Bundle-Description: %pluginDescription Bundle-SymbolicName: org.eclipse.papyrus.infra.properties;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-Activator: org.eclipse.papyrus.infra.properties.internal.InfraPropertiesPlugin Automatic-Module-Name: org.eclipse.papyrus.infra.properties diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.architecture/.classpath b/plugins/infra/services/org.eclipse.papyrus.infra.services.architecture/.classpath index e801ebfb468..81fe078c20c 100644 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.architecture/.classpath +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.architecture/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src"/> <classpathentry kind="output" path="bin"/> diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.architecture/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/services/org.eclipse.papyrus.infra.services.architecture/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.architecture/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.architecture/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -12,7 +12,7 @@ org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.architecture/META-INF/MANIFEST.MF b/plugins/infra/services/org.eclipse.papyrus.infra.services.architecture/META-INF/MANIFEST.MF index 6179a54f758..c743a771986 100644 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.architecture/META-INF/MANIFEST.MF +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.architecture/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.papyrus.infra.services.architecture;singleton:=true Bundle-Version: 2.0.0.qualifier Bundle-Localization: plugin -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.eclipse.papyrus.infra.services.architecture Require-Bundle: org.eclipse.gmf.runtime.emf.type.core;bundle-version="[1.9.0,2.0.0)", org.eclipse.papyrus.infra.architecture;bundle-version="[3.0.0,4.0.0)", diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.history/.classpath b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.history/.classpath index e801ebfb468..81fe078c20c 100644 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.history/.classpath +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.history/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src"/> <classpathentry kind="output" path="bin"/> diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.history/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.history/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.history/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.history/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -12,7 +12,7 @@ org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.history/META-INF/MANIFEST.MF b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.history/META-INF/MANIFEST.MF index b6e2a524b42..342aa8e3c4b 100644 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.history/META-INF/MANIFEST.MF +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.history/META-INF/MANIFEST.MF @@ -16,5 +16,5 @@ Bundle-Localization: plugin Bundle-Name: %pluginName Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.infra.services.controlmode.history;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.infra.services.controlmode.history diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/.classpath b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/.classpath index e801ebfb468..81fe078c20c 100644 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/.classpath +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src"/> <classpathentry kind="output" path="bin"/> diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -12,7 +12,7 @@ org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/META-INF/MANIFEST.MF b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/META-INF/MANIFEST.MF index c9c3ad06fb7..8fd503dcb0d 100644 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/META-INF/MANIFEST.MF +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/META-INF/MANIFEST.MF @@ -35,8 +35,8 @@ Bundle-Name: %pluginName Bundle-Activator: org.eclipse.papyrus.infra.services.controlmode.ControlModePlugin Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.infra.services.controlmode;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 -Import-Package: com.google.common.base;version="[30.1.0, 31.0.0)", - com.google.common.collect;version="[30.1.0, 31.0.0)", - com.google.common.util.concurrent;version="[30.1.0, 31.0.0)" +Bundle-RequiredExecutionEnvironment: JavaSE-17 +Import-Package: com.google.common.base;version="[33.1.0,33.2.0)", + com.google.common.collect;version="[33.1.0,33.2.0)", + com.google.common.util.concurrent;version="[33.1.0,33.2.0)" Automatic-Module-Name: org.eclipse.papyrus.infra.services.controlmode diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.decoration/.classpath b/plugins/infra/services/org.eclipse.papyrus.infra.services.decoration/.classpath index e801ebfb468..81fe078c20c 100644 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.decoration/.classpath +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.decoration/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src"/> <classpathentry kind="output" path="bin"/> diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.decoration/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/services/org.eclipse.papyrus.infra.services.decoration/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.decoration/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.decoration/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -12,7 +12,7 @@ org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.decoration/META-INF/MANIFEST.MF b/plugins/infra/services/org.eclipse.papyrus.infra.services.decoration/META-INF/MANIFEST.MF index 4f0d65df92c..4b94cad26ec 100644 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.decoration/META-INF/MANIFEST.MF +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.decoration/META-INF/MANIFEST.MF @@ -1,6 +1,5 @@ Manifest-Version: 1.0 -Require-Bundle: org.apache.commons.lang;bundle-version="[2.6.0,3.0.0)", - org.eclipse.emf.edit.ui;bundle-version="[2.18.0,3.0.0)", +Require-Bundle: org.eclipse.emf.edit.ui;bundle-version="[2.18.0,3.0.0)", org.eclipse.gmf.runtime.common.ui;bundle-version="[1.8.0,2.0.0)", org.eclipse.gmf.runtime.emf.type.core;bundle-version="[1.9.0,2.0.0)", org.eclipse.papyrus.emf.facet.custom.metamodel;bundle-version="[2.0.0,3.0.0)", @@ -15,11 +14,11 @@ Export-Package: org.eclipse.papyrus.infra.services.decoration, org.eclipse.papyrus.infra.services.decoration.util Bundle-Vendor: %providerName Bundle-ActivationPolicy: lazy -Bundle-Version: 3.0.0.qualifier +Bundle-Version: 3.1.0.qualifier Bundle-Localization: plugin Bundle-Name: %pluginName Bundle-Activator: org.eclipse.papyrus.infra.services.decoration.Activator Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.infra.services.decoration;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.infra.services.decoration diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.decoration/pom.xml b/plugins/infra/services/org.eclipse.papyrus.infra.services.decoration/pom.xml index 2e0aea612f1..791d9adf1f6 100644 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.decoration/pom.xml +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.decoration/pom.xml @@ -9,6 +9,6 @@ <version>0.0.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.papyrus.infra.services.decoration</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.1.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project>
\ No newline at end of file diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.decoration/src/org/eclipse/papyrus/infra/services/decoration/util/Decoration.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.decoration/src/org/eclipse/papyrus/infra/services/decoration/util/Decoration.java index 03394f9be3a..4d4c4014959 100644 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.decoration/src/org/eclipse/papyrus/infra/services/decoration/util/Decoration.java +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.decoration/src/org/eclipse/papyrus/infra/services/decoration/util/Decoration.java @@ -18,7 +18,6 @@ package org.eclipse.papyrus.infra.services.decoration.util; import java.util.List; -import org.apache.commons.lang.WordUtils; import org.eclipse.emf.ecore.EObject; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jface.viewers.IDecoration; @@ -121,6 +120,7 @@ public class Decoration implements IPapyrusDecoration { /** * @return the type (corresponding to marker type) */ + @Override public String getType() { return type; } @@ -132,6 +132,7 @@ public class Decoration implements IPapyrusDecoration { * @see org.eclipse.papyrus.infra.services.decoration.util.IPapyrusDecoration#getMessage() */ + @Override public String getMessage() { return message; } @@ -145,6 +146,7 @@ public class Decoration implements IPapyrusDecoration { * @see org.eclipse.papyrus.infra.services.decoration.util.IPapyrusDecoration#setMessage(java.lang.String) */ + @Override public void setMessage(String message) { this.message = message; } @@ -176,6 +178,7 @@ public class Decoration implements IPapyrusDecoration { * @return the decoration image * @see org.eclipse.papyrus.infra.services.decoration.util.IPapyrusDecoration#getDecorationImage() */ + @Override public ImageDescriptor getDecorationImageForGE() { return decorationImageForGE; } @@ -187,6 +190,7 @@ public class Decoration implements IPapyrusDecoration { * the new decoration image * @see org.eclipse.papyrus.infra.services.decoration.util.IPapyrusDecoration#setDecorationImageForGE(org.eclipse.jface.resource.ImageDescriptor) */ + @Override public void setDecorationImageForGE(ImageDescriptor decorationImageForGE) { this.decorationImageForGE = decorationImageForGE; } @@ -197,6 +201,7 @@ public class Decoration implements IPapyrusDecoration { * @return the decoration image * @see org.eclipse.papyrus.infra.services.decoration.util.IPapyrusDecoration#getDecorationImage() */ + @Override public ImageDescriptor getDecorationImageForME() { return decorationImageForME; } @@ -208,6 +213,7 @@ public class Decoration implements IPapyrusDecoration { * the new decoration image * @see org.eclipse.papyrus.infra.services.decoration.util.IPapyrusDecoration#setDecorationImageForGE(org.eclipse.jface.resource.ImageDescriptor) */ + @Override public void setDecorationImageForME(ImageDescriptor decorationImageForME) { this.decorationImageForME = decorationImageForME; } @@ -219,6 +225,7 @@ public class Decoration implements IPapyrusDecoration { * @return the position * @see org.eclipse.papyrus.infra.services.decoration.util.IPapyrusDecoration#getPosition() */ + @Override public PreferedPosition getPosition() { return position; } @@ -232,6 +239,7 @@ public class Decoration implements IPapyrusDecoration { * @see org.eclipse.papyrus.infra.services.decoration.util.IPapyrusDecoration#setPosition(org.eclipse.papyrus.infra.services.decoration.util.Decoration.PreferedPosition) */ + @Override public void setPosition(PreferedPosition position) { this.position = position; } @@ -240,6 +248,7 @@ public class Decoration implements IPapyrusDecoration { * @return the decoration position as enumerated by constants in IDecoration from JFace * (TOP_LEFT, TOP_RIGHT, BOTTOM_LEFT, BOTTOM_RIGHT, UNDERLAY */ + @Override public int getPositionForJFace() { switch (position) { case NORTH_WEST: @@ -287,7 +296,7 @@ public class Decoration implements IPapyrusDecoration { message += "\n"; //$NON-NLS-1$ } if (decoration.getMessage() != null) { - message += WordUtils.wrap(decoration.getMessage(), 100, "\n ", true); //$NON-NLS-1$ + message += "- " + StringUtils.stringWrap(decoration.getMessage(), 100, "\n "); //$NON-NLS-1$ //$NON-NLS-2$ } } } @@ -304,6 +313,7 @@ public class Decoration implements IPapyrusDecoration { * * @return the priority */ + @Override public int getPriority() { return priority; } @@ -314,6 +324,7 @@ public class Decoration implements IPapyrusDecoration { * @param priority * the new priority */ + @Override public void setPriority(int priority) { this.priority = priority; } diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.decoration/src/org/eclipse/papyrus/infra/services/decoration/util/DecorationUtils.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.decoration/src/org/eclipse/papyrus/infra/services/decoration/util/DecorationUtils.java index e4de77510ff..e21053b28d1 100644 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.decoration/src/org/eclipse/papyrus/infra/services/decoration/util/DecorationUtils.java +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.decoration/src/org/eclipse/papyrus/infra/services/decoration/util/DecorationUtils.java @@ -18,7 +18,6 @@ package org.eclipse.papyrus.infra.services.decoration.util; import java.util.HashMap; import java.util.Map; -import org.apache.commons.lang.WordUtils; import org.eclipse.emf.common.util.BasicEList; import org.eclipse.emf.common.util.EList; import org.eclipse.emf.ecore.EObject; @@ -57,7 +56,7 @@ public class DecorationUtils { } EObject eObject = EMFHelper.getEObject(element); - eObjects = new BasicEList<EObject>(); + eObjects = new BasicEList<>(); this.element = element; if (eObject != null) { @@ -83,7 +82,7 @@ public class DecorationUtils { if (eObject == null) { throw new IllegalArgumentException("The decorated EObject shall not be null"); //$NON-NLS-1$ } - eObjects = new BasicEList<EObject>(); + eObjects = new BasicEList<>(); eObjects.add(eObject); } @@ -121,8 +120,8 @@ public class DecorationUtils { public EList<IPapyrusDecoration> getDecorations(DecorationService decorationService, boolean navigateToParents) { Map<String, Decoration> decorations = getDecorations(decorationService); // child decorations are organized in a map indexed by the decoration type - EList<IPapyrusDecoration> foundDecorations = new BasicEList<IPapyrusDecoration>(); - Map<String, EList<IPapyrusDecoration>> childDecorationMap = new HashMap<String, EList<IPapyrusDecoration>>(); + EList<IPapyrusDecoration> foundDecorations = new BasicEList<>(); + Map<String, EList<IPapyrusDecoration>> childDecorationMap = new HashMap<>(); if (decorations != null) { for (Decoration decoration : decorations.values()) { EObject eObjectOfDecorator = decoration.getElement(); @@ -148,7 +147,7 @@ public class DecorationUtils { EList<IPapyrusDecoration> childDecorations = childDecorationMap.get(type); if (childDecorations == null) { // does not exist yet => create - childDecorations = new BasicEList<IPapyrusDecoration>(); + childDecorations = new BasicEList<>(); childDecorationMap.put(type, childDecorations); } childDecorations.add(decoration); @@ -188,8 +187,8 @@ public class DecorationUtils { * @param decorationService * the decoration service * @return the decoration message - * - * @deprecated, use {@link Decoration#getMessageFromDecorations(DecorationService, Object)} instead of this method + * + * @deprecated, use {@link Decoration#getMessageFromDecorations(DecorationService, Object)} instead of this method */ @Deprecated public String getDecorationMessage(DecorationService decorationService) { @@ -203,7 +202,7 @@ public class DecorationUtils { if (message.length() > 0) { message += "\n"; //$NON-NLS-1$ } - message += "- " + WordUtils.wrap(decoration.getMessage(), 100, "\n ", true); //$NON-NLS-1$ //$NON-NLS-2$ + message += "- " + StringUtils.stringWrap(decoration.getMessage(), 100, "\n "); //$NON-NLS-1$ //$NON-NLS-2$ } } return (message.length() > 0) ? message : null; diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.decoration/src/org/eclipse/papyrus/infra/services/decoration/util/StringUtils.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.decoration/src/org/eclipse/papyrus/infra/services/decoration/util/StringUtils.java new file mode 100755 index 00000000000..51430a501bd --- /dev/null +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.decoration/src/org/eclipse/papyrus/infra/services/decoration/util/StringUtils.java @@ -0,0 +1,51 @@ +/***************************************************************************** + * Copyright (c) 2022 CEA LIST and others. + * + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * + * Contributors: + * CEA LIST - Initial API and implementation + * + *****************************************************************************/ + +package org.eclipse.papyrus.infra.services.decoration.util; + +/** + * This class provides useful methods for String + * + * @since 3.1 + */ +class StringUtils { + + /** + * replace WordUtils.wrap of Apache + * code found on https://stackoverflow.com/questions/4212675/wrap-the-string-after-a-number-of-characters-word-wise-in-java + * + * @param s + * the message + * @param length + * number of carters per line + * @param separator + * the line separator + * @return + * the wrapped string + */ + static String stringWrap(String s, int length, String separator) { + String message = ""; //$NON-NLS-1$ + int position = 0; + for (String token : s.split(" ", -1)) { //$NON-NLS-1$ + if (message.length() - position + token.length() > length) { + message = message + separator + token; + position = message.length() + 1; + } else { + message += (message.isEmpty() ? "" : " ") + token; //$NON-NLS-1$ //$NON-NLS-2$ + } + } + return message; + } +} diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.ui/.classpath b/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.ui/.classpath index e801ebfb468..81fe078c20c 100644 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.ui/.classpath +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.ui/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src"/> <classpathentry kind="output" path="bin"/> diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.ui/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.ui/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.ui/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.ui/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -12,7 +12,7 @@ org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.ui/META-INF/MANIFEST.MF b/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.ui/META-INF/MANIFEST.MF index efe42a4f0be..52ba079b3a7 100644 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.ui/META-INF/MANIFEST.MF +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.ui/META-INF/MANIFEST.MF @@ -24,5 +24,5 @@ Bundle-Name: %pluginName Bundle-Activator: org.eclipse.papyrus.infra.services.edit.internal.ui.Activator Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.infra.services.edit.ui;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.infra.services.edit.ui diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/.classpath b/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/.classpath index e801ebfb468..81fe078c20c 100644 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/.classpath +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src"/> <classpathentry kind="output" path="bin"/> diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -12,7 +12,7 @@ org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/META-INF/MANIFEST.MF b/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/META-INF/MANIFEST.MF index b5f1619f207..0a6e9fe0706 100644 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/META-INF/MANIFEST.MF +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/META-INF/MANIFEST.MF @@ -26,6 +26,6 @@ Bundle-Name: %pluginName Bundle-Activator: org.eclipse.papyrus.infra.services.edit.Activator Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.infra.services.edit;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 -Import-Package: com.google.common.base;version="[30.1.0, 31.0.0)" +Bundle-RequiredExecutionEnvironment: JavaSE-17 +Import-Package: com.google.common.base;version="[33.1.0,33.2.0)" Automatic-Module-Name: org.eclipse.papyrus.infra.services.edit diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.labelprovider/.classpath b/plugins/infra/services/org.eclipse.papyrus.infra.services.labelprovider/.classpath index e801ebfb468..81fe078c20c 100644 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.labelprovider/.classpath +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.labelprovider/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src"/> <classpathentry kind="output" path="bin"/> diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.labelprovider/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/services/org.eclipse.papyrus.infra.services.labelprovider/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.labelprovider/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.labelprovider/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -12,7 +12,7 @@ org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.labelprovider/META-INF/MANIFEST.MF b/plugins/infra/services/org.eclipse.papyrus.infra.services.labelprovider/META-INF/MANIFEST.MF index d8e09bc85ab..4de125267d9 100644 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.labelprovider/META-INF/MANIFEST.MF +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.labelprovider/META-INF/MANIFEST.MF @@ -14,5 +14,5 @@ Bundle-Name: LabelProvider service Bundle-Activator: org.eclipse.papyrus.infra.services.labelprovider.Activator Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.infra.services.labelprovider;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.infra.services.labelprovider diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.localizer/.classpath b/plugins/infra/services/org.eclipse.papyrus.infra.services.localizer/.classpath index e801ebfb468..81fe078c20c 100644 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.localizer/.classpath +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.localizer/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src"/> <classpathentry kind="output" path="bin"/> diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.localizer/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/services/org.eclipse.papyrus.infra.services.localizer/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.localizer/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.localizer/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -12,7 +12,7 @@ org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.localizer/META-INF/MANIFEST.MF b/plugins/infra/services/org.eclipse.papyrus.infra.services.localizer/META-INF/MANIFEST.MF index 2201193b9ee..10fc8c0bf11 100644 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.localizer/META-INF/MANIFEST.MF +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.localizer/META-INF/MANIFEST.MF @@ -16,6 +16,6 @@ Bundle-Localization: plugin Bundle-ManifestVersion: 2 Bundle-Activator: org.eclipse.papyrus.infra.services.localizer.internal.Activator Bundle-SymbolicName: org.eclipse.papyrus.infra.services.localizer;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 -Import-Package: com.google.common.collect;version="[30.1.0, 31.0.0)" +Bundle-RequiredExecutionEnvironment: JavaSE-17 +Import-Package: com.google.common.collect;version="[33.1.0,33.2.0)" Automatic-Module-Name: org.eclipse.papyrus.infra.services.localizer diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.markerlistener/.classpath b/plugins/infra/services/org.eclipse.papyrus.infra.services.markerlistener/.classpath index e801ebfb468..81fe078c20c 100644 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.markerlistener/.classpath +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.markerlistener/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src"/> <classpathentry kind="output" path="bin"/> diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.markerlistener/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/services/org.eclipse.papyrus.infra.services.markerlistener/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.markerlistener/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.markerlistener/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -12,7 +12,7 @@ org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.markerlistener/META-INF/MANIFEST.MF b/plugins/infra/services/org.eclipse.papyrus.infra.services.markerlistener/META-INF/MANIFEST.MF index 3793391d936..1854ec89ae5 100644 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.markerlistener/META-INF/MANIFEST.MF +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.markerlistener/META-INF/MANIFEST.MF @@ -19,5 +19,5 @@ Bundle-Name: %pluginName Bundle-Activator: org.eclipse.papyrus.infra.services.markerlistener.Activator Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.infra.services.markerlistener;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.infra.services.markerlistener diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.navigation/.classpath b/plugins/infra/services/org.eclipse.papyrus.infra.services.navigation/.classpath index e801ebfb468..81fe078c20c 100644 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.navigation/.classpath +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.navigation/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src"/> <classpathentry kind="output" path="bin"/> diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.navigation/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/services/org.eclipse.papyrus.infra.services.navigation/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.navigation/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.navigation/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -12,7 +12,7 @@ org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.navigation/META-INF/MANIFEST.MF b/plugins/infra/services/org.eclipse.papyrus.infra.services.navigation/META-INF/MANIFEST.MF index 1e9383e749d..a9cacef79af 100644 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.navigation/META-INF/MANIFEST.MF +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.navigation/META-INF/MANIFEST.MF @@ -15,5 +15,5 @@ Bundle-Name: Navigation Service Bundle-Activator: org.eclipse.papyrus.infra.services.navigation.Activator Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.infra.services.navigation;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.infra.services.navigation diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.openelement/.classpath b/plugins/infra/services/org.eclipse.papyrus.infra.services.openelement/.classpath index e801ebfb468..81fe078c20c 100644 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.openelement/.classpath +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.openelement/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src"/> <classpathentry kind="output" path="bin"/> diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.openelement/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/services/org.eclipse.papyrus.infra.services.openelement/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.openelement/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.openelement/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -12,7 +12,7 @@ org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.openelement/META-INF/MANIFEST.MF b/plugins/infra/services/org.eclipse.papyrus.infra.services.openelement/META-INF/MANIFEST.MF index f03c254f338..bb2634820d8 100644 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.openelement/META-INF/MANIFEST.MF +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.openelement/META-INF/MANIFEST.MF @@ -20,5 +20,5 @@ Bundle-Name: OpenElement Service Bundle-Activator: org.eclipse.papyrus.infra.services.openelement.Activator Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.infra.services.openelement;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.infra.services.openelement diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.ui/.classpath b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.ui/.classpath index e801ebfb468..81fe078c20c 100644 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.ui/.classpath +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.ui/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src"/> <classpathentry kind="output" path="bin"/> diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.ui/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.ui/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.ui/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.ui/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -12,7 +12,7 @@ org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.ui/META-INF/MANIFEST.MF b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.ui/META-INF/MANIFEST.MF index 69004b43b52..a5108b1d4aa 100644 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.ui/META-INF/MANIFEST.MF +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.ui/META-INF/MANIFEST.MF @@ -24,7 +24,7 @@ Bundle-Name: %pluginName Bundle-Activator: org.eclipse.papyrus.infra.services.resourceloading.internal.ui.UIPlugin Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.infra.services.resourceloading.ui;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.eclipse.papyrus.infra.services.resourceloading.internal.ui;x-internal:=true, org.eclipse.papyrus.infra.services.resourceloading.internal.ui.editor;x-internal:=true, org.eclipse.papyrus.infra.services.resourceloading.internal.ui.expressions;x-internal:=true, diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/.classpath b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/.classpath index e801ebfb468..81fe078c20c 100644 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/.classpath +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src"/> <classpathentry kind="output" path="bin"/> diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -12,7 +12,7 @@ org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/META-INF/MANIFEST.MF b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/META-INF/MANIFEST.MF index de30886925c..d24bb8c7516 100644 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/META-INF/MANIFEST.MF +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/META-INF/MANIFEST.MF @@ -19,5 +19,5 @@ Bundle-Name: %pluginName Bundle-Activator: org.eclipse.papyrus.infra.services.resourceloading.Activator Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.infra.services.resourceloading;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.infra.services.resourceloading diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.semantic/.classpath b/plugins/infra/services/org.eclipse.papyrus.infra.services.semantic/.classpath index e801ebfb468..81fe078c20c 100644 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.semantic/.classpath +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.semantic/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src"/> <classpathentry kind="output" path="bin"/> diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.semantic/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/services/org.eclipse.papyrus.infra.services.semantic/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.semantic/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.semantic/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -12,7 +12,7 @@ org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.semantic/META-INF/MANIFEST.MF b/plugins/infra/services/org.eclipse.papyrus.infra.services.semantic/META-INF/MANIFEST.MF index 7a92258cd76..89b67d23104 100644 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.semantic/META-INF/MANIFEST.MF +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.semantic/META-INF/MANIFEST.MF @@ -14,5 +14,5 @@ Bundle-Name: Semantic Service Bundle-Activator: org.eclipse.papyrus.infra.services.semantic.Activator Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.infra.services.semantic;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.infra.services.semantic diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/.classpath b/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/.classpath index e801ebfb468..81fe078c20c 100644 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/.classpath +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src"/> <classpathentry kind="output" path="bin"/> diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -12,7 +12,7 @@ org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/META-INF/MANIFEST.MF b/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/META-INF/MANIFEST.MF index 3768921bf15..ac687f82c21 100644 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/META-INF/MANIFEST.MF +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/META-INF/MANIFEST.MF @@ -27,6 +27,6 @@ Bundle-Name: %pluginName Bundle-Activator: org.eclipse.papyrus.infra.services.validation.Activator Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.infra.services.validation;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 -Import-Package: com.google.common.collect;version="[30.1.0, 31.0.0)" +Bundle-RequiredExecutionEnvironment: JavaSE-17 +Import-Package: com.google.common.collect;version="[33.1.0,33.2.0)" Automatic-Module-Name: org.eclipse.papyrus.infra.services.validation diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.viewersearch/.classpath b/plugins/infra/services/org.eclipse.papyrus.infra.services.viewersearch/.classpath index edc8895124d..a7bc712151f 100644 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.viewersearch/.classpath +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.viewersearch/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src/"/> <classpathentry kind="output" path="bin"/> diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.viewersearch/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/services/org.eclipse.papyrus.infra.services.viewersearch/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.viewersearch/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.viewersearch/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -12,7 +12,7 @@ org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.viewersearch/META-INF/MANIFEST.MF b/plugins/infra/services/org.eclipse.papyrus.infra.services.viewersearch/META-INF/MANIFEST.MF index 5a69fbfb9f5..e1f8794925c 100644 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.viewersearch/META-INF/MANIFEST.MF +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.viewersearch/META-INF/MANIFEST.MF @@ -14,5 +14,5 @@ Bundle-Name: %pluginName Bundle-Activator: org.eclipse.papyrus.infra.services.viewersearch.Activator Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.infra.services.viewersearch;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.infra.services.viewersearch diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.viewlabelprovider/.classpath b/plugins/infra/services/org.eclipse.papyrus.infra.services.viewlabelprovider/.classpath index edc8895124d..a7bc712151f 100644 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.viewlabelprovider/.classpath +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.viewlabelprovider/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src/"/> <classpathentry kind="output" path="bin"/> diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.viewlabelprovider/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/services/org.eclipse.papyrus.infra.services.viewlabelprovider/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.viewlabelprovider/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.viewlabelprovider/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -12,7 +12,7 @@ org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.viewlabelprovider/META-INF/MANIFEST.MF b/plugins/infra/services/org.eclipse.papyrus.infra.services.viewlabelprovider/META-INF/MANIFEST.MF index 15d1e8378a7..560c5d59987 100644 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.viewlabelprovider/META-INF/MANIFEST.MF +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.viewlabelprovider/META-INF/MANIFEST.MF @@ -15,5 +15,5 @@ Bundle-Name: %pluginName Bundle-Activator: org.eclipse.papyrus.infra.services.viewlabelprovider.Activator Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.infra.services.viewlabelprovider;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.infra.services.viewlabelprovider diff --git a/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.edit/.classpath b/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.edit/.classpath index e9c6eafb6fa..abaf32b3e99 100755 --- a/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.edit/.classpath +++ b/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.edit/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src-gen"/> <classpathentry kind="output" path="bin"/> diff --git a/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.edit/.project b/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.edit/.project index fedc1c56b8b..2667d7019b4 100755 --- a/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.edit/.project +++ b/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.edit/.project @@ -20,9 +20,15 @@ <arguments> </arguments> </buildCommand> + <buildCommand> + <name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name> + <arguments> + </arguments> + </buildCommand> </buildSpec> <natures> <nature>org.eclipse.jdt.core.javanature</nature> <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature> </natures> </projectDescription> diff --git a/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.edit/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.edit/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.edit/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.edit/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -12,7 +12,7 @@ org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 diff --git a/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.edit/META-INF/MANIFEST.MF b/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.edit/META-INF/MANIFEST.MF index 8bf3745e42b..a7bdbea6a68 100755 --- a/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.edit/META-INF/MANIFEST.MF +++ b/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.edit/META-INF/MANIFEST.MF @@ -14,4 +14,4 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.22.0,4.0.0)";resolut org.eclipse.papyrus.infra.textedit;bundle-version="[1.0.0,2.0.0)" Import-Package: org.osgi.framework;version="[1.10.0,2.0.0)" Bundle-ActivationPolicy: lazy -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.modelexplorer/.classpath b/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.modelexplorer/.classpath index e801ebfb468..81fe078c20c 100755 --- a/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.modelexplorer/.classpath +++ b/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.modelexplorer/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src"/> <classpathentry kind="output" path="bin"/> diff --git a/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.modelexplorer/.project b/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.modelexplorer/.project index fbb6ed37938..f208e0971e1 100755 --- a/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.modelexplorer/.project +++ b/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.modelexplorer/.project @@ -20,9 +20,15 @@ <arguments> </arguments> </buildCommand> + <buildCommand> + <name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name> + <arguments> + </arguments> + </buildCommand> </buildSpec> <natures> <nature>org.eclipse.pde.PluginNature</nature> <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature> </natures> </projectDescription> diff --git a/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.modelexplorer/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.modelexplorer/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.modelexplorer/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.modelexplorer/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -12,7 +12,7 @@ org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 diff --git a/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.modelexplorer/META-INF/MANIFEST.MF b/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.modelexplorer/META-INF/MANIFEST.MF index 862ccb5fc98..182162a6b1a 100755 --- a/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.modelexplorer/META-INF/MANIFEST.MF +++ b/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.modelexplorer/META-INF/MANIFEST.MF @@ -27,6 +27,6 @@ Require-Bundle: org.eclipse.core.expressions;bundle-version="[3.7.0,4.0.0)", org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="[4.0.0,5.0.0)", org.eclipse.papyrus.views.modelexplorer;bundle-version="[5.0.0,6.0.0)", org.eclipse.ui;bundle-version="[3.119.0,4.0.0)" -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.infra.textedit.modelexplorer Bundle-ActivationPolicy: lazy diff --git a/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.properties/.classpath b/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.properties/.classpath index e801ebfb468..81fe078c20c 100755 --- a/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.properties/.classpath +++ b/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.properties/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src"/> <classpathentry kind="output" path="bin"/> diff --git a/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.properties/.project b/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.properties/.project index 89484cab4dc..c7d5debb6fd 100755 --- a/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.properties/.project +++ b/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.properties/.project @@ -20,9 +20,15 @@ <arguments> </arguments> </buildCommand> + <buildCommand> + <name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name> + <arguments> + </arguments> + </buildCommand> </buildSpec> <natures> <nature>org.eclipse.pde.PluginNature</nature> <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature> </natures> </projectDescription> diff --git a/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.properties/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.properties/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.properties/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.properties/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -12,7 +12,7 @@ org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 diff --git a/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.properties/META-INF/MANIFEST.MF b/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.properties/META-INF/MANIFEST.MF index 2c88c3647b2..dcf4eec4dde 100755 --- a/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.properties/META-INF/MANIFEST.MF +++ b/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.properties/META-INF/MANIFEST.MF @@ -20,6 +20,6 @@ Require-Bundle: org.eclipse.core.databinding;bundle-version="[1.10.0,2.0.0)", org.eclipse.papyrus.infra.widgets;bundle-version="[4.1.0,5.0.0)", org.eclipse.ui;bundle-version="[3.119.0,4.0.0)", org.eclipse.ui.views.properties.tabbed;bundle-version="[3.9.0,4.0.0)" -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.infra.textedit.properties Bundle-ActivationPolicy: lazy diff --git a/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.representation.architecture/.classpath b/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.representation.architecture/.classpath index b1592a80554..abaa43d8201 100755 --- a/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.representation.architecture/.classpath +++ b/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.representation.architecture/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src"/> <classpathentry kind="src" path="api"/> diff --git a/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.representation.architecture/.project b/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.representation.architecture/.project index 9405bab1a09..8689400abb7 100755 --- a/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.representation.architecture/.project +++ b/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.representation.architecture/.project @@ -20,9 +20,15 @@ <arguments> </arguments> </buildCommand> + <buildCommand> + <name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name> + <arguments> + </arguments> + </buildCommand> </buildSpec> <natures> <nature>org.eclipse.pde.PluginNature</nature> <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature> </natures> </projectDescription> diff --git a/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.representation.architecture/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.representation.architecture/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.representation.architecture/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.representation.architecture/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -12,7 +12,7 @@ org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 diff --git a/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.representation.architecture/META-INF/MANIFEST.MF b/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.representation.architecture/META-INF/MANIFEST.MF index db42a1fee12..d3fa3172f6f 100755 --- a/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.representation.architecture/META-INF/MANIFEST.MF +++ b/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.representation.architecture/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-SymbolicName: org.eclipse.papyrus.infra.textedit.representation.architect Bundle-Version: 1.0.0.qualifier Bundle-Vendor: %Bundle-Vendor Automatic-Module-Name: org.eclipse.papyrus.infra.textedit.representation.architecture -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-Activator: org.eclipse.papyrus.infra.textedit.representation.architecture.Activator Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.22.0,4.0.0)", org.eclipse.emf.ecore;bundle-version="[2.24.0,3.0.0)", diff --git a/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.representation.edit/.classpath b/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.representation.edit/.classpath index e9c6eafb6fa..abaf32b3e99 100755 --- a/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.representation.edit/.classpath +++ b/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.representation.edit/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src-gen"/> <classpathentry kind="output" path="bin"/> diff --git a/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.representation.edit/.project b/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.representation.edit/.project index ea21b3a5147..f10c3607e79 100755 --- a/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.representation.edit/.project +++ b/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.representation.edit/.project @@ -20,9 +20,15 @@ <arguments> </arguments> </buildCommand> + <buildCommand> + <name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name> + <arguments> + </arguments> + </buildCommand> </buildSpec> <natures> <nature>org.eclipse.jdt.core.javanature</nature> <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature> </natures> </projectDescription> diff --git a/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.representation.edit/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.representation.edit/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.representation.edit/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.representation.edit/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -12,7 +12,7 @@ org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 diff --git a/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.representation.edit/META-INF/MANIFEST.MF b/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.representation.edit/META-INF/MANIFEST.MF index eea9e9da3ea..e705bc281ff 100755 --- a/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.representation.edit/META-INF/MANIFEST.MF +++ b/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.representation.edit/META-INF/MANIFEST.MF @@ -23,4 +23,4 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.22.0,4.0.0)";resolut org.eclipse.papyrus.infra.types.edit;bundle-version="[5.0.0,6.0.0)" Import-Package: org.osgi.framework;version="[1.10.0,2.0.0)" Bundle-ActivationPolicy: lazy -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.representation/.classpath b/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.representation/.classpath index 42b4bab9a7d..6140e536273 100755 --- a/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.representation/.classpath +++ b/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.representation/.classpath @@ -3,7 +3,7 @@ <classpathentry kind="src" path="src-gen"/> <classpathentry kind="src" path="src"/> <classpathentry kind="src" path="api"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="output" path="bin"/> </classpath> diff --git a/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.representation/.project b/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.representation/.project index 04a0d4a1d50..fc648c70308 100755 --- a/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.representation/.project +++ b/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.representation/.project @@ -20,9 +20,15 @@ <arguments> </arguments> </buildCommand> + <buildCommand> + <name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name> + <arguments> + </arguments> + </buildCommand> </buildSpec> <natures> <nature>org.eclipse.pde.PluginNature</nature> <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature> </natures> </projectDescription> diff --git a/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.representation/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.representation/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.representation/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.representation/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -12,7 +12,7 @@ org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 diff --git a/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.representation/META-INF/MANIFEST.MF b/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.representation/META-INF/MANIFEST.MF index 5c12832551e..ab6321c89f8 100755 --- a/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.representation/META-INF/MANIFEST.MF +++ b/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.representation/META-INF/MANIFEST.MF @@ -11,7 +11,7 @@ Export-Package: org.eclipse.papyrus.infra.textedit.representation, org.eclipse.papyrus.infra.textedit.representation.impl, org.eclipse.papyrus.infra.textedit.representation.util Automatic-Module-Name: org.eclipse.papyrus.infra.textedit.representation -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.20.0,4.0.0)";x-installation:=greedy;resolution:=optional, org.eclipse.emf.ecore;bundle-version="[2.23.0,3.0.0)", org.eclipse.papyrus.infra.core.architecture;bundle-version="[3.0.0,4.0.0)", diff --git a/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.types/.classpath b/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.types/.classpath index e801ebfb468..81fe078c20c 100755 --- a/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.types/.classpath +++ b/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.types/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src"/> <classpathentry kind="output" path="bin"/> diff --git a/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.types/.project b/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.types/.project index bef472e20db..9d6aa71e306 100755 --- a/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.types/.project +++ b/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.types/.project @@ -20,9 +20,15 @@ <arguments> </arguments> </buildCommand> + <buildCommand> + <name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name> + <arguments> + </arguments> + </buildCommand> </buildSpec> <natures> <nature>org.eclipse.pde.PluginNature</nature> <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature> </natures> </projectDescription> diff --git a/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.types/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.types/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.types/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.types/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -12,7 +12,7 @@ org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 diff --git a/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.types/META-INF/MANIFEST.MF b/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.types/META-INF/MANIFEST.MF index 4f0290882ce..e16ea7a186e 100755 --- a/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.types/META-INF/MANIFEST.MF +++ b/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.types/META-INF/MANIFEST.MF @@ -12,6 +12,6 @@ Require-Bundle: org.eclipse.emf.ecore;bundle-version="[2.24.0,3.0.0)", org.eclipse.papyrus.infra.textedit;bundle-version="[1.0.0,2.0.0)", org.eclipse.papyrus.infra.types;bundle-version="[5.0.0,6.0.0)", org.eclipse.ui.workbench;bundle-version="[3.122.0,4.0.0)" -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.infra.textedit.types Bundle-ActivationPolicy: lazy diff --git a/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.ui/.classpath b/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.ui/.classpath index b1592a80554..abaa43d8201 100755 --- a/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.ui/.classpath +++ b/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.ui/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src"/> <classpathentry kind="src" path="api"/> diff --git a/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.ui/.project b/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.ui/.project index 367ae42f8c5..9c9ff0b79ce 100755 --- a/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.ui/.project +++ b/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.ui/.project @@ -20,9 +20,15 @@ <arguments> </arguments> </buildCommand> + <buildCommand> + <name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name> + <arguments> + </arguments> + </buildCommand> </buildSpec> <natures> <nature>org.eclipse.pde.PluginNature</nature> <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature> </natures> </projectDescription> diff --git a/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.ui/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.ui/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.ui/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.ui/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -12,7 +12,7 @@ org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 diff --git a/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.ui/META-INF/MANIFEST.MF b/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.ui/META-INF/MANIFEST.MF index 4a03e4bc3ef..4c4a8217afb 100755 --- a/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.ui/META-INF/MANIFEST.MF +++ b/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.ui/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-SymbolicName: org.eclipse.papyrus.infra.textedit.ui;singleton:=true Bundle-Version: 1.0.0.qualifier Bundle-Vendor: %Bundle-Vendor Automatic-Module-Name: org.eclipse.papyrus.infra.textedit.ui -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-Activator: org.eclipse.papyrus.infra.textedit.ui.Activator Require-Bundle: org.eclipse.core.expressions;bundle-version="[3.7.0,4.0.0)", org.eclipse.core.runtime;bundle-version="[3.22.0,4.0.0)", diff --git a/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.xtext/.classpath b/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.xtext/.classpath index b1592a80554..abaa43d8201 100755 --- a/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.xtext/.classpath +++ b/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.xtext/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src"/> <classpathentry kind="src" path="api"/> diff --git a/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.xtext/.project b/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.xtext/.project index 62eae2fe130..eaef2ca8fad 100755 --- a/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.xtext/.project +++ b/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.xtext/.project @@ -20,9 +20,15 @@ <arguments> </arguments> </buildCommand> + <buildCommand> + <name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name> + <arguments> + </arguments> + </buildCommand> </buildSpec> <natures> <nature>org.eclipse.pde.PluginNature</nature> <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature> </natures> </projectDescription> diff --git a/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.xtext/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.xtext/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.xtext/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.xtext/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -12,7 +12,7 @@ org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 diff --git a/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.xtext/META-INF/MANIFEST.MF b/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.xtext/META-INF/MANIFEST.MF index 0432942da5b..3a8625a257f 100755 --- a/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.xtext/META-INF/MANIFEST.MF +++ b/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.xtext/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.papyrus.infra.textedit.xtext;singleton:=true -Bundle-Version: 1.0.0.qualifier +Bundle-Version: 1.1.100.qualifier Bundle-Activator: org.eclipse.papyrus.infra.textedit.xtext.Activator Bundle-Vendor: %Bundle-Vendor Require-Bundle: org.eclipse.ui;bundle-version="[3.119.0,4.0.0)", @@ -33,7 +33,7 @@ Require-Bundle: org.eclipse.ui;bundle-version="[3.119.0,4.0.0)", org.eclipse.papyrus.infra.emf.gmf;bundle-version="[2.1.0,3.0.0)", org.eclipse.papyrus.infra.emf;bundle-version="[4.2.0,5.0.0)", org.eclipse.gmf.runtime.emf.core;bundle-version="[1.7.0,2.0.0)" -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.infra.textedit.xtext Bundle-ActivationPolicy: lazy Export-Package: org.eclipse.papyrus.infra.textedit.xtext.custom, diff --git a/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.xtext/api/org/eclipse/papyrus/infra/textedit/xtext/custom/PapyrusXTextDocumentProvider.java b/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.xtext/api/org/eclipse/papyrus/infra/textedit/xtext/custom/PapyrusXTextDocumentProvider.java index 4648efd3fa3..379598c2fbb 100755 --- a/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.xtext/api/org/eclipse/papyrus/infra/textedit/xtext/custom/PapyrusXTextDocumentProvider.java +++ b/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.xtext/api/org/eclipse/papyrus/infra/textedit/xtext/custom/PapyrusXTextDocumentProvider.java @@ -1,5 +1,5 @@ /***************************************************************************** - * Copyright (c) 2021 CEA LIST and others. + * Copyright (c) 2021-2022 CEA LIST and others. * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 @@ -10,7 +10,7 @@ * * Contributors: * Vincent Lorenzo (CEA LIST) <vincent.lorenzo@cea.fr> - Initial API and implementation - * + * Vincent Lorenzo (CEA LIST) <vincent.lorenzo@cea.fr> - Bug 580115 *****************************************************************************/ package org.eclipse.papyrus.infra.textedit.xtext.custom; @@ -30,6 +30,7 @@ import org.eclipse.papyrus.infra.emf.utils.ServiceUtilsForEObject; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration; import org.eclipse.papyrus.infra.textedit.xtext.Activator; import org.eclipse.papyrus.infra.textedit.xtext.nested.editor.NestedXTextEditorInput; +import org.eclipse.xtext.ui.editor.model.IXtextDocument; import org.eclipse.xtext.ui.editor.model.XtextDocumentProvider; /** @@ -38,6 +39,18 @@ import org.eclipse.xtext.ui.editor.model.XtextDocumentProvider; public class PapyrusXTextDocumentProvider extends XtextDocumentProvider { /** + * @see org.eclipse.ui.texteditor.AbstractDocumentProvider#getDocument(java.lang.Object) + * + * @param element + * @return + * @since 1.1 + */ + @Override + public IXtextDocument getDocument(Object element) { + return (IXtextDocument) super.getDocument(element); + } + + /** * @see org.eclipse.xtext.ui.editor.model.XtextDocumentProvider#doSaveDocument(org.eclipse.core.runtime.IProgressMonitor, java.lang.Object, org.eclipse.jface.text.IDocument, boolean) * * @param monitor @@ -72,13 +85,29 @@ public class PapyrusXTextDocumentProvider extends XtextDocumentProvider { if (newText.equals(initialText)) { return; } - ICommand cmd = getParseCommand(input.getDirectEditorConfiguration(), semanticElement, newText); final TransactionalEditingDomain domain = getEditingDomain(semanticElement); domain.getCommandStack().execute(new GMFtoEMFCommandWrapper(cmd)); } /** + * This method is used to update the editor content when the value has been edited outside of the current editor + * + * @param editorInput + * the editor input + * @param document + * the edited document + * @since 1.1 + */ + public void updateTextEditorContent(final NestedXTextEditorInput editorInput, final IDocument document) { + final String oldText = document.get(); + final String newText = editorInput.getTextToEdit(); + if (!oldText.equals(newText)) { + document.set(newText); + } + } + + /** * * @param configuration * the editor configuration diff --git a/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.xtext/api/org/eclipse/papyrus/infra/textedit/xtext/custom/PapyrusXTextMarker.java b/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.xtext/api/org/eclipse/papyrus/infra/textedit/xtext/custom/PapyrusXTextMarker.java index 7cdf4ae4fae..bb7e40a132d 100755 --- a/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.xtext/api/org/eclipse/papyrus/infra/textedit/xtext/custom/PapyrusXTextMarker.java +++ b/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.xtext/api/org/eclipse/papyrus/infra/textedit/xtext/custom/PapyrusXTextMarker.java @@ -21,7 +21,7 @@ import org.eclipse.papyrus.infra.textedit.xtext.nested.editor.PapyrusXTextEditor /** * This class allows to get error markers in the {@link PapyrusXTextEditor}. - * Strangely it seems work find doing nothing + * Strangely it seems work fine doing nothing */ public class PapyrusXTextMarker extends org.eclipse.ui.texteditor.AbstractMarkerAnnotationModel { diff --git a/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.xtext/api/org/eclipse/papyrus/infra/textedit/xtext/nested/editor/PapyrusXTextEditor.java b/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.xtext/api/org/eclipse/papyrus/infra/textedit/xtext/nested/editor/PapyrusXTextEditor.java index f014c31f7dc..220c1299274 100755 --- a/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.xtext/api/org/eclipse/papyrus/infra/textedit/xtext/nested/editor/PapyrusXTextEditor.java +++ b/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.xtext/api/org/eclipse/papyrus/infra/textedit/xtext/nested/editor/PapyrusXTextEditor.java @@ -1,5 +1,5 @@ /***************************************************************************** - * Copyright (c) 2021 CEA LIST and others. + * Copyright (c) 2021-2022 CEA LIST and others. * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 @@ -10,7 +10,8 @@ * * Contributors: * Vincent Lorenzo (CEA LIST) <vincent.lorenzo@cea.fr> - Initial API and implementation - * + * Vincent Lorenzo (CEA LIST) <vincent.lorenzo@cea.fr> - Bug 578648, 579033, 580115, 580042 + * Jeremie Tatibouet (CEA LIST) <jeremie.tatibouet@cea.fr> - Bug 580336 *****************************************************************************/ package org.eclipse.papyrus.infra.textedit.xtext.nested.editor; @@ -18,25 +19,34 @@ package org.eclipse.papyrus.infra.textedit.xtext.nested.editor; import java.io.IOException; import java.util.EventObject; +import org.eclipse.core.commands.operations.IOperationHistory; +import org.eclipse.core.commands.operations.OperationHistoryFactory; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.NullProgressMonitor; +import org.eclipse.emf.common.command.Command; +import org.eclipse.emf.common.command.CommandStack; import org.eclipse.emf.common.command.CommandStackListener; import org.eclipse.emf.common.notify.Adapter; import org.eclipse.emf.common.notify.impl.AdapterImpl; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.transaction.TransactionalEditingDomain; +import org.eclipse.osgi.util.NLS; import org.eclipse.papyrus.infra.core.resource.ModelSet; import org.eclipse.papyrus.infra.core.sasheditor.editor.ISashWindowsContainer; import org.eclipse.papyrus.infra.core.services.ServiceException; import org.eclipse.papyrus.infra.core.services.ServicesRegistry; import org.eclipse.papyrus.infra.core.utils.ServiceUtils; +import org.eclipse.papyrus.infra.emf.gmf.command.NotifyingWorkspaceCommandStack; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration; import org.eclipse.papyrus.infra.textedit.textdocument.TextDocument; import org.eclipse.papyrus.infra.textedit.textdocument.TextDocumentPackage; import org.eclipse.papyrus.infra.textedit.xtext.Activator; +import org.eclipse.papyrus.infra.textedit.xtext.custom.PapyrusXTextDocumentProvider; +import org.eclipse.papyrus.infra.textedit.xtext.internal.command.TextUndoRedoCommandWrapper; import org.eclipse.papyrus.infra.textedit.xtext.internal.listeners.SaveTextOnFocusLostPageLifeCycleEventsListener; import org.eclipse.papyrus.infra.textedit.xtext.internal.listeners.SaveTextOnFocusLostPartListener; +import org.eclipse.papyrus.infra.textedit.xtext.internal.listeners.UndoableTextChangeListener; import org.eclipse.papyrus.infra.ui.lifecycleevents.ISaveAndDirtyService; import org.eclipse.ui.IEditorInput; import org.eclipse.ui.IEditorSite; @@ -44,6 +54,9 @@ import org.eclipse.ui.IPartListener2; import org.eclipse.ui.IWorkbenchPage; import org.eclipse.ui.PartInitException; import org.eclipse.xtext.ui.editor.XtextEditor; +import org.eclipse.xtext.ui.editor.model.IXtextDocument; +import org.eclipse.xtext.ui.editor.model.XtextDocument; + /** * This Customization of the {@link XtextEditor} allows us to open an XtextEditor in the Papyrus sash editor @@ -53,27 +66,12 @@ public class PapyrusXTextEditor extends XtextEditor { /** * the listener on the command stack */ - private final CommandStackListener listener = new CommandStackListener() { - - @Override - public void commandStackChanged(EventObject event) { - resetInput(); - } - }; + private CommandStackListener commandStackListener; /** * a listener on the semanticContext of the {@link TextDocument} */ - private final Adapter textDocumentListener = new AdapterImpl() { - - @Override - public void notifyChanged(org.eclipse.emf.common.notify.Notification msg) { - if (TextDocumentPackage.eINSTANCE.getTextDocument_SemanticContext().equals(msg.getFeature())) { - resetInput(); - } - }; - - }; + private Adapter textDocumentListener; /** * the part listener. This listener is used to be able to save the editor contents on the focus lost @@ -130,6 +128,11 @@ public class PapyrusXTextEditor extends XtextEditor { private SaveTextOnFocusLostPageLifeCycleEventsListener sashWindowsContainerListener = null; /** + * listener on the IOperationHistory + */ + private UndoableTextChangeListener historyListener; + + /** * * Constructor. * @@ -221,27 +224,16 @@ public class PapyrusXTextEditor extends XtextEditor { /** * This method is called to re-set the editor input */ - private void resetInput() { - int currentCaretOffset = -1; - if (getSourceViewer() != null - && getSourceViewer().getTextWidget() != null - && !getSourceViewer().getTextWidget().isDisposed()) { - currentCaretOffset = getSourceViewer().getTextWidget().getCaretOffset(); - } - try { - // TODO maybe better to call setInput directly! - // setInput(null); - doSetInput(null); - } catch (CoreException e) { - Activator.log.error(e); - } - if (currentCaretOffset != -1 && getSourceViewer() != null - && getSourceViewer().getTextWidget() != null - && !getSourceViewer().getTextWidget().isDisposed()) { - getSourceViewer().getTextWidget().setCaretOffset(currentCaretOffset); - } - } + private void updateEditorContent() { + final PapyrusXTextDocumentProvider provider = getDocumentProvider(); + final IXtextDocument document = provider.getDocument(this.input); + + // we need to disable the listener in order to not add a new command into the commandstack! + this.historyListener.disable(); + provider.updateTextEditorContent(this.input, document); + this.historyListener.enable(); + } /** * This method allows to save the typed text in the edited model @@ -254,13 +246,21 @@ public class PapyrusXTextEditor extends XtextEditor { * this method registers the listeners */ protected void registerListeners() { - this.domain.getCommandStack().addCommandStackListener(this.listener); - this.textDocument.eAdapters().add(this.textDocumentListener); + this.commandStackListener = createCommandStackListener(); + if (this.commandStackListener != null) { + this.domain.getCommandStack().addCommandStackListener(this.commandStackListener); + } + this.textDocumentListener = createTextDocumentListener(); + if (this.textDocumentListener != null) { + this.textDocument.eAdapters().add(this.textDocumentListener); + } if (this.saveAndDirtyService != null) { this.saveAndDirtyService.registerIsaveablePart(this); } final IWorkbenchPage page = getEditorSite().getPage(); page.addPartListener(this.partListener); + this.historyListener = new UndoableTextChangeListener(this.domain, getDocumentProvider().getDocument(this.input)); + getOperationHistory().addOperationHistoryListener(this.historyListener); } @@ -269,10 +269,15 @@ public class PapyrusXTextEditor extends XtextEditor { */ protected void unregisterListeners() { unregisterSashWindowsContainerListener(); + getOperationHistory().removeOperationHistoryListener(this.historyListener); final IWorkbenchPage page = getEditorSite().getPage(); page.removePartListener(this.partListener); - this.domain.getCommandStack().removeCommandStackListener(this.listener); - this.textDocument.eAdapters().remove(this.textDocumentListener); + if (this.commandStackListener != null) { + this.domain.getCommandStack().removeCommandStackListener(this.commandStackListener); + } + if (this.textDocumentListener != null) { + this.textDocument.eAdapters().remove(this.textDocumentListener); + } if (this.saveAndDirtyService != null) { this.saveAndDirtyService.removeIsaveablePart(this); } @@ -324,6 +329,9 @@ public class PapyrusXTextEditor extends XtextEditor { if (this.textDocument != null && this.textDocument.eResource() != null) {// resource can be null when we are destroying the TextDocument super.doSetInput(this.input); + if (this.historyListener != null) { + this.historyListener.updateXTextDocument(getDocumentProvider().getDocument(this.input)); + } } } @@ -334,6 +342,15 @@ public class PapyrusXTextEditor extends XtextEditor { */ @Override public void setFocus() { + final PapyrusXTextDocumentProvider provider = getDocumentProvider(); + if (provider != null) { + final IXtextDocument document = provider.getDocument(getEditorInput()); + if (document instanceof XtextDocument) { + // here to create and display validation markers after getting the focus + // bugs 580042 and 580336 + ((XtextDocument) document).checkAndUpdateAnnotations(); + } + } registerSashWindowsContainerListener(); super.setFocus(); } @@ -351,7 +368,10 @@ public class PapyrusXTextEditor extends XtextEditor { this.sashWindowsContainerListener = new SaveTextOnFocusLostPageLifeCycleEventsListener(this); this.sashWindowsContainer.addPageChangedListener(this.sashWindowsContainerListener); } catch (ServiceException e) { - Activator.log.error(e); + // we get an exception when we reopen a Papyrus model with an XtextEditor already open. + // This method is called at least 3 times during the loading and at the end we succeed to register the listen + // see bug 578648 + Activator.log.warn(NLS.bind("The service {0} is not yet initialized. We will retry at the next focus change.", ISashWindowsContainer.class)); //$NON-NLS-1$ } } } @@ -367,4 +387,76 @@ public class PapyrusXTextEditor extends XtextEditor { this.sashWindowsContainerListener = null; } + /** + * this method do nothing to avoid to break Undo/Redo Papyrus nested editor (diagram/table/...) + * see Bug 579033: [Diagram][KeyBinding] Undo/Redo actions are broken in diagram and it seems comes form the keybinding + */ + @Override + protected void createUndoRedoActions() { + // do nothing to preserve Papyrus Undo/Redo feature/keybinding + } + + /** + * + * @return + * the {@link IOperationHistory} + */ + private IOperationHistory getOperationHistory() { + return OperationHistoryFactory.getOperationHistory(); + } + + /** + * @see org.eclipse.ui.texteditor.AbstractDecoratedTextEditor#getDocumentProvider() + * + * @return + * @since 1.1 + */ + @Override + public PapyrusXTextDocumentProvider getDocumentProvider() { + return (PapyrusXTextDocumentProvider) super.getDocumentProvider(); + } + + /** + * + * @return + * the listener for the {@link CommandStack}, can be <code>null</code> + * @since 1.1 + */ + protected CommandStackListener createCommandStackListener() { + return new CommandStackListener() { + + @Override + public void commandStackChanged(EventObject event) { + final Object source = event.getSource(); + if (source instanceof NotifyingWorkspaceCommandStack) { + NotifyingWorkspaceCommandStack stack = (NotifyingWorkspaceCommandStack) source; + final Command cmd = stack.getMostRecentCommand(); + + if (cmd instanceof TextUndoRedoCommandWrapper) { + // there is nothing to do in this case, because this notification has been sent by ourself! + return; + } + } + updateEditorContent(); + } + }; + } + + /** + * + * @return + * the listener for {@link TextDocument}, can be <code>null</code> + * @since 1.1 + */ + protected Adapter createTextDocumentListener() { + return new AdapterImpl() { + + @Override + public void notifyChanged(org.eclipse.emf.common.notify.Notification msg) { + if (TextDocumentPackage.eINSTANCE.getTextDocument_SemanticContext().equals(msg.getFeature())) { + updateEditorContent(); + } + }; + }; + } } diff --git a/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.xtext/plugin.xml b/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.xtext/plugin.xml index 87cb9b4cc67..44bf59a3c28 100755 --- a/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.xtext/plugin.xml +++ b/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.xtext/plugin.xml @@ -5,7 +5,7 @@ point="org.eclipse.papyrus.infra.ui.papyrusDiagram"> <actionBarContributor id="org.eclipse.papyrus.infra.textedit.xtext.PapyrusXTextActionBarContributor" - implementingClass="org.eclipse.ui.editors.text.TextEditorActionContributor"> + implementingClass="org.eclipse.papyrus.infra.textedit.xtext.internal.actions.CustomXtextActionBarContributor"> </actionBarContributor> </extension> diff --git a/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.xtext/pom.xml b/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.xtext/pom.xml index 1b4c022948d..e825ece7693 100755 --- a/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.xtext/pom.xml +++ b/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.xtext/pom.xml @@ -9,6 +9,6 @@ <version>0.0.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.papyrus.infra.textedit.xtext</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>1.1.100-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project>
\ No newline at end of file diff --git a/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.xtext/src/org/eclipse/papyrus/infra/textedit/xtext/Activator.java b/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.xtext/src/org/eclipse/papyrus/infra/textedit/xtext/Activator.java index 2a96764f342..de442928fa6 100755 --- a/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.xtext/src/org/eclipse/papyrus/infra/textedit/xtext/Activator.java +++ b/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.xtext/src/org/eclipse/papyrus/infra/textedit/xtext/Activator.java @@ -1,5 +1,5 @@ /***************************************************************************** - * Copyright (c) 2021 CEA LIST and others. + * Copyright (c) 2021 - 2022 CEA LIST and others. * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 @@ -10,7 +10,7 @@ * * Contributors: * Vincent Lorenzo (CEA LIST) <vincent.lorenzo@cea.fr> - Initial API and implementation - * + * Vincent Lorenzo (CEA LIST) <vincent.lorenzo@cea.fr> - Bug 578648 *****************************************************************************/ package org.eclipse.papyrus.infra.textedit.xtext; @@ -41,12 +41,14 @@ public class Activator extends AbstractUIPlugin { public void start(BundleContext context) throws Exception { super.start(context); plugin = this; + log = new LogHelper(this); } @Override public void stop(BundleContext context) throws Exception { plugin = null; super.stop(context); + log = null; } /** diff --git a/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.xtext/src/org/eclipse/papyrus/infra/textedit/xtext/internal/actions/CustomXtextActionBarContributor.java b/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.xtext/src/org/eclipse/papyrus/infra/textedit/xtext/internal/actions/CustomXtextActionBarContributor.java new file mode 100755 index 00000000000..8dd9b80bfe6 --- /dev/null +++ b/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.xtext/src/org/eclipse/papyrus/infra/textedit/xtext/internal/actions/CustomXtextActionBarContributor.java @@ -0,0 +1,61 @@ +/***************************************************************************** + * Copyright (c) 2022 CEA LIST and others. + * + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * + * Contributors: + * Vincent Lorenzo (CEA LIST) <vincent.lorenzo@cea.fr> - Initial API and implementation + * + *****************************************************************************/ + +package org.eclipse.papyrus.infra.textedit.xtext.internal.actions; + +import org.eclipse.jface.action.IAction; +import org.eclipse.ui.IActionBars; +import org.eclipse.ui.IEditorPart; +import org.eclipse.ui.actions.ActionFactory; + +/** + * A custom version of the Text actionbar contributor for org.eclipse.papyrus.infra.textedit.xtext.nested.editor.PapyrusXTextEditor. + * This action bar contributor allows to preserve the Undo/Redo actions inside Papyrus + */ +public class CustomXtextActionBarContributor extends org.eclipse.ui.editors.text.TextEditorActionContributor { + + + /** + * Constructor. + * + */ + public CustomXtextActionBarContributor() { + // nothing to do + } + + + /** + * @see org.eclipse.ui.editors.text.TextEditorActionContributor#setActiveEditor(org.eclipse.ui.IEditorPart) + * + * @param part + */ + @Override + public void setActiveEditor(IEditorPart part) { + final IActionBars actionBars = getActionBars(); + + final IAction undo = actionBars.getGlobalActionHandler(ActionFactory.UNDO.getId()); + final IAction redo = actionBars.getGlobalActionHandler(ActionFactory.REDO.getId()); + + super.setActiveEditor(part);// this super seems erase undo/redo actions + + // see bug Bug 579033: [Diagram][KeyBinding] Undo/Redo actions are broken in diagram and it seems comes form the keybinding + if (undo != null) { + actionBars.setGlobalActionHandler(ActionFactory.UNDO.getId(), undo); + } + if (redo != null) { + actionBars.setGlobalActionHandler(ActionFactory.REDO.getId(), redo); + } + } +} diff --git a/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.xtext/src/org/eclipse/papyrus/infra/textedit/xtext/internal/command/TextUndoRedoCommandWrapper.java b/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.xtext/src/org/eclipse/papyrus/infra/textedit/xtext/internal/command/TextUndoRedoCommandWrapper.java new file mode 100755 index 00000000000..ba1a4d995c2 --- /dev/null +++ b/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.xtext/src/org/eclipse/papyrus/infra/textedit/xtext/internal/command/TextUndoRedoCommandWrapper.java @@ -0,0 +1,130 @@ +/***************************************************************************** + * Copyright (c) 2022 CEA LIST and others. + * + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * + * Contributors: + * Vincent Lorenzo (CEA LIST) <vincent.lorenzo@cea.fr> - Initial API and implementation + * + *****************************************************************************/ + +package org.eclipse.papyrus.infra.textedit.xtext.internal.command; + +import org.eclipse.core.commands.ExecutionException; +import org.eclipse.core.commands.operations.IOperationHistory; +import org.eclipse.core.commands.operations.IUndoableOperation; +import org.eclipse.core.commands.operations.OperationHistoryFactory; +import org.eclipse.core.runtime.NullProgressMonitor; +import org.eclipse.emf.common.command.AbstractCommand; +import org.eclipse.papyrus.infra.textedit.xtext.Activator; +import org.eclipse.ui.editors.text.TextEditor; + +/** + * This command is used to wrap an already executed {@link IUndoableOperation} used in the context of a {@link TextEditor} + */ +public class TextUndoRedoCommandWrapper extends AbstractCommand { + + /** + * the wrapped operation + */ + private IUndoableOperation operation; + + /** + * + * Constructor. + * + * @param operation + * the wrapped operation + */ + public TextUndoRedoCommandWrapper(final IUndoableOperation operation) { + super("Wrapped Papyrus Text Edit Operation"); //$NON-NLS-1$ + this.operation = operation; + + } + + /** + * @see org.eclipse.emf.common.command.Command#execute() + * + */ + @Override + public void execute() { + // do nothing, already executed by XText + } + + /** + * + * @see org.eclipse.emf.common.command.AbstractCommand#canExecute() + * + * @return + */ + @Override + public boolean canExecute() { + return true; + }; + + /** + * + * @see org.eclipse.emf.common.command.AbstractCommand#prepare() + * + * @return + */ + @Override + protected boolean prepare() { + return true; + }; + + /** + * @see org.eclipse.emf.common.command.AbstractCommand#undo() + * + */ + @Override + public void undo() { + try { + if (operation != null) { + getOperationHistory().undoOperation(this.operation, new NullProgressMonitor(), null); + } + } catch (ExecutionException e) { + Activator.log.error(e); + } + } + + /** + * @see org.eclipse.emf.common.command.AbstractCommand#canUndo() + * + * @return + */ + @Override + public boolean canUndo() { + return true; + } + + + /** + * @see org.eclipse.emf.common.command.Command#redo() + * + */ + @Override + public void redo() { + try { + if (this.operation != null) { + getOperationHistory().redoOperation(operation, new NullProgressMonitor(), null); + } + } catch (ExecutionException e) { + Activator.log.error(e); + } + } + + /** + * + * @return + * the {@link IOperationHistory} + */ + private IOperationHistory getOperationHistory() { + return OperationHistoryFactory.getOperationHistory(); + } +} diff --git a/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.xtext/src/org/eclipse/papyrus/infra/textedit/xtext/internal/listeners/UndoableTextChangeListener.java b/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.xtext/src/org/eclipse/papyrus/infra/textedit/xtext/internal/listeners/UndoableTextChangeListener.java new file mode 100755 index 00000000000..7b1ce8f245d --- /dev/null +++ b/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.xtext/src/org/eclipse/papyrus/infra/textedit/xtext/internal/listeners/UndoableTextChangeListener.java @@ -0,0 +1,135 @@ +/***************************************************************************** + * Copyright (c) 2022 CEA LIST and others. + * + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * + * Contributors: + * Vincent Lorenzo (CEA LIST) <vincent.lorenzo@cea.fr> - Initial API and implementation + * + *****************************************************************************/ + +package org.eclipse.papyrus.infra.textedit.xtext.internal.listeners; + +import org.eclipse.core.commands.operations.IOperationHistoryListener; +import org.eclipse.core.commands.operations.IUndoContext; +import org.eclipse.core.commands.operations.IUndoableOperation; +import org.eclipse.core.commands.operations.ObjectUndoContext; +import org.eclipse.core.commands.operations.OperationHistoryEvent; +import org.eclipse.emf.transaction.TransactionalEditingDomain; +import org.eclipse.papyrus.infra.textedit.xtext.internal.command.TextUndoRedoCommandWrapper; +import org.eclipse.xtext.ui.editor.model.IXtextDocument; + +/** + * This class is in charge of listening the change of the Eclipse OperationHistory and to propagate the changes concerning a text edition from Papyrus + * inside the Papyrus CommandStack + */ +public class UndoableTextChangeListener implements IOperationHistoryListener { + + private static final String UNDOABLE_TEXT_CHANGE_CLASS = "org.eclipse.text.undo.DocumentUndoManager.UndoableTextChange"; //$NON-NLS-1$ + + private static final String UNDOABLE_COMPOUND_TEXT_CHANGE_CLASS = "org.eclipse.text.undo.DocumentUndoManager.UndoableCompoundTextChange"; //$NON-NLS-1$ + + /** + * the editing domain to use + */ + private TransactionalEditingDomain domain; + + /** + * the edited {@link IXtextDocument} + */ + private IXtextDocument xTextDocument; + + /** + * boolean indicating if we must listen or not the changes + */ + private boolean active = true; + + /** + * + * Constructor. + * + * @param domain + * the editing domain used to by the Papyrus editor + * @param xTextDocument + * the edited {@link IXtextDocument} + */ + public UndoableTextChangeListener(final TransactionalEditingDomain domain, final IXtextDocument xTextDocument) { + this.domain = domain; + this.xTextDocument = xTextDocument; + } + + /** + * This method allows to update the concerned XtextDocument because we create a new one after each new setInput + * + * @param xTextDocument + */ + public void updateXTextDocument(final IXtextDocument xTextDocument) { + this.xTextDocument = xTextDocument; + } + + /** + * enable the listener + */ + public void enable() { + this.active = true; + } + + /** + * disable the listener + */ + public void disable() { + this.active = false; + } + + /** + * @see org.eclipse.core.commands.operations.IOperationHistoryListener#historyNotification(org.eclipse.core.commands.operations.OperationHistoryEvent) + * + * @param event + */ + @Override + public void historyNotification(final OperationHistoryEvent event) { + + final int eventType = event.getEventType(); + final IUndoableOperation operation = event.getOperation(); + final String operationClassName = operation.getClass().getCanonicalName(); + if (UNDOABLE_TEXT_CHANGE_CLASS.equals(operationClassName) + || UNDOABLE_COMPOUND_TEXT_CHANGE_CLASS.equals(operationClassName)) { + + if (eventType == OperationHistoryEvent.OPERATION_ADDED) { + if (!active) { + return; + } + // we check the notification concerns the document for which we installed this listener + if (this.xTextDocument == extractCurrentXTextDocument(operation)) { + // we wrap the action and we add it to the papyrus command stack + final TextUndoRedoCommandWrapper lastCreatedWrapper = new TextUndoRedoCommandWrapper(operation); + this.domain.getCommandStack().execute(lastCreatedWrapper); + } + } + } + } + + /** + * + * @param operation + * an operation + * @return + * the xtext document or <code>null</code> for the current operation + */ + private IXtextDocument extractCurrentXTextDocument(final IUndoableOperation operation) { + for (final IUndoContext ctx : operation.getContexts()) { + if (ctx instanceof ObjectUndoContext) { + final ObjectUndoContext undoContext = (ObjectUndoContext) ctx; + if (undoContext.getObject() instanceof IXtextDocument) { + return (IXtextDocument) undoContext.getObject(); + } + } + } + return null; + } +} diff --git a/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.xtext/usecase.md b/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.xtext/usecase.md index 986801fa7e3..3e4bb8fa874 100755 --- a/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.xtext/usecase.md +++ b/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.xtext/usecase.md @@ -11,4 +11,17 @@ For the "focus lost", we must consider several case: Custom implementation of the dispose method (close method is never called by Papyrus) 5. We have several PapyrusXtextEditor open side by side, we must save the first one each time the user click in another one - we use the SaveTextOnFocusLostPageLifeCycleEventsListener
\ No newline at end of file + we use the SaveTextOnFocusLostPageLifeCycleEventsListener + +##Undo/Redo +bug 580115 : the Undo/Redo of the text editor must be accessible to the user. +Undo/Redo of TextEditor is not compliant with the Papyrus Undo/Redo mechanism which uses an EMF Command Stack. Nevertheless we find a way to propagate Text changes inside the Papyrus Undo/Redo command stack. +We listen the Eclipse Operation History (class org.eclipse.papyrus.infra.textedit.xtext.internal.listeners.UndoableTextChangeListener) to detect TextEdition action from a Papyrus nested TextEditor, +then we wrap the UndoableTextChange/UndoableCompoundTextChange (already executed) into an EMF Command (class TextUndoRedoCommandWrapper) and we add this command into the Papyrus CommandStack. + +The CommandStack listener is used to update the editor contents when a new command is executed inside the Command Stack: +- TextUndoRedoCommandWrapper can be ignored, because the editor is already up to date +- the CommandStackListener calls org.eclipse.papyrus.infra.textedit.xtext.nested.editor.PapyrusXTextEditor.updateEditorContent() +- updateEditorContent disables the UndoableTextChangeListener before updating the contents. this steps is required. If we don't disable the listener, the update will add a new TextUndoRedoCommandWrapper inside the Papyrus CommandStack and it should not! + +
\ No newline at end of file diff --git a/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit/.classpath b/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit/.classpath index 004db3fba20..2377d859931 100755 --- a/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit/.classpath +++ b/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit/.classpath @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> <classpathentry kind="src" path="src-gen"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="output" path="bin"/> </classpath> diff --git a/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit/.project b/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit/.project index ad4bb1562aa..ca6d97a1307 100755 --- a/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit/.project +++ b/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit/.project @@ -20,9 +20,15 @@ <arguments> </arguments> </buildCommand> + <buildCommand> + <name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name> + <arguments> + </arguments> + </buildCommand> </buildSpec> <natures> <nature>org.eclipse.pde.PluginNature</nature> <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature> </natures> </projectDescription> diff --git a/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -12,7 +12,7 @@ org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 diff --git a/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit/META-INF/MANIFEST.MF b/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit/META-INF/MANIFEST.MF index 584da741484..832a0cd0c28 100755 --- a/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit/META-INF/MANIFEST.MF +++ b/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit/META-INF/MANIFEST.MF @@ -13,4 +13,4 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.22.0,4.0.0)";x-insta org.eclipse.emf.ecore;bundle-version="[2.24.0,3.0.0)" Bundle-ActivationPolicy: lazy Automatic-Module-Name: org.eclipse.papyrus.infra.textedit -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.core/.classpath b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/.classpath index e801ebfb468..81fe078c20c 100644 --- a/plugins/infra/types/org.eclipse.papyrus.infra.types.core/.classpath +++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src"/> <classpathentry kind="output" path="bin"/> diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.core/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/infra/types/org.eclipse.papyrus.infra.types.core/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -12,7 +12,7 @@ org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.core/META-INF/MANIFEST.MF b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/META-INF/MANIFEST.MF index 012f9ef9b2b..f53cead5ecc 100644 --- a/plugins/infra/types/org.eclipse.papyrus.infra.types.core/META-INF/MANIFEST.MF +++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/META-INF/MANIFEST.MF @@ -24,6 +24,6 @@ Bundle-Name: %pluginName Bundle-Activator: org.eclipse.papyrus.infra.types.core.Activator Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.infra.types.core;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 -Import-Package: com.google.common.collect;version="[30.1.0, 31.0.0)" +Bundle-RequiredExecutionEnvironment: JavaSE-17 +Import-Package: com.google.common.collect;version="[33.1.0,33.2.0)" Automatic-Module-Name: org.eclipse.papyrus.infra.types.core diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/.classpath b/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/.classpath index e9c6eafb6fa..abaf32b3e99 100644 --- a/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/.classpath +++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src-gen"/> <classpathentry kind="output" path="bin"/> diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -12,7 +12,7 @@ org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/META-INF/MANIFEST.MF b/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/META-INF/MANIFEST.MF index 370eff892c0..1a63ac0eccc 100644 --- a/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/META-INF/MANIFEST.MF +++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/META-INF/MANIFEST.MF @@ -13,5 +13,5 @@ Bundle-Localization: plugin Bundle-ManifestVersion: 2 Bundle-Activator: org.eclipse.papyrus.infra.types.provider.TypesConfigurationsEditPlugin$Implementation Bundle-SymbolicName: org.eclipse.papyrus.infra.types.edit;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.infra.types.edit diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.editor/.classpath b/plugins/infra/types/org.eclipse.papyrus.infra.types.editor/.classpath index e9c6eafb6fa..abaf32b3e99 100644 --- a/plugins/infra/types/org.eclipse.papyrus.infra.types.editor/.classpath +++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.editor/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src-gen"/> <classpathentry kind="output" path="bin"/> diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.editor/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/types/org.eclipse.papyrus.infra.types.editor/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/infra/types/org.eclipse.papyrus.infra.types.editor/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.editor/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -12,7 +12,7 @@ org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.editor/META-INF/MANIFEST.MF b/plugins/infra/types/org.eclipse.papyrus.infra.types.editor/META-INF/MANIFEST.MF index 84faf0afce5..bd64913f8d1 100644 --- a/plugins/infra/types/org.eclipse.papyrus.infra.types.editor/META-INF/MANIFEST.MF +++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.editor/META-INF/MANIFEST.MF @@ -18,5 +18,5 @@ Bundle-Localization: plugin Bundle-ManifestVersion: 2 Bundle-Activator: org.eclipse.papyrus.infra.types.presentation.TypesConfigurationsEditorPlugin$Implementation Bundle-SymbolicName: org.eclipse.papyrus.infra.types.editor;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.infra.types.editor diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/.classpath b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/.classpath index bb642933501..f574c0cbd4d 100644 --- a/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/.classpath +++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src-gen"/> <classpathentry kind="src" path="src"/> diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -12,7 +12,7 @@ org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/META-INF/MANIFEST.MF b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/META-INF/MANIFEST.MF index 2e114e767c3..e787f429845 100644 --- a/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/META-INF/MANIFEST.MF +++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/META-INF/MANIFEST.MF @@ -24,5 +24,5 @@ Bundle-Localization: plugin Bundle-ManifestVersion: 2 Bundle-Activator: org.eclipse.papyrus.infra.types.rulebased.provider.RuleBasedEditPlugin$Implementation Bundle-SymbolicName: org.eclipse.papyrus.infra.types.rulebased;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.infra.types.rulebased diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.ui/.classpath b/plugins/infra/types/org.eclipse.papyrus.infra.types.ui/.classpath index e801ebfb468..81fe078c20c 100644 --- a/plugins/infra/types/org.eclipse.papyrus.infra.types.ui/.classpath +++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.ui/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src"/> <classpathentry kind="output" path="bin"/> diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.ui/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/types/org.eclipse.papyrus.infra.types.ui/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/infra/types/org.eclipse.papyrus.infra.types.ui/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.ui/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -12,7 +12,7 @@ org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.ui/META-INF/MANIFEST.MF b/plugins/infra/types/org.eclipse.papyrus.infra.types.ui/META-INF/MANIFEST.MF index 276ed241c6d..224a18889a8 100644 --- a/plugins/infra/types/org.eclipse.papyrus.infra.types.ui/META-INF/MANIFEST.MF +++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.ui/META-INF/MANIFEST.MF @@ -17,5 +17,5 @@ Bundle-Localization: plugin Bundle-Name: %pluginName Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.infra.types.ui;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.infra.types.ui diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.ui/plugin.xml b/plugins/infra/types/org.eclipse.papyrus.infra.types.ui/plugin.xml index fa1d4c578bb..3008991046e 100644 --- a/plugins/infra/types/org.eclipse.papyrus.infra.types.ui/plugin.xml +++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.ui/plugin.xml @@ -20,7 +20,7 @@ point="org.eclipse.ui.menus"> <menuContribution allPopups="false" - locationURI="popup:org.eclipse.ui.popup.any?after=additions"> + locationURI="popup:org.eclipse.papyrus.dev.ui.framework"> <command commandId="org.eclipse.papyrus.infra.types.ui.deploy" icon="icons/configuration.gif" diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types/.classpath b/plugins/infra/types/org.eclipse.papyrus.infra.types/.classpath index bb642933501..f574c0cbd4d 100644 --- a/plugins/infra/types/org.eclipse.papyrus.infra.types/.classpath +++ b/plugins/infra/types/org.eclipse.papyrus.infra.types/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src-gen"/> <classpathentry kind="src" path="src"/> diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/types/org.eclipse.papyrus.infra.types/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/infra/types/org.eclipse.papyrus.infra.types/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/infra/types/org.eclipse.papyrus.infra.types/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -12,7 +12,7 @@ org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types/META-INF/MANIFEST.MF b/plugins/infra/types/org.eclipse.papyrus.infra.types/META-INF/MANIFEST.MF index 43e792d1eb1..068c20f6b58 100644 --- a/plugins/infra/types/org.eclipse.papyrus.infra.types/META-INF/MANIFEST.MF +++ b/plugins/infra/types/org.eclipse.papyrus.infra.types/META-INF/MANIFEST.MF @@ -6,7 +6,7 @@ Bundle-Version: 5.0.0.qualifier Bundle-ClassPath: . Bundle-Vendor: %providerName Bundle-Localization: plugin -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.eclipse.papyrus.infra.types, org.eclipse.papyrus.infra.types.impl, org.eclipse.papyrus.infra.types.operations, diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.newchild.ui/.classpath b/plugins/infra/ui/org.eclipse.papyrus.infra.newchild.ui/.classpath index e801ebfb468..81fe078c20c 100644 --- a/plugins/infra/ui/org.eclipse.papyrus.infra.newchild.ui/.classpath +++ b/plugins/infra/ui/org.eclipse.papyrus.infra.newchild.ui/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src"/> <classpathentry kind="output" path="bin"/> diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.newchild.ui/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/ui/org.eclipse.papyrus.infra.newchild.ui/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/infra/ui/org.eclipse.papyrus.infra.newchild.ui/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/infra/ui/org.eclipse.papyrus.infra.newchild.ui/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -12,7 +12,7 @@ org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.newchild.ui/META-INF/MANIFEST.MF b/plugins/infra/ui/org.eclipse.papyrus.infra.newchild.ui/META-INF/MANIFEST.MF index 3b3becffbe3..7e037b43533 100644 --- a/plugins/infra/ui/org.eclipse.papyrus.infra.newchild.ui/META-INF/MANIFEST.MF +++ b/plugins/infra/ui/org.eclipse.papyrus.infra.newchild.ui/META-INF/MANIFEST.MF @@ -9,7 +9,7 @@ Require-Bundle: org.eclipse.emf.databinding;bundle-version="[1.5.0,2.0.0)", org.eclipse.gmf.runtime.diagram.ui;bundle-version="[1.9.0,2.0.0)", org.eclipse.papyrus.infra.newchild;bundle-version="[5.0.0,6.0.0)", org.eclipse.uml2.types;bundle-version="[2.5.0,3.0.0)" -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-ActivationPolicy: lazy Bundle-Vendor: %providerName Bundle-Localization: plugin diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.onefile.ui/.classpath b/plugins/infra/ui/org.eclipse.papyrus.infra.onefile.ui/.classpath index e801ebfb468..81fe078c20c 100644 --- a/plugins/infra/ui/org.eclipse.papyrus.infra.onefile.ui/.classpath +++ b/plugins/infra/ui/org.eclipse.papyrus.infra.onefile.ui/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src"/> <classpathentry kind="output" path="bin"/> diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.onefile.ui/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/ui/org.eclipse.papyrus.infra.onefile.ui/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/infra/ui/org.eclipse.papyrus.infra.onefile.ui/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/infra/ui/org.eclipse.papyrus.infra.onefile.ui/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -12,7 +12,7 @@ org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.onefile.ui/META-INF/MANIFEST.MF b/plugins/infra/ui/org.eclipse.papyrus.infra.onefile.ui/META-INF/MANIFEST.MF index 2d0f4023a5c..2b36e519084 100644 --- a/plugins/infra/ui/org.eclipse.papyrus.infra.onefile.ui/META-INF/MANIFEST.MF +++ b/plugins/infra/ui/org.eclipse.papyrus.infra.onefile.ui/META-INF/MANIFEST.MF @@ -16,7 +16,7 @@ Require-Bundle: org.eclipse.core.expressions;bundle-version="[3.6.0,4.0.0)", org.eclipse.papyrus.infra.core.log;bundle-version="[2.0.0,3.0.0)", org.eclipse.papyrus.infra.emf;bundle-version="[4.0.0,5.0.0)", org.eclipse.papyrus.infra.internationalization;bundle-version="[2.0.0,3.0.0)", - org.eclipse.papyrus.infra.onefile;bundle-version="[3.0.0,4.0.0)", + org.eclipse.papyrus.infra.onefile;bundle-version="[3.1.0,4.0.0)", org.eclipse.papyrus.infra.ui;bundle-version="[3.0.0,4.0.0)", org.eclipse.ui.ide;bundle-version="[3.17.0,4.0.0)", org.eclipse.ui.navigator;bundle-version="[3.9.0,4.0.0)", @@ -25,11 +25,11 @@ Require-Bundle: org.eclipse.core.expressions;bundle-version="[3.6.0,4.0.0)", org.eclipse.uml2.types;bundle-version="[2.5.0,3.0.0)" Bundle-Vendor: %providerName Bundle-ActivationPolicy: lazy -Bundle-Version: 2.0.0.qualifier +Bundle-Version: 2.0.100.qualifier Bundle-Localization: plugin Bundle-Name: %pluginName Bundle-Activator: org.eclipse.papyrus.infra.onefile.internal.ui.Activator Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.infra.onefile.ui;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.infra.onefile.ui diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.onefile.ui/pom.xml b/plugins/infra/ui/org.eclipse.papyrus.infra.onefile.ui/pom.xml index ef52c3f380d..15abab788e3 100644 --- a/plugins/infra/ui/org.eclipse.papyrus.infra.onefile.ui/pom.xml +++ b/plugins/infra/ui/org.eclipse.papyrus.infra.onefile.ui/pom.xml @@ -9,6 +9,6 @@ <version>0.0.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.papyrus.infra.onefile.ui</artifactId> - <version>2.0.0-SNAPSHOT</version> + <version>2.0.100-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project>
\ No newline at end of file diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.onefile.ui/src/org/eclipse/papyrus/infra/onefile/internal/ui/providers/PapyrusModelActionProvider.java b/plugins/infra/ui/org.eclipse.papyrus.infra.onefile.ui/src/org/eclipse/papyrus/infra/onefile/internal/ui/providers/PapyrusModelActionProvider.java index fdddf7197bc..e6fcf4b4857 100644 --- a/plugins/infra/ui/org.eclipse.papyrus.infra.onefile.ui/src/org/eclipse/papyrus/infra/onefile/internal/ui/providers/PapyrusModelActionProvider.java +++ b/plugins/infra/ui/org.eclipse.papyrus.infra.onefile.ui/src/org/eclipse/papyrus/infra/onefile/internal/ui/providers/PapyrusModelActionProvider.java @@ -1,5 +1,5 @@ /***************************************************************************** - * Copyright (c) 2011 Atos Origin Integration - CEA LIST. + * Copyright (c) 2011, 2022 Atos Origin Integration - CEA LIST. * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 @@ -12,6 +12,7 @@ * Tristan Faure (Atos Origin Integration) tristan.faure@atosorigin.com - Initial API and implementation * Camille Letavernier (CEA LIST) camille.letavernier@cea.fr * Benoit Maggi (CEA LIST) benoit.maggi@cea.fr - Add copy Action + * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Bug 578434 *****************************************************************************/ package org.eclipse.papyrus.infra.onefile.internal.ui.providers; @@ -157,7 +158,7 @@ public class PapyrusModelActionProvider extends CommonActionProvider { if (getIFile() != null) { try { IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage(); - page.openEditor(new FileEditorInput(getIFile()), "org.eclipse.papyrus.infra.core.papyrusEditor", true, IWorkbenchPage.MATCH_ID | IWorkbenchPage.MATCH_INPUT); + page.openEditor(new FileEditorInput(getIFile()), "org.eclipse.papyrus.infra.core.papyrusEditor", true, IWorkbenchPage.MATCH_ID | IWorkbenchPage.MATCH_INPUT); //$NON-NLS-1$ } catch (WorkbenchException e) { Activator.log.error(e); } @@ -183,8 +184,7 @@ public class PapyrusModelActionProvider extends CommonActionProvider { @Override public boolean isEnabled() { - return getSelectedResources() != null && getSelectedResources().size() > 0 && OneFileUtils.isDi((IResource) getSelectedResources().get(0)); - + return getSelectedResources() != null && getSelectedResources().size() > 0 && OneFileUtils.containsDi(getSelectedResources()); } @Override @@ -193,7 +193,7 @@ public class PapyrusModelActionProvider extends CommonActionProvider { } @Override - protected List getSelectedResources() { + protected List<IResource> getSelectedResources() { return helper.getSelectedResources(getContext()); } }; @@ -206,7 +206,7 @@ public class PapyrusModelActionProvider extends CommonActionProvider { } @Override - protected List getSelectedResources() { + protected List<IResource> getSelectedResources() { return helper.getSelectedResources(getContext()); } }; @@ -219,7 +219,7 @@ public class PapyrusModelActionProvider extends CommonActionProvider { } @Override - protected List getSelectedResources() { + protected List<IResource> getSelectedResources() { return helper.getSelectedResources(getContext()); } @@ -326,6 +326,7 @@ public class PapyrusModelActionProvider extends CommonActionProvider { * * @see org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets.Composite) */ + @Override public void createControl(Composite parent) { Composite composite = new Composite(parent, SWT.NONE); composite.setLayout(new GridLayout(2, false)); @@ -342,6 +343,7 @@ public class PapyrusModelActionProvider extends CommonActionProvider { fNameField.setLayoutData(new GridData(GridData.FILL, GridData.BEGINNING, true, false)); fNameField.addModifyListener(new ModifyListener() { + @Override public void modifyText(ModifyEvent e) { validatePage(); } @@ -361,7 +363,7 @@ public class PapyrusModelActionProvider extends CommonActionProvider { } protected final void validatePage() { - String text = fNameField.getText() + ".di"; + String text = fNameField.getText() + ".di"; //$NON-NLS-1$ RefactoringStatus status = fRefactoringProcessor.validateNewElementName(text); setPageComplete(status); } @@ -394,7 +396,7 @@ public class PapyrusModelActionProvider extends CommonActionProvider { } private void initializeRefactoring() { - fRefactoringProcessor.setNewResourceName(fNameField.getText() + ".di"); + fRefactoringProcessor.setNewResourceName(fNameField.getText() + ".di"); //$NON-NLS-1$ } } } @@ -446,12 +448,12 @@ public class PapyrusModelActionProvider extends CommonActionProvider { return null; } - protected List getSelectedResources(ActionContext context) { + protected List<IResource> getSelectedResources(ActionContext context) { ISelection selec = context.getSelection(); - List<IResource> resources = new ArrayList<IResource>(); + List<IResource> resources = new ArrayList<>(); if (selec instanceof IStructuredSelection) { IStructuredSelection struc = (IStructuredSelection) selec; - for (Iterator<Object> i = struc.iterator(); i.hasNext();) { + for (Iterator<?> i = struc.iterator(); i.hasNext();) { Object o = i.next(); if (o instanceof IPapyrusFile) { IPapyrusFile papy = (IPapyrusFile) o; diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui.architecture/.classpath b/plugins/infra/ui/org.eclipse.papyrus.infra.ui.architecture/.classpath index c3ba59e4c3a..1a821310bdc 100644 --- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui.architecture/.classpath +++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui.architecture/.classpath @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> <classpathentry kind="src" path="src"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="output" path="bin"/> </classpath> diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui.architecture/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/ui/org.eclipse.papyrus.infra.ui.architecture/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui.architecture/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui.architecture/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -12,7 +12,7 @@ org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui.architecture/META-INF/MANIFEST.MF b/plugins/infra/ui/org.eclipse.papyrus.infra.ui.architecture/META-INF/MANIFEST.MF index bd6f78a223d..f0be380dc3b 100644 --- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui.architecture/META-INF/MANIFEST.MF +++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui.architecture/META-INF/MANIFEST.MF @@ -7,7 +7,7 @@ Bundle-ClassPath: . Bundle-Activator: org.eclipse.papyrus.infra.ui.architecture.ArchitectureUIPlugin$Implementation Bundle-Vendor: %providerName Bundle-Localization: plugin -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.eclipse.papyrus.infra.ui.architecture, org.eclipse.papyrus.infra.ui.architecture.dialogs, org.eclipse.papyrus.infra.ui.architecture.messages, diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui.fonts/.classpath b/plugins/infra/ui/org.eclipse.papyrus.infra.ui.fonts/.classpath index e801ebfb468..81fe078c20c 100644 --- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui.fonts/.classpath +++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui.fonts/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src"/> <classpathentry kind="output" path="bin"/> diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui.fonts/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/ui/org.eclipse.papyrus.infra.ui.fonts/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui.fonts/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui.fonts/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -12,7 +12,7 @@ org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui.fonts/META-INF/MANIFEST.MF b/plugins/infra/ui/org.eclipse.papyrus.infra.ui.fonts/META-INF/MANIFEST.MF index f0bf55dead6..772c87a03b7 100644 --- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui.fonts/META-INF/MANIFEST.MF +++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui.fonts/META-INF/MANIFEST.MF @@ -8,6 +8,6 @@ Bundle-Vendor: Eclipse Modeling Project Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.18.0,4.0.0)", org.eclipse.ui;bundle-version="[3.117.0,4.0.0)", javax.annotation;bundle-version="[1.3.5,2.0.0)" -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.infra.ui.fonts Bundle-ActivationPolicy: lazy diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui.resources/.classpath b/plugins/infra/ui/org.eclipse.papyrus.infra.ui.resources/.classpath index e801ebfb468..81fe078c20c 100644 --- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui.resources/.classpath +++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui.resources/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src"/> <classpathentry kind="output" path="bin"/> diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui.resources/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/ui/org.eclipse.papyrus.infra.ui.resources/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui.resources/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui.resources/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -12,7 +12,7 @@ org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui.resources/META-INF/MANIFEST.MF b/plugins/infra/ui/org.eclipse.papyrus.infra.ui.resources/META-INF/MANIFEST.MF index daab8297638..2f014324d44 100644 --- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui.resources/META-INF/MANIFEST.MF +++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui.resources/META-INF/MANIFEST.MF @@ -19,6 +19,6 @@ Bundle-Name: %pluginName Bundle-Activator: org.eclipse.papyrus.infra.ui.resources.Activator Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.infra.ui.resources;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 -Import-Package: com.google.common.base;version="[30.1.0, 31.0.0)" +Bundle-RequiredExecutionEnvironment: JavaSE-17 +Import-Package: com.google.common.base;version="[33.1.0,33.2.0)" Automatic-Module-Name: org.eclipse.papyrus.infra.ui.resources diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/.classpath b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/.classpath index b1592a80554..abaa43d8201 100644 --- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/.classpath +++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src"/> <classpathentry kind="src" path="api"/> diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -12,7 +12,7 @@ org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/META-INF/MANIFEST.MF b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/META-INF/MANIFEST.MF index 60a7a711115..bff53dc8fc6 100644 --- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/META-INF/MANIFEST.MF +++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/META-INF/MANIFEST.MF @@ -26,7 +26,7 @@ Bundle-ActivationPolicy: lazy Bundle-ClassPath: . Bundle-Name: %pluginName Bundle-Localization: plugin -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Require-Bundle: org.eclipse.core.databinding;bundle-version="[1.9.0,2.0.0)", org.eclipse.core.expressions;bundle-version="[3.6.0,4.0.0)", org.eclipse.draw2d;bundle-version="[3.10.0,4.0.0)", @@ -42,19 +42,20 @@ Require-Bundle: org.eclipse.core.databinding;bundle-version="[1.9.0,2.0.0)", org.eclipse.papyrus.infra.tools;bundle-version="[4.0.0,5.0.0)", org.eclipse.papyrus.infra.widgets;bundle-version="[4.0.0,5.0.0)", org.eclipse.papyrus.infra.widgets.toolbox;bundle-version="[3.0.0,4.0.0)", + org.eclipse.papyrus.views.properties.services;bundle-version="[1.0.0,2.0.0)", org.eclipse.ui.ide;bundle-version="[3.17.0,4.0.0)", org.eclipse.ui.views.properties.tabbed;bundle-version="[3.8.0,4.0.0)", org.eclipse.uml2.types;bundle-version="[2.5.0,3.0.0)" Bundle-Vendor: %providerName -Bundle-Version: 3.4.0.qualifier +Bundle-Version: 3.5.100.qualifier Eclipse-BuddyPolicy: dependent Bundle-ManifestVersion: 2 Bundle-Activator: org.eclipse.papyrus.infra.ui.Activator Bundle-Description: Plugin dedicated to manage generic menus and actions, linked to EMF but not to UML nor GMF technologies. Bundle-SymbolicName: org.eclipse.papyrus.infra.ui;singleton:=true -Import-Package: com.google.common.base;version="[30.1.0, 31.0.0)", - com.google.common.cache;version="[30.1.0, 31.0.0)", - com.google.common.collect;version="[30.1.0, 31.0.0)", - com.google.common.util.concurrent;version="[30.1.0, 31.0.0)" +Import-Package: com.google.common.base;version="[33.1.0,33.2.0)", + com.google.common.cache;version="[33.1.0,33.2.0)", + com.google.common.collect;version="[33.1.0,33.2.0)", + com.google.common.util.concurrent;version="[33.1.0,33.2.0)" Automatic-Module-Name: org.eclipse.papyrus.infra.ui diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/pom.xml b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/pom.xml index e8cf2944f47..66d33f3c28e 100644 --- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/pom.xml +++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/pom.xml @@ -9,7 +9,7 @@ <version>0.0.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.papyrus.infra.ui</artifactId> - <version>3.4.0-SNAPSHOT</version> + <version>3.5.100-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> <description>Plugin dedicated to manage generic menus and actions, linked to EMF but not to UML nor GMF technologies.</description> </project>
\ No newline at end of file diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/Activator.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/Activator.java index 3ede5b6fadb..e40b0da8a2c 100644 --- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/Activator.java +++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/Activator.java @@ -1,5 +1,5 @@ /***************************************************************************** - * Copyright (c) 2011, 2016, 2021 CEA LIST, Christian W. Damus, and others. + * Copyright (c) 2011, 2016, 2021-2022 CEA LIST, Christian W. Damus, and others. * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 @@ -12,7 +12,7 @@ * Francois Le Fevre (CEA LIST) francois.le-fevre@cea.fr - Initial API and implementation * Christian W. Damus = bug 485220 * Pauline DEVILLE (CEA LIST) pauline.deville@cea.fr - Bug 571948 - * + * Vincent LORENZO (CEA) - vincent.lorenzo@cea.fr - bug 581073 *****************************************************************************/ package org.eclipse.papyrus.infra.ui; @@ -24,14 +24,17 @@ import org.eclipse.papyrus.infra.core.services.spi.IContextualServiceRegistryTra import org.eclipse.papyrus.infra.tools.spi.IExecutorServiceFactory; import org.eclipse.papyrus.infra.tools.spi.INotificationBuilderFactory; import org.eclipse.papyrus.infra.ui.api.services.IStatusService; +import org.eclipse.papyrus.infra.ui.editor.PapyrusEditorPropertySheetPageViewProvider; import org.eclipse.papyrus.infra.ui.internal.services.status.StatusService; import org.eclipse.papyrus.infra.ui.util.UIUtil; import org.eclipse.papyrus.infra.ui.util.WorkbenchPartHelper; import org.eclipse.papyrus.infra.widgets.toolbox.notification.builders.NotificationBuilder; +import org.eclipse.papyrus.views.properties.services.IPropertySheetPageProviderService; import org.eclipse.swt.widgets.Display; import org.eclipse.ui.IEditorPart; import org.eclipse.ui.plugin.AbstractUIPlugin; import org.osgi.framework.BundleContext; +import org.osgi.framework.ServiceReference; import org.osgi.framework.ServiceRegistration; /** @@ -70,6 +73,18 @@ public class Activator extends AbstractUIPlugin { plugin = this; log = new LogHelper(this); + // 1. get the bundle context + final BundleContext bc = Activator.getDefault().getBundle().getBundleContext(); + // 2. find the property page service + final ServiceReference<IPropertySheetPageProviderService> servreg = bc.getServiceReference(IPropertySheetPageProviderService.class); + if (servreg != null) { + final IPropertySheetPageProviderService provider = bc.getService(servreg); + if (provider != null) { + // 3. register the property view provider for the Diagram + provider.registerPropertySheetPageProvider(new PapyrusEditorPropertySheetPageViewProvider()); + } + } + IExecutorServiceFactory executorFactory = () -> UIUtil.createUIExecutor(Display.getDefault()); executorFactoryReg = context.registerService(IExecutorServiceFactory.class, executorFactory, null); diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/CoreMultiDiagramEditor.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/CoreMultiDiagramEditor.java index 036ddaa5522..f659bc17331 100644 --- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/CoreMultiDiagramEditor.java +++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/CoreMultiDiagramEditor.java @@ -1,5 +1,5 @@ /***************************************************************************** - * Copyright (c) 2008, 2016, 2021 LIFL, CEA LIST, Christian W. Damus, and others. + * Copyright (c) 2008, 2016, 2021-2023 LIFL, CEA LIST, Christian W. Damus, and others. * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 @@ -16,7 +16,9 @@ * Christian W. Damus (CEA) - bug 437217 * Christian W. Damus - bugs 469464, 469188, 485220, 496299 * Pauline DEVILLE (CEA LIST) - bug 571948 - * + * Vincent LORENZO (CEA) - vincent.lorenzo@cea.fr - bug 581073 + * Patrick Tessier (CEA LIST) - bug 562218 + * Vincent Lorenzo (CEA LIST) - bug 581653 *****************************************************************************/ package org.eclipse.papyrus.infra.ui.editor; @@ -56,6 +58,7 @@ import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.jface.viewers.ILabelProvider; import org.eclipse.jface.viewers.ISelection; import org.eclipse.osgi.util.NLS; +import org.eclipse.papyrus.infra.core.api.IServiceRegistryIndexer; import org.eclipse.papyrus.infra.core.editor.BackboneException; import org.eclipse.papyrus.infra.core.language.ILanguageChangeListener; import org.eclipse.papyrus.infra.core.language.ILanguageService; @@ -68,14 +71,12 @@ import org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.DiSashModelM import org.eclipse.papyrus.infra.core.sasheditor.editor.AbstractMultiPageSashEditor; import org.eclipse.papyrus.infra.core.sasheditor.editor.ISashWindowsContainer; import org.eclipse.papyrus.infra.core.sashwindows.di.service.IPageManager; -import org.eclipse.papyrus.infra.core.services.ExtensionServicesRegistry; import org.eclipse.papyrus.infra.core.services.ServiceException; import org.eclipse.papyrus.infra.core.services.ServiceMultiException; import org.eclipse.papyrus.infra.core.services.ServiceStartKind; import org.eclipse.papyrus.infra.core.services.ServicesRegistry; import org.eclipse.papyrus.infra.core.utils.ServiceUtils; -import org.eclipse.papyrus.infra.emf.resource.ICrossReferenceIndex; -import org.eclipse.papyrus.infra.emf.resource.ShardResourceLocator; +import org.eclipse.papyrus.infra.emf.api.IModelSetService; import org.eclipse.papyrus.infra.ui.Activator; import org.eclipse.papyrus.infra.ui.api.services.IStatusService; import org.eclipse.papyrus.infra.ui.contentoutline.ContentOutlineRegistry; @@ -95,6 +96,7 @@ import org.eclipse.papyrus.infra.ui.services.EditorLifecycleManager; import org.eclipse.papyrus.infra.ui.services.internal.EditorLifecycleManagerImpl; import org.eclipse.papyrus.infra.ui.services.internal.InternalEditorLifecycleManager; import org.eclipse.papyrus.infra.ui.util.EditorUtils; +import org.eclipse.papyrus.views.properties.services.IPropertySheetPageProviderService; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Display; import org.eclipse.ui.IEditorActionBarContributor; @@ -165,6 +167,12 @@ public class CoreMultiDiagramEditor extends AbstractMultiPageSashEditor implemen private final List<Runnable> closeActions = new ArrayList<>(); + private boolean needsRefresh; + + private IModelSetService modelSetService; + + private IServiceRegistryIndexer serviceRegistryIndexer; + /** * Listener on {@link ISaveAndDirtyService#addInputChangedListener(IEditorInputChangedListener)} */ @@ -285,6 +293,12 @@ public class CoreMultiDiagramEditor extends AbstractMultiPageSashEditor implemen BundleContext bundleContext = FrameworkUtil.getBundle(this.getClass()).getBundleContext(); ServiceReference<IStatusService> statusServiceRef = bundleContext.getServiceReference(IStatusService.class); loadingStatusService = bundleContext.getService(statusServiceRef); + // get the OSGI context + final ServiceReference<IModelSetService> serviceRef = bundleContext.getServiceReference(IModelSetService.class); + modelSetService = bundleContext.getService(serviceRef); + final ServiceReference<IServiceRegistryIndexer> serviceregistryIndexerRef = bundleContext.getServiceReference(IServiceRegistryIndexer.class); + serviceRegistryIndexer = bundleContext.getService(serviceregistryIndexerRef); + } /** @@ -326,16 +340,7 @@ public class CoreMultiDiagramEditor extends AbstractMultiPageSashEditor implemen * @return */ private ServicesRegistry createServicesRegistry() { - // Create Services Registry - try { - ServicesRegistry servicesRegistry = new ExtensionServicesRegistry(org.eclipse.papyrus.infra.core.Activator.PLUGIN_ID); - // servicesRegistry.startRegistry(); - return servicesRegistry; - } catch (ServiceException e) { - // Show log and error - log.error(e.getMessage(), e); - } - return null; + return serviceRegistryIndexer.createServiceRegistryAttachTo(this); } /** @@ -637,19 +642,10 @@ public class CoreMultiDiagramEditor extends AbstractMultiPageSashEditor implemen servicesRegistry.startServicesByClassKeys(servicesToStart); - resourceSet = servicesRegistry.getService(ModelSet.class); - - if (resourceSet.isShardingSupported()) { - // Install shard resource handling - new ShardResourceLocator(resourceSet); + resourceSet = modelSetService.loadModelSet(uri, servicesRegistry); - // Resolve a possible shard URI - uri = EditorUtils.resolveShardRoot( - ICrossReferenceIndex.getInstance(resourceSet), uri); - } + serviceRegistryIndexer.associateServiceRegistry(resourceSet, servicesRegistry); - // Load it up - resourceSet.loadModels(uri); // start remaining services servicesRegistry.startRegistry(); @@ -659,16 +655,6 @@ public class CoreMultiDiagramEditor extends AbstractMultiPageSashEditor implemen if (!name.equals(getPartName())) { setPartName(name); } - } catch (ModelMultiException e) { - try { - // with the ModelMultiException it is still possible to open the - // editors that's why the service registry is still started - servicesRegistry.startRegistry(); - warnUser(e); - } catch (ServiceException e1) { - log.error(e); - // throw new PartInitException("could not initialize services", e); //$NON-NLS-1$ - } } catch (ServiceException e) { log.error(e); // throw new PartInitException("could not initialize services", e); @@ -855,22 +841,64 @@ public class CoreMultiDiagramEditor extends AbstractMultiPageSashEditor implemen * @see org.eclipse.papyrus.infra.ui.editor.IMultiDiagramEditor#getPropertySheetPage() */ public IPropertySheetPage getPropertySheetPage() { - IPropertySheetPage propertiesPage = new MultiDiagramPropertySheetPage(this); - propertiesPages.add(propertiesPage); - return propertiesPage; + IPropertySheetPage propertyPage = null; + // 1. get the service + final IPropertySheetPageProviderService provider = getPropertySheetPageProviderService(); + if (provider != null) { + // 2. get the property page + propertyPage = provider.createPropertySheetPage(this, getEditorSite().getId()); // call implies to get value "org.eclipse.papyrus.infra.core.papyrusEditor" and requires to find the editor in the Property Service + } + if (propertyPage != null) { + propertiesPages.add(propertyPage); + } + return propertyPage; + } + + /** + * This method returns the {@link IPropertySheetPage} + * + * @return + * the property sheet page provider service + */ + private IPropertySheetPageProviderService getPropertySheetPageProviderService() { + // 1. get the bundle context + final BundleContext bc = Activator.getDefault().getBundle().getBundleContext(); + // 2. find the property page service + final ServiceReference<IPropertySheetPageProviderService> servreg = bc.getServiceReference(IPropertySheetPageProviderService.class); + if (servreg != null) { + final IPropertySheetPageProviderService provider = bc.getService(servreg); + if (provider != null) { + return provider; + } + } + return null; } @Override public void dispose() { - for (IPropertySheetPage propertiesPage : this.propertiesPages) { - propertiesPage.dispose(); + // 1. get the service + final IPropertySheetPageProviderService provider = getPropertySheetPageProviderService(); + if (provider != null) { + // 2. dispose each property page + for (IPropertySheetPage propertySheetPage : this.propertiesPages) { + provider.dispose(propertySheetPage); + } } + propertiesPages.clear(); // Forget the outline page(s) contentOutlineRegistry = null; super.dispose(); + + if (this.serviceRegistryIndexer != null) { + if (this.resourceSet != null) { + serviceRegistryIndexer.getServiceRegistryMap().remove(this.resourceSet); + } + serviceRegistryIndexer.getServiceRegistryMap().remove(this); + serviceRegistryIndexer = null; + } } private IReloadableEditor createReloadAdapter() { @@ -971,6 +999,7 @@ public class CoreMultiDiagramEditor extends AbstractMultiPageSashEditor implemen closeActions.clear(); transactionalEditingDomain = null; + serviceRegistryIndexer.getServiceRegistryMap().remove(this.resourceSet); resourceSet = null; undoContext = null; saveAndDirtyService = null; @@ -1212,8 +1241,6 @@ public class CoreMultiDiagramEditor extends AbstractMultiPageSashEditor implemen } } - private boolean needsRefresh; - protected void scheduleRefresh() { needsRefresh = true; Display.getDefault().asyncExec(new Runnable() { diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/PapyrusEditorPropertySheetPageViewProvider.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/PapyrusEditorPropertySheetPageViewProvider.java new file mode 100755 index 00000000000..dd0d12eb987 --- /dev/null +++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/editor/PapyrusEditorPropertySheetPageViewProvider.java @@ -0,0 +1,75 @@ +/***************************************************************************** + * Copyright (c) 2022 CEA LIST and others. + * + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * + * Contributors: + * Vincent LORENZO (CEA LIST) - vincent.lorenzo@cea.fr - Initial API and implementation + * + *****************************************************************************/ + +package org.eclipse.papyrus.infra.ui.editor; + +import org.eclipse.papyrus.views.properties.services.IPropertySheetPageProvider; +import org.eclipse.ui.views.properties.IPropertySheetPage; + +/** + * Papyrus Editor Property Sheet Page Provider using the XWT Renderer + * + * @since 3.5 + */ +public class PapyrusEditorPropertySheetPageViewProvider implements IPropertySheetPageProvider { + + /** + * @see org.eclipse.papyrus.views.properties.services.IPropertySheetPageProvider#getRendererID() + * + * @return + */ + @Override + public String getRendererID() { + return "XWT"; //$NON-NLS-1$ + } + + /** + * @see org.eclipse.papyrus.views.properties.services.IPropertySheetPageProvider#provides(java.lang.Object, java.lang.String) + * + * @param realContributor + * @param viewID + * @return + */ + @Override + public boolean provides(final Object realContributor, final String viewID) { + return realContributor instanceof CoreMultiDiagramEditor; + } + + /** + * @see org.eclipse.papyrus.views.properties.services.IPropertySheetPageProvider#createPropertyPage(java.lang.Object, java.lang.String) + * + * @param realContributor + * @param viewID + * @return + */ + @Override + public IPropertySheetPage createPropertyPage(final Object realContributor, final String viewID) { + if (realContributor instanceof CoreMultiDiagramEditor) { + return new MultiDiagramPropertySheetPage((CoreMultiDiagramEditor) realContributor); + } + return null; + } + + /** + * @see org.eclipse.papyrus.views.properties.services.IPropertySheetPageProvider#dispose(org.eclipse.ui.views.properties.IPropertySheetPage) + * + * @param propertySheetPage + */ + @Override + public void dispose(final IPropertySheetPage propertySheetPage) { + propertySheetPage.dispose(); + } + +} diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/multidiagram/actionbarcontributor/ActionBarContributorDescriptor.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/multidiagram/actionbarcontributor/ActionBarContributorDescriptor.java index b6d8d22810c..1d9c8dee22e 100644 --- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/multidiagram/actionbarcontributor/ActionBarContributorDescriptor.java +++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/multidiagram/actionbarcontributor/ActionBarContributorDescriptor.java @@ -1,5 +1,5 @@ /***************************************************************************** - * Copyright (c) 2008 CEA LIST. + * Copyright (c) 2008, 2023 CEA LIST. * * * All rights reserved. This program and the accompanying materials @@ -11,10 +11,12 @@ * * Contributors: * Cedric Dumoulin Cedric.dumoulin@lifl.fr - Initial API and implementation - * + * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - bug 581660 *****************************************************************************/ package org.eclipse.papyrus.infra.ui.multidiagram.actionbarcontributor; +import java.lang.reflect.InvocationTargetException; + import org.eclipse.papyrus.infra.core.editor.BackboneException; import org.eclipse.ui.part.EditorActionBarContributor; @@ -54,7 +56,7 @@ public class ActionBarContributorDescriptor { private EditorActionBarContributor createActionBarContributor() throws BackboneException { try { - EditorActionBarContributor context = contextClass.newInstance(); + EditorActionBarContributor context = contextClass.getDeclaredConstructor().newInstance(); return context; } catch (SecurityException e) { @@ -69,6 +71,18 @@ public class ActionBarContributorDescriptor { // Lets propagate. This is an implementation problem that should be // solved by programmer. throw new RuntimeException(e); + } catch (IllegalArgumentException e) { + // Lets propagate. This is an implementation problem that should be + // solved by programmer. + throw new RuntimeException(e); + } catch (InvocationTargetException e) { + // Lets propagate. This is an implementation problem that should be + // solved by programmer. + throw new RuntimeException(e); + } catch (NoSuchMethodException e) { + // Lets propagate. This is an implementation problem that should be + // solved by programmer. + throw new RuntimeException(e); } } diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/multidiagram/actionbarcontributor/ActionBarContributorRegistry.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/multidiagram/actionbarcontributor/ActionBarContributorRegistry.java index 95631d08bd9..0f7f5f28fc3 100644 --- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/multidiagram/actionbarcontributor/ActionBarContributorRegistry.java +++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/multidiagram/actionbarcontributor/ActionBarContributorRegistry.java @@ -1,5 +1,5 @@ /***************************************************************************** - * Copyright (c) 2008 CEA LIST. + * Copyright (c) 2008, 2023 CEA LIST. * * * All rights reserved. This program and the accompanying materials @@ -11,7 +11,7 @@ * * Contributors: * Cedric Dumoulin Cedric.dumoulin@lifl.fr - Initial API and implementation - * + * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - bug 581660 *****************************************************************************/ package org.eclipse.papyrus.infra.ui.multidiagram.actionbarcontributor; @@ -42,7 +42,7 @@ import org.eclipse.ui.part.EditorActionBarContributor; public class ActionBarContributorRegistry implements IActionBarContributorFactory, IService { /** ID of the editor extension (schema filename) */ - public static final String EDITOR_EXTENSION_ID = "papyrusDiagram"; + public static final String EDITOR_EXTENSION_ID = "papyrusDiagram"; //$NON-NLS-1$ /** Namespace where to look for the extension points. */ protected String extensionPointNamespace; @@ -79,7 +79,7 @@ public class ActionBarContributorRegistry implements IActionBarContributorFactor return desc.getActionBarContributor(); } catch (NullPointerException e) { // no context found. - throw new NotFoundException("No ActionBarContributor registered under id '" + key + "'."); + throw new NotFoundException("No ActionBarContributor registered under id '" + key + "'."); //$NON-NLS-1$ //$NON-NLS-2$ } } @@ -91,7 +91,7 @@ public class ActionBarContributorRegistry implements IActionBarContributorFactor * If a contributor fail to be loaded. */ public List<EditorActionBarContributor> getActionBarContributors() throws BackboneException { - List<EditorActionBarContributor> res = new ArrayList<EditorActionBarContributor>(); + List<EditorActionBarContributor> res = new ArrayList<>(); for (ActionBarContributorDescriptor desc : editorContextDescriptors.values()) { res.add(desc.getActionBarContributor()); } @@ -116,7 +116,7 @@ public class ActionBarContributorRegistry implements IActionBarContributorFactor */ private void initializeEditorContextDescriptors() { - editorContextDescriptors = new HashMap<Object, ActionBarContributorDescriptor>(); + editorContextDescriptors = new HashMap<>(); // Reading data from plugins IConfigurationElement[] configElements = Platform.getExtensionRegistry().getConfigurationElementsFor(extensionPointNamespace, EDITOR_EXTENSION_ID); @@ -132,7 +132,7 @@ public class ActionBarContributorRegistry implements IActionBarContributorFactor // Already exists. Check if it is the same ActionBarContributorDescriptor existingDesc = editorContextDescriptors.get(desc.contextId); if (desc.equals(existingDesc)) { - log.warn("More than one ActionBarContributor is registered under the name '" + desc.contextId + "', with different parameters. Extra declaration are discarded."); + log.warn("More than one ActionBarContributor is registered under the name '" + desc.contextId + "', with different parameters. Extra declaration are discarded."); //$NON-NLS-1$ //$NON-NLS-2$ } } else { editorContextDescriptors.put(desc.contextId, desc); @@ -144,7 +144,7 @@ public class ActionBarContributorRegistry implements IActionBarContributorFactor } if (log.isDebugEnabled()) { - log.debug(this.getClass().getSimpleName() + " : contributors desc loaded [" + editorContextDescriptors.size() + "]"); + log.debug(this.getClass().getSimpleName() + " : contributors desc loaded [" + editorContextDescriptors.size() + "]"); //$NON-NLS-1$ //$NON-NLS-2$ } } @@ -174,6 +174,12 @@ public class ActionBarContributorRegistry implements IActionBarContributorFactor */ @Override public void disposeService() { + for (final ActionBarContributorDescriptor descriptor : editorContextDescriptors.values()) { + descriptor.contextClass = null; + descriptor.contextId = null; + descriptor.instance = null; + } + editorContextDescriptors = null; } } diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/multidiagram/actionbarcontributor/CoreComposedActionBarContributor.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/multidiagram/actionbarcontributor/CoreComposedActionBarContributor.java index 418313314de..e622d40055b 100644 --- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/multidiagram/actionbarcontributor/CoreComposedActionBarContributor.java +++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/multidiagram/actionbarcontributor/CoreComposedActionBarContributor.java @@ -1,5 +1,5 @@ /***************************************************************************** - * Copyright (c) 2008 CEA LIST. + * Copyright (c) 2008, 2023 CEA LIST. * * * All rights reserved. This program and the accompanying materials @@ -11,7 +11,7 @@ * * Contributors: * Cedric Dumoulin Cedric.dumoulin@lifl.fr - Initial API and implementation - * + * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - bug 581660 *****************************************************************************/ package org.eclipse.papyrus.infra.ui.multidiagram.actionbarcontributor; @@ -81,6 +81,9 @@ public class CoreComposedActionBarContributor extends ComposedActionBarContribut for (EditorActionBarContributor contributor : contributors) { contributor.dispose(); } + + contributors = null; + actionBarContributorRegistry = null; super.dispose(); } diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.widgets.toolbox/.classpath b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets.toolbox/.classpath index e801ebfb468..81fe078c20c 100644 --- a/plugins/infra/ui/org.eclipse.papyrus.infra.widgets.toolbox/.classpath +++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets.toolbox/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src"/> <classpathentry kind="output" path="bin"/> diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.widgets.toolbox/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets.toolbox/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/infra/ui/org.eclipse.papyrus.infra.widgets.toolbox/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets.toolbox/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -12,7 +12,7 @@ org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.widgets.toolbox/META-INF/MANIFEST.MF b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets.toolbox/META-INF/MANIFEST.MF index e8f052d2fbd..ffb0101bc4d 100644 --- a/plugins/infra/ui/org.eclipse.papyrus.infra.widgets.toolbox/META-INF/MANIFEST.MF +++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets.toolbox/META-INF/MANIFEST.MF @@ -23,5 +23,5 @@ Bundle-Localization: plugin Bundle-Activator: org.eclipse.papyrus.infra.widgets.toolbox.Activator Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.infra.widgets.toolbox;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.infra.widgets.toolbox diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/.classpath b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/.classpath index e801ebfb468..81fe078c20c 100644 --- a/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/.classpath +++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src"/> <classpathentry kind="output" path="bin"/> diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -12,7 +12,7 @@ org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/META-INF/MANIFEST.MF b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/META-INF/MANIFEST.MF index 4ac02b669ec..f1ff93164f2 100644 --- a/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/META-INF/MANIFEST.MF +++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/META-INF/MANIFEST.MF @@ -33,13 +33,13 @@ Export-Package: org.eclipse.papyrus.infra.widgets, org.eclipse.papyrus.infra.widgets.wizard.pages Bundle-Vendor: %providerName Bundle-ActivationPolicy: lazy -Bundle-Version: 4.1.0.qualifier +Bundle-Version: 4.3.0.qualifier Bundle-Name: %pluginName Bundle-Localization: plugin Bundle-ManifestVersion: 2 Bundle-Activator: org.eclipse.papyrus.infra.widgets.Activator Bundle-Description: %pluginDescription Bundle-SymbolicName: org.eclipse.papyrus.infra.widgets;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 -Import-Package: com.google.common.collect;version="[30.1.0, 31.0.0)" +Bundle-RequiredExecutionEnvironment: JavaSE-17 +Import-Package: com.google.common.collect;version="[33.1.0,33.2.0)" Automatic-Module-Name: org.eclipse.papyrus.infra.widgets diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/pom.xml b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/pom.xml index 5d25a653cfc..ad36d2c66b2 100644 --- a/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/pom.xml +++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/pom.xml @@ -9,6 +9,6 @@ <version>0.0.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.papyrus.infra.widgets</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project>
\ No newline at end of file diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/BooleanCheckbox.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/BooleanCheckbox.java index 39adad24442..997e67f7e53 100644 --- a/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/BooleanCheckbox.java +++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/BooleanCheckbox.java @@ -15,7 +15,7 @@ package org.eclipse.papyrus.infra.widgets.editors; import org.eclipse.core.databinding.observable.value.IObservableValue; -import org.eclipse.jface.databinding.swt.WidgetProperties; +import org.eclipse.jface.databinding.swt.typed.WidgetProperties; import org.eclipse.jface.fieldassist.FieldDecorationRegistry; import org.eclipse.papyrus.infra.tools.databinding.AggregatedObservable; import org.eclipse.papyrus.infra.widgets.databinding.GrayedCheckboxObservableValue; @@ -67,7 +67,7 @@ public class BooleanCheckbox extends AbstractValueEditor { super(parent); checkbox = factory.createButton(this, label, SWT.CHECK | style); - IObservableValue widgetObservable = WidgetProperties.selection().observe(checkbox); + IObservableValue widgetObservable = WidgetProperties.widgetSelection().observe(checkbox); setWidgetObservable(widgetObservable, true); GridData gridData = getDefaultLayoutData(); checkbox.setLayoutData(gridData); @@ -88,7 +88,7 @@ public class BooleanCheckbox extends AbstractValueEditor { this.aggregated = (AggregatedObservable) modelProperty; newWidgetObservable = new GrayedCheckboxObservableValue(checkbox, aggregated); } else { - newWidgetObservable = WidgetProperties.selection().observe(checkbox); + newWidgetObservable = WidgetProperties.widgetSelection().observe(checkbox); } setWidgetObservable(newWidgetObservable, true); super.setModelObservable(modelProperty); diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/BooleanCombo.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/BooleanCombo.java index 30b26007a31..c4fcc4e747d 100644 --- a/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/BooleanCombo.java +++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/BooleanCombo.java @@ -14,7 +14,7 @@ *****************************************************************************/ package org.eclipse.papyrus.infra.widgets.editors; -import org.eclipse.jface.databinding.viewers.ViewerProperties; +import org.eclipse.jface.databinding.viewers.typed.ViewerProperties; import org.eclipse.jface.viewers.ComboViewer; import org.eclipse.jface.viewers.StructuredSelection; import org.eclipse.papyrus.infra.widgets.providers.AbstractStaticContentProvider; diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/BooleanRadio.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/BooleanRadio.java index bed5f18645b..aa7e8228f40 100644 --- a/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/BooleanRadio.java +++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/BooleanRadio.java @@ -12,13 +12,13 @@ * Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation * Thibault Le Ouay t.leouay@sherpa-eng.com - Add binding implementation * Sebastien Gabel (Esterel Technologies SAS) - Bug 497361 - * + * *****************************************************************************/ package org.eclipse.papyrus.infra.widgets.editors; import org.eclipse.core.databinding.observable.value.IObservableValue; import org.eclipse.core.databinding.observable.value.SelectObservableValue; -import org.eclipse.jface.databinding.swt.WidgetProperties; +import org.eclipse.jface.databinding.swt.typed.WidgetProperties; import org.eclipse.jface.fieldassist.ControlDecoration; import org.eclipse.jface.fieldassist.FieldDecorationRegistry; import org.eclipse.swt.SWT; @@ -88,7 +88,7 @@ public class BooleanRadio extends AbstractValueEditor { setWidgetObservable(getObservable(), true); controlDecoration = new ControlDecoration(trueRadio, SWT.TOP | SWT.LEFT); - + // Use a dedicated grid data for each radio, otherwise one of the two labels may be truncated. GridData trueGd = new GridData(); trueGd.horizontalIndent = FieldDecorationRegistry.getDefault().getMaximumDecorationWidth(); @@ -106,8 +106,8 @@ public class BooleanRadio extends AbstractValueEditor { * @return The encapsulating observable value */ private IObservableValue getObservable() { - IObservableValue trueObservable = WidgetProperties.selection().observe(trueRadio); - IObservableValue falseObservable = WidgetProperties.selection().observe(falseRadio); + IObservableValue trueObservable = WidgetProperties.widgetSelection().observe(trueRadio); + IObservableValue falseObservable = WidgetProperties.widgetSelection().observe(falseRadio); SelectObservableValue observable = new SelectObservableValue(); observable.addOption(true, trueObservable); diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/BooleanToggle.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/BooleanToggle.java index 1d099906faf..b3616becc6b 100644 --- a/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/BooleanToggle.java +++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/BooleanToggle.java @@ -15,7 +15,7 @@ package org.eclipse.papyrus.infra.widgets.editors; import org.eclipse.core.runtime.IStatus; -import org.eclipse.jface.databinding.swt.WidgetProperties; +import org.eclipse.jface.databinding.swt.typed.WidgetProperties; import org.eclipse.jface.fieldassist.ControlDecoration; import org.eclipse.jface.fieldassist.FieldDecoration; import org.eclipse.jface.fieldassist.FieldDecorationRegistry; @@ -43,7 +43,7 @@ public class BooleanToggle extends AbstractValueEditor { super(parent, SWT.NONE, label); toggleButton = factory.createButton(this, null, style | SWT.TOGGLE); - setWidgetObservable(WidgetProperties.selection().observe(toggleButton)); + setWidgetObservable(WidgetProperties.widgetSelection().observe(toggleButton)); setCommitOnFocusLost(toggleButton); GridData gridData = new GridData(); toggleButton.setLayoutData(gridData); diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/EnumRadio.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/EnumRadio.java index dfa0d101358..29d9451b7da 100644 --- a/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/EnumRadio.java +++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/EnumRadio.java @@ -20,7 +20,7 @@ import java.util.Map; import org.eclipse.core.databinding.observable.value.IObservableValue; import org.eclipse.core.databinding.observable.value.SelectObservableValue; import org.eclipse.core.runtime.IStatus; -import org.eclipse.jface.databinding.swt.WidgetProperties; +import org.eclipse.jface.databinding.swt.typed.WidgetProperties; import org.eclipse.jface.fieldassist.ControlDecoration; import org.eclipse.jface.fieldassist.FieldDecoration; import org.eclipse.jface.fieldassist.FieldDecorationRegistry; @@ -56,7 +56,7 @@ public class EnumRadio extends AbstractValueEditor { protected ILabelProvider labelProvider = new LabelProvider(); - protected final Map<Button, Object> values = new HashMap<Button, Object>(); + protected final Map<Button, Object> values = new HashMap<>(); protected int numColumns = -1; @@ -109,7 +109,7 @@ public class EnumRadio extends AbstractValueEditor { button.setBackground(buttonsArea.getBackground()); // For Radio buttons, we need to force the color button.setData(value); button.setToolTipText(toolTipText); - IObservableValue buttonObservable = WidgetProperties.selection().observe(button); + IObservableValue buttonObservable = WidgetProperties.widgetSelection().observe(button); observable.addOption(value, buttonObservable); values.put(button, value); diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/FloatEditor.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/FloatEditor.java index d2f35856ad8..e8be4d8357c 100644 --- a/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/FloatEditor.java +++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/FloatEditor.java @@ -16,8 +16,8 @@ package org.eclipse.papyrus.infra.widgets.editors; import java.util.Locale; import org.eclipse.core.databinding.conversion.IConverter; -import org.eclipse.core.databinding.conversion.NumberToStringConverter; -import org.eclipse.core.databinding.conversion.StringToNumberConverter; +import org.eclipse.core.databinding.conversion.text.NumberToStringConverter; +import org.eclipse.core.databinding.conversion.text.StringToNumberConverter; import org.eclipse.papyrus.infra.widgets.Activator; import org.eclipse.swt.widgets.Composite; diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/IntegerEditor.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/IntegerEditor.java index 37cfa907e48..6443689e8f8 100644 --- a/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/IntegerEditor.java +++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/IntegerEditor.java @@ -15,7 +15,7 @@ package org.eclipse.papyrus.infra.widgets.editors; import org.eclipse.core.databinding.conversion.IConverter; -import org.eclipse.core.databinding.conversion.StringToNumberConverter; +import org.eclipse.core.databinding.conversion.text.StringToNumberConverter; import org.eclipse.papyrus.infra.widgets.Activator; import org.eclipse.papyrus.infra.widgets.validator.IntegerValidator; import org.eclipse.swt.widgets.Composite; @@ -78,7 +78,7 @@ public class IntegerEditor extends StringEditor { if (fromObject instanceof String) { String newString = ((String) fromObject).replaceAll(" ", ""); //$NON-NLS-1$ //$NON-NLS-2$ try { - Integer i = (Integer) StringToNumberConverter.toInteger(false).convert(newString); + Integer i = StringToNumberConverter.toInteger(false).convert(newString); return i; } catch (Exception ex) { diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/IntegerSpinner.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/IntegerSpinner.java index 3dae3f34186..e4fa9a78f6c 100644 --- a/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/IntegerSpinner.java +++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/IntegerSpinner.java @@ -18,7 +18,7 @@ import java.util.Timer; import java.util.TimerTask; import org.eclipse.core.databinding.conversion.IConverter; -import org.eclipse.core.databinding.conversion.StringToNumberConverter; +import org.eclipse.core.databinding.conversion.text.StringToNumberConverter; import org.eclipse.core.databinding.observable.value.AbstractObservableValue; import org.eclipse.core.runtime.IStatus; import org.eclipse.jface.fieldassist.ControlDecoration; @@ -267,7 +267,7 @@ public class IntegerSpinner extends AbstractValueEditor implements KeyListener, spinner.setBackground(ERROR); spinner.update(); } else { - IStatus status = (IStatus) binding.getValidationStatus().getValue(); + IStatus status = binding.getValidationStatus().getValue(); switch (status.getSeverity()) { case IStatus.OK: case IStatus.WARNING: diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/LongEditor.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/LongEditor.java index b11e57372e9..93dc92f2457 100644 --- a/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/LongEditor.java +++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/LongEditor.java @@ -3,8 +3,8 @@ package org.eclipse.papyrus.infra.widgets.editors; import java.util.Locale; import org.eclipse.core.databinding.conversion.IConverter; -import org.eclipse.core.databinding.conversion.NumberToStringConverter; -import org.eclipse.core.databinding.conversion.StringToNumberConverter; +import org.eclipse.core.databinding.conversion.text.NumberToStringConverter; +import org.eclipse.core.databinding.conversion.text.StringToNumberConverter; import org.eclipse.papyrus.infra.widgets.Activator; import org.eclipse.swt.widgets.Composite; diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/UnlimitedNaturalEditor.java b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/UnlimitedNaturalEditor.java index 35aa1aa7b42..3df723b5175 100644 --- a/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/UnlimitedNaturalEditor.java +++ b/plugins/infra/ui/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/infra/widgets/editors/UnlimitedNaturalEditor.java @@ -1,7 +1,7 @@ package org.eclipse.papyrus.infra.widgets.editors; import org.eclipse.core.databinding.conversion.IConverter; -import org.eclipse.core.databinding.conversion.StringToNumberConverter; +import org.eclipse.core.databinding.conversion.text.StringToNumberConverter; import org.eclipse.papyrus.infra.widgets.Activator; import org.eclipse.papyrus.infra.widgets.validator.UnlimitedNaturalValidator; import org.eclipse.swt.widgets.Composite; @@ -55,11 +55,10 @@ public class UnlimitedNaturalEditor extends StringEditor { public Integer convert(Object fromObject) { if (fromObject instanceof String) { String newString = ((String) fromObject).replaceAll(" ", ""); //$NON-NLS-1$ //$NON-NLS-2$ - if (newString.equals("*")) - { + if (newString.equals("*")) { return -1; } - return (Integer) StringToNumberConverter.toInteger(false).convert(newString); + return StringToNumberConverter.toInteger(false).convert(newString); } return 0; } diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/.classpath b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/.classpath index ad5e13cce77..946fb3d346f 100755 --- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/.classpath +++ b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src"/> <classpathentry kind="src" path="src-gen"/> diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -12,7 +12,7 @@ org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/META-INF/MANIFEST.MF b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/META-INF/MANIFEST.MF index 33dc1e176ca..e0cf48e5717 100755 --- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/META-INF/MANIFEST.MF +++ b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/META-INF/MANIFEST.MF @@ -34,11 +34,11 @@ Require-Bundle: org.eclipse.emf.databinding;bundle-version="[1.5.0,2.0.0)", Bundle-Vendor: %providerName Bundle-ActivationPolicy: lazy Bundle-ClassPath: . -Bundle-Version: 4.0.0.qualifier +Bundle-Version: 4.0.100.qualifier Bundle-Localization: plugin Bundle-Name: %pluginName Bundle-ManifestVersion: 2 Bundle-Activator: org.eclipse.papyrus.infra.viewpoints.policy.Activator Bundle-SymbolicName: org.eclipse.papyrus.infra.viewpoints.policy;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.infra.viewpoints.policy diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/pom.xml b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/pom.xml index e7f1afa70b3..74e7f8e9ef2 100644 --- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/pom.xml +++ b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/pom.xml @@ -9,6 +9,6 @@ <version>0.0.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.papyrus.infra.viewpoints.policy</artifactId> - <version>4.0.0-SNAPSHOT</version> + <version>4.0.100-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project>
\ No newline at end of file diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/src/org/eclipse/papyrus/infra/viewpoints/policy/PolicyChecker.java b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/src/org/eclipse/papyrus/infra/viewpoints/policy/PolicyChecker.java index fa4c4b3104f..c514ddda60d 100644 --- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/src/org/eclipse/papyrus/infra/viewpoints/policy/PolicyChecker.java +++ b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/src/org/eclipse/papyrus/infra/viewpoints/policy/PolicyChecker.java @@ -1,5 +1,5 @@ /***************************************************************************** - * Copyright (c) 2013, 2021, 2018 CEA LIST, Christian W. Damus, and others. + * Copyright (c) 2013, 2021, 2018, 2023 CEA LIST, Christian W. Damus, and others. * * * All rights reserved. This program and the accompanying materials @@ -15,6 +15,7 @@ * Christian W. Damus - bugs 463156, 493030, 573886 * Thanh Liem PHAN (ALL4TEC) thanhliem.phan@all4tec.net - Bug 519409 * Benoit Maggi (CEA) - Bug 536581 + * Vincent Lorenzo (CEA-LIST) <vincent.lorenzo@cea.fr> - bug 582023 *****************************************************************************/ package org.eclipse.papyrus.infra.viewpoints.policy; @@ -203,7 +204,7 @@ public class PolicyChecker { */ public ModelAddData getChildAddData(Diagram diagram, EObject parent, EObject child) { ViewPrototype prototype = ViewPrototype.get(diagram); - if (prototype == null) { + if (prototype == null || !(prototype.representationKind instanceof PapyrusDiagram)) { // This diagram is not in the current policy return new ModelAddData(false); } @@ -235,7 +236,7 @@ public class PolicyChecker { */ public ModelAddData getChildAddData(Diagram diagram, EClass parentType, EClass childType) { ViewPrototype prototype = ViewPrototype.get(diagram); - if (prototype == null) { + if (prototype == null || !(prototype.representationKind instanceof PapyrusDiagram)) { // This diagram is not in the current policy return new ModelAddData(false); } @@ -264,7 +265,7 @@ public class PolicyChecker { */ public boolean isInPalette(Diagram diagram, String entryID) { ViewPrototype prototype = ViewPrototype.get(diagram); - if (prototype == null) { + if (prototype == null || !(prototype.representationKind instanceof PapyrusDiagram)) { // This diagram is not in the current policy return false; } @@ -293,7 +294,7 @@ public class PolicyChecker { */ public boolean isInModelingAssistants(Diagram diagram, IElementType elementType) { ViewPrototype prototype = ViewPrototype.get(diagram); - if (prototype == null) { + if (prototype == null || !(prototype.representationKind instanceof PapyrusDiagram)) { // This diagram is not in the current policy return false; } |