diff options
2002 files changed, 10494 insertions, 7100 deletions
diff --git a/examples/core/org.eclipse.papyrus.example.core.lifecycleevents/.classpath b/examples/core/org.eclipse.papyrus.example.core.lifecycleevents/.classpath index e801ebfb468..81fe078c20c 100644 --- a/examples/core/org.eclipse.papyrus.example.core.lifecycleevents/.classpath +++ b/examples/core/org.eclipse.papyrus.example.core.lifecycleevents/.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/examples/core/org.eclipse.papyrus.example.core.lifecycleevents/.settings/org.eclipse.jdt.core.prefs b/examples/core/org.eclipse.papyrus.example.core.lifecycleevents/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/examples/core/org.eclipse.papyrus.example.core.lifecycleevents/.settings/org.eclipse.jdt.core.prefs +++ b/examples/core/org.eclipse.papyrus.example.core.lifecycleevents/.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/examples/core/org.eclipse.papyrus.example.core.lifecycleevents/META-INF/MANIFEST.MF b/examples/core/org.eclipse.papyrus.example.core.lifecycleevents/META-INF/MANIFEST.MF index 84dfc9fed0d..17d30ffe511 100644 --- a/examples/core/org.eclipse.papyrus.example.core.lifecycleevents/META-INF/MANIFEST.MF +++ b/examples/core/org.eclipse.papyrus.example.core.lifecycleevents/META-INF/MANIFEST.MF @@ -10,7 +10,7 @@ Require-Bundle: org.eclipse.emf.transaction;bundle-version="[1.9.0,2.0.0)", org.eclipse.papyrus.infra.ui;bundle-version="[3.0.0,4.0.0)", org.eclipse.ui.views.properties.tabbed;bundle-version="[3.8.0,4.0.0)" Bundle-ActivationPolicy: lazy -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-Vendor: %providerName Export-Package: org.eclipse.papyrus.example.core.lifecycleevents Automatic-Module-Name: org.eclipse.papyrus.example.core.lifecycleevents diff --git a/examples/core/org.eclipse.papyrus.example.core.sashwindows.fulleditor/.classpath b/examples/core/org.eclipse.papyrus.example.core.sashwindows.fulleditor/.classpath index e801ebfb468..81fe078c20c 100644 --- a/examples/core/org.eclipse.papyrus.example.core.sashwindows.fulleditor/.classpath +++ b/examples/core/org.eclipse.papyrus.example.core.sashwindows.fulleditor/.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/examples/core/org.eclipse.papyrus.example.core.sashwindows.fulleditor/.settings/org.eclipse.jdt.core.prefs b/examples/core/org.eclipse.papyrus.example.core.sashwindows.fulleditor/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/examples/core/org.eclipse.papyrus.example.core.sashwindows.fulleditor/.settings/org.eclipse.jdt.core.prefs +++ b/examples/core/org.eclipse.papyrus.example.core.sashwindows.fulleditor/.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/examples/core/org.eclipse.papyrus.example.core.sashwindows.fulleditor/META-INF/MANIFEST.MF b/examples/core/org.eclipse.papyrus.example.core.sashwindows.fulleditor/META-INF/MANIFEST.MF index 98000edd444..10c7f725696 100644 --- a/examples/core/org.eclipse.papyrus.example.core.sashwindows.fulleditor/META-INF/MANIFEST.MF +++ b/examples/core/org.eclipse.papyrus.example.core.sashwindows.fulleditor/META-INF/MANIFEST.MF @@ -15,7 +15,7 @@ Require-Bundle: org.eclipse.emf.ecore.xmi;bundle-version="[2.16.0,3.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)" Bundle-ActivationPolicy: lazy -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-Vendor: %providerName Export-Package: org.eclipse.papyrus.example.core.sashwindows.fulleditor, org.eclipse.papyrus.example.core.sashwindows.fulleditor.editor, diff --git a/examples/core/org.eclipse.papyrus.example.core.sashwindows.fulleditor/plugin.xml b/examples/core/org.eclipse.papyrus.example.core.sashwindows.fulleditor/plugin.xml index d4ed4311242..ca6845ec1de 100644 --- a/examples/core/org.eclipse.papyrus.example.core.sashwindows.fulleditor/plugin.xml +++ b/examples/core/org.eclipse.papyrus.example.core.sashwindows.fulleditor/plugin.xml @@ -1,7 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <?eclipse version="3.2"?> <plugin> - <extension point="org.eclipse.ui.editors"> <editor @@ -35,7 +34,7 @@ <extension point="org.eclipse.ui.menus"> <menuContribution - locationURI="popup:org.eclipse.papyrus.dev.ui.menu"> + locationURI="popup:org.eclipse.papyrus.dev.ui.editors"> <menu id="org.eclipse.example.multitext.ui.menu" label="Sash Windows Full Editor"> @@ -128,5 +127,4 @@ </activeWhen> </handler> </extension> - </plugin> diff --git a/examples/core/org.eclipse.papyrus.example.core.sashwindows.simpleeditor/.classpath b/examples/core/org.eclipse.papyrus.example.core.sashwindows.simpleeditor/.classpath index e801ebfb468..81fe078c20c 100644 --- a/examples/core/org.eclipse.papyrus.example.core.sashwindows.simpleeditor/.classpath +++ b/examples/core/org.eclipse.papyrus.example.core.sashwindows.simpleeditor/.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/examples/core/org.eclipse.papyrus.example.core.sashwindows.simpleeditor/.settings/org.eclipse.jdt.core.prefs b/examples/core/org.eclipse.papyrus.example.core.sashwindows.simpleeditor/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/examples/core/org.eclipse.papyrus.example.core.sashwindows.simpleeditor/.settings/org.eclipse.jdt.core.prefs +++ b/examples/core/org.eclipse.papyrus.example.core.sashwindows.simpleeditor/.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/examples/core/org.eclipse.papyrus.example.core.sashwindows.simpleeditor/META-INF/MANIFEST.MF b/examples/core/org.eclipse.papyrus.example.core.sashwindows.simpleeditor/META-INF/MANIFEST.MF index 557938515c1..6e081f697a8 100644 --- a/examples/core/org.eclipse.papyrus.example.core.sashwindows.simpleeditor/META-INF/MANIFEST.MF +++ b/examples/core/org.eclipse.papyrus.example.core.sashwindows.simpleeditor/META-INF/MANIFEST.MF @@ -13,6 +13,6 @@ Require-Bundle: org.eclipse.core.resources;bundle-version="[3.13.0,4.0.0)", org.eclipse.ui.editors;bundle-version="[3.13.0,4.0.0)", org.eclipse.ui.ide;bundle-version="[3.17.0,4.0.0)" Bundle-ActivationPolicy: lazy -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-Vendor: %providerName Automatic-Module-Name: org.eclipse.papyrus.example.core.sashwindows.simpleeditor diff --git a/examples/custo/org.eclipse.papyrus.example.custo.cyber/.classpath b/examples/custo/org.eclipse.papyrus.example.custo.cyber/.classpath index 9404e3d0f26..ee87847c66c 100644 --- a/examples/custo/org.eclipse.papyrus.example.custo.cyber/.classpath +++ b/examples/custo/org.eclipse.papyrus.example.custo.cyber/.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/examples/custo/org.eclipse.papyrus.example.custo.cyber/.settings/org.eclipse.jdt.core.prefs b/examples/custo/org.eclipse.papyrus.example.custo.cyber/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/examples/custo/org.eclipse.papyrus.example.custo.cyber/.settings/org.eclipse.jdt.core.prefs +++ b/examples/custo/org.eclipse.papyrus.example.custo.cyber/.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/examples/custo/org.eclipse.papyrus.example.custo.cyber/META-INF/MANIFEST.MF b/examples/custo/org.eclipse.papyrus.example.custo.cyber/META-INF/MANIFEST.MF index b3b3ac5c8fa..1b13d990ec1 100644 --- a/examples/custo/org.eclipse.papyrus.example.custo.cyber/META-INF/MANIFEST.MF +++ b/examples/custo/org.eclipse.papyrus.example.custo.cyber/META-INF/MANIFEST.MF @@ -7,7 +7,7 @@ Bundle-ClassPath: . Bundle-Vendor: %providerName Bundle-Localization: plugin Automatic-Module-Name: org.eclipse.papyrus.example.custo.cyber -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.eclipse.papyrus.example.custo.cyber.soft.soft, org.eclipse.papyrus.example.custo.cyber.soft.soft.impl, org.eclipse.papyrus.example.custo.cyber.soft.soft.util diff --git a/examples/emf/org.eclipse.papyrus.outline.emftree/.settings/org.eclipse.jdt.core.prefs b/examples/emf/org.eclipse.papyrus.outline.emftree/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/examples/emf/org.eclipse.papyrus.outline.emftree/.settings/org.eclipse.jdt.core.prefs +++ b/examples/emf/org.eclipse.papyrus.outline.emftree/.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/examples/emf/org.eclipse.papyrus.outline.emftree/META-INF/MANIFEST.MF b/examples/emf/org.eclipse.papyrus.outline.emftree/META-INF/MANIFEST.MF index fda52d11c0b..d9dfd06249a 100644 --- a/examples/emf/org.eclipse.papyrus.outline.emftree/META-INF/MANIFEST.MF +++ b/examples/emf/org.eclipse.papyrus.outline.emftree/META-INF/MANIFEST.MF @@ -15,5 +15,5 @@ Bundle-Name: %pluginName Bundle-ManifestVersion: 2 Bundle-Activator: org.eclipse.papyrus.outline.emftree.Activator Bundle-SymbolicName: org.eclipse.papyrus.outline.emftree;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.outline.emftree diff --git a/examples/infra/org.eclipse.papyrus.example.infra.servicesregistry.retrieval/.classpath b/examples/infra/org.eclipse.papyrus.example.infra.servicesregistry.retrieval/.classpath index e801ebfb468..81fe078c20c 100644 --- a/examples/infra/org.eclipse.papyrus.example.infra.servicesregistry.retrieval/.classpath +++ b/examples/infra/org.eclipse.papyrus.example.infra.servicesregistry.retrieval/.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/examples/infra/org.eclipse.papyrus.example.infra.servicesregistry.retrieval/.settings/org.eclipse.jdt.core.prefs b/examples/infra/org.eclipse.papyrus.example.infra.servicesregistry.retrieval/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/examples/infra/org.eclipse.papyrus.example.infra.servicesregistry.retrieval/.settings/org.eclipse.jdt.core.prefs +++ b/examples/infra/org.eclipse.papyrus.example.infra.servicesregistry.retrieval/.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/examples/infra/org.eclipse.papyrus.example.infra.servicesregistry.retrieval/META-INF/MANIFEST.MF b/examples/infra/org.eclipse.papyrus.example.infra.servicesregistry.retrieval/META-INF/MANIFEST.MF index ae9e5b480e6..f4df446ef27 100644 --- a/examples/infra/org.eclipse.papyrus.example.infra.servicesregistry.retrieval/META-INF/MANIFEST.MF +++ b/examples/infra/org.eclipse.papyrus.example.infra.servicesregistry.retrieval/META-INF/MANIFEST.MF @@ -11,7 +11,7 @@ Require-Bundle: org.eclipse.gmf.runtime.emf.type.core;bundle-version="[1.9.0,2.0 org.eclipse.ui;bundle-version="[3.117.0,4.0.0)", org.eclipse.uml2.types;bundle-version="[2.5.0,3.0.0)" Bundle-ActivationPolicy: lazy -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-Vendor: %providerName Export-Package: org.eclipse.papyrus.example.infra.servicesregistry.retrieval, org.eclipse.papyrus.example.infra.servicesregistry.retrieval.menu.handlers diff --git a/examples/infra/org.eclipse.papyrus.infra.gmfdiag.connectionpoint.preferences/.classpath b/examples/infra/org.eclipse.papyrus.infra.gmfdiag.connectionpoint.preferences/.classpath index e801ebfb468..81fe078c20c 100644 --- a/examples/infra/org.eclipse.papyrus.infra.gmfdiag.connectionpoint.preferences/.classpath +++ b/examples/infra/org.eclipse.papyrus.infra.gmfdiag.connectionpoint.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/examples/infra/org.eclipse.papyrus.infra.gmfdiag.connectionpoint.preferences/.settings/org.eclipse.jdt.core.prefs b/examples/infra/org.eclipse.papyrus.infra.gmfdiag.connectionpoint.preferences/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/examples/infra/org.eclipse.papyrus.infra.gmfdiag.connectionpoint.preferences/.settings/org.eclipse.jdt.core.prefs +++ b/examples/infra/org.eclipse.papyrus.infra.gmfdiag.connectionpoint.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/examples/infra/org.eclipse.papyrus.infra.gmfdiag.connectionpoint.preferences/META-INF/MANIFEST.MF b/examples/infra/org.eclipse.papyrus.infra.gmfdiag.connectionpoint.preferences/META-INF/MANIFEST.MF index ef0d6d8d065..d6f7675d9f6 100644 --- a/examples/infra/org.eclipse.papyrus.infra.gmfdiag.connectionpoint.preferences/META-INF/MANIFEST.MF +++ b/examples/infra/org.eclipse.papyrus.infra.gmfdiag.connectionpoint.preferences/META-INF/MANIFEST.MF @@ -9,6 +9,6 @@ Require-Bundle: org.eclipse.emf.edit.ui;bundle-version="[2.18.0,3.0.0)", org.eclipse.gmf.runtime.diagram.ui;bundle-version="[1.9.0,2.0.0)", org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[4.0.0,5.0.0)", org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="[4.0.0,5.0.0)" -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-ActivationPolicy: lazy Automatic-Module-Name: org.eclipse.papyrus.infra.gmfdiag.connectionpoint.preferences diff --git a/examples/others/org.eclipse.papyrus.example.text.instance/.classpath b/examples/others/org.eclipse.papyrus.example.text.instance/.classpath index c3ba59e4c3a..1a821310bdc 100644 --- a/examples/others/org.eclipse.papyrus.example.text.instance/.classpath +++ b/examples/others/org.eclipse.papyrus.example.text.instance/.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/examples/others/org.eclipse.papyrus.example.text.instance/.settings/org.eclipse.jdt.core.prefs b/examples/others/org.eclipse.papyrus.example.text.instance/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/examples/others/org.eclipse.papyrus.example.text.instance/.settings/org.eclipse.jdt.core.prefs +++ b/examples/others/org.eclipse.papyrus.example.text.instance/.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/examples/others/org.eclipse.papyrus.example.text.instance/META-INF/MANIFEST.MF b/examples/others/org.eclipse.papyrus.example.text.instance/META-INF/MANIFEST.MF index db7ef27e97f..1ad805e4880 100644 --- a/examples/others/org.eclipse.papyrus.example.text.instance/META-INF/MANIFEST.MF +++ b/examples/others/org.eclipse.papyrus.example.text.instance/META-INF/MANIFEST.MF @@ -11,6 +11,6 @@ Bundle-Name: %pluginName Bundle-Localization: plugin Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.example.text.instance;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-Description: %pluginDescription Automatic-Module-Name: org.eclipse.papyrus.example.text.instance diff --git a/examples/uml/edition/org.eclipse.papyrus.examples.uml.edition.profile/.classpath b/examples/uml/edition/org.eclipse.papyrus.examples.uml.edition.profile/.classpath index 9004b3397c2..ee87847c66c 100644 --- a/examples/uml/edition/org.eclipse.papyrus.examples.uml.edition.profile/.classpath +++ b/examples/uml/edition/org.eclipse.papyrus.examples.uml.edition.profile/.classpath @@ -1,8 +1,8 @@ -<?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.pde.core.requiredPlugins"/>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
+<?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-17"/> + <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> + <classpathentry kind="src" path="src"/> + <classpathentry kind="output" path="bin"/> +</classpath> diff --git a/examples/uml/edition/org.eclipse.papyrus.examples.uml.edition.profile/.settings/org.eclipse.jdt.core.prefs b/examples/uml/edition/org.eclipse.papyrus.examples.uml.edition.profile/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100644 --- a/examples/uml/edition/org.eclipse.papyrus.examples.uml.edition.profile/.settings/org.eclipse.jdt.core.prefs +++ b/examples/uml/edition/org.eclipse.papyrus.examples.uml.edition.profile/.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/examples/uml/edition/org.eclipse.papyrus.examples.uml.edition.profile/META-INF/MANIFEST.MF b/examples/uml/edition/org.eclipse.papyrus.examples.uml.edition.profile/META-INF/MANIFEST.MF index 7174dcf1cec..7480a082c45 100644 --- a/examples/uml/edition/org.eclipse.papyrus.examples.uml.edition.profile/META-INF/MANIFEST.MF +++ b/examples/uml/edition/org.eclipse.papyrus.examples.uml.edition.profile/META-INF/MANIFEST.MF @@ -1,21 +1,21 @@ -Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.papyrus.examples.uml.edition.profile;singleton:=true
-Bundle-Version: 1.0.0.qualifier
-Bundle-ClassPath: .
-Bundle-Vendor: %providerName
-Bundle-Localization: plugin
-Bundle-Activator: org.eclipse.papyrus.examples.uml.edition.profile.Activator
-Require-Bundle: org.eclipse.ui;bundle-version="[3.118.0,4.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.20.0,4.0.0)",
- org.eclipse.emf.ecore;bundle-version="[2.23.0,3.0.0)",
- org.eclipse.uml2.types;bundle-version="[2.5.0,3.0.0)",
- org.eclipse.uml2.uml;bundle-version="[5.5.0,6.0.0)",
- org.eclipse.papyrus.uml.extensionpoints;bundle-version="[2.0.0,3.0.0)"
-Bundle-RequiredExecutionEnvironment: JavaSE-11
-Export-Package: org.eclipse.papyrus.examples.uml.edition.profile,
- org.eclipse.papyrus.examples.uml.edition.profile.impl,
- org.eclipse.papyrus.examples.uml.edition.profile.util
-Automatic-Module-Name: org.eclipse.papyrus.examples.uml.edition.profile
-Bundle-ActivationPolicy: lazy
+Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-Name: %pluginName +Bundle-SymbolicName: org.eclipse.papyrus.examples.uml.edition.profile;singleton:=true +Bundle-Version: 1.0.0.qualifier +Bundle-ClassPath: . +Bundle-Vendor: %providerName +Bundle-Localization: plugin +Bundle-Activator: org.eclipse.papyrus.examples.uml.edition.profile.Activator +Require-Bundle: org.eclipse.ui;bundle-version="[3.118.0,4.0.0)", + org.eclipse.core.runtime;bundle-version="[3.20.0,4.0.0)", + org.eclipse.emf.ecore;bundle-version="[2.23.0,3.0.0)", + org.eclipse.uml2.types;bundle-version="[2.5.0,3.0.0)", + org.eclipse.uml2.uml;bundle-version="[5.5.0,6.0.0)", + org.eclipse.papyrus.uml.extensionpoints;bundle-version="[2.0.0,3.0.0)" +Bundle-RequiredExecutionEnvironment: JavaSE-17 +Export-Package: org.eclipse.papyrus.examples.uml.edition.profile, + org.eclipse.papyrus.examples.uml.edition.profile.impl, + org.eclipse.papyrus.examples.uml.edition.profile.util +Automatic-Module-Name: org.eclipse.papyrus.examples.uml.edition.profile +Bundle-ActivationPolicy: lazy diff --git a/examples/uml/org.eclipse.papyrus.example.uml.comment.editor.newresource/.classpath b/examples/uml/org.eclipse.papyrus.example.uml.comment.editor.newresource/.classpath index e801ebfb468..81fe078c20c 100644 --- a/examples/uml/org.eclipse.papyrus.example.uml.comment.editor.newresource/.classpath +++ b/examples/uml/org.eclipse.papyrus.example.uml.comment.editor.newresource/.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/examples/uml/org.eclipse.papyrus.example.uml.comment.editor.newresource/.settings/org.eclipse.jdt.core.prefs b/examples/uml/org.eclipse.papyrus.example.uml.comment.editor.newresource/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/examples/uml/org.eclipse.papyrus.example.uml.comment.editor.newresource/.settings/org.eclipse.jdt.core.prefs +++ b/examples/uml/org.eclipse.papyrus.example.uml.comment.editor.newresource/.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/examples/uml/org.eclipse.papyrus.example.uml.comment.editor.newresource/META-INF/MANIFEST.MF b/examples/uml/org.eclipse.papyrus.example.uml.comment.editor.newresource/META-INF/MANIFEST.MF index 20dc05f251f..de4ba1e0542 100644 --- a/examples/uml/org.eclipse.papyrus.example.uml.comment.editor.newresource/META-INF/MANIFEST.MF +++ b/examples/uml/org.eclipse.papyrus.example.uml.comment.editor.newresource/META-INF/MANIFEST.MF @@ -19,6 +19,6 @@ Bundle-Name: %Bundle-Name Bundle-ManifestVersion: 2 Bundle-Activator: org.eclipse.papyrus.example.uml.comment.editor.newresource.Activator Bundle-SymbolicName: org.eclipse.papyrus.example.uml.comment.editor.newresource;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-Description: %Bundle-Description Automatic-Module-Name: org.eclipse.papyrus.example.uml.comment.editor.newresource diff --git a/examples/uml/org.eclipse.papyrus.example.uml.comment.editor.newresource/plugin.xml b/examples/uml/org.eclipse.papyrus.example.uml.comment.editor.newresource/plugin.xml index e89ad7623d2..a370e99fb32 100644 --- a/examples/uml/org.eclipse.papyrus.example.uml.comment.editor.newresource/plugin.xml +++ b/examples/uml/org.eclipse.papyrus.example.uml.comment.editor.newresource/plugin.xml @@ -46,7 +46,7 @@ point="org.eclipse.ui.menus"> <menuContribution allPopups="false" - locationURI="popup:org.eclipse.papyrus.dev.ui.menu"> + locationURI="popup:org.eclipse.papyrus.dev.ui.editors"> <command commandId="org.eclipse.papyrus.example.uml.comment.editor.command.newresource" icon="icons/texteditorv2.bmp" diff --git a/examples/uml/org.eclipse.papyrus.example.uml.comment.editor.sharedresource/.classpath b/examples/uml/org.eclipse.papyrus.example.uml.comment.editor.sharedresource/.classpath index e801ebfb468..81fe078c20c 100644 --- a/examples/uml/org.eclipse.papyrus.example.uml.comment.editor.sharedresource/.classpath +++ b/examples/uml/org.eclipse.papyrus.example.uml.comment.editor.sharedresource/.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/examples/uml/org.eclipse.papyrus.example.uml.comment.editor.sharedresource/.settings/org.eclipse.jdt.core.prefs b/examples/uml/org.eclipse.papyrus.example.uml.comment.editor.sharedresource/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/examples/uml/org.eclipse.papyrus.example.uml.comment.editor.sharedresource/.settings/org.eclipse.jdt.core.prefs +++ b/examples/uml/org.eclipse.papyrus.example.uml.comment.editor.sharedresource/.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/examples/uml/org.eclipse.papyrus.example.uml.comment.editor.sharedresource/META-INF/MANIFEST.MF b/examples/uml/org.eclipse.papyrus.example.uml.comment.editor.sharedresource/META-INF/MANIFEST.MF index 89ca3fc88d0..3f4478beadb 100644 --- a/examples/uml/org.eclipse.papyrus.example.uml.comment.editor.sharedresource/META-INF/MANIFEST.MF +++ b/examples/uml/org.eclipse.papyrus.example.uml.comment.editor.sharedresource/META-INF/MANIFEST.MF @@ -13,12 +13,12 @@ Require-Bundle: org.eclipse.gmf.runtime.diagram.ui;bundle-version="[1.9.0,2.0.0) org.eclipse.uml2.uml;bundle-version="[5.5.0,6.0.0)" Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy -Bundle-Version: 2.0.0.qualifier +Bundle-Version: 2.1.0.qualifier Bundle-Localization: plugin Bundle-Name: %Bundle-Name Bundle-ManifestVersion: 2 Bundle-Activator: org.eclipse.papyrus.example.uml.comment.editor.sharedresource.Activator Bundle-SymbolicName: org.eclipse.papyrus.example.uml.comment.editor.sharedresource;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-Description: %Bundle-Description Automatic-Module-Name: org.eclipse.papyrus.example.uml.comment.editor.sharedresource diff --git a/examples/uml/org.eclipse.papyrus.example.uml.comment.editor.sharedresource/plugin.xml b/examples/uml/org.eclipse.papyrus.example.uml.comment.editor.sharedresource/plugin.xml index 86bb539f808..268a25a4aea 100644 --- a/examples/uml/org.eclipse.papyrus.example.uml.comment.editor.sharedresource/plugin.xml +++ b/examples/uml/org.eclipse.papyrus.example.uml.comment.editor.sharedresource/plugin.xml @@ -43,7 +43,7 @@ point="org.eclipse.ui.menus"> <menuContribution allPopups="false" - locationURI="popup:org.eclipse.papyrus.dev.ui.menu"> + locationURI="popup:org.eclipse.papyrus.dev.ui.editors"> <command commandId="org.eclipse.papyrus.example.uml.comment.editor.command.sharedresource" icon="icons/texteditor.bmp" diff --git a/examples/uml/org.eclipse.papyrus.example.uml.comment.editor.sharedresource/pom.xml b/examples/uml/org.eclipse.papyrus.example.uml.comment.editor.sharedresource/pom.xml index 1117b82a18d..d9a29116aea 100644 --- a/examples/uml/org.eclipse.papyrus.example.uml.comment.editor.sharedresource/pom.xml +++ b/examples/uml/org.eclipse.papyrus.example.uml.comment.editor.sharedresource/pom.xml @@ -10,6 +10,6 @@ </parent> <artifactId>org.eclipse.papyrus.example.uml.comment.editor.sharedresource</artifactId> <groupId>org.eclipse.papyrus</groupId> - <version>2.0.0-SNAPSHOT</version> + <version>2.1.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project>
\ No newline at end of file diff --git a/examples/uml/org.eclipse.papyrus.example.uml.nattable.actions/.classpath b/examples/uml/org.eclipse.papyrus.example.uml.nattable.actions/.classpath index e801ebfb468..81fe078c20c 100755 --- a/examples/uml/org.eclipse.papyrus.example.uml.nattable.actions/.classpath +++ b/examples/uml/org.eclipse.papyrus.example.uml.nattable.actions/.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/examples/uml/org.eclipse.papyrus.example.uml.nattable.actions/.settings/org.eclipse.jdt.core.prefs b/examples/uml/org.eclipse.papyrus.example.uml.nattable.actions/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/examples/uml/org.eclipse.papyrus.example.uml.nattable.actions/.settings/org.eclipse.jdt.core.prefs +++ b/examples/uml/org.eclipse.papyrus.example.uml.nattable.actions/.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/examples/uml/org.eclipse.papyrus.example.uml.nattable.actions/META-INF/MANIFEST.MF b/examples/uml/org.eclipse.papyrus.example.uml.nattable.actions/META-INF/MANIFEST.MF index 50e809a4388..885d7a627f4 100755 --- a/examples/uml/org.eclipse.papyrus.example.uml.nattable.actions/META-INF/MANIFEST.MF +++ b/examples/uml/org.eclipse.papyrus.example.uml.nattable.actions/META-INF/MANIFEST.MF @@ -10,6 +10,6 @@ Require-Bundle: org.eclipse.emf.edit.ui;bundle-version="[2.18.0,3.0.0)", 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.ui.views.properties.tabbed;bundle-version="[3.8.0,4.0.0)" -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.example.uml.nattable.actions Bundle-ActivationPolicy: lazy diff --git a/examples/uml/org.eclipse.papyrus.example.uml.nattable.empty.line/.classpath b/examples/uml/org.eclipse.papyrus.example.uml.nattable.empty.line/.classpath index e801ebfb468..81fe078c20c 100755 --- a/examples/uml/org.eclipse.papyrus.example.uml.nattable.empty.line/.classpath +++ b/examples/uml/org.eclipse.papyrus.example.uml.nattable.empty.line/.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/examples/uml/org.eclipse.papyrus.example.uml.nattable.empty.line/.settings/org.eclipse.jdt.core.prefs b/examples/uml/org.eclipse.papyrus.example.uml.nattable.empty.line/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/examples/uml/org.eclipse.papyrus.example.uml.nattable.empty.line/.settings/org.eclipse.jdt.core.prefs +++ b/examples/uml/org.eclipse.papyrus.example.uml.nattable.empty.line/.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/examples/uml/org.eclipse.papyrus.example.uml.nattable.empty.line/META-INF/MANIFEST.MF b/examples/uml/org.eclipse.papyrus.example.uml.nattable.empty.line/META-INF/MANIFEST.MF index 73d21222b35..6a144d6ee41 100755 --- a/examples/uml/org.eclipse.papyrus.example.uml.nattable.empty.line/META-INF/MANIFEST.MF +++ b/examples/uml/org.eclipse.papyrus.example.uml.nattable.empty.line/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-SymbolicName: org.eclipse.papyrus.example.uml.nattable.empty.line;singlet Bundle-Version: 2.0.0.qualifier Bundle-Vendor: %Bundle-Vendor Automatic-Module-Name: org.eclipse.papyrus.example.uml.nattable.empty.line -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Require-Bundle: ca.odell.glazedlists;bundle-version="[1.9.0,2.0.0)", org.eclipse.emf.databinding;bundle-version="[1.5.0,2.0.0)", org.eclipse.gmf.runtime.diagram.ui.properties;bundle-version="[1.8.0,2.0.0)", diff --git a/examples/uml/org.eclipse.papyrus.example.uml.services.decorator/.classpath b/examples/uml/org.eclipse.papyrus.example.uml.services.decorator/.classpath index bc3587db485..a7a673fa7ab 100644 --- a/examples/uml/org.eclipse.papyrus.example.uml.services.decorator/.classpath +++ b/examples/uml/org.eclipse.papyrus.example.uml.services.decorator/.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/examples/uml/org.eclipse.papyrus.example.uml.services.decorator/.settings/org.eclipse.jdt.core.prefs b/examples/uml/org.eclipse.papyrus.example.uml.services.decorator/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/examples/uml/org.eclipse.papyrus.example.uml.services.decorator/.settings/org.eclipse.jdt.core.prefs +++ b/examples/uml/org.eclipse.papyrus.example.uml.services.decorator/.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/examples/uml/org.eclipse.papyrus.example.uml.services.decorator/META-INF/MANIFEST.MF b/examples/uml/org.eclipse.papyrus.example.uml.services.decorator/META-INF/MANIFEST.MF index 5c29733496b..ca9c598a202 100644 --- a/examples/uml/org.eclipse.papyrus.example.uml.services.decorator/META-INF/MANIFEST.MF +++ b/examples/uml/org.eclipse.papyrus.example.uml.services.decorator/META-INF/MANIFEST.MF @@ -6,7 +6,7 @@ Bundle-Localization: plugin Bundle-Name: %Bundle-Name Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.example.uml.services.decorator;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-Description: %Bundle-Description Automatic-Module-Name: org.eclipse.papyrus.example.uml.comment.editor.newresource Require-Bundle: org.eclipse.ui;bundle-version="[3.119.0,4.0.0)", diff --git a/examples/uml/org.eclipse.papyrus.examples.uml.diagrams/.classpath b/examples/uml/org.eclipse.papyrus.examples.uml.diagrams/.classpath index bc3587db485..a7a673fa7ab 100644 --- a/examples/uml/org.eclipse.papyrus.examples.uml.diagrams/.classpath +++ b/examples/uml/org.eclipse.papyrus.examples.uml.diagrams/.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/examples/uml/org.eclipse.papyrus.examples.uml.diagrams/.settings/org.eclipse.jdt.core.prefs b/examples/uml/org.eclipse.papyrus.examples.uml.diagrams/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/examples/uml/org.eclipse.papyrus.examples.uml.diagrams/.settings/org.eclipse.jdt.core.prefs +++ b/examples/uml/org.eclipse.papyrus.examples.uml.diagrams/.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/examples/uml/org.eclipse.papyrus.examples.uml.diagrams/META-INF/MANIFEST.MF b/examples/uml/org.eclipse.papyrus.examples.uml.diagrams/META-INF/MANIFEST.MF index 19899405de6..05a7f302bd3 100644 --- a/examples/uml/org.eclipse.papyrus.examples.uml.diagrams/META-INF/MANIFEST.MF +++ b/examples/uml/org.eclipse.papyrus.examples.uml.diagrams/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: %Bundle-Name Bundle-Version: 2.1.0.qualifier Bundle-Localization: plugin Bundle-ManifestVersion: 2 -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-ActivationPolicy: lazy Bundle-Vendor: %Bundle-Vendor Automatic-Module-Name: org.eclipse.papyrus.examples.uml.diagrams diff --git a/examples/uml/org.eclipse.papyrus.examples.uml.textedit.property.xtext.architecture/.classpath b/examples/uml/org.eclipse.papyrus.examples.uml.textedit.property.xtext.architecture/.classpath index e801ebfb468..81fe078c20c 100755 --- a/examples/uml/org.eclipse.papyrus.examples.uml.textedit.property.xtext.architecture/.classpath +++ b/examples/uml/org.eclipse.papyrus.examples.uml.textedit.property.xtext.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/examples/uml/org.eclipse.papyrus.examples.uml.textedit.property.xtext.architecture/.project b/examples/uml/org.eclipse.papyrus.examples.uml.textedit.property.xtext.architecture/.project index 9342ffac1e9..ffd658e3c06 100755 --- a/examples/uml/org.eclipse.papyrus.examples.uml.textedit.property.xtext.architecture/.project +++ b/examples/uml/org.eclipse.papyrus.examples.uml.textedit.property.xtext.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/examples/uml/org.eclipse.papyrus.examples.uml.textedit.property.xtext.architecture/.settings/org.eclipse.jdt.core.prefs b/examples/uml/org.eclipse.papyrus.examples.uml.textedit.property.xtext.architecture/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/examples/uml/org.eclipse.papyrus.examples.uml.textedit.property.xtext.architecture/.settings/org.eclipse.jdt.core.prefs +++ b/examples/uml/org.eclipse.papyrus.examples.uml.textedit.property.xtext.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/examples/uml/org.eclipse.papyrus.examples.uml.textedit.property.xtext.architecture/META-INF/MANIFEST.MF b/examples/uml/org.eclipse.papyrus.examples.uml.textedit.property.xtext.architecture/META-INF/MANIFEST.MF index 7ce6b99240f..01fbae4db54 100755 --- a/examples/uml/org.eclipse.papyrus.examples.uml.textedit.property.xtext.architecture/META-INF/MANIFEST.MF +++ b/examples/uml/org.eclipse.papyrus.examples.uml.textedit.property.xtext.architecture/META-INF/MANIFEST.MF @@ -33,6 +33,6 @@ Require-Bundle: org.apache.log4j;bundle-version="[1.2.0,2.0.0)", org.eclipse.xtext;bundle-version="[2.25.0,3.0.0)", org.eclipse.xtext.ui;bundle-version="[2.25.0,3.0.0)", org.eclipse.xtext.ui.shared;bundle-version="2.25.0" -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.examples.uml.textedit.property.xtext.architecture Bundle-ActivationPolicy: lazy diff --git a/examples/uml/org.eclipse.papyrus.examples.uml.textedit.property.xtext.architecture/model/umlXtextProperty.architecture b/examples/uml/org.eclipse.papyrus.examples.uml.textedit.property.xtext.architecture/model/umlXtextProperty.architecture index d8f72bcda2c..59ef024d76d 100755 --- a/examples/uml/org.eclipse.papyrus.examples.uml.textedit.property.xtext.architecture/model/umlXtextProperty.architecture +++ b/examples/uml/org.eclipse.papyrus.examples.uml.textedit.property.xtext.architecture/model/umlXtextProperty.architecture @@ -4,7 +4,6 @@ <viewpoints xmi:type="architecture:ArchitectureViewpoint" xmi:id="_HQhf5sSYEeaKZJ_pGfaSiA" id="org.eclipse.papyrus.uml.analysis" name="Software Analysis" description="A viewpoint allowing software analysis with UML" icon="platform:/plugin/org.eclipse.papyrus.uml.architecture/icons/viewpoint.gif" representationKinds="_cuzcsBrTEeysSp9JokodgA"/> <viewpoints xmi:type="architecture:ArchitectureViewpoint" xmi:id="_OOrIUMSZEeaKZJ_pGfaSiA" id="org.eclipse.papyrus.uml.design" name="Software Design" description="A viewpoint allowing software design with UML" icon="platform:/plugin/org.eclipse.papyrus.uml.architecture/icons/viewpoint.gif" representationKinds="_cuzcsBrTEeysSp9JokodgA"/> <elementTypes xmi:type="elementtypesconfigurations:ElementTypeSetConfiguration" href="platform:/plugin/org.eclipse.papyrus.infra.textedit.types/resources/textdocument-context.elementtypesconfigurations#_mn_RcCA7EeyP_rvz9XoGqg"/> - <extendedContexts xmi:type="architecture:ArchitectureDescriptionLanguage" href="platform:/plugin/org.eclipse.papyrus.uml.architecture/model/uml.architecture#_HQhf5cSYEeaKZJ_pGfaSiA"/> <representationKinds xmi:type="representation:TextDocumentRepresentation" xmi:id="_cuzcsBrTEeysSp9JokodgA" id="org.eclipse.papyrus.examples.uml.textedit.property.xtext.architecture" name="XText UML Property Editor Example" icon="platform:/plugin/org.eclipse.papyrus.examples.uml.textedit.property.xtext.architecture/icons/XTextUMLPropertyEditor.gif" implementationID="UMLXTextPropertyEditor" creationCommandClass="org.eclipse.papyrus.infra.textedit.representation.architecture.CreateTextDocumentEditorCommand"> <modelRules xmi:type="representation_1:ModelRule" xmi:id="_mgNFUBrTEeysSp9JokodgA" permit="true" elementMultiplicity="1" multiplicity="-1"> <element xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Property"/> diff --git a/examples/uml/org.eclipse.papyrus.uml.diagram.emftree/.classpath b/examples/uml/org.eclipse.papyrus.uml.diagram.emftree/.classpath index e801ebfb468..81fe078c20c 100644 --- a/examples/uml/org.eclipse.papyrus.uml.diagram.emftree/.classpath +++ b/examples/uml/org.eclipse.papyrus.uml.diagram.emftree/.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/examples/uml/org.eclipse.papyrus.uml.diagram.emftree/.settings/org.eclipse.jdt.core.prefs b/examples/uml/org.eclipse.papyrus.uml.diagram.emftree/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/examples/uml/org.eclipse.papyrus.uml.diagram.emftree/.settings/org.eclipse.jdt.core.prefs +++ b/examples/uml/org.eclipse.papyrus.uml.diagram.emftree/.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/examples/uml/org.eclipse.papyrus.uml.diagram.emftree/META-INF/MANIFEST.MF b/examples/uml/org.eclipse.papyrus.uml.diagram.emftree/META-INF/MANIFEST.MF index d7e3760b03b..010d8596778 100644 --- a/examples/uml/org.eclipse.papyrus.uml.diagram.emftree/META-INF/MANIFEST.MF +++ b/examples/uml/org.eclipse.papyrus.uml.diagram.emftree/META-INF/MANIFEST.MF @@ -18,6 +18,6 @@ Bundle-Localization: plugin Bundle-Activator: org.eclipse.papyrus.uml.diagram.emftree.Activator Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.emftree;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Import-Package: org.eclipse.papyrus.infra.ui.extension.diagrameditor Automatic-Module-Name: org.eclipse.papyrus.uml.diagram.emftree diff --git a/examples/uml/org.eclipse.papyrus.uml.disable.helper.advices.example/.classpath b/examples/uml/org.eclipse.papyrus.uml.disable.helper.advices.example/.classpath index e801ebfb468..81fe078c20c 100644 --- a/examples/uml/org.eclipse.papyrus.uml.disable.helper.advices.example/.classpath +++ b/examples/uml/org.eclipse.papyrus.uml.disable.helper.advices.example/.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/examples/uml/org.eclipse.papyrus.uml.disable.helper.advices.example/.settings/org.eclipse.jdt.core.prefs b/examples/uml/org.eclipse.papyrus.uml.disable.helper.advices.example/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/examples/uml/org.eclipse.papyrus.uml.disable.helper.advices.example/.settings/org.eclipse.jdt.core.prefs +++ b/examples/uml/org.eclipse.papyrus.uml.disable.helper.advices.example/.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/examples/uml/org.eclipse.papyrus.uml.disable.helper.advices.example/META-INF/MANIFEST.MF b/examples/uml/org.eclipse.papyrus.uml.disable.helper.advices.example/META-INF/MANIFEST.MF index 526df650650..27ff722cf40 100644 --- a/examples/uml/org.eclipse.papyrus.uml.disable.helper.advices.example/META-INF/MANIFEST.MF +++ b/examples/uml/org.eclipse.papyrus.uml.disable.helper.advices.example/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.papyrus.uml.disable.helper.advices.example;singleton:=true Bundle-Version: 2.0.0.qualifier 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.types;bundle-version="[5.0.0,6.0.0)", diff --git a/examples/uml/org.eclipse.papyrus.uml.textual.editors.example/.classpath b/examples/uml/org.eclipse.papyrus.uml.textual.editors.example/.classpath index e801ebfb468..81fe078c20c 100644 --- a/examples/uml/org.eclipse.papyrus.uml.textual.editors.example/.classpath +++ b/examples/uml/org.eclipse.papyrus.uml.textual.editors.example/.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/examples/uml/org.eclipse.papyrus.uml.textual.editors.example/.settings/org.eclipse.jdt.core.prefs b/examples/uml/org.eclipse.papyrus.uml.textual.editors.example/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/examples/uml/org.eclipse.papyrus.uml.textual.editors.example/.settings/org.eclipse.jdt.core.prefs +++ b/examples/uml/org.eclipse.papyrus.uml.textual.editors.example/.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/examples/uml/org.eclipse.papyrus.uml.textual.editors.example/META-INF/MANIFEST.MF b/examples/uml/org.eclipse.papyrus.uml.textual.editors.example/META-INF/MANIFEST.MF index 7968527cb56..5c27f35c42d 100644 --- a/examples/uml/org.eclipse.papyrus.uml.textual.editors.example/META-INF/MANIFEST.MF +++ b/examples/uml/org.eclipse.papyrus.uml.textual.editors.example/META-INF/MANIFEST.MF @@ -18,7 +18,7 @@ Require-Bundle: org.eclipse.core.databinding;bundle-version="1.9.0", org.eclipse.papyrus.uml.properties.xtext;bundle-version="[2.0.0,3.0.0)", org.eclipse.papyrus.uml.textedit.transition.xtext.ui;bundle-version="[3.0.0,4.0.0)", org.eclipse.xtext.ui;bundle-version="[2.22.0,3.0.0)" -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-ActivationPolicy: lazy Bundle-Description: %Bundle-Description Bundle-Localization: plugin diff --git a/examples/user/org.eclipse.papyrus.examples.user.qvto/.classpath b/examples/user/org.eclipse.papyrus.examples.user.qvto/.classpath index bc3587db485..a7a673fa7ab 100644 --- a/examples/user/org.eclipse.papyrus.examples.user.qvto/.classpath +++ b/examples/user/org.eclipse.papyrus.examples.user.qvto/.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/examples/user/org.eclipse.papyrus.examples.user.qvto/.settings/org.eclipse.jdt.core.prefs b/examples/user/org.eclipse.papyrus.examples.user.qvto/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/examples/user/org.eclipse.papyrus.examples.user.qvto/.settings/org.eclipse.jdt.core.prefs +++ b/examples/user/org.eclipse.papyrus.examples.user.qvto/.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/examples/user/org.eclipse.papyrus.examples.user.qvto/META-INF/MANIFEST.MF b/examples/user/org.eclipse.papyrus.examples.user.qvto/META-INF/MANIFEST.MF index 6dcb78eb079..0abf38d22e1 100644 --- a/examples/user/org.eclipse.papyrus.examples.user.qvto/META-INF/MANIFEST.MF +++ b/examples/user/org.eclipse.papyrus.examples.user.qvto/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: %Bundle-Name Bundle-Version: 2.1.0.qualifier Bundle-Localization: plugin Bundle-ManifestVersion: 2 -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-ActivationPolicy: lazy Bundle-Vendor: %Bundle-Vendor Automatic-Module-Name: org.eclipse.papyrus.examples.user.qvto diff --git a/features/papyrus-main-features/org.eclipse.papyrus.infra.core.feature/feature.xml b/features/papyrus-main-features/org.eclipse.papyrus.infra.core.feature/feature.xml index fdee14b6804..cfc5cba9552 100644 --- a/features/papyrus-main-features/org.eclipse.papyrus.infra.core.feature/feature.xml +++ b/features/papyrus-main-features/org.eclipse.papyrus.infra.core.feature/feature.xml @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> <feature id="org.eclipse.papyrus.infra.core.feature" - version="3.0.0.qualifier" label="%featureName" - provider-name="%providerName" + version="3.1.100.qualifier" + provider-name="%providerName" license-feature="org.eclipse.license" license-feature-version="2.0.2"> diff --git a/features/papyrus-main-features/org.eclipse.papyrus.infra.core.feature/pom.xml b/features/papyrus-main-features/org.eclipse.papyrus.infra.core.feature/pom.xml index 0ad7fee27dc..a795aaea761 100644 --- a/features/papyrus-main-features/org.eclipse.papyrus.infra.core.feature/pom.xml +++ b/features/papyrus-main-features/org.eclipse.papyrus.infra.core.feature/pom.xml @@ -1,5 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> -<project> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.eclipse.papyrus</groupId> @@ -7,6 +9,6 @@ <version>0.0.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.papyrus.infra.core.feature</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.1.100-SNAPSHOT</version> <packaging>eclipse-feature</packaging> </project>
\ No newline at end of file diff --git a/features/papyrus-main-features/org.eclipse.papyrus.infra.emf.feature/feature.xml b/features/papyrus-main-features/org.eclipse.papyrus.infra.emf.feature/feature.xml index 0247948c8d7..93ee53ece48 100644 --- a/features/papyrus-main-features/org.eclipse.papyrus.infra.emf.feature/feature.xml +++ b/features/papyrus-main-features/org.eclipse.papyrus.infra.emf.feature/feature.xml @@ -1,14 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?> <feature id="org.eclipse.papyrus.infra.emf.feature" - version="3.0.0.qualifier" label="%featureName" - provider-name="%providerName" + version="3.2.0.qualifier" + provider-name="%providerName" license-feature="org.eclipse.license" license-feature-version="2.0.2"> - + <description url="https://eclipse.org/papyrus/"> - %description + %description </description> <copyright> diff --git a/features/papyrus-main-features/org.eclipse.papyrus.infra.emf.feature/pom.xml b/features/papyrus-main-features/org.eclipse.papyrus.infra.emf.feature/pom.xml index e9013a356c8..4a663038170 100644 --- a/features/papyrus-main-features/org.eclipse.papyrus.infra.emf.feature/pom.xml +++ b/features/papyrus-main-features/org.eclipse.papyrus.infra.emf.feature/pom.xml @@ -1,5 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> -<project> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.eclipse.papyrus</groupId> @@ -7,6 +9,6 @@ <version>0.0.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.papyrus.infra.emf.feature</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.2.0-SNAPSHOT</version> <packaging>eclipse-feature</packaging> </project>
\ No newline at end of file diff --git a/features/papyrus-main-features/org.eclipse.papyrus.infra.feature/feature.xml b/features/papyrus-main-features/org.eclipse.papyrus.infra.feature/feature.xml index 255293dba71..753adb878f5 100644 --- a/features/papyrus-main-features/org.eclipse.papyrus.infra.feature/feature.xml +++ b/features/papyrus-main-features/org.eclipse.papyrus.infra.feature/feature.xml @@ -2,7 +2,7 @@ <feature id="org.eclipse.papyrus.infra.feature" label="Papyrus infra" - version="3.1.0.qualifier" + version="3.3.0.qualifier" provider-name="Eclipse Modeling Project" license-feature="org.eclipse.license" license-feature-version="2.0.2"> diff --git a/features/papyrus-main-features/org.eclipse.papyrus.infra.feature/pom.xml b/features/papyrus-main-features/org.eclipse.papyrus.infra.feature/pom.xml index 5f1958e93d1..2a52e26a219 100644 --- a/features/papyrus-main-features/org.eclipse.papyrus.infra.feature/pom.xml +++ b/features/papyrus-main-features/org.eclipse.papyrus.infra.feature/pom.xml @@ -1,5 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> -<project> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.eclipse.papyrus</groupId> @@ -7,6 +9,6 @@ <version>0.0.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.papyrus.infra.feature</artifactId> - <version>3.1.0-SNAPSHOT</version> + <version>3.3.0-SNAPSHOT</version> <packaging>eclipse-feature</packaging> </project>
\ No newline at end of file diff --git a/features/papyrus-main-features/org.eclipse.papyrus.infra.gmfdiag.feature/feature.xml b/features/papyrus-main-features/org.eclipse.papyrus.infra.gmfdiag.feature/feature.xml index ea30976d905..4f811ac231a 100644 --- a/features/papyrus-main-features/org.eclipse.papyrus.infra.gmfdiag.feature/feature.xml +++ b/features/papyrus-main-features/org.eclipse.papyrus.infra.gmfdiag.feature/feature.xml @@ -1,14 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?> <feature id="org.eclipse.papyrus.infra.gmfdiag.feature" - version="3.0.0.qualifier" label="%featureName" - provider-name="%providerName" + version="3.0.200.qualifier" + provider-name="%providerName" license-feature="org.eclipse.license" license-feature-version="2.0.2"> - + <description url="https://eclipse.org/papyrus/"> - %description + %description </description> <copyright> @@ -71,13 +71,13 @@ install-size="0" version="0.0.0" unpack="false"/> - + <plugin id="org.eclipse.papyrus.infra.gmfdiag.expansion" download-size="0" install-size="0" version="0.0.0" - unpack="false"/> + unpack="false"/> <plugin id="org.eclipse.papyrus.infra.gmfdiag.gef" @@ -194,7 +194,7 @@ download-size="0" install-size="0" version="0.0.0"/> - + <plugin id="org.eclipse.papyrus.infra.gmfdiag.representation" download-size="0" @@ -202,39 +202,38 @@ version="0.0.0"/> <plugin - id="org.eclipse.papyrus.infra.gmfdiag.representation.edit" - download-size="0" - install-size="0" - version="0.0.0"/> + id="org.eclipse.papyrus.infra.gmfdiag.representation.edit" + download-size="0" + install-size="0" + version="0.0.0"/> <plugin - id="org.eclipse.papyrus.infra.gmfdiag.style" - download-size="0" - install-size="0" - version="0.0.0"/> + id="org.eclipse.papyrus.infra.gmfdiag.style" + download-size="0" + install-size="0" + version="0.0.0"/> <plugin - id="org.eclipse.papyrus.infra.gmfdiag.style.edit" - download-size="0" - install-size="0" - version="0.0.0"/> + id="org.eclipse.papyrus.infra.gmfdiag.style.edit" + download-size="0" + install-size="0" + version="0.0.0"/> - <plugin + <plugin id="org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration" download-size="0" install-size="0" version="0.0.0" unpack="false"/> - - - <plugin + + <plugin id="org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.edit" download-size="0" install-size="0" version="0.0.0" unpack="false"/> - - <plugin + + <plugin id="org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors" download-size="0" install-size="0" diff --git a/features/papyrus-main-features/org.eclipse.papyrus.infra.gmfdiag.feature/pom.xml b/features/papyrus-main-features/org.eclipse.papyrus.infra.gmfdiag.feature/pom.xml index 6348f49a974..a952f2fe6fa 100644 --- a/features/papyrus-main-features/org.eclipse.papyrus.infra.gmfdiag.feature/pom.xml +++ b/features/papyrus-main-features/org.eclipse.papyrus.infra.gmfdiag.feature/pom.xml @@ -1,5 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> -<project> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.eclipse.papyrus</groupId> @@ -7,6 +9,6 @@ <version>0.0.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.papyrus.infra.gmfdiag.feature</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.200-SNAPSHOT</version> <packaging>eclipse-feature</packaging> </project>
\ No newline at end of file diff --git a/features/papyrus-main-features/org.eclipse.papyrus.infra.services.feature/feature.xml b/features/papyrus-main-features/org.eclipse.papyrus.infra.services.feature/feature.xml index d0efb12121f..8445c21e0b9 100644 --- a/features/papyrus-main-features/org.eclipse.papyrus.infra.services.feature/feature.xml +++ b/features/papyrus-main-features/org.eclipse.papyrus.infra.services.feature/feature.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <feature id="org.eclipse.papyrus.infra.services.feature" - version="3.0.0.qualifier" + version="3.1.0.qualifier" label="%featureName" provider-name="%providerName" license-feature="org.eclipse.license" diff --git a/features/papyrus-main-features/org.eclipse.papyrus.infra.services.feature/pom.xml b/features/papyrus-main-features/org.eclipse.papyrus.infra.services.feature/pom.xml index 1fe20f2e817..2fb2d0b4174 100644 --- a/features/papyrus-main-features/org.eclipse.papyrus.infra.services.feature/pom.xml +++ b/features/papyrus-main-features/org.eclipse.papyrus.infra.services.feature/pom.xml @@ -9,6 +9,6 @@ <version>0.0.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.papyrus.infra.services.feature</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.1.0-SNAPSHOT</version> <packaging>eclipse-feature</packaging> </project>
\ No newline at end of file diff --git a/features/papyrus-main-features/org.eclipse.papyrus.infra.textedit.feature/feature.xml b/features/papyrus-main-features/org.eclipse.papyrus.infra.textedit.feature/feature.xml index 841fa29f1e7..e06c53c51c3 100755 --- a/features/papyrus-main-features/org.eclipse.papyrus.infra.textedit.feature/feature.xml +++ b/features/papyrus-main-features/org.eclipse.papyrus.infra.textedit.feature/feature.xml @@ -2,7 +2,7 @@ <feature id="org.eclipse.papyrus.infra.textedit.feature" label="%featureName" - version="1.0.0.qualifier" + version="1.1.0.qualifier" provider-name="%providerName" license-feature="org.eclipse.license" license-feature-version="2.0.2"> diff --git a/features/papyrus-main-features/org.eclipse.papyrus.infra.textedit.feature/pom.xml b/features/papyrus-main-features/org.eclipse.papyrus.infra.textedit.feature/pom.xml index e279af9aea0..0c3e33a71b9 100755 --- a/features/papyrus-main-features/org.eclipse.papyrus.infra.textedit.feature/pom.xml +++ b/features/papyrus-main-features/org.eclipse.papyrus.infra.textedit.feature/pom.xml @@ -9,6 +9,6 @@ <version>0.0.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.papyrus.infra.textedit.feature</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>1.1.0-SNAPSHOT</version> <packaging>eclipse-feature</packaging> </project> diff --git a/features/papyrus-main-features/org.eclipse.papyrus.infra.ui.feature/feature.xml b/features/papyrus-main-features/org.eclipse.papyrus.infra.ui.feature/feature.xml index c2a0c97585b..822f0bedaa8 100644 --- a/features/papyrus-main-features/org.eclipse.papyrus.infra.ui.feature/feature.xml +++ b/features/papyrus-main-features/org.eclipse.papyrus.infra.ui.feature/feature.xml @@ -2,7 +2,7 @@ <feature id="org.eclipse.papyrus.infra.ui.feature" label="%featureName" - version="3.1.0.qualifier" + version="3.1.100.qualifier" provider-name="%providerName" license-feature="org.eclipse.license" license-feature-version="2.0.2"> diff --git a/features/papyrus-main-features/org.eclipse.papyrus.infra.ui.feature/pom.xml b/features/papyrus-main-features/org.eclipse.papyrus.infra.ui.feature/pom.xml index 9f921e530c2..cf665ea19cf 100644 --- a/features/papyrus-main-features/org.eclipse.papyrus.infra.ui.feature/pom.xml +++ b/features/papyrus-main-features/org.eclipse.papyrus.infra.ui.feature/pom.xml @@ -9,6 +9,6 @@ <version>0.0.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.papyrus.infra.ui.feature</artifactId> - <version>3.1.0-SNAPSHOT</version> + <version>3.1.100-SNAPSHOT</version> <packaging>eclipse-feature</packaging> </project>
\ No newline at end of file diff --git a/features/papyrus-main-features/org.eclipse.papyrus.infra.viewpoints.feature/feature.xml b/features/papyrus-main-features/org.eclipse.papyrus.infra.viewpoints.feature/feature.xml index 432b5dacd50..72a1a3e01de 100755 --- a/features/papyrus-main-features/org.eclipse.papyrus.infra.viewpoints.feature/feature.xml +++ b/features/papyrus-main-features/org.eclipse.papyrus.infra.viewpoints.feature/feature.xml @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> <feature id="org.eclipse.papyrus.infra.viewpoints.feature" - version="3.0.0.qualifier" label="%featureName" - provider-name="%providerName" + version="3.0.100.qualifier" + provider-name="%providerName" license-feature="org.eclipse.license" license-feature-version="2.0.2"> diff --git a/features/papyrus-main-features/org.eclipse.papyrus.infra.viewpoints.feature/pom.xml b/features/papyrus-main-features/org.eclipse.papyrus.infra.viewpoints.feature/pom.xml index f92e3a6ff4d..57ac064ff39 100644 --- a/features/papyrus-main-features/org.eclipse.papyrus.infra.viewpoints.feature/pom.xml +++ b/features/papyrus-main-features/org.eclipse.papyrus.infra.viewpoints.feature/pom.xml @@ -1,5 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> -<project> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.eclipse.papyrus</groupId> @@ -7,6 +9,6 @@ <version>0.0.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.papyrus.infra.viewpoints.feature</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.100-SNAPSHOT</version> <packaging>eclipse-feature</packaging> -</project>
\ No newline at end of file +</project> diff --git a/features/papyrus-main-features/org.eclipse.papyrus.infra.widget.feature/feature.xml b/features/papyrus-main-features/org.eclipse.papyrus.infra.widget.feature/feature.xml index 8c80ef78e7c..43abcd25cc6 100644 --- a/features/papyrus-main-features/org.eclipse.papyrus.infra.widget.feature/feature.xml +++ b/features/papyrus-main-features/org.eclipse.papyrus.infra.widget.feature/feature.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <feature id="org.eclipse.papyrus.infra.widget.feature" - version="3.0.0.qualifier" + version="3.1.0.qualifier" label="%featureName" provider-name="%providerName" license-feature="org.eclipse.license" diff --git a/features/papyrus-main-features/org.eclipse.papyrus.infra.widget.feature/pom.xml b/features/papyrus-main-features/org.eclipse.papyrus.infra.widget.feature/pom.xml index b2d970a07e7..5ea4bff38f9 100644 --- a/features/papyrus-main-features/org.eclipse.papyrus.infra.widget.feature/pom.xml +++ b/features/papyrus-main-features/org.eclipse.papyrus.infra.widget.feature/pom.xml @@ -7,6 +7,6 @@ <version>0.0.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.papyrus.infra.widget.feature</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.1.0-SNAPSHOT</version> <packaging>eclipse-feature</packaging> </project>
\ No newline at end of file diff --git a/features/papyrus-main-features/org.eclipse.papyrus.sdk.feature/feature.xml b/features/papyrus-main-features/org.eclipse.papyrus.sdk.feature/feature.xml index 9e4ac1174c7..0766c6ec65d 100644 --- a/features/papyrus-main-features/org.eclipse.papyrus.sdk.feature/feature.xml +++ b/features/papyrus-main-features/org.eclipse.papyrus.sdk.feature/feature.xml @@ -2,7 +2,7 @@ <feature id="org.eclipse.papyrus.sdk.feature" label="%featureName" - version="6.2.0.qualifier" + version="6.6.0.qualifier" provider-name="%providerName" plugin="org.eclipse.papyrus.sdk" license-feature="org.eclipse.license" @@ -57,14 +57,21 @@ id="com.google.guava" download-size="0" install-size="0" - version="30.1.0.v20210127-2300" + version="0.0.0" unpack="false"/> <plugin id="com.google.gson" download-size="0" install-size="0" - version="2.7.0.v20170129-0911" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.apache.logging.log4j" + download-size="0" + install-size="0" + version="2.17.1.v20220106-2156" unpack="false"/> <plugin diff --git a/features/papyrus-main-features/org.eclipse.papyrus.sdk.feature/pom.xml b/features/papyrus-main-features/org.eclipse.papyrus.sdk.feature/pom.xml index 39c124e29c6..46fd2ed3074 100644 --- a/features/papyrus-main-features/org.eclipse.papyrus.sdk.feature/pom.xml +++ b/features/papyrus-main-features/org.eclipse.papyrus.sdk.feature/pom.xml @@ -9,7 +9,7 @@ <version>0.0.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.papyrus.sdk.feature</artifactId> - <version>6.2.0-SNAPSHOT</version> + <version>6.6.0-SNAPSHOT</version> <packaging>eclipse-feature</packaging> <build> diff --git a/features/papyrus-main-features/org.eclipse.papyrus.uml.alf.feature/feature.xml b/features/papyrus-main-features/org.eclipse.papyrus.uml.alf.feature/feature.xml index 50c1afb4e40..a3199f9a85d 100644 --- a/features/papyrus-main-features/org.eclipse.papyrus.uml.alf.feature/feature.xml +++ b/features/papyrus-main-features/org.eclipse.papyrus.uml.alf.feature/feature.xml @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> <feature id="org.eclipse.papyrus.uml.alf.feature" - version="3.0.0.qualifier" label="%featureName" - provider-name="%providerName" + version="3.0.100.qualifier" + provider-name="%providerName" license-feature="org.eclipse.license" license-feature-version="2.0.2"> diff --git a/features/papyrus-main-features/org.eclipse.papyrus.uml.alf.feature/pom.xml b/features/papyrus-main-features/org.eclipse.papyrus.uml.alf.feature/pom.xml index 094501a2ace..0f265fb77fb 100644 --- a/features/papyrus-main-features/org.eclipse.papyrus.uml.alf.feature/pom.xml +++ b/features/papyrus-main-features/org.eclipse.papyrus.uml.alf.feature/pom.xml @@ -7,6 +7,6 @@ <version>0.0.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.papyrus.uml.alf.feature</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.100-SNAPSHOT</version> <packaging>eclipse-feature</packaging> </project>
\ No newline at end of file diff --git a/features/papyrus-main-features/org.eclipse.papyrus.uml.diagram.feature/feature.xml b/features/papyrus-main-features/org.eclipse.papyrus.uml.diagram.feature/feature.xml index 016ef6dae52..f75498e9275 100644 --- a/features/papyrus-main-features/org.eclipse.papyrus.uml.diagram.feature/feature.xml +++ b/features/papyrus-main-features/org.eclipse.papyrus.uml.diagram.feature/feature.xml @@ -2,7 +2,7 @@ <feature id="org.eclipse.papyrus.uml.diagram.feature" label="%featureName" - version="4.0.0.qualifier" + version="4.1.0.qualifier" provider-name="%providerName" license-feature="org.eclipse.license" license-feature-version="2.0.2"> diff --git a/features/papyrus-main-features/org.eclipse.papyrus.uml.diagram.feature/pom.xml b/features/papyrus-main-features/org.eclipse.papyrus.uml.diagram.feature/pom.xml index 36bba987602..605e9b4cb4b 100644 --- a/features/papyrus-main-features/org.eclipse.papyrus.uml.diagram.feature/pom.xml +++ b/features/papyrus-main-features/org.eclipse.papyrus.uml.diagram.feature/pom.xml @@ -8,6 +8,6 @@ <version>0.0.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.papyrus.uml.diagram.feature</artifactId> - <version>4.0.0-SNAPSHOT</version> + <version>4.1.0-SNAPSHOT</version> <packaging>eclipse-feature</packaging> </project>
\ No newline at end of file diff --git a/features/papyrus-main-features/org.eclipse.papyrus.uml.feature/feature.xml b/features/papyrus-main-features/org.eclipse.papyrus.uml.feature/feature.xml index f6b6f9f5929..dea62de4c57 100755 --- a/features/papyrus-main-features/org.eclipse.papyrus.uml.feature/feature.xml +++ b/features/papyrus-main-features/org.eclipse.papyrus.uml.feature/feature.xml @@ -2,7 +2,7 @@ <feature id="org.eclipse.papyrus.uml.feature" label="%featureName" - version="5.0.0.qualifier" + version="5.1.0.qualifier" provider-name="%providerName" license-feature="org.eclipse.license" license-feature-version="2.0.2"> diff --git a/features/papyrus-main-features/org.eclipse.papyrus.uml.feature/pom.xml b/features/papyrus-main-features/org.eclipse.papyrus.uml.feature/pom.xml index 44bb071be5c..6c19a7b7b6f 100755 --- a/features/papyrus-main-features/org.eclipse.papyrus.uml.feature/pom.xml +++ b/features/papyrus-main-features/org.eclipse.papyrus.uml.feature/pom.xml @@ -9,6 +9,6 @@ <version>0.0.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.papyrus.uml.feature</artifactId> - <version>5.0.0-SNAPSHOT</version> + <version>5.1.0-SNAPSHOT</version> <packaging>eclipse-feature</packaging> </project>
\ No newline at end of file diff --git a/features/papyrus-main-features/org.eclipse.papyrus.uml.search.feature/feature.xml b/features/papyrus-main-features/org.eclipse.papyrus.uml.search.feature/feature.xml index cd1fa0f2f6f..2e85875f1cf 100644 --- a/features/papyrus-main-features/org.eclipse.papyrus.uml.search.feature/feature.xml +++ b/features/papyrus-main-features/org.eclipse.papyrus.uml.search.feature/feature.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <feature id="org.eclipse.papyrus.uml.search.feature" - version="2.0.0.qualifier" + version="2.1.0.qualifier" label="%featureName" provider-name="%providerName" license-feature="org.eclipse.license" diff --git a/features/papyrus-main-features/org.eclipse.papyrus.uml.search.feature/pom.xml b/features/papyrus-main-features/org.eclipse.papyrus.uml.search.feature/pom.xml index 29fa1c0ac05..12b764c80a1 100644 --- a/features/papyrus-main-features/org.eclipse.papyrus.uml.search.feature/pom.xml +++ b/features/papyrus-main-features/org.eclipse.papyrus.uml.search.feature/pom.xml @@ -7,6 +7,6 @@ <version>0.0.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.papyrus.uml.search.feature</artifactId> - <version>2.0.0-SNAPSHOT</version> + <version>2.1.0-SNAPSHOT</version> <packaging>eclipse-feature</packaging> </project>
\ No newline at end of file diff --git a/features/papyrus-main-features/org.eclipse.papyrus.uml.textedit.feature/feature.xml b/features/papyrus-main-features/org.eclipse.papyrus.uml.textedit.feature/feature.xml index 95a6e663ce3..7cc3f0619bb 100644 --- a/features/papyrus-main-features/org.eclipse.papyrus.uml.textedit.feature/feature.xml +++ b/features/papyrus-main-features/org.eclipse.papyrus.uml.textedit.feature/feature.xml @@ -1,14 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?> <feature id="org.eclipse.papyrus.uml.textedit.feature" - version="2.0.0.qualifier" label="%featureName" - provider-name="%providerName" + version="2.0.100.qualifier" + provider-name="%providerName" license-feature="org.eclipse.license" license-feature-version="2.0.2"> - + <description url="https://eclipse.org/papyrus/"> - %description + %description </description> <copyright> diff --git a/features/papyrus-main-features/org.eclipse.papyrus.uml.textedit.feature/pom.xml b/features/papyrus-main-features/org.eclipse.papyrus.uml.textedit.feature/pom.xml index d7f5ae58a62..e724017b792 100644 --- a/features/papyrus-main-features/org.eclipse.papyrus.uml.textedit.feature/pom.xml +++ b/features/papyrus-main-features/org.eclipse.papyrus.uml.textedit.feature/pom.xml @@ -7,6 +7,6 @@ <version>0.0.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.papyrus.uml.textedit.feature</artifactId> - <version>2.0.0-SNAPSHOT</version> + <version>2.0.100-SNAPSHOT</version> <packaging>eclipse-feature</packaging> </project>
\ No newline at end of file diff --git a/features/papyrus-main-features/org.eclipse.papyrus.uml.tools.feature/feature.xml b/features/papyrus-main-features/org.eclipse.papyrus.uml.tools.feature/feature.xml index 7f2ce1d56bc..0aaa7689d47 100644 --- a/features/papyrus-main-features/org.eclipse.papyrus.uml.tools.feature/feature.xml +++ b/features/papyrus-main-features/org.eclipse.papyrus.uml.tools.feature/feature.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <feature id="org.eclipse.papyrus.uml.tools.feature" - version="3.0.0.qualifier" + version="3.1.0.qualifier" label="%featureName" provider-name="%providerName" license-feature="org.eclipse.license" diff --git a/features/papyrus-main-features/org.eclipse.papyrus.uml.tools.feature/pom.xml b/features/papyrus-main-features/org.eclipse.papyrus.uml.tools.feature/pom.xml index 47cfeda0b79..09c05e4e786 100644 --- a/features/papyrus-main-features/org.eclipse.papyrus.uml.tools.feature/pom.xml +++ b/features/papyrus-main-features/org.eclipse.papyrus.uml.tools.feature/pom.xml @@ -7,6 +7,6 @@ <version>0.0.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.papyrus.uml.tools.feature</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.1.0-SNAPSHOT</version> <packaging>eclipse-feature</packaging> -</project>
\ No newline at end of file +</project> diff --git a/features/papyrus-main-features/org.eclipse.papyrus.views.properties.feature/feature.xml b/features/papyrus-main-features/org.eclipse.papyrus.views.properties.feature/feature.xml index be7dc9f6803..29112271d5f 100644 --- a/features/papyrus-main-features/org.eclipse.papyrus.views.properties.feature/feature.xml +++ b/features/papyrus-main-features/org.eclipse.papyrus.views.properties.feature/feature.xml @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> <feature id="org.eclipse.papyrus.views.properties.feature" - version="3.0.0.qualifier" label="%featureName" - provider-name="%providerName" + version="3.1.0.qualifier" + provider-name="%providerName" license-feature="org.eclipse.license" license-feature-version="2.0.2"> - + <description url="https://eclipse.org/papyrus/"> %description </description> @@ -33,4 +33,10 @@ version="0.0.0" unpack="false"/> + <plugin + id="org.eclipse.papyrus.views.properties.services" + download-size="0" + install-size="0" + version="0.0.0"/> + </feature> diff --git a/features/papyrus-main-features/org.eclipse.papyrus.views.properties.feature/pom.xml b/features/papyrus-main-features/org.eclipse.papyrus.views.properties.feature/pom.xml index f78c893f49a..b3fccb374db 100644 --- a/features/papyrus-main-features/org.eclipse.papyrus.views.properties.feature/pom.xml +++ b/features/papyrus-main-features/org.eclipse.papyrus.views.properties.feature/pom.xml @@ -1,5 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> -<project> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.eclipse.papyrus</groupId> @@ -7,6 +9,6 @@ <version>0.0.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.papyrus.views.properties.feature</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.1.0-SNAPSHOT</version> <packaging>eclipse-feature</packaging> </project>
\ No newline at end of file diff --git a/features/papyrus-main-features/org.eclipse.papyrus.views.search.feature/feature.xml b/features/papyrus-main-features/org.eclipse.papyrus.views.search.feature/feature.xml index dc8380d9462..898a2fee9a7 100644 --- a/features/papyrus-main-features/org.eclipse.papyrus.views.search.feature/feature.xml +++ b/features/papyrus-main-features/org.eclipse.papyrus.views.search.feature/feature.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <feature id="org.eclipse.papyrus.views.search.feature" - version="2.0.0.qualifier" + version="2.1.0.qualifier" label="%featureName" provider-name="%providerName" license-feature="org.eclipse.license" diff --git a/features/papyrus-main-features/org.eclipse.papyrus.views.search.feature/pom.xml b/features/papyrus-main-features/org.eclipse.papyrus.views.search.feature/pom.xml index c6da79afec1..7cad8e4f121 100644 --- a/features/papyrus-main-features/org.eclipse.papyrus.views.search.feature/pom.xml +++ b/features/papyrus-main-features/org.eclipse.papyrus.views.search.feature/pom.xml @@ -7,6 +7,6 @@ <version>0.0.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.papyrus.views.search.feature</artifactId> - <version>2.0.0-SNAPSHOT</version> + <version>2.1.0-SNAPSHOT</version> <packaging>eclipse-feature</packaging> </project>
\ No newline at end of file diff --git a/features/papyrus-tests-features/org.eclipse.papyrus.tests.feature/feature.xml b/features/papyrus-tests-features/org.eclipse.papyrus.tests.feature/feature.xml index 0360944b167..7bee66fab28 100644 --- a/features/papyrus-tests-features/org.eclipse.papyrus.tests.feature/feature.xml +++ b/features/papyrus-tests-features/org.eclipse.papyrus.tests.feature/feature.xml @@ -2,7 +2,7 @@ <feature id="org.eclipse.papyrus.tests.feature" label="%featureName" - version="2.0.0.qualifier" + version="2.0.100.qualifier" provider-name="%providerName" license-feature="org.eclipse.license" license-feature-version="2.0.2"> diff --git a/features/papyrus-tests-features/org.eclipse.papyrus.tests.feature/pom.xml b/features/papyrus-tests-features/org.eclipse.papyrus.tests.feature/pom.xml index 5aa172b29fa..ba01cd51077 100644 --- a/features/papyrus-tests-features/org.eclipse.papyrus.tests.feature/pom.xml +++ b/features/papyrus-tests-features/org.eclipse.papyrus.tests.feature/pom.xml @@ -11,6 +11,6 @@ </parent> <groupId>org.eclipse.papyrus</groupId> <artifactId>org.eclipse.papyrus.tests.feature</artifactId> - <version>2.0.0-SNAPSHOT</version> + <version>2.0.100-SNAPSHOT</version> <packaging>eclipse-feature</packaging> </project>
\ No newline at end of file diff --git a/features/papyrus-tests-features/org.eclipse.papyrus.tests.uml.diagram.feature/feature.xml b/features/papyrus-tests-features/org.eclipse.papyrus.tests.uml.diagram.feature/feature.xml index e73a5233839..e222d5813f2 100644 --- a/features/papyrus-tests-features/org.eclipse.papyrus.tests.uml.diagram.feature/feature.xml +++ b/features/papyrus-tests-features/org.eclipse.papyrus.tests.uml.diagram.feature/feature.xml @@ -2,7 +2,7 @@ <feature id="org.eclipse.papyrus.tests.uml.diagram.feature" label="%featureName" - version="1.2.0.qualifier" + version="1.2.100.qualifier" provider-name="%providerName" license-feature="org.eclipse.license" license-feature-version="2.0.2"> diff --git a/features/papyrus-tests-features/org.eclipse.papyrus.tests.uml.diagram.feature/pom.xml b/features/papyrus-tests-features/org.eclipse.papyrus.tests.uml.diagram.feature/pom.xml index 2068a8757af..634e8dbff38 100644 --- a/features/papyrus-tests-features/org.eclipse.papyrus.tests.uml.diagram.feature/pom.xml +++ b/features/papyrus-tests-features/org.eclipse.papyrus.tests.uml.diagram.feature/pom.xml @@ -11,6 +11,6 @@ </parent> <groupId>org.eclipse.papyrus</groupId> <artifactId>org.eclipse.papyrus.tests.uml.diagram.feature</artifactId> - <version>1.2.0-SNAPSHOT</version> + <version>1.2.100-SNAPSHOT</version> <packaging>eclipse-feature</packaging> </project>
\ No newline at end of file diff --git a/features/papyrus-toolsmiths-features/org.eclipse.papyrus.junit.feature/feature.xml b/features/papyrus-toolsmiths-features/org.eclipse.papyrus.junit.feature/feature.xml index 0abe380a6de..f7a3f25eb8f 100644 --- a/features/papyrus-toolsmiths-features/org.eclipse.papyrus.junit.feature/feature.xml +++ b/features/papyrus-toolsmiths-features/org.eclipse.papyrus.junit.feature/feature.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <feature id="org.eclipse.papyrus.junit.feature" - version="1.1.0.qualifier" + version="1.2.0.qualifier" label="%featureName" provider-name="%providerName" license-feature="org.eclipse.license" diff --git a/features/papyrus-toolsmiths-features/org.eclipse.papyrus.junit.feature/pom.xml b/features/papyrus-toolsmiths-features/org.eclipse.papyrus.junit.feature/pom.xml index 54fc4b9b5c2..082f7ffb364 100644 --- a/features/papyrus-toolsmiths-features/org.eclipse.papyrus.junit.feature/pom.xml +++ b/features/papyrus-toolsmiths-features/org.eclipse.papyrus.junit.feature/pom.xml @@ -9,7 +9,7 @@ </parent> <artifactId>org.eclipse.papyrus.junit.feature</artifactId> <groupId>org.eclipse.papyrus</groupId> - <version>1.1.0-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <packaging>eclipse-feature</packaging> </project>
\ No newline at end of file diff --git a/features/papyrus-toolsmiths-features/org.eclipse.papyrus.releng.feature/feature.xml b/features/papyrus-toolsmiths-features/org.eclipse.papyrus.releng.feature/feature.xml index 43320abf9a6..4c022d8c1f1 100755 --- a/features/papyrus-toolsmiths-features/org.eclipse.papyrus.releng.feature/feature.xml +++ b/features/papyrus-toolsmiths-features/org.eclipse.papyrus.releng.feature/feature.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <feature id="org.eclipse.papyrus.releng.feature" - version="1.0.0.qualifier" + version="1.2.0.qualifier" label="%featureName" provider-name="%providerName" license-feature="org.eclipse.license" @@ -21,7 +21,7 @@ <requires> - <import feature="org.eclipse.cbi.targetplatform-feature" version="3.0.0" match="compatible"/> + <import feature="org.eclipse.cbi.targetplatform.feature" version="3.0.0" match="compatible"/> </requires> <plugin diff --git a/features/papyrus-toolsmiths-features/org.eclipse.papyrus.releng.feature/pom.xml b/features/papyrus-toolsmiths-features/org.eclipse.papyrus.releng.feature/pom.xml index dbdf58cc88d..f8c77fc9fed 100755 --- a/features/papyrus-toolsmiths-features/org.eclipse.papyrus.releng.feature/pom.xml +++ b/features/papyrus-toolsmiths-features/org.eclipse.papyrus.releng.feature/pom.xml @@ -9,7 +9,7 @@ </parent> <artifactId>org.eclipse.papyrus.releng.feature</artifactId> <groupId>org.eclipse.papyrus</groupId> - <version>1.0.0-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <packaging>eclipse-feature</packaging> </project>
\ No newline at end of file diff --git a/features/papyrus-toolsmiths-features/org.eclipse.papyrus.toolsmiths.feature/feature.xml b/features/papyrus-toolsmiths-features/org.eclipse.papyrus.toolsmiths.feature/feature.xml index a093ce778be..66188093be3 100644 --- a/features/papyrus-toolsmiths-features/org.eclipse.papyrus.toolsmiths.feature/feature.xml +++ b/features/papyrus-toolsmiths-features/org.eclipse.papyrus.toolsmiths.feature/feature.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <feature id="org.eclipse.papyrus.toolsmiths.feature" - version="1.2.0.qualifier" + version="1.3.0.qualifier" label="%featureName" provider-name="%providerName" license-feature="org.eclipse.license" diff --git a/features/papyrus-toolsmiths-features/org.eclipse.papyrus.toolsmiths.feature/pom.xml b/features/papyrus-toolsmiths-features/org.eclipse.papyrus.toolsmiths.feature/pom.xml index b2d3b358e5a..87e0ec2ca9e 100644 --- a/features/papyrus-toolsmiths-features/org.eclipse.papyrus.toolsmiths.feature/pom.xml +++ b/features/papyrus-toolsmiths-features/org.eclipse.papyrus.toolsmiths.feature/pom.xml @@ -8,6 +8,6 @@ <version>0.0.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.papyrus.toolsmiths.feature</artifactId> - <version>1.2.0-SNAPSHOT</version> + <version>1.3.0-SNAPSHOT</version> <packaging>eclipse-feature</packaging> </project> diff --git a/plugins/doc/org.eclipse.papyrus.api.migration.doc/.classpath b/plugins/doc/org.eclipse.papyrus.api.migration.doc/.classpath index bc3587db485..a7a673fa7ab 100755 --- a/plugins/doc/org.eclipse.papyrus.api.migration.doc/.classpath +++ b/plugins/doc/org.eclipse.papyrus.api.migration.doc/.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/doc/org.eclipse.papyrus.api.migration.doc/.settings/org.eclipse.jdt.core.prefs b/plugins/doc/org.eclipse.papyrus.api.migration.doc/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/doc/org.eclipse.papyrus.api.migration.doc/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/doc/org.eclipse.papyrus.api.migration.doc/.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/doc/org.eclipse.papyrus.api.migration.doc/META-INF/MANIFEST.MF b/plugins/doc/org.eclipse.papyrus.api.migration.doc/META-INF/MANIFEST.MF index 46819caf740..51442086061 100755 --- a/plugins/doc/org.eclipse.papyrus.api.migration.doc/META-INF/MANIFEST.MF +++ b/plugins/doc/org.eclipse.papyrus.api.migration.doc/META-INF/MANIFEST.MF @@ -5,4 +5,4 @@ Bundle-SymbolicName: org.eclipse.papyrus.api.migration.doc;singleton:=true Bundle-Version: 2.0.0.qualifier Bundle-Vendor: Eclipse Modeling Project Automatic-Module-Name: org.eclipse.papyrus.api.migration.doc -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/plugins/doc/org.eclipse.papyrus.copypaste.ui.doc/.settings/org.eclipse.jdt.core.prefs b/plugins/doc/org.eclipse.papyrus.copypaste.ui.doc/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/doc/org.eclipse.papyrus.copypaste.ui.doc/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/doc/org.eclipse.papyrus.copypaste.ui.doc/.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/doc/org.eclipse.papyrus.copypaste.ui.doc/META-INF/MANIFEST.MF b/plugins/doc/org.eclipse.papyrus.copypaste.ui.doc/META-INF/MANIFEST.MF index 8a670fca9fd..aa14784f0be 100644 --- a/plugins/doc/org.eclipse.papyrus.copypaste.ui.doc/META-INF/MANIFEST.MF +++ b/plugins/doc/org.eclipse.papyrus.copypaste.ui.doc/META-INF/MANIFEST.MF @@ -5,5 +5,5 @@ Bundle-Name: %pluginName Bundle-Localization: plugin Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.copypaste.ui.doc;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.copypaste.ui.doc diff --git a/plugins/doc/org.eclipse.papyrus.customization.paletteconfiguration.doc/.settings/org.eclipse.jdt.core.prefs b/plugins/doc/org.eclipse.papyrus.customization.paletteconfiguration.doc/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/doc/org.eclipse.papyrus.customization.paletteconfiguration.doc/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/doc/org.eclipse.papyrus.customization.paletteconfiguration.doc/.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/doc/org.eclipse.papyrus.developer.doc/.classpath b/plugins/doc/org.eclipse.papyrus.developer.doc/.classpath index bc3587db485..a7a673fa7ab 100644 --- a/plugins/doc/org.eclipse.papyrus.developer.doc/.classpath +++ b/plugins/doc/org.eclipse.papyrus.developer.doc/.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/doc/org.eclipse.papyrus.developer.doc/.settings/org.eclipse.jdt.core.prefs b/plugins/doc/org.eclipse.papyrus.developer.doc/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/doc/org.eclipse.papyrus.developer.doc/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/doc/org.eclipse.papyrus.developer.doc/.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/doc/org.eclipse.papyrus.developer.doc/META-INF/MANIFEST.MF b/plugins/doc/org.eclipse.papyrus.developer.doc/META-INF/MANIFEST.MF index 049e9d7dcc0..258699ac3b5 100644 --- a/plugins/doc/org.eclipse.papyrus.developer.doc/META-INF/MANIFEST.MF +++ b/plugins/doc/org.eclipse.papyrus.developer.doc/META-INF/MANIFEST.MF @@ -7,4 +7,4 @@ Bundle-Name: %pluginName Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.developer.doc;singleton:=true Automatic-Module-Name: org.eclipse.papyrus.developer.doc -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/plugins/doc/org.eclipse.papyrus.developer.doc/resource/guidelines.mediawiki b/plugins/doc/org.eclipse.papyrus.developer.doc/resource/guidelines.mediawiki index d14f47ef8fb..89dfecdbd46 100644 --- a/plugins/doc/org.eclipse.papyrus.developer.doc/resource/guidelines.mediawiki +++ b/plugins/doc/org.eclipse.papyrus.developer.doc/resource/guidelines.mediawiki @@ -334,7 +334,7 @@ These rules apply to all plug-ins and features developed for the Papyrus Eclipse ==== Plug-ins ==== -*All plug-ins must compile and run with Java 11 (''Execution Environment = JavaSE-11'') since 2020-12. +*All plug-ins must compile and run with Java 17 (''Execution Environment = JavaSE-17'') since 2023-06. *Plug-in provider : ''Eclipse Modeling Project'' *Version : **Juno : ''0.9.2.qualifier'' @@ -482,8 +482,8 @@ This list contains all points that should be verified before committing the plug *Plugin id should correspond to Papyrus standards. It should be meaningfull and distinguishable from other plugins (to avoid having plugins org.eclipse.papyrus.editors and org.eclipse.papyrus.editor) **Plugin id and project name should be exactly the same, to ease the process build *Plugin should be compatible with the java 11 library: -**Minimal execution environment is JavaSE-11 -**JRE system library should be specified to JavaSE-11 +**Minimal execution environment is JavaSE-17 +**JRE system library should be specified to JavaSE-17 *Plugin should contain the 'about.html' file at the root of the plugin **Check also that this file is included in the source and binary builds (build.properties -> binary build, source build) *Plugin should be internationalized, with plugin.properties file or with the new system: PDE Tools > Internationalize diff --git a/plugins/doc/org.eclipse.papyrus.doctemplate.doc/.classpath b/plugins/doc/org.eclipse.papyrus.doctemplate.doc/.classpath index bc3587db485..a7a673fa7ab 100755 --- a/plugins/doc/org.eclipse.papyrus.doctemplate.doc/.classpath +++ b/plugins/doc/org.eclipse.papyrus.doctemplate.doc/.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/doc/org.eclipse.papyrus.doctemplate.doc/.settings/org.eclipse.jdt.core.prefs b/plugins/doc/org.eclipse.papyrus.doctemplate.doc/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/doc/org.eclipse.papyrus.doctemplate.doc/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/doc/org.eclipse.papyrus.doctemplate.doc/.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/doc/org.eclipse.papyrus.doctemplate.doc/META-INF/MANIFEST.MF b/plugins/doc/org.eclipse.papyrus.doctemplate.doc/META-INF/MANIFEST.MF index 3bb1a1d598a..8b58a6b68d5 100755 --- a/plugins/doc/org.eclipse.papyrus.doctemplate.doc/META-INF/MANIFEST.MF +++ b/plugins/doc/org.eclipse.papyrus.doctemplate.doc/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.doctemplate.doc;singleton:=true Bundle-Version: 1.0.0.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-Name: %Bundle-Name Bundle-Vendor: %Bundle-Vendor Bundle-Description: %Bundle-Description diff --git a/plugins/doc/org.eclipse.papyrus.dsml.validation.doc/.settings/org.eclipse.jdt.core.prefs b/plugins/doc/org.eclipse.papyrus.dsml.validation.doc/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/doc/org.eclipse.papyrus.dsml.validation.doc/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/doc/org.eclipse.papyrus.dsml.validation.doc/.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/doc/org.eclipse.papyrus.dsml.validation.doc/META-INF/MANIFEST.MF b/plugins/doc/org.eclipse.papyrus.dsml.validation.doc/META-INF/MANIFEST.MF index 8ea7cd0ba0d..2baf8676062 100644 --- a/plugins/doc/org.eclipse.papyrus.dsml.validation.doc/META-INF/MANIFEST.MF +++ b/plugins/doc/org.eclipse.papyrus.dsml.validation.doc/META-INF/MANIFEST.MF @@ -6,5 +6,5 @@ Bundle-Localization: plugin Bundle-Name: %pluginName Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.dsml.validation.doc;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.dsml.validation.doc diff --git a/plugins/doc/org.eclipse.papyrus.infra.architecture.doc/.settings/org.eclipse.jdt.core.prefs b/plugins/doc/org.eclipse.papyrus.infra.architecture.doc/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/doc/org.eclipse.papyrus.infra.architecture.doc/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/doc/org.eclipse.papyrus.infra.architecture.doc/.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/doc/org.eclipse.papyrus.infra.doc/.classpath b/plugins/doc/org.eclipse.papyrus.infra.doc/.classpath index e801ebfb468..81fe078c20c 100644 --- a/plugins/doc/org.eclipse.papyrus.infra.doc/.classpath +++ b/plugins/doc/org.eclipse.papyrus.infra.doc/.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/doc/org.eclipse.papyrus.infra.doc/.settings/org.eclipse.jdt.core.prefs b/plugins/doc/org.eclipse.papyrus.infra.doc/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/doc/org.eclipse.papyrus.infra.doc/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/doc/org.eclipse.papyrus.infra.doc/.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/doc/org.eclipse.papyrus.infra.doc/META-INF/MANIFEST.MF b/plugins/doc/org.eclipse.papyrus.infra.doc/META-INF/MANIFEST.MF index ceaea967b89..425ce385362 100644 --- a/plugins/doc/org.eclipse.papyrus.infra.doc/META-INF/MANIFEST.MF +++ b/plugins/doc/org.eclipse.papyrus.infra.doc/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Version: 2.0.0.qualifier Bundle-Name: %Bundle-Name Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.infra.doc;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-ClassPath: . Automatic-Module-Name: org.eclipse.papyrus.infra.doc Require-Bundle: org.eclipse.help.webapp;bundle-version="[3.10.0,4.0.0)" diff --git a/plugins/doc/org.eclipse.papyrus.infra.emf.expressions.doc/.classpath b/plugins/doc/org.eclipse.papyrus.infra.emf.expressions.doc/.classpath index e801ebfb468..81fe078c20c 100755 --- a/plugins/doc/org.eclipse.papyrus.infra.emf.expressions.doc/.classpath +++ b/plugins/doc/org.eclipse.papyrus.infra.emf.expressions.doc/.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/doc/org.eclipse.papyrus.infra.emf.expressions.doc/.settings/org.eclipse.jdt.core.prefs b/plugins/doc/org.eclipse.papyrus.infra.emf.expressions.doc/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/doc/org.eclipse.papyrus.infra.emf.expressions.doc/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/doc/org.eclipse.papyrus.infra.emf.expressions.doc/.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/doc/org.eclipse.papyrus.infra.emf.expressions.doc/META-INF/MANIFEST.MF b/plugins/doc/org.eclipse.papyrus.infra.emf.expressions.doc/META-INF/MANIFEST.MF index 7234c73f00a..1360e93c8d4 100755 --- a/plugins/doc/org.eclipse.papyrus.infra.emf.expressions.doc/META-INF/MANIFEST.MF +++ b/plugins/doc/org.eclipse.papyrus.infra.emf.expressions.doc/META-INF/MANIFEST.MF @@ -4,6 +4,6 @@ Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.papyrus.infra.emf.expressions.doc;singleton:=true Bundle-Version: 2.0.0.qualifier Bundle-Vendor: %Bundle-Vendor -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-Description: %Bundle-Description Automatic-Module-Name: org.eclipse.papyrus.infra.emf.expressions.doc diff --git a/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/.settings/org.eclipse.jdt.core.prefs b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.common.doc/.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/doc/org.eclipse.papyrus.infra.gmfdiag.css.doc/.settings/org.eclipse.jdt.core.prefs b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.css.doc/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.css.doc/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.css.doc/.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/doc/org.eclipse.papyrus.infra.internationalization.doc/.settings/org.eclipse.jdt.core.prefs b/plugins/doc/org.eclipse.papyrus.infra.internationalization.doc/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/doc/org.eclipse.papyrus.infra.internationalization.doc/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/doc/org.eclipse.papyrus.infra.internationalization.doc/.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/doc/org.eclipse.papyrus.infra.nattable.doc/.settings/org.eclipse.jdt.core.prefs b/plugins/doc/org.eclipse.papyrus.infra.nattable.doc/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/doc/org.eclipse.papyrus.infra.nattable.doc/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/doc/org.eclipse.papyrus.infra.nattable.doc/.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/doc/org.eclipse.papyrus.infra.newchild.doc/.classpath b/plugins/doc/org.eclipse.papyrus.infra.newchild.doc/.classpath index f53357c3cbb..00f063ff89b 100644 --- a/plugins/doc/org.eclipse.papyrus.infra.newchild.doc/.classpath +++ b/plugins/doc/org.eclipse.papyrus.infra.newchild.doc/.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/doc/org.eclipse.papyrus.infra.newchild.doc/.settings/org.eclipse.jdt.core.prefs b/plugins/doc/org.eclipse.papyrus.infra.newchild.doc/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/doc/org.eclipse.papyrus.infra.newchild.doc/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/doc/org.eclipse.papyrus.infra.newchild.doc/.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/doc/org.eclipse.papyrus.infra.newchild.doc/META-INF/MANIFEST.MF b/plugins/doc/org.eclipse.papyrus.infra.newchild.doc/META-INF/MANIFEST.MF index 6fadac795c8..2c109f54026 100644 --- a/plugins/doc/org.eclipse.papyrus.infra.newchild.doc/META-INF/MANIFEST.MF +++ b/plugins/doc/org.eclipse.papyrus.infra.newchild.doc/META-INF/MANIFEST.MF @@ -4,5 +4,5 @@ Bundle-Version: 2.0.0.qualifier Bundle-Name: New Child Documentation Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.infra.newchild.doc;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.infra.newchild.doc diff --git a/plugins/doc/org.eclipse.papyrus.infra.services.controlmode.doc/.classpath b/plugins/doc/org.eclipse.papyrus.infra.services.controlmode.doc/.classpath index f53357c3cbb..00f063ff89b 100644 --- a/plugins/doc/org.eclipse.papyrus.infra.services.controlmode.doc/.classpath +++ b/plugins/doc/org.eclipse.papyrus.infra.services.controlmode.doc/.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/doc/org.eclipse.papyrus.infra.services.controlmode.doc/.settings/org.eclipse.jdt.core.prefs b/plugins/doc/org.eclipse.papyrus.infra.services.controlmode.doc/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/doc/org.eclipse.papyrus.infra.services.controlmode.doc/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/doc/org.eclipse.papyrus.infra.services.controlmode.doc/.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/doc/org.eclipse.papyrus.infra.services.controlmode.doc/META-INF/MANIFEST.MF b/plugins/doc/org.eclipse.papyrus.infra.services.controlmode.doc/META-INF/MANIFEST.MF index d30e3d5903d..c98cde4ce65 100644 --- a/plugins/doc/org.eclipse.papyrus.infra.services.controlmode.doc/META-INF/MANIFEST.MF +++ b/plugins/doc/org.eclipse.papyrus.infra.services.controlmode.doc/META-INF/MANIFEST.MF @@ -4,5 +4,5 @@ Bundle-Version: 2.0.0.qualifier Bundle-Name: %Bundle-Name Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.infra.services.controlmode.doc;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.infra.services.controlmode.doc diff --git a/plugins/doc/org.eclipse.papyrus.infra.services.decoration.doc/.settings/org.eclipse.jdt.core.prefs b/plugins/doc/org.eclipse.papyrus.infra.services.decoration.doc/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/doc/org.eclipse.papyrus.infra.services.decoration.doc/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/doc/org.eclipse.papyrus.infra.services.decoration.doc/.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/doc/org.eclipse.papyrus.infra.services.navigation.doc/.settings/org.eclipse.jdt.core.prefs b/plugins/doc/org.eclipse.papyrus.infra.services.navigation.doc/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/doc/org.eclipse.papyrus.infra.services.navigation.doc/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/doc/org.eclipse.papyrus.infra.services.navigation.doc/.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/doc/org.eclipse.papyrus.infra.types.doc/META-INF/MANIFEST.MF b/plugins/doc/org.eclipse.papyrus.infra.types.doc/META-INF/MANIFEST.MF index 1e7a30e3860..2e093cc2c4c 100644 --- a/plugins/doc/org.eclipse.papyrus.infra.types.doc/META-INF/MANIFEST.MF +++ b/plugins/doc/org.eclipse.papyrus.infra.types.doc/META-INF/MANIFEST.MF @@ -4,5 +4,5 @@ Bundle-Version: 4.0.0.qualifier Bundle-Name: %Bundle-Name Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.infra.types.doc;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.infra.types.doc diff --git a/plugins/doc/org.eclipse.papyrus.req.reqif.doc/.settings/org.eclipse.jdt.core.prefs b/plugins/doc/org.eclipse.papyrus.req.reqif.doc/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/doc/org.eclipse.papyrus.req.reqif.doc/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/doc/org.eclipse.papyrus.req.reqif.doc/.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/doc/org.eclipse.papyrus.toolsmiths.architecture.doc/.settings/org.eclipse.jdt.core.prefs b/plugins/doc/org.eclipse.papyrus.toolsmiths.architecture.doc/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/doc/org.eclipse.papyrus.toolsmiths.architecture.doc/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/doc/org.eclipse.papyrus.toolsmiths.architecture.doc/.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/doc/org.eclipse.papyrus.toolsmiths.plugin.builder.doc/.settings/org.eclipse.jdt.core.prefs b/plugins/doc/org.eclipse.papyrus.toolsmiths.plugin.builder.doc/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100644 --- a/plugins/doc/org.eclipse.papyrus.toolsmiths.plugin.builder.doc/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/doc/org.eclipse.papyrus.toolsmiths.plugin.builder.doc/.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/doc/org.eclipse.papyrus.toolsmiths.plugin.builder.doc/META-INF/MANIFEST.MF b/plugins/doc/org.eclipse.papyrus.toolsmiths.plugin.builder.doc/META-INF/MANIFEST.MF index b9a42ab5300..08af10416ca 100644 --- a/plugins/doc/org.eclipse.papyrus.toolsmiths.plugin.builder.doc/META-INF/MANIFEST.MF +++ b/plugins/doc/org.eclipse.papyrus.toolsmiths.plugin.builder.doc/META-INF/MANIFEST.MF @@ -6,4 +6,4 @@ Bundle-Localization: plugin Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.toolsmiths.plugin.builder.doc;singleton:=true Automatic-Module-Name: org.eclipse.papyrus.toolsmiths.plugin.builder.doc -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/plugins/doc/org.eclipse.papyrus.toolsmiths.profilemigration.doc/.settings/org.eclipse.jdt.core.prefs b/plugins/doc/org.eclipse.papyrus.toolsmiths.profilemigration.doc/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/doc/org.eclipse.papyrus.toolsmiths.profilemigration.doc/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/doc/org.eclipse.papyrus.toolsmiths.profilemigration.doc/.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/doc/org.eclipse.papyrus.toolsmiths.recipe.elementtypes.doc/META-INF/MANIFEST.MF b/plugins/doc/org.eclipse.papyrus.toolsmiths.recipe.elementtypes.doc/META-INF/MANIFEST.MF index f5a3505ac81..0d8c518ea46 100644 --- a/plugins/doc/org.eclipse.papyrus.toolsmiths.recipe.elementtypes.doc/META-INF/MANIFEST.MF +++ b/plugins/doc/org.eclipse.papyrus.toolsmiths.recipe.elementtypes.doc/META-INF/MANIFEST.MF @@ -7,4 +7,4 @@ Automatic-Module-Name: org.eclipse.papyrus.toolsmiths.recipe.elementtypes.doc Bundle-Vendor: %pluginVendor Bundle-Localization: plugin Require-Bundle: org.eclipse.emf.common.ui;bundle-version="[2.18.0,3.0.0)" -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/plugins/doc/org.eclipse.papyrus.toolsmiths.recipe.elementtypes.doc/examples/org.eclipse.papyrus.toolsmiths.example.umlformetamodels/.classpath b/plugins/doc/org.eclipse.papyrus.toolsmiths.recipe.elementtypes.doc/examples/org.eclipse.papyrus.toolsmiths.example.umlformetamodels/.classpath index e801ebfb468..81fe078c20c 100644 --- a/plugins/doc/org.eclipse.papyrus.toolsmiths.recipe.elementtypes.doc/examples/org.eclipse.papyrus.toolsmiths.example.umlformetamodels/.classpath +++ b/plugins/doc/org.eclipse.papyrus.toolsmiths.recipe.elementtypes.doc/examples/org.eclipse.papyrus.toolsmiths.example.umlformetamodels/.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/doc/org.eclipse.papyrus.toolsmiths.recipe.elementtypes.doc/examples/org.eclipse.papyrus.toolsmiths.example.umlformetamodels/.settings/org.eclipse.jdt.core.prefs b/plugins/doc/org.eclipse.papyrus.toolsmiths.recipe.elementtypes.doc/examples/org.eclipse.papyrus.toolsmiths.example.umlformetamodels/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/doc/org.eclipse.papyrus.toolsmiths.recipe.elementtypes.doc/examples/org.eclipse.papyrus.toolsmiths.example.umlformetamodels/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/doc/org.eclipse.papyrus.toolsmiths.recipe.elementtypes.doc/examples/org.eclipse.papyrus.toolsmiths.example.umlformetamodels/.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/doc/org.eclipse.papyrus.toolsmiths.recipe.elementtypes.doc/examples/org.eclipse.papyrus.toolsmiths.example.umlformetamodels/META-INF/MANIFEST.MF b/plugins/doc/org.eclipse.papyrus.toolsmiths.recipe.elementtypes.doc/examples/org.eclipse.papyrus.toolsmiths.example.umlformetamodels/META-INF/MANIFEST.MF index ff11ce5dbb6..abe69cadc78 100644 --- a/plugins/doc/org.eclipse.papyrus.toolsmiths.recipe.elementtypes.doc/examples/org.eclipse.papyrus.toolsmiths.example.umlformetamodels/META-INF/MANIFEST.MF +++ b/plugins/doc/org.eclipse.papyrus.toolsmiths.recipe.elementtypes.doc/examples/org.eclipse.papyrus.toolsmiths.example.umlformetamodels/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-SymbolicName: org.eclipse.papyrus.toolsmiths.example.umlformetamodels;sin Bundle-Version: 1.0.0.qualifier Bundle-Vendor: Eclipse Modeling Project Automatic-Module-Name: org.eclipse.papyrus.toolsmiths.example.umlformetamodels -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Require-Bundle: org.eclipse.papyrus.infra.core;bundle-version="[4.0.0,5.0.0)", org.eclipse.papyrus.infra.architecture;bundle-version="[3.0.0,4.0.0)", org.eclipse.papyrus.infra.emf.types;bundle-version="[5.0.0,6.0.0)", diff --git a/plugins/doc/org.eclipse.papyrus.toolsmiths.validation.doc/.settings/org.eclipse.jdt.core.prefs b/plugins/doc/org.eclipse.papyrus.toolsmiths.validation.doc/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/doc/org.eclipse.papyrus.toolsmiths.validation.doc/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/doc/org.eclipse.papyrus.toolsmiths.validation.doc/.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/doc/org.eclipse.papyrus.uml.decoratormodel.doc/.settings/org.eclipse.jdt.core.prefs b/plugins/doc/org.eclipse.papyrus.uml.decoratormodel.doc/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/doc/org.eclipse.papyrus.uml.decoratormodel.doc/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/doc/org.eclipse.papyrus.uml.decoratormodel.doc/.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/doc/org.eclipse.papyrus.uml.diagram.common.doc/.settings/org.eclipse.jdt.core.prefs b/plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/.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/doc/org.eclipse.papyrus.uml.diagram.profile.doc/.settings/org.eclipse.jdt.core.prefs b/plugins/doc/org.eclipse.papyrus.uml.diagram.profile.doc/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/doc/org.eclipse.papyrus.uml.diagram.profile.doc/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/doc/org.eclipse.papyrus.uml.diagram.profile.doc/.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/doc/org.eclipse.papyrus.uml.doc/.settings/org.eclipse.jdt.core.prefs b/plugins/doc/org.eclipse.papyrus.uml.doc/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/doc/org.eclipse.papyrus.uml.doc/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/doc/org.eclipse.papyrus.uml.doc/.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/doc/org.eclipse.papyrus.uml.migration.doc/.settings/org.eclipse.jdt.core.prefs b/plugins/doc/org.eclipse.papyrus.uml.migration.doc/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/doc/org.eclipse.papyrus.uml.migration.doc/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/doc/org.eclipse.papyrus.uml.migration.doc/.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/doc/org.eclipse.papyrus.uml.modelrepair.doc/.settings/org.eclipse.jdt.core.prefs b/plugins/doc/org.eclipse.papyrus.uml.modelrepair.doc/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/doc/org.eclipse.papyrus.uml.modelrepair.doc/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/doc/org.eclipse.papyrus.uml.modelrepair.doc/.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/doc/org.eclipse.papyrus.uml.profile.assistants.doc/.settings/org.eclipse.jdt.core.prefs b/plugins/doc/org.eclipse.papyrus.uml.profile.assistants.doc/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/doc/org.eclipse.papyrus.uml.profile.assistants.doc/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/doc/org.eclipse.papyrus.uml.profile.assistants.doc/.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/doc/org.eclipse.papyrus.uml.profile.customization.doc/.settings/org.eclipse.jdt.core.prefs b/plugins/doc/org.eclipse.papyrus.uml.profile.customization.doc/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/doc/org.eclipse.papyrus.uml.profile.customization.doc/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/doc/org.eclipse.papyrus.uml.profile.customization.doc/.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/doc/org.eclipse.papyrus.uml.profile.types.doc/.settings/org.eclipse.jdt.core.prefs b/plugins/doc/org.eclipse.papyrus.uml.profile.types.doc/.settings/org.eclipse.jdt.core.prefs index c9545f06a41..62ef3488cc0 100644 --- a/plugins/doc/org.eclipse.papyrus.uml.profile.types.doc/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/doc/org.eclipse.papyrus.uml.profile.types.doc/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error 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 diff --git a/plugins/doc/org.eclipse.papyrus.uml.profile.types.doc/META-INF/MANIFEST.MF b/plugins/doc/org.eclipse.papyrus.uml.profile.types.doc/META-INF/MANIFEST.MF index de1e2c0d486..29bb41719c8 100644 --- a/plugins/doc/org.eclipse.papyrus.uml.profile.types.doc/META-INF/MANIFEST.MF +++ b/plugins/doc/org.eclipse.papyrus.uml.profile.types.doc/META-INF/MANIFEST.MF @@ -5,5 +5,5 @@ Bundle-SymbolicName: org.eclipse.papyrus.uml.profile.types.doc;singleton:=true Bundle-Version: 1.0.0.qualifier Bundle-Vendor: Eclipse Modeling Project Automatic-Module-Name: org.eclipse.papyrus.uml.profile.types.doc -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Require-Bundle: org.eclipse.help diff --git a/plugins/doc/org.eclipse.papyrus.uml.search.ui.doc/.settings/org.eclipse.jdt.core.prefs b/plugins/doc/org.eclipse.papyrus.uml.search.ui.doc/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/doc/org.eclipse.papyrus.uml.search.ui.doc/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/doc/org.eclipse.papyrus.uml.search.ui.doc/.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/doc/org.eclipse.papyrus.uml.textedit.doc/META-INF/MANIFEST.MF b/plugins/doc/org.eclipse.papyrus.uml.textedit.doc/META-INF/MANIFEST.MF index 3bedd2f3913..a985468a096 100755 --- a/plugins/doc/org.eclipse.papyrus.uml.textedit.doc/META-INF/MANIFEST.MF +++ b/plugins/doc/org.eclipse.papyrus.uml.textedit.doc/META-INF/MANIFEST.MF @@ -5,4 +5,4 @@ Bundle-SymbolicName: org.eclipse.papyrus.uml.textedit.doc;singleton:=true Bundle-Version: 1.1.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/plugins/editor/org.eclipse.papyrus.eclipse.project.editors/.classpath b/plugins/editor/org.eclipse.papyrus.eclipse.project.editors/.classpath index e801ebfb468..81fe078c20c 100644 --- a/plugins/editor/org.eclipse.papyrus.eclipse.project.editors/.classpath +++ b/plugins/editor/org.eclipse.papyrus.eclipse.project.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/editor/org.eclipse.papyrus.eclipse.project.editors/.settings/org.eclipse.jdt.core.prefs b/plugins/editor/org.eclipse.papyrus.eclipse.project.editors/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/editor/org.eclipse.papyrus.eclipse.project.editors/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/editor/org.eclipse.papyrus.eclipse.project.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/editor/org.eclipse.papyrus.eclipse.project.editors/META-INF/MANIFEST.MF b/plugins/editor/org.eclipse.papyrus.eclipse.project.editors/META-INF/MANIFEST.MF index 9d6b6db477f..3ec64053335 100644 --- a/plugins/editor/org.eclipse.papyrus.eclipse.project.editors/META-INF/MANIFEST.MF +++ b/plugins/editor/org.eclipse.papyrus.eclipse.project.editors/META-INF/MANIFEST.MF @@ -19,5 +19,5 @@ Bundle-Name: %pluginName Bundle-Activator: org.eclipse.papyrus.eclipse.project.editors.Activator Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.eclipse.project.editors;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.eclipse.project.editors diff --git a/plugins/editor/org.eclipse.papyrus.editor.perspectiveconfiguration/.classpath b/plugins/editor/org.eclipse.papyrus.editor.perspectiveconfiguration/.classpath index e801ebfb468..81fe078c20c 100644 --- a/plugins/editor/org.eclipse.papyrus.editor.perspectiveconfiguration/.classpath +++ b/plugins/editor/org.eclipse.papyrus.editor.perspectiveconfiguration/.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/editor/org.eclipse.papyrus.editor.perspectiveconfiguration/.settings/org.eclipse.jdt.core.prefs b/plugins/editor/org.eclipse.papyrus.editor.perspectiveconfiguration/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/editor/org.eclipse.papyrus.editor.perspectiveconfiguration/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/editor/org.eclipse.papyrus.editor.perspectiveconfiguration/.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/editor/org.eclipse.papyrus.editor.perspectiveconfiguration/META-INF/MANIFEST.MF b/plugins/editor/org.eclipse.papyrus.editor.perspectiveconfiguration/META-INF/MANIFEST.MF index 3927d0edb05..9501010dd07 100644 --- a/plugins/editor/org.eclipse.papyrus.editor.perspectiveconfiguration/META-INF/MANIFEST.MF +++ b/plugins/editor/org.eclipse.papyrus.editor.perspectiveconfiguration/META-INF/MANIFEST.MF @@ -10,5 +10,5 @@ Bundle-Name: %pluginName Bundle-Activator: org.eclipse.papyrus.editor.perspectiveconfiguration.Activator Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.editor.perspectiveconfiguration;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.editor.perspectiveconfiguration diff --git a/plugins/editor/org.eclipse.papyrus.editor/.classpath b/plugins/editor/org.eclipse.papyrus.editor/.classpath index e801ebfb468..81fe078c20c 100644 --- a/plugins/editor/org.eclipse.papyrus.editor/.classpath +++ b/plugins/editor/org.eclipse.papyrus.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"/> <classpathentry kind="output" path="bin"/> diff --git a/plugins/editor/org.eclipse.papyrus.editor/.settings/org.eclipse.jdt.core.prefs b/plugins/editor/org.eclipse.papyrus.editor/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/editor/org.eclipse.papyrus.editor/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/editor/org.eclipse.papyrus.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/editor/org.eclipse.papyrus.editor/META-INF/MANIFEST.MF b/plugins/editor/org.eclipse.papyrus.editor/META-INF/MANIFEST.MF index 09c92f70aad..74703b69f20 100644 --- a/plugins/editor/org.eclipse.papyrus.editor/META-INF/MANIFEST.MF +++ b/plugins/editor/org.eclipse.papyrus.editor/META-INF/MANIFEST.MF @@ -18,5 +18,5 @@ Bundle-Name: %pluginName Bundle-Activator: org.eclipse.papyrus.editor.Activator Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.editor;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.editor diff --git a/plugins/emf/org.eclipse.papyrus.emf.ui/.classpath b/plugins/emf/org.eclipse.papyrus.emf.ui/.classpath index b1592a80554..abaa43d8201 100755 --- a/plugins/emf/org.eclipse.papyrus.emf.ui/.classpath +++ b/plugins/emf/org.eclipse.papyrus.emf.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/emf/org.eclipse.papyrus.emf.ui/.settings/org.eclipse.jdt.core.prefs b/plugins/emf/org.eclipse.papyrus.emf.ui/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/emf/org.eclipse.papyrus.emf.ui/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/emf/org.eclipse.papyrus.emf.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/emf/org.eclipse.papyrus.emf.ui/META-INF/MANIFEST.MF b/plugins/emf/org.eclipse.papyrus.emf.ui/META-INF/MANIFEST.MF index 03a943bdf0c..5d11360c8fd 100755 --- a/plugins/emf/org.eclipse.papyrus.emf.ui/META-INF/MANIFEST.MF +++ b/plugins/emf/org.eclipse.papyrus.emf.ui/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-SymbolicName: org.eclipse.papyrus.emf.ui;singleton:=true Bundle-Version: 2.0.0.qualifier Bundle-Vendor: %Bundle-Vendor Automatic-Module-Name: org.eclipse.papyrus.emf.ui -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.18.0,4.0.0)", org.eclipse.emf.edit.ui;bundle-version="[2.18.0,3.0.0)", org.eclipse.ui.views.properties.tabbed;bundle-version="[3.8.0,4.0.0)" diff --git a/plugins/emf/org.eclipse.papyrus.emf/.classpath b/plugins/emf/org.eclipse.papyrus.emf/.classpath index e801ebfb468..81fe078c20c 100755 --- a/plugins/emf/org.eclipse.papyrus.emf/.classpath +++ b/plugins/emf/org.eclipse.papyrus.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/emf/org.eclipse.papyrus.emf/.settings/org.eclipse.jdt.core.prefs b/plugins/emf/org.eclipse.papyrus.emf/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/emf/org.eclipse.papyrus.emf/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/emf/org.eclipse.papyrus.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/emf/org.eclipse.papyrus.emf/META-INF/MANIFEST.MF b/plugins/emf/org.eclipse.papyrus.emf/META-INF/MANIFEST.MF index 11648f084a5..07ca41bd9ac 100755 --- a/plugins/emf/org.eclipse.papyrus.emf/META-INF/MANIFEST.MF +++ b/plugins/emf/org.eclipse.papyrus.emf/META-INF/MANIFEST.MF @@ -10,7 +10,7 @@ Require-Bundle: org.eclipse.core.resources;bundle-version="[3.13.0,4.0.0)", org.eclipse.emf.ecore.xmi;bundle-version="[2.16.0,3.0.0)", org.eclipse.papyrus.infra.core.log;bundle-version="[2.0.0,3.0.0)", org.eclipse.pde.core;bundle-version="[3.13.0,4.0.0)" -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-ActivationPolicy: lazy Export-Package: org.eclipse.papyrus.emf.helpers, org.eclipse.papyrus.emf.resources, diff --git a/plugins/facet/editor/org.eclipse.papyrus.emf.facet.custom.metamodel.editor/.classpath b/plugins/facet/editor/org.eclipse.papyrus.emf.facet.custom.metamodel.editor/.classpath index edc8895124d..a7bc712151f 100644 --- a/plugins/facet/editor/org.eclipse.papyrus.emf.facet.custom.metamodel.editor/.classpath +++ b/plugins/facet/editor/org.eclipse.papyrus.emf.facet.custom.metamodel.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/"/> <classpathentry kind="output" path="bin"/> diff --git a/plugins/facet/editor/org.eclipse.papyrus.emf.facet.custom.metamodel.editor/.settings/org.eclipse.jdt.core.prefs b/plugins/facet/editor/org.eclipse.papyrus.emf.facet.custom.metamodel.editor/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/facet/editor/org.eclipse.papyrus.emf.facet.custom.metamodel.editor/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/facet/editor/org.eclipse.papyrus.emf.facet.custom.metamodel.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/facet/editor/org.eclipse.papyrus.emf.facet.custom.metamodel.editor/META-INF/MANIFEST.MF b/plugins/facet/editor/org.eclipse.papyrus.emf.facet.custom.metamodel.editor/META-INF/MANIFEST.MF index c16e3c4b4bc..cc615a1a95e 100644 --- a/plugins/facet/editor/org.eclipse.papyrus.emf.facet.custom.metamodel.editor/META-INF/MANIFEST.MF +++ b/plugins/facet/editor/org.eclipse.papyrus.emf.facet.custom.metamodel.editor/META-INF/MANIFEST.MF @@ -25,5 +25,5 @@ Bundle-Localization: plugin Bundle-ManifestVersion: 2 Bundle-Activator: org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.presentation.Activator Bundle-SymbolicName: org.eclipse.papyrus.emf.facet.custom.metamodel.editor;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.emf.facet.custom.metamodel.editor diff --git a/plugins/facet/editor/org.eclipse.papyrus.emf.facet.doc/.classpath b/plugins/facet/editor/org.eclipse.papyrus.emf.facet.doc/.classpath index edc8895124d..a7bc712151f 100644 --- a/plugins/facet/editor/org.eclipse.papyrus.emf.facet.doc/.classpath +++ b/plugins/facet/editor/org.eclipse.papyrus.emf.facet.doc/.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/facet/editor/org.eclipse.papyrus.emf.facet.doc/.settings/org.eclipse.jdt.core.prefs b/plugins/facet/editor/org.eclipse.papyrus.emf.facet.doc/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/facet/editor/org.eclipse.papyrus.emf.facet.doc/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/facet/editor/org.eclipse.papyrus.emf.facet.doc/.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/facet/editor/org.eclipse.papyrus.emf.facet.doc/META-INF/MANIFEST.MF b/plugins/facet/editor/org.eclipse.papyrus.emf.facet.doc/META-INF/MANIFEST.MF index 213079bf33c..12654b2e621 100644 --- a/plugins/facet/editor/org.eclipse.papyrus.emf.facet.doc/META-INF/MANIFEST.MF +++ b/plugins/facet/editor/org.eclipse.papyrus.emf.facet.doc/META-INF/MANIFEST.MF @@ -6,5 +6,5 @@ Bundle-Version: 2.0.0.qualifier Bundle-Name: %Bundle-Name Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.emf.facet.doc;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.emf.facet.doc diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.architecture.edit/.classpath b/plugins/facet/org.eclipse.papyrus.emf.facet.architecture.edit/.classpath index 004db3fba20..2377d859931 100755 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.architecture.edit/.classpath +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.architecture.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/facet/org.eclipse.papyrus.emf.facet.architecture.edit/.settings/org.eclipse.jdt.core.prefs b/plugins/facet/org.eclipse.papyrus.emf.facet.architecture.edit/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.architecture.edit/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.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/facet/org.eclipse.papyrus.emf.facet.architecture.edit/META-INF/MANIFEST.MF b/plugins/facet/org.eclipse.papyrus.emf.facet.architecture.edit/META-INF/MANIFEST.MF index f9f56e71d5a..cacd735f9b6 100755 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.architecture.edit/META-INF/MANIFEST.MF +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.architecture.edit/META-INF/MANIFEST.MF @@ -8,7 +8,7 @@ Bundle-ClassPath: . Bundle-Activator: org.eclipse.papyrus.emf.facet.architecture.customizationconfiguration.provider.CustomizationConfigurationEditPlugin$Implementation$Activator Bundle-Vendor: %providerName Bundle-Localization: plugin -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.eclipse.papyrus.emf.facet.architecture.customizationconfiguration.provider Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.18.0,4.0.0)", org.eclipse.papyrus.emf.facet.architecture;bundle-version="[1.0.0,2.0.0)", diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.architecture/.classpath b/plugins/facet/org.eclipse.papyrus.emf.facet.architecture/.classpath index bb642933501..f574c0cbd4d 100755 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.architecture/.classpath +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.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-gen"/> <classpathentry kind="src" path="src"/> diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.architecture/.settings/org.eclipse.jdt.core.prefs b/plugins/facet/org.eclipse.papyrus.emf.facet.architecture/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.architecture/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.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/facet/org.eclipse.papyrus.emf.facet.architecture/META-INF/MANIFEST.MF b/plugins/facet/org.eclipse.papyrus.emf.facet.architecture/META-INF/MANIFEST.MF index 3bcf96b037c..582f4e7795d 100755 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.architecture/META-INF/MANIFEST.MF +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.architecture/META-INF/MANIFEST.MF @@ -7,7 +7,7 @@ Bundle-ClassPath: . Bundle-Vendor: %providerName Bundle-Localization: plugin Automatic-Module-Name: org.eclipse.papyrus.emf.facet.architecture -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.18.0,4.0.0)", org.eclipse.emf.ecore;bundle-version="[2.22.0,3.0.0)", org.eclipse.papyrus.infra.core.architecture;bundle-version="[3.0.0,4.0.0)", diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.common.core/.classpath b/plugins/facet/org.eclipse.papyrus.emf.facet.common.core/.classpath index e801ebfb468..81fe078c20c 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.common.core/.classpath +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.common.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/facet/org.eclipse.papyrus.emf.facet.common.core/.settings/org.eclipse.jdt.core.prefs b/plugins/facet/org.eclipse.papyrus.emf.facet.common.core/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.common.core/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.common.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/facet/org.eclipse.papyrus.emf.facet.common.core/META-INF/MANIFEST.MF b/plugins/facet/org.eclipse.papyrus.emf.facet.common.core/META-INF/MANIFEST.MF index 1b191a0aabd..f7a250ee827 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.common.core/META-INF/MANIFEST.MF +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.common.core/META-INF/MANIFEST.MF @@ -10,5 +10,5 @@ Bundle-Name: %Bundle-Name Bundle-Activator: org.eclipse.papyrus.emf.facet.common.core.internal.Activator Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.emf.facet.common.core;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.emf.facet.common.core diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.common.sdk.core/.classpath b/plugins/facet/org.eclipse.papyrus.emf.facet.common.sdk.core/.classpath index e801ebfb468..81fe078c20c 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.common.sdk.core/.classpath +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.common.sdk.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/facet/org.eclipse.papyrus.emf.facet.common.sdk.core/.settings/org.eclipse.jdt.core.prefs b/plugins/facet/org.eclipse.papyrus.emf.facet.common.sdk.core/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.common.sdk.core/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.common.sdk.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/facet/org.eclipse.papyrus.emf.facet.common.sdk.core/META-INF/MANIFEST.MF b/plugins/facet/org.eclipse.papyrus.emf.facet.common.sdk.core/META-INF/MANIFEST.MF index 86513523c8f..ee13e98b439 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.common.sdk.core/META-INF/MANIFEST.MF +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.common.sdk.core/META-INF/MANIFEST.MF @@ -15,5 +15,5 @@ Bundle-Name: %Bundle-Name Bundle-Activator: org.eclipse.papyrus.emf.facet.common.sdk.core.internal.Activator Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.emf.facet.common.sdk.core;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.emf.facet.common.sdk.core diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.common.sdk.core/src/org/eclipse/papyrus/emf/facet/common/sdk/core/internal/exported/utils/ProjectUtils.java b/plugins/facet/org.eclipse.papyrus.emf.facet.common.sdk.core/src/org/eclipse/papyrus/emf/facet/common/sdk/core/internal/exported/utils/ProjectUtils.java index f1c96991e72..6dfbfb31560 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.common.sdk.core/src/org/eclipse/papyrus/emf/facet/common/sdk/core/internal/exported/utils/ProjectUtils.java +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.common.sdk.core/src/org/eclipse/papyrus/emf/facet/common/sdk/core/internal/exported/utils/ProjectUtils.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2010, 2012 Mia-Software. + * Copyright (c) 2010, 2012, 2023 Mia-Software. * 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,8 @@ * Gregoire Dupe (Mia-Software) * Fabien Giquel (Mia-Software) * Nicolas Bros (Mia-Software) - * Nicolas Bros (Mia-Software) - Bug 375054 - Add validation warning for overlay on EClass + * Nicolas Bros (Mia-Software) - Bug 375054 - Add validation warning for overlay on EClass + * Pauline DEVILLE (CEA LIST) pauline.deville@cea.fr - Bug 581848 *******************************************************************************/ package org.eclipse.papyrus.emf.facet.common.sdk.core.internal.exported.utils; @@ -61,7 +62,7 @@ public final class ProjectUtils { // Nothing } - private static final String JAVA_VERSION = "JavaSE-11"; //$NON-NLS-1$ + private static final String JAVA_VERSION = "JavaSE-17"; //$NON-NLS-1$ public static void addPdeClassPath(final IProject project) throws JavaModelException { final IJavaProject javaProject = JavaCore.create(project); diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.common.ui/.classpath b/plugins/facet/org.eclipse.papyrus.emf.facet.common.ui/.classpath index e801ebfb468..81fe078c20c 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.common.ui/.classpath +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.common.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/facet/org.eclipse.papyrus.emf.facet.common.ui/.settings/org.eclipse.jdt.core.prefs b/plugins/facet/org.eclipse.papyrus.emf.facet.common.ui/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.common.ui/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.common.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/facet/org.eclipse.papyrus.emf.facet.common.ui/META-INF/MANIFEST.MF b/plugins/facet/org.eclipse.papyrus.emf.facet.common.ui/META-INF/MANIFEST.MF index a170778afe3..18547cb139d 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.common.ui/META-INF/MANIFEST.MF +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.common.ui/META-INF/MANIFEST.MF @@ -17,5 +17,5 @@ Bundle-Name: %Bundle-Name Bundle-Activator: org.eclipse.papyrus.emf.facet.common.ui.internal.Activator Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.emf.facet.common.ui;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.emf.facet.common.ui diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.core/.classpath b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.core/.classpath index e801ebfb468..81fe078c20c 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.core/.classpath +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.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/facet/org.eclipse.papyrus.emf.facet.custom.core/.settings/org.eclipse.jdt.core.prefs b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.core/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.core/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.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/facet/org.eclipse.papyrus.emf.facet.custom.core/META-INF/MANIFEST.MF b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.core/META-INF/MANIFEST.MF index 92f08b7f140..211ef887a18 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.core/META-INF/MANIFEST.MF +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.core/META-INF/MANIFEST.MF @@ -22,5 +22,5 @@ Bundle-Name: %Bundle-Name Bundle-Activator: org.eclipse.papyrus.emf.facet.custom.core.internal.Activator Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.emf.facet.custom.core;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.emf.facet.custom.core diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.metamodel.edit/.classpath b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.metamodel.edit/.classpath index c3ba59e4c3a..1a821310bdc 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.metamodel.edit/.classpath +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.metamodel.edit/.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/facet/org.eclipse.papyrus.emf.facet.custom.metamodel.edit/.settings/org.eclipse.jdt.core.prefs b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.metamodel.edit/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.metamodel.edit/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.metamodel.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/facet/org.eclipse.papyrus.emf.facet.custom.metamodel.edit/META-INF/MANIFEST.MF b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.metamodel.edit/META-INF/MANIFEST.MF index d0b0cadfc11..6e45d81314f 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.metamodel.edit/META-INF/MANIFEST.MF +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.metamodel.edit/META-INF/MANIFEST.MF @@ -14,5 +14,5 @@ Bundle-Localization: plugin Bundle-ManifestVersion: 2 Bundle-Activator: org.eclipse.papyrus.emf.facet.custom.metamodel.v0_2_0.custom.provider.CustomEditPlugin$Implementation Bundle-SymbolicName: org.eclipse.papyrus.emf.facet.custom.metamodel.edit;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.emf.facet.custom.metamodel.edit diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.metamodel/.classpath b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.metamodel/.classpath index c3ba59e4c3a..1a821310bdc 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.metamodel/.classpath +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.metamodel/.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/facet/org.eclipse.papyrus.emf.facet.custom.metamodel/.settings/org.eclipse.jdt.core.prefs b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.metamodel/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.metamodel/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.metamodel/.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/facet/org.eclipse.papyrus.emf.facet.custom.metamodel/META-INF/MANIFEST.MF b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.metamodel/META-INF/MANIFEST.MF index 14c3fe2c911..9ea52a96bbc 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.metamodel/META-INF/MANIFEST.MF +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.metamodel/META-INF/MANIFEST.MF @@ -22,5 +22,5 @@ Bundle-Localization: plugin Bundle-Name: %pluginName Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.emf.facet.custom.metamodel;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.emf.facet.custom.metamodel diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.core/.classpath b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.core/.classpath index e801ebfb468..81fe078c20c 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.core/.classpath +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.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/facet/org.eclipse.papyrus.emf.facet.custom.sdk.core/.settings/org.eclipse.jdt.core.prefs b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.core/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.core/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.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/facet/org.eclipse.papyrus.emf.facet.custom.sdk.core/META-INF/MANIFEST.MF b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.core/META-INF/MANIFEST.MF index 1cbc8f32620..f0314e13614 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.core/META-INF/MANIFEST.MF +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.core/META-INF/MANIFEST.MF @@ -18,5 +18,5 @@ Bundle-Name: %Bundle-Name Bundle-Activator: org.eclipse.papyrus.emf.facet.custom.sdk.core.internal.Activator Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.emf.facet.custom.sdk.core;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.emf.facet.custom.sdk.core diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/.classpath b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/.classpath index edc8895124d..a7bc712151f 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/.classpath +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.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/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/.settings/org.eclipse.jdt.core.prefs b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.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/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/META-INF/MANIFEST.MF b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/META-INF/MANIFEST.MF index 832fe43a7a1..f32422d812c 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/META-INF/MANIFEST.MF +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.ui/META-INF/MANIFEST.MF @@ -25,5 +25,5 @@ Bundle-Name: %Bundle-Name Bundle-ManifestVersion: 2 Bundle-Activator: org.eclipse.papyrus.emf.facet.custom.sdk.ui.internal.Activator Bundle-SymbolicName: org.eclipse.papyrus.emf.facet.custom.sdk.ui;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.emf.facet.custom.sdk.ui diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/.classpath b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/.classpath index e801ebfb468..81fe078c20c 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/.classpath +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.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/facet/org.eclipse.papyrus.emf.facet.custom.ui/.settings/org.eclipse.jdt.core.prefs b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.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/facet/org.eclipse.papyrus.emf.facet.custom.ui/META-INF/MANIFEST.MF b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/META-INF/MANIFEST.MF index adb787d4a2e..382316e4492 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/META-INF/MANIFEST.MF +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/META-INF/MANIFEST.MF @@ -27,5 +27,5 @@ Bundle-Name: %Bundle-Name Bundle-Activator: org.eclipse.papyrus.emf.facet.custom.ui.internal.Activator Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.emf.facet.custom.ui;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.emf.facet.custom.ui diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.catalog/.classpath b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.catalog/.classpath index c3ba59e4c3a..1a821310bdc 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.catalog/.classpath +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.catalog/.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/facet/org.eclipse.papyrus.emf.facet.efacet.catalog/.settings/org.eclipse.jdt.core.prefs b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.catalog/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.catalog/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.catalog/.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/facet/org.eclipse.papyrus.emf.facet.efacet.catalog/META-INF/MANIFEST.MF b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.catalog/META-INF/MANIFEST.MF index 8d8f3a709a9..2e982bccb87 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.catalog/META-INF/MANIFEST.MF +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.catalog/META-INF/MANIFEST.MF @@ -12,5 +12,5 @@ Bundle-Name: %Bundle-Name Bundle-Activator: org.eclipse.papyrus.emf.facet.efacet.catalog.plugin.Activator Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.emf.facet.efacet.catalog;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.emf.facet.efacet.catalog diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.core/.classpath b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.core/.classpath index e801ebfb468..81fe078c20c 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.core/.classpath +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.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/facet/org.eclipse.papyrus.emf.facet.efacet.core/.settings/org.eclipse.jdt.core.prefs b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.core/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.core/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.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/facet/org.eclipse.papyrus.emf.facet.efacet.core/META-INF/MANIFEST.MF b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.core/META-INF/MANIFEST.MF index 9656531219e..eb7da7f7d90 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.core/META-INF/MANIFEST.MF +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.core/META-INF/MANIFEST.MF @@ -22,5 +22,5 @@ Bundle-Name: %Bundle-Name Bundle-Activator: org.eclipse.papyrus.emf.facet.efacet.core.internal.Activator Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.emf.facet.efacet.core;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.emf.facet.efacet.core diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.edit/.classpath b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.edit/.classpath index e801ebfb468..81fe078c20c 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.edit/.classpath +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.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/facet/org.eclipse.papyrus.emf.facet.efacet.edit/.settings/org.eclipse.jdt.core.prefs b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.edit/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.edit/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.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/facet/org.eclipse.papyrus.emf.facet.efacet.edit/META-INF/MANIFEST.MF b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.edit/META-INF/MANIFEST.MF index ef52bc7e84b..be07b108a27 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.edit/META-INF/MANIFEST.MF +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.edit/META-INF/MANIFEST.MF @@ -12,5 +12,5 @@ Bundle-Name: %pluginName Bundle-Activator: org.eclipse.papyrus.emf.facet.efacet.provider.EfacetEditPlugin$Implementation Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.emf.facet.efacet.edit;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.emf.facet.efacet.edit diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.editor/.classpath b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.editor/.classpath index e801ebfb468..81fe078c20c 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.editor/.classpath +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.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"/> <classpathentry kind="output" path="bin"/> diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.editor/.settings/org.eclipse.jdt.core.prefs b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.editor/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.editor/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.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/facet/org.eclipse.papyrus.emf.facet.efacet.editor/META-INF/MANIFEST.MF b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.editor/META-INF/MANIFEST.MF index 10d22230191..48ec86a1c64 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.editor/META-INF/MANIFEST.MF +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.editor/META-INF/MANIFEST.MF @@ -17,5 +17,5 @@ Bundle-Localization: plugin Bundle-ManifestVersion: 2 Bundle-Activator: org.eclipse.papyrus.emf.facet.efacet.presentation.EfacetEditorPlugin$Implementation Bundle-SymbolicName: org.eclipse.papyrus.emf.facet.efacet.editor;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.emf.facet.efacet.editor diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel.edit/.classpath b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel.edit/.classpath index e801ebfb468..81fe078c20c 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel.edit/.classpath +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel.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/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel.edit/.settings/org.eclipse.jdt.core.prefs b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel.edit/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel.edit/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel.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/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel.edit/META-INF/MANIFEST.MF b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel.edit/META-INF/MANIFEST.MF index 4c7e192369b..93e4e3b0e3c 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel.edit/META-INF/MANIFEST.MF +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel.edit/META-INF/MANIFEST.MF @@ -16,5 +16,5 @@ Bundle-Localization: plugin Bundle-ManifestVersion: 2 Bundle-Activator: org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.provider.Efacet2EditPlugin$Implementation Bundle-SymbolicName: org.eclipse.papyrus.emf.facet.efacet.metamodel.edit;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.emf.facet.efacet.metamodel.edit diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/.classpath b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/.classpath index bb642933501..f574c0cbd4d 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/.classpath +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/.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/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/.settings/org.eclipse.jdt.core.prefs b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/.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/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/META-INF/MANIFEST.MF b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/META-INF/MANIFEST.MF index f36563fa19e..63571d6825e 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/META-INF/MANIFEST.MF +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/META-INF/MANIFEST.MF @@ -28,6 +28,6 @@ Bundle-Version: 2.0.0.qualifier Bundle-Name: %pluginName Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.emf.facet.efacet.metamodel;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.emf.facet.efacet.metamodel Bundle-Activator: org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.internal.Activator diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.sdk.ui/.classpath b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.sdk.ui/.classpath index edc8895124d..a7bc712151f 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.sdk.ui/.classpath +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.sdk.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/facet/org.eclipse.papyrus.emf.facet.efacet.sdk.ui/.settings/org.eclipse.jdt.core.prefs b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.sdk.ui/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.sdk.ui/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.sdk.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/facet/org.eclipse.papyrus.emf.facet.efacet.sdk.ui/META-INF/MANIFEST.MF b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.sdk.ui/META-INF/MANIFEST.MF index ac9905c34c8..2fbd1378b40 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.sdk.ui/META-INF/MANIFEST.MF +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.sdk.ui/META-INF/MANIFEST.MF @@ -29,5 +29,5 @@ Bundle-Name: %Bundle-Name Bundle-ManifestVersion: 2 Bundle-Activator: org.eclipse.papyrus.emf.facet.efacet.sdk.ui.internal.Activator Bundle-SymbolicName: org.eclipse.papyrus.emf.facet.efacet.sdk.ui;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.emf.facet.efacet.sdk.ui diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.ui/.classpath b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.ui/.classpath index e801ebfb468..81fe078c20c 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.ui/.classpath +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.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/facet/org.eclipse.papyrus.emf.facet.efacet.ui/.settings/org.eclipse.jdt.core.prefs b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.ui/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.ui/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.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/facet/org.eclipse.papyrus.emf.facet.efacet.ui/META-INF/MANIFEST.MF b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.ui/META-INF/MANIFEST.MF index 45de4069247..a39951aa01b 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.ui/META-INF/MANIFEST.MF +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.ui/META-INF/MANIFEST.MF @@ -36,5 +36,5 @@ Bundle-Name: %Bundle-Name Bundle-Activator: org.eclipse.papyrus.emf.facet.efacet.ui.internal.Activator Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.emf.facet.efacet.ui;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.emf.facet.efacet.ui diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet/.classpath b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet/.classpath index c3ba59e4c3a..1a821310bdc 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet/.classpath +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet/.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/facet/org.eclipse.papyrus.emf.facet.efacet/.settings/org.eclipse.jdt.core.prefs b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet/.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/facet/org.eclipse.papyrus.emf.facet.efacet/META-INF/MANIFEST.MF b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet/META-INF/MANIFEST.MF index 3098a4aa4ea..6f904dd6738 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet/META-INF/MANIFEST.MF +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet/META-INF/MANIFEST.MF @@ -12,5 +12,5 @@ Bundle-Name: %Bundle-Name Bundle-Activator: org.eclipse.papyrus.emf.facet.efacet.plugin.Activator Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.emf.facet.efacet;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.emf.facet.efacet diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.query.java.core/.classpath b/plugins/facet/org.eclipse.papyrus.emf.facet.query.java.core/.classpath index e801ebfb468..81fe078c20c 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.query.java.core/.classpath +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.query.java.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/facet/org.eclipse.papyrus.emf.facet.query.java.core/.settings/org.eclipse.jdt.core.prefs b/plugins/facet/org.eclipse.papyrus.emf.facet.query.java.core/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.query.java.core/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.query.java.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/facet/org.eclipse.papyrus.emf.facet.query.java.core/META-INF/MANIFEST.MF b/plugins/facet/org.eclipse.papyrus.emf.facet.query.java.core/META-INF/MANIFEST.MF index 6ab65e9182a..ac9f41a7a31 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.query.java.core/META-INF/MANIFEST.MF +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.query.java.core/META-INF/MANIFEST.MF @@ -17,5 +17,5 @@ Bundle-Name: %Bundle-Name Bundle-Activator: org.eclipse.papyrus.emf.facet.query.java.core.internal.plugin.Activator Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.emf.facet.query.java.core;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.emf.facet.query.java.core diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.query.java.metamodel/.classpath b/plugins/facet/org.eclipse.papyrus.emf.facet.query.java.metamodel/.classpath index 099e24f14fc..c3f9cf33e92 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.query.java.metamodel/.classpath +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.query.java.metamodel/.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/facet/org.eclipse.papyrus.emf.facet.query.java.metamodel/.settings/org.eclipse.jdt.core.prefs b/plugins/facet/org.eclipse.papyrus.emf.facet.query.java.metamodel/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.query.java.metamodel/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.query.java.metamodel/.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/facet/org.eclipse.papyrus.emf.facet.query.java.metamodel/META-INF/MANIFEST.MF b/plugins/facet/org.eclipse.papyrus.emf.facet.query.java.metamodel/META-INF/MANIFEST.MF index d7b208175e5..5cd68daebfb 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.query.java.metamodel/META-INF/MANIFEST.MF +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.query.java.metamodel/META-INF/MANIFEST.MF @@ -14,5 +14,5 @@ Bundle-Name: %Bundle-Name Bundle-Activator: org.eclipse.papyrus.emf.facet.query.java.metamodel.internal.Activator Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.emf.facet.query.java.metamodel;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.emf.facet.query.java.metamodel diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.query.java.sdk.ui/.classpath b/plugins/facet/org.eclipse.papyrus.emf.facet.query.java.sdk.ui/.classpath index e801ebfb468..81fe078c20c 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.query.java.sdk.ui/.classpath +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.query.java.sdk.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/facet/org.eclipse.papyrus.emf.facet.query.java.sdk.ui/.settings/org.eclipse.jdt.core.prefs b/plugins/facet/org.eclipse.papyrus.emf.facet.query.java.sdk.ui/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.query.java.sdk.ui/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.query.java.sdk.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/facet/org.eclipse.papyrus.emf.facet.query.java.sdk.ui/META-INF/MANIFEST.MF b/plugins/facet/org.eclipse.papyrus.emf.facet.query.java.sdk.ui/META-INF/MANIFEST.MF index 2007f831103..2e60e394264 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.query.java.sdk.ui/META-INF/MANIFEST.MF +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.query.java.sdk.ui/META-INF/MANIFEST.MF @@ -22,5 +22,5 @@ Bundle-Name: %Bundle-Name Bundle-Activator: org.eclipse.papyrus.emf.facet.query.java.sdk.ui.internal.Activator Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.emf.facet.query.java.sdk.ui;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.emf.facet.query.java.sdk.ui diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.query.java/.classpath b/plugins/facet/org.eclipse.papyrus.emf.facet.query.java/.classpath index c3ba59e4c3a..1a821310bdc 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.query.java/.classpath +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.query.java/.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/facet/org.eclipse.papyrus.emf.facet.query.java/.settings/org.eclipse.jdt.core.prefs b/plugins/facet/org.eclipse.papyrus.emf.facet.query.java/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.query.java/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.query.java/.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/facet/org.eclipse.papyrus.emf.facet.query.java/META-INF/MANIFEST.MF b/plugins/facet/org.eclipse.papyrus.emf.facet.query.java/META-INF/MANIFEST.MF index f9a7dfbc03f..9e74850e30d 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.query.java/META-INF/MANIFEST.MF +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.query.java/META-INF/MANIFEST.MF @@ -10,5 +10,5 @@ Bundle-Version: 2.0.0.qualifier Bundle-Name: %Bundle-Name Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.emf.facet.query.java;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.emf.facet.query.java diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.query.ocl.core/.classpath b/plugins/facet/org.eclipse.papyrus.emf.facet.query.ocl.core/.classpath index e801ebfb468..81fe078c20c 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.query.ocl.core/.classpath +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.query.ocl.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/facet/org.eclipse.papyrus.emf.facet.query.ocl.core/.settings/org.eclipse.jdt.core.prefs b/plugins/facet/org.eclipse.papyrus.emf.facet.query.ocl.core/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.query.ocl.core/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.query.ocl.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/facet/org.eclipse.papyrus.emf.facet.query.ocl.core/META-INF/MANIFEST.MF b/plugins/facet/org.eclipse.papyrus.emf.facet.query.ocl.core/META-INF/MANIFEST.MF index 076fba08e1b..d9152ebba6b 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.query.ocl.core/META-INF/MANIFEST.MF +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.query.ocl.core/META-INF/MANIFEST.MF @@ -14,5 +14,5 @@ Bundle-Name: %Bundle-Name Bundle-Activator: org.eclipse.papyrus.emf.facet.query.ocl.core.internal.Activator Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.emf.facet.query.ocl.core;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.emf.facet.query.ocl.core diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.query.ocl.metamodel/.classpath b/plugins/facet/org.eclipse.papyrus.emf.facet.query.ocl.metamodel/.classpath index e801ebfb468..81fe078c20c 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.query.ocl.metamodel/.classpath +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.query.ocl.metamodel/.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/facet/org.eclipse.papyrus.emf.facet.query.ocl.metamodel/.settings/org.eclipse.jdt.core.prefs b/plugins/facet/org.eclipse.papyrus.emf.facet.query.ocl.metamodel/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.query.ocl.metamodel/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.query.ocl.metamodel/.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/facet/org.eclipse.papyrus.emf.facet.query.ocl.metamodel/META-INF/MANIFEST.MF b/plugins/facet/org.eclipse.papyrus.emf.facet.query.ocl.metamodel/META-INF/MANIFEST.MF index cb9dc99d52f..26332a5676c 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.query.ocl.metamodel/META-INF/MANIFEST.MF +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.query.ocl.metamodel/META-INF/MANIFEST.MF @@ -12,5 +12,5 @@ Bundle-Localization: plugin Bundle-Name: %pluginName Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.emf.facet.query.ocl.metamodel;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.emf.facet.query.ocl.metamodel diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.query.ocl.sdk.ui/.classpath b/plugins/facet/org.eclipse.papyrus.emf.facet.query.ocl.sdk.ui/.classpath index e801ebfb468..81fe078c20c 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.query.ocl.sdk.ui/.classpath +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.query.ocl.sdk.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/facet/org.eclipse.papyrus.emf.facet.query.ocl.sdk.ui/.settings/org.eclipse.jdt.core.prefs b/plugins/facet/org.eclipse.papyrus.emf.facet.query.ocl.sdk.ui/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.query.ocl.sdk.ui/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.query.ocl.sdk.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/facet/org.eclipse.papyrus.emf.facet.query.ocl.sdk.ui/META-INF/MANIFEST.MF b/plugins/facet/org.eclipse.papyrus.emf.facet.query.ocl.sdk.ui/META-INF/MANIFEST.MF index 91b0cfcb14b..e253125fcba 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.query.ocl.sdk.ui/META-INF/MANIFEST.MF +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.query.ocl.sdk.ui/META-INF/MANIFEST.MF @@ -18,5 +18,5 @@ Bundle-Name: %Bundle-Name Bundle-Activator: org.eclipse.papyrus.emf.facet.query.ocl.sdk.ui.internal.Activator Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.emf.facet.query.ocl.sdk.ui;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.emf.facet.query.ocl.sdk.ui diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.util.core/.classpath b/plugins/facet/org.eclipse.papyrus.emf.facet.util.core/.classpath index e801ebfb468..81fe078c20c 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.util.core/.classpath +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.util.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/facet/org.eclipse.papyrus.emf.facet.util.core/.settings/org.eclipse.jdt.core.prefs b/plugins/facet/org.eclipse.papyrus.emf.facet.util.core/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.util.core/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.util.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/facet/org.eclipse.papyrus.emf.facet.util.core/META-INF/MANIFEST.MF b/plugins/facet/org.eclipse.papyrus.emf.facet.util.core/META-INF/MANIFEST.MF index 1077a942f38..ffb9007145b 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.util.core/META-INF/MANIFEST.MF +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.util.core/META-INF/MANIFEST.MF @@ -12,5 +12,5 @@ Bundle-Name: %Bundle-Name Bundle-Activator: org.eclipse.papyrus.emf.facet.util.core.internal.Activator Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.emf.facet.util.core;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.emf.facet.util.core diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.util.emf.catalog/.classpath b/plugins/facet/org.eclipse.papyrus.emf.facet.util.emf.catalog/.classpath index c3ba59e4c3a..1a821310bdc 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.util.emf.catalog/.classpath +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.util.emf.catalog/.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/facet/org.eclipse.papyrus.emf.facet.util.emf.catalog/.settings/org.eclipse.jdt.core.prefs b/plugins/facet/org.eclipse.papyrus.emf.facet.util.emf.catalog/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.util.emf.catalog/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.util.emf.catalog/.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/facet/org.eclipse.papyrus.emf.facet.util.emf.catalog/META-INF/MANIFEST.MF b/plugins/facet/org.eclipse.papyrus.emf.facet.util.emf.catalog/META-INF/MANIFEST.MF index 4e00df6e7bd..1df36ae7482 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.util.emf.catalog/META-INF/MANIFEST.MF +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.util.emf.catalog/META-INF/MANIFEST.MF @@ -10,5 +10,5 @@ Bundle-Name: %Bundle-Name Bundle-Activator: org.eclipse.papyrus.emf.facet.util.emf.catalog.plugin.Activator Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.emf.facet.util.emf.catalog;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.emf.facet.util.emf.catalog diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.util.emf.core/.classpath b/plugins/facet/org.eclipse.papyrus.emf.facet.util.emf.core/.classpath index c3ba59e4c3a..1a821310bdc 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.util.emf.core/.classpath +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.util.emf.core/.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/facet/org.eclipse.papyrus.emf.facet.util.emf.core/.settings/org.eclipse.jdt.core.prefs b/plugins/facet/org.eclipse.papyrus.emf.facet.util.emf.core/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.util.emf.core/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.util.emf.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/facet/org.eclipse.papyrus.emf.facet.util.emf.core/META-INF/MANIFEST.MF b/plugins/facet/org.eclipse.papyrus.emf.facet.util.emf.core/META-INF/MANIFEST.MF index 7c7a5e3669b..b7dde4819cc 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.util.emf.core/META-INF/MANIFEST.MF +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.util.emf.core/META-INF/MANIFEST.MF @@ -28,5 +28,5 @@ Bundle-Name: %Bundle-Name Bundle-Activator: org.eclipse.papyrus.emf.facet.util.emf.core.internal.Activator Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.emf.facet.util.emf.core;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.emf.facet.util.emf.core diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.util.emf.ui/.classpath b/plugins/facet/org.eclipse.papyrus.emf.facet.util.emf.ui/.classpath index e801ebfb468..81fe078c20c 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.util.emf.ui/.classpath +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.util.emf.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/facet/org.eclipse.papyrus.emf.facet.util.emf.ui/.settings/org.eclipse.jdt.core.prefs b/plugins/facet/org.eclipse.papyrus.emf.facet.util.emf.ui/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.util.emf.ui/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.util.emf.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/facet/org.eclipse.papyrus.emf.facet.util.emf.ui/META-INF/MANIFEST.MF b/plugins/facet/org.eclipse.papyrus.emf.facet.util.emf.ui/META-INF/MANIFEST.MF index d8d9854907e..0a63f00b3ea 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.util.emf.ui/META-INF/MANIFEST.MF +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.util.emf.ui/META-INF/MANIFEST.MF @@ -25,5 +25,5 @@ Bundle-Name: %Bundle-Name Bundle-Activator: org.eclipse.papyrus.emf.facet.util.emf.ui.internal.Activator Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.emf.facet.util.emf.ui;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.emf.facet.util.emf.ui diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.util.jface.ui/.classpath b/plugins/facet/org.eclipse.papyrus.emf.facet.util.jface.ui/.classpath index e801ebfb468..81fe078c20c 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.util.jface.ui/.classpath +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.util.jface.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/facet/org.eclipse.papyrus.emf.facet.util.jface.ui/.settings/org.eclipse.jdt.core.prefs b/plugins/facet/org.eclipse.papyrus.emf.facet.util.jface.ui/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.util.jface.ui/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.util.jface.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/facet/org.eclipse.papyrus.emf.facet.util.jface.ui/META-INF/MANIFEST.MF b/plugins/facet/org.eclipse.papyrus.emf.facet.util.jface.ui/META-INF/MANIFEST.MF index 5a3c11ec359..72a743ddbf6 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.util.jface.ui/META-INF/MANIFEST.MF +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.util.jface.ui/META-INF/MANIFEST.MF @@ -11,5 +11,5 @@ Bundle-Name: %Bundle-Name Bundle-Activator: org.eclipse.papyrus.emf.facet.util.jface.ui.internal.Activator Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.emf.facet.util.jface.ui;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.emf.facet.util.jface.ui diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.util.pde.core/.classpath b/plugins/facet/org.eclipse.papyrus.emf.facet.util.pde.core/.classpath index e801ebfb468..81fe078c20c 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.util.pde.core/.classpath +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.util.pde.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/facet/org.eclipse.papyrus.emf.facet.util.pde.core/.settings/org.eclipse.jdt.core.prefs b/plugins/facet/org.eclipse.papyrus.emf.facet.util.pde.core/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.util.pde.core/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.util.pde.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/facet/org.eclipse.papyrus.emf.facet.util.pde.core/META-INF/MANIFEST.MF b/plugins/facet/org.eclipse.papyrus.emf.facet.util.pde.core/META-INF/MANIFEST.MF index 652b8405e62..478d3c2ae97 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.util.pde.core/META-INF/MANIFEST.MF +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.util.pde.core/META-INF/MANIFEST.MF @@ -14,5 +14,5 @@ Bundle-Name: Papyrus EMF Facet PDE Core Utils Bundle-Activator: org.eclipse.papyrus.emf.facet.util.pde.core.internal.Activator Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.emf.facet.util.pde.core;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.emf.facet.util.pde.core diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.util.pde.core/src/org/eclipse/papyrus/emf/facet/util/pde/core/internal/PluginUtils.java b/plugins/facet/org.eclipse.papyrus.emf.facet.util.pde.core/src/org/eclipse/papyrus/emf/facet/util/pde/core/internal/PluginUtils.java index cde4e0539dd..23880765ea5 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.util.pde.core/src/org/eclipse/papyrus/emf/facet/util/pde/core/internal/PluginUtils.java +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.util.pde.core/src/org/eclipse/papyrus/emf/facet/util/pde/core/internal/PluginUtils.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2010-2013 Mia-Software. + * Copyright (c) 2010-2013, 2023 Mia-Software. * 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 @@ -14,6 +14,7 @@ * Nicolas Guyomar (Mia-Software) - Bug 340681 - Facet column implementation * Nicolas Bros (Mia-Software) - Bug 380391 - PluginUtils#importPlugin should use the Bundle API * Gregoire Dupe (Mia-Software) - Bug 408344 - [Releng] Deep folders cause build break + * Pauline DEVILLE (CEA LIST) pauline.deville@cea.fr - Bug 581848 *******************************************************************************/ package org.eclipse.papyrus.emf.facet.util.pde.core.internal; @@ -244,7 +245,7 @@ public final class PluginUtils { } } - private static final String JAVA_VERSION = "JavaSE-11"; //$NON-NLS-1$ + private static final String JAVA_VERSION = "JavaSE-17"; //$NON-NLS-1$ private static final String ACTIVATOR_NAME = "Activator"; //$NON-NLS-1$ private static final String MANIFEST_MF_TPL = "resources/MANIFEST.MF.template"; //$NON-NLS-1$ private static final String ACTIVATOR_TPL = "resources/Activator.java.template"; //$NON-NLS-1$ diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.util.swt/.classpath b/plugins/facet/org.eclipse.papyrus.emf.facet.util.swt/.classpath index e801ebfb468..81fe078c20c 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.util.swt/.classpath +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.util.swt/.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/facet/org.eclipse.papyrus.emf.facet.util.swt/.settings/org.eclipse.jdt.core.prefs b/plugins/facet/org.eclipse.papyrus.emf.facet.util.swt/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.util.swt/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.util.swt/.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/facet/org.eclipse.papyrus.emf.facet.util.swt/META-INF/MANIFEST.MF b/plugins/facet/org.eclipse.papyrus.emf.facet.util.swt/META-INF/MANIFEST.MF index 6fe4eb01188..ee811b5680c 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.util.swt/META-INF/MANIFEST.MF +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.util.swt/META-INF/MANIFEST.MF @@ -13,5 +13,5 @@ Bundle-Name: %Bundle-Name Bundle-Activator: org.eclipse.papyrus.emf.facet.util.swt.internal.Activator Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.emf.facet.util.swt;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.emf.facet.util.swt diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.util.ui/.classpath b/plugins/facet/org.eclipse.papyrus.emf.facet.util.ui/.classpath index e801ebfb468..81fe078c20c 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.util.ui/.classpath +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.util.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/facet/org.eclipse.papyrus.emf.facet.util.ui/.settings/org.eclipse.jdt.core.prefs b/plugins/facet/org.eclipse.papyrus.emf.facet.util.ui/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.util.ui/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.util.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/facet/org.eclipse.papyrus.emf.facet.util.ui/META-INF/MANIFEST.MF b/plugins/facet/org.eclipse.papyrus.emf.facet.util.ui/META-INF/MANIFEST.MF index 88bc1846476..ab74547c313 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.util.ui/META-INF/MANIFEST.MF +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.util.ui/META-INF/MANIFEST.MF @@ -35,5 +35,5 @@ Bundle-Name: %Bundle-Name Bundle-Activator: org.eclipse.papyrus.emf.facet.util.ui.internal.Activator Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.emf.facet.util.ui;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.emf.facet.util.ui diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.widgets.celleditors.ecore/.classpath b/plugins/facet/org.eclipse.papyrus.emf.facet.widgets.celleditors.ecore/.classpath index e801ebfb468..81fe078c20c 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.widgets.celleditors.ecore/.classpath +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.widgets.celleditors.ecore/.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/facet/org.eclipse.papyrus.emf.facet.widgets.celleditors.ecore/.settings/org.eclipse.jdt.core.prefs b/plugins/facet/org.eclipse.papyrus.emf.facet.widgets.celleditors.ecore/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.widgets.celleditors.ecore/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.widgets.celleditors.ecore/.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/facet/org.eclipse.papyrus.emf.facet.widgets.celleditors.ecore/META-INF/MANIFEST.MF b/plugins/facet/org.eclipse.papyrus.emf.facet.widgets.celleditors.ecore/META-INF/MANIFEST.MF index 3282313a556..2d856d476b6 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.widgets.celleditors.ecore/META-INF/MANIFEST.MF +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.widgets.celleditors.ecore/META-INF/MANIFEST.MF @@ -12,5 +12,5 @@ Bundle-Name: %Bundle-Name Bundle-Activator: org.eclipse.papyrus.emf.facet.widgets.celleditors.ecore.Activator Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.emf.facet.widgets.celleditors.ecore;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.emf.facet.widgets.celleditors.ecore diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.widgets.celleditors/.classpath b/plugins/facet/org.eclipse.papyrus.emf.facet.widgets.celleditors/.classpath index e801ebfb468..81fe078c20c 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.widgets.celleditors/.classpath +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.widgets.celleditors/.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/facet/org.eclipse.papyrus.emf.facet.widgets.celleditors/.settings/org.eclipse.jdt.core.prefs b/plugins/facet/org.eclipse.papyrus.emf.facet.widgets.celleditors/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.widgets.celleditors/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.widgets.celleditors/.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/facet/org.eclipse.papyrus.emf.facet.widgets.celleditors/META-INF/MANIFEST.MF b/plugins/facet/org.eclipse.papyrus.emf.facet.widgets.celleditors/META-INF/MANIFEST.MF index 2ff9ae06a78..5b1d85bffe6 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.widgets.celleditors/META-INF/MANIFEST.MF +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.widgets.celleditors/META-INF/MANIFEST.MF @@ -31,5 +31,5 @@ Bundle-Localization: plugin Bundle-Activator: org.eclipse.papyrus.emf.facet.widgets.celleditors.internal.Activator Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.emf.facet.widgets.celleditors;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.emf.facet.widgets.celleditors diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.widgets/.classpath b/plugins/facet/org.eclipse.papyrus.emf.facet.widgets/.classpath index e801ebfb468..81fe078c20c 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.widgets/.classpath +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.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/facet/org.eclipse.papyrus.emf.facet.widgets/.settings/org.eclipse.jdt.core.prefs b/plugins/facet/org.eclipse.papyrus.emf.facet.widgets/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.widgets/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.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/facet/org.eclipse.papyrus.emf.facet.widgets/META-INF/MANIFEST.MF b/plugins/facet/org.eclipse.papyrus.emf.facet.widgets/META-INF/MANIFEST.MF index e31cab1972d..932b774193d 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.widgets/META-INF/MANIFEST.MF +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.widgets/META-INF/MANIFEST.MF @@ -13,5 +13,5 @@ Bundle-Name: %Bundle-Name Bundle-Activator: org.eclipse.papyrus.emf.facet.widgets.internal.Activator Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.emf.facet.widgets;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.emf.facet.widgets 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..adf24d85314 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="[32.0.0, 33.0.0)", + com.google.common.collect;version="[32.0.0, 33.0.0)", + com.google.common.io;version="[32.0.0, 33.0.0)", + com.google.common.util.concurrent;version="[32.0.0, 33.0.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..d5417afb0d1 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="[32.0.0, 33.0.0)", + com.google.common.collect;version="[32.0.0, 33.0.0)", + com.google.common.util.concurrent;version="[32.0.0, 33.0.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..49b8f280803 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="[32.0.0, 33.0.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..dce8f679a27 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="[32.0.0, 33.0.0)", + com.google.common.collect;version="[32.0.0, 33.0.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..8b4d8ba6e3d 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="[32.0.0, 33.0.0)", + com.google.common.collect;version="[32.0.0, 33.0.0)", + com.google.common.util.concurrent;version="[32.0.0, 33.0.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..4a2aefd1195 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="[32.0.0, 33.0.0)", + com.google.common.collect;version="[32.0.0, 33.0.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..a3233967324 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="[32.0.0, 33.0.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..55b26c3d0a6 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="[32.0.0, 33.0.0)", + com.google.common.collect;version="[32.0.0, 33.0.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..115e9bd0e2a 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="[32.0.0, 33.0.0)", + com.google.common.collect;version="[32.0.0, 33.0.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..71ae01eb5b0 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="[32.0.0,33.0.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..9041f1ccfab 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="[32.0.0, 33.0.0)", + com.google.common.collect;version="[32.0.0, 33.0.0)", + com.google.common.util.concurrent;version="[32.0.0, 33.0.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 d4d5d5ced97..ff876f501ca 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,10 +1,11 @@ Manifest-Version: 1.0 Require-Bundle: com.ibm.icu, - org.apache.batik.dom;bundle-version="[1.14.0,1.15.0)", - org.apache.batik.dom.svg;bundle-version="[1.14.0,1.15.0)", - org.apache.batik.util;bundle-version="[1.14.0,1.15.0)", - org.apache.batik.xml;bundle-version="[1.14.0,1.15.0)", - org.apache.batik.anim;bundle-version="[1.14.0,1.15.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)", @@ -48,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, @@ -95,19 +96,19 @@ 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.3.0.qualifier +Bundle-Version: 4.3.200.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="[32.0.0,33.0.0)", + com.google.common.collect;version="[32.0.0,33.0.0)", + com.google.common.util.concurrent;version="[32.0.0,33.0.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.EditPolicyProviderServiceImpl.xml, 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 76eff12ab77..c2ba82bb608 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.3.0-SNAPSHOT</version> + <version>4.3.200-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/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/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.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..2b052956c50 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 @@ -22,5 +22,5 @@ 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.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.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..52c20eefddf 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="[32.0.0, 33.0.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 2b24b7f73e4..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 @@ -31,5 +31,5 @@ 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.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..5bd44abd7c6 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="[32.0.0, 33.0.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..4dc6905756b 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="[32.0.0, 33.0.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..247e0c9562c 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="[32.0.0, 33.0.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..08a67bc6efe 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="[32.0.0, 33.0.0)", + com.google.common.collect;version="[32.0.0, 33.0.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..cf90db476e8 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="[32.1.3,33.0.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="[32.0.0, 33.0.0)", + com.google.common.collect;version="[32.0.0, 33.0.0)", + com.google.common.reflect;version="[32.0.0, 33.0.0)", + com.google.common.util.concurrent;version="[32.0.0, 33.0.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..06705f772d8 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="[32.0.0, 33.0.0)", + com.google.common.collect;version="[32.0.0, 33.0.0)", + com.google.common.reflect;version="[32.0.0, 33.0.0)", + com.google.common.util.concurrent;version="[32.0.0, 33.0.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..bdb21b28a91 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="[32.0.0, 33.0.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..38df2914c3e 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="[32.0.0, 33.0.0)", + com.google.common.collect;version="[32.0.0, 33.0.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 87408fb79cb..d276721c725 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)", @@ -98,6 +97,6 @@ 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="[32.0.0, 33.0.0)" Automatic-Module-Name: org.eclipse.papyrus.infra.nattable 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/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 6cfa26e36d7..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 @@ -14,5 +14,5 @@ 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/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..155def6883a 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="[32.0.0, 33.0.0)", + com.google.common.collect;version="[32.0.0, 33.0.0)", + com.google.common.util.concurrent;version="[32.0.0, 33.0.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..721c6017e30 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="[32.0.0, 33.0.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..c8b2a31fe3a 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="[32.0.0, 33.0.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..9eec571f15d 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="[32.0.0, 33.0.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 1665b4aa5f4..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.100.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 0414b874411..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 @@ -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 + * 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,9 +19,13 @@ 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; @@ -32,12 +37,16 @@ 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; @@ -45,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 @@ -54,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 @@ -131,6 +128,11 @@ public class PapyrusXTextEditor extends XtextEditor { private SaveTextOnFocusLostPageLifeCycleEventsListener sashWindowsContainerListener = null; /** + * listener on the IOperationHistory + */ + private UndoableTextChangeListener historyListener; + + /** * * Constructor. * @@ -222,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 @@ -255,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); } @@ -270,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); } @@ -325,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)); + } } } @@ -335,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(); } @@ -377,6 +393,70 @@ public class PapyrusXTextEditor extends XtextEditor { */ @Override protected void createUndoRedoActions() { - // do nothing to preserve papyrus Undo/Redo feature/keybinding + // 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/pom.xml b/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.xtext/pom.xml index be0b2b2a1d9..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.100-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/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..b8e5670202b 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="[32.0.0, 33.0.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 a9ccaba3d3b..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 @@ -31,5 +31,5 @@ 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.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..72dabf84c67 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="[32.0.0, 33.0.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..8d6e2a08b10 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="[32.0.0, 33.0.0)", + com.google.common.cache;version="[32.0.0, 33.0.0)", + com.google.common.collect;version="[32.0.0, 33.0.0)", + com.google.common.util.concurrent;version="[32.0.0, 33.0.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..3e40c0ed198 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="[32.0.0, 33.0.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; } diff --git a/plugins/sdk/org.eclipse.papyrus.sdk/.settings/org.eclipse.jdt.core.prefs b/plugins/sdk/org.eclipse.papyrus.sdk/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/sdk/org.eclipse.papyrus.sdk/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/sdk/org.eclipse.papyrus.sdk/.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/sdk/org.eclipse.papyrus.sdk/META-INF/MANIFEST.MF b/plugins/sdk/org.eclipse.papyrus.sdk/META-INF/MANIFEST.MF index 51b1fda3d04..b62a07ea1d4 100644 --- a/plugins/sdk/org.eclipse.papyrus.sdk/META-INF/MANIFEST.MF +++ b/plugins/sdk/org.eclipse.papyrus.sdk/META-INF/MANIFEST.MF @@ -1,9 +1,9 @@ Manifest-Version: 1.0 Bundle-Vendor: %providerName Bundle-ActivationPolicy: lazy -Bundle-Version: 6.2.0.qualifier +Bundle-Version: 6.6.0.qualifier Bundle-Name: %pluginName Bundle-Localization: plugin Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.sdk;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/plugins/sdk/org.eclipse.papyrus.sdk/pom.xml b/plugins/sdk/org.eclipse.papyrus.sdk/pom.xml index 48013784f50..044018d2e59 100644 --- a/plugins/sdk/org.eclipse.papyrus.sdk/pom.xml +++ b/plugins/sdk/org.eclipse.papyrus.sdk/pom.xml @@ -9,6 +9,6 @@ <version>0.0.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.papyrus.sdk</artifactId> - <version>6.2.0-SNAPSHOT</version> + <version>6.6.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project>
\ No newline at end of file diff --git a/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.ui/.classpath b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.ui/.classpath index e801ebfb468..81fe078c20c 100644 --- a/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.ui/.classpath +++ b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.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/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.ui/.settings/org.eclipse.jdt.core.prefs b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.ui/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.ui/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.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/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.ui/META-INF/MANIFEST.MF b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.ui/META-INF/MANIFEST.MF index 1cae3314fb5..8f979bb2812 100644 --- a/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.ui/META-INF/MANIFEST.MF +++ b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.ui/META-INF/MANIFEST.MF @@ -20,5 +20,5 @@ Bundle-ManifestVersion: 2 Bundle-Activator: org.eclipse.papyrus.uml.profile.assistants.generator.ui.internal.Activator Bundle-Description: %pluginDescription Bundle-SymbolicName: org.eclipse.papyrus.uml.profile.assistants.generator.ui;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.uml.profile.assistants.generator.ui diff --git a/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.ui/plugin.xml b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.ui/plugin.xml index 958c626bc31..c49f0460e69 100644 --- a/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.ui/plugin.xml +++ b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.ui/plugin.xml @@ -5,11 +5,11 @@ point="org.eclipse.ui.menus"> <menuContribution allPopups="false" - locationURI="popup:org.eclipse.papyrus.uml.profile.types.generator.ui.generateMenu?after=additions"> + locationURI="popup:org.eclipse.papyrus.custo.editors"> <command commandId="org.eclipse.papyrus.uml.profile.assistants.generator.ui.generateModelAssistants" id="org.eclipse.papyrus.uml.profile.assistants.generator.ui.generateModelAssistants" - label="Diagram Assistants..." + label="Generate Diagram Assistants..." style="push"> <visibleWhen checkEnabled="false"> diff --git a/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.assistants.generator/.classpath b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.assistants.generator/.classpath index 8891ed463f8..ddc43578b35 100644 --- a/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.assistants.generator/.classpath +++ b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.assistants.generator/.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/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.assistants.generator/.settings/org.eclipse.jdt.core.prefs b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.assistants.generator/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.assistants.generator/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.assistants.generator/.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/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.assistants.generator/META-INF/MANIFEST.MF b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.assistants.generator/META-INF/MANIFEST.MF index 634595a4d68..e59a070ee26 100644 --- a/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.assistants.generator/META-INF/MANIFEST.MF +++ b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.assistants.generator/META-INF/MANIFEST.MF @@ -1,6 +1,5 @@ Manifest-Version: 1.0 -Require-Bundle: com.google.inject;bundle-version="[3.0.0,4.0.0)", - javax.inject;bundle-version="[1.0.0,2.0.0)", +Require-Bundle: com.google.inject;bundle-version="[7.0.0,8.0.0)", org.eclipse.emf.databinding;bundle-version="[1.5.0,2.0.0)", org.eclipse.gmf.runtime.diagram.ui.properties;bundle-version="[1.8.0,2.0.0)", org.eclipse.m2m.qvt.oml;bundle-version="[3.10.0,4.0.0)", @@ -17,12 +16,12 @@ Export-Package: org.eclipse.papyrus.uml.profile.assistants.generator, Bundle-Vendor: %providerName Bundle-ActivationPolicy: lazy Bundle-ClassPath: . -Bundle-Version: 5.0.0.qualifier +Bundle-Version: 5.1.0.qualifier Bundle-Localization: plugin Bundle-Name: %pluginName Bundle-ManifestVersion: 2 Bundle-Activator: org.eclipse.papyrus.uml.profile.assistants.generator.internal.Activator Bundle-Description: %pluginDescription Bundle-SymbolicName: org.eclipse.papyrus.uml.profile.assistants.generator;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.uml.profile.assistants.generator diff --git a/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.assistants.generator/pom.xml b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.assistants.generator/pom.xml index 72d73eaff05..795f898b21e 100644 --- a/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.assistants.generator/pom.xml +++ b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.assistants.generator/pom.xml @@ -7,7 +7,7 @@ <version>0.0.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.papyrus.uml.profile.assistants.generator</artifactId> - <version>5.0.0-SNAPSHOT</version> + <version>5.1.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> <build> <plugins> @@ -47,4 +47,4 @@ </plugin> </plugins> </build> -</project>
\ No newline at end of file +</project> diff --git a/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.assistants.generator/src/org/eclipse/papyrus/uml/profile/assistants/generator/ConnectionAssistantRule.xtend b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.assistants.generator/src/org/eclipse/papyrus/uml/profile/assistants/generator/ConnectionAssistantRule.xtend index 5107bcbef49..70eeda3b2c2 100644 --- a/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.assistants.generator/src/org/eclipse/papyrus/uml/profile/assistants/generator/ConnectionAssistantRule.xtend +++ b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.assistants.generator/src/org/eclipse/papyrus/uml/profile/assistants/generator/ConnectionAssistantRule.xtend @@ -1,5 +1,5 @@ /***************************************************************************** - * 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 @@ -10,12 +10,11 @@ * * Contributors: * Christian W. Damus - Initial API and implementation + * Ansgar Radermacher - bug 582492, move to com.google.inject * *****************************************************************************/ package org.eclipse.papyrus.uml.profile.assistants.generator -import javax.inject.Inject -import javax.inject.Singleton import org.eclipse.papyrus.infra.filters.Filter import org.eclipse.papyrus.infra.gmfdiag.assistant.AssistantFactory import org.eclipse.papyrus.infra.gmfdiag.assistant.ConnectionAssistant @@ -24,6 +23,8 @@ import org.eclipse.papyrus.uml.profile.types.generator.UML import org.eclipse.papyrus.uml.profile.types.generator.UMLElementTypes import org.eclipse.papyrus.uml.profile.types.generator.ImpliedExtension import org.eclipse.papyrus.infra.types.ElementTypeConfiguration +import com.google.inject.Singleton +import com.google.inject.Inject /** * Transformation rule for generating a {@link ConnectionAssistant} from a UML {@link Extension}. diff --git a/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.assistants.generator/src/org/eclipse/papyrus/uml/profile/assistants/generator/FiltersUtil.xtend b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.assistants.generator/src/org/eclipse/papyrus/uml/profile/assistants/generator/FiltersUtil.xtend index 4e668c2bc9b..828e9c2b371 100644 --- a/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.assistants.generator/src/org/eclipse/papyrus/uml/profile/assistants/generator/FiltersUtil.xtend +++ b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.assistants.generator/src/org/eclipse/papyrus/uml/profile/assistants/generator/FiltersUtil.xtend @@ -1,5 +1,5 @@ /***************************************************************************** - * 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 @@ -10,11 +10,11 @@ * * Contributors: * Christian W. Damus - Initial API and implementation + * Ansgar Radermacher - bug 582492, move to com.google.inject * *****************************************************************************/ package org.eclipse.papyrus.uml.profile.assistants.generator -import javax.inject.Singleton import org.eclipse.papyrus.infra.filters.CompoundFilter import org.eclipse.papyrus.infra.filters.Filter import org.eclipse.papyrus.infra.filters.FiltersFactory @@ -24,9 +24,10 @@ import org.eclipse.papyrus.infra.gmfdiag.assistant.AssistantFactory import org.eclipse.uml2.uml.Profile import org.eclipse.papyrus.uml.filters.UMLFiltersFactory import org.eclipse.emf.ecore.util.EcoreUtil -import javax.inject.Inject import org.eclipse.papyrus.infra.types.ElementTypeConfiguration import org.eclipse.papyrus.uml.profile.types.generator.UML +import com.google.inject.Singleton +import com.google.inject.Inject /** * Utility extensions for working with {@link Filter}s. diff --git a/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.assistants.generator/src/org/eclipse/papyrus/uml/profile/assistants/generator/ModelingAssistantProviderRule.xtend b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.assistants.generator/src/org/eclipse/papyrus/uml/profile/assistants/generator/ModelingAssistantProviderRule.xtend index b58cb6d7ee9..c5146f3a9b0 100644 --- a/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.assistants.generator/src/org/eclipse/papyrus/uml/profile/assistants/generator/ModelingAssistantProviderRule.xtend +++ b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.assistants.generator/src/org/eclipse/papyrus/uml/profile/assistants/generator/ModelingAssistantProviderRule.xtend @@ -1,5 +1,5 @@ /***************************************************************************** - * 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 @@ -10,18 +10,19 @@ * * Contributors: * Christian W. Damus - Initial API and implementation + * Ansgar Radermacher - bug 582492, move to com.google.inject * *****************************************************************************/ package org.eclipse.papyrus.uml.profile.assistants.generator -import javax.inject.Inject -import javax.inject.Singleton import org.eclipse.papyrus.infra.gmfdiag.assistant.AssistantFactory import org.eclipse.papyrus.infra.gmfdiag.assistant.ModelingAssistantProvider import org.eclipse.papyrus.uml.profile.types.generator.Identifiers import org.eclipse.papyrus.uml.profile.types.generator.UML import org.eclipse.papyrus.uml.profile.types.generator.UMLElementTypes import org.eclipse.uml2.uml.Profile +import com.google.inject.Singleton +import com.google.inject.Inject /** * Transformation rule for generating a {@link ModelingAssistantProvider} from a UML {@link Profile}. diff --git a/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.assistants.generator/src/org/eclipse/papyrus/uml/profile/assistants/generator/PopupAssistantRule.xtend b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.assistants.generator/src/org/eclipse/papyrus/uml/profile/assistants/generator/PopupAssistantRule.xtend index f7abd1d974b..de2d3030ec4 100644 --- a/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.assistants.generator/src/org/eclipse/papyrus/uml/profile/assistants/generator/PopupAssistantRule.xtend +++ b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.assistants.generator/src/org/eclipse/papyrus/uml/profile/assistants/generator/PopupAssistantRule.xtend @@ -1,5 +1,5 @@ /***************************************************************************** - * 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 @@ -10,12 +10,11 @@ * * Contributors: * Christian W. Damus - Initial API and implementation + * Ansgar Radermacher - bug 582492, move to com.google.inject * *****************************************************************************/ package org.eclipse.papyrus.uml.profile.assistants.generator -import javax.inject.Inject -import javax.inject.Singleton import org.eclipse.papyrus.infra.types.ElementTypeConfiguration import org.eclipse.papyrus.infra.filters.Filter import org.eclipse.papyrus.infra.gmfdiag.assistant.AssistantFactory @@ -24,6 +23,8 @@ import org.eclipse.papyrus.uml.profile.types.generator.Identifiers import org.eclipse.papyrus.uml.profile.types.generator.UML import org.eclipse.papyrus.uml.profile.types.generator.UMLElementTypes import org.eclipse.papyrus.uml.profile.types.generator.ImpliedExtension +import com.google.inject.Singleton +import com.google.inject.Inject /** * Transformation rule for generating a {@link PopupAssistant} from a UML {@link Extension}. diff --git a/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.newchildmenu.generator.ui/.classpath b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.newchildmenu.generator.ui/.classpath index e801ebfb468..81fe078c20c 100644 --- a/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.newchildmenu.generator.ui/.classpath +++ b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.newchildmenu.generator.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/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.newchildmenu.generator.ui/.settings/org.eclipse.jdt.core.prefs b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.newchildmenu.generator.ui/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.newchildmenu.generator.ui/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.newchildmenu.generator.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/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.newchildmenu.generator.ui/META-INF/MANIFEST.MF b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.newchildmenu.generator.ui/META-INF/MANIFEST.MF index 804a14983c7..40b2fa3c288 100644 --- a/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.newchildmenu.generator.ui/META-INF/MANIFEST.MF +++ b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.newchildmenu.generator.ui/META-INF/MANIFEST.MF @@ -10,5 +10,5 @@ Bundle-Localization: plugin Bundle-ManifestVersion: 2 Bundle-Activator: org.eclipse.papyrus.uml.profile.newchildmenu.generator.ui.Activator Bundle-SymbolicName: org.eclipse.papyrus.uml.profile.newchildmenu.generator.ui;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.uml.profile.newchildmenu.generator.ui diff --git a/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.newchildmenu.generator.ui/plugin.xml b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.newchildmenu.generator.ui/plugin.xml index b996bf535e8..c22ac3f18ce 100644 --- a/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.newchildmenu.generator.ui/plugin.xml +++ b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.newchildmenu.generator.ui/plugin.xml @@ -5,7 +5,7 @@ point="org.eclipse.ui.menus"> <menuContribution allPopups="false" - locationURI="popup:org.eclipse.ui.popup.any?after=additions"> + locationURI="popup:org.eclipse.papyrus.custo.modelexplorer"> <command commandId="org.eclipse.papyrus.uml.profile.newchildmenu.generator.ui.command" style="push"> diff --git a/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.newchildmenu.generator/.classpath b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.newchildmenu.generator/.classpath index ebdc7999a61..cbcac7a5d3c 100644 --- a/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.newchildmenu.generator/.classpath +++ b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.newchildmenu.generator/.classpath @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> <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="src" path="src"/> <classpathentry kind="output" path="bin"/> diff --git a/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.newchildmenu.generator/.settings/org.eclipse.jdt.core.prefs b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.newchildmenu.generator/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.newchildmenu.generator/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.newchildmenu.generator/.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/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.newchildmenu.generator/META-INF/MANIFEST.MF b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.newchildmenu.generator/META-INF/MANIFEST.MF index 34bd5ad8354..c7a7197d182 100644 --- a/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.newchildmenu.generator/META-INF/MANIFEST.MF +++ b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.newchildmenu.generator/META-INF/MANIFEST.MF @@ -14,5 +14,5 @@ Bundle-Localization: plugin Bundle-ManifestVersion: 2 Bundle-Activator: org.eclipse.papyrus.uml.profile.newchildmenu.generator.Activator Bundle-SymbolicName: org.eclipse.papyrus.uml.profile.newchildmenu.generator;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.uml.profile.newchildmenu.generator diff --git a/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.types.generator.ui/.classpath b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.types.generator.ui/.classpath index e801ebfb468..81fe078c20c 100644 --- a/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.types.generator.ui/.classpath +++ b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.types.generator.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/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.types.generator.ui/.settings/org.eclipse.jdt.core.prefs b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.types.generator.ui/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.types.generator.ui/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.types.generator.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/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.types.generator.ui/META-INF/MANIFEST.MF b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.types.generator.ui/META-INF/MANIFEST.MF index ba327a5b643..8fe356fac6d 100644 --- a/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.types.generator.ui/META-INF/MANIFEST.MF +++ b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.types.generator.ui/META-INF/MANIFEST.MF @@ -27,6 +27,6 @@ Bundle-ManifestVersion: 2 Bundle-Activator: org.eclipse.papyrus.uml.profile.types.generator.ui.internal.Activator Bundle-Description: %pluginDescription Bundle-SymbolicName: org.eclipse.papyrus.uml.profile.types.generator.ui;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 -Import-Package: com.google.common.util.concurrent;version="[30.1.0, 31.0.0)" +Bundle-RequiredExecutionEnvironment: JavaSE-17 +Import-Package: com.google.common.util.concurrent;version="[32.0.0, 33.0.0)" Automatic-Module-Name: org.eclipse.papyrus.uml.profile.types.generator.ui diff --git a/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.types.generator.ui/plugin.xml b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.types.generator.ui/plugin.xml index 9953366b8ba..4abea148e06 100644 --- a/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.types.generator.ui/plugin.xml +++ b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.types.generator.ui/plugin.xml @@ -5,14 +5,11 @@ point="org.eclipse.ui.menus"> <menuContribution allPopups="false" - locationURI="popup:org.eclipse.papyrus.views.modelexplorer.modelexplorer.popup?after=tools"> - <menu - label="Generate Tooling Model" - id="org.eclipse.papyrus.uml.profile.types.generator.ui.generateMenu"> + locationURI="popup:org.eclipse.papyrus.custo.framework"> <command commandId="org.eclipse.papyrus.uml.profile.types.generator.ui.generateElementTypes" id="org.eclipse.papyrus.uml.profile.types.generator.ui.generateElementTypes" - label="Element Types..." + label="Generate Element Types..." style="push"> <visibleWhen checkEnabled="false"> @@ -36,7 +33,6 @@ name="additions" visible="false"> </separator> - </menu> </menuContribution> </extension> <extension diff --git a/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.types.generator/.classpath b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.types.generator/.classpath index 8891ed463f8..ddc43578b35 100644 --- a/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.types.generator/.classpath +++ b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.types.generator/.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/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.types.generator/.settings/org.eclipse.jdt.core.prefs b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.types.generator/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.types.generator/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.types.generator/.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/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.types.generator/META-INF/MANIFEST.MF b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.types.generator/META-INF/MANIFEST.MF index 2ea311dc8a7..9292aa404f7 100644 --- a/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.types.generator/META-INF/MANIFEST.MF +++ b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.types.generator/META-INF/MANIFEST.MF @@ -1,7 +1,5 @@ Manifest-Version: 1.0 -Require-Bundle: com.google.inject;bundle-version="[3.0.0,4.0.0)", - javax.inject;bundle-version="[1.0.0,2.0.0)", - org.eclipse.emf.databinding;bundle-version="[1.5.0,2.0.0)", +Require-Bundle: org.eclipse.emf.databinding;bundle-version="[1.5.0,2.0.0)", org.eclipse.gmf.runtime.diagram.ui.properties;bundle-version="[1.8.0,2.0.0)", org.eclipse.m2m.qvt.oml;bundle-version="[3.10.0,4.0.0)", org.eclipse.papyrus.infra.core.log;bundle-version="[2.0.0,3.0.0)", @@ -11,19 +9,20 @@ Require-Bundle: com.google.inject;bundle-version="[3.0.0,4.0.0)", org.eclipse.papyrus.uml.types.core;bundle-version="[5.0.0,6.0.0)", org.eclipse.uml2.uml.editor;bundle-version="[5.5.0,6.0.0)", org.eclipse.xtend.lib;bundle-version="[2.22.0,3.0.0)", - org.eclipse.papyrus.uml.tools.utils;bundle-version="[4.0.0,5.0.0)" + org.eclipse.papyrus.uml.tools.utils;bundle-version="[4.0.0,5.0.0)", + com.google.inject;bundle-version="[7.0.0,8.0.0)" Export-Package: org.eclipse.papyrus.uml.profile.types.generator, org.eclipse.papyrus.uml.profile.types.generator.internal;x-internal:=true, org.eclipse.papyrus.uml.profile.types.generator.strategy Bundle-Vendor: %providerName Bundle-ActivationPolicy: lazy Bundle-ClassPath: . -Bundle-Version: 3.0.0.qualifier +Bundle-Version: 3.1.0.qualifier Bundle-Localization: plugin Bundle-Name: %pluginName Bundle-ManifestVersion: 2 Bundle-Activator: org.eclipse.papyrus.uml.profile.types.generator.internal.Activator Bundle-Description: %pluginDescription Bundle-SymbolicName: org.eclipse.papyrus.uml.profile.types.generator;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.uml.profile.types.generator diff --git a/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.types.generator/pom.xml b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.types.generator/pom.xml index e403e90fa8c..0ef32f3d73a 100644 --- a/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.types.generator/pom.xml +++ b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.types.generator/pom.xml @@ -9,7 +9,7 @@ <version>0.0.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.papyrus.uml.profile.types.generator</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.1.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> <build> <plugins> @@ -49,4 +49,4 @@ </plugin> </plugins> </build> -</project>
\ No newline at end of file +</project> diff --git a/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.types.generator/src/org/eclipse/papyrus/uml/profile/types/generator/ConfigurationSetRule.xtend b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.types.generator/src/org/eclipse/papyrus/uml/profile/types/generator/ConfigurationSetRule.xtend index 73f8c665ea9..d9350450698 100644 --- a/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.types.generator/src/org/eclipse/papyrus/uml/profile/types/generator/ConfigurationSetRule.xtend +++ b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.types.generator/src/org/eclipse/papyrus/uml/profile/types/generator/ConfigurationSetRule.xtend @@ -1,5 +1,5 @@ /***************************************************************************** - * Copyright (c) 2014, 2015, 2017, 2020 Christian W. Damus and others. + * Copyright (c) 2014, 2015, 2017, 2020, 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 @@ -11,18 +11,18 @@ * Contributors: * Christian W. Damus - Initial API and implementation * Benoit Maggi - Bug 474408: order by identifier the generated file - * Ansgar Radermacher - Bug 526155: set element type name from profile + * Ansgar Radermacher - Bug 526155: set element type name from profile, bug 582492, move to com.google.inject * Camille Letavernier - Bug 569354: remove StereotypeAdvice; use StereotypeMatcherAdvice instead * *****************************************************************************/ package org.eclipse.papyrus.uml.profile.types.generator +import com.google.inject.Inject +import com.google.inject.Singleton import java.util.ArrayList import java.util.List import java.util.Map import java.util.Optional -import javax.inject.Inject -import javax.inject.Singleton import org.eclipse.emf.common.util.EList import org.eclipse.emf.ecore.EObject import org.eclipse.papyrus.infra.types.ElementTypeConfiguration diff --git a/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.types.generator/src/org/eclipse/papyrus/uml/profile/types/generator/ElementTypeRule.xtend b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.types.generator/src/org/eclipse/papyrus/uml/profile/types/generator/ElementTypeRule.xtend index 620cf0b8a77..45d76f31984 100644 --- a/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.types.generator/src/org/eclipse/papyrus/uml/profile/types/generator/ElementTypeRule.xtend +++ b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.types.generator/src/org/eclipse/papyrus/uml/profile/types/generator/ElementTypeRule.xtend @@ -1,5 +1,5 @@ /***************************************************************************** - * Copyright (c) 2014, 2015, 2018, 2020 Christian W. Damus and others. + * Copyright (c) 2014, 2015, 2018, 2020, 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 @@ -11,14 +11,14 @@ * Contributors: * Christian W. Damus - Initial API and implementation * Ansgar Radermacher - Bug 526155, enable re-generation from profile: copy existing advices - * Ansgar Radermacher - Bug 526156, reference semantic base element type + * Ansgar Radermacher - Bug 526156, reference semantic base element type, bug 582492, move to com.google.inject * Camille Letavernier - Bug 569354: remove StereotypeAdvice; use StereotypeMatcherAdvice instead * *****************************************************************************/ package org.eclipse.papyrus.uml.profile.types.generator -import javax.inject.Inject -import javax.inject.Singleton +import com.google.inject.Inject +import com.google.inject.Singleton import org.eclipse.core.resources.ResourcesPlugin import org.eclipse.emf.common.util.URI import org.eclipse.emf.ecore.EObject diff --git a/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.types.generator/src/org/eclipse/papyrus/uml/profile/types/generator/Identifiers.xtend b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.types.generator/src/org/eclipse/papyrus/uml/profile/types/generator/Identifiers.xtend index b883037011b..4dcc8bf6d22 100644 --- a/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.types.generator/src/org/eclipse/papyrus/uml/profile/types/generator/Identifiers.xtend +++ b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.types.generator/src/org/eclipse/papyrus/uml/profile/types/generator/Identifiers.xtend @@ -1,5 +1,5 @@ /***************************************************************************** - * Copyright (c) 2014, 2018 Christian W. Damus and others. + * Copyright (c) 2014, 2018, 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 @@ -10,24 +10,26 @@ * * Contributors: * Christian W. Damus - Initial API and implementation - * Ansgar Radermacher - Bug 526156, reference semantic base element type - * + * Ansgar Radermacher - Bug 526156, reference semantic base element type, + * Bug 582492, move to com.google.inject + * *****************************************************************************/ package org.eclipse.papyrus.uml.profile.types.generator -import static extension org.eclipse.uml2.common.util.UML2Util.getValidJavaIdentifier - -import org.eclipse.xtend.lib.annotations.Accessors -import javax.inject.Singleton -import org.eclipse.papyrus.infra.types.ElementTypeConfiguration -import org.eclipse.papyrus.infra.types.SpecializationTypeConfiguration -import javax.inject.Inject -import org.eclipse.papyrus.infra.types.ElementTypeSetConfiguration +import com.google.inject.Inject +import com.google.inject.Singleton import org.eclipse.emf.common.notify.AdapterFactory +import org.eclipse.emf.common.util.ResourceLocator +import org.eclipse.emf.ecore.EClassifier import org.eclipse.emf.ecore.EObject import org.eclipse.emf.edit.provider.IItemLabelProvider -import org.eclipse.emf.ecore.EClassifier -import org.eclipse.emf.common.util.ResourceLocator +import org.eclipse.papyrus.infra.types.ElementTypeConfiguration +import org.eclipse.papyrus.infra.types.ElementTypeSetConfiguration +import org.eclipse.papyrus.infra.types.SpecializationTypeConfiguration +import org.eclipse.uml2.uml.Package +import org.eclipse.xtend.lib.annotations.Accessors + +import static extension org.eclipse.uml2.common.util.UML2Util.getValidJavaIdentifier /** * Utility extensions for working with and generating unique identifiers in the element types model. @@ -77,7 +79,7 @@ class Identifiers { useDiPostfix } - def setIdentifierBase(org.eclipse.uml2.uml.Package umlPackage) { + def setIdentifierBase(Package umlPackage) { identifierBase = prefix } diff --git a/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.types.generator/src/org/eclipse/papyrus/uml/profile/types/generator/ImpliedExtension.xtend b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.types.generator/src/org/eclipse/papyrus/uml/profile/types/generator/ImpliedExtension.xtend index 1f7d09c7c39..5516aee2a49 100644 --- a/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.types.generator/src/org/eclipse/papyrus/uml/profile/types/generator/ImpliedExtension.xtend +++ b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.types.generator/src/org/eclipse/papyrus/uml/profile/types/generator/ImpliedExtension.xtend @@ -15,9 +15,9 @@ package org.eclipse.papyrus.uml.profile.types.generator -import org.eclipse.xtend.lib.annotations.Data import org.eclipse.uml2.uml.Class import org.eclipse.uml2.uml.Stereotype +import org.eclipse.xtend.lib.annotations.Data /** * An analogue of the UML {@code Extension} metaclass that represents an implied metaclass extension. diff --git a/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.types.generator/src/org/eclipse/papyrus/uml/profile/types/generator/UML.xtend b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.types.generator/src/org/eclipse/papyrus/uml/profile/types/generator/UML.xtend index bfadb67d514..41c06efe620 100644 --- a/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.types.generator/src/org/eclipse/papyrus/uml/profile/types/generator/UML.xtend +++ b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.types.generator/src/org/eclipse/papyrus/uml/profile/types/generator/UML.xtend @@ -1,5 +1,5 @@ /***************************************************************************** - * 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 @@ -10,19 +10,21 @@ * * Contributors: * Christian W. Damus - Initial API and implementation + * Ansgar Radermacher - bug 582492, move to com.google.inject * *****************************************************************************/ package org.eclipse.papyrus.uml.profile.types.generator -import static org.eclipse.uml2.uml.UMLPackage.Literals.* - -import javax.inject.Singleton -import org.eclipse.uml2.uml.NamedElement -import org.eclipse.uml2.uml.Stereotype -import org.eclipse.uml2.uml.Profile +import com.google.inject.Singleton +import java.util.Set import org.eclipse.emf.ecore.EClass import org.eclipse.emf.ecore.EReference -import java.util.Set +import org.eclipse.uml2.uml.NamedElement +import org.eclipse.uml2.uml.Package +import org.eclipse.uml2.uml.Profile +import org.eclipse.uml2.uml.Stereotype + +import static org.eclipse.uml2.uml.UMLPackage.Literals.* /** * Utility extensions for working with UML models and elements. @@ -52,12 +54,12 @@ class UML { element.allOwningPackages.filter(Profile).last } - def Iterable<ImpliedExtension> getAllExtensions(org.eclipse.uml2.uml.Package package_) { + def Iterable<ImpliedExtension> getAllExtensions(Package package_) { package_.ownedTypes.filter(Stereotype).map[impliedExtensions].flatten + package_.nestedPackages.map[allExtensions].flatten } - def Iterable<Stereotype> getAllStereotypes(org.eclipse.uml2.uml.Package package_) { + def Iterable<Stereotype> getAllStereotypes(Package package_) { package_.ownedTypes.filter(Stereotype) + package_.nestedPackages.map[allStereotypes].flatten } diff --git a/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.types.generator/src/org/eclipse/papyrus/uml/profile/types/generator/UMLElementTypes.xtend b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.types.generator/src/org/eclipse/papyrus/uml/profile/types/generator/UMLElementTypes.xtend index 9042a6329b5..e07b57944d9 100644 --- a/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.types.generator/src/org/eclipse/papyrus/uml/profile/types/generator/UMLElementTypes.xtend +++ b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.types.generator/src/org/eclipse/papyrus/uml/profile/types/generator/UMLElementTypes.xtend @@ -1,5 +1,5 @@ /***************************************************************************** - * 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 @@ -10,27 +10,27 @@ * * Contributors: * Christian W. Damus - Initial API and implementation - * + * Ansgar Radermacher - bug 582492, move to com.google.inject *****************************************************************************/ package org.eclipse.papyrus.uml.profile.types.generator -import javax.inject.Inject -import javax.inject.Singleton +import com.google.inject.Inject +import com.google.inject.Singleton +import java.util.List +import java.util.regex.Pattern import org.eclipse.emf.ecore.EClass import org.eclipse.gmf.runtime.emf.type.core.ElementTypeRegistry import org.eclipse.gmf.runtime.emf.type.core.IElementType import org.eclipse.gmf.runtime.emf.type.core.IMetamodelType import org.eclipse.gmf.runtime.emf.type.core.ISpecializationType import org.eclipse.papyrus.infra.types.ElementTypeConfiguration +import org.eclipse.papyrus.infra.types.ElementTypesConfigurationsFactory import org.eclipse.papyrus.infra.types.IconEntry import org.eclipse.papyrus.infra.types.MetamodelTypeConfiguration import org.eclipse.papyrus.infra.types.SpecializationTypeConfiguration import org.eclipse.papyrus.infra.types.core.registries.ElementTypeSetConfigurationRegistry import org.eclipse.uml2.uml.Class import org.eclipse.uml2.uml.UMLPackage -import java.util.regex.Pattern -import org.eclipse.papyrus.infra.types.ElementTypesConfigurationsFactory -import java.util.List /** * Utility extensions for working with and generating objects for the base UML element types specialized by the profile. diff --git a/plugins/toolsmiths/builder/org.eclipse.papyrus.toolsmiths.plugin.builder/.classpath b/plugins/toolsmiths/builder/org.eclipse.papyrus.toolsmiths.plugin.builder/.classpath index e801ebfb468..81fe078c20c 100755 --- a/plugins/toolsmiths/builder/org.eclipse.papyrus.toolsmiths.plugin.builder/.classpath +++ b/plugins/toolsmiths/builder/org.eclipse.papyrus.toolsmiths.plugin.builder/.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/toolsmiths/builder/org.eclipse.papyrus.toolsmiths.plugin.builder/.settings/org.eclipse.jdt.core.prefs b/plugins/toolsmiths/builder/org.eclipse.papyrus.toolsmiths.plugin.builder/.settings/org.eclipse.jdt.core.prefs index e63dbb3b5b4..daedce1f057 100755 --- a/plugins/toolsmiths/builder/org.eclipse.papyrus.toolsmiths.plugin.builder/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/toolsmiths/builder/org.eclipse.papyrus.toolsmiths.plugin.builder/.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/toolsmiths/builder/org.eclipse.papyrus.toolsmiths.plugin.builder/META-INF/MANIFEST.MF b/plugins/toolsmiths/builder/org.eclipse.papyrus.toolsmiths.plugin.builder/META-INF/MANIFEST.MF index 4a81a262de1..25c45146c83 100755 --- a/plugins/toolsmiths/builder/org.eclipse.papyrus.toolsmiths.plugin.builder/META-INF/MANIFEST.MF +++ b/plugins/toolsmiths/builder/org.eclipse.papyrus.toolsmiths.plugin.builder/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-SymbolicName: org.eclipse.papyrus.toolsmiths.plugin.builder;singleton:=tr Bundle-Version: 1.1.0.qualifier Bundle-Vendor: %Bundle-Vendor Automatic-Module-Name: org.eclipse.papyrus.infra.nattable.builder -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-ActivationPolicy: lazy Bundle-Activator: org.eclipse.papyrus.toolsmiths.plugin.builder.Activator Require-Bundle: org.eclipse.core.resources;bundle-version="[3.13.0,4.0.0)", @@ -35,8 +35,8 @@ Require-Bundle: org.eclipse.core.resources;bundle-version="[3.13.0,4.0.0)", org.eclipse.papyrus.infra.tools;bundle-version="[4.0.0,5.0.0)", org.eclipse.pde.ui;bundle-version="[3.11.0,4.0.0)", org.eclipse.papyrus.infra.core.architecture;bundle-version="[3.0.0,4.0.0)" -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="[32.0.0,33.0.0)", + com.google.common.collect;version="[32.0.0,33.0.0)", org.osgi.service.component.annotations;version="[1.3.0,2.0.0)";resolution:=optional Export-Package: org.eclipse.papyrus.toolsmiths.plugin.builder, org.eclipse.papyrus.toolsmiths.plugin.builder.helper, diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.edit/.classpath b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.edit/.classpath index e801ebfb468..81fe078c20c 100644 --- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.edit/.classpath +++ b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.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/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.edit/.settings/org.eclipse.jdt.core.prefs b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.edit/.settings/org.eclipse.jdt.core.prefs index c9545f06a41..62ef3488cc0 100644 --- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.edit/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.edit/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error 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 diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.edit/META-INF/MANIFEST.MF b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.edit/META-INF/MANIFEST.MF index cf656e2f34d..041ac143313 100644 --- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.edit/META-INF/MANIFEST.MF +++ b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.edit/META-INF/MANIFEST.MF @@ -22,4 +22,4 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.3.0,4.0.0)", org.eclipse.ui.ide;bundle-version="[3.3.0,4.0.0)";visibility:=reexport, org.eclipse.emf.codegen.ecore.ui;bundle-version="[2.3.0,3.0.0)";visibility:=reexport Bundle-ActivationPolicy: lazy -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.ui/.classpath b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.ui/.classpath index e801ebfb468..81fe078c20c 100644 --- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.ui/.classpath +++ b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.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/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.ui/.settings/org.eclipse.jdt.core.prefs b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.ui/.settings/org.eclipse.jdt.core.prefs index c9545f06a41..62ef3488cc0 100644 --- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.ui/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.ui/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error 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 diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.ui/META-INF/MANIFEST.MF b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.ui/META-INF/MANIFEST.MF index b194d7e3ddd..b5343e510d0 100644 --- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.ui/META-INF/MANIFEST.MF +++ b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.ui/META-INF/MANIFEST.MF @@ -20,5 +20,5 @@ Bundle-ActivationPolicy: lazy Bundle-Vendor: %providerName Export-Package: org.eclipse.papyrus.gmf.internal.codegen, org.eclipse.papyrus.gmf.internal.codegen.popup.actions;x-friends:="org.eclipse.papyrus.gmf.codegen.xtend.ui,org.eclipse.papyrus.codegen" -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.gmf.codegen.ui diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.xtend.ui/.classpath b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.xtend.ui/.classpath index e801ebfb468..81fe078c20c 100644 --- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.xtend.ui/.classpath +++ b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.xtend.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/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.xtend.ui/.settings/org.eclipse.jdt.core.prefs b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.xtend.ui/.settings/org.eclipse.jdt.core.prefs index c9545f06a41..62ef3488cc0 100644 --- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.xtend.ui/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.xtend.ui/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error 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 diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.xtend.ui/META-INF/MANIFEST.MF b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.xtend.ui/META-INF/MANIFEST.MF index 2b51f243a7d..8b63c1813c4 100644 --- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.xtend.ui/META-INF/MANIFEST.MF +++ b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.xtend.ui/META-INF/MANIFEST.MF @@ -17,7 +17,7 @@ Require-Bundle: org.eclipse.ui;bundle-version="[3.118.0,4.0.0)", org.eclipse.jdt.ui;bundle-version="[3.3.0,4.0.0)", org.eclipse.papyrus.gmf.codegen.xtend;bundle-version="[1.0.0,2.0.0)" Bundle-ActivationPolicy: lazy -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-Vendor: %providerName Export-Package: org.eclipse.papyrus.gmf.codegen.xtend.ui, org.eclipse.papyrus.gmf.codegen.xtend.ui.handlers diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.xtend/.classpath b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.xtend/.classpath index e610be77cf1..46b577496e1 100644 --- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.xtend/.classpath +++ b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.xtend/.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"/> diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.xtend/.settings/org.eclipse.jdt.core.prefs b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.xtend/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100644 --- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.xtend/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.xtend/.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/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.xtend/META-INF/MANIFEST.MF b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.xtend/META-INF/MANIFEST.MF index d809525a1b8..7fe726d792c 100644 --- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.xtend/META-INF/MANIFEST.MF +++ b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.xtend/META-INF/MANIFEST.MF @@ -16,7 +16,7 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.3.0,4.0.0)", org.eclipse.xtext.builder;bundle-version="[2.24.0,3.0.0)", org.eclipse.xtend.lib;bundle-version="[2.24.0,3.0.0)", org.eclipse.ocl.ecore;bundle-version="[3.15.0,4.0.0)", - com.google.guava;bundle-version="[30.0.0,31.0.0)", + com.google.guava;bundle-version="[32.1.3,33.0.0)", org.eclipse.xtext.xbase.lib;bundle-version="[2.24.0,3.0.0)", org.eclipse.gmf.runtime.notation;bundle-version="[1.9.0,2.0.0)", org.eclipse.gmf.runtime.emf.type.core;bundle-version="[1.9.0,2.0.0)", @@ -25,7 +25,7 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.3.0,4.0.0)", org.eclipse.papyrus.eclipse.project.editors;bundle-version="[3.0.0,4.0.0)", org.eclipse.pde.core;bundle-version="[3.14.0,4.0.0)" Bundle-ActivationPolicy: lazy -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-Vendor: %providerName Export-Package: diagram.editparts, diagram.editpolicies, diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.xtend/xtend/xpt/editor/palette/PaletteConfiguration.xtend b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.xtend/xtend/xpt/editor/palette/PaletteConfiguration.xtend index 77b491b18e6..5e48bc81325 100644 --- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.xtend/xtend/xpt/editor/palette/PaletteConfiguration.xtend +++ b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.xtend/xtend/xpt/editor/palette/PaletteConfiguration.xtend @@ -1,5 +1,5 @@ /***************************************************************************** - * Copyright (c) 2017 CEA LIST, ALL4TEC and others. + * Copyright (c) 2017, 2023 CEA LIST, ALL4TEC 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,10 @@ * Contributors: * Mickael ADAM (ALL4TEC) mickael.adam@all4tec.net - Initial API and implementation * Etienne Allogo (ARTAL) - etienne.allogo@artal.fr - Bug 569174 : L1.2 clean up + * Ansgar Radermacher - bug 582492, move to com.google.inject *****************************************************************************/ package xpt.editor.palette -import javax.inject.Inject -import javax.inject.Singleton import org.eclipse.emf.ecore.xmi.XMLResource import org.eclipse.papyrus.gmf.codegen.gmfgen.AbstractToolEntry import org.eclipse.papyrus.gmf.codegen.gmfgen.GenEditorGenerator @@ -23,6 +22,8 @@ import org.eclipse.papyrus.gmf.codegen.gmfgen.ToolEntry import org.eclipse.papyrus.gmf.codegen.gmfgen.ToolGroup import xpt.Common import xpt.Common_qvto +import com.google.inject.Inject +import com.google.inject.Singleton /** * Template for generation of palette configuration model from gmfgen. diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.xtend/xtend/xpt/providers/VisualTypeProvider.xtend b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.xtend/xtend/xpt/providers/VisualTypeProvider.xtend index a1650ff931a..5da2a4fb4aa 100644 --- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.xtend/xtend/xpt/providers/VisualTypeProvider.xtend +++ b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.xtend/xtend/xpt/providers/VisualTypeProvider.xtend @@ -1,5 +1,5 @@ /***************************************************************************** - * Copyright (c) 2015, 2021 Christian W. Damus, CEA LIST, Artal and others. + * Copyright (c) 2015, 2021, 2023 Christian W. Damus, CEA LIST, Artal 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,16 +12,17 @@ * Christian W. Damus - Initial API and implementation * Etienne Allogo (ARTAL) - etienne.allogo@artal.fr - Bug 569174 : 1.4 Merge papyrus extension templates into codegen.xtend * Etienne Allogo (ARTAL) - etienne.allogo@artal.fr - Bug 569174 : L1.2 clean up providers + * Ansgar Radermacher - bug 582492, move to com.google.inject *****************************************************************************/ package xpt.providers -import javax.inject.Inject -import javax.inject.Singleton import org.eclipse.papyrus.gmf.codegen.gmfgen.GenDiagram import xpt.CodeStyle import xpt.Common import xpt.editor.VisualIDRegistry import xpt.providers.ElementTypes +import com.google.inject.Singleton +import com.google.inject.Inject /** * Template for the class that plugs in knowledge of the Visual IDs of this diagram diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/.classpath b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/.classpath index e801ebfb468..81fe078c20c 100644 --- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/.classpath +++ b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/.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/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/.settings/org.eclipse.jdt.core.prefs b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/.settings/org.eclipse.jdt.core.prefs index c9545f06a41..62ef3488cc0 100644 --- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error 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 diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/META-INF/MANIFEST.MF b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/META-INF/MANIFEST.MF index a2dad5bffe7..a6d68262664 100644 --- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/META-INF/MANIFEST.MF +++ b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/META-INF/MANIFEST.MF @@ -25,5 +25,5 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)", org.eclipse.ui.workbench;bundle-version="[3.0.0,4.0.0)", org.eclipse.papyrus.emf;bundle-version="[2.0.0,3.0.0)" Bundle-ActivationPolicy: lazy -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Eclipse-BuddyPolicy: registered diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.common/.classpath b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.common/.classpath index e801ebfb468..81fe078c20c 100644 --- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.common/.classpath +++ b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.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/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.common/.settings/org.eclipse.jdt.core.prefs b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.common/.settings/org.eclipse.jdt.core.prefs index c9545f06a41..62ef3488cc0 100644 --- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.common/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.common/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error 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 diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.common/META-INF/MANIFEST.MF b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.common/META-INF/MANIFEST.MF index 4aa6595d74b..bfe4efe4afb 100644 --- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.common/META-INF/MANIFEST.MF +++ b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.common/META-INF/MANIFEST.MF @@ -37,7 +37,7 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.3.0,4.0.0)", org.eclipse.emf.edit;bundle-version="[2.3.0,3.0.0)", org.eclipse.emf.edit.ui;bundle-version="[2.3.0,3.0.0)", org.eclipse.papyrus.emf;bundle-version="[2.0.0,3.0.0)" -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-Activator: org.eclipse.papyrus.gmf.internal.common.Activator Bundle-ActivationPolicy: lazy Bundle-Localization: plugin diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.validate/.classpath b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.validate/.classpath index e801ebfb468..81fe078c20c 100644 --- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.validate/.classpath +++ b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.validate/.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/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.validate/.settings/org.eclipse.jdt.core.prefs b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.validate/.settings/org.eclipse.jdt.core.prefs index c9545f06a41..62ef3488cc0 100644 --- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.validate/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.validate/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error 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 diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.validate/META-INF/MANIFEST.MF b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.validate/META-INF/MANIFEST.MF index 47465fdab7d..d52c9436cf9 100644 --- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.validate/META-INF/MANIFEST.MF +++ b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.validate/META-INF/MANIFEST.MF @@ -12,5 +12,5 @@ Require-Bundle: org.eclipse.emf.validation;bundle-version="[1.1.0,2.0.0)", org.eclipse.ocl.ecore;bundle-version="[3.0.0,4.0.0)" Bundle-Vendor: %providerName Bundle-ActivationPolicy: lazy -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.eclipse.papyrus.gmf.validate diff --git a/plugins/toolsmiths/org.eclipse.papyrus.architectureview/.classpath b/plugins/toolsmiths/org.eclipse.papyrus.architectureview/.classpath index e801ebfb468..81fe078c20c 100644 --- a/plugins/toolsmiths/org.eclipse.papyrus.architectureview/.classpath +++ b/plugins/toolsmiths/org.eclipse.papyrus.architectureview/.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/toolsmiths/org.eclipse.papyrus.architectureview/.settings/org.eclipse.jdt.core.prefs b/plugins/toolsmiths/org.eclipse.papyrus.architectureview/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/toolsmiths/org.eclipse.papyrus.architectureview/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/toolsmiths/org.eclipse.papyrus.architectureview/.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/toolsmiths/org.eclipse.papyrus.architectureview/META-INF/MANIFEST.MF b/plugins/toolsmiths/org.eclipse.papyrus.architectureview/META-INF/MANIFEST.MF index 49f055f85b1..b3071e092db 100644 --- a/plugins/toolsmiths/org.eclipse.papyrus.architectureview/META-INF/MANIFEST.MF +++ b/plugins/toolsmiths/org.eclipse.papyrus.architectureview/META-INF/MANIFEST.MF @@ -18,5 +18,5 @@ Bundle-Name: %pluginName Bundle-Activator: org.eclipse.papyrus.architectureview.Activator Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.architectureview;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.architectureview diff --git a/plugins/toolsmiths/org.eclipse.papyrus.codegen/.classpath b/plugins/toolsmiths/org.eclipse.papyrus.codegen/.classpath index e801ebfb468..81fe078c20c 100644 --- a/plugins/toolsmiths/org.eclipse.papyrus.codegen/.classpath +++ b/plugins/toolsmiths/org.eclipse.papyrus.codegen/.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/toolsmiths/org.eclipse.papyrus.codegen/.settings/org.eclipse.jdt.core.prefs b/plugins/toolsmiths/org.eclipse.papyrus.codegen/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/toolsmiths/org.eclipse.papyrus.codegen/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/toolsmiths/org.eclipse.papyrus.codegen/.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/toolsmiths/org.eclipse.papyrus.codegen/META-INF/MANIFEST.MF b/plugins/toolsmiths/org.eclipse.papyrus.codegen/META-INF/MANIFEST.MF index 9e8c18a50fb..848c966a02b 100644 --- a/plugins/toolsmiths/org.eclipse.papyrus.codegen/META-INF/MANIFEST.MF +++ b/plugins/toolsmiths/org.eclipse.papyrus.codegen/META-INF/MANIFEST.MF @@ -19,5 +19,5 @@ Bundle-Localization: plugin Bundle-Activator: org.eclipse.papyrus.codegen.Activator Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.codegen;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.codegen diff --git a/plugins/toolsmiths/org.eclipse.papyrus.customization.nattableconfiguration/.classpath b/plugins/toolsmiths/org.eclipse.papyrus.customization.nattableconfiguration/.classpath index e801ebfb468..81fe078c20c 100644 --- a/plugins/toolsmiths/org.eclipse.papyrus.customization.nattableconfiguration/.classpath +++ b/plugins/toolsmiths/org.eclipse.papyrus.customization.nattableconfiguration/.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/toolsmiths/org.eclipse.papyrus.customization.nattableconfiguration/.settings/org.eclipse.jdt.core.prefs b/plugins/toolsmiths/org.eclipse.papyrus.customization.nattableconfiguration/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/toolsmiths/org.eclipse.papyrus.customization.nattableconfiguration/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/toolsmiths/org.eclipse.papyrus.customization.nattableconfiguration/.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/toolsmiths/org.eclipse.papyrus.customization.nattableconfiguration/META-INF/MANIFEST.MF b/plugins/toolsmiths/org.eclipse.papyrus.customization.nattableconfiguration/META-INF/MANIFEST.MF index 1d0120132ae..12937e909d7 100644 --- a/plugins/toolsmiths/org.eclipse.papyrus.customization.nattableconfiguration/META-INF/MANIFEST.MF +++ b/plugins/toolsmiths/org.eclipse.papyrus.customization.nattableconfiguration/META-INF/MANIFEST.MF @@ -24,7 +24,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 Export-Package: org.eclipse.papyrus.customization.nattableconfiguration, org.eclipse.papyrus.customization.nattableconfiguration.edition, diff --git a/plugins/toolsmiths/org.eclipse.papyrus.customization.nattableconfiguration/plugin.xml b/plugins/toolsmiths/org.eclipse.papyrus.customization.nattableconfiguration/plugin.xml index 8f34f410bee..d9d3192aca3 100644 --- a/plugins/toolsmiths/org.eclipse.papyrus.customization.nattableconfiguration/plugin.xml +++ b/plugins/toolsmiths/org.eclipse.papyrus.customization.nattableconfiguration/plugin.xml @@ -5,7 +5,7 @@ point="org.eclipse.ui.menus"> <menuContribution allPopups="true" - locationURI="popup:org.eclipse.ui.navigator.ProjectExplorer#PopupMenu"> + locationURI="popup:org.eclipse.papyrus.dev.ui.editors"> <command commandId="org.eclipse.papyrus.infra.nattable.edit.configuration.wizard" label="Edit Table Configuration" diff --git a/plugins/toolsmiths/org.eclipse.papyrus.dev.assistants.codegen/.classpath b/plugins/toolsmiths/org.eclipse.papyrus.dev.assistants.codegen/.classpath index 47ce7cd0756..5bfb3c39906 100644 --- a/plugins/toolsmiths/org.eclipse.papyrus.dev.assistants.codegen/.classpath +++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.assistants.codegen/.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/toolsmiths/org.eclipse.papyrus.dev.assistants.codegen/.settings/org.eclipse.jdt.core.prefs b/plugins/toolsmiths/org.eclipse.papyrus.dev.assistants.codegen/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/toolsmiths/org.eclipse.papyrus.dev.assistants.codegen/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.assistants.codegen/.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/toolsmiths/org.eclipse.papyrus.dev.assistants.codegen/META-INF/MANIFEST.MF b/plugins/toolsmiths/org.eclipse.papyrus.dev.assistants.codegen/META-INF/MANIFEST.MF index edbac8d1147..e808d7a67fa 100644 --- a/plugins/toolsmiths/org.eclipse.papyrus.dev.assistants.codegen/META-INF/MANIFEST.MF +++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.assistants.codegen/META-INF/MANIFEST.MF @@ -1,6 +1,5 @@ Manifest-Version: 1.0 -Require-Bundle: com.google.inject;bundle-version="[3.0.0,4.0.0)", - javax.inject;bundle-version="[1.0.0,2.0.0)", +Require-Bundle: com.google.inject;bundle-version="[7.0.0,8.0.0)", org.eclipse.emf.databinding;bundle-version="[1.5.0,2.0.0)", org.eclipse.gmf.runtime.diagram.ui.properties;bundle-version="[1.8.0,2.0.0)", org.eclipse.m2m.qvt.oml;bundle-version="[3.10.0,4.0.0)", @@ -18,12 +17,12 @@ Require-Bundle: com.google.inject;bundle-version="[3.0.0,4.0.0)", org.eclipse.emf.codegen.ecore;bundle-version="[2.16.0,3.0.0)" Bundle-Vendor: %providerName Bundle-ActivationPolicy: lazy -Bundle-Version: 2.0.100.qualifier +Bundle-Version: 2.1.100.qualifier Bundle-Name: %pluginName Bundle-Localization: plugin Bundle-ManifestVersion: 2 Bundle-Activator: org.eclipse.papyrus.dev.assistants.codegen.internal.Activator Bundle-Description: %description Bundle-SymbolicName: org.eclipse.papyrus.dev.assistants.codegen;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.dev.assistants.codegen diff --git a/plugins/toolsmiths/org.eclipse.papyrus.dev.assistants.codegen/plugin.xml b/plugins/toolsmiths/org.eclipse.papyrus.dev.assistants.codegen/plugin.xml index 6a31924d162..c3cf33144da 100644 --- a/plugins/toolsmiths/org.eclipse.papyrus.dev.assistants.codegen/plugin.xml +++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.assistants.codegen/plugin.xml @@ -20,7 +20,7 @@ point="org.eclipse.ui.menus"> <menuContribution allPopups="false" - locationURI="popup:org.eclipse.ui.popup.any"> + locationURI="popup:org.eclipse.papyrus.custo.editors"> <command commandId="org.eclipse.papyrus.dev.assistants.codegen.generateAssistantsFromElementTypes" id="org.eclipse.papyrus.dev.assistants.codegen.menus.generateAssistantsFromElementTypes" diff --git a/plugins/toolsmiths/org.eclipse.papyrus.dev.assistants.codegen/pom.xml b/plugins/toolsmiths/org.eclipse.papyrus.dev.assistants.codegen/pom.xml index 147f397c91a..89022092b4b 100644 --- a/plugins/toolsmiths/org.eclipse.papyrus.dev.assistants.codegen/pom.xml +++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.assistants.codegen/pom.xml @@ -10,7 +10,7 @@ </parent> <artifactId>org.eclipse.papyrus.dev.assistants.codegen</artifactId> <groupId>org.eclipse.papyrus</groupId> - <version>2.0.100-SNAPSHOT</version> + <version>2.1.100-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> <build> <plugins> @@ -50,4 +50,4 @@ </plugin> </plugins> </build> -</project>
\ No newline at end of file +</project> diff --git a/plugins/toolsmiths/org.eclipse.papyrus.dev.assistants.codegen/src/org/eclipse/papyrus/dev/assistants/codegen/generator/ElementTypeToAssistantRule.xtend b/plugins/toolsmiths/org.eclipse.papyrus.dev.assistants.codegen/src/org/eclipse/papyrus/dev/assistants/codegen/generator/ElementTypeToAssistantRule.xtend index b02e32f1d64..94124915d89 100644 --- a/plugins/toolsmiths/org.eclipse.papyrus.dev.assistants.codegen/src/org/eclipse/papyrus/dev/assistants/codegen/generator/ElementTypeToAssistantRule.xtend +++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.assistants.codegen/src/org/eclipse/papyrus/dev/assistants/codegen/generator/ElementTypeToAssistantRule.xtend @@ -1,5 +1,5 @@ /***************************************************************************** - * Copyright (c) 2015 Christian W. Damus and others. + * Copyright (c) 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 @@ -10,17 +10,18 @@ * * Contributors: * Christian W. Damus - Initial API and implementation + * Ansgar Radermacher - bug 582492, move to com.google.inject * *****************************************************************************/ package org.eclipse.papyrus.dev.assistants.codegen.generator -import javax.inject.Inject import org.eclipse.papyrus.infra.types.ElementTypeConfiguration import org.eclipse.papyrus.infra.types.ElementTypeSetConfiguration import org.eclipse.papyrus.infra.filters.Filter import org.eclipse.papyrus.infra.gmfdiag.assistant.AssistantFactory import org.eclipse.papyrus.uml.profile.assistants.generator.FiltersUtil import org.eclipse.papyrus.uml.profile.types.generator.UMLElementTypes +import com.google.inject.Inject /** * Element Type to Assistant transformation rule. diff --git a/plugins/toolsmiths/org.eclipse.papyrus.dev.assistants.codegen/src/org/eclipse/papyrus/dev/assistants/codegen/generator/GMFGenToAssistantRule.xtend b/plugins/toolsmiths/org.eclipse.papyrus.dev.assistants.codegen/src/org/eclipse/papyrus/dev/assistants/codegen/generator/GMFGenToAssistantRule.xtend index 20eb609c87f..35ad70f9a3d 100644 --- a/plugins/toolsmiths/org.eclipse.papyrus.dev.assistants.codegen/src/org/eclipse/papyrus/dev/assistants/codegen/generator/GMFGenToAssistantRule.xtend +++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.assistants.codegen/src/org/eclipse/papyrus/dev/assistants/codegen/generator/GMFGenToAssistantRule.xtend @@ -1,5 +1,5 @@ /***************************************************************************** - * Copyright (c) 2015, 2021 Christian W. Damus and others. + * Copyright (c) 2015, 2021, 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 @@ -11,10 +11,10 @@ * Contributors: * Christian W. Damus - Initial API and implementation * Vincent Lorenzo (CEA LIST) - vincent.lorenzo@cea.fr - bug 569174, 570944 + * Ansgar Radermacher - bug 582492, move to com.google.inject *****************************************************************************/ package org.eclipse.papyrus.dev.assistants.codegen.generator -import javax.inject.Inject import org.eclipse.emf.ecore.EObject import org.eclipse.papyrus.gmf.codegen.gmfgen.GenChildNode import org.eclipse.papyrus.gmf.codegen.gmfgen.GenCommonBase @@ -27,6 +27,7 @@ import org.eclipse.papyrus.gmf.codegen.gmfgen.ModelFacet import org.eclipse.papyrus.infra.filters.Filter import org.eclipse.papyrus.infra.gmfdiag.assistant.AssistantFactory import org.eclipse.papyrus.uml.profile.assistants.generator.FiltersUtil +import com.google.inject.Inject /** * GMFGen node/link to Assistant transformation rule. diff --git a/plugins/toolsmiths/org.eclipse.papyrus.dev.assistants.codegen/src/org/eclipse/papyrus/dev/assistants/codegen/generator/ModelingAssistantProviderRule.xtend b/plugins/toolsmiths/org.eclipse.papyrus.dev.assistants.codegen/src/org/eclipse/papyrus/dev/assistants/codegen/generator/ModelingAssistantProviderRule.xtend index af01a866352..18f6754d487 100644 --- a/plugins/toolsmiths/org.eclipse.papyrus.dev.assistants.codegen/src/org/eclipse/papyrus/dev/assistants/codegen/generator/ModelingAssistantProviderRule.xtend +++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.assistants.codegen/src/org/eclipse/papyrus/dev/assistants/codegen/generator/ModelingAssistantProviderRule.xtend @@ -1,5 +1,5 @@ /***************************************************************************** - * Copyright (c) 2015, 2021 Christian W. Damus and others. + * Copyright (c) 2015, 2021, 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 @@ -11,16 +11,17 @@ * Contributors: * Christian W. Damus - Initial API and implementation * Vincent Lorenzo (CEA LIST) - vincent.lorenzo@cea.fr - bug 569174, 570944 + * Ansgar Radermacher - bug 582492, move to com.google.inject *****************************************************************************/ package org.eclipse.papyrus.dev.assistants.codegen.generator -import javax.inject.Inject -import javax.inject.Singleton import org.eclipse.papyrus.infra.gmfdiag.assistant.AssistantFactory import org.eclipse.papyrus.infra.gmfdiag.assistant.ModelingAssistantProvider import org.eclipse.papyrus.uml.profile.types.generator.UMLElementTypes import org.eclipse.papyrus.infra.types.ElementTypeSetConfiguration import org.eclipse.papyrus.gmf.codegen.gmfgen.GenEditorGenerator +import com.google.inject.Singleton +import com.google.inject.Inject /** * Transformation rule for generating a {@link ModelingAssistantProvider} from a UML {@link Profile}. diff --git a/plugins/toolsmiths/org.eclipse.papyrus.dev.pluginexplorer/.classpath b/plugins/toolsmiths/org.eclipse.papyrus.dev.pluginexplorer/.classpath index e801ebfb468..81fe078c20c 100755 --- a/plugins/toolsmiths/org.eclipse.papyrus.dev.pluginexplorer/.classpath +++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.pluginexplorer/.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/toolsmiths/org.eclipse.papyrus.dev.pluginexplorer/.settings/org.eclipse.jdt.core.prefs b/plugins/toolsmiths/org.eclipse.papyrus.dev.pluginexplorer/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/toolsmiths/org.eclipse.papyrus.dev.pluginexplorer/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.pluginexplorer/.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/toolsmiths/org.eclipse.papyrus.dev.pluginexplorer/META-INF/MANIFEST.MF b/plugins/toolsmiths/org.eclipse.papyrus.dev.pluginexplorer/META-INF/MANIFEST.MF index e465be0a60e..4df4ab1b099 100755 --- a/plugins/toolsmiths/org.eclipse.papyrus.dev.pluginexplorer/META-INF/MANIFEST.MF +++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.pluginexplorer/META-INF/MANIFEST.MF @@ -12,5 +12,5 @@ Bundle-Activator: org.eclipse.papyrus.dev.pluginexplorer.Activator Bundle-ManifestVersion: 2 Bundle-Description: %pluginDescription Bundle-SymbolicName: org.eclipse.papyrus.dev.pluginexplorer;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.dev.pluginexplorer diff --git a/plugins/toolsmiths/org.eclipse.papyrus.dev.project.management/.classpath b/plugins/toolsmiths/org.eclipse.papyrus.dev.project.management/.classpath index f0d0c735ff8..e3378d07f07 100644 --- a/plugins/toolsmiths/org.eclipse.papyrus.dev.project.management/.classpath +++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.project.management/.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"> <attributes> <attribute name="module" value="true"/> </attributes> diff --git a/plugins/toolsmiths/org.eclipse.papyrus.dev.project.management/.settings/org.eclipse.jdt.core.prefs b/plugins/toolsmiths/org.eclipse.papyrus.dev.project.management/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/toolsmiths/org.eclipse.papyrus.dev.project.management/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.project.management/.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/toolsmiths/org.eclipse.papyrus.dev.project.management/META-INF/MANIFEST.MF b/plugins/toolsmiths/org.eclipse.papyrus.dev.project.management/META-INF/MANIFEST.MF index 774b293a356..ba5c0077f6a 100644 --- a/plugins/toolsmiths/org.eclipse.papyrus.dev.project.management/META-INF/MANIFEST.MF +++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.project.management/META-INF/MANIFEST.MF @@ -14,7 +14,7 @@ Bundle-Name: %Bundle-Name Bundle-ManifestVersion: 2 Bundle-Activator: org.eclipse.papyrus.dev.project.management.Activator Bundle-SymbolicName: org.eclipse.papyrus.dev.project.management;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.eclipse.papyrus.dev.project.management, org.eclipse.papyrus.dev.project.management.dialog, org.eclipse.papyrus.dev.project.management.handlers, diff --git a/plugins/toolsmiths/org.eclipse.papyrus.dev.project.management/src/org/eclipse/papyrus/dev/project/management/internal/operations/VersionRules.java b/plugins/toolsmiths/org.eclipse.papyrus.dev.project.management/src/org/eclipse/papyrus/dev/project/management/internal/operations/VersionRules.java index a0a21521deb..11431781b5d 100644 --- a/plugins/toolsmiths/org.eclipse.papyrus.dev.project.management/src/org/eclipse/papyrus/dev/project/management/internal/operations/VersionRules.java +++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.project.management/src/org/eclipse/papyrus/dev/project/management/internal/operations/VersionRules.java @@ -38,7 +38,7 @@ public class VersionRules { new CurrentVersionRule(), // The default behaviour new FixedRangeRule(dep -> dep.startsWith("org.apache.batik"), "[1.6.0,1.7.0)"), //$NON-NLS-1$//$NON-NLS-2$ new SkipRule("com.ibm.icu") //$NON-NLS-1$ - ,new FixedRangeRule("com.google.guava", "30.1.0") //$NON-NLS-1$ + ,new FixedRangeRule("com.google.guava", "32.1.3") //$NON-NLS-1$ ); public VersionRules() { diff --git a/plugins/toolsmiths/org.eclipse.papyrus.dev.types/.classpath b/plugins/toolsmiths/org.eclipse.papyrus.dev.types/.classpath index 44e0ca59e44..dc7bac18b79 100644 --- a/plugins/toolsmiths/org.eclipse.papyrus.dev.types/.classpath +++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.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="xtend-gen"/> <classpathentry kind="src" path="src"/> diff --git a/plugins/toolsmiths/org.eclipse.papyrus.dev.types/.settings/org.eclipse.jdt.core.prefs b/plugins/toolsmiths/org.eclipse.papyrus.dev.types/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/toolsmiths/org.eclipse.papyrus.dev.types/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.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/toolsmiths/org.eclipse.papyrus.dev.types/META-INF/MANIFEST.MF b/plugins/toolsmiths/org.eclipse.papyrus.dev.types/META-INF/MANIFEST.MF index 3969868ada7..2f34bd652bb 100644 --- a/plugins/toolsmiths/org.eclipse.papyrus.dev.types/META-INF/MANIFEST.MF +++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.types/META-INF/MANIFEST.MF @@ -14,11 +14,11 @@ Require-Bundle: org.eclipse.core.filesystem;bundle-version="[1.7.0,2.0.0)", org.eclipse.xtend.lib;bundle-version="[2.22.0,3.0.0)" Bundle-Vendor: %providerName Bundle-ActivationPolicy: lazy -Bundle-Version: 4.0.0.qualifier +Bundle-Version: 4.1.0.qualifier Bundle-Name: %pluginName Bundle-Localization: plugin Bundle-ManifestVersion: 2 Bundle-Activator: org.eclipse.papyrus.dev.types.Activator Bundle-SymbolicName: org.eclipse.papyrus.dev.types;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.dev.types diff --git a/plugins/toolsmiths/org.eclipse.papyrus.dev.types/plugin.xml b/plugins/toolsmiths/org.eclipse.papyrus.dev.types/plugin.xml index 9d0f7c94998..ecd36ea9b16 100644 --- a/plugins/toolsmiths/org.eclipse.papyrus.dev.types/plugin.xml +++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.types/plugin.xml @@ -5,7 +5,7 @@ point="org.eclipse.ui.menus"> <menuContribution allPopups="false" - locationURI="popup:org.eclipse.papyrus.dev.ui.menu"> + locationURI="popup:org.eclipse.papyrus.custo.framework"> <command commandId="org.eclipse.papyrus.infra.dev.types.commands.migrateTypesConfigurations" id="org.eclipse.papyrus.infra.dev.types.menus.migrateTypesConfigurations" @@ -29,7 +29,7 @@ </menuContribution> <menuContribution allPopups="false" - locationURI="popup:org.eclipse.papyrus.dev.ui.menu"> + locationURI="popup:org.eclipse.papyrus.custo.framework"> <command commandId="org.eclipse.papyrus.infra.dev.types.commands.generateElementTypesRegistry" id="org.eclipse.papyrus.infra.dev.types.menus.generateElementTypesRegistry" @@ -53,7 +53,7 @@ </menuContribution> <menuContribution allPopups="false" - locationURI="popup:org.eclipse.papyrus.dev.ui.menu"> + locationURI="popup:org.eclipse.papyrus.custo.framework"> <command commandId="org.eclipse.papyrus.infra.dev.types.commands.migrateSpecializations" id="org.eclipse.papyrus.infra.dev.types.menus.migrateSpecializations" @@ -77,7 +77,7 @@ </menuContribution> <menuContribution allPopups="false" - locationURI="popup:org.eclipse.papyrus.dev.ui.menu"> + locationURI="popup:org.eclipse.papyrus.dev.ui.framework"> <command commandId="org.eclipse.papyrus.infra.dev.types.commands.elementTypeInfo" id="org.eclipse.papyrus.infra.dev.types.menus.elementTypeInfo" diff --git a/plugins/toolsmiths/org.eclipse.papyrus.dev.types/pom.xml b/plugins/toolsmiths/org.eclipse.papyrus.dev.types/pom.xml index c8d06a6380d..31aca283712 100644 --- a/plugins/toolsmiths/org.eclipse.papyrus.dev.types/pom.xml +++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.types/pom.xml @@ -8,7 +8,7 @@ </parent> <artifactId>org.eclipse.papyrus.dev.types</artifactId> <groupId>org.eclipse.papyrus</groupId> - <version>4.0.0-SNAPSHOT</version> + <version>4.1.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> <build> <plugins> diff --git a/plugins/toolsmiths/org.eclipse.papyrus.dev.ui/.classpath b/plugins/toolsmiths/org.eclipse.papyrus.dev.ui/.classpath index 9d7154d3dc5..53711edd13c 100644 --- a/plugins/toolsmiths/org.eclipse.papyrus.dev.ui/.classpath +++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.ui/.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/toolsmiths/org.eclipse.papyrus.dev.ui/.settings/org.eclipse.jdt.core.prefs b/plugins/toolsmiths/org.eclipse.papyrus.dev.ui/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/toolsmiths/org.eclipse.papyrus.dev.ui/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.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/toolsmiths/org.eclipse.papyrus.dev.ui/META-INF/MANIFEST.MF b/plugins/toolsmiths/org.eclipse.papyrus.dev.ui/META-INF/MANIFEST.MF index 1d3f9ba399d..5763839ca01 100644 --- a/plugins/toolsmiths/org.eclipse.papyrus.dev.ui/META-INF/MANIFEST.MF +++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.ui/META-INF/MANIFEST.MF @@ -4,12 +4,12 @@ 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.core.log;bundle-version="[2.0.0,3.0.0)", org.eclipse.ui;bundle-version="[3.117.0,4.0.0)" Bundle-Vendor: %providerName -Bundle-Version: 1.0.0.qualifier +Bundle-Version: 1.1.0.qualifier Eclipse-BuddyPolicy: dependent Bundle-ManifestVersion: 2 Bundle-Activator: org.eclipse.papyrus.dev.ui.Activator diff --git a/plugins/toolsmiths/org.eclipse.papyrus.dev.ui/plugin.xml b/plugins/toolsmiths/org.eclipse.papyrus.dev.ui/plugin.xml index 3f9ff2ba32a..25a2caa7612 100644 --- a/plugins/toolsmiths/org.eclipse.papyrus.dev.ui/plugin.xml +++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.ui/plugin.xml @@ -5,28 +5,27 @@ point="org.eclipse.ui.menus"> <menuContribution allPopups="false" - locationURI="popup:org.eclipse.ui.popup.any"> - <separator - name="org.eclipse.papyrus.dev.ui.menu.separator.before" - visible="true" - id="org.eclipse.papyrus.dev.ui.menu.separator.before"> - </separator> + locationURI="popup:org.eclipse.ui.popup.any?after=org.eclipse.papyrus.custo.menu"> <menu id="org.eclipse.papyrus.dev.ui.menu" label="Papyrus Developer" icon="platform:/plugin/org.eclipse.papyrus.dev.ui/icons/papyrus/Papyrus_16x16.gif" tooltip="Papyrus Developer Menu"> - <command - commandId="org.eclipse.papyrus.dev.ui.commands" - label="Upcoming elts for Developer..." - style="push" - tooltip="Upcoming elements for Developer..."> - </command> <separator name="org.eclipse.papyrus.dev.ui.menu.separator.after" visible="true" id="org.eclipse.papyrus.dev.ui.menu.separator.after"> </separator> + <menu + id="org.eclipse.papyrus.dev.ui.editors" + label="Editors" + tooltip="Papyrus editors developer menu"> + </menu> + <menu + id="org.eclipse.papyrus.dev.ui.framework" + label="Framework" + tooltip="Papyrus framework developer menu"> + </menu> </menu> </menuContribution> </extension> diff --git a/plugins/toolsmiths/org.eclipse.papyrus.dev.ui/pom.xml b/plugins/toolsmiths/org.eclipse.papyrus.dev.ui/pom.xml index bd1a9957d79..470e35a5b3e 100644 --- a/plugins/toolsmiths/org.eclipse.papyrus.dev.ui/pom.xml +++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.ui/pom.xml @@ -12,7 +12,7 @@ <artifactId>org.eclipse.papyrus.dev.ui</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>1.1.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> <description>A plugin to hold the menu for developer tools.</description> </project> diff --git a/plugins/toolsmiths/org.eclipse.papyrus.dev.view.services.edit.request/.classpath b/plugins/toolsmiths/org.eclipse.papyrus.dev.view.services.edit.request/.classpath index e801ebfb468..81fe078c20c 100644 --- a/plugins/toolsmiths/org.eclipse.papyrus.dev.view.services.edit.request/.classpath +++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.view.services.edit.request/.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/toolsmiths/org.eclipse.papyrus.dev.view.services.edit.request/.settings/org.eclipse.jdt.core.prefs b/plugins/toolsmiths/org.eclipse.papyrus.dev.view.services.edit.request/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/toolsmiths/org.eclipse.papyrus.dev.view.services.edit.request/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.view.services.edit.request/.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/toolsmiths/org.eclipse.papyrus.dev.view.services.edit.request/META-INF/MANIFEST.MF b/plugins/toolsmiths/org.eclipse.papyrus.dev.view.services.edit.request/META-INF/MANIFEST.MF index a7d77299b89..11efdbd368f 100644 --- a/plugins/toolsmiths/org.eclipse.papyrus.dev.view.services.edit.request/META-INF/MANIFEST.MF +++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.view.services.edit.request/META-INF/MANIFEST.MF @@ -11,5 +11,5 @@ Bundle-Activator: org.eclipse.papyrus.dev.view.services.edit.request.Activator Bundle-ManifestVersion: 2 Bundle-Description: %pluginDescription Bundle-SymbolicName: org.eclipse.papyrus.dev.view.services.edit.request;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.dev.view.services.edit.request diff --git a/plugins/toolsmiths/org.eclipse.papyrus.gmf.editpartview/.classpath b/plugins/toolsmiths/org.eclipse.papyrus.gmf.editpartview/.classpath index e801ebfb468..81fe078c20c 100644 --- a/plugins/toolsmiths/org.eclipse.papyrus.gmf.editpartview/.classpath +++ b/plugins/toolsmiths/org.eclipse.papyrus.gmf.editpartview/.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/toolsmiths/org.eclipse.papyrus.gmf.editpartview/.settings/org.eclipse.jdt.core.prefs b/plugins/toolsmiths/org.eclipse.papyrus.gmf.editpartview/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/toolsmiths/org.eclipse.papyrus.gmf.editpartview/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/toolsmiths/org.eclipse.papyrus.gmf.editpartview/.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/toolsmiths/org.eclipse.papyrus.gmf.editpartview/META-INF/MANIFEST.MF b/plugins/toolsmiths/org.eclipse.papyrus.gmf.editpartview/META-INF/MANIFEST.MF index 17f4179f82b..5dfa61ebf53 100644 --- a/plugins/toolsmiths/org.eclipse.papyrus.gmf.editpartview/META-INF/MANIFEST.MF +++ b/plugins/toolsmiths/org.eclipse.papyrus.gmf.editpartview/META-INF/MANIFEST.MF @@ -12,5 +12,5 @@ Bundle-Name: %pluginName Bundle-Activator: org.eclipse.papyrus.gmf.editpartview.Activator Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.gmf.editpartview;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.gmf.editpartview diff --git a/plugins/toolsmiths/org.eclipse.papyrus.gmf.editpoliciesstates/.classpath b/plugins/toolsmiths/org.eclipse.papyrus.gmf.editpoliciesstates/.classpath index e801ebfb468..81fe078c20c 100644 --- a/plugins/toolsmiths/org.eclipse.papyrus.gmf.editpoliciesstates/.classpath +++ b/plugins/toolsmiths/org.eclipse.papyrus.gmf.editpoliciesstates/.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/toolsmiths/org.eclipse.papyrus.gmf.editpoliciesstates/.settings/org.eclipse.jdt.core.prefs b/plugins/toolsmiths/org.eclipse.papyrus.gmf.editpoliciesstates/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/toolsmiths/org.eclipse.papyrus.gmf.editpoliciesstates/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/toolsmiths/org.eclipse.papyrus.gmf.editpoliciesstates/.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/toolsmiths/org.eclipse.papyrus.gmf.editpoliciesstates/META-INF/MANIFEST.MF b/plugins/toolsmiths/org.eclipse.papyrus.gmf.editpoliciesstates/META-INF/MANIFEST.MF index a885ad25da7..b66ee541290 100644 --- a/plugins/toolsmiths/org.eclipse.papyrus.gmf.editpoliciesstates/META-INF/MANIFEST.MF +++ b/plugins/toolsmiths/org.eclipse.papyrus.gmf.editpoliciesstates/META-INF/MANIFEST.MF @@ -10,5 +10,5 @@ Bundle-Name: %pluginName Bundle-Activator: org.eclipse.papyrus.gmf.editpoliciesstates.Activator Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.gmf.editpoliciesstates;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.gmf.editpoliciesstates diff --git a/plugins/toolsmiths/org.eclipse.papyrus.gmf.figureview/.classpath b/plugins/toolsmiths/org.eclipse.papyrus.gmf.figureview/.classpath index e801ebfb468..81fe078c20c 100644 --- a/plugins/toolsmiths/org.eclipse.papyrus.gmf.figureview/.classpath +++ b/plugins/toolsmiths/org.eclipse.papyrus.gmf.figureview/.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/toolsmiths/org.eclipse.papyrus.gmf.figureview/.settings/org.eclipse.jdt.core.prefs b/plugins/toolsmiths/org.eclipse.papyrus.gmf.figureview/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/toolsmiths/org.eclipse.papyrus.gmf.figureview/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/toolsmiths/org.eclipse.papyrus.gmf.figureview/.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/toolsmiths/org.eclipse.papyrus.gmf.figureview/META-INF/MANIFEST.MF b/plugins/toolsmiths/org.eclipse.papyrus.gmf.figureview/META-INF/MANIFEST.MF index 00ed17e957d..93cfeac9cca 100644 --- a/plugins/toolsmiths/org.eclipse.papyrus.gmf.figureview/META-INF/MANIFEST.MF +++ b/plugins/toolsmiths/org.eclipse.papyrus.gmf.figureview/META-INF/MANIFEST.MF @@ -11,5 +11,5 @@ Bundle-Name: %pluginName Bundle-Activator: org.eclipse.papyrus.gmf.figureview.Activator Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.gmf.figureview;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.gmf.figureview diff --git a/plugins/toolsmiths/org.eclipse.papyrus.infra.emf.commandstack/.classpath b/plugins/toolsmiths/org.eclipse.papyrus.infra.emf.commandstack/.classpath index e801ebfb468..81fe078c20c 100644 --- a/plugins/toolsmiths/org.eclipse.papyrus.infra.emf.commandstack/.classpath +++ b/plugins/toolsmiths/org.eclipse.papyrus.infra.emf.commandstack/.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/toolsmiths/org.eclipse.papyrus.infra.emf.commandstack/.settings/org.eclipse.jdt.core.prefs b/plugins/toolsmiths/org.eclipse.papyrus.infra.emf.commandstack/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/toolsmiths/org.eclipse.papyrus.infra.emf.commandstack/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/toolsmiths/org.eclipse.papyrus.infra.emf.commandstack/.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/toolsmiths/org.eclipse.papyrus.infra.emf.commandstack/META-INF/MANIFEST.MF b/plugins/toolsmiths/org.eclipse.papyrus.infra.emf.commandstack/META-INF/MANIFEST.MF index 13320b3b551..cf8a8f8baf6 100644 --- a/plugins/toolsmiths/org.eclipse.papyrus.infra.emf.commandstack/META-INF/MANIFEST.MF +++ b/plugins/toolsmiths/org.eclipse.papyrus.infra.emf.commandstack/META-INF/MANIFEST.MF @@ -13,5 +13,5 @@ Bundle-ManifestVersion: 2 Bundle-Activator: org.eclipse.papyrus.infra.emf.commandstack.Activator Bundle-Description: This plugin allows to show the commands owned by the emf command stack Bundle-SymbolicName: org.eclipse.papyrus.infra.emf.commandstack;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.infra.emf.commandstack diff --git a/plugins/toolsmiths/org.eclipse.papyrus.infra.gmfdiag.css.debug/.classpath b/plugins/toolsmiths/org.eclipse.papyrus.infra.gmfdiag.css.debug/.classpath index e801ebfb468..81fe078c20c 100644 --- a/plugins/toolsmiths/org.eclipse.papyrus.infra.gmfdiag.css.debug/.classpath +++ b/plugins/toolsmiths/org.eclipse.papyrus.infra.gmfdiag.css.debug/.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/toolsmiths/org.eclipse.papyrus.infra.gmfdiag.css.debug/.settings/org.eclipse.jdt.core.prefs b/plugins/toolsmiths/org.eclipse.papyrus.infra.gmfdiag.css.debug/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/toolsmiths/org.eclipse.papyrus.infra.gmfdiag.css.debug/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/toolsmiths/org.eclipse.papyrus.infra.gmfdiag.css.debug/.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/toolsmiths/org.eclipse.papyrus.infra.gmfdiag.css.debug/META-INF/MANIFEST.MF b/plugins/toolsmiths/org.eclipse.papyrus.infra.gmfdiag.css.debug/META-INF/MANIFEST.MF index 0650be0e5ae..4cbe6405650 100644 --- a/plugins/toolsmiths/org.eclipse.papyrus.infra.gmfdiag.css.debug/META-INF/MANIFEST.MF +++ b/plugins/toolsmiths/org.eclipse.papyrus.infra.gmfdiag.css.debug/META-INF/MANIFEST.MF @@ -19,5 +19,5 @@ Bundle-Name: CSS Debug view Bundle-Activator: org.eclipse.papyrus.infra.gmfdiag.css.debug.Activator Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.css.debug;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.infra.gmfdiag.css.debug diff --git a/plugins/toolsmiths/org.eclipse.papyrus.mwe2.utils/.classpath b/plugins/toolsmiths/org.eclipse.papyrus.mwe2.utils/.classpath index a0e3a0c3a6e..276e0a400c3 100644 --- a/plugins/toolsmiths/org.eclipse.papyrus.mwe2.utils/.classpath +++ b/plugins/toolsmiths/org.eclipse.papyrus.mwe2.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="con" path="org.eclipse.xtend.XTEND_CONTAINER"/> <classpathentry kind="src" path="src"/> diff --git a/plugins/toolsmiths/org.eclipse.papyrus.mwe2.utils/.settings/org.eclipse.jdt.core.prefs b/plugins/toolsmiths/org.eclipse.papyrus.mwe2.utils/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/toolsmiths/org.eclipse.papyrus.mwe2.utils/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/toolsmiths/org.eclipse.papyrus.mwe2.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/toolsmiths/org.eclipse.papyrus.mwe2.utils/META-INF/MANIFEST.MF b/plugins/toolsmiths/org.eclipse.papyrus.mwe2.utils/META-INF/MANIFEST.MF index 26322ae46f4..a15ae639741 100644 --- a/plugins/toolsmiths/org.eclipse.papyrus.mwe2.utils/META-INF/MANIFEST.MF +++ b/plugins/toolsmiths/org.eclipse.papyrus.mwe2.utils/META-INF/MANIFEST.MF @@ -16,5 +16,5 @@ Bundle-Name: %Bundle-Name Bundle-ManifestVersion: 2 Bundle-Activator: org.eclipse.papyrus.mwe2.utils.Activator Bundle-SymbolicName: org.eclipse.papyrus.mwe2.utils;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.mwe2.utils diff --git a/plugins/toolsmiths/org.eclipse.papyrus.releng.dev.release/.classpath b/plugins/toolsmiths/org.eclipse.papyrus.releng.dev.release/.classpath index bc3587db485..a7a673fa7ab 100644 --- a/plugins/toolsmiths/org.eclipse.papyrus.releng.dev.release/.classpath +++ b/plugins/toolsmiths/org.eclipse.papyrus.releng.dev.release/.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/toolsmiths/org.eclipse.papyrus.releng.main.release/.classpath b/plugins/toolsmiths/org.eclipse.papyrus.releng.main.release/.classpath index bc3587db485..a7a673fa7ab 100644 --- a/plugins/toolsmiths/org.eclipse.papyrus.releng.main.release/.classpath +++ b/plugins/toolsmiths/org.eclipse.papyrus.releng.main.release/.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/toolsmiths/org.eclipse.papyrus.releng.tools/.classpath b/plugins/toolsmiths/org.eclipse.papyrus.releng.tools/.classpath index e801ebfb468..81fe078c20c 100644 --- a/plugins/toolsmiths/org.eclipse.papyrus.releng.tools/.classpath +++ b/plugins/toolsmiths/org.eclipse.papyrus.releng.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/toolsmiths/org.eclipse.papyrus.releng.tools/.settings/org.eclipse.jdt.core.prefs b/plugins/toolsmiths/org.eclipse.papyrus.releng.tools/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/toolsmiths/org.eclipse.papyrus.releng.tools/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/toolsmiths/org.eclipse.papyrus.releng.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/toolsmiths/org.eclipse.papyrus.releng.tools/META-INF/MANIFEST.MF b/plugins/toolsmiths/org.eclipse.papyrus.releng.tools/META-INF/MANIFEST.MF index b54e9d1a416..27ad0f4df69 100755 --- a/plugins/toolsmiths/org.eclipse.papyrus.releng.tools/META-INF/MANIFEST.MF +++ b/plugins/toolsmiths/org.eclipse.papyrus.releng.tools/META-INF/MANIFEST.MF @@ -1,6 +1,6 @@ Manifest-Version: 1.0 -Require-Bundle: org.eclipse.cbi.p2repo.aggregator;bundle-version="[1.0.0,2.0.0)", - org.eclipse.cbi.p2repo.aggregator.legacy;bundle-version="[1.0.0,2.0.0)", +Require-Bundle: org.eclipse.cbi.p2repo.aggregator;bundle-version="[1.1.0,2.0.0)", + org.eclipse.cbi.p2repo.aggregator.legacy;bundle-version="[1.1.0,2.0.0)", org.eclipse.cbi.targetplatform;bundle-version="[3.0.0,4.0.0)", org.eclipse.cbi.targetplatform.model;bundle-version="[3.0.0,4.0.0)", org.eclipse.cbi.targetplatform.ui;bundle-version="[3.0.0,4.0.0)", @@ -9,15 +9,14 @@ Require-Bundle: org.eclipse.cbi.p2repo.aggregator;bundle-version="[1.0.0,2.0.0)" org.eclipse.oomph.setup.targlets;bundle-version="[1.12.0,2.0.0)", org.eclipse.oomph.setup.workingsets;bundle-version="[1.12.0,2.0.0)", org.eclipse.ui;bundle-version="[3.117.0,4.0.0)", - org.eclipse.xtext;bundle-version="[2.22.0,3.0.0)" + org.eclipse.xtext;bundle-version="[2.22.0,3.0.0)", + com.google.guava;bundle-version="[32.1.3,33.0.0)" Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy -Bundle-Version: 3.1.0.qualifier +Bundle-Version: 3.2.0.qualifier Bundle-Name: %Bundle-Name Bundle-ManifestVersion: 2 Bundle-Activator: org.eclipse.papyrus.releng.tools.internal.Activator Bundle-SymbolicName: org.eclipse.papyrus.releng.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)" +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.releng.tools diff --git a/plugins/toolsmiths/org.eclipse.papyrus.releng.tools/pom.xml b/plugins/toolsmiths/org.eclipse.papyrus.releng.tools/pom.xml index c7a7d8c7c3c..3dfec1ece40 100644 --- a/plugins/toolsmiths/org.eclipse.papyrus.releng.tools/pom.xml +++ b/plugins/toolsmiths/org.eclipse.papyrus.releng.tools/pom.xml @@ -10,6 +10,6 @@ </parent> <artifactId>org.eclipse.papyrus.releng.tools</artifactId> <groupId>org.eclipse.papyrus</groupId> - <version>3.1.0-SNAPSHOT</version> + <version>3.2.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> -</project>
\ No newline at end of file +</project> diff --git a/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.ecore/.classpath b/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.ecore/.classpath index e801ebfb468..81fe078c20c 100755 --- a/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.ecore/.classpath +++ b/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.ecore/.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/toolsmiths/org.eclipse.papyrus.toolsmiths.ecore/.settings/org.eclipse.jdt.core.prefs b/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.ecore/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.ecore/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.ecore/.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/toolsmiths/org.eclipse.papyrus.toolsmiths.ecore/META-INF/MANIFEST.MF b/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.ecore/META-INF/MANIFEST.MF index eb0a8b48a29..254544821b7 100755 --- a/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.ecore/META-INF/MANIFEST.MF +++ b/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.ecore/META-INF/MANIFEST.MF @@ -15,6 +15,6 @@ Require-Bundle: org.eclipse.emf.edit.ui;bundle-version="[2.18.0,3.0.0)", org.eclipse.papyrus.infra.ui;bundle-version="[3.0.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-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.toolsmiths.ecore Bundle-ActivationPolicy: lazy diff --git a/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.expressions/.classpath b/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.expressions/.classpath index e801ebfb468..81fe078c20c 100755 --- a/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.expressions/.classpath +++ b/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.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"/> <classpathentry kind="output" path="bin"/> diff --git a/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.expressions/.settings/org.eclipse.jdt.core.prefs b/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.expressions/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.expressions/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.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/toolsmiths/org.eclipse.papyrus.toolsmiths.expressions/META-INF/MANIFEST.MF b/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.expressions/META-INF/MANIFEST.MF index 6d7900831ab..59b139d039d 100755 --- a/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.expressions/META-INF/MANIFEST.MF +++ b/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.expressions/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.papyrus.toolsmiths.expressions;singleton:=true Bundle-Version: 2.0.0.qualifier Bundle-Vendor: %Bundle-Vendor -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/toolsmiths/org.eclipse.papyrus.toolsmiths.expressions/plugin.xml b/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.expressions/plugin.xml index e187ce1859b..4d77c81235e 100755 --- a/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.expressions/plugin.xml +++ b/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.expressions/plugin.xml @@ -14,7 +14,7 @@ point="org.eclipse.ui.menus"> <menuContribution allPopups="false" - locationURI="popup:org.eclipse.papyrus.uml.profile.types.generator.ui.generateMenu?after=additions"> + locationURI="popup:org.eclipse.papyrus.dev.ui.framework"> <command commandId="org.eclipse.papyrus.toolsmiths.expressions.createExpressionsForUMLProfile" icon="icons/ExpressionCatalog.gif" diff --git a/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.nattable/.classpath b/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.nattable/.classpath index e801ebfb468..81fe078c20c 100755 --- a/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.nattable/.classpath +++ b/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.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/toolsmiths/org.eclipse.papyrus.toolsmiths.nattable/.settings/org.eclipse.jdt.core.prefs b/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.nattable/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.nattable/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.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/toolsmiths/org.eclipse.papyrus.toolsmiths.nattable/META-INF/MANIFEST.MF b/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.nattable/META-INF/MANIFEST.MF index 769fe5047f0..8dc4d5f1572 100755 --- a/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.nattable/META-INF/MANIFEST.MF +++ b/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.nattable/META-INF/MANIFEST.MF @@ -26,6 +26,6 @@ Require-Bundle: org.eclipse.core.expressions;bundle-version="[3.6.0,4.0.0)", org.eclipse.papyrus.infra.widgets;bundle-version="[4.0.0,5.0.0)", org.eclipse.papyrus.uml.properties;bundle-version="[4.0.0,5.0.0)", org.eclipse.uml2.uml.editor;bundle-version="[5.5.0,6.0.0)" -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.toolsmiths.nattable Bundle-ActivationPolicy: lazy diff --git a/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.palette/.classpath b/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.palette/.classpath index e801ebfb468..81fe078c20c 100644 --- a/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.palette/.classpath +++ b/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.palette/.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/toolsmiths/org.eclipse.papyrus.toolsmiths.palette/.settings/org.eclipse.jdt.core.prefs b/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.palette/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.palette/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.palette/.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/toolsmiths/org.eclipse.papyrus.toolsmiths.palette/META-INF/MANIFEST.MF b/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.palette/META-INF/MANIFEST.MF index 04c640eb26a..ac17698c200 100644 --- a/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.palette/META-INF/MANIFEST.MF +++ b/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.palette/META-INF/MANIFEST.MF @@ -27,5 +27,5 @@ Bundle-Localization: plugin Bundle-Name: %pluginName Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.toolsmiths.palette;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.toolsmiths.palette diff --git a/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.palette/plugin.xml b/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.palette/plugin.xml index a35158c6b63..2a8d36ddbad 100644 --- a/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.palette/plugin.xml +++ b/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.palette/plugin.xml @@ -5,7 +5,7 @@ point="org.eclipse.ui.menus"> <menuContribution allPopups="false" - locationURI="popup:org.eclipse.ui.popup.any?after=additions"> + locationURI="popup:org.eclipse.papyrus.custo.editors"> <command commandId="org.eclipse.papyrus.customization.palette.extended.undeploy" icon="icons/configuration.gif" diff --git a/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths/.classpath b/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths/.classpath index 3edcb53ea07..9c3dccd599c 100644 --- a/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths/.classpath +++ b/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths/.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/toolsmiths/org.eclipse.papyrus.toolsmiths/.settings/org.eclipse.jdt.core.prefs b/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths/.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/toolsmiths/org.eclipse.papyrus.toolsmiths/META-INF/MANIFEST.MF b/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths/META-INF/MANIFEST.MF index bf770bee2ee..f2035ea53c1 100644 --- a/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths/META-INF/MANIFEST.MF +++ b/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths/META-INF/MANIFEST.MF @@ -14,7 +14,7 @@ Require-Bundle: org.eclipse.draw2d;bundle-version="[3.10.0,4.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)", - com.google.guava;bundle-version="[30.1.0,31.0.0)" + com.google.guava;bundle-version="[32.1.3,33.0.0)" Export-Package: org.eclipse.papyrus.toolsmiths.factory, org.eclipse.papyrus.toolsmiths.generator, org.eclipse.papyrus.toolsmiths.model.customizationplugin, @@ -25,12 +25,12 @@ Export-Package: org.eclipse.papyrus.toolsmiths.factory, Bundle-Vendor: %providerName Bundle-ActivationPolicy: lazy Bundle-ClassPath: . -Bundle-Version: 2.0.0.qualifier +Bundle-Version: 2.1.0.qualifier Bundle-Localization: plugin Bundle-Name: %pluginName Bundle-Activator: org.eclipse.papyrus.toolsmiths.Activator Bundle-ManifestVersion: 2 Bundle-Description: %pluginDescription Bundle-SymbolicName: org.eclipse.papyrus.toolsmiths;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.toolsmiths diff --git a/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths/plugin.xml b/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths/plugin.xml index 6e4ac61cfb7..d001d95a2e0 100644 --- a/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths/plugin.xml +++ b/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths/plugin.xml @@ -71,6 +71,45 @@ factory="org.eclipse.papyrus.toolsmiths.factory.PropertyViewEnvironmentExtensionFactory"> </factory> </extension> + <extension + point="org.eclipse.ui.menus"> + <menuContribution + allPopups="false" + locationURI="popup:org.eclipse.ui.popup.any"> + <separator + name="org.eclipse.papyrus.custo.ui.menu.separator.before" + visible="true" + id="org.eclipse.papyrus.custo.ui.menu.separator.before"> + </separator> + + <menu + id="org.eclipse.papyrus.custo.menu" + label="Papyrus Customizer" + icon="icons/papyrus.png" + tooltip="Papyrus Customization Menu"> + <menu + id="org.eclipse.papyrus.custo.editors" + label="Editors" + tooltip="Papyrus editors customization menu"> + </menu> + <menu + id="org.eclipse.papyrus.custo.framework" + label="Framework" + tooltip="Papyrus framework customization menu"> + </menu> + <menu + id="org.eclipse.papyrus.custo.modelexplorer" + label="Model Explorer" + tooltip="Papyrus model explorer customization menu"> + </menu> + <menu + id="org.eclipse.papyrus.custo.propertiesview" + label="Properties view" + tooltip="Papyrus properties view customization menu"> + </menu> + </menu> + </menuContribution> + </extension> </plugin> diff --git a/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths/pom.xml b/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths/pom.xml index e9ba325349d..5a44668f17e 100644 --- a/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths/pom.xml +++ b/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths/pom.xml @@ -9,6 +9,6 @@ <version>0.0.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.papyrus.toolsmiths</artifactId> - <version>2.0.0-SNAPSHOT</version> + <version>2.1.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project>
\ No newline at end of file diff --git a/plugins/toolsmiths/org.eclipse.papyrus.uml.m2m.qvto.tests.tools/.classpath b/plugins/toolsmiths/org.eclipse.papyrus.uml.m2m.qvto.tests.tools/.classpath index e801ebfb468..81fe078c20c 100644 --- a/plugins/toolsmiths/org.eclipse.papyrus.uml.m2m.qvto.tests.tools/.classpath +++ b/plugins/toolsmiths/org.eclipse.papyrus.uml.m2m.qvto.tests.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/toolsmiths/org.eclipse.papyrus.uml.m2m.qvto.tests.tools/.settings/org.eclipse.jdt.core.prefs b/plugins/toolsmiths/org.eclipse.papyrus.uml.m2m.qvto.tests.tools/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/toolsmiths/org.eclipse.papyrus.uml.m2m.qvto.tests.tools/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/toolsmiths/org.eclipse.papyrus.uml.m2m.qvto.tests.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/toolsmiths/org.eclipse.papyrus.uml.m2m.qvto.tests.tools/META-INF/MANIFEST.MF b/plugins/toolsmiths/org.eclipse.papyrus.uml.m2m.qvto.tests.tools/META-INF/MANIFEST.MF index 053b126114c..4c2d86c612b 100644 --- a/plugins/toolsmiths/org.eclipse.papyrus.uml.m2m.qvto.tests.tools/META-INF/MANIFEST.MF +++ b/plugins/toolsmiths/org.eclipse.papyrus.uml.m2m.qvto.tests.tools/META-INF/MANIFEST.MF @@ -4,8 +4,8 @@ Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.papyrus.uml.m2m.qvto.tests.tools;singleton:=true Bundle-Version: 2.1.0.qualifier Bundle-Vendor: %Bundle-Vendor -Bundle-RequiredExecutionEnvironment: JavaSE-11 -Require-Bundle: com.google.guava;bundle-version="[30.0.0,31.0.0)", +Bundle-RequiredExecutionEnvironment: JavaSE-17 +Require-Bundle: com.google.guava;bundle-version="[32.1.3,33.0.0)", org.eclipse.emf.compare;bundle-version="[3.5.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/toolsmiths/profilemigration/org.eclipse.papyrus.toolsmiths.profilemigration.ui/.classpath b/plugins/toolsmiths/profilemigration/org.eclipse.papyrus.toolsmiths.profilemigration.ui/.classpath index e801ebfb468..81fe078c20c 100644 --- a/plugins/toolsmiths/profilemigration/org.eclipse.papyrus.toolsmiths.profilemigration.ui/.classpath +++ b/plugins/toolsmiths/profilemigration/org.eclipse.papyrus.toolsmiths.profilemigration.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/toolsmiths/profilemigration/org.eclipse.papyrus.toolsmiths.profilemigration.ui/.settings/org.eclipse.jdt.core.prefs b/plugins/toolsmiths/profilemigration/org.eclipse.papyrus.toolsmiths.profilemigration.ui/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/toolsmiths/profilemigration/org.eclipse.papyrus.toolsmiths.profilemigration.ui/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/toolsmiths/profilemigration/org.eclipse.papyrus.toolsmiths.profilemigration.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/toolsmiths/profilemigration/org.eclipse.papyrus.toolsmiths.profilemigration.ui/META-INF/MANIFEST.MF b/plugins/toolsmiths/profilemigration/org.eclipse.papyrus.toolsmiths.profilemigration.ui/META-INF/MANIFEST.MF index b8e997ddaa5..8baea55c46e 100644 --- a/plugins/toolsmiths/profilemigration/org.eclipse.papyrus.toolsmiths.profilemigration.ui/META-INF/MANIFEST.MF +++ b/plugins/toolsmiths/profilemigration/org.eclipse.papyrus.toolsmiths.profilemigration.ui/META-INF/MANIFEST.MF @@ -16,7 +16,7 @@ Require-Bundle: org.eclipse.emf.databinding;bundle-version="[1.5.0,2.0.0)", org.eclipse.papyrus.uml.properties;bundle-version="[4.0.0,5.0.0)", org.eclipse.papyrus.uml.tools;bundle-version="[5.0.0,6.0.0)", org.eclipse.uml2.uml.editor;bundle-version="[5.5.0,6.0.0)" -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-Activator: org.eclipse.papyrus.toolsmiths.profilemigration.ui.Activator Bundle-ActivationPolicy: lazy Export-Package: org.eclipse.papyrus.toolsmiths.profilemigration.ui, diff --git a/plugins/toolsmiths/profilemigration/org.eclipse.papyrus.toolsmiths.profilemigration/.classpath b/plugins/toolsmiths/profilemigration/org.eclipse.papyrus.toolsmiths.profilemigration/.classpath index e801ebfb468..81fe078c20c 100644 --- a/plugins/toolsmiths/profilemigration/org.eclipse.papyrus.toolsmiths.profilemigration/.classpath +++ b/plugins/toolsmiths/profilemigration/org.eclipse.papyrus.toolsmiths.profilemigration/.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/toolsmiths/profilemigration/org.eclipse.papyrus.toolsmiths.profilemigration/.settings/org.eclipse.jdt.core.prefs b/plugins/toolsmiths/profilemigration/org.eclipse.papyrus.toolsmiths.profilemigration/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/toolsmiths/profilemigration/org.eclipse.papyrus.toolsmiths.profilemigration/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/toolsmiths/profilemigration/org.eclipse.papyrus.toolsmiths.profilemigration/.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/toolsmiths/profilemigration/org.eclipse.papyrus.toolsmiths.profilemigration/META-INF/MANIFEST.MF b/plugins/toolsmiths/profilemigration/org.eclipse.papyrus.toolsmiths.profilemigration/META-INF/MANIFEST.MF index 778b94ef674..e2f4b8922dc 100644 --- a/plugins/toolsmiths/profilemigration/org.eclipse.papyrus.toolsmiths.profilemigration/META-INF/MANIFEST.MF +++ b/plugins/toolsmiths/profilemigration/org.eclipse.papyrus.toolsmiths.profilemigration/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.papyrus.toolsmiths.profilemigration;singleton:=true Bundle-Version: 1.1.0.qualifier Bundle-ClassPath: . -Require-Bundle: com.google.guava;bundle-version="[30.0.0,31.0.0)", +Require-Bundle: com.google.guava;bundle-version="[32.1.3,33.0.0)", org.eclipse.emf.compare;bundle-version="[3.5.0,4.0.0)", org.eclipse.emf.databinding;bundle-version="[1.5.0,2.0.0)", org.eclipse.gmf.runtime.diagram.ui.properties;bundle-version="[1.8.0,2.0.0)", @@ -13,7 +13,7 @@ Require-Bundle: com.google.guava;bundle-version="[30.0.0,31.0.0)", org.eclipse.papyrus.toolsmiths.profilemigration.ui;bundle-version="[1.0.0,2.0.0)", org.eclipse.papyrus.uml.tools;bundle-version="[5.0.0,6.0.0)", org.eclipse.uml2.uml.editor;bundle-version="[5.5.0,6.0.0)" -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.eclipse.papyrus.toolsmiths.profilemigration, org.eclipse.papyrus.toolsmiths.profilemigration.factory, org.eclipse.papyrus.toolsmiths.profilemigration.internal;x-internal:=true, diff --git a/plugins/toolsmiths/validation/org.eclipse.papyrus.toolsmiths.validation.architecture/.classpath b/plugins/toolsmiths/validation/org.eclipse.papyrus.toolsmiths.validation.architecture/.classpath index 7b137d9ab4b..f192ed9b8a7 100644 --- a/plugins/toolsmiths/validation/org.eclipse.papyrus.toolsmiths.validation.architecture/.classpath +++ b/plugins/toolsmiths/validation/org.eclipse.papyrus.toolsmiths.validation.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/toolsmiths/validation/org.eclipse.papyrus.toolsmiths.validation.architecture/.settings/org.eclipse.jdt.core.prefs b/plugins/toolsmiths/validation/org.eclipse.papyrus.toolsmiths.validation.architecture/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/toolsmiths/validation/org.eclipse.papyrus.toolsmiths.validation.architecture/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/toolsmiths/validation/org.eclipse.papyrus.toolsmiths.validation.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/toolsmiths/validation/org.eclipse.papyrus.toolsmiths.validation.architecture/META-INF/MANIFEST.MF b/plugins/toolsmiths/validation/org.eclipse.papyrus.toolsmiths.validation.architecture/META-INF/MANIFEST.MF index 5f9dfbbcad1..4e94bffac65 100644 --- a/plugins/toolsmiths/validation/org.eclipse.papyrus.toolsmiths.validation.architecture/META-INF/MANIFEST.MF +++ b/plugins/toolsmiths/validation/org.eclipse.papyrus.toolsmiths.validation.architecture/META-INF/MANIFEST.MF @@ -35,8 +35,8 @@ Bundle-Activator: org.eclipse.papyrus.toolsmiths.validation.architecture.Activat Bundle-ManifestVersion: 2 Bundle-Description: %pluginDescription Bundle-SymbolicName: org.eclipse.papyrus.toolsmiths.validation.architecture;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.toolsmiths.validation.architecture -Import-Package: com.google.common.collect;version="[30.1.0,31.0.0)", +Import-Package: com.google.common.collect;version="[32.0.0,33.0.0)", org.osgi.service.component.annotations;version="[1.3.0,2.0.0)";resolution:=optional Service-Component: OSGI-INF/org.eclipse.papyrus.toolsmiths.validation.architecture.internal.checkers.ArchitectureBuilderProvider.xml diff --git a/plugins/toolsmiths/validation/org.eclipse.papyrus.toolsmiths.validation.common/.classpath b/plugins/toolsmiths/validation/org.eclipse.papyrus.toolsmiths.validation.common/.classpath index 7b137d9ab4b..f192ed9b8a7 100644 --- a/plugins/toolsmiths/validation/org.eclipse.papyrus.toolsmiths.validation.common/.classpath +++ b/plugins/toolsmiths/validation/org.eclipse.papyrus.toolsmiths.validation.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/toolsmiths/validation/org.eclipse.papyrus.toolsmiths.validation.common/.settings/org.eclipse.jdt.core.prefs b/plugins/toolsmiths/validation/org.eclipse.papyrus.toolsmiths.validation.common/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/toolsmiths/validation/org.eclipse.papyrus.toolsmiths.validation.common/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/toolsmiths/validation/org.eclipse.papyrus.toolsmiths.validation.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/toolsmiths/validation/org.eclipse.papyrus.toolsmiths.validation.common/META-INF/MANIFEST.MF b/plugins/toolsmiths/validation/org.eclipse.papyrus.toolsmiths.validation.common/META-INF/MANIFEST.MF index 3516c52f8e4..6c5aaaced25 100644 --- a/plugins/toolsmiths/validation/org.eclipse.papyrus.toolsmiths.validation.common/META-INF/MANIFEST.MF +++ b/plugins/toolsmiths/validation/org.eclipse.papyrus.toolsmiths.validation.common/META-INF/MANIFEST.MF @@ -44,7 +44,7 @@ Bundle-Activator: org.eclipse.papyrus.toolsmiths.validation.common.Activator Bundle-ManifestVersion: 2 Bundle-Description: %pluginDescription Bundle-SymbolicName: org.eclipse.papyrus.toolsmiths.validation.common;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.toolsmiths.validation.common -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="[32.0.0,33.0.0)", + com.google.common.collect;version="[32.0.0,33.0.0)" diff --git a/plugins/toolsmiths/validation/org.eclipse.papyrus.toolsmiths.validation.common/src/org/eclipse/papyrus/toolsmiths/validation/common/internal/utils/PluginErrorReporter.java b/plugins/toolsmiths/validation/org.eclipse.papyrus.toolsmiths.validation.common/src/org/eclipse/papyrus/toolsmiths/validation/common/internal/utils/PluginErrorReporter.java index 50dfdef15c9..85649c85228 100644 --- a/plugins/toolsmiths/validation/org.eclipse.papyrus.toolsmiths.validation.common/src/org/eclipse/papyrus/toolsmiths/validation/common/internal/utils/PluginErrorReporter.java +++ b/plugins/toolsmiths/validation/org.eclipse.papyrus.toolsmiths.validation.common/src/org/eclipse/papyrus/toolsmiths/validation/common/internal/utils/PluginErrorReporter.java @@ -1,5 +1,5 @@ /***************************************************************************** - * Copyright (c) 2020, 2021 CEA LIST, EclipseSource, Christian W. Damus, and others. + * Copyright (c) 2020, 2021, 2023 CEA LIST, EclipseSource, 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,12 @@ * Contributors: * Remi Schnekenburger (EclipseSource) - Initial API and implementation * Christian W. Damus - bugs 569357, 570097, 551740 + * Pauline DEVILLE (CEA LIST) pauline.deville@cea.fr - Bug 581848 * *****************************************************************************/ package org.eclipse.papyrus.toolsmiths.validation.common.internal.utils; import java.lang.reflect.Field; -import java.lang.reflect.Modifier; import java.util.HashMap; import java.util.HashSet; import java.util.Map; @@ -192,9 +192,6 @@ public class PluginErrorReporter<T extends EObject> extends ManifestErrorReporte try { errorReporterField = XMLErrorReporter.class.getDeclaredField("fErrorReporter"); //$NON-NLS-1$ errorReporterField.setAccessible(true); - Field modifiersField = Field.class.getDeclaredField("modifiers");//$NON-NLS-1$ - modifiersField.setAccessible(true); - modifiersField.setInt(modifiersField, modifiersField.getModifiers() & ~Modifier.FINAL); errorReporterField.set(this, new DiagnosticErrorReporter(file, markerType, diagnostics)); } catch (NoSuchFieldException | SecurityException | IllegalArgumentException | IllegalAccessException e) { Activator.log.error(e); @@ -483,7 +480,7 @@ public class PluginErrorReporter<T extends EObject> extends ManifestErrorReporte protected boolean findArchitectureContextReference() { // We do not need extensions on the set registration point if some architecture context includes the set return ArchitectureIndex.getInstance().isReferenced(getModel()); - } + } // // Nested types diff --git a/plugins/toolsmiths/validation/org.eclipse.papyrus.toolsmiths.validation.elementtypes/.classpath b/plugins/toolsmiths/validation/org.eclipse.papyrus.toolsmiths.validation.elementtypes/.classpath index 7b137d9ab4b..f192ed9b8a7 100644 --- a/plugins/toolsmiths/validation/org.eclipse.papyrus.toolsmiths.validation.elementtypes/.classpath +++ b/plugins/toolsmiths/validation/org.eclipse.papyrus.toolsmiths.validation.elementtypes/.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/toolsmiths/validation/org.eclipse.papyrus.toolsmiths.validation.elementtypes/.settings/org.eclipse.jdt.core.prefs b/plugins/toolsmiths/validation/org.eclipse.papyrus.toolsmiths.validation.elementtypes/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/toolsmiths/validation/org.eclipse.papyrus.toolsmiths.validation.elementtypes/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/toolsmiths/validation/org.eclipse.papyrus.toolsmiths.validation.elementtypes/.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/toolsmiths/validation/org.eclipse.papyrus.toolsmiths.validation.elementtypes/META-INF/MANIFEST.MF b/plugins/toolsmiths/validation/org.eclipse.papyrus.toolsmiths.validation.elementtypes/META-INF/MANIFEST.MF index 9388888908d..f681499ffdf 100644 --- a/plugins/toolsmiths/validation/org.eclipse.papyrus.toolsmiths.validation.elementtypes/META-INF/MANIFEST.MF +++ b/plugins/toolsmiths/validation/org.eclipse.papyrus.toolsmiths.validation.elementtypes/META-INF/MANIFEST.MF @@ -35,8 +35,8 @@ Bundle-Activator: org.eclipse.papyrus.toolsmiths.validation.elementtypes.Activat Bundle-ManifestVersion: 2 Bundle-Description: %pluginDescription Bundle-SymbolicName: org.eclipse.papyrus.toolsmiths.validation.elementtypes;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.toolsmiths.validation.elementtypes -Import-Package: com.google.common.collect;version="[30.1.0,31.0.0)", +Import-Package: com.google.common.collect;version="[32.0.0,33.0.0)", org.osgi.service.component.annotations;version="[1.3.0,2.0.0)";resolution:=optional Service-Component: OSGI-INF/org.eclipse.papyrus.toolsmiths.validation.elementtypes.internal.checkers.ElementTypesBuilderProvider.xml diff --git a/plugins/toolsmiths/validation/org.eclipse.papyrus.toolsmiths.validation.newchild/.classpath b/plugins/toolsmiths/validation/org.eclipse.papyrus.toolsmiths.validation.newchild/.classpath index 7b137d9ab4b..f192ed9b8a7 100644 --- a/plugins/toolsmiths/validation/org.eclipse.papyrus.toolsmiths.validation.newchild/.classpath +++ b/plugins/toolsmiths/validation/org.eclipse.papyrus.toolsmiths.validation.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"/> <classpathentry kind="output" path="bin/"/> diff --git a/plugins/toolsmiths/validation/org.eclipse.papyrus.toolsmiths.validation.newchild/.settings/org.eclipse.jdt.core.prefs b/plugins/toolsmiths/validation/org.eclipse.papyrus.toolsmiths.validation.newchild/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100644 --- a/plugins/toolsmiths/validation/org.eclipse.papyrus.toolsmiths.validation.newchild/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/toolsmiths/validation/org.eclipse.papyrus.toolsmiths.validation.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/toolsmiths/validation/org.eclipse.papyrus.toolsmiths.validation.newchild/META-INF/MANIFEST.MF b/plugins/toolsmiths/validation/org.eclipse.papyrus.toolsmiths.validation.newchild/META-INF/MANIFEST.MF index 4563e8118d3..167e3a6078f 100644 --- a/plugins/toolsmiths/validation/org.eclipse.papyrus.toolsmiths.validation.newchild/META-INF/MANIFEST.MF +++ b/plugins/toolsmiths/validation/org.eclipse.papyrus.toolsmiths.validation.newchild/META-INF/MANIFEST.MF @@ -28,8 +28,8 @@ Bundle-Activator: org.eclipse.papyrus.toolsmiths.validation.newchild.Activator Bundle-ManifestVersion: 2 Bundle-Description: %pluginDescription Bundle-SymbolicName: org.eclipse.papyrus.toolsmiths.validation.newchild;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.toolsmiths.validation.newchild Service-Component: OSGI-INF/org.eclipse.papyrus.toolsmiths.validation.newchild.internal.checkers.NewChildMenuBuilderProvider.xml -Import-Package: com.google.common.collect;version="[30.1.0,31.0.0)", +Import-Package: com.google.common.collect;version="[32.0.0,33.0.0)", org.osgi.service.component.annotations;version="[1.3.0,2.0.0)";resolution:=optional diff --git a/plugins/toolsmiths/validation/org.eclipse.papyrus.toolsmiths.validation.profile/.classpath b/plugins/toolsmiths/validation/org.eclipse.papyrus.toolsmiths.validation.profile/.classpath index 7b137d9ab4b..f192ed9b8a7 100644 --- a/plugins/toolsmiths/validation/org.eclipse.papyrus.toolsmiths.validation.profile/.classpath +++ b/plugins/toolsmiths/validation/org.eclipse.papyrus.toolsmiths.validation.profile/.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/toolsmiths/validation/org.eclipse.papyrus.toolsmiths.validation.profile/.settings/org.eclipse.jdt.core.prefs b/plugins/toolsmiths/validation/org.eclipse.papyrus.toolsmiths.validation.profile/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/toolsmiths/validation/org.eclipse.papyrus.toolsmiths.validation.profile/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/toolsmiths/validation/org.eclipse.papyrus.toolsmiths.validation.profile/.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/toolsmiths/validation/org.eclipse.papyrus.toolsmiths.validation.profile/META-INF/MANIFEST.MF b/plugins/toolsmiths/validation/org.eclipse.papyrus.toolsmiths.validation.profile/META-INF/MANIFEST.MF index 2fc2ea3c244..eb3417f30f8 100644 --- a/plugins/toolsmiths/validation/org.eclipse.papyrus.toolsmiths.validation.profile/META-INF/MANIFEST.MF +++ b/plugins/toolsmiths/validation/org.eclipse.papyrus.toolsmiths.validation.profile/META-INF/MANIFEST.MF @@ -31,8 +31,8 @@ Bundle-Activator: org.eclipse.papyrus.toolsmiths.validation.profile.Activator Bundle-ManifestVersion: 2 Bundle-Description: %pluginDescription Bundle-SymbolicName: org.eclipse.papyrus.toolsmiths.validation.profile;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.toolsmiths.validation.profile -Import-Package: com.google.common.collect;version="[30.1.0,31.0.0)", +Import-Package: com.google.common.collect;version="[32.0.0,33.0.0)", org.osgi.service.component.annotations;version="[1.3.0,2.0.0)";resolution:=optional Service-Component: OSGI-INF/org.eclipse.papyrus.toolsmiths.validation.profile.internal.checkers.ProfileBuilderProvider.xml diff --git a/plugins/toolsmiths/validation/org.eclipse.papyrus.toolsmiths.validation.properties/.classpath b/plugins/toolsmiths/validation/org.eclipse.papyrus.toolsmiths.validation.properties/.classpath index 7b137d9ab4b..f192ed9b8a7 100644 --- a/plugins/toolsmiths/validation/org.eclipse.papyrus.toolsmiths.validation.properties/.classpath +++ b/plugins/toolsmiths/validation/org.eclipse.papyrus.toolsmiths.validation.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/toolsmiths/validation/org.eclipse.papyrus.toolsmiths.validation.properties/.settings/org.eclipse.jdt.core.prefs b/plugins/toolsmiths/validation/org.eclipse.papyrus.toolsmiths.validation.properties/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100644 --- a/plugins/toolsmiths/validation/org.eclipse.papyrus.toolsmiths.validation.properties/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/toolsmiths/validation/org.eclipse.papyrus.toolsmiths.validation.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/toolsmiths/validation/org.eclipse.papyrus.toolsmiths.validation.properties/META-INF/MANIFEST.MF b/plugins/toolsmiths/validation/org.eclipse.papyrus.toolsmiths.validation.properties/META-INF/MANIFEST.MF index 2f0e455a616..348df260ca9 100644 --- a/plugins/toolsmiths/validation/org.eclipse.papyrus.toolsmiths.validation.properties/META-INF/MANIFEST.MF +++ b/plugins/toolsmiths/validation/org.eclipse.papyrus.toolsmiths.validation.properties/META-INF/MANIFEST.MF @@ -44,10 +44,10 @@ Bundle-Activator: org.eclipse.papyrus.toolsmiths.validation.properties.internal. Bundle-ManifestVersion: 2 Bundle-Description: %pluginDescription Bundle-SymbolicName: org.eclipse.papyrus.toolsmiths.validation.properties;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.toolsmiths.validation.properties -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="[32.0.0,33.0.0)", + com.google.common.collect;version="[32.0.0,33.0.0)", org.osgi.service.component.annotations;version="[1.3.0,2.0.0)";resolution:=optional Service-Component: OSGI-INF/org.eclipse.papyrus.toolsmiths.validation.properties.internal.checkers.PropertiesContextBuilderProvider.xml, OSGI-INF/org.eclipse.papyrus.toolsmiths.validation.properties.internal.checkers.PropertiesEnvironmentBuilderProvider.xml, diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf.common.ui/.classpath b/plugins/uml/alf/org.eclipse.papyrus.uml.alf.common.ui/.classpath index 0fa64c8e5fc..b5e203ff5c7 100644 --- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf.common.ui/.classpath +++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf.common.ui/.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/uml/alf/org.eclipse.papyrus.uml.alf.common.ui/.settings/org.eclipse.jdt.core.prefs b/plugins/uml/alf/org.eclipse.papyrus.uml.alf.common.ui/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf.common.ui/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf.common.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/uml/alf/org.eclipse.papyrus.uml.alf.common.ui/META-INF/MANIFEST.MF b/plugins/uml/alf/org.eclipse.papyrus.uml.alf.common.ui/META-INF/MANIFEST.MF index f318f189ac5..7fd36173688 100644 --- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf.common.ui/META-INF/MANIFEST.MF +++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf.common.ui/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Export-Package: org.eclipse.papyrus.uml.alf.ui.contentassist Bundle-ActivationPolicy: lazy Bundle-Localization: plugin Bundle-Name: %pluginName -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Require-Bundle: org.eclipse.papyrus.uml.alf.common;bundle-version="[3.0.0,4.0.0)", org.eclipse.uml2.uml;bundle-version="[5.5.0,6.0.0)", org.eclipse.xtext.ui;bundle-version="[2.22.0,3.0.0)", diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf.common/.classpath b/plugins/uml/alf/org.eclipse.papyrus.uml.alf.common/.classpath index ad5e13cce77..946fb3d346f 100644 --- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf.common/.classpath +++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf.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="src" path="src-gen"/> diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf.common/.settings/org.eclipse.jdt.core.prefs b/plugins/uml/alf/org.eclipse.papyrus.uml.alf.common/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf.common/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf.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/uml/alf/org.eclipse.papyrus.uml.alf.common/META-INF/MANIFEST.MF b/plugins/uml/alf/org.eclipse.papyrus.uml.alf.common/META-INF/MANIFEST.MF index 014b5d38b6b..34eea19beaa 100644 --- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf.common/META-INF/MANIFEST.MF +++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf.common/META-INF/MANIFEST.MF @@ -6,14 +6,14 @@ Export-Package: org.eclipse.papyrus.uml.alf, org.eclipse.papyrus.uml.alf.validation Require-Bundle: org.eclipse.emf.mwe2.launch;bundle-version="[2.11.0,3.0.0)", org.eclipse.uml2.uml;bundle-version="[5.5.0,6.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)" 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-ManifestVersion: 2 Import-Package: org.apache.log4j;version="[1.2.0,2.0.0)" Bundle-SymbolicName: org.eclipse.papyrus.uml.alf.common;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.uml.alf.common diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf.common/pom.xml b/plugins/uml/alf/org.eclipse.papyrus.uml.alf.common/pom.xml index 9ed7073ad71..6e525dca05e 100644 --- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf.common/pom.xml +++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf.common/pom.xml @@ -9,6 +9,6 @@ <version>0.0.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.papyrus.uml.alf.common</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/uml/alf/org.eclipse.papyrus.uml.alf.libraries/.classpath b/plugins/uml/alf/org.eclipse.papyrus.uml.alf.libraries/.classpath index e801ebfb468..81fe078c20c 100644 --- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf.libraries/.classpath +++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf.libraries/.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/uml/alf/org.eclipse.papyrus.uml.alf.libraries/.settings/org.eclipse.jdt.core.prefs b/plugins/uml/alf/org.eclipse.papyrus.uml.alf.libraries/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf.libraries/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf.libraries/.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/uml/alf/org.eclipse.papyrus.uml.alf.libraries/META-INF/MANIFEST.MF b/plugins/uml/alf/org.eclipse.papyrus.uml.alf.libraries/META-INF/MANIFEST.MF index 6e90ca0a6f4..758ecbb992d 100644 --- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf.libraries/META-INF/MANIFEST.MF +++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf.libraries/META-INF/MANIFEST.MF @@ -13,5 +13,5 @@ Bundle-Name: ALF Libraries Bundle-ManifestVersion: 2 Bundle-Activator: org.eclipse.papyrus.uml.alf.libraries.AlfLibrariesActivator Bundle-SymbolicName: org.eclipse.papyrus.uml.alf.libraries;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.uml.alf.libraries diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf.to.fuml/.classpath b/plugins/uml/alf/org.eclipse.papyrus.uml.alf.to.fuml/.classpath index e801ebfb468..81fe078c20c 100644 --- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf.to.fuml/.classpath +++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf.to.fuml/.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/uml/alf/org.eclipse.papyrus.uml.alf.to.fuml/.settings/org.eclipse.jdt.core.prefs b/plugins/uml/alf/org.eclipse.papyrus.uml.alf.to.fuml/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf.to.fuml/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf.to.fuml/.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/uml/alf/org.eclipse.papyrus.uml.alf.to.fuml/META-INF/MANIFEST.MF b/plugins/uml/alf/org.eclipse.papyrus.uml.alf.to.fuml/META-INF/MANIFEST.MF index 65efaf55215..a9a25cf6076 100644 --- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf.to.fuml/META-INF/MANIFEST.MF +++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf.to.fuml/META-INF/MANIFEST.MF @@ -10,5 +10,5 @@ Bundle-Name: Alf to fUML transformation Bundle-ManifestVersion: 2 Bundle-Activator: org.eclipse.papyrus.uml.alf.to.fuml.AlfMappingActivator Bundle-SymbolicName: org.eclipse.papyrus.uml.alf.to.fuml;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.uml.alf.to.fuml diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf.ui/.classpath b/plugins/uml/alf/org.eclipse.papyrus.uml.alf.ui/.classpath index 1692b979957..1322f6dec67 100644 --- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf.ui/.classpath +++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf.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"> <accessrules> <accessrule kind="accessible" pattern="org/apache/log4j/*"/> diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf.ui/.settings/org.eclipse.jdt.core.prefs b/plugins/uml/alf/org.eclipse.papyrus.uml.alf.ui/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf.ui/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf.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/uml/alf/org.eclipse.papyrus.uml.alf.ui/META-INF/MANIFEST.MF b/plugins/uml/alf/org.eclipse.papyrus.uml.alf.ui/META-INF/MANIFEST.MF index 225eb908ee3..26a7f06f2a0 100644 --- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf.ui/META-INF/MANIFEST.MF +++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf.ui/META-INF/MANIFEST.MF @@ -29,5 +29,5 @@ Bundle-Activator: org.eclipse.papyrus.uml.alf.ui.internal.AlfActivator Bundle-SymbolicName: org.eclipse.papyrus.uml.alf.ui;singleton:=true Import-Package: org.apache.log4j;version="[1.2.0,2.0.0)", org.eclipse.xtext.xbase.lib;version="[2.10.0,3.0.0)" -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.uml.alf.ui diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/.classpath b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/.classpath index a54efa33cfa..3c38b4e531d 100644 --- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/.classpath +++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/.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/uml/alf/org.eclipse.papyrus.uml.alf/.settings/org.eclipse.jdt.core.prefs b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/.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/uml/alf/org.eclipse.papyrus.uml.alf/META-INF/MANIFEST.MF b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/META-INF/MANIFEST.MF index 7e0ea54e36e..576dd80e8ec 100644 --- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/META-INF/MANIFEST.MF +++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/META-INF/MANIFEST.MF @@ -14,7 +14,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.codegen.ecore.ui;bundle-version="[2.22.0,3.0.0)", org.eclipse.emf.mwe2.launch;bundle-version="[2.11.0,3.0.0)", org.eclipse.gmf.runtime.diagram.ui;bundle-version="[1.9.0,2.0.0)", @@ -23,10 +23,10 @@ Require-Bundle: org.eclipse.emf.codegen.ecore.ui;bundle-version="[2.22.0,3.0.0)" org.eclipse.papyrus.uml.extensionpoints;bundle-version="[2.0.0,3.0.0)", org.eclipse.papyrus.uml.tools.utils;bundle-version="[4.0.0,5.0.0)", org.eclipse.uml2.uml.resources;bundle-version="[5.5.0,6.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)" Bundle-Vendor: %providerName -Bundle-Version: 4.0.0.qualifier +Bundle-Version: 4.0.100.qualifier Bundle-Activator: org.eclipse.papyrus.uml.alf.AlfActivator Bundle-ManifestVersion: 2 Import-Package: org.apache.log4j;version="[1.2.0,2.0.0)", diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/pom.xml b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/pom.xml index 00ade792c83..ee294236330 100644 --- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/pom.xml +++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/pom.xml @@ -9,7 +9,7 @@ <version>0.0.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.papyrus.uml.alf</artifactId> - <version>4.0.0-SNAPSHOT</version> + <version>4.0.100-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> <build> <plugins> diff --git a/plugins/uml/architecture/org.eclipse.papyrus.uml.architecture/.classpath b/plugins/uml/architecture/org.eclipse.papyrus.uml.architecture/.classpath index e801ebfb468..81fe078c20c 100644 --- a/plugins/uml/architecture/org.eclipse.papyrus.uml.architecture/.classpath +++ b/plugins/uml/architecture/org.eclipse.papyrus.uml.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/uml/architecture/org.eclipse.papyrus.uml.architecture/.settings/org.eclipse.jdt.core.prefs b/plugins/uml/architecture/org.eclipse.papyrus.uml.architecture/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/uml/architecture/org.eclipse.papyrus.uml.architecture/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/uml/architecture/org.eclipse.papyrus.uml.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/uml/architecture/org.eclipse.papyrus.uml.architecture/META-INF/MANIFEST.MF b/plugins/uml/architecture/org.eclipse.papyrus.uml.architecture/META-INF/MANIFEST.MF index 5765897ad58..c57c67ac3ba 100755 --- a/plugins/uml/architecture/org.eclipse.papyrus.uml.architecture/META-INF/MANIFEST.MF +++ b/plugins/uml/architecture/org.eclipse.papyrus.uml.architecture/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.papyrus.uml.architecture;singleton:=true Bundle-Version: 2.0.0.qualifier Bundle-Localization: plugin -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Require-Bundle: org.eclipse.emf.databinding;bundle-version="[1.5.0,2.0.0)", org.eclipse.emf.validation.ocl;bundle-version="[1.4.0,2.0.0)", org.eclipse.gmf.runtime.diagram.ui.properties;bundle-version="[1.8.0,2.0.0)", diff --git a/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.controlmode/.classpath b/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.controlmode/.classpath index e801ebfb468..81fe078c20c 100644 --- a/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.controlmode/.classpath +++ b/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.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/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.controlmode/.settings/org.eclipse.jdt.core.prefs b/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.controlmode/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.controlmode/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.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/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.controlmode/META-INF/MANIFEST.MF b/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.controlmode/META-INF/MANIFEST.MF index 00c147467e3..8d58224252f 100644 --- a/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.controlmode/META-INF/MANIFEST.MF +++ b/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.controlmode/META-INF/MANIFEST.MF @@ -26,7 +26,7 @@ Bundle-Activator: org.eclipse.papyrus.uml.decoratormodel.internal.controlmode.Ac Bundle-ManifestVersion: 2 Bundle-Description: %pluginDescription Bundle-SymbolicName: org.eclipse.papyrus.uml.decoratormodel.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="[32.0.0, 33.0.0)", + com.google.common.collect;version="[32.0.0, 33.0.0)" Automatic-Module-Name: org.eclipse.papyrus.uml.decoratormodel.controlmode diff --git a/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.properties/.classpath b/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.properties/.classpath index e801ebfb468..81fe078c20c 100644 --- a/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.properties/.classpath +++ b/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.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/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.properties/.settings/org.eclipse.jdt.core.prefs b/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.properties/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.properties/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.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/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.properties/META-INF/MANIFEST.MF b/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.properties/META-INF/MANIFEST.MF index fc46df08c83..935d9579971 100644 --- a/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.properties/META-INF/MANIFEST.MF +++ b/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.properties/META-INF/MANIFEST.MF @@ -28,8 +28,8 @@ Bundle-ManifestVersion: 2 Bundle-Activator: org.eclipse.papyrus.uml.decoratormodel.properties.Activator Bundle-Description: %pluginDescription Bundle-SymbolicName: org.eclipse.papyrus.uml.decoratormodel.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)", - com.google.common.util.concurrent;version="[30.1.0, 31.0.0)" +Bundle-RequiredExecutionEnvironment: JavaSE-17 +Import-Package: com.google.common.base;version="[32.0.0, 33.0.0)", + com.google.common.collect;version="[32.0.0, 33.0.0)", + com.google.common.util.concurrent;version="[32.0.0, 33.0.0)" Automatic-Module-Name: org.eclipse.papyrus.uml.decoratormodel.properties diff --git a/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.ui/.classpath b/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.ui/.classpath index e801ebfb468..81fe078c20c 100644 --- a/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.ui/.classpath +++ b/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.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/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.ui/.settings/org.eclipse.jdt.core.prefs b/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.ui/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.ui/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.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/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.ui/META-INF/MANIFEST.MF b/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.ui/META-INF/MANIFEST.MF index c3eca716ccd..48b2893a90a 100644 --- a/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.ui/META-INF/MANIFEST.MF +++ b/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.ui/META-INF/MANIFEST.MF @@ -35,9 +35,9 @@ Bundle-Activator: org.eclipse.papyrus.uml.decoratormodel.internal.ui.Activator Bundle-ManifestVersion: 2 Bundle-Description: %pluginDescription Bundle-SymbolicName: org.eclipse.papyrus.uml.decoratormodel.ui;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.eventbus;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="[32.0.0, 33.0.0)", + com.google.common.collect;version="[32.0.0, 33.0.0)", + com.google.common.eventbus;version="[32.0.0, 33.0.0)", + com.google.common.util.concurrent;version="[32.0.0, 33.0.0)" Automatic-Module-Name: org.eclipse.papyrus.uml.decoratormodel.ui diff --git a/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel/.classpath b/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel/.classpath index ad5e13cce77..946fb3d346f 100644 --- a/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel/.classpath +++ b/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel/.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/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel/.settings/org.eclipse.jdt.core.prefs b/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel/.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/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel/META-INF/MANIFEST.MF b/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel/META-INF/MANIFEST.MF index 05b6289c9c3..aa077277741 100755 --- a/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel/META-INF/MANIFEST.MF +++ b/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel/META-INF/MANIFEST.MF @@ -36,8 +36,8 @@ Bundle-Activator: org.eclipse.papyrus.uml.decoratormodel.Activator Bundle-ManifestVersion: 2 Bundle-Description: %pluginDescription Bundle-SymbolicName: org.eclipse.papyrus.uml.decoratormodel;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="[32.0.0, 33.0.0)", + com.google.common.collect;version="[32.0.0, 33.0.0)", + com.google.common.util.concurrent;version="[32.0.0, 33.0.0)" Automatic-Module-Name: org.eclipse.papyrus.uml.decoratormodel diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/.classpath b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/.classpath index ca630b31841..4c89b72842b 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/.classpath +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/.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="custom-src"/> <classpathentry kind="output" path="bin"/> diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/.settings/org.eclipse.jdt.core.prefs b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/.settings/org.eclipse.jdt.core.prefs index f09f5504dea..fcf1425718d 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/.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/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/META-INF/MANIFEST.MF index 0cab1bd05ca..3cd3dc7d1b5 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/META-INF/MANIFEST.MF +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/META-INF/MANIFEST.MF @@ -33,8 +33,8 @@ Bundle-ActivationPolicy: lazy Bundle-ClassPath: . Bundle-Name: %pluginName Bundle-Localization: plugin -Bundle-RequiredExecutionEnvironment: JavaSE-11 -Require-Bundle: com.google.guava;bundle-version="[30.1.0,31.0.0)", +Bundle-RequiredExecutionEnvironment: JavaSE-17 +Require-Bundle: com.google.guava;bundle-version="[32.1.3,33.0.0)", org.eclipse.core.expressions;bundle-version="[3.6.0,4.0.0)", org.eclipse.e4.ui.css.core;bundle-version="[0.12.0,1.0.0)", org.eclipse.emf.databinding;bundle-version="[1.5.0,2.0.0)", @@ -86,10 +86,10 @@ Require-Bundle: com.google.guava;bundle-version="[30.1.0,31.0.0)", org.eclipse.uml2.uml.editor;bundle-version="[5.5.0,6.0.0)" Bundle-Vendor: %providerName Eclipse-LazyStart: true -Bundle-Version: 5.0.0.qualifier +Bundle-Version: 5.0.100.qualifier Bundle-Activator: org.eclipse.papyrus.uml.diagram.activity.part.UMLDiagramEditorPlugin Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.activity; 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)" +Import-Package: com.google.common.base;version="[32.0.0, 33.0.0)", + com.google.common.collect;version="[32.0.0, 33.0.0)" Automatic-Module-Name: org.eclipse.papyrus.uml.diagram.activity diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/activitygroup/GroupRequestAdvisor.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/activitygroup/GroupRequestAdvisor.java index 9111159b1e0..6ef20588322 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/activitygroup/GroupRequestAdvisor.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/activitygroup/GroupRequestAdvisor.java @@ -685,7 +685,7 @@ public class GroupRequestAdvisor implements IGroupRequestAdvisor { * Transform an IGraphicalEditPart to the related GroupNotifyingEditPolicy */ @SuppressWarnings("unchecked") - Iterable<GroupNotifyingOnMoveEditPolicy> policies = Iterables.transform(compartementEditPart.getChildren(), new Function<IGraphicalEditPart, GroupNotifyingOnMoveEditPolicy>() { + Iterable<GroupNotifyingOnMoveEditPolicy> policies = Iterables.transform((List<IGraphicalEditPart>) compartementEditPart.getChildren(), new Function<IGraphicalEditPart, GroupNotifyingOnMoveEditPolicy>() { @Override public GroupNotifyingOnMoveEditPolicy apply(IGraphicalEditPart from) { diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/activitygroup/editpolicy/notifiers/GroupNotifyingOnMoveEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/activitygroup/editpolicy/notifiers/GroupNotifyingOnMoveEditPolicy.java index f3284f457ff..f56858cac73 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/activitygroup/editpolicy/notifiers/GroupNotifyingOnMoveEditPolicy.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/activitygroup/editpolicy/notifiers/GroupNotifyingOnMoveEditPolicy.java @@ -16,6 +16,8 @@ *****************************************************************************/ package org.eclipse.papyrus.uml.diagram.activity.activitygroup.editpolicy.notifiers; +import java.util.List; + import org.eclipse.gef.EditPart; import org.eclipse.gef.EditPolicy; import org.eclipse.gef.Request; @@ -89,6 +91,7 @@ public class GroupNotifyingOnMoveEditPolicy extends GroupListenerEditPolicy { * * @param targetedEditPart */ + @SuppressWarnings("unchecked") protected void stopMovingParts(Iterable<IGraphicalEditPart> targetedEditPart) { if (targetedEditPart != null) { for (EditPart part : targetedEditPart) { @@ -103,7 +106,7 @@ public class GroupNotifyingOnMoveEditPolicy extends GroupListenerEditPolicy { } editPolicy2.stopMoving(); } - stopMovingParts(part.getChildren()); + stopMovingParts((List<IGraphicalEditPart>) part.getChildren()); } } } @@ -113,6 +116,7 @@ public class GroupNotifyingOnMoveEditPolicy extends GroupListenerEditPolicy { startMovingParts(req, targetedEditPart); } + @SuppressWarnings("unchecked") protected void startMovingParts(final ChangeBoundsRequest req, Iterable<IGraphicalEditPart> targetedEditPart) { if (targetedEditPart != null) { for (final EditPart part : targetedEditPart) { @@ -127,7 +131,7 @@ public class GroupNotifyingOnMoveEditPolicy extends GroupListenerEditPolicy { } editPolicy2.startMoving(req); } - startMovingParts(req, part.getChildren()); + startMovingParts(req, (List<IGraphicalEditPart>) part.getChildren()); } } } diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/policies/DeleteActionViewEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/policies/DeleteActionViewEditPolicy.java index 061e18d6607..fc92bc0dbc3 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/policies/DeleteActionViewEditPolicy.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/policies/DeleteActionViewEditPolicy.java @@ -1,5 +1,5 @@ /***************************************************************************** - * Copyright (c) 2010 Atos Origin. + * Copyright (c) 2010, 2023 Atos Origin. * * * All rights reserved. This program and the accompanying materials @@ -11,6 +11,7 @@ * * Contributors: * Atos Origin - Initial API and implementation + * Pauline DEVILLE (CEA LIST) <pauline.deville@cea.fr> - Bug 582075 * *****************************************************************************/ package org.eclipse.papyrus.uml.diagram.activity.edit.policies; @@ -63,8 +64,12 @@ public class DeleteActionViewEditPolicy extends ViewComponentEditPolicy { List<?> parts = Collections.singletonList(getHost()); ((GroupRequest) request).setEditParts(getHost()); // inspect the list of parts to add linked local conditions - List<EditPart> partsToAdd = getListOfLinkedLocalConditionsParts(parts); - ((GroupRequest) request).getEditParts().addAll(partsToAdd); + List<? extends EditPart> partsToAdd = getListOfLinkedLocalConditionsParts(parts); + + @SuppressWarnings("unchecked") + List<EditPart> editParts = (List<EditPart>) ((GroupRequest) request).getEditParts(); + editParts.addAll(partsToAdd); + ((GroupRequest) request).setEditParts(editParts); return getDeleteCommand((GroupRequest) request); } } diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/pom.xml b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/pom.xml index fe4fce7b6c2..ee25aff0373 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/pom.xml +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/pom.xml @@ -9,6 +9,6 @@ <version>0.0.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.papyrus.uml.diagram.activity</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/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/.classpath b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/.classpath index ca630b31841..4c89b72842b 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/.classpath +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/.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="custom-src"/> <classpathentry kind="output" path="bin"/> diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/.settings/org.eclipse.jdt.core.prefs b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/.settings/org.eclipse.jdt.core.prefs index f09f5504dea..fcf1425718d 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/.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/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/META-INF/MANIFEST.MF index 14e952937ff..9792f3edabc 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/META-INF/MANIFEST.MF +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/META-INF/MANIFEST.MF @@ -30,8 +30,8 @@ Bundle-ActivationPolicy: lazy Bundle-ClassPath: . Bundle-Name: %pluginName Bundle-Localization: plugin -Bundle-RequiredExecutionEnvironment: JavaSE-11 -Require-Bundle: com.google.guava;bundle-version="[30.1.0,31.0.0)", +Bundle-RequiredExecutionEnvironment: JavaSE-17 +Require-Bundle: com.google.guava;bundle-version="[32.1.3,33.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)", org.eclipse.gmf.runtime.diagram.ui.properties;bundle-version="[1.8.0,2.0.0)", @@ -76,6 +76,6 @@ Bundle-Activator: org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlu Bundle-ManifestVersion: 2 Bundle-Description: %pluginDescription Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.clazz; 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)" +Import-Package: com.google.common.base;version="[32.0.0, 33.0.0)", + com.google.common.collect;version="[32.0.0, 33.0.0)" Automatic-Module-Name: org.eclipse.papyrus.uml.diagram.clazz diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/helper/AssociationClassHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/helper/AssociationClassHelper.java index 209ac037fe2..12a49448047 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/helper/AssociationClassHelper.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/helper/AssociationClassHelper.java @@ -1,5 +1,5 @@ /***************************************************************************** - * Copyright (c) 2009 CEA LIST. + * Copyright (c) 2009, 2022 CEA LIST. * * * All rights reserved. This program and the accompanying materials @@ -12,7 +12,7 @@ * Contributors: * Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation * Fanch Bonnabesse (ALL4TEC) fanch.bonnabesse@alltec.net - Bug 493430 - * + * Vincent LORENZO (CEA LIST) - vincent.lorenzo@cea.fr - Bug 580838 *****************************************************************************/ package org.eclipse.papyrus.uml.diagram.clazz.custom.helper; @@ -183,7 +183,7 @@ public class AssociationClassHelper extends ElementHelper { * @return the set of command to create an association Class */ public Command getAssociationClassElementCommand(CreateConnectionViewAndElementRequest createConnectionViewAndElementRequest, Command command) { - if (false == createConnectionViewAndElementRequest.getSourceEditPart() instanceof GraphicalEditPart) { + if (command == null || false == createConnectionViewAndElementRequest.getSourceEditPart() instanceof GraphicalEditPart) { return UnexecutableCommand.INSTANCE; } GraphicalEditPart sourceEditPart = (GraphicalEditPart) createConnectionViewAndElementRequest.getSourceEditPart(); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/.classpath b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/.classpath index e801ebfb468..81fe078c20c 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/.classpath +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/.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/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/.settings/org.eclipse.jdt.core.prefs b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/.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/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/META-INF/MANIFEST.MF index 958a4fb19ce..ab64dd289d9 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/META-INF/MANIFEST.MF +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/META-INF/MANIFEST.MF @@ -20,11 +20,11 @@ Require-Bundle: org.eclipse.emf.databinding;bundle-version="[1.5.0,2.0.0)", org.eclipse.uml2.uml.edit;bundle-version="[5.5.0,6.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.uml.diagram.common.groups.Activator Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.common.groups;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.uml.diagram.common.groups diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/pom.xml b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/pom.xml index 46f83decb22..700ad401338 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/pom.xml +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/pom.xml @@ -7,6 +7,6 @@ <version>0.0.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.papyrus.uml.diagram.common.groups</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/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/src/org/eclipse/papyrus/uml/diagram/common/groups/commands/utlis/CommandsUtils.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/src/org/eclipse/papyrus/uml/diagram/common/groups/commands/utlis/CommandsUtils.java index 0287689aa67..7adc2954b92 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/src/org/eclipse/papyrus/uml/diagram/common/groups/commands/utlis/CommandsUtils.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/src/org/eclipse/papyrus/uml/diagram/common/groups/commands/utlis/CommandsUtils.java @@ -1,5 +1,5 @@ /***************************************************************************** - * Copyright (c) 2010 Atos Origin. + * Copyright (c) 2010, 2023 Atos Origin. * * * All rights reserved. This program and the accompanying materials @@ -11,6 +11,7 @@ * * Contributors: * Atos Origin - Initial API and implementation + * Pauline DEVILLE (CEA LIST) <pauline.deville@cea.fr> - Bug 582075 * *****************************************************************************/ package org.eclipse.papyrus.uml.diagram.common.groups.commands.utlis; @@ -349,7 +350,7 @@ public class CommandsUtils { */ public static ChangeModelParentCommand getUpdateChildrenModel(List<IGraphicalEditPart> directChildsToComplete, AbstractContainerNodeDescriptor descriptor, TransactionalEditingDomain editingDomain, IAdaptable parent, IGraphicalEditPart anyPart) { ChangeModelParentCommand cmd = null; - Map<EObject, EReference> elementToMove = new HashMap<EObject, EReference>(); + Map<EObject, EReference> elementToMove = new HashMap<>(); if (!directChildsToComplete.isEmpty()) { for (IGraphicalEditPart child : directChildsToComplete) { EObject childEObject = child.resolveSemanticElement(); @@ -476,7 +477,7 @@ public class CommandsUtils { /* * Child visually contained in the new group which can be graphical children of this new group */ - List<IGraphicalEditPart> directChildsToComplete = new ArrayList<IGraphicalEditPart>(); + List<IGraphicalEditPart> directChildsToComplete = new ArrayList<>(); /* * Old child visually contained before the request ( used in changeBound request ) */ @@ -491,12 +492,12 @@ public class CommandsUtils { /* * List of elements atomically chosen as graphical child */ - List<IGraphicalEditPart> newGraphicalChildren = new ArrayList<IGraphicalEditPart>(); + List<IGraphicalEditPart> newGraphicalChildren = new ArrayList<>(); ; /* * List of elements on which the user should be asked to choose the graphical parent */ - List<IGraphicalEditPart> choiceToMakeChildren = new ArrayList<IGraphicalEditPart>(); + List<IGraphicalEditPart> choiceToMakeChildren = new ArrayList<>(); ; for (IGraphicalEditPart part : directChildsToComplete) { if (alreadyHaveGroupGraphicalParent(part, modelParents)) { @@ -605,7 +606,7 @@ public class CommandsUtils { if (request instanceof ChangeBoundsRequest) { Object _movingPart = parentAdapter.getAdapter(EditPart.class); if (_movingPart instanceof IGraphicalEditPart) { - List<IGraphicalEditPart> graphicalChilds = new ArrayList<IGraphicalEditPart>(); + List<IGraphicalEditPart> graphicalChilds = new ArrayList<>(); IGraphicalEditPart movingEditPart = (IGraphicalEditPart) _movingPart; // Look for all graphical children graphicalChilds = getGraphicalChild(movingEditPart); @@ -767,7 +768,7 @@ public class CommandsUtils { } } // List of all model parent available (except the compartment edit part) - List<IGraphicalEditPart> modelParents = new ArrayList<IGraphicalEditPart>(); + List<IGraphicalEditPart> modelParents = new ArrayList<>(); EObject childEObject = graphicalChild.resolveSemanticElement(); // Does the child have already a valid model parent boolean alreadyHaveValideModelParent = false; @@ -885,7 +886,7 @@ public class CommandsUtils { viewer = parentEditPart.getViewer(); if (viewer != null) { IGraphicalEditPart compartmentEditPart = (IGraphicalEditPart) Utils.getCompartementEditPartFromMainEditPart(viewer.getEditPartRegistry(), parentEditPart); - result = new ArrayList<IGraphicalEditPart>(); + result = new ArrayList<>(); for (Object child : compartmentEditPart.getChildren()) { if (child instanceof IGraphicalEditPart && GroupContainmentRegistry.isNodeConcerned((IGraphicalEditPart) child)) { result.add((IGraphicalEditPart) child); @@ -922,7 +923,7 @@ public class CommandsUtils { } else if (request instanceof ChangeBoundsRequest) { Object _parentEditPart = parentAdapter.getAdapter(IGraphicalEditPart.class); if (_parentEditPart instanceof IGraphicalEditPart) { - oldDirectChildsToComplete = new ArrayList<IGraphicalEditPart>(); + oldDirectChildsToComplete = new ArrayList<>(); Utils.createComputedListsOfVisuallyRelatedElements(directChildsToComplete, (ChangeBoundsRequest) request, (IGraphicalEditPart) _parentEditPart, descriptor, true); Utils.createComputedListsOfVisuallyRelatedElements(oldDirectChildsToComplete, (ChangeBoundsRequest) request, (IGraphicalEditPart) _parentEditPart, descriptor, false); } @@ -954,7 +955,7 @@ public class CommandsUtils { private static CompositeCommand withdrawOldChildrenReferences(TransactionalEditingDomain editingDomain, IAdaptable parentAdapter, CompositeCommand cc, String handleChildrenLabel, AbstractContainerNodeDescriptor descriptor, List<IGraphicalEditPart> directChildsToComplete, List<IGraphicalEditPart> oldDirectChildsToComplete) { if (oldDirectChildsToComplete != null && !oldDirectChildsToComplete.isEmpty()) { - List<IGraphicalEditPart> childToWithdraw = new ArrayList<IGraphicalEditPart>(); + List<IGraphicalEditPart> childToWithdraw = new ArrayList<>(); for (IGraphicalEditPart child : oldDirectChildsToComplete) { if (!directChildsToComplete.contains(child)) { childToWithdraw.add(child); @@ -1124,7 +1125,7 @@ public class CommandsUtils { public static Command requestEditPartMultiplexor(ChangeBoundsRequest request, String label, IGraphicalEditPart getHost) { CompositeCommand result = new CompositeCommand(label); if (request.getEditParts().size() > 1) { - for (Object part : request.getEditParts()) { + for (EditPart part : request.getEditParts()) { ChangeBoundsRequest req = new ChangeBoundsRequest(); req.setEditParts(Collections.singletonList(part)); req.setMoveDelta(request.getMoveDelta()); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/.classpath b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/.classpath index e801ebfb468..81fe078c20c 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/.classpath +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.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/uml/diagram/org.eclipse.papyrus.uml.diagram.common/.settings/org.eclipse.jdt.core.prefs b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/.settings/org.eclipse.jdt.core.prefs index f09f5504dea..fcf1425718d 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.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_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/uml/diagram/org.eclipse.papyrus.uml.diagram.common/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/META-INF/MANIFEST.MF index c92b720886f..08c002eae75 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/META-INF/MANIFEST.MF +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/META-INF/MANIFEST.MF @@ -51,7 +51,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.e4.ui.css.core;bundle-version="[0.12.0,1.0.0)", org.eclipse.emf.databinding;bundle-version="[1.5.0,2.0.0)", @@ -109,11 +109,11 @@ Require-Bundle: org.eclipse.core.expressions;bundle-version="[3.6.0,4.0.0)", org.eclipse.papyrus.uml.tools.utils;bundle-version="[4.0.0,5.0.0)", org.eclipse.uml2.uml.editor;bundle-version="[5.5.0,6.0.0)" Bundle-Vendor: %providerName -Bundle-Version: 5.0.0.qualifier +Bundle-Version: 5.1.100.qualifier Eclipse-BuddyPolicy: dependent Bundle-Activator: org.eclipse.papyrus.uml.diagram.common.Activator Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.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)" +Import-Package: com.google.common.base;version="[32.0.0, 33.0.0)", + com.google.common.collect;version="[32.0.0, 33.0.0)" Automatic-Module-Name: org.eclipse.papyrus.uml.diagram.common diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/pom.xml b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/pom.xml index 322cb7dc32d..52ce9ef8af1 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/pom.xml +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/pom.xml @@ -9,6 +9,6 @@ <version>0.0.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.papyrus.uml.diagram.common</artifactId> - <version>5.0.0-SNAPSHOT</version> + <version>5.1.100-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project>
\ No newline at end of file diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/editparts/RoundedBorderNamedElementEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/editparts/RoundedBorderNamedElementEditPart.java index 7cb44121d91..63669447442 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/editparts/RoundedBorderNamedElementEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/editparts/RoundedBorderNamedElementEditPart.java @@ -1,5 +1,5 @@ /***************************************************************************** - * Copyright (c) 2010, 2015, 2021 CEA LIST, ARTAL and others. + * Copyright (c) 2010, 2015, 2021, 2022 CEA LIST, ARTAL and others. * * 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,9 @@ * SPDX-License-Identifier: EPL-2.0 * * Contributors: - * Mickael ADAM (ALL4TEC) mickael.adam@all4tec.net - Initial API and Implementation + * Mickael ADAM (ALL4TEC) - mickael.adam@all4tec.net - Initial API and Implementation * Etienne ALLOGO (ARTAL) - etienne.allogo@artal.fr - Bug 569174 : generate less dead for common methods + * Vincent LORENZO (CEA LIST) - vincent.lorenzo@cea.fr - Bug 580838 *****************************************************************************/ @@ -26,6 +27,7 @@ import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.edit.domain.EditingDomain; import org.eclipse.gef.EditPolicy; import org.eclipse.gmf.runtime.diagram.ui.editparts.AbstractBorderedShapeEditPart; +import org.eclipse.gmf.runtime.diagram.ui.figures.IBorderItemLocator; import org.eclipse.gmf.runtime.notation.NotationPackage; import org.eclipse.gmf.runtime.notation.View; import org.eclipse.papyrus.infra.emf.utils.EMFHelper; @@ -362,7 +364,10 @@ public abstract class RoundedBorderNamedElementEditPart extends BorderNamedEleme Object feature = event.getFeature(); if (NotationPackage.eINSTANCE.getSize_Width().equals(feature) | NotationPackage.eINSTANCE.getSize_Height().equals(feature)) { - getBorderItemLocator().relocate(getFigure()); + final IBorderItemLocator locator = getBorderItemLocator(); + if (locator != null) { + locator.relocate(getFigure()); + } } } @@ -370,12 +375,14 @@ public abstract class RoundedBorderNamedElementEditPart extends BorderNamedEleme * * @return the figure that represent the shape, this class is generated by the GMF tooling */ + @Override protected abstract IFigure createNodePlate(); /** * * @return the figure that represent the shape, this class is generated by the GMF tooling */ + @Override protected abstract IFigure createNodeShape(); /** @@ -384,6 +391,7 @@ public abstract class RoundedBorderNamedElementEditPart extends BorderNamedEleme * @param nodeShape * @return the figure that is the the node shape */ + @Override protected abstract IFigure setupContentPane(IFigure nodeShape); } diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/editparts/UMLNodeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/editparts/UMLNodeEditPart.java index 8cfaad54088..1470db35dfe 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/editparts/UMLNodeEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/editparts/UMLNodeEditPart.java @@ -146,7 +146,7 @@ public abstract class UMLNodeEditPart extends NodeEditPart implements IUMLEditPa */ protected void changeLayoutCompartment() { if (getCompartmentLayoutHelper() != null) { - Iterator<EditPart> childrenIterator = getChildren().iterator(); + Iterator<? extends EditPart> childrenIterator = getChildren().iterator(); while (childrenIterator.hasNext()) { EditPart currentEditPart = childrenIterator.next(); if (currentEditPart instanceof ListCompartmentEditPart) { diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/editpolicies/CommonDiagramDragDropEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/editpolicies/CommonDiagramDragDropEditPolicy.java index 0975ea61112..9cd9154a44c 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/editpolicies/CommonDiagramDragDropEditPolicy.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/editpolicies/CommonDiagramDragDropEditPolicy.java @@ -389,7 +389,7 @@ public abstract class CommonDiagramDragDropEditPolicy extends AbstractDiagramDra return false; } @SuppressWarnings("unchecked") - List<EditPart> childs = parent.getChildren(); + List<? extends EditPart> childs = parent.getChildren(); for (EditPart nextChild : childs) { if (!(nextChild instanceof GraphicalEditPart)) { continue; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/figure/node/AutomaticCompartmentLayoutManager.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/figure/node/AutomaticCompartmentLayoutManager.java index 7ea03b9b604..df007ad3166 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/figure/node/AutomaticCompartmentLayoutManager.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/figure/node/AutomaticCompartmentLayoutManager.java @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright (c) 2009 CEA LIST. + * Copyright (c) 2009, 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,9 +9,10 @@ * SPDX-License-Identifier: EPL-2.0 * * Contributors: - * Patrick Tessier (CEA LIST), Thibault Landre (Atos Origin) - Initial API and implementation - * Vincent Lorenzo (CEA LIST), change layout(IFigure container) - * Laurent Wouters (CEA LIST), refactoring, cleanup, added layout of labels on top of shapes + * Patrick Tessier (CEA LIST), Thibault Landre (Atos Origin) - Initial API and implementation + * Vincent Lorenzo (CEA LIST), change layout(IFigure container) + * Laurent Wouters (CEA LIST), refactoring, cleanup, added layout of labels on top of shapes + * Vincent LORENZO (CEA LIST) vincent.lorenzo@cea.fr - Bug 581898 *****************************************************************************/ package org.eclipse.papyrus.uml.diagram.common.figure.node; @@ -44,17 +45,17 @@ public class AutomaticCompartmentLayoutManager extends AbstractLayout { /** * list of visible compartment children */ - protected ArrayList<IFigure> visibleCompartments = new ArrayList<IFigure>(); + protected ArrayList<IFigure> visibleCompartments = new ArrayList<>(); /** * list of visible non-compartment children (e.g. labels) */ - protected ArrayList<IFigure> visibleOthers = new ArrayList<IFigure>(); + protected ArrayList<IFigure> visibleOthers = new ArrayList<>(); /** * list of the invisible children */ - protected ArrayList<IFigure> invisibles = new ArrayList<IFigure>(); + protected ArrayList<IFigure> invisibles = new ArrayList<>(); /** * true if the bounds of the labels are forced by an inner figure @@ -163,7 +164,7 @@ public class AutomaticCompartmentLayoutManager extends AbstractLayout { /** * Returns <code>true</code> if there is a displayed shape compartment in the list of visible compartment - * + * * @param container * the figure to check * @return <code>true</code> if there is a displayed shape compartment in the list of visible compartment @@ -267,7 +268,7 @@ public class AutomaticCompartmentLayoutManager extends AbstractLayout { protected void layoutDefault(IFigure container) { // this list contains the visible compartments (that is to say : // notCompartmentList + compartmentsList - List<IFigure> visibles = new ArrayList<IFigure>(); + List<IFigure> visibles = new ArrayList<>(); visibles.addAll(visibleOthers); visibles.addAll(visibleCompartments); @@ -362,7 +363,7 @@ public class AutomaticCompartmentLayoutManager extends AbstractLayout { * @return A list of the bounds of the given children in the same order */ private List<Rectangle> buildInitialsBounds(IFigure container, List<IFigure> visibles) { - List<Rectangle> result = new ArrayList<Rectangle>(visibles.size()); + List<Rectangle> result = new ArrayList<>(visibles.size()); for (IFigure child : visibles) { result.add(buildInitialsBounds(container, child)); } @@ -402,8 +403,12 @@ public class AutomaticCompartmentLayoutManager extends AbstractLayout { // first, fixes the order of the children // remove the labels container.getChildren().removeAll(visibleOthers); + // add them at the end - container.getChildren().addAll(visibleOthers); + for (IFigure fig : visibleOthers) { + container.add(fig); + } + List<Rectangle> bounds = buildInitialsBounds(container, visibleCompartments); double compartmentsHeight = getTotalHeight(bounds, 0, visibleCompartments.size()); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/figure/node/HTMLCornerBentFigure.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/figure/node/HTMLCornerBentFigure.java index dfc09974c25..9db993f389c 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/figure/node/HTMLCornerBentFigure.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/figure/node/HTMLCornerBentFigure.java @@ -1,5 +1,5 @@ /***************************************************************************** - * Copyright (c) 2010 CEA LIST. + * Copyright (c) 2010, 2023 CEA LIST. * * * All rights reserved. This program and the accompanying materials @@ -12,6 +12,7 @@ * Contributors: * Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - Initial API and implementation * Mickaël ADAM (ALL4TEC) mickael.adam@all4tec.net - implementation of strike though, font and font color + * Vincent LORENZO (CEA LIST) vincent.lorenzo@cea.fr - bug 581921 *****************************************************************************/ package org.eclipse.papyrus.uml.diagram.common.figure.node; @@ -74,7 +75,7 @@ public class HTMLCornerBentFigure extends CornerBentFigure implements ILabelFigu /** * HTML renderer extension ID - * + * * @since 2.0 */ public static final String EXTENSION_ID = Activator.ID + ".htmlRendererContributor"; //$NON-NLS-1$ @@ -108,7 +109,7 @@ public class HTMLCornerBentFigure extends CornerBentFigure implements ILabelFigu /** * HTML renderer from extensions (if any) - * + * * @since 2.0 */ protected HTMLRenderer htmlRenderer; @@ -119,7 +120,7 @@ public class HTMLCornerBentFigure extends CornerBentFigure implements ILabelFigu protected Boolean useHtmlRenderer = null; /** * Body size to remember so layout changes are not fired infinitely - * + * * @since 2.0 */ protected int oldWidth = 0; @@ -129,7 +130,7 @@ public class HTMLCornerBentFigure extends CornerBentFigure implements ILabelFigu protected int oldHeight = 0; /** text styles stack */ - private final List<List<Styles>> myStyles = new ArrayList<List<Styles>>(); + private final List<List<Styles>> myStyles = new ArrayList<>(); /** font used for the figure */ private FontData currentFontData; @@ -139,13 +140,13 @@ public class HTMLCornerBentFigure extends CornerBentFigure implements ILabelFigu /** * The color style stack of text. */ - private Stack<Color> colors = new Stack<Color>(); + private Stack<Color> colors = new Stack<>(); /** * set of font datas used by this comment. It will be cleaned juste after * the creation of the comment */ - private Set<FontData> cachedFontDatas = new HashSet<FontData>(); + private Set<FontData> cachedFontDatas = new HashSet<>(); /** * Creates a new HTMLCornerBentFigure. @@ -214,19 +215,11 @@ public class HTMLCornerBentFigure extends CornerBentFigure implements ILabelFigu private class HTMLLayoutListener extends LayoutListener.Stub { @Override public void postLayout(IFigure container) { - if (htmlLayoutListener != null) { - container.removeLayoutListener(htmlLayoutListener); - } - if (oldWidth != container.getClientArea().width || oldHeight != container.getClientArea().height) { oldWidth = container.getClientArea().width; oldHeight = container.getClientArea().height; paintHTML(); } - - if (htmlLayoutListener != null) { - container.addLayoutListener(htmlLayoutListener); - } } } @@ -456,7 +449,7 @@ public class HTMLCornerBentFigure extends CornerBentFigure implements ILabelFigu /** * Generate Blocks for a Span Node. - * + * * @param node * the node from which to generate below flows * @param parentFlow @@ -534,7 +527,7 @@ public class HTMLCornerBentFigure extends CornerBentFigure implements ILabelFigu /** * Overrides Figure.setFont() method * setup font for all TextFlow childes of this figure - * + * */ @Override public void setFont(Font f) { @@ -556,9 +549,9 @@ public class HTMLCornerBentFigure extends CornerBentFigure implements ILabelFigu /** * {@inheritDoc} - * + * * Overridden to refresh text after set of font and font color to be taken into account. - * + * * @see org.eclipse.draw2d.Figure#setForegroundColor(org.eclipse.swt.graphics.Color) */ @Override @@ -576,12 +569,12 @@ public class HTMLCornerBentFigure extends CornerBentFigure implements ILabelFigu /** * @see HTMLCornerBentFigure.setFont() for using - * + * * @param parent * @return TextFlow childs list */ private List<TextFlow> findTextFlowChildList(IFigure parent) { - List<TextFlow> result = new ArrayList<TextFlow>(); + List<TextFlow> result = new ArrayList<>(); for (Object nextFigure : parent.getChildren()) { if (!(nextFigure instanceof TextFlow)) { result.addAll(findTextFlowChildList((IFigure) nextFigure)); @@ -595,7 +588,7 @@ public class HTMLCornerBentFigure extends CornerBentFigure implements ILabelFigu /** * Generates code from a node representing a text. * IFigure default font value will setup if styles list is empty. - * + * * @param node * the node from which to generate belowk flows * @param parentFlow @@ -613,7 +606,7 @@ public class HTMLCornerBentFigure extends CornerBentFigure implements ILabelFigu /** * Calculate Current Foreground color. - * + * * @param styles * The list of styles. * @return The current foreground color. @@ -636,7 +629,7 @@ public class HTMLCornerBentFigure extends CornerBentFigure implements ILabelFigu * Calculates current font as default figure font + styles * styles has overrides default font * It's main method for getting font value by this figure - * + * * @return */ private Font calculateCurrentFont(List<Styles> styles) { @@ -645,7 +638,7 @@ public class HTMLCornerBentFigure extends CornerBentFigure implements ILabelFigu /** * Extracts underLine value from styles - * + * * @see generateTextFromTextNode() for using * @return */ @@ -665,7 +658,7 @@ public class HTMLCornerBentFigure extends CornerBentFigure implements ILabelFigu /** * Extract strike through value from styles. - * + * * @param styles * the list of styles */ @@ -685,7 +678,7 @@ public class HTMLCornerBentFigure extends CornerBentFigure implements ILabelFigu /** * Calculates default fontData without styles - * + * * @return */ private FontData getDefaultFontData() { @@ -706,7 +699,7 @@ public class HTMLCornerBentFigure extends CornerBentFigure implements ILabelFigu /** * Font -> FontData converter - * + * * @return Current Figure FonData value */ private FontData getCurrentFigureFontData() { @@ -721,7 +714,7 @@ public class HTMLCornerBentFigure extends CornerBentFigure implements ILabelFigu /** * Compose figure font with styles - * + * * @param defaultFontData * @return */ @@ -1012,7 +1005,7 @@ public class HTMLCornerBentFigure extends CornerBentFigure implements ILabelFigu /** * Valid HTML tags enumeration - * + * * @since 3.0 */ protected enum HTMLTags { diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/figure/node/RichTextRenderer.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/figure/node/RichTextRenderer.java index f5af8b2a1a2..16b6d37cf25 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/figure/node/RichTextRenderer.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/figure/node/RichTextRenderer.java @@ -1,6 +1,6 @@ /***************************************************************************** - * Copyright (c) 2016, 2018 CEA LIST and others. - * + * Copyright (c) 2016, 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 * which accompanies this distribution, and is available at @@ -11,7 +11,7 @@ * Contributors: * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr * Mickaël ADAM (ALL4TEC) mickael.adam@all4tec.net - Bug 502878 - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Bug 522427 + * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Bug 522427, 581922 *****************************************************************************/ package org.eclipse.papyrus.uml.diagram.common.figure.node; @@ -68,7 +68,7 @@ public class RichTextRenderer implements HTMLRenderer { } /** - * + * * @see org.eclipse.papyrus.uml.diagram.common.figure.node.HTMLRenderer#paintHTML(java.lang.String, int, int, int, int) * * @param text @@ -96,6 +96,8 @@ public class RichTextRenderer implements HTMLRenderer { GC gcTmp = new GC(htmlImageTmp); Rectangle boundsTmp = new Rectangle(x, y, 10, 10); // magic number painter.preCalculate(text != null ? text : "", gcTmp, boundsTmp, false);//$NON-NLS-1$ // false instead true, seems me better (more width than height) + gcTmp.dispose(); + htmlImageTmp.dispose(); int width = this.painter.getPreferredSize().x; int height = this.painter.getPreferredSize().y; // *************** end bug fix ************************ diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/locator/ExternalLabelPositionLocator.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/locator/ExternalLabelPositionLocator.java index 518eb6705d5..9c015a10ac5 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/locator/ExternalLabelPositionLocator.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/locator/ExternalLabelPositionLocator.java @@ -373,7 +373,7 @@ public class ExternalLabelPositionLocator implements IPapyrusBorderItemLocator { if (editPart != null) { EditPart parent = editPart.getParent(); if (parent instanceof IPapyrusEditPart) { - final List<EditPart> childrens = parent.getChildren(); + final List<? extends EditPart> childrens = parent.getChildren(); // Count all papyrus label edit part of the parent for (EditPart children : childrens) { if (children instanceof PapyrusLabelEditPart) { diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/.classpath b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/.classpath index ca630b31841..4c89b72842b 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/.classpath +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/.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="custom-src"/> <classpathentry kind="output" path="bin"/> diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/.settings/org.eclipse.jdt.core.prefs b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/.settings/org.eclipse.jdt.core.prefs index f09f5504dea..fcf1425718d 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/.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/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/META-INF/MANIFEST.MF index 3dd7bd3ba85..b0c95b46c04 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/META-INF/MANIFEST.MF +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/META-INF/MANIFEST.MF @@ -25,8 +25,8 @@ Bundle-ActivationPolicy: lazy Bundle-ClassPath: . Bundle-Name: %pluginName Bundle-Localization: plugin -Bundle-RequiredExecutionEnvironment: JavaSE-11 -Require-Bundle: com.google.guava;bundle-version="[30.1.0,31.0.0)", +Bundle-RequiredExecutionEnvironment: JavaSE-17 +Require-Bundle: com.google.guava;bundle-version="[32.1.3,33.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)", org.eclipse.gmf.runtime.diagram.ui.properties;bundle-version="[1.8.0,2.0.0)", @@ -71,5 +71,5 @@ Bundle-Version: 6.0.0.qualifier Bundle-Activator: org.eclipse.papyrus.uml.diagram.communication.part.UMLDiagramEditorPlugin Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.communication; singleton:=true -Import-Package: com.google.common.collect;version="[30.1.0, 31.0.0)" +Import-Package: com.google.common.collect;version="[32.0.0, 33.0.0)" Automatic-Module-Name: org.eclipse.papyrus.uml.diagram.communication diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/.classpath b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/.classpath index ca630b31841..4c89b72842b 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/.classpath +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/.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="custom-src"/> <classpathentry kind="output" path="bin"/> diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/.settings/org.eclipse.jdt.core.prefs b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/.settings/org.eclipse.jdt.core.prefs index f09f5504dea..fcf1425718d 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/.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/uml/diagram/org.eclipse.papyrus.uml.diagram.component/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/META-INF/MANIFEST.MF index 51cd5cfe644..cc9c7109d96 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/META-INF/MANIFEST.MF +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/META-INF/MANIFEST.MF @@ -32,8 +32,8 @@ Bundle-ActivationPolicy: lazy Bundle-ClassPath: . Bundle-Name: %pluginName Bundle-Localization: plugin -Bundle-RequiredExecutionEnvironment: JavaSE-11 -Require-Bundle: com.google.guava;bundle-version="[30.1.0,31.0.0)", +Bundle-RequiredExecutionEnvironment: JavaSE-17 +Require-Bundle: com.google.guava;bundle-version="[32.1.3,33.0.0)", org.eclipse.core.expressions;bundle-version="[3.7.0,4.0.0)", org.eclipse.emf.databinding;bundle-version="[1.5.0,2.0.0)", org.eclipse.gmf.runtime.diagram.ui.properties;bundle-version="[1.8.0,2.0.0)", diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/.classpath b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/.classpath index ca630b31841..4c89b72842b 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/.classpath +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/.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="custom-src"/> <classpathentry kind="output" path="bin"/> diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/.settings/org.eclipse.jdt.core.prefs b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/.settings/org.eclipse.jdt.core.prefs index f09f5504dea..fcf1425718d 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/.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/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/META-INF/MANIFEST.MF index b191cac91cc..d8da8121a20 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/META-INF/MANIFEST.MF +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/META-INF/MANIFEST.MF @@ -32,8 +32,8 @@ Bundle-ActivationPolicy: lazy Bundle-ClassPath: . Bundle-Name: %pluginName Bundle-Localization: plugin -Bundle-RequiredExecutionEnvironment: JavaSE-11 -Require-Bundle: com.google.guava;bundle-version="[30.1.0,31.0.0)", +Bundle-RequiredExecutionEnvironment: JavaSE-17 +Require-Bundle: com.google.guava;bundle-version="[32.1.3,33.0.0)", org.eclipse.core.expressions;bundle-version="[3.7.0,4.0.0)", org.eclipse.emf.databinding;bundle-version="[1.5.0,2.0.0)", org.eclipse.gmf.runtime.diagram.ui.properties;bundle-version="[1.8.0,2.0.0)", diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.css/.classpath b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.css/.classpath index e801ebfb468..81fe078c20c 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.css/.classpath +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.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/uml/diagram/org.eclipse.papyrus.uml.diagram.css/.settings/org.eclipse.jdt.core.prefs b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.css/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.css/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.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/uml/diagram/org.eclipse.papyrus.uml.diagram.css/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.css/META-INF/MANIFEST.MF index 33ebb1f406e..3f7fef36ea0 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.css/META-INF/MANIFEST.MF +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.css/META-INF/MANIFEST.MF @@ -17,7 +17,7 @@ Bundle-Name: UML-Specific CSS concepts Bundle-Activator: org.eclipse.papyrus.uml.diagram.css.Activator Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.css;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.eclipse.papyrus.uml.diagram.css, org.eclipse.papyrus.uml.diagram.css.dom, org.eclipse.papyrus.uml.diagram.css.helper diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/.classpath b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/.classpath index ca630b31841..4c89b72842b 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/.classpath +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/.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="custom-src"/> <classpathentry kind="output" path="bin"/> diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/.settings/org.eclipse.jdt.core.prefs b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/.settings/org.eclipse.jdt.core.prefs index f09f5504dea..fcf1425718d 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/.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/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/META-INF/MANIFEST.MF index 0ad1b1e4f37..7291b33afac 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/META-INF/MANIFEST.MF +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/META-INF/MANIFEST.MF @@ -24,8 +24,8 @@ Bundle-ActivationPolicy: lazy Bundle-ClassPath: . Bundle-Name: %pluginName Bundle-Localization: plugin -Bundle-RequiredExecutionEnvironment: JavaSE-11 -Require-Bundle: com.google.guava;bundle-version="[30.1.0,31.0.0)", +Bundle-RequiredExecutionEnvironment: JavaSE-17 +Require-Bundle: com.google.guava;bundle-version="[32.1.3,33.0.0)", org.eclipse.core.expressions;bundle-version="[3.7.0,4.0.0)", org.eclipse.emf.databinding;bundle-version="[1.5.0,2.0.0)", org.eclipse.gmf.runtime.diagram.ui.properties;bundle-version="[1.8.0,2.0.0)", diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.dnd/.classpath b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.dnd/.classpath index e801ebfb468..81fe078c20c 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.dnd/.classpath +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.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/uml/diagram/org.eclipse.papyrus.uml.diagram.dnd/.settings/org.eclipse.jdt.core.prefs b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.dnd/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.dnd/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.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/uml/diagram/org.eclipse.papyrus.uml.diagram.dnd/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.dnd/META-INF/MANIFEST.MF index e9150561b8c..b676ca0562e 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.dnd/META-INF/MANIFEST.MF +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.dnd/META-INF/MANIFEST.MF @@ -20,7 +20,7 @@ Require-Bundle: org.eclipse.emf.databinding;bundle-version="[1.5.0,2.0.0)", org.eclipse.papyrus.uml.tools;bundle-version="[5.0.0,6.0.0)", org.eclipse.uml2.uml.editor;bundle-version="[5.5.0,6.0.0)" Bundle-Vendor: Eclipse Modeling Project -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-ActivationPolicy: lazy Bundle-Version: 2.0.0.qualifier Bundle-Name: UML Drag and Drop diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.dnd/src/org/eclipse/papyrus/uml/diagram/dnd/strategy/ReorderListItemsStrategy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.dnd/src/org/eclipse/papyrus/uml/diagram/dnd/strategy/ReorderListItemsStrategy.java index 71adddf8581..5b96fb81708 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.dnd/src/org/eclipse/papyrus/uml/diagram/dnd/strategy/ReorderListItemsStrategy.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.dnd/src/org/eclipse/papyrus/uml/diagram/dnd/strategy/ReorderListItemsStrategy.java @@ -246,7 +246,7 @@ public class ReorderListItemsStrategy extends AbstractDropStrategy { */ private EditPart getDropBefore(ChangeBoundsRequest dropRequest, ListCompartmentEditPart listPart) { int target = dropRequest.getLocation().y; - List<EditPart> children = listPart.getChildren(); + List<? extends EditPart> children = listPart.getChildren(); EditPart dropBefore = null; // Find the first element below the drop target @@ -292,7 +292,7 @@ public class ReorderListItemsStrategy extends AbstractDropStrategy { if (getCommand(request, targetEditPart) != null) { ListCompartmentEditPart targetEP = getTargetEP(targetEditPart); ChangeBoundsRequest dropRequest = (ChangeBoundsRequest) request; - EditPart ep = (EditPart) targetEP.getChildren().get(0); + EditPart ep = targetEP.getChildren().get(0); IFigure sibling = ((GraphicalEditPart) ep).getFigure(); IFigure figure = sibling.getParent(); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.icons/.classpath b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.icons/.classpath index e801ebfb468..81fe078c20c 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.icons/.classpath +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.icons/.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/uml/diagram/org.eclipse.papyrus.uml.diagram.icons/.settings/org.eclipse.jdt.core.prefs b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.icons/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.icons/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.icons/.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/uml/diagram/org.eclipse.papyrus.uml.diagram.icons/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.icons/META-INF/MANIFEST.MF index dc0d3b8ec02..5cf70673029 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.icons/META-INF/MANIFEST.MF +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.icons/META-INF/MANIFEST.MF @@ -9,5 +9,5 @@ Bundle-Localization: plugin Bundle-ManifestVersion: 2 Bundle-Activator: org.eclipse.papyrus.uml.diagram.icons.Activator Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.icons;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.uml.diagram.icons diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/.classpath b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/.classpath index ad5e13cce77..946fb3d346f 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/.classpath +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/.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/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/.settings/org.eclipse.jdt.core.prefs b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/.settings/org.eclipse.jdt.core.prefs index f09f5504dea..fcf1425718d 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/.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/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/META-INF/MANIFEST.MF index bdcc22629cd..5886421ddd5 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/META-INF/MANIFEST.MF +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/META-INF/MANIFEST.MF @@ -58,6 +58,6 @@ Bundle-Name: %pluginName Bundle-Activator: org.eclipse.papyrus.uml.diagram.interactionoverview.Activator Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.interactionoverview;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="[32.0.0, 33.0.0)" Automatic-Module-Name: org.eclipse.papyrus.uml.diagram.interactionoverview diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.linklf/.classpath b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.linklf/.classpath index e801ebfb468..81fe078c20c 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.linklf/.classpath +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.linklf/.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/uml/diagram/org.eclipse.papyrus.uml.diagram.linklf/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.linklf/META-INF/MANIFEST.MF index f4b4b90aae9..714f223b340 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.linklf/META-INF/MANIFEST.MF +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.linklf/META-INF/MANIFEST.MF @@ -20,7 +20,7 @@ Require-Bundle: org.eclipse.emf.databinding;bundle-version="[1.5.0,2.0.0)", org.eclipse.papyrus.uml.diagram.deployment;bundle-version="[5.0.0,6.0.0)", org.eclipse.papyrus.uml.diagram.profile;bundle-version="[5.0.0,6.0.0)", org.eclipse.uml2.uml.editor;bundle-version="[5.5.0,6.0.0)" -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-ActivationPolicy: lazy Bundle-Vendor: %providerName Bundle-Localization: plugin diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/.classpath b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/.classpath index 6cbcc85160e..8d6bf638988 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/.classpath +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.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/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/.settings/org.eclipse.jdt.core.prefs b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.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/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/META-INF/MANIFEST.MF index c1f7c2bda2c..6e32d750c31 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/META-INF/MANIFEST.MF +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/META-INF/MANIFEST.MF @@ -32,5 +32,5 @@ Bundle-Activator: org.eclipse.papyrus.uml.diagram.menu.Activator Bundle-ManifestVersion: 2 Bundle-Description: %pluginDescription Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.menu;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.uml.diagram.menu diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/src/org/eclipse/papyrus/uml/diagram/menu/actions/ArrangeAction.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/src/org/eclipse/papyrus/uml/diagram/menu/actions/ArrangeAction.java index 002e94b5426..9d7250022df 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/src/org/eclipse/papyrus/uml/diagram/menu/actions/ArrangeAction.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/src/org/eclipse/papyrus/uml/diagram/menu/actions/ArrangeAction.java @@ -184,7 +184,7 @@ public class ArrangeAction extends AbstractGraphicalParametricAction { */ @SuppressWarnings("unchecked") protected List<IGraphicalEditPart> createOperationSetForArrangeAll(List<IGraphicalEditPart> selection) { - Set<IGraphicalEditPart> parentsSet = new HashSet<IGraphicalEditPart>(); + Set<IGraphicalEditPart> parentsSet = new HashSet<>(); for (Iterator<IGraphicalEditPart> iter = selection.iterator(); iter.hasNext();) { Object element = iter.next(); if (element instanceof ShapeCompartmentEditPart || element instanceof DiagramEditPart) { @@ -202,7 +202,7 @@ public class ArrangeAction extends AbstractGraphicalParametricAction { if (parentsSet.isEmpty()) { return Collections.EMPTY_LIST; } - List<IGraphicalEditPart> elements = new ArrayList<IGraphicalEditPart>(); + List<IGraphicalEditPart> elements = new ArrayList<>(); elements.addAll(parentsSet); return elements; } @@ -224,7 +224,7 @@ public class ArrangeAction extends AbstractGraphicalParametricAction { return createOperationSetForArrangeAll(selection); } if (getDiagramEditPart() != null) { - return getDiagramEditPart().getChildren(); + return (List<IGraphicalEditPart>) getDiagramEditPart().getChildren(); } return Collections.EMPTY_LIST; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/src/org/eclipse/papyrus/uml/diagram/menu/actions/SizeAction.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/src/org/eclipse/papyrus/uml/diagram/menu/actions/SizeAction.java index 0fbd359cc6c..972691f58f1 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/src/org/eclipse/papyrus/uml/diagram/menu/actions/SizeAction.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/src/org/eclipse/papyrus/uml/diagram/menu/actions/SizeAction.java @@ -74,7 +74,7 @@ public class SizeAction { /** the selected elements */ public List<IGraphicalEditPart> selectedElements; - + /** * * Constructor. @@ -220,7 +220,7 @@ public class SizeAction { int maxDown = 0; // Contents of Edit Part selected - List<EditPart> contents = editPart.getChildren(); + List<? extends EditPart> contents = editPart.getChildren(); for (int index = 0; index < contents.size(); index++) { EditPart editPartCompar = contents.get(index); @@ -264,15 +264,15 @@ public class SizeAction { * @return the int */ private int findIndex(double currentZoomLevel, double[] zoomLevel) { - for(int i = 0; i < zoomLevel.length; i++) { - if(zoomLevel[i] == currentZoomLevel) { + for (int i = 0; i < zoomLevel.length; i++) { + if (zoomLevel[i] == currentZoomLevel) { return i; } } return -1; // element not found } - + /** * Return the command for the Same Height and Width Action * @@ -282,7 +282,7 @@ public class SizeAction { protected Command getBothCommand() { return new SameBothSizeAction(selectedElements).getCommand(); } - + /** * Return the command for the Same Height Action * @@ -292,7 +292,7 @@ public class SizeAction { protected Command getHeightCommand() { return new SameHeightSizeAction(selectedElements).getCommand(); } - + /** * Return the command for the Same Width Action * @@ -302,36 +302,36 @@ public class SizeAction { protected Command getWidthCommand() { return new SameWidthSizeAction(selectedElements).getCommand(); } - + /** - * Base group editParts resize action + * Base group editParts resize action */ protected static abstract class SameSizeAction { public final List<IGraphicalEditPart> mySelectedElements; - + public SameSizeAction(List<IGraphicalEditPart> selectedElements) { mySelectedElements = selectedElements; } - + /** * Will to be resized width * Default set to false; */ protected abstract boolean needResizeHeight(); - + /** * Will to be resized height * Default set to false; */ protected abstract boolean needResizeWidth(); - + /** * Direction to expand selected figures. - * Return some of {@link PositionConstants}. + * Return some of {@link PositionConstants}. */ protected abstract int getResizeDirection(); - + public Command getCommand() { if (!(this.mySelectedElements.size() > 1)) { return UnexecutableCommand.INSTANCE; @@ -356,22 +356,22 @@ public class SizeAction { // Calculate delta resize Dimension delta = calculateDelta(epToResize, primarySize); - - //translateToAbsolute translate considering zoom + + // translateToAbsolute translate considering zoom primary.getFigure().translateToAbsolute(delta); - + Command resizeCommand = epToResize.getCommand(createResizeRequest(delta)); // Previous implementation (following line) forced bounds on view instead of using resize command provided by the edit part. // // doResizeCmd.add(new ICommandProxy(new SetBoundsCommand(toResize.getEditingDomain(), "", new EObjectAdapter(resizeView), primarySize))); //$NON-NLS-1$ // - + doResizeCmd.add(resizeCommand); } return doResizeCmd.unwrap(); } - + protected Dimension calculateEdiPartSize(IGraphicalEditPart ep) { View primaryView = (View) ep.getModel(); Integer width = (Integer) ViewUtil.getStructuralFeatureValue(primaryView, NotationPackage.eINSTANCE.getSize_Width()); @@ -385,16 +385,16 @@ public class SizeAction { } return epSize; } - + protected Dimension calculateDelta(IGraphicalEditPart toResize, Dimension newSize) { Dimension editPartSize = calculateEdiPartSize(toResize); - + int deltaWidth = needResizeWidth() ? deltaWidth = newSize.width - editPartSize.width : 0; int deltaHeight = needResizeHeight() ? newSize.height - editPartSize.height : 0; - + return new Dimension(deltaWidth, deltaHeight); } - + protected ChangeBoundsRequest createResizeRequest(Dimension delta) { ChangeBoundsRequest request = new ChangeBoundsRequest(); request.setResizeDirection(getResizeDirection()); @@ -467,7 +467,7 @@ public class SizeAction { protected boolean needResizeHeight() { return true; } - + @Override protected boolean needResizeWidth() { return false; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.modelexplorer/.classpath b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.modelexplorer/.classpath index e801ebfb468..81fe078c20c 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.modelexplorer/.classpath +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.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/uml/diagram/org.eclipse.papyrus.uml.diagram.modelexplorer/.settings/org.eclipse.jdt.core.prefs b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.modelexplorer/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.modelexplorer/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.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/uml/diagram/org.eclipse.papyrus.uml.diagram.modelexplorer/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.modelexplorer/META-INF/MANIFEST.MF index b69747cdf2a..e1340a5880c 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.modelexplorer/META-INF/MANIFEST.MF +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.modelexplorer/META-INF/MANIFEST.MF @@ -21,5 +21,5 @@ Bundle-Activator: org.eclipse.papyrus.uml.diagram.modelexplorer.Activator Bundle-ManifestVersion: 2 Bundle-Description: %pluginDescription Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.modelexplorer;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.uml.diagram.modelexplorer diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.navigation/.classpath b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.navigation/.classpath index e801ebfb468..81fe078c20c 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.navigation/.classpath +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.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/uml/diagram/org.eclipse.papyrus.uml.diagram.navigation/.settings/org.eclipse.jdt.core.prefs b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.navigation/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.navigation/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.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/uml/diagram/org.eclipse.papyrus.uml.diagram.navigation/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.navigation/META-INF/MANIFEST.MF index 365015aa921..b40c4c902f0 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.navigation/META-INF/MANIFEST.MF +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.navigation/META-INF/MANIFEST.MF @@ -12,5 +12,5 @@ Bundle-Localization: plugin Bundle-Name: %pluginName Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.navigation;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.uml.diagram.navigation diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/.classpath b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/.classpath index ca630b31841..4c89b72842b 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/.classpath +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/.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="custom-src"/> <classpathentry kind="output" path="bin"/> diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/.settings/org.eclipse.jdt.core.prefs b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/.settings/org.eclipse.jdt.core.prefs index f09f5504dea..fcf1425718d 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/.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/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/META-INF/MANIFEST.MF index df51a51b924..6e7a2ed3eb7 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/META-INF/MANIFEST.MF +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/META-INF/MANIFEST.MF @@ -25,8 +25,8 @@ Bundle-ActivationPolicy: lazy Bundle-ClassPath: . Bundle-Name: %pluginName Bundle-Localization: plugin -Bundle-RequiredExecutionEnvironment: JavaSE-11 -Require-Bundle: com.google.guava;bundle-version="[30.1.0,31.0.0)", +Bundle-RequiredExecutionEnvironment: JavaSE-17 +Require-Bundle: com.google.guava;bundle-version="[32.1.3,33.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)", org.eclipse.gmf.runtime.diagram.ui.properties;bundle-version="[1.8.0,2.0.0)", @@ -78,5 +78,5 @@ Bundle-Activator: org.eclipse.papyrus.uml.diagram.profile.part.UMLDiagramEditorP Bundle-ManifestVersion: 2 Bundle-Description: %pluginDescription Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.profile; singleton:=true -Import-Package: com.google.common.collect;version="[30.1.0, 31.0.0)" +Import-Package: com.google.common.collect;version="[32.0.0, 33.0.0)" Automatic-Module-Name: org.eclipse.papyrus.uml.diagram.profile diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.restrictions/.classpath b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.restrictions/.classpath index e801ebfb468..81fe078c20c 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.restrictions/.classpath +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.restrictions/.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/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.restrictions/.settings/org.eclipse.jdt.core.prefs b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.restrictions/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.restrictions/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.restrictions/.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/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.restrictions/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.restrictions/META-INF/MANIFEST.MF index 3cfe7618bea..1eae0205dff 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.restrictions/META-INF/MANIFEST.MF +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.restrictions/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.sequence.restrictions Bundle-Version: 2.1.0.qualifier Bundle-Vendor: Eclipse Modeling Project Automatic-Module-Name: org.eclipse.papyrus.uml.diagram.sequence.restrictions -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-ActivationPolicy: lazy Require-Bundle: org.eclipse.gmf.runtime.diagram.ui.properties;bundle-version="[1.8.0,2.0.0)", org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[4.0.0,5.0.0)", diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/.classpath b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/.classpath index 1ee876a6b66..faa13e8e1fd 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/.classpath +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/.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="custom-src"/> diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/.settings/org.eclipse.jdt.core.prefs b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/.settings/org.eclipse.jdt.core.prefs index f09f5504dea..fcf1425718d 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/.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/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/META-INF/MANIFEST.MF index d51c4623f19..4dab9503678 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/META-INF/MANIFEST.MF +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/META-INF/MANIFEST.MF @@ -15,8 +15,8 @@ Bundle-ActivationPolicy: lazy Bundle-ClassPath: . Bundle-Name: %pluginName Bundle-Localization: plugin -Bundle-RequiredExecutionEnvironment: JavaSE-11 -Require-Bundle: com.google.guava;bundle-version="[30.1.0,31.0.0)", +Bundle-RequiredExecutionEnvironment: JavaSE-17 +Require-Bundle: com.google.guava;bundle-version="[32.1.3,33.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)", org.eclipse.gmf.runtime.diagram.ui.properties;bundle-version="[1.8.0,2.0.0)", @@ -68,9 +68,9 @@ Require-Bundle: com.google.guava;bundle-version="[30.1.0,31.0.0)", org.eclipse.ui.navigator;bundle-version="[3.10.0,4.0.0)", org.eclipse.ui.navigator.resources;bundle-version="[3.8.0,4.0.0)" Bundle-Vendor: %providerName -Bundle-Version: 7.0.0.qualifier +Bundle-Version: 7.2.0.qualifier Bundle-ManifestVersion: 2 Bundle-Activator: org.eclipse.papyrus.uml.diagram.sequence.part.UMLDiagramEditorPlugin Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.sequence; singleton:=true -Import-Package: com.google.common.collect;version="[30.1.0, 31.0.0)" +Import-Package: com.google.common.collect;version="[32.0.0, 33.0.0)" Automatic-Module-Name: org.eclipse.papyrus.uml.diagram.sequence diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CInteractionInteractionCompartmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CInteractionInteractionCompartmentEditPart.java index 3829ad6a591..7906e83d633 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CInteractionInteractionCompartmentEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CInteractionInteractionCompartmentEditPart.java @@ -1,5 +1,5 @@ /***************************************************************************** - * Copyright (c) 2017, 2018 CEA LIST, Christian W. Damus, and others. + * Copyright (c) 2017, 2018, 2023 CEA LIST, Christian W. Damus, Pascal Bannerot, 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: * CEA LIST - Initial API and implementation * Christian W. Damus - bug 530201 + * Pascal Bannerot (CEA LIST) pascal.bannerot@cea.fr - Bug 582412 * *****************************************************************************/ @@ -27,8 +28,12 @@ import org.eclipse.gef.requests.ReconnectRequest; import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles; import org.eclipse.gmf.runtime.notation.View; import org.eclipse.papyrus.uml.diagram.sequence.edit.policies.InteractionFragmentContainerCreationEditPolicy; +import org.eclipse.papyrus.uml.diagram.sequence.edit.policies.InteractionFragmentContainerDragDropEditPolicy; /** + * + * Contributors: + * * @author Celine JANSSENS * */ @@ -48,6 +53,7 @@ public class CInteractionInteractionCompartmentEditPart extends InteractionInter super.createDefaultEditPolicies(); installEditPolicy(EditPolicyRoles.CREATION_ROLE, new InteractionFragmentContainerCreationEditPolicy()); + installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new InteractionFragmentContainerDragDropEditPolicy()); } /** diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/InteractionFragmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/InteractionFragmentEditPart.java index dea047ff071..b06be83ba0e 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/InteractionFragmentEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/InteractionFragmentEditPart.java @@ -59,7 +59,7 @@ public abstract class InteractionFragmentEditPart extends RoundedCompartmentEdit if (lifelineCoveredList != null && getParent() != null) { // we get the interactionCompartimentEditPart to have access to all lifelines // EditParts - List<EditPart> childrenEditPart = getParent().getChildren(); + List<? extends EditPart> childrenEditPart = getParent().getChildren(); if (childrenEditPart != null) { // The max value guarantee that the first figure will set the minX value int minX = Integer.MAX_VALUE; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/CombinedFragmentResizeEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/CombinedFragmentResizeEditPolicy.java index 9808c119aaf..7be8da570d7 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/CombinedFragmentResizeEditPolicy.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/CombinedFragmentResizeEditPolicy.java @@ -1,5 +1,5 @@ /***************************************************************************** - * Copyright (c) 2018 EclipseSource and others. + * Copyright (c) 2018, 2023 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,6 +10,7 @@ * * Contributors: * EclipseSource - Initial API and implementation (Bug 533770) + * Pauline DEVILLE (CEA-LIST) pauline.deville@cea.fr - Bug 582075 * *****************************************************************************/ package org.eclipse.papyrus.uml.diagram.sequence.edit.policies; @@ -131,11 +132,8 @@ public class CombinedFragmentResizeEditPolicy extends ResizableEditPolicyEx { Command resizeCFCommand = super.getResizeCommand(request); if (resizeCFCommand != null && resizeCFCommand.canExecute()) { CompoundCommand command = new CompoundCommand(resizeCFCommand.getLabel()); - command.setDebugLabel("Resize CF & Operand"); - - @SuppressWarnings("unchecked") - List<Command> commands = command.getCommands(); - commands.add(resizeCFCommand); + command.setDebugLabel("Resize CF & Operand"); //$NON-NLS-1$ + command.add(resizeCFCommand); ChangeBoundsRequest cbr = request; int direction = cbr.getResizeDirection(); @@ -168,7 +166,7 @@ public class CombinedFragmentResizeEditPolicy extends ResizableEditPolicyEx { resizeOperand.setSizeDelta(new Dimension(cbr.getSizeDelta().width(), 0)); resizeOperand.setResizeDirection(PositionConstants.EAST); } - commands.add(operandPart.getCommand(resizeOperand)); + command.add(operandPart.getCommand(resizeOperand)); } return command; @@ -192,7 +190,7 @@ public class CombinedFragmentResizeEditPolicy extends ResizableEditPolicyEx { ChangeBoundsRequest requestAbove = getResizeAboveRequest(request); ChangeBoundsRequest requestBelow = getResizeBelowRequest(request); - CompoundCommand moveSeparatorCommand = new CompoundCommand("Move Operands Separator"); + CompoundCommand moveSeparatorCommand = new CompoundCommand("Move Operands Separator"); //$NON-NLS-1$ moveSeparatorCommand.add(getOperandAbove(request).getCommand(requestAbove)); moveSeparatorCommand.add(getOperandBelow(request).getCommand(requestBelow)); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/InteractionFragmentContainerDragDropEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/InteractionFragmentContainerDragDropEditPolicy.java new file mode 100644 index 00000000000..70d23666099 --- /dev/null +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/InteractionFragmentContainerDragDropEditPolicy.java @@ -0,0 +1,49 @@ +/***************************************************************************** + * 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: + * CEA LIST - Initial API and implementation + * Pauline DEVILLE (CEA LIST) <pauline.deville@cea.fr> - Bug 582075 + * + *****************************************************************************/ +package org.eclipse.papyrus.uml.diagram.sequence.edit.policies; + +import java.util.List; + +import org.eclipse.gef.EditPart; +import org.eclipse.gef.commands.Command; +import org.eclipse.gef.commands.UnexecutableCommand; +import org.eclipse.gef.requests.ChangeBoundsRequest; +import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy; +import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.CInteractionOperandEditPart; + +/** + * @author Pascal Bannerot (CEA LIST) <pascal.bannerot@cea.fr> + * @since 7.1 + * Forbidden InteractionOperand all drag and drop operations - Bug 582412 + */ + +public class InteractionFragmentContainerDragDropEditPolicy extends DragDropEditPolicy { + /** + * @see org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy#getDropCommand(org.eclipse.gef.requests.ChangeBoundsRequest) + * + * @param request + * @return + */ + @Override + protected Command getDropCommand(ChangeBoundsRequest request) { + List<? extends EditPart> editParts = request.getEditParts(); + + if (editParts.size() == 1 && editParts.get(0) instanceof CInteractionOperandEditPart) { + return UnexecutableCommand.INSTANCE; + } + return super.getDropCommand(request); + } +} diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/InteractionOperandDragDropEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/InteractionOperandDragDropEditPolicy.java index 65a7326f918..3135bb6ac7a 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/InteractionOperandDragDropEditPolicy.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/InteractionOperandDragDropEditPolicy.java @@ -1,5 +1,5 @@ /***************************************************************************** - * Copyright (c) 2009, 2018 Atos Origin, EclipseSource and others. + * Copyright (c) 2009, 2018, 2023 Atos Origin, EclipseSource and others. * * * All rights reserved. This program and the accompanying materials @@ -12,6 +12,8 @@ * Contributors: * Atos Origin - Initial API and implementation * EclipseSource - Bug 533770 + * Pascal Bannerot (CEA LIST) <pascal.bannerot@cea.fr> - Bug 582412 + * Pauline DEVILLE (CEA LIST) <pauline.deville@cea.fr> - Bug 582075 * *****************************************************************************/ package org.eclipse.papyrus.uml.diagram.sequence.edit.policies; @@ -24,6 +26,7 @@ import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.transaction.TransactionalEditingDomain; import org.eclipse.gef.EditPart; import org.eclipse.gef.Request; +import org.eclipse.gef.RequestConstants; import org.eclipse.gef.commands.Command; import org.eclipse.gef.commands.UnexecutableCommand; import org.eclipse.gef.requests.ChangeBoundsRequest; @@ -48,6 +51,7 @@ import org.eclipse.uml2.uml.UMLPackage; /** * The custom DragDropEditPolicy for InteractionOperandEditPart. + * */ public class InteractionOperandDragDropEditPolicy extends DragDropEditPolicy { @@ -59,9 +63,20 @@ public class InteractionOperandDragDropEditPolicy extends DragDropEditPolicy { */ @Override public Command getCommand(Request request) { + if (RequestConstants.REQ_MOVE.equals(request.getType())) { + return getDragCommand((ChangeBoundsRequest) request); + } return super.getCommand(request); } + @Override + protected Command getDragCommand(ChangeBoundsRequest request) { + if (getTargetEditPart(request) instanceof InteractionOperandEditPart) { + return UnexecutableCommand.INSTANCE; + } + return super.getDragCommand(request); + } + /** * @see org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy#getDropCommand(org.eclipse.gef.requests.ChangeBoundsRequest) * @@ -71,7 +86,7 @@ public class InteractionOperandDragDropEditPolicy extends DragDropEditPolicy { @Override @SuppressWarnings("unchecked") // GMF is Java 1.4 protected Command getDropCommand(ChangeBoundsRequest request) { - List<EditPart> editParts = request.getEditParts(); + List<? extends EditPart> editParts = request.getEditParts(); if (editParts.size() == 1 && editParts.get(0) instanceof InteractionOperandEditPart) { InteractionOperandEditPart partToMove = (InteractionOperandEditPart) editParts.get(0); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/OLDLifelineXYLayoutEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/OLDLifelineXYLayoutEditPolicy.java index 11dbd421aeb..c27c3d43ca8 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/OLDLifelineXYLayoutEditPolicy.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/OLDLifelineXYLayoutEditPolicy.java @@ -1,5 +1,5 @@ /***************************************************************************** - * Copyright (c) 2009 CEA + * Copyright (c) 2009, 2023 CEA and Others * * * All rights reserved. This program and the accompanying materials @@ -11,6 +11,7 @@ * * Contributors: * Atos Origin - Initial API and implementation + * Pauline DEVILLE (CEA LIST) <pauline.deville@cea.fr> - Bug 582075 * *****************************************************************************/ package org.eclipse.papyrus.uml.diagram.sequence.edit.policies; @@ -160,7 +161,7 @@ public class OLDLifelineXYLayoutEditPolicy { @SuppressWarnings("unchecked") public static Command getResizeOrMoveChildrenCommand(LifelineEditPart lifelineEP, ChangeBoundsRequest request, boolean isMove, boolean updateEnclosingInteraction, boolean useFixedXPos) { - List<EditPart> editParts = request.getEditParts(); + List<? extends EditPart> editParts = request.getEditParts(); if (editParts != null) { CompoundCommand compoundCmd = new CompoundCommand(); compoundCmd.setLabel("Move or resize"); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/UpdateWeakReferenceForExecSpecEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/UpdateWeakReferenceForExecSpecEditPolicy.java index 0888a941d97..4169276c92c 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/UpdateWeakReferenceForExecSpecEditPolicy.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/UpdateWeakReferenceForExecSpecEditPolicy.java @@ -114,6 +114,7 @@ public class UpdateWeakReferenceForExecSpecEditPolicy extends UpdateWeakReferenc * the {@link CreateViewAndElementRequest} request * @return the command to update weak references */ + @SuppressWarnings("unchecked") private Command getUpdateWeakRefForExecSpecCreate(final CreateViewAndElementRequest request) { Command command = null; CreateViewAndElementRequest createRequest = request; @@ -148,7 +149,8 @@ public class UpdateWeakReferenceForExecSpecEditPolicy extends UpdateWeakReferenc ArrayList<EditPart> senderList = SenderRequestUtils.getSenders(request); - List<?> connectionsAndChildren = new ArrayList<>(); + @SuppressWarnings("rawtypes") + List connectionsAndChildren = new ArrayList<>(); connectionsAndChildren.addAll(((GraphicalEditPart) host).getSourceConnections()); connectionsAndChildren.addAll(((GraphicalEditPart) host).getTargetConnections()); connectionsAndChildren.addAll(((GraphicalEditPart) host).getChildren()); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/UpdateWeakReferenceForMessageSpecEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/UpdateWeakReferenceForMessageSpecEditPolicy.java index d63757199ed..af360ec3578 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/UpdateWeakReferenceForMessageSpecEditPolicy.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/UpdateWeakReferenceForMessageSpecEditPolicy.java @@ -137,7 +137,8 @@ public class UpdateWeakReferenceForMessageSpecEditPolicy extends UpdateWeakRefer IGraphicalEditPart targetLifeLineEP = (IGraphicalEditPart) createRequest.getTargetEditPart(); ArrayList<EditPart> senderList = SenderRequestUtils.getSenders(request); - List<?> connectionsAndChildren = new ArrayList<>(); + @SuppressWarnings("rawtypes") + List connectionsAndChildren = new ArrayList<>(); if (null != sourceLifeLineEP) { connectionsAndChildren.addAll(sourceLifeLineEP.getSourceConnections()); connectionsAndChildren.addAll(sourceLifeLineEP.getTargetConnections()); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/figures/DurationLinkFigure.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/figures/DurationLinkFigure.java index fbc92710b1b..1ddbffcf2c2 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/figures/DurationLinkFigure.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/figures/DurationLinkFigure.java @@ -1,5 +1,5 @@ /***************************************************************************** - * Copyright (c) 2018 CEA LIST, EclipseSource and others. + * Copyright (c) 2018, 2023 CEA LIST, 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 @@ -9,8 +9,8 @@ * SPDX-License-Identifier: EPL-2.0 * * Contributors: - * EclipseSource - Initial API and implementation - * + * EclipseSource - Initial API and implementation + * Vincent LORENZO (CEA LIST) vincent.lorenzo@cea.fr - Bug 581898 *****************************************************************************/ package org.eclipse.papyrus.uml.diagram.sequence.figures; @@ -346,8 +346,7 @@ public class DurationLinkFigure extends UMLEdgeFigure { } // Child labels - @SuppressWarnings("unchecked") - List<IFigure> children = getChildren(); + List<? extends IFigure> children = getChildren(); return children.stream().anyMatch(child -> child.containsPoint(x, y)); } diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/figures/InteractionOperandFigure.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/figures/InteractionOperandFigure.java index 7abbdb1bff1..c8418669f1f 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/figures/InteractionOperandFigure.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/figures/InteractionOperandFigure.java @@ -1,5 +1,5 @@ /***************************************************************************** - * Copyright (c) 2009 CEA + * Copyright (c) 2009, 2023 CEA LIST * * * All rights reserved. This program and the accompanying materials @@ -11,6 +11,7 @@ * * Contributors: * Atos Origin - Initial API and implementation + * Pascal Bannerot (CEA LIST) pascal.bannerot@cea.fr - Bug 582412 * *****************************************************************************/ package org.eclipse.papyrus.uml.diagram.sequence.figures; @@ -87,7 +88,7 @@ public class InteractionOperandFigure extends RoundedCompartmentFigure { Dimension dim = super.getMinimumSize(wHint, hHint); // look for combinedFragmentFigure IFigure cfFigure = getParent(); - while (!(cfFigure instanceof CombinedFragmentFigure)) { + while (cfFigure != null && !(cfFigure instanceof CombinedFragmentFigure)) { cfFigure = cfFigure.getParent(); } if (cfFigure == null) { diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/referencialgrilling/ConnectInteractionOperandToGridEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/referencialgrilling/ConnectInteractionOperandToGridEditPolicy.java index 4f950ad4bbf..30c9f6ea35d 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/referencialgrilling/ConnectInteractionOperandToGridEditPolicy.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/referencialgrilling/ConnectInteractionOperandToGridEditPolicy.java @@ -1,5 +1,5 @@ /***************************************************************************** - * Copyright (c) 2017 CEA LIST and others. + * Copyright (c) 2017, 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 @@ -10,6 +10,7 @@ * * Contributors: * CEA LIST - Initial API and implementation + * Pascal Bannerot (CEA LIST) pascal.bannerot@cea.fr - Bug 582412 * *****************************************************************************/ @@ -115,10 +116,12 @@ public class ConnectInteractionOperandToGridEditPolicy extends ConnectRectangleT @Override public void notifyChanged(Notification notification) { super.notifyChanged(notification); - if (notification.getEventType() == Notification.SET && notification.getNotifier() instanceof Bounds && (((EObject) notification.getNotifier()).eContainer().equals(combinedFragmentEditPart.getNotationView()))) { - PrecisionRectangle bounds = NotationHelper.getAbsoluteBounds((Node) ((GraphicalEditPart) getHost()).getNotationView()); - if (notification.getFeature().equals(NotationPackage.eINSTANCE.getSize_Width())) { - updateColumFinishFromWitdhNotification(bounds); + if (combinedFragmentEditPart != null) { + if (notification.getEventType() == Notification.SET && notification.getNotifier() instanceof Bounds && (((EObject) notification.getNotifier()).eContainer().equals(combinedFragmentEditPart.getNotationView()))) { + PrecisionRectangle bounds = NotationHelper.getAbsoluteBounds((Node) ((GraphicalEditPart) getHost()).getNotationView()); + if (notification.getFeature().equals(NotationPackage.eINSTANCE.getSize_Width())) { + updateColumFinishFromWitdhNotification(bounds); + } } } } diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/referencialgrilling/GridManagementEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/referencialgrilling/GridManagementEditPolicy.java index c258d5304e7..adc17bbf670 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/referencialgrilling/GridManagementEditPolicy.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/referencialgrilling/GridManagementEditPolicy.java @@ -1,5 +1,5 @@ /***************************************************************************** - * Copyright (c) 2016, 2018, 2019 CEA LIST, ALL4TEC, Christian W. Damus, and others. + * Copyright (c) 2016, 2018, 2019, 2023 CEA LIST, ALL4TEC, 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 @@ -14,6 +14,7 @@ * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Bug 531936 * Christian W. Damus - bugs 533679, 530201 * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Bug 548147 + * Pascal Bannerot (CEA LIST) pascal.bannerot@cea.fr - Bug 582412 *****************************************************************************/ package org.eclipse.papyrus.uml.diagram.sequence.referencialgrilling; @@ -364,9 +365,12 @@ public class GridManagementEditPolicy extends GraphicalEditPolicyEx implements A index++; } else { - CombinedFragment cf = (CombinedFragment) ((InteractionOperand) covered.get(index)).eContainer(); - covered.add(index, cf); - index++; + InteractionOperand interactionOperand = (InteractionOperand) covered.get(index); + if (interactionOperand.eContainer() instanceof CombinedFragment) { + CombinedFragment cf = (CombinedFragment) interactionOperand.eContainer(); + covered.add(index, cf); + index++; + } } } index++; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/OperandBoundsComputeHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/OperandBoundsComputeHelper.java index a77c463e4bf..acc4c21d014 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/OperandBoundsComputeHelper.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/OperandBoundsComputeHelper.java @@ -317,6 +317,7 @@ public class OperandBoundsComputeHelper { * @param combinedFragmentEditPart * @return Command */ + @SuppressWarnings("unchecked") public static Command createUpdateIOBoundsForCFResizeCommand(CompoundCommand compoundCmd, final ChangeBoundsRequest request, CombinedFragmentEditPart combinedFragmentEditPart) { if (combinedFragmentEditPart.getChildren().size() > 0 && combinedFragmentEditPart.getChildren().get(0) instanceof CombinedFragmentCombinedFragmentCompartmentEditPart) { CombinedFragmentCombinedFragmentCompartmentEditPart compartment = (CombinedFragmentCombinedFragmentCompartmentEditPart) combinedFragmentEditPart.getChildren().get(0); @@ -327,7 +328,7 @@ public class OperandBoundsComputeHelper { } else if ((request.getResizeDirection() & PositionConstants.SOUTH) != 0) { targetIOEP = findLastIOEP(compartment); } - updateIOBoundsForCFResize(request, compoundCmd, compartment.getChildren(), cf, targetIOEP != null ? (InteractionOperand) targetIOEP.resolveSemanticElement() : null, request.getSizeDelta(), request.getResizeDirection()); + updateIOBoundsForCFResize(request, compoundCmd, (List<EditPart>) compartment.getChildren(), cf, targetIOEP != null ? (InteractionOperand) targetIOEP.resolveSemanticElement() : null, request.getSizeDelta(), request.getResizeDirection()); if (targetIOEP != null && request.getSizeDelta().height != 0) { int heightDelta = request.getSizeDelta().height; int movedY = heightDelta; @@ -846,7 +847,7 @@ public class OperandBoundsComputeHelper { CombinedFragmentEditPart combinedFragmentEditPart = (CombinedFragmentEditPart) child; if (combinedFragmentEditPart.getChildren().size() > 0 && combinedFragmentEditPart.getChildren().get(0) instanceof CombinedFragmentCombinedFragmentCompartmentEditPart) { CombinedFragmentCombinedFragmentCompartmentEditPart compartment = (CombinedFragmentCombinedFragmentCompartmentEditPart) combinedFragmentEditPart.getChildren().get(0); - List<EditPart> combinedFragmentChildrenEditParts = compartment.getChildren(); + List<? extends EditPart> combinedFragmentChildrenEditParts = compartment.getChildren(); CombinedFragment cf = (CombinedFragment) combinedFragmentEditPart.resolveSemanticElement(); InteractionOperand targetOperand = null; if ((request.getResizeDirection() & PositionConstants.NORTH) != 0) { @@ -854,7 +855,8 @@ public class OperandBoundsComputeHelper { } else if ((request.getResizeDirection() & PositionConstants.SOUTH) != 0) { targetOperand = cf.getOperands().get(cf.getOperands().size() - 1); } - InteractionOperandEditPart targetOperandEditPart = OperandBoundsComputeHelper.findTargetOperandEditPart(cf, targetOperand, combinedFragmentChildrenEditParts); + @SuppressWarnings("unchecked") + InteractionOperandEditPart targetOperandEditPart = OperandBoundsComputeHelper.findTargetOperandEditPart(cf, targetOperand, (List<EditPart>) combinedFragmentChildrenEditParts); int heightDelta = request.getSizeDelta().height(); if (targetOperandEditPart != null && heightDelta < 0) { int height = targetOperandEditPart.getFigure().getBounds().height(); @@ -879,7 +881,7 @@ public class OperandBoundsComputeHelper { if (editPart.getParent() instanceof CombinedFragmentCombinedFragmentCompartmentEditPart) { CombinedFragmentCombinedFragmentCompartmentEditPart compartment = (CombinedFragmentCombinedFragmentCompartmentEditPart) editPart.getParent(); if (compartment.getParent() instanceof CombinedFragmentEditPart) { - List<EditPart> combinedFragmentChildrenEditParts = compartment.getChildren(); + List<? extends EditPart> combinedFragmentChildrenEditParts = compartment.getChildren(); InteractionOperandEditPart previousIOEP = null; InteractionOperandEditPart latterIOEP = null; boolean isFirstOperand = false; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/pom.xml b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/pom.xml index 829d0649390..31efb972338 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/pom.xml +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/pom.xml @@ -9,6 +9,6 @@ <version>0.0.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.papyrus.uml.diagram.sequence</artifactId> - <version>7.0.0-SNAPSHOT</version> + <version>7.2.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project>
\ No newline at end of file diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/.classpath b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/.classpath index ca630b31841..4c89b72842b 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/.classpath +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/.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="custom-src"/> <classpathentry kind="output" path="bin"/> diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/.settings/org.eclipse.jdt.core.prefs b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/.settings/org.eclipse.jdt.core.prefs index f09f5504dea..fcf1425718d 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/.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/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/META-INF/MANIFEST.MF index 681e7321556..b12d646d2ce 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/META-INF/MANIFEST.MF +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/META-INF/MANIFEST.MF @@ -31,8 +31,8 @@ Bundle-ClassPath: . Bundle-Name: %pluginName Bundle-Localization: plugin Created-By: 1.5.0_06-b05 (Sun Microsystems Inc.) -Bundle-RequiredExecutionEnvironment: JavaSE-11 -Require-Bundle: com.google.guava;bundle-version="[30.1.0,31.0.0)", +Bundle-RequiredExecutionEnvironment: JavaSE-17 +Require-Bundle: com.google.guava;bundle-version="[32.1.3,33.0.0)", org.eclipse.core.expressions;bundle-version="[3.7.0,4.0.0)", org.eclipse.emf.databinding;bundle-version="[1.5.0,2.0.0)", org.eclipse.emf.validation.ocl;bundle-version="[1.4.0,2.0.0)", diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotype.edition/.classpath b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotype.edition/.classpath index e801ebfb468..81fe078c20c 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotype.edition/.classpath +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotype.edition/.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/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotype.edition/.settings/org.eclipse.jdt.core.prefs b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotype.edition/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotype.edition/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotype.edition/.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/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotype.edition/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotype.edition/META-INF/MANIFEST.MF index 528c6659c2d..9775e89755a 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotype.edition/META-INF/MANIFEST.MF +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotype.edition/META-INF/MANIFEST.MF @@ -26,5 +26,5 @@ Bundle-Activator: org.eclipse.papyrus.uml.diagram.stereotype.edition.Activator Bundle-ManifestVersion: 2 Bundle-Description: %pluginDescription Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.stereotype.edition;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.uml.diagram.stereotype.edition diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.symbols/.classpath b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.symbols/.classpath index e801ebfb468..81fe078c20c 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.symbols/.classpath +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.symbols/.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/uml/diagram/org.eclipse.papyrus.uml.diagram.symbols/.settings/org.eclipse.jdt.core.prefs b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.symbols/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.symbols/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.symbols/.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/uml/diagram/org.eclipse.papyrus.uml.diagram.symbols/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.symbols/META-INF/MANIFEST.MF index 600bf243f49..a1bf4e5bc2e 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.symbols/META-INF/MANIFEST.MF +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.symbols/META-INF/MANIFEST.MF @@ -1,6 +1,7 @@ Manifest-Version: 1.0 Export-Package: org.eclipse.papyrus.uml.diagram.symbols, org.eclipse.papyrus.uml.diagram.symbols.provider +Import-Package: org.w3c.dom.svg;version="[1.1.0,2.0.0)" Require-Bundle: org.eclipse.emf.databinding;bundle-version="[1.5.0,2.0.0)", org.eclipse.gmf.runtime.diagram.ui.properties;bundle-version="[1.8.0,2.0.0)", org.eclipse.gmf.runtime.draw2d.ui.render;bundle-version="[1.7.0,2.0.0)", @@ -11,15 +12,14 @@ Require-Bundle: org.eclipse.emf.databinding;bundle-version="[1.5.0,2.0.0)", org.eclipse.papyrus.uml.diagram.common;bundle-version="[5.0.0,6.0.0)", org.eclipse.papyrus.uml.tools;bundle-version="[5.0.0,6.0.0)", org.eclipse.papyrus.uml.tools.utils;bundle-version="[4.0.0,5.0.0)", - org.eclipse.uml2.uml.editor;bundle-version="[5.5.0,6.0.0)", - org.w3c.dom.svg;bundle-version="[1.1.0,2.0.0)" + org.eclipse.uml2.uml.editor;bundle-version="[5.5.0,6.0.0)" Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy -Bundle-Version: 2.0.0.qualifier +Bundle-Version: 2.0.100.qualifier Bundle-Name: %Bundle-Name Bundle-Activator: org.eclipse.papyrus.uml.diagram.symbols.Activator Bundle-ManifestVersion: 2 Bundle-Description: %Bundle-Description Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.symbols;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.uml.diagram.symbols diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.symbols/pom.xml b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.symbols/pom.xml index e795a08a0d8..00f57dfe2d1 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.symbols/pom.xml +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.symbols/pom.xml @@ -9,6 +9,6 @@ <version>0.0.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.papyrus.uml.diagram.symbols</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/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/.classpath b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/.classpath index 1ee876a6b66..faa13e8e1fd 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/.classpath +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/.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="custom-src"/> diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/.settings/org.eclipse.jdt.core.prefs b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/.settings/org.eclipse.jdt.core.prefs index f09f5504dea..fcf1425718d 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/.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/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/META-INF/MANIFEST.MF index 143def52c87..c05faae31b4 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/META-INF/MANIFEST.MF +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/META-INF/MANIFEST.MF @@ -27,8 +27,8 @@ Bundle-ActivationPolicy: lazy Bundle-ClassPath: . Bundle-Localization: plugin Bundle-Name: %pluginName -Bundle-RequiredExecutionEnvironment: JavaSE-11 -Require-Bundle: com.google.guava;bundle-version="[30.1.0,31.0.0)", +Bundle-RequiredExecutionEnvironment: JavaSE-17 +Require-Bundle: com.google.guava;bundle-version="[32.1.3,33.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)", org.eclipse.gmf.runtime.diagram.ui.properties;bundle-version="[1.8.0,2.0.0)", @@ -71,7 +71,7 @@ Require-Bundle: com.google.guava;bundle-version="[30.1.0,31.0.0)", org.eclipse.uml2.uml.editor;bundle-version="[5.5.0,6.0.0)" Bundle-Vendor: %providerName Eclipse-LazyStart: true -Bundle-Version: 2.0.0.qualifier +Bundle-Version: 2.1.100.qualifier Bundle-Activator: org.eclipse.papyrus.uml.diagram.timing.part.UMLDiagramEditorPlugin Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.timing; singleton:=true diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/edit/parts/CustomCompactLifelineCompartmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/edit/parts/CustomCompactLifelineCompartmentEditPart.java index 61bb688b63a..2bfcb2db39a 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/edit/parts/CustomCompactLifelineCompartmentEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/edit/parts/CustomCompactLifelineCompartmentEditPart.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 * are made available under the terms of the Eclipse Public License 2.0 @@ -7,6 +7,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.uml.diagram.timing.custom.edit.parts; @@ -65,8 +66,7 @@ public class CustomCompactLifelineCompartmentEditPart extends CompactLifelineCom // constantly resets the bounds (in org.eclipse.draw2d.FreeformViewport#readjustScrollBars) // So, layout based on the grand-parent's clientArea. final Rectangle clientArea = container.getParent().getClientArea(); - @SuppressWarnings("unchecked") - final List<IFigure> children = container.getChildren(); + final List<? extends IFigure> children = container.getChildren(); int x = clientArea.x + FIRST_STATE_OFFSET; final int centerY = clientArea.y + clientArea.height / 2; int currentStateInvariantX = 0; @@ -207,7 +207,7 @@ public class CustomCompactLifelineCompartmentEditPart extends CompactLifelineCom return occurrenceFigure; } - protected static IFigure findNextStateChangeOccurrence(final List<IFigure> children, final int startIndex) { + protected static IFigure findNextStateChangeOccurrence(final List<? extends IFigure> children, final int startIndex) { for (int i = startIndex; i < children.size() - 1; i++) { final IFigure figure1 = children.get(i); final IFigure figure2 = children.get(i + 1); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/edit/parts/CustomCompactLifelineEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/edit/parts/CustomCompactLifelineEditPartCN.java index 5704d859c4b..ab31cd383f5 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/edit/parts/CustomCompactLifelineEditPartCN.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/edit/parts/CustomCompactLifelineEditPartCN.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 * are made available under the terms of the Eclipse Public License 2.0 @@ -7,6 +7,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.uml.diagram.timing.custom.edit.parts; @@ -63,8 +64,7 @@ public class CustomCompactLifelineEditPartCN extends CompactLifelineEditPartCN { final int timeRulerHeight = Constants.TIME_RULER_HEIGHT; final boolean displayTimeRuler = lifelineFigure.isDisplayTimeRuler(); final Rectangle clientArea = container.getClientArea(); - @SuppressWarnings("unchecked") - final List<IFigure> children = container.getChildren(); + final List<? extends IFigure> children = container.getChildren(); for (int i = 0; i < children.size(); i++) { final IFigure child = children.get(i); if (child == lifelineFigure.getTimelineContainerFigure()) { diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/edit/parts/CustomFreeTimeRulerCompartmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/edit/parts/CustomFreeTimeRulerCompartmentEditPart.java index 6c43ea8e0b7..d894a259599 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/edit/parts/CustomFreeTimeRulerCompartmentEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/edit/parts/CustomFreeTimeRulerCompartmentEditPart.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 * are made available under the terms of the Eclipse Public License 2.0 @@ -7,6 +7,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.uml.diagram.timing.custom.edit.parts; @@ -119,8 +120,7 @@ public class CustomFreeTimeRulerCompartmentEditPart extends FreeTimeRulerCompart // constantly resets the bounds (in org.eclipse.draw2d.FreeformViewport#readjustScrollBars) // So, layout based on the grand-parent's clientArea. // final Rectangle clientArea = container.getParent().getClientArea(); - @SuppressWarnings("unchecked") - final List<IFigure> children = container.getChildren(); + final List<? extends IFigure> children = container.getChildren(); for (int i = 0; i < children.size(); i++) { final IFigure child = children.get(i); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/edit/parts/CustomFullLifelineEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/edit/parts/CustomFullLifelineEditPartCN.java index 4b23b5634ca..6a97a5d7d7c 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/edit/parts/CustomFullLifelineEditPartCN.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/edit/parts/CustomFullLifelineEditPartCN.java @@ -1,6 +1,5 @@ /***************************************************************************** - * Copyright (c) 2012 CEA LIST. - * + * Copyright (c) 2012, 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 @@ -8,8 +7,8 @@ * 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.uml.diagram.timing.custom.edit.parts; import java.util.List; @@ -65,8 +64,7 @@ public class CustomFullLifelineEditPartCN extends FullLifelineEditPartCN { final int timeRulerHeight = Constants.TIME_RULER_HEIGHT; final boolean displayTimeRuler = lifelineFigure.isDisplayTimeRuler(); final Rectangle clientArea = container.getClientArea(); - @SuppressWarnings("unchecked") - final List<IFigure> children = container.getChildren(); + final List<? extends IFigure> children = container.getChildren(); for (int i = 0; i < children.size(); i++) { final IFigure child = children.get(i); if (child == lifelineFigure.getChronogramContainerFigure()) { diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/edit/parts/CustomFullLifelineTimelineCompartmentEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/edit/parts/CustomFullLifelineTimelineCompartmentEditPartCN.java index f1ccadc77f5..4b89a3b2597 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/edit/parts/CustomFullLifelineTimelineCompartmentEditPartCN.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/edit/parts/CustomFullLifelineTimelineCompartmentEditPartCN.java @@ -1,6 +1,5 @@ /***************************************************************************** - * Copyright (c) 2012 CEA LIST. - * + * Copyright (c) 2012, 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 @@ -8,7 +7,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.uml.diagram.timing.custom.edit.parts; @@ -78,8 +77,7 @@ public class CustomFullLifelineTimelineCompartmentEditPartCN extends FullLifelin // constantly resets the bounds (in org.eclipse.draw2d.FreeformViewport#readjustScrollBars) // So, layout based on the grand-parent's clientArea. final Rectangle clientArea = container.getParent().getClientArea(); - @SuppressWarnings("unchecked") - final List<IFigure> children = container.getChildren(); + final List<? extends IFigure> children = container.getChildren(); final Rectangle[] constraints = new Rectangle[children.size()]; for (int i = 0; i < children.size(); i++) { constraints[i] = (Rectangle) getConstraint(children.get(i)); @@ -143,7 +141,7 @@ public class CustomFullLifelineTimelineCompartmentEditPartCN extends FullLifelin } /** First pass of the layout */ - protected static void layoutOccurrenceSpecificationsAndStateInvariants(final EditPartViewer viewer, final Rectangle clientArea, final List<IFigure> figures, final Rectangle[] constraints) { + protected static void layoutOccurrenceSpecificationsAndStateInvariants(final EditPartViewer viewer, final Rectangle clientArea, final List<? extends IFigure> figures, final Rectangle[] constraints) { int x = clientArea.x; int y = -1; @@ -278,7 +276,7 @@ public class CustomFullLifelineTimelineCompartmentEditPartCN extends FullLifelin * following StateInvariants, the time elements, which can be bound to an OccurrenceSpecification or StateInvariant, * and the GeneralOrderings, which can be linked to OccurrenceSpecifications. */ - protected static void layoutVerticalLinesAndTimeElements(final List<IFigure> figures, final Rectangle clientArea, final Rectangle[] constraints) { + protected static void layoutVerticalLinesAndTimeElements(final List<? extends IFigure> figures, final Rectangle clientArea, final Rectangle[] constraints) { IFigure previousFigure = null; IFigure nextFigure = null; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/edit/parts/CustomInteractionCompartmentEditPartTN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/edit/parts/CustomInteractionCompartmentEditPartTN.java index e4fc383cf73..67918d91a1a 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/edit/parts/CustomInteractionCompartmentEditPartTN.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/edit/parts/CustomInteractionCompartmentEditPartTN.java @@ -1,6 +1,5 @@ /***************************************************************************** - * Copyright (c) 2012 CEA LIST. - * + * Copyright (c) 2012, 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 @@ -8,7 +7,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.uml.diagram.timing.custom.edit.parts; @@ -54,8 +53,7 @@ public class CustomInteractionCompartmentEditPartTN extends InteractionCompartme @Override public void layout(final IFigure container) { - @SuppressWarnings("unchecked") - final List<IFigure> children = container.getChildren(); + final List<? extends IFigure> children = container.getChildren(); final Rectangle clientArea = container.getClientArea(); final Map<IFigure, Integer> numberOfStates = computeNumberOfStates(children); double totalStates = 0; @@ -83,7 +81,7 @@ public class CustomInteractionCompartmentEditPartTN extends InteractionCompartme return result; } - protected Map<IFigure, Integer> computeNumberOfStates(final List<IFigure> children) { + protected Map<IFigure, Integer> computeNumberOfStates(final List<? extends IFigure> children) { final LinkedHashMap<IFigure, Integer> numberOfStatesPerLifeline = new LinkedHashMap<>(); final EditPartViewer viewer = CustomInteractionCompartmentEditPartTN.this.getRoot().getViewer(); for (int i = 0; i < children.size(); i++) { diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/edit/parts/CustomInteractionEditPartTN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/edit/parts/CustomInteractionEditPartTN.java index 930e1a6df22..423108388c9 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/edit/parts/CustomInteractionEditPartTN.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/edit/parts/CustomInteractionEditPartTN.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.uml.diagram.timing.custom.edit.parts; @@ -65,7 +65,7 @@ public class CustomInteractionEditPartTN extends InteractionEditPartTN { // final boolean displayTimeRuler = interactionRectangleFigure.isDisplayTimeRuler(); final Rectangle clientArea = container.getClientArea(); @SuppressWarnings("unchecked") - final List<IFigure> children = container.getChildren(); + final List<? extends IFigure> children = container.getChildren(); int consumedHeight = 0; for (int i = 0; i < children.size(); i++) { final IFigure child = children.get(i); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/edit/parts/CustomTimingDiagramEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/edit/parts/CustomTimingDiagramEditPart.java index 8a7dd2b8460..bb5fe028fc3 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/edit/parts/CustomTimingDiagramEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/edit/parts/CustomTimingDiagramEditPart.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 * are made available under the terms of the Eclipse Public License 2.0 @@ -7,6 +7,11 @@ * 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.uml.diagram.timing.custom.edit.parts; @@ -28,7 +33,6 @@ public class CustomTimingDiagramEditPart extends TimingDiagramEditPart { super(view); } - @SuppressWarnings("unchecked") @Override public Command getCommand(final Request request) { if (request.getType() == RequestConstants.REQ_DROP && !canBeDropped(((GroupRequest) request).getEditParts())) { @@ -38,7 +42,7 @@ public class CustomTimingDiagramEditPart extends TimingDiagramEditPart { return super.getCommand(request); } - private static boolean canBeDropped(final List<EditPart> editParts) { + private static boolean canBeDropped(final List<? extends EditPart> editParts) { for (final EditPart editPart : editParts) { if (!(editPart instanceof InteractionEditPartTN)) { return false; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/edit/policies/AbstractTimelineLayoutPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/edit/policies/AbstractTimelineLayoutPolicy.java index a0628d504a6..84ab1044c34 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/edit/policies/AbstractTimelineLayoutPolicy.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/edit/policies/AbstractTimelineLayoutPolicy.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 * are made available under the terms of the Eclipse Public License 2.0 @@ -7,6 +7,10 @@ * 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.uml.diagram.timing.custom.edit.policies; @@ -179,7 +183,7 @@ public class AbstractTimelineLayoutPolicy extends XYLayoutEditPolicy { /** Returns a command that updates the positions of time elements, relative to the element they are attached to */ protected Command getUpdateTimeElementsCommand() { - final GraphicalEditPart timelineCompartmentEditPart = (GraphicalEditPart) getHost(); + final GraphicalEditPart timelineCompartmentEditPart = getHost(); final Node compartmentView = (Node) timelineCompartmentEditPart.getModel(); final boolean compact = timelineCompartmentEditPart instanceof CompactLifelineCompartmentEditPartCN; final int width = timelineCompartmentEditPart.getFigure().getSize().width; @@ -373,7 +377,6 @@ public class AbstractTimelineLayoutPolicy extends XYLayoutEditPolicy { } // meant to be overridden - @SuppressWarnings("static-method") protected int getOriginX() { return 0; } diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/edit/policies/CustomCompactLifelineCompartmentLayoutEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/edit/policies/CustomCompactLifelineCompartmentLayoutEditPolicy.java index 39c3d72eef3..5d0983650bd 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/edit/policies/CustomCompactLifelineCompartmentLayoutEditPolicy.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/edit/policies/CustomCompactLifelineCompartmentLayoutEditPolicy.java @@ -9,6 +9,10 @@ * * 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.uml.diagram.timing.custom.edit.policies; @@ -89,9 +93,8 @@ public class CustomCompactLifelineCompartmentLayoutEditPolicy extends AbstractTi final int widthDelta = FigureUtils.scaleByZoom(new Point(request.getSizeDelta().width, 0), lifelineEditPart.getFigure()).x; @SuppressWarnings("unchecked") - final List<EditPart> editPartsToResize = request.getEditParts(); - @SuppressWarnings("unchecked") - final List<EditPart> children = compartmentEditPart.getChildren(); + final List<? extends EditPart> editPartsToResize = request.getEditParts(); + final List<? extends EditPart> children = compartmentEditPart.getChildren(); int deltaX = 0; boolean moved = false; for (int i = 0; i < children.size(); i++) { @@ -201,7 +204,7 @@ public class CustomCompactLifelineCompartmentLayoutEditPolicy extends AbstractTi final View timelineCompartmentView = (View) timelineCompartmentEditPart.getModel(); @SuppressWarnings("unchecked") - final List<EditPart> editParts = changeBoundsRequest.getEditParts(); + final List<? extends EditPart> editParts = changeBoundsRequest.getEditParts(); final List<Node> nodesToMove = new ArrayList<>(); for (final EditPart editPart : editParts) { final Object model = editPart.getModel(); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/edit/policies/CustomTimelineCompartmentLayoutEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/edit/policies/CustomTimelineCompartmentLayoutEditPolicy.java index 0139fe47b96..4d69eedd783 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/edit/policies/CustomTimelineCompartmentLayoutEditPolicy.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/edit/policies/CustomTimelineCompartmentLayoutEditPolicy.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 @@ -9,6 +9,10 @@ * * 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.uml.diagram.timing.custom.edit.policies; @@ -112,7 +116,7 @@ public class CustomTimelineCompartmentLayoutEditPolicy extends AbstractTimelineL final String closestStateDefinitionId = StateDefinitionUtils.getStateDefinitionViewID(stateDefinitionView); @SuppressWarnings("unchecked") - final List<EditPart> editParts = changeBoundsRequest.getEditParts(); + final List<? extends EditPart> editParts = changeBoundsRequest.getEditParts(); for (final EditPart editPart : editParts) { if (editPart instanceof FullStateInvariantEditPartCN) { final FullStateInvariantEditPartCN fullStateInvariantEditPart = (FullStateInvariantEditPartCN) editPart; @@ -156,7 +160,7 @@ public class CustomTimelineCompartmentLayoutEditPolicy extends AbstractTimelineL final View timelineCompartmentView = (View) timelineCompartmentEditPart.getModel(); @SuppressWarnings("unchecked") - final List<EditPart> editParts = changeBoundsRequest.getEditParts(); + final List<? extends EditPart> editParts = changeBoundsRequest.getEditParts(); final Point moveDelta = FigureUtils.scaleByZoom(changeBoundsRequest.getMoveDelta(), lifelineEditPart.getFigure()); // no vertical move moveDelta.y = 0; @@ -198,7 +202,7 @@ public class CustomTimelineCompartmentLayoutEditPolicy extends AbstractTimelineL final FullLifelineTimelineCompartmentEditPartCN timelineCompartmentEditPart = (FullLifelineTimelineCompartmentEditPartCN) EditPartUtils.findFirstChildEditPartWithId(lifelineEditPart, FullLifelineTimelineCompartmentEditPartCN.VISUAL_ID); final View timelineCompartmentView = (View) timelineCompartmentEditPart.getModel(); @SuppressWarnings("unchecked") - final List<EditPart> editParts = changeBoundsRequest.getEditParts(); + final List<? extends EditPart> editParts = changeBoundsRequest.getEditParts(); final Point moveDelta = FigureUtils.scaleByZoom(changeBoundsRequest.getMoveDelta(), lifelineEditPart.getFigure()); // no vertical move moveDelta.y = 0; @@ -229,7 +233,7 @@ public class CustomTimelineCompartmentLayoutEditPolicy extends AbstractTimelineL final List<Node> allMovedNodes = new ArrayList<>(); final Map<Object, Object> extendedData = request.getExtendedData(); if (extendedData != null) { - List<EditPart> editParts = (List<EditPart>) extendedData.get(ALL_MOVED_EDITPARTS); + List<? extends EditPart> editParts = (List<EditPart>) extendedData.get(ALL_MOVED_EDITPARTS); // when the request is sent directly, for example in unit tests if (editParts == null) { if (request instanceof GroupRequest) { @@ -301,15 +305,17 @@ public class CustomTimelineCompartmentLayoutEditPolicy extends AbstractTimelineL final ChangeBoundsRequest changeBoundsRequest = (ChangeBoundsRequest) request; final int targetY = computeTargetOrdinate(changeBoundsRequest); @SuppressWarnings("unchecked") - final List<GraphicalEditPart> editParts = changeBoundsRequest.getEditParts(); + final List<? extends EditPart> editParts = changeBoundsRequest.getEditParts(); final double scale = FigureUtils.getScale(getHostFigure()); - for (final GraphicalEditPart editPart : editParts) { - final Rectangle figureBounds = editPart.getFigure().getBounds(); - final Rectangle containerBounds = ((GraphicalEditPart) getHost()).getFigure().getBounds(); - final Rectangle feedbackBounds = new Rectangle(containerBounds.x + figureBounds.x, targetY - LAYOUT_FEEDBACK_HEIGHT / 2, figureBounds.width, LAYOUT_FEEDBACK_HEIGHT); - feedbackBounds.scale(scale); - this.layoutFeedbackFigures.add(createLayoutTargetFeedbackFigure(feedbackBounds)); + for (final EditPart editPart : editParts) { + if (editPart instanceof GraphicalEditPart) { + final Rectangle figureBounds = ((GraphicalEditPart) editPart).getFigure().getBounds(); + final Rectangle containerBounds = getHost().getFigure().getBounds(); + final Rectangle feedbackBounds = new Rectangle(containerBounds.x + figureBounds.x, targetY - LAYOUT_FEEDBACK_HEIGHT / 2, figureBounds.width, LAYOUT_FEEDBACK_HEIGHT); + feedbackBounds.scale(scale); + this.layoutFeedbackFigures.add(createLayoutTargetFeedbackFigure(feedbackBounds)); + } } } diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/edit/policies/GenericListCompartmentLayoutEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/edit/policies/GenericListCompartmentLayoutEditPolicy.java index 420fc359db5..0c70b3c6d80 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/edit/policies/GenericListCompartmentLayoutEditPolicy.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/edit/policies/GenericListCompartmentLayoutEditPolicy.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 * are made available under the terms of the Eclipse Public License 2.0 @@ -7,6 +7,10 @@ * 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.uml.diagram.timing.custom.edit.policies; @@ -41,8 +45,6 @@ import org.eclipse.papyrus.uml.diagram.timing.custom.utils.ViewUtils; * Handles re-ordering Views inside their compartment through drag&drop. This policy is meant to be installed on a list * compartment. */ -// meant to be overridden -@SuppressWarnings("static-method") public class GenericListCompartmentLayoutEditPolicy extends ConstrainedToolbarLayoutEditPolicy { private static final int LAYOUT_FEEDBACK_HEIGHT = 4; @@ -54,7 +56,7 @@ public class GenericListCompartmentLayoutEditPolicy extends ConstrainedToolbarLa protected IFigure layoutFeedbackFigure = null; protected GraphicalEditPart getEditPartToRefresh() { - return (GraphicalEditPart) getHost(); + return getHost(); } protected int getLayoutFeedbackHeight() { @@ -81,10 +83,9 @@ public class GenericListCompartmentLayoutEditPolicy extends ConstrainedToolbarLa return UnexecutableCommand.INSTANCE; } - final GraphicalEditPart hostEditPart = (GraphicalEditPart) getHost(); + final GraphicalEditPart hostEditPart = getHost(); final View compartmentView = (View) hostEditPart.getModel(); - @SuppressWarnings("unchecked") - final List<EditPart> editParts = changeBoundsRequest.getEditParts(); + final List<? extends EditPart> editParts = changeBoundsRequest.getEditParts(); for (final EditPart editPart : editParts) { if (editPart instanceof GraphicalEditPart) { final GraphicalEditPart graphicalEditPart = (GraphicalEditPart) editPart; @@ -149,7 +150,7 @@ public class GenericListCompartmentLayoutEditPolicy extends ConstrainedToolbarLa protected InsertionPoint computeClosestInsertionPoint(final int offset) { @SuppressWarnings("unchecked") - final List<GraphicalEditPart> children = getHost().getChildren(); + final List<GraphicalEditPart> children = (List<GraphicalEditPart>) getHost().getChildren(); if (children.isEmpty()) { return null; } diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/edit/policies/TimingDiagramDragDropEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/edit/policies/TimingDiagramDragDropEditPolicy.java index 6c5a79dc919..a68832149f9 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/edit/policies/TimingDiagramDragDropEditPolicy.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/edit/policies/TimingDiagramDragDropEditPolicy.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 * are made available under the terms of the Eclipse Public License 2.0 @@ -7,6 +7,11 @@ * 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.uml.diagram.timing.custom.edit.policies; @@ -94,7 +99,6 @@ import org.eclipse.uml2.uml.TimeObservation; public class TimingDiagramDragDropEditPolicy extends CommonDiagramDragDropEditPolicy { /** Elements for which we want to specialize the drop */ - @SuppressWarnings("boxing") private static final String[] SPECIFIC_DROP_ELEMENT_IDS = { InteractionEditPartTN.VISUAL_ID, FullLifelineEditPartCN.VISUAL_ID, CompactLifelineEditPartCN.VISUAL_ID, MessageSyncEditPart.VISUAL_ID, MessageAsyncEditPart.VISUAL_ID, MessageReplyEditPart.VISUAL_ID, MessageCreateEditPart.VISUAL_ID, MessageDeleteEditPart.VISUAL_ID, MessageFoundEditPart.VISUAL_ID, MessageLostEditPart.VISUAL_ID, TimeObservationEditPart.VISUAL_ID, TimeConstraintEditPart.VISUAL_ID, DurationObservationEditPartCN.VISUAL_ID, DurationConstraintEditPartCN.VISUAL_ID, GeneralOrderingEditPart.VISUAL_ID, GateEditPart.VISUAL_ID }; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/figures/AbstractMessageFigure.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/figures/AbstractMessageFigure.java index 1db71d973bc..94ac8333d8c 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/figures/AbstractMessageFigure.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/figures/AbstractMessageFigure.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 * are made available under the terms of the Eclipse Public License 2.0 @@ -7,6 +7,10 @@ * 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.uml.diagram.timing.custom.figures; @@ -43,13 +47,11 @@ public abstract class AbstractMessageFigure extends UMLEdgeFigure { } // meant to be overridden - @SuppressWarnings("static-method") protected RotatableDecoration createSourceDecoration() { return null; } // meant to be overridden - @SuppressWarnings("static-method") protected RotatableDecoration createTargetDecoration() { return null; } diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/layouts/TimeRulerLayout.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/layouts/TimeRulerLayout.java index 4ae569b24d9..318af72106b 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/layouts/TimeRulerLayout.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/layouts/TimeRulerLayout.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 * are made available under the terms of the Eclipse Public License 2.0 @@ -7,6 +7,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.uml.diagram.timing.custom.layouts; @@ -30,8 +31,7 @@ public class TimeRulerLayout extends AbstractLayout { // constantly resets the bounds (in org.eclipse.draw2d.FreeformViewport#readjustScrollBars) // So, layout based on the grand-parent's clientArea. final Rectangle clientArea = container.getParent().getClientArea(); - @SuppressWarnings("unchecked") - final List<IFigure> children = container.getChildren(); + final List<? extends IFigure> children = container.getChildren(); for (int i = 0; i < children.size(); i++) { final IFigure child = children.get(i); child.setBounds(clientArea); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/utils/EditPartUtils.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/utils/EditPartUtils.java index 262f85032e4..0f91d752c30 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/utils/EditPartUtils.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/utils/EditPartUtils.java @@ -51,8 +51,7 @@ public class EditPartUtils { result.add(editPart); } } - @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/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/utils/LifelineUtils.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/utils/LifelineUtils.java index 79467a82a35..ebdd64e48e5 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/utils/LifelineUtils.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/utils/LifelineUtils.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 @@ -9,6 +9,10 @@ * * 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.uml.diagram.timing.custom.utils; @@ -111,7 +115,6 @@ public final class LifelineUtils { * the Lifeline's view, containing the StateDefinitions (ignored for a Compact lifeline) * */ - @SuppressWarnings("boxing") public static void updateFragmentNames(final Lifeline lifeline, final View lifelineView) { View fullLifelineView = lifelineView; if (lifelineView != null && !FullLifelineEditPartCN.VISUAL_ID.equals(lifelineView.getType())) { diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/utils/RequestUtils.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/utils/RequestUtils.java index 364b620328b..ba366fe1463 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/utils/RequestUtils.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/utils/RequestUtils.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 * are made available under the terms of the Eclipse Public License 2.0 @@ -7,6 +7,10 @@ * 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.uml.diagram.timing.custom.utils; @@ -46,8 +50,7 @@ public final class RequestUtils { /** Whether the given request is a GroupRequest concerning instances of the given EClass only. */ public static boolean isGroupRequestFor(final GroupRequest groupRequest, final EClass eClass) { - @SuppressWarnings("unchecked") - final List<EditPart> editParts = groupRequest.getEditParts(); + final List<? extends EditPart> editParts = groupRequest.getEditParts(); if (editParts == null) { return false; } @@ -68,8 +71,7 @@ public final class RequestUtils { /** Whether the given request is a GroupRequest concerning instances of the given EditPart only. */ public static boolean isGroupRequestFor(final GroupRequest groupRequest, final Class<? extends EditPart> editPartClass) { - @SuppressWarnings("unchecked") - final List<EditPart> editParts = groupRequest.getEditParts(); + final List<? extends EditPart> editParts = groupRequest.getEditParts(); for (final EditPart editPart : editParts) { if (!editPartClass.isInstance(editPart)) { return false; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/pom.xml b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/pom.xml index a31cff57d4a..8eac545224d 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/pom.xml +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/pom.xml @@ -9,6 +9,6 @@ <version>0.0.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.papyrus.uml.diagram.timing</artifactId> - <version>2.0.0-SNAPSHOT</version> + <version>2.1.100-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project>
\ No newline at end of file diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/.classpath b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/.classpath index ca630b31841..4c89b72842b 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/.classpath +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/.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="custom-src"/> <classpathentry kind="output" path="bin"/> diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/.settings/org.eclipse.jdt.core.prefs b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/.settings/org.eclipse.jdt.core.prefs index f09f5504dea..fcf1425718d 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/.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/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/META-INF/MANIFEST.MF index 586b329ab3c..ef24cbf7a72 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/META-INF/MANIFEST.MF +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/META-INF/MANIFEST.MF @@ -22,8 +22,8 @@ Bundle-ActivationPolicy: lazy Bundle-ClassPath: . Bundle-Name: %pluginName Bundle-Localization: plugin -Bundle-RequiredExecutionEnvironment: JavaSE-11 -Require-Bundle: com.google.guava;bundle-version="[30.1.0,31.0.0)", +Bundle-RequiredExecutionEnvironment: JavaSE-17 +Require-Bundle: com.google.guava;bundle-version="[32.1.3,33.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)", org.eclipse.gmf.runtime.diagram.ui.properties;bundle-version="[1.8.0,2.0.0)", diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/.classpath b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/.classpath index e801ebfb468..81fe078c20c 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/.classpath +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/.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/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/.settings/org.eclipse.jdt.core.prefs b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/.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/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/META-INF/MANIFEST.MF index 654e7c587cd..c847ccb2baf 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/META-INF/MANIFEST.MF +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/META-INF/MANIFEST.MF @@ -36,11 +36,11 @@ Require-Bundle: org.eclipse.emf.databinding;bundle-version="[1.5.0,2.0.0)", org.eclipse.uml2.uml;bundle-version="[5.5.0,6.0.0)" Bundle-Vendor: %pluginProvider Bundle-ActivationPolicy: lazy -Bundle-Version: 4.0.0.qualifier +Bundle-Version: 4.0.100.qualifier Bundle-Name: %pluginName Bundle-Localization: plugin Bundle-Activator: org.eclipse.papyrus.uml.diagram.wizards.Activator Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.wizards;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.uml.diagram.wizards diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/pom.xml b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/pom.xml index c385702e489..24218cd3562 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/pom.xml +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/pom.xml @@ -1,5 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> -<project> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.eclipse.papyrus</groupId> @@ -7,6 +9,6 @@ <version>0.0.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.papyrus.uml.diagram.wizards</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/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/uml/diagram/wizards/command/NewPapyrusModelCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/uml/diagram/wizards/command/NewPapyrusModelCommand.java index cd0bea63a89..b626056aabf 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/uml/diagram/wizards/command/NewPapyrusModelCommand.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/uml/diagram/wizards/command/NewPapyrusModelCommand.java @@ -22,7 +22,11 @@ import org.eclipse.papyrus.infra.core.resource.ModelSet; /** * The Command to create a new Papyrus Model. + * + * @deprecated + * see org.eclipse.papyrus.infra.emf.commands.CreateModelInModelSetCommand */ +@Deprecated(since = "4.0.100") public class NewPapyrusModelCommand extends RecordingCommand { /** The my model set. */ @@ -35,13 +39,13 @@ public class NewPapyrusModelCommand extends RecordingCommand { * Instantiates a new new papyrus model command. * * @param modelSet - * the di resource set + * the di resource set * @param newURI - * the URI of the new model's principal resource + * the URI of the new model's principal resource * @param contextId - * the id of the architecture context + * the id of the architecture context * @param viewpointIds - * the ids of the architecture viewpoints + * the ids of the architecture viewpoints */ public NewPapyrusModelCommand(ModelSet modelSet, URI newURI) { super(modelSet.getTransactionalEditingDomain()); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/uml/diagram/wizards/wizards/CreateModelWizard.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/uml/diagram/wizards/wizards/CreateModelWizard.java index 80ffeb7ba69..33e6202744f 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/uml/diagram/wizards/wizards/CreateModelWizard.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/uml/diagram/wizards/wizards/CreateModelWizard.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008, 2017, 2018, 2019 Obeo, CEA LIST, Christian W. Damus, and others. + * Copyright (c) 2008, 2017-2019, 2023 Obeo, 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 * which accompanies this distribution, and is available at @@ -14,8 +14,9 @@ * Christian W. Damus (CEA) - create models by URI, not IFile (CDO) * Christian W. Damus (CEA) - Support creating models in repositories (CDO) * Christian W. Damus - bugs 490936, 471453, 540584 - * Pauline DEVILLE (CEA LIST) - Bug 493312 - [Wizard] Apply multiple profiles in new model wizard + * Pauline DEVILLE (CEA LIST) - Bug 493312 - [Wizard] Apply multiple profiles in new model wizard * Ansgar Radermacher (CEA LIST) - bug 551952 + * Pauline DEVILLE (CEA LIST) - bug 562218 * *******************************************************************************/ package org.eclipse.papyrus.uml.diagram.wizards.wizards; @@ -63,11 +64,12 @@ 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.ServicesRegistry; +import org.eclipse.papyrus.infra.emf.api.IModelSetService; +import org.eclipse.papyrus.infra.emf.commands.CreateModelInModelSetCommand; import org.eclipse.papyrus.infra.ui.util.EditorUtils; import org.eclipse.papyrus.infra.viewpoints.policy.ViewPrototype; import org.eclipse.papyrus.uml.diagram.wizards.Activator; import org.eclipse.papyrus.uml.diagram.wizards.command.InitFromTemplateCommand; -import org.eclipse.papyrus.uml.diagram.wizards.command.NewPapyrusModelCommand; import org.eclipse.papyrus.uml.diagram.wizards.messages.Messages; import org.eclipse.papyrus.uml.diagram.wizards.pages.INewPapyrusModelPage; import org.eclipse.papyrus.uml.diagram.wizards.pages.NewModelFilePage; @@ -97,6 +99,9 @@ import org.eclipse.ui.ide.IDE; import org.eclipse.ui.services.IEvaluationService; import org.eclipse.uml2.uml.NamedElement; import org.eclipse.uml2.uml.Profile; +import org.osgi.framework.BundleContext; +import org.osgi.framework.FrameworkUtil; +import org.osgi.framework.ServiceReference; /** * Create new model file and initialize a selected diagram. This wizard create @@ -147,6 +152,8 @@ public class CreateModelWizard extends Wizard implements INewWizard { private final NewModelWizardData wizardData = new NewModelWizardData(); + private final IModelSetService modelSetService; + protected static final String EXTENSION_POINT_ID = "org.eclipse.papyrus.uml.diagram.wizards.templates"; //$NON-NLS-1$ /** @@ -158,6 +165,10 @@ public class CreateModelWizard extends Wizard implements INewWizard { setDefaultPageImageDescriptor(Activator.imageDescriptorFromPlugin(Activator.PLUGIN_ID, "icons/papyrus/PapyrusWizban_75x66.gif")); //$NON-NLS-1$ // setHelpAvailable(true); + BundleContext bundleContext = FrameworkUtil.getBundle(this.getClass()).getBundleContext(); + final ServiceReference<IModelSetService> serviceRef = bundleContext.getServiceReference(IModelSetService.class); + modelSetService = bundleContext.getService(serviceRef); + } /** @@ -320,7 +331,7 @@ public class CreateModelWizard extends Wizard implements INewWizard { // have to create the model set and populate it with the DI model // before initializing other services that actually need the DI // model, such as the SashModel Manager service - ModelSet modelSet = registry.getService(ModelSet.class); + ModelSet modelSet = modelSetService.getModelSet(registry); createPapyrusModels(modelSet, newURI); @@ -665,7 +676,7 @@ public class CreateModelWizard extends Wizard implements INewWizard { * the URI of the new model's principal resource */ protected void createPapyrusModels(ModelSet modelSet, URI newURIs) { - RecordingCommand command = new NewPapyrusModelCommand(modelSet, newURIs); + RecordingCommand command = new CreateModelInModelSetCommand(modelSet, newURIs); getCommandStack(modelSet).execute(command); } diff --git a/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.edit/.classpath b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.edit/.classpath index bb642933501..f574c0cbd4d 100755 --- a/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.edit/.classpath +++ b/plugins/uml/expressions/org.eclipse.papyrus.uml.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/uml/expressions/org.eclipse.papyrus.uml.expressions.edit/.settings/org.eclipse.jdt.core.prefs b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.edit/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.edit/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/uml/expressions/org.eclipse.papyrus.uml.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/uml/expressions/org.eclipse.papyrus.uml.expressions.edit/META-INF/MANIFEST.MF b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.edit/META-INF/MANIFEST.MF index b89632cc2cf..6c3bab55c81 100755 --- a/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.edit/META-INF/MANIFEST.MF +++ b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.edit/META-INF/MANIFEST.MF @@ -7,7 +7,7 @@ Bundle-ClassPath: . Bundle-Activator: org.eclipse.papyrus.uml.expressions.umlexpressions.provider.UmlexpressionsEditPlugin$Implementation Bundle-Vendor: %providerName Bundle-Localization: plugin -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.eclipse.papyrus.uml.expressions.umlexpressions.provider Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.18.0,4.0.0)", org.eclipse.emf.ecore.edit;bundle-version="[2.13.0,3.0.0)", diff --git a/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.properties/.classpath b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.properties/.classpath index e801ebfb468..81fe078c20c 100755 --- a/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.properties/.classpath +++ b/plugins/uml/expressions/org.eclipse.papyrus.uml.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/uml/expressions/org.eclipse.papyrus.uml.expressions.properties/.settings/org.eclipse.jdt.core.prefs b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.properties/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.properties/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/uml/expressions/org.eclipse.papyrus.uml.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/uml/expressions/org.eclipse.papyrus.uml.expressions.properties/META-INF/MANIFEST.MF b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.properties/META-INF/MANIFEST.MF index f6057c99c3a..c6e21478ca6 100755 --- a/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.properties/META-INF/MANIFEST.MF +++ b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.properties/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.papyrus.uml.expressions.properties;singleton:=true Bundle-Version: 2.0.0.qualifier Bundle-Vendor: %Bundle-Vendor -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 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)", org.eclipse.gmf.runtime.emf.type.core;bundle-version="[1.9.0,2.0.0)", diff --git a/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions/.classpath b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions/.classpath index bb642933501..f574c0cbd4d 100755 --- a/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions/.classpath +++ b/plugins/uml/expressions/org.eclipse.papyrus.uml.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/uml/expressions/org.eclipse.papyrus.uml.expressions/.settings/org.eclipse.jdt.core.prefs b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/uml/expressions/org.eclipse.papyrus.uml.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/uml/expressions/org.eclipse.papyrus.uml.expressions/META-INF/MANIFEST.MF b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions/META-INF/MANIFEST.MF index 92678932a22..e2177fde28e 100755 --- a/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions/META-INF/MANIFEST.MF +++ b/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions/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.uml.expressions.umlexpressions, org.eclipse.papyrus.uml.expressions.umlexpressions.custom, org.eclipse.papyrus.uml.expressions.umlexpressions.impl, diff --git a/plugins/uml/internationalization/org.eclipse.papyrus.uml.internationalization.edit/.classpath b/plugins/uml/internationalization/org.eclipse.papyrus.uml.internationalization.edit/.classpath index 54f6168870d..82b2944d5a5 100644 --- a/plugins/uml/internationalization/org.eclipse.papyrus.uml.internationalization.edit/.classpath +++ b/plugins/uml/internationalization/org.eclipse.papyrus.uml.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"/> <classpathentry kind="output" path="bin"/> diff --git a/plugins/uml/internationalization/org.eclipse.papyrus.uml.internationalization.edit/.settings/org.eclipse.jdt.core.prefs b/plugins/uml/internationalization/org.eclipse.papyrus.uml.internationalization.edit/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/uml/internationalization/org.eclipse.papyrus.uml.internationalization.edit/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/uml/internationalization/org.eclipse.papyrus.uml.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/uml/internationalization/org.eclipse.papyrus.uml.internationalization.edit/META-INF/MANIFEST.MF b/plugins/uml/internationalization/org.eclipse.papyrus.uml.internationalization.edit/META-INF/MANIFEST.MF index 555137beecd..8e57a36736d 100644 --- a/plugins/uml/internationalization/org.eclipse.papyrus.uml.internationalization.edit/META-INF/MANIFEST.MF +++ b/plugins/uml/internationalization/org.eclipse.papyrus.uml.internationalization.edit/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 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.internationalization.common;bundle-version="[2.0.0,3.0.0)", diff --git a/plugins/uml/internationalization/org.eclipse.papyrus.uml.internationalization.utils/.classpath b/plugins/uml/internationalization/org.eclipse.papyrus.uml.internationalization.utils/.classpath index 54f6168870d..82b2944d5a5 100644 --- a/plugins/uml/internationalization/org.eclipse.papyrus.uml.internationalization.utils/.classpath +++ b/plugins/uml/internationalization/org.eclipse.papyrus.uml.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/uml/internationalization/org.eclipse.papyrus.uml.internationalization.utils/.settings/org.eclipse.jdt.core.prefs b/plugins/uml/internationalization/org.eclipse.papyrus.uml.internationalization.utils/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/uml/internationalization/org.eclipse.papyrus.uml.internationalization.utils/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/uml/internationalization/org.eclipse.papyrus.uml.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/uml/internationalization/org.eclipse.papyrus.uml.internationalization.utils/META-INF/MANIFEST.MF b/plugins/uml/internationalization/org.eclipse.papyrus.uml.internationalization.utils/META-INF/MANIFEST.MF index 26d24dff5c7..be8cabf0ca3 100644 --- a/plugins/uml/internationalization/org.eclipse.papyrus.uml.internationalization.utils/META-INF/MANIFEST.MF +++ b/plugins/uml/internationalization/org.eclipse.papyrus.uml.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 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.core.log;bundle-version="[2.0.0,3.0.0)", diff --git a/plugins/uml/internationalization/org.eclipse.papyrus.uml.internationalization.utils/src/org/eclipse/papyrus/uml/internationalization/utils/utils/UMLLabelInternationalization.java b/plugins/uml/internationalization/org.eclipse.papyrus.uml.internationalization.utils/src/org/eclipse/papyrus/uml/internationalization/utils/utils/UMLLabelInternationalization.java index 6871453aa38..71b6e12b728 100644 --- a/plugins/uml/internationalization/org.eclipse.papyrus.uml.internationalization.utils/src/org/eclipse/papyrus/uml/internationalization/utils/utils/UMLLabelInternationalization.java +++ b/plugins/uml/internationalization/org.eclipse.papyrus.uml.internationalization.utils/src/org/eclipse/papyrus/uml/internationalization/utils/utils/UMLLabelInternationalization.java @@ -85,12 +85,11 @@ public class UMLLabelInternationalization { if (null != namedElement.eResource()) { URI resourceURI = namedElement.eResource().getURI(); final ResourceSet resourceSet = namedElement.eResource().getResourceSet(); - if (resourceSet instanceof ModelSet) { + if (resourceSet instanceof ModelSet && ((ModelSet) resourceSet).getURIWithoutExtension() != null) { resourceURI = ((ModelSet) resourceSet).getURIWithoutExtension().appendFileExtension(DiModel.DI_FILE_EXTENSION); } if (InternationalizationPreferencesUtils.getInternationalizationPreference(resourceURI)) { result = getLabelWithoutUML(namedElement, localize); - } } String name = null; @@ -100,7 +99,7 @@ public class UMLLabelInternationalization { } else { name = namedElement.getName(); } - + return null != result ? result : name; } diff --git a/plugins/uml/internationalization/org.eclipse.papyrus.uml.internationalization/.classpath b/plugins/uml/internationalization/org.eclipse.papyrus.uml.internationalization/.classpath index 54f6168870d..82b2944d5a5 100644 --- a/plugins/uml/internationalization/org.eclipse.papyrus.uml.internationalization/.classpath +++ b/plugins/uml/internationalization/org.eclipse.papyrus.uml.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/uml/internationalization/org.eclipse.papyrus.uml.internationalization/.settings/org.eclipse.jdt.core.prefs b/plugins/uml/internationalization/org.eclipse.papyrus.uml.internationalization/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/uml/internationalization/org.eclipse.papyrus.uml.internationalization/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/uml/internationalization/org.eclipse.papyrus.uml.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/uml/internationalization/org.eclipse.papyrus.uml.internationalization/META-INF/MANIFEST.MF b/plugins/uml/internationalization/org.eclipse.papyrus.uml.internationalization/META-INF/MANIFEST.MF index 2095968d19b..80ce7bdcc23 100644 --- a/plugins/uml/internationalization/org.eclipse.papyrus.uml.internationalization/META-INF/MANIFEST.MF +++ b/plugins/uml/internationalization/org.eclipse.papyrus.uml.internationalization/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 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.core.log;bundle-version="[2.0.0,3.0.0)", diff --git a/plugins/uml/m2m/org.eclipse.papyrus.uml.m2m.qvto.common.blackboxes/.classpath b/plugins/uml/m2m/org.eclipse.papyrus.uml.m2m.qvto.common.blackboxes/.classpath index e801ebfb468..81fe078c20c 100644 --- a/plugins/uml/m2m/org.eclipse.papyrus.uml.m2m.qvto.common.blackboxes/.classpath +++ b/plugins/uml/m2m/org.eclipse.papyrus.uml.m2m.qvto.common.blackboxes/.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/uml/m2m/org.eclipse.papyrus.uml.m2m.qvto.common.blackboxes/.settings/org.eclipse.jdt.core.prefs b/plugins/uml/m2m/org.eclipse.papyrus.uml.m2m.qvto.common.blackboxes/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/uml/m2m/org.eclipse.papyrus.uml.m2m.qvto.common.blackboxes/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/uml/m2m/org.eclipse.papyrus.uml.m2m.qvto.common.blackboxes/.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/uml/m2m/org.eclipse.papyrus.uml.m2m.qvto.common.blackboxes/META-INF/MANIFEST.MF b/plugins/uml/m2m/org.eclipse.papyrus.uml.m2m.qvto.common.blackboxes/META-INF/MANIFEST.MF index 9494a1e6c02..670f3e6f92a 100644 --- a/plugins/uml/m2m/org.eclipse.papyrus.uml.m2m.qvto.common.blackboxes/META-INF/MANIFEST.MF +++ b/plugins/uml/m2m/org.eclipse.papyrus.uml.m2m.qvto.common.blackboxes/META-INF/MANIFEST.MF @@ -13,7 +13,7 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.18.0,4.0.0)", org.eclipse.papyrus.infra.core.log;bundle-version="[2.0.0,3.0.0)", org.eclipse.ui;bundle-version="[3.117.0,4.0.0)", org.eclipse.uml2.uml;bundle-version="[5.5.0,6.0.0)" -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-ActivationPolicy: lazy Export-Package: org.eclipse.papyrus.uml.m2m.qvto.common.blackboxes, org.eclipse.papyrus.uml.m2m.qvto.common.blackboxes.ecore, diff --git a/plugins/uml/m2m/org.eclipse.papyrus.uml.m2m.qvto.common/.classpath b/plugins/uml/m2m/org.eclipse.papyrus.uml.m2m.qvto.common/.classpath index 9404e3d0f26..ee87847c66c 100644 --- a/plugins/uml/m2m/org.eclipse.papyrus.uml.m2m.qvto.common/.classpath +++ b/plugins/uml/m2m/org.eclipse.papyrus.uml.m2m.qvto.common/.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/uml/m2m/org.eclipse.papyrus.uml.m2m.qvto.common/.settings/org.eclipse.jdt.core.prefs b/plugins/uml/m2m/org.eclipse.papyrus.uml.m2m.qvto.common/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/uml/m2m/org.eclipse.papyrus.uml.m2m.qvto.common/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/uml/m2m/org.eclipse.papyrus.uml.m2m.qvto.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/uml/m2m/org.eclipse.papyrus.uml.m2m.qvto.common/META-INF/MANIFEST.MF b/plugins/uml/m2m/org.eclipse.papyrus.uml.m2m.qvto.common/META-INF/MANIFEST.MF index bd4d777b3ee..13250914c92 100644 --- a/plugins/uml/m2m/org.eclipse.papyrus.uml.m2m.qvto.common/META-INF/MANIFEST.MF +++ b/plugins/uml/m2m/org.eclipse.papyrus.uml.m2m.qvto.common/META-INF/MANIFEST.MF @@ -23,7 +23,7 @@ Require-Bundle: org.eclipse.emf.databinding;bundle-version="[1.5.0,2.0.0)", org.eclipse.ui.console;bundle-version="[3.9.0,4.0.0)", org.eclipse.ui.views.properties.tabbed;bundle-version="[3.8.0,4.0.0)", org.eclipse.uml2.uml;bundle-version="[5.5.0,6.0.0)" -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-ActivationPolicy: lazy Export-Package: org.eclipse.papyrus.uml.m2m.qvto.common, org.eclipse.papyrus.uml.m2m.qvto.common.concurrent, @@ -37,6 +37,6 @@ Export-Package: org.eclipse.papyrus.uml.m2m.qvto.common, org.eclipse.papyrus.uml.m2m.qvto.common.MigrationParameters, org.eclipse.papyrus.uml.m2m.qvto.common.MigrationParameters.impl, org.eclipse.papyrus.uml.m2m.qvto.common.MigrationParameters.util -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="[32.0.0, 33.0.0)", + com.google.common.collect;version="[32.0.0, 33.0.0)" Automatic-Module-Name: org.eclipse.papyrus.uml.m2m.qvto.common diff --git a/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer.widgets/.classpath b/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer.widgets/.classpath index e801ebfb468..81fe078c20c 100644 --- a/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer.widgets/.classpath +++ b/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer.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/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer.widgets/.settings/org.eclipse.jdt.core.prefs b/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer.widgets/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer.widgets/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer.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/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer.widgets/META-INF/MANIFEST.MF b/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer.widgets/META-INF/MANIFEST.MF index 217a7d5398d..c459cecc53c 100644 --- a/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer.widgets/META-INF/MANIFEST.MF +++ b/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer.widgets/META-INF/MANIFEST.MF @@ -17,5 +17,5 @@ Bundle-Name: %pluginName Bundle-Activator: org.eclipse.papyrus.uml.modelexplorer.widgets.Activator Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.uml.modelexplorer.widgets;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.uml.modelexplorer.widgets diff --git a/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer/.classpath b/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer/.classpath index ad5e13cce77..946fb3d346f 100644 --- a/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer/.classpath +++ b/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.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="src" path="src-gen"/> diff --git a/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer/.settings/org.eclipse.jdt.core.prefs b/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.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/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer/META-INF/MANIFEST.MF b/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer/META-INF/MANIFEST.MF index 7ddda29a805..141829b6ce1 100644 --- a/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer/META-INF/MANIFEST.MF +++ b/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer/META-INF/MANIFEST.MF @@ -41,6 +41,6 @@ Bundle-Localization: plugin Bundle-ManifestVersion: 2 Bundle-Activator: org.eclipse.papyrus.uml.modelexplorer.Activator Bundle-SymbolicName: org.eclipse.papyrus.uml.modelexplorer;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="[32.0.0, 33.0.0)" Automatic-Module-Name: org.eclipse.papyrus.uml.modelexplorer diff --git a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config/.classpath b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config/.classpath index e801ebfb468..81fe078c20c 100644 --- a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config/.classpath +++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.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/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config/.settings/org.eclipse.jdt.core.prefs b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.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/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config/META-INF/MANIFEST.MF b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config/META-INF/MANIFEST.MF index cc44e3f6c40..ad42809e4bd 100644 --- a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config/META-INF/MANIFEST.MF +++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config/META-INF/MANIFEST.MF @@ -20,5 +20,5 @@ Bundle-Activator: org.eclipse.papyrus.uml.nattable.clazz.config.Activator Bundle-ManifestVersion: 2 Bundle-Description: %Bundle-Description Bundle-SymbolicName: org.eclipse.papyrus.uml.nattable.clazz.config;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.uml.nattable.clazz.config diff --git a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.config/.classpath b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.config/.classpath index e801ebfb468..81fe078c20c 100644 --- a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.config/.classpath +++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.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/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.config/.settings/org.eclipse.jdt.core.prefs b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.config/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.config/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.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/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.config/META-INF/MANIFEST.MF b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.config/META-INF/MANIFEST.MF index 6c656a8a781..0264f15a7ef 100644 --- a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.config/META-INF/MANIFEST.MF +++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.config/META-INF/MANIFEST.MF @@ -11,5 +11,5 @@ Bundle-Name: UML Generic Table Config Bundle-Activator: org.eclipse.papyrus.uml.nattable.generic.config.Activator Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.uml.nattable.generic.config;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.uml.nattable.generic.config diff --git a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic/.classpath b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic/.classpath index e801ebfb468..81fe078c20c 100644 --- a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic/.classpath +++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic/.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/uml/nattable/org.eclipse.papyrus.uml.nattable.generic/.settings/org.eclipse.jdt.core.prefs b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic/.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/uml/nattable/org.eclipse.papyrus.uml.nattable.generic/META-INF/MANIFEST.MF b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic/META-INF/MANIFEST.MF index 4eb36f85be0..5158952bc04 100644 --- a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic/META-INF/MANIFEST.MF +++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic/META-INF/MANIFEST.MF @@ -11,5 +11,5 @@ Bundle-Activator: org.eclipse.papyrus.uml.nattable.generic.Activator Bundle-ManifestVersion: 2 Bundle-Description: %pluginDescription Bundle-SymbolicName: org.eclipse.papyrus.uml.nattable.generic;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.uml.nattable.generic diff --git a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.matrix/.classpath b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.matrix/.classpath index e801ebfb468..81fe078c20c 100755 --- a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.matrix/.classpath +++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.matrix/.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/uml/nattable/org.eclipse.papyrus.uml.nattable.matrix/.settings/org.eclipse.jdt.core.prefs b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.matrix/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.matrix/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.matrix/.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/uml/nattable/org.eclipse.papyrus.uml.nattable.matrix/META-INF/MANIFEST.MF b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.matrix/META-INF/MANIFEST.MF index 6747ed9cee9..ac3870cee9a 100755 --- a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.matrix/META-INF/MANIFEST.MF +++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.matrix/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: Papyrys UML Nattable Matrix Bundle-SymbolicName: org.eclipse.papyrus.uml.nattable.matrix;singleton:=true Bundle-Version: 2.0.0.qualifier Bundle-Vendor: Eclipse Modeling Project -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Require-Bundle: org.eclipse.draw2d;bundle-version="[3.10.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/uml/nattable/org.eclipse.papyrus.uml.nattable.menu/.classpath b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.menu/.classpath index ad5e13cce77..946fb3d346f 100644 --- a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.menu/.classpath +++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.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="src" path="src-gen"/> diff --git a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.menu/.settings/org.eclipse.jdt.core.prefs b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.menu/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.menu/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.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/uml/nattable/org.eclipse.papyrus.uml.nattable.menu/META-INF/MANIFEST.MF b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.menu/META-INF/MANIFEST.MF index dcd0266ce6c..fd2dbe4f3f0 100644 --- a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.menu/META-INF/MANIFEST.MF +++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.menu/META-INF/MANIFEST.MF @@ -24,5 +24,5 @@ Bundle-Activator: org.eclipse.papyrus.uml.nattable.menu.Activator Bundle-ManifestVersion: 2 Bundle-Description: %pluginDescription Bundle-SymbolicName: org.eclipse.papyrus.uml.nattable.menu;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.uml.nattable.menu diff --git a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.properties/.classpath b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.properties/.classpath index e801ebfb468..81fe078c20c 100755 --- a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.properties/.classpath +++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.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/uml/nattable/org.eclipse.papyrus.uml.nattable.properties/.settings/org.eclipse.jdt.core.prefs b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.properties/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.properties/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.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/uml/nattable/org.eclipse.papyrus.uml.nattable.properties/META-INF/MANIFEST.MF b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.properties/META-INF/MANIFEST.MF index 5c3718a3689..eee6cb046a3 100755 --- a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.properties/META-INF/MANIFEST.MF +++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.properties/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.papyrus.uml.nattable.properties;singleton:=true Bundle-Version: 2.0.0.qualifier Bundle-Vendor: %Bundle-Vendor -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/uml/nattable/org.eclipse.papyrus.uml.nattable.richtext/.classpath b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.richtext/.classpath index 18aabea9777..1fbf7ad5c53 100644 --- a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.richtext/.classpath +++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.richtext/.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/uml/nattable/org.eclipse.papyrus.uml.nattable.richtext/.settings/org.eclipse.jdt.core.prefs b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.richtext/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.richtext/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.richtext/.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/uml/nattable/org.eclipse.papyrus.uml.nattable.richtext/META-INF/MANIFEST.MF b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.richtext/META-INF/MANIFEST.MF index 5d4e99460e1..d7e7a9bb172 100644 --- a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.richtext/META-INF/MANIFEST.MF +++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.richtext/META-INF/MANIFEST.MF @@ -7,7 +7,7 @@ Bundle-Localization: plugin Bundle-Activator: org.eclipse.papyrus.uml.nattable.richtext.Activator Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.uml.nattable.richtext;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 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)", org.eclipse.gmf.runtime.common.ui;bundle-version="[1.8.0,2.0.0)", diff --git a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotype.display/.classpath b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotype.display/.classpath index e801ebfb468..81fe078c20c 100644 --- a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotype.display/.classpath +++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotype.display/.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/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotype.display/.settings/org.eclipse.jdt.core.prefs b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotype.display/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotype.display/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotype.display/.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/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotype.display/META-INF/MANIFEST.MF b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotype.display/META-INF/MANIFEST.MF index 91f64fa966c..ad27503da0c 100644 --- a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotype.display/META-INF/MANIFEST.MF +++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotype.display/META-INF/MANIFEST.MF @@ -30,5 +30,5 @@ Bundle-Name: Stereotype Display Table Bundle-ManifestVersion: 2 Bundle-Activator: org.eclipse.papyrus.uml.nattable.stereotype.display.Activator Bundle-SymbolicName: org.eclipse.papyrus.uml.nattable.stereotype.display;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.uml.nattable.stereotype.display diff --git a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.xtext.integration/.classpath b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.xtext.integration/.classpath index e801ebfb468..81fe078c20c 100644 --- a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.xtext.integration/.classpath +++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.xtext.integration/.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/uml/nattable/org.eclipse.papyrus.uml.nattable.xtext.integration/.settings/org.eclipse.jdt.core.prefs b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.xtext.integration/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.xtext.integration/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.xtext.integration/.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/uml/nattable/org.eclipse.papyrus.uml.nattable.xtext.integration/META-INF/MANIFEST.MF b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.xtext.integration/META-INF/MANIFEST.MF index 33ed351b072..4325901d5f1 100644 --- a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.xtext.integration/META-INF/MANIFEST.MF +++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.xtext.integration/META-INF/MANIFEST.MF @@ -21,5 +21,5 @@ Bundle-Activator: org.eclipse.papyrus.uml.nattable.xtext.integration.Activator Bundle-ManifestVersion: 2 Bundle-Description: %pluginDescription Bundle-SymbolicName: org.eclipse.papyrus.uml.nattable.xtext.integration;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.uml.nattable.xtext.integration diff --git a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.xtext.valuespecification/.classpath b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.xtext.valuespecification/.classpath index e801ebfb468..3628e336878 100644 --- a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.xtext.valuespecification/.classpath +++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.xtext.valuespecification/.classpath @@ -1,6 +1,10 @@ <?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"> + <attributes> + <attribute name="module" value="true"/> + </attributes> + </classpathentry> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src"/> <classpathentry kind="output" path="bin"/> diff --git a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.xtext.valuespecification/.settings/org.eclipse.jdt.core.prefs b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.xtext.valuespecification/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.xtext.valuespecification/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.xtext.valuespecification/.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/uml/nattable/org.eclipse.papyrus.uml.nattable.xtext.valuespecification/META-INF/MANIFEST.MF b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.xtext.valuespecification/META-INF/MANIFEST.MF index f93b8fad30c..4d4cfaac36e 100644 --- a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.xtext.valuespecification/META-INF/MANIFEST.MF +++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.xtext.valuespecification/META-INF/MANIFEST.MF @@ -27,5 +27,5 @@ Bundle-Activator: org.eclipse.papyrus.uml.nattable.xtext.valuespecification.Acti Bundle-ManifestVersion: 2 Bundle-Description: %pluginDescription Bundle-SymbolicName: org.eclipse.papyrus.uml.nattable.xtext.valuespecification;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.uml.nattable.xtext.valuespecification diff --git a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/.classpath b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/.classpath index e801ebfb468..81fe078c20c 100644 --- a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/.classpath +++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.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/uml/nattable/org.eclipse.papyrus.uml.nattable/.settings/org.eclipse.jdt.core.prefs b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.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/uml/nattable/org.eclipse.papyrus.uml.nattable/META-INF/MANIFEST.MF b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/META-INF/MANIFEST.MF index d5ba04f12d8..6e6c2741294 100644 --- a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/META-INF/MANIFEST.MF +++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/META-INF/MANIFEST.MF @@ -45,5 +45,5 @@ Bundle-Localization: plugin Bundle-Activator: org.eclipse.papyrus.uml.nattable.Activator Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.uml.nattable;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.uml.nattable diff --git a/plugins/uml/org.eclipse.papyrus.uml.appearance/.classpath b/plugins/uml/org.eclipse.papyrus.uml.appearance/.classpath index e801ebfb468..81fe078c20c 100644 --- a/plugins/uml/org.eclipse.papyrus.uml.appearance/.classpath +++ b/plugins/uml/org.eclipse.papyrus.uml.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/uml/org.eclipse.papyrus.uml.appearance/.settings/org.eclipse.jdt.core.prefs b/plugins/uml/org.eclipse.papyrus.uml.appearance/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/uml/org.eclipse.papyrus.uml.appearance/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/uml/org.eclipse.papyrus.uml.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/uml/org.eclipse.papyrus.uml.appearance/META-INF/MANIFEST.MF b/plugins/uml/org.eclipse.papyrus.uml.appearance/META-INF/MANIFEST.MF index f8d8b989e05..a62b605cfba 100644 --- a/plugins/uml/org.eclipse.papyrus.uml.appearance/META-INF/MANIFEST.MF +++ b/plugins/uml/org.eclipse.papyrus.uml.appearance/META-INF/MANIFEST.MF @@ -15,5 +15,5 @@ Bundle-Name: %Bundle-Name Bundle-Activator: org.eclipse.papyrus.uml.appearance.Activator Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.uml.appearance;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.uml.appearance diff --git a/plugins/uml/org.eclipse.papyrus.uml.commands/.classpath b/plugins/uml/org.eclipse.papyrus.uml.commands/.classpath index e801ebfb468..81fe078c20c 100644 --- a/plugins/uml/org.eclipse.papyrus.uml.commands/.classpath +++ b/plugins/uml/org.eclipse.papyrus.uml.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/uml/org.eclipse.papyrus.uml.commands/.settings/org.eclipse.jdt.core.prefs b/plugins/uml/org.eclipse.papyrus.uml.commands/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/uml/org.eclipse.papyrus.uml.commands/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/uml/org.eclipse.papyrus.uml.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/uml/org.eclipse.papyrus.uml.commands/META-INF/MANIFEST.MF b/plugins/uml/org.eclipse.papyrus.uml.commands/META-INF/MANIFEST.MF index 56780f79487..d3c8a8d5f96 100644 --- a/plugins/uml/org.eclipse.papyrus.uml.commands/META-INF/MANIFEST.MF +++ b/plugins/uml/org.eclipse.papyrus.uml.commands/META-INF/MANIFEST.MF @@ -23,5 +23,5 @@ Bundle-Name: %pluginName Bundle-Activator: org.eclipse.papyrus.uml.commands.Activator Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.uml.commands;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.uml.commands diff --git a/plugins/uml/org.eclipse.papyrus.uml.controlmode.profile/.classpath b/plugins/uml/org.eclipse.papyrus.uml.controlmode.profile/.classpath index e801ebfb468..81fe078c20c 100644 --- a/plugins/uml/org.eclipse.papyrus.uml.controlmode.profile/.classpath +++ b/plugins/uml/org.eclipse.papyrus.uml.controlmode.profile/.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/uml/org.eclipse.papyrus.uml.controlmode.profile/.settings/org.eclipse.jdt.core.prefs b/plugins/uml/org.eclipse.papyrus.uml.controlmode.profile/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/uml/org.eclipse.papyrus.uml.controlmode.profile/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/uml/org.eclipse.papyrus.uml.controlmode.profile/.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/uml/org.eclipse.papyrus.uml.controlmode.profile/META-INF/MANIFEST.MF b/plugins/uml/org.eclipse.papyrus.uml.controlmode.profile/META-INF/MANIFEST.MF index 7d3cab0a353..b0f9bf3aa64 100644 --- a/plugins/uml/org.eclipse.papyrus.uml.controlmode.profile/META-INF/MANIFEST.MF +++ b/plugins/uml/org.eclipse.papyrus.uml.controlmode.profile/META-INF/MANIFEST.MF @@ -19,7 +19,7 @@ Bundle-Name: %pluginName Bundle-Activator: org.eclipse.papyrus.uml.controlmode.profile.Activator Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.uml.controlmode.profile;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="[32.0.0, 33.0.0)", + com.google.common.collect;version="[32.0.0, 33.0.0)" Automatic-Module-Name: org.eclipse.papyrus.uml.controlmode.profile diff --git a/plugins/uml/org.eclipse.papyrus.uml.documentation.profile/.classpath b/plugins/uml/org.eclipse.papyrus.uml.documentation.profile/.classpath index bb642933501..f574c0cbd4d 100644 --- a/plugins/uml/org.eclipse.papyrus.uml.documentation.profile/.classpath +++ b/plugins/uml/org.eclipse.papyrus.uml.documentation.profile/.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/uml/org.eclipse.papyrus.uml.documentation.profile/.settings/org.eclipse.jdt.core.prefs b/plugins/uml/org.eclipse.papyrus.uml.documentation.profile/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/uml/org.eclipse.papyrus.uml.documentation.profile/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/uml/org.eclipse.papyrus.uml.documentation.profile/.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/uml/org.eclipse.papyrus.uml.documentation.profile/META-INF/MANIFEST.MF b/plugins/uml/org.eclipse.papyrus.uml.documentation.profile/META-INF/MANIFEST.MF index e116f375e22..47d04bdce3e 100644 --- a/plugins/uml/org.eclipse.papyrus.uml.documentation.profile/META-INF/MANIFEST.MF +++ b/plugins/uml/org.eclipse.papyrus.uml.documentation.profile/META-INF/MANIFEST.MF @@ -12,5 +12,5 @@ Bundle-Name: %pluginName Bundle-Localization: plugin Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.uml.documentation.profile;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.uml.documentation.profile diff --git a/plugins/uml/org.eclipse.papyrus.uml.export/.classpath b/plugins/uml/org.eclipse.papyrus.uml.export/.classpath index e801ebfb468..81fe078c20c 100644 --- a/plugins/uml/org.eclipse.papyrus.uml.export/.classpath +++ b/plugins/uml/org.eclipse.papyrus.uml.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/uml/org.eclipse.papyrus.uml.export/.settings/org.eclipse.jdt.core.prefs b/plugins/uml/org.eclipse.papyrus.uml.export/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/uml/org.eclipse.papyrus.uml.export/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/uml/org.eclipse.papyrus.uml.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/uml/org.eclipse.papyrus.uml.export/META-INF/MANIFEST.MF b/plugins/uml/org.eclipse.papyrus.uml.export/META-INF/MANIFEST.MF index 2d8f0eb7929..95adaad758b 100644 --- a/plugins/uml/org.eclipse.papyrus.uml.export/META-INF/MANIFEST.MF +++ b/plugins/uml/org.eclipse.papyrus.uml.export/META-INF/MANIFEST.MF @@ -3,10 +3,10 @@ Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.papyrus.uml.export;singleton:=true Bundle-Version: 2.1.0.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-11 -Require-Bundle: com.google.gson;bundle-version="[2.7.0,2.8.0)", - org.apache.batik.dom.svg;bundle-version="[1.14.0,1.15.0)", - org.apache.batik.anim;bundle-version="[1.14.0,1.15.0)", +Bundle-RequiredExecutionEnvironment: JavaSE-17 +Require-Bundle: com.google.gson;bundle-version="[2.9.1,3.0.0)", + org.apache.batik.dom.svg;bundle-version="[1.17.0,1.18.0)", + org.apache.batik.anim;bundle-version="[1.17.0,1.18.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)", org.eclipse.gmf.runtime.diagram.ui;bundle-version="[1.9.0,2.0.0)", diff --git a/plugins/uml/org.eclipse.papyrus.uml.extensionpoints/.classpath b/plugins/uml/org.eclipse.papyrus.uml.extensionpoints/.classpath index e801ebfb468..81fe078c20c 100644 --- a/plugins/uml/org.eclipse.papyrus.uml.extensionpoints/.classpath +++ b/plugins/uml/org.eclipse.papyrus.uml.extensionpoints/.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/uml/org.eclipse.papyrus.uml.extensionpoints/.settings/org.eclipse.jdt.core.prefs b/plugins/uml/org.eclipse.papyrus.uml.extensionpoints/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/uml/org.eclipse.papyrus.uml.extensionpoints/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/uml/org.eclipse.papyrus.uml.extensionpoints/.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/uml/org.eclipse.papyrus.uml.extensionpoints/META-INF/MANIFEST.MF b/plugins/uml/org.eclipse.papyrus.uml.extensionpoints/META-INF/MANIFEST.MF index 2587b64e874..49df795c346 100644 --- a/plugins/uml/org.eclipse.papyrus.uml.extensionpoints/META-INF/MANIFEST.MF +++ b/plugins/uml/org.eclipse.papyrus.uml.extensionpoints/META-INF/MANIFEST.MF @@ -18,5 +18,5 @@ Bundle-Localization: plugin Bundle-ManifestVersion: 2 Bundle-Activator: org.eclipse.papyrus.uml.extensionpoints.Activator Bundle-SymbolicName: org.eclipse.papyrus.uml.extensionpoints;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.uml.extensionpoints diff --git a/plugins/uml/org.eclipse.papyrus.uml.filters.edit/.classpath b/plugins/uml/org.eclipse.papyrus.uml.filters.edit/.classpath index e9c6eafb6fa..abaf32b3e99 100644 --- a/plugins/uml/org.eclipse.papyrus.uml.filters.edit/.classpath +++ b/plugins/uml/org.eclipse.papyrus.uml.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/uml/org.eclipse.papyrus.uml.filters.edit/.settings/org.eclipse.jdt.core.prefs b/plugins/uml/org.eclipse.papyrus.uml.filters.edit/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/uml/org.eclipse.papyrus.uml.filters.edit/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/uml/org.eclipse.papyrus.uml.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/uml/org.eclipse.papyrus.uml.filters.edit/META-INF/MANIFEST.MF b/plugins/uml/org.eclipse.papyrus.uml.filters.edit/META-INF/MANIFEST.MF index 1d00f70136e..4cd6c3ad810 100644 --- a/plugins/uml/org.eclipse.papyrus.uml.filters.edit/META-INF/MANIFEST.MF +++ b/plugins/uml/org.eclipse.papyrus.uml.filters.edit/META-INF/MANIFEST.MF @@ -15,5 +15,5 @@ Bundle-Activator: org.eclipse.papyrus.uml.filters.provider.UMLFiltersEditPlugin$ Bundle-ManifestVersion: 2 Bundle-Description: %pluginDescription Bundle-SymbolicName: org.eclipse.papyrus.uml.filters.edit;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.uml.filters.edit diff --git a/plugins/uml/org.eclipse.papyrus.uml.filters/.classpath b/plugins/uml/org.eclipse.papyrus.uml.filters/.classpath index 33577510720..fd01258584d 100644 --- a/plugins/uml/org.eclipse.papyrus.uml.filters/.classpath +++ b/plugins/uml/org.eclipse.papyrus.uml.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/uml/org.eclipse.papyrus.uml.filters/.settings/org.eclipse.jdt.core.prefs b/plugins/uml/org.eclipse.papyrus.uml.filters/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/uml/org.eclipse.papyrus.uml.filters/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/uml/org.eclipse.papyrus.uml.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/uml/org.eclipse.papyrus.uml.filters/META-INF/MANIFEST.MF b/plugins/uml/org.eclipse.papyrus.uml.filters/META-INF/MANIFEST.MF index f095d99c554..90c2dff010d 100644 --- a/plugins/uml/org.eclipse.papyrus.uml.filters/META-INF/MANIFEST.MF +++ b/plugins/uml/org.eclipse.papyrus.uml.filters/META-INF/MANIFEST.MF @@ -18,6 +18,6 @@ Bundle-Activator: org.eclipse.papyrus.infra.filters.internal.UMLFiltersPlugin$Im Bundle-ManifestVersion: 2 Bundle-Description: %pluginDescription Bundle-SymbolicName: org.eclipse.papyrus.uml.filters;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="[32.0.0, 33.0.0)" Automatic-Module-Name: org.eclipse.papyrus.uml.filters diff --git a/plugins/uml/org.eclipse.papyrus.uml.icons/.classpath b/plugins/uml/org.eclipse.papyrus.uml.icons/.classpath index e801ebfb468..81fe078c20c 100644 --- a/plugins/uml/org.eclipse.papyrus.uml.icons/.classpath +++ b/plugins/uml/org.eclipse.papyrus.uml.icons/.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/uml/org.eclipse.papyrus.uml.icons/.settings/org.eclipse.jdt.core.prefs b/plugins/uml/org.eclipse.papyrus.uml.icons/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/uml/org.eclipse.papyrus.uml.icons/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/uml/org.eclipse.papyrus.uml.icons/.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/uml/org.eclipse.papyrus.uml.icons/META-INF/MANIFEST.MF b/plugins/uml/org.eclipse.papyrus.uml.icons/META-INF/MANIFEST.MF index 6b7157688de..a9aa0079db8 100644 --- a/plugins/uml/org.eclipse.papyrus.uml.icons/META-INF/MANIFEST.MF +++ b/plugins/uml/org.eclipse.papyrus.uml.icons/META-INF/MANIFEST.MF @@ -10,5 +10,5 @@ Bundle-Localization: plugin Bundle-ManifestVersion: 2 Bundle-Activator: org.eclipse.papyrus.uml.icons.Activator Bundle-SymbolicName: org.eclipse.papyrus.uml.icons;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.uml.icons diff --git a/plugins/uml/org.eclipse.papyrus.uml.import/.classpath b/plugins/uml/org.eclipse.papyrus.uml.import/.classpath index e801ebfb468..81fe078c20c 100644 --- a/plugins/uml/org.eclipse.papyrus.uml.import/.classpath +++ b/plugins/uml/org.eclipse.papyrus.uml.import/.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/uml/org.eclipse.papyrus.uml.import/.settings/org.eclipse.jdt.core.prefs b/plugins/uml/org.eclipse.papyrus.uml.import/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/uml/org.eclipse.papyrus.uml.import/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/uml/org.eclipse.papyrus.uml.import/.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/uml/org.eclipse.papyrus.uml.import/META-INF/MANIFEST.MF b/plugins/uml/org.eclipse.papyrus.uml.import/META-INF/MANIFEST.MF index df95ac3fc5e..e492921f805 100644 --- a/plugins/uml/org.eclipse.papyrus.uml.import/META-INF/MANIFEST.MF +++ b/plugins/uml/org.eclipse.papyrus.uml.import/META-INF/MANIFEST.MF @@ -19,5 +19,5 @@ Bundle-Name: %pluginName Bundle-Activator: org.eclipse.papyrus.uml.importt.Activator Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.uml.import;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.uml.import diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelrepair/.classpath b/plugins/uml/org.eclipse.papyrus.uml.modelrepair/.classpath index e801ebfb468..81fe078c20c 100644 --- a/plugins/uml/org.eclipse.papyrus.uml.modelrepair/.classpath +++ b/plugins/uml/org.eclipse.papyrus.uml.modelrepair/.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/uml/org.eclipse.papyrus.uml.modelrepair/.settings/org.eclipse.jdt.core.prefs b/plugins/uml/org.eclipse.papyrus.uml.modelrepair/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/uml/org.eclipse.papyrus.uml.modelrepair/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/uml/org.eclipse.papyrus.uml.modelrepair/.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/uml/org.eclipse.papyrus.uml.modelrepair/META-INF/MANIFEST.MF b/plugins/uml/org.eclipse.papyrus.uml.modelrepair/META-INF/MANIFEST.MF index 7016c6c2e28..6a789a6e9f4 100644 --- a/plugins/uml/org.eclipse.papyrus.uml.modelrepair/META-INF/MANIFEST.MF +++ b/plugins/uml/org.eclipse.papyrus.uml.modelrepair/META-INF/MANIFEST.MF @@ -36,9 +36,9 @@ Bundle-Activator: org.eclipse.papyrus.uml.modelrepair.Activator Bundle-ManifestVersion: 2 Bundle-Description: %pluginDescription Bundle-SymbolicName: org.eclipse.papyrus.uml.modelrepair;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.eventbus;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="[32.0.0, 33.0.0)", + com.google.common.collect;version="[32.0.0, 33.0.0)", + com.google.common.eventbus;version="[32.0.0, 33.0.0)", + com.google.common.util.concurrent;version="[32.0.0, 33.0.0)" Automatic-Module-Name: org.eclipse.papyrus.uml.modelrepair diff --git a/plugins/uml/org.eclipse.papyrus.uml.navigation/.classpath b/plugins/uml/org.eclipse.papyrus.uml.navigation/.classpath index e801ebfb468..81fe078c20c 100644 --- a/plugins/uml/org.eclipse.papyrus.uml.navigation/.classpath +++ b/plugins/uml/org.eclipse.papyrus.uml.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/uml/org.eclipse.papyrus.uml.navigation/.settings/org.eclipse.jdt.core.prefs b/plugins/uml/org.eclipse.papyrus.uml.navigation/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/uml/org.eclipse.papyrus.uml.navigation/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/uml/org.eclipse.papyrus.uml.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/uml/org.eclipse.papyrus.uml.navigation/META-INF/MANIFEST.MF b/plugins/uml/org.eclipse.papyrus.uml.navigation/META-INF/MANIFEST.MF index b9b56095171..8323ecb3068 100644 --- a/plugins/uml/org.eclipse.papyrus.uml.navigation/META-INF/MANIFEST.MF +++ b/plugins/uml/org.eclipse.papyrus.uml.navigation/META-INF/MANIFEST.MF @@ -20,7 +20,7 @@ Bundle-Localization: plugin Bundle-Activator: org.eclipse.papyrus.uml.navigation.Activator Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.uml.navigation;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.eclipse.papyrus.uml.navigation, org.eclipse.papyrus.uml.navigation.menuContributor, org.eclipse.papyrus.uml.navigation.navigableElement diff --git a/plugins/uml/org.eclipse.papyrus.uml.oclconstraintevaluation/.classpath b/plugins/uml/org.eclipse.papyrus.uml.oclconstraintevaluation/.classpath index e801ebfb468..81fe078c20c 100644 --- a/plugins/uml/org.eclipse.papyrus.uml.oclconstraintevaluation/.classpath +++ b/plugins/uml/org.eclipse.papyrus.uml.oclconstraintevaluation/.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/uml/org.eclipse.papyrus.uml.oclconstraintevaluation/.settings/org.eclipse.jdt.core.prefs b/plugins/uml/org.eclipse.papyrus.uml.oclconstraintevaluation/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/uml/org.eclipse.papyrus.uml.oclconstraintevaluation/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/uml/org.eclipse.papyrus.uml.oclconstraintevaluation/.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/uml/org.eclipse.papyrus.uml.oclconstraintevaluation/META-INF/MANIFEST.MF b/plugins/uml/org.eclipse.papyrus.uml.oclconstraintevaluation/META-INF/MANIFEST.MF index 54f9936df74..2581a02ad3c 100644 --- a/plugins/uml/org.eclipse.papyrus.uml.oclconstraintevaluation/META-INF/MANIFEST.MF +++ b/plugins/uml/org.eclipse.papyrus.uml.oclconstraintevaluation/META-INF/MANIFEST.MF @@ -12,5 +12,5 @@ Bundle-Name: %pluginName Bundle-Activator: org.eclipse.papyrus.uml.oclconstraintevaluation.Activator Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.uml.oclconstraintevaluation;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.uml.oclconstraintevaluation diff --git a/plugins/uml/org.eclipse.papyrus.uml.perspective/.classpath b/plugins/uml/org.eclipse.papyrus.uml.perspective/.classpath index e801ebfb468..81fe078c20c 100644 --- a/plugins/uml/org.eclipse.papyrus.uml.perspective/.classpath +++ b/plugins/uml/org.eclipse.papyrus.uml.perspective/.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/uml/org.eclipse.papyrus.uml.perspective/.settings/org.eclipse.jdt.core.prefs b/plugins/uml/org.eclipse.papyrus.uml.perspective/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/uml/org.eclipse.papyrus.uml.perspective/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/uml/org.eclipse.papyrus.uml.perspective/.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/uml/org.eclipse.papyrus.uml.perspective/META-INF/MANIFEST.MF b/plugins/uml/org.eclipse.papyrus.uml.perspective/META-INF/MANIFEST.MF index f461de0ea54..dbb65957849 100644 --- a/plugins/uml/org.eclipse.papyrus.uml.perspective/META-INF/MANIFEST.MF +++ b/plugins/uml/org.eclipse.papyrus.uml.perspective/META-INF/MANIFEST.MF @@ -14,5 +14,5 @@ Bundle-Name: %pluginName Bundle-Activator: org.eclipse.papyrus.uml.perspective.Activator Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.uml.perspective;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.uml.perspective diff --git a/plugins/uml/org.eclipse.papyrus.uml.profile/.classpath b/plugins/uml/org.eclipse.papyrus.uml.profile/.classpath index e801ebfb468..81fe078c20c 100644 --- a/plugins/uml/org.eclipse.papyrus.uml.profile/.classpath +++ b/plugins/uml/org.eclipse.papyrus.uml.profile/.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/uml/org.eclipse.papyrus.uml.profile/.settings/org.eclipse.jdt.core.prefs b/plugins/uml/org.eclipse.papyrus.uml.profile/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/uml/org.eclipse.papyrus.uml.profile/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/uml/org.eclipse.papyrus.uml.profile/.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/uml/org.eclipse.papyrus.uml.profile/META-INF/MANIFEST.MF b/plugins/uml/org.eclipse.papyrus.uml.profile/META-INF/MANIFEST.MF index bafcf980f3b..85379c7a371 100644 --- a/plugins/uml/org.eclipse.papyrus.uml.profile/META-INF/MANIFEST.MF +++ b/plugins/uml/org.eclipse.papyrus.uml.profile/META-INF/MANIFEST.MF @@ -44,7 +44,7 @@ Bundle-Localization: plugin Bundle-Activator: org.eclipse.papyrus.uml.profile.Activator Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.uml.profile;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 -Import-Package: com.google.common.base;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="[32.0.0, 33.0.0)", + com.google.common.util.concurrent;version="[32.0.0, 33.0.0)" Automatic-Module-Name: org.eclipse.papyrus.uml.profile diff --git a/plugins/uml/org.eclipse.papyrus.uml.resourceloading.profile/.classpath b/plugins/uml/org.eclipse.papyrus.uml.resourceloading.profile/.classpath index e801ebfb468..81fe078c20c 100644 --- a/plugins/uml/org.eclipse.papyrus.uml.resourceloading.profile/.classpath +++ b/plugins/uml/org.eclipse.papyrus.uml.resourceloading.profile/.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/uml/org.eclipse.papyrus.uml.resourceloading.profile/.settings/org.eclipse.jdt.core.prefs b/plugins/uml/org.eclipse.papyrus.uml.resourceloading.profile/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/uml/org.eclipse.papyrus.uml.resourceloading.profile/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/uml/org.eclipse.papyrus.uml.resourceloading.profile/.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/uml/org.eclipse.papyrus.uml.resourceloading.profile/META-INF/MANIFEST.MF b/plugins/uml/org.eclipse.papyrus.uml.resourceloading.profile/META-INF/MANIFEST.MF index 8fa2be63f95..be8fb49768e 100644 --- a/plugins/uml/org.eclipse.papyrus.uml.resourceloading.profile/META-INF/MANIFEST.MF +++ b/plugins/uml/org.eclipse.papyrus.uml.resourceloading.profile/META-INF/MANIFEST.MF @@ -12,5 +12,5 @@ Bundle-Localization: plugin Bundle-Name: %pluginName Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.uml.resourceloading.profile;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.uml.resourceloading.profile diff --git a/plugins/uml/org.eclipse.papyrus.uml.search.ui/.classpath b/plugins/uml/org.eclipse.papyrus.uml.search.ui/.classpath index edc8895124d..a7bc712151f 100644 --- a/plugins/uml/org.eclipse.papyrus.uml.search.ui/.classpath +++ b/plugins/uml/org.eclipse.papyrus.uml.search.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/uml/org.eclipse.papyrus.uml.search.ui/.settings/org.eclipse.jdt.core.prefs b/plugins/uml/org.eclipse.papyrus.uml.search.ui/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/uml/org.eclipse.papyrus.uml.search.ui/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/uml/org.eclipse.papyrus.uml.search.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/uml/org.eclipse.papyrus.uml.search.ui/META-INF/MANIFEST.MF b/plugins/uml/org.eclipse.papyrus.uml.search.ui/META-INF/MANIFEST.MF index a4e9e0c1df4..74271b83540 100644 --- a/plugins/uml/org.eclipse.papyrus.uml.search.ui/META-INF/MANIFEST.MF +++ b/plugins/uml/org.eclipse.papyrus.uml.search.ui/META-INF/MANIFEST.MF @@ -27,11 +27,11 @@ Require-Bundle: org.eclipse.emf.databinding;bundle-version="[1.5.0,2.0.0)", org.eclipse.uml2.uml;bundle-version="[5.5.0,6.0.0)" Bundle-Vendor: %vendorName 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.uml.search.ui.Activator Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.uml.search.ui;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.uml.search.ui diff --git a/plugins/uml/org.eclipse.papyrus.uml.search.ui/plugin.xml b/plugins/uml/org.eclipse.papyrus.uml.search.ui/plugin.xml index dfcc113eea5..0d8b9a29a73 100644 --- a/plugins/uml/org.eclipse.papyrus.uml.search.ui/plugin.xml +++ b/plugins/uml/org.eclipse.papyrus.uml.search.ui/plugin.xml @@ -48,6 +48,10 @@ priority="10" provider="org.eclipse.papyrus.uml.search.ui.providers.AttributeMatchLabelProvider"> </labelProvider> + <context + description="The context of label providers used is the search view" + id="org.eclipse.papyrus.uml.search.ui.label.provider.context"> + </context> </extension> <extension point="org.eclipse.core.runtime.adapters"> diff --git a/plugins/uml/org.eclipse.papyrus.uml.search.ui/pom.xml b/plugins/uml/org.eclipse.papyrus.uml.search.ui/pom.xml index 58642829ab7..50832d8d3ce 100644 --- a/plugins/uml/org.eclipse.papyrus.uml.search.ui/pom.xml +++ b/plugins/uml/org.eclipse.papyrus.uml.search.ui/pom.xml @@ -7,6 +7,6 @@ <version>0.0.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.papyrus.uml.search.ui</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/uml/org.eclipse.papyrus.uml.search.ui/src/org/eclipse/papyrus/uml/search/ui/dialogs/ReplaceDialog.java b/plugins/uml/org.eclipse.papyrus.uml.search.ui/src/org/eclipse/papyrus/uml/search/ui/dialogs/ReplaceDialog.java index b9fa4c7cab4..5b09de3e078 100644 --- a/plugins/uml/org.eclipse.papyrus.uml.search.ui/src/org/eclipse/papyrus/uml/search/ui/dialogs/ReplaceDialog.java +++ b/plugins/uml/org.eclipse.papyrus.uml.search.ui/src/org/eclipse/papyrus/uml/search/ui/dialogs/ReplaceDialog.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 @@ -11,6 +11,7 @@ * * Contributors: * CEA LIST - Initial API and implementation + * Pauline DEVILLE (CEA LIST) <pauline.deville@cea.fr> - Bug 581217 * *****************************************************************************/ package org.eclipse.papyrus.uml.search.ui.dialogs; @@ -37,7 +38,7 @@ import org.eclipse.papyrus.uml.search.ui.pages.PapyrusSearchResultPage; import org.eclipse.papyrus.views.search.regex.PatternHelper; import org.eclipse.papyrus.views.search.results.AbstractResultEntry; import org.eclipse.papyrus.views.search.results.AttributeMatch; -import org.eclipse.papyrus.views.search.scope.ScopeEntry; +import org.eclipse.papyrus.views.search.scope.IScopeEntry; import org.eclipse.papyrus.views.search.utils.MatchUtils; import org.eclipse.swt.SWT; import org.eclipse.swt.layout.GridData; @@ -89,7 +90,7 @@ public class ReplaceDialog extends Dialog { protected void configureShell(Shell shell) { super.configureShell(shell); shell.setText(Messages.ReplaceDialog_0); - shell.setImage(ResourceManager.getPluginImage(Activator.PLUGIN_ID, "icons/PapyrusSearch.png")); //$NON-NLS-1$) + shell.setImage(ResourceManager.getPluginImage(Activator.PLUGIN_ID, "icons/PapyrusSearch.png")); //$NON-NLS-1$ } @Override @@ -199,8 +200,8 @@ public class ReplaceDialog extends Dialog { @Override protected void okPressed() { - Set<AbstractResultEntry> toProcess = new HashSet<AbstractResultEntry>(); - Set<ScopeEntry> toSave = new HashSet<ScopeEntry>(); + Set<AbstractResultEntry> toProcess = new HashSet<>(); + Set<IScopeEntry> toSave = new HashSet<>(); if (fSelection == null) { toProcess.addAll(MatchUtils.getMatches(fResultPage.getInput(), false)); @@ -233,18 +234,18 @@ public class ReplaceDialog extends Dialog { }); } } else { - if (element instanceof ScopeEntry) { + if (element instanceof IScopeEntry) { change(attributeMatch); - toSave.add((ScopeEntry) element); + toSave.add((IScopeEntry) element); } } } } - for (ScopeEntry scopeEntry : toSave) { + for (IScopeEntry scopeEntry : toSave) { try { scopeEntry.getModelSet().save(new NullProgressMonitor()); } catch (IOException e) { diff --git a/plugins/uml/org.eclipse.papyrus.uml.search.ui/src/org/eclipse/papyrus/uml/search/ui/manager/PapyrusSearchTextManager.java b/plugins/uml/org.eclipse.papyrus.uml.search.ui/src/org/eclipse/papyrus/uml/search/ui/manager/PapyrusSearchTextManager.java index 9c0337f572b..b47f5ed8a50 100644 --- a/plugins/uml/org.eclipse.papyrus.uml.search.ui/src/org/eclipse/papyrus/uml/search/ui/manager/PapyrusSearchTextManager.java +++ b/plugins/uml/org.eclipse.papyrus.uml.search.ui/src/org/eclipse/papyrus/uml/search/ui/manager/PapyrusSearchTextManager.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 @@ -11,6 +11,7 @@ * * Contributors: * CEA LIST - Initial API and implementation + * Pauline DEVILLE (CEA LIST) <pauline.deville@cea.fr> - Bug 581217 * *****************************************************************************/ package org.eclipse.papyrus.uml.search.ui.manager; @@ -26,7 +27,7 @@ import org.eclipse.papyrus.uml.search.ui.providers.ParticipantTypeAttribute; import org.eclipse.papyrus.uml.search.ui.providers.ParticipantTypeElement; import org.eclipse.papyrus.uml.search.ui.query.PapyrusAdvancedQuery; import org.eclipse.papyrus.uml.search.ui.query.PapyrusQuery; -import org.eclipse.papyrus.views.search.scope.ScopeEntry; +import org.eclipse.papyrus.views.search.scope.IScopeEntry; import org.eclipse.search.ui.ISearchQuery; import org.eclipse.swt.widgets.Display; @@ -36,7 +37,7 @@ import org.eclipse.swt.widgets.Display; */ public class PapyrusSearchTextManager { - private Collection<ScopeEntry> fScopeEntries; + private Collection<IScopeEntry> fScopeEntries; private boolean fIsCaseSensitive; @@ -44,7 +45,7 @@ public class PapyrusSearchTextManager { private String fQueryText; - public PapyrusSearchTextManager(Collection<ScopeEntry> scopeEntries, boolean isCaseSensitive, boolean isRegularExpression, String queryText) { + public PapyrusSearchTextManager(Collection<IScopeEntry> scopeEntries, boolean isCaseSensitive, boolean isRegularExpression, String queryText) { fScopeEntries = scopeEntries; fIsCaseSensitive = isCaseSensitive; fIsRegularExpression = isRegularExpression; @@ -86,7 +87,7 @@ public class PapyrusSearchTextManager { } private List<ParticipantTypeElement> getParticipantsToEvaluate(HashMap<ParticipantTypeElement, List<ParticipantTypeAttribute>> participantsList) { - List<ParticipantTypeElement> participantsToEvaluate = new ArrayList<ParticipantTypeElement>(); + List<ParticipantTypeElement> participantsToEvaluate = new ArrayList<>(); for (ParticipantTypeElement element : participantsList.keySet()) { if (element.isChecked()) { diff --git a/plugins/uml/org.eclipse.papyrus.uml.search.ui/src/org/eclipse/papyrus/uml/search/ui/pages/PapyrusSearchPage.java b/plugins/uml/org.eclipse.papyrus.uml.search.ui/src/org/eclipse/papyrus/uml/search/ui/pages/PapyrusSearchPage.java index c8046c169cd..57862ff9aed 100644 --- a/plugins/uml/org.eclipse.papyrus.uml.search.ui/src/org/eclipse/papyrus/uml/search/ui/pages/PapyrusSearchPage.java +++ b/plugins/uml/org.eclipse.papyrus.uml.search.ui/src/org/eclipse/papyrus/uml/search/ui/pages/PapyrusSearchPage.java @@ -1,5 +1,5 @@ /***************************************************************************** - * Copyright (c) 2013, 2014 CEA LIST and others. + * Copyright (c) 2013, 2014, 2023 CEA LIST and others. * * * All rights reserved. This program and the accompanying materials @@ -14,6 +14,7 @@ * Christian W. Damus (CEA LIST) - Fix leaking of all UML models in search results * Christian W. Damus (CEA LIST) - Replace workspace IResource dependency with URI for CDO compatibility * Christian W. Damus (CEA) - bug 434681 + * Pauline DEVILLE (CEA LIST) <pauline.deville@cea.fr> - Bug 581217 * *****************************************************************************/ package org.eclipse.papyrus.uml.search.ui.pages; @@ -93,6 +94,7 @@ import org.eclipse.papyrus.uml.search.ui.query.WorkspaceQueryProvider; import org.eclipse.papyrus.uml.stereotypecollector.StereotypeCollector; import org.eclipse.papyrus.uml.tools.model.UmlModel; import org.eclipse.papyrus.views.search.regex.PatternHelper; +import org.eclipse.papyrus.views.search.scope.IScopeEntry; import org.eclipse.papyrus.views.search.scope.ScopeCollector; import org.eclipse.papyrus.views.search.scope.ScopeEntry; import org.eclipse.search.ui.IReplacePage; @@ -145,29 +147,30 @@ import com.google.inject.Injector; /** * * Papyrus specific search page + * * @since 2.0 * */ public class PapyrusSearchPage extends DialogPage implements ISearchPage, IReplacePage { - + private int currentScope = -1; - private HashMap<ParticipantTypeElement, List<ParticipantTypeAttribute>> umlTypeParticipantsList = new HashMap<ParticipantTypeElement, List<ParticipantTypeAttribute>>(); + private HashMap<ParticipantTypeElement, List<ParticipantTypeAttribute>> umlTypeParticipantsList = new HashMap<>(); + + private HashMap<ParticipantTypeElement, List<ParticipantTypeAttribute>> stereotypeParticipantsList = new HashMap<>(); + + private LinkedList<Object> profiles = new LinkedList<>(); + + private String allProfiles = "*"; //$NON-NLS-1$ - private HashMap<ParticipantTypeElement, List<ParticipantTypeAttribute>> stereotypeParticipantsList = new HashMap<ParticipantTypeElement, List<ParticipantTypeAttribute>>(); - - private LinkedList<Object> profiles = new LinkedList<Object>(); - - private String allProfiles = "*"; - private Collection<Stereotype> availableStereotypes; - + private Collection<Stereotype> appliedStereotypes; - + private boolean profilesComputed = false; - + private boolean availableStereotypesComputed = false; - + private boolean appliedStereotypesComputed = false; private static final String REGULAR_EXPRESSION_ILLFORMED = Messages.PapyrusSearchPage_0; @@ -185,11 +188,11 @@ public class PapyrusSearchPage extends DialogPage implements ISearchPage, IRepla private CheckBoxFilteredTree participantUMLTypesTree; private CheckBoxFilteredTree participantStereotypesTree; - + private CheckboxTreeViewer participantUMLTypesTreeViewer; - + private CheckboxTreeViewer participantStereotypesTreeViewer; - + private ComboViewer participantProfilesComboViewer; private Label searchQueryExplanatoryLabel; @@ -213,45 +216,43 @@ public class PapyrusSearchPage extends DialogPage implements ISearchPage, IRepla private EObject contextObject; private static final int TEXT_QUERY_KIND = 0; - + private static final int OCL_QUERY_KIND = 1; private static final int SIMPLE_SEARCH = 0; private static final int ADVANCED_SEARCH = 1; - + private int currentSearchKind = SIMPLE_SEARCH; - + private int currentQueryKind = TEXT_QUERY_KIND; - + private boolean onlyAppliedStereotypes = false; - + private boolean onlyAppliedStereotypesStateChanged = true; - + private Profile selectedProfile = null; private ParserContext parserContext; -// private ModelManager modelManager = null; - protected Composite textQueryComposite; private Composite advancedSearchComposite; private Composite textQueryFieldsComposite; - + private Button fBtnOnlyAppliedStereotypes; - + private Button fBtnSearchForAllSelected; - + private Button fBtnSearchForAnySelected; private Label umlTypesLabel; - + private Label stereotypesLabel; - + private Label profilesLabel; - + private Label emptyLabel; protected void createTextSearch() { @@ -266,11 +267,12 @@ public class PapyrusSearchPage extends DialogPage implements ISearchPage, IRepla searchQueryExplanatoryLabel = new Label(textQueryFieldsComposite, SWT.NONE); searchQueryExplanatoryLabel.setText(Messages.PapyrusSearchPage_48); searchQueryExplanatoryLabel.setLayoutData(new GridData(SWT.FILL, SWT.FILL, false, false, 1, 1)); - + searchQueryText = new Text(textQueryFieldsComposite, SWT.BORDER); searchQueryText.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false, 1, 1)); searchQueryText.addModifyListener(new ModifyListener() { + @Override public void modifyText(ModifyEvent evt) { validateRegex(); } @@ -288,12 +290,14 @@ public class PapyrusSearchPage extends DialogPage implements ISearchPage, IRepla btnRegularExpression.setText(Messages.PapyrusSearchPage_6); btnRegularExpression.addSelectionListener(new SelectionListener() { + @Override public void widgetSelected(SelectionEvent e) { btnCaseSensitive.setEnabled(!btnRegularExpression.getSelection()); validateRegex(); searchQueryText.forceFocus(); } + @Override public void widgetDefaultSelected(SelectionEvent e) { widgetSelected(e); } @@ -324,9 +328,9 @@ public class PapyrusSearchPage extends DialogPage implements ISearchPage, IRepla for (Control childControl : advancedSearchComposite.getChildren()) { childControl.dispose(); } - + createSpecificTextSearch(); - + advancedSearchComposite.layout(); } } @@ -344,10 +348,10 @@ public class PapyrusSearchPage extends DialogPage implements ISearchPage, IRepla } createSpecificTextSearch(); } - + protected void createSpecificTextSearch() { if (searchKind.getSelectionIndex() == ADVANCED_SEARCH) { - + if (container.getSelectedScope() == currentScope || currentScope == -1) { // if scope not changed or first time if (umlTypeParticipantsList.isEmpty()) { createUMLTypesList(); @@ -355,50 +359,49 @@ public class PapyrusSearchPage extends DialogPage implements ISearchPage, IRepla createProfilesList(false); createStereotypesList(false); - + createAdvancedSearch(); // Don't call any methods of UI entities before this! participantProfilesComboViewer.refresh(); participantUMLTypesTreeViewer.refresh(); filterParticipantStereotypesByProfile(); // This refreshes the participantStereotypesTreeViewer - + currentScope = container.getSelectedScope(); } else { // else: same code as refresh button except we need to recreate the UI // Refresh UML types if (umlTypeParticipantsList.isEmpty()) { createUMLTypesList(); } - + // Refresh profiles selectedProfile = null; profilesComputed = false; createProfilesList(true); - + // Refresh stereotypes availableStereotypesComputed = false; appliedStereotypesComputed = false; createStereotypesList(true); - + // Refresh UI createAdvancedSearch(); // Don't call any methods of UI entities before this! participantProfilesComboViewer.refresh(); participantUMLTypesTreeViewer.refresh(); filterParticipantStereotypesByProfile(); // This refreshes the participantStereotypesTreeViewer - + currentScope = container.getSelectedScope(); } - - + + } else { createSimpleSearch(); - }/* else { - Other search kinds in the future - }*/ + } } protected void createUMLTypesList() { ProgressMonitorDialog dialog = new ProgressMonitorDialog(getShell()); IRunnableWithProgress computeAvailableTypes = new IRunnableWithProgress() { + @Override public void run(IProgressMonitor thePM) throws InterruptedException { // UML metaclasses @@ -406,7 +409,7 @@ public class PapyrusSearchPage extends DialogPage implements ISearchPage, IRepla if (eClassifier instanceof EClass) { ParticipantTypeElement parentElement = new ParticipantTypeElement(eClassifier); if (parentElement.getElement() instanceof EClass) { - List<ParticipantTypeAttribute> attributeList = new ArrayList<ParticipantTypeAttribute>(); + List<ParticipantTypeAttribute> attributeList = new ArrayList<>(); for (EObject eAttribute : ((EClass) (parentElement).getElement()).getEAllAttributes()) { ParticipantTypeAttribute attribute = new ParticipantTypeAttribute(eAttribute, (parentElement)); attributeList.add(attribute); @@ -422,21 +425,20 @@ public class PapyrusSearchPage extends DialogPage implements ISearchPage, IRepla try { dialog.run(true, true, computeAvailableTypes); } catch (InvocationTargetException e1) { - // TODO Auto-generated catch block - e1.printStackTrace(); + Activator.log.error(e1); } catch (InterruptedException e1) { - // TODO Auto-generated catch block - e1.printStackTrace(); + Activator.log.error(e1); } } - + protected void createProfilesList(boolean forceRefresh) { if (forceRefresh || !profilesComputed) { profiles.clear(); - + ProgressMonitorDialog dialog = new ProgressMonitorDialog(getShell()); IRunnableWithProgress computeAvailableTypes = new IRunnableWithProgress() { + @Override public void run(IProgressMonitor thePM) throws InterruptedException { Collection<Profile> appliedProfiles = StereotypeCollector.getInstance().computeAppliedProfiles(container); profiles.add(allProfiles); @@ -447,25 +449,23 @@ public class PapyrusSearchPage extends DialogPage implements ISearchPage, IRepla try { dialog.run(true, true, computeAvailableTypes); - } catch (InvocationTargetException e1) { - // TODO Auto-generated catch block - e1.printStackTrace(); + Activator.log.error(e1); } catch (InterruptedException e1) { - // TODO Auto-generated catch block - e1.printStackTrace(); + Activator.log.error(e1); } } } - + protected void createStereotypesList(final boolean forceRefresh) { ProgressMonitorDialog dialog = new ProgressMonitorDialog(getShell()); IRunnableWithProgress computeAvailableTypes = new IRunnableWithProgress() { + @Override public void run(IProgressMonitor thePM) throws InterruptedException { if (forceRefresh || onlyAppliedStereotypesStateChanged) { stereotypeParticipantsList.clear(); - + Collection<Stereotype> computedStereotypes; // Find available stereotypes @@ -474,7 +474,7 @@ public class PapyrusSearchPage extends DialogPage implements ISearchPage, IRepla if (appliedStereotypes != null) { appliedStereotypes.clear(); } - + appliedStereotypes = StereotypeCollector.getInstance().computeAppliedStereotypes(container); appliedStereotypesComputed = true; } @@ -485,7 +485,7 @@ public class PapyrusSearchPage extends DialogPage implements ISearchPage, IRepla if (availableStereotypes != null) { availableStereotypes.clear(); } - + availableStereotypes = StereotypeCollector.getInstance().computeAvailableStereotypes(container); availableStereotypesComputed = true; } @@ -496,7 +496,7 @@ public class PapyrusSearchPage extends DialogPage implements ISearchPage, IRepla // Fill the hash map for the treeviewer for (Stereotype stereotype : computedStereotypes) { ParticipantTypeElement parentElement = new ParticipantTypeElement(stereotype); - List<ParticipantTypeAttribute> attributeList = new ArrayList<ParticipantTypeAttribute>(); + List<ParticipantTypeAttribute> attributeList = new ArrayList<>(); for (Property property : ((Stereotype) parentElement.getElement()).getAllAttributes()) { if (!property.getName().startsWith("base_")) { //$NON-NLS-1$ if (property.getType() instanceof Element) { @@ -508,7 +508,7 @@ public class PapyrusSearchPage extends DialogPage implements ISearchPage, IRepla stereotypeParticipantsList.put(parentElement, attributeList); } - + onlyAppliedStereotypesStateChanged = false; } } @@ -517,53 +517,51 @@ public class PapyrusSearchPage extends DialogPage implements ISearchPage, IRepla try { dialog.run(true, true, computeAvailableTypes); } catch (InvocationTargetException e1) { - // TODO Auto-generated catch block - e1.printStackTrace(); + Activator.log.error(e1); } catch (InterruptedException e1) { - // TODO Auto-generated catch block - e1.printStackTrace(); + Activator.log.error(e1); } } - + protected void filterParticipantStereotypesByProfile() { if (selectedProfile == null) { participantStereotypesTreeViewer.setInput(stereotypeParticipantsList); participantStereotypesTreeViewer.refresh(); return; } - - HashMap<ParticipantTypeElement, List<ParticipantTypeAttribute>> filteredStereotypeParticipantsList = new HashMap<ParticipantTypeElement, List<ParticipantTypeAttribute>>(); + + HashMap<ParticipantTypeElement, List<ParticipantTypeAttribute>> filteredStereotypeParticipantsList = new HashMap<>(); Iterator<Entry<ParticipantTypeElement, List<ParticipantTypeAttribute>>> it = stereotypeParticipantsList.entrySet().iterator(); while (it.hasNext()) { - Map.Entry<ParticipantTypeElement, List<ParticipantTypeAttribute>> pair = (Map.Entry<ParticipantTypeElement, List<ParticipantTypeAttribute>>)it.next(); - Stereotype stereotype = (Stereotype) ((ParticipantTypeElement) pair.getKey()).getElement(); + Map.Entry<ParticipantTypeElement, List<ParticipantTypeAttribute>> pair = it.next(); + Stereotype stereotype = (Stereotype) pair.getKey().getElement(); if (EcoreUtil.getURI(stereotype.getProfile()).equals(EcoreUtil.getURI(selectedProfile))) { filteredStereotypeParticipantsList.put(pair.getKey(), pair.getValue()); } } - + participantStereotypesTreeViewer.setInput(filteredStereotypeParticipantsList); participantStereotypesTreeViewer.refresh(); } - protected void createAdvancedSearch() { + protected void createAdvancedSearch() { profilesLabel = new Label(advancedSearchComposite, SWT.NONE); profilesLabel.setLayoutData(new GridData(SWT.FILL, SWT.FILL, false, false, 1, 1)); profilesLabel.setText(Messages.PapyrusSearchPage_51); - - //TODO Better solution than this empty label + + // TODO Better solution than this empty label emptyLabel = new Label(advancedSearchComposite, SWT.NONE); emptyLabel.setLayoutData(new GridData(SWT.FILL, SWT.FILL, false, false, 1, 1)); - emptyLabel.setText(""); - - //TODO Better solution than this empty label + emptyLabel.setText(""); //$NON-NLS-1$ + + // TODO Better solution than this empty label emptyLabel = new Label(advancedSearchComposite, SWT.NONE); emptyLabel.setLayoutData(new GridData(SWT.FILL, SWT.FILL, false, false, 1, 1)); - emptyLabel.setText(""); - + emptyLabel.setText(""); //$NON-NLS-1$ + // Newline - + participantProfilesComboViewer = new ComboViewer(advancedSearchComposite, SWT.READ_ONLY); participantProfilesComboViewer.setContentProvider(ArrayContentProvider.getInstance()); participantProfilesComboViewer.setLabelProvider(new LabelProvider() { @@ -583,21 +581,22 @@ public class PapyrusSearchPage extends DialogPage implements ISearchPage, IRepla participantProfilesComboViewer.setSelection(new StructuredSelection(selectedProfile)); } participantProfilesComboViewer.addSelectionChangedListener(new ISelectionChangedListener() { + @Override public void selectionChanged(SelectionChangedEvent event) { if (event.getSelection().isEmpty()) { return; } - + if (participantProfilesComboViewer.getStructuredSelection().getFirstElement() instanceof Profile) { selectedProfile = (Profile) participantProfilesComboViewer.getStructuredSelection().getFirstElement(); } else { selectedProfile = null; } - + filterParticipantStereotypesByProfile(); } }); - + fBtnOnlyAppliedStereotypes = new Button(advancedSearchComposite, SWT.CHECK); fBtnOnlyAppliedStereotypes.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, false, false, 1, 1)); fBtnOnlyAppliedStereotypes.setText(Messages.PapyrusSearchPage_50); @@ -606,17 +605,17 @@ public class PapyrusSearchPage extends DialogPage implements ISearchPage, IRepla @Override public void widgetSelected(SelectionEvent e) { onlyAppliedStereotypes = fBtnOnlyAppliedStereotypes.getSelection(); - + // Memorize previous stereotypes attributes that have been checked - HashMap<ParticipantTypeElement, List<ParticipantTypeAttribute>> oldStereotypeParticipantsList = new HashMap<ParticipantTypeElement, List<ParticipantTypeAttribute>>(); + HashMap<ParticipantTypeElement, List<ParticipantTypeAttribute>> oldStereotypeParticipantsList = new HashMap<>(); Iterator<Entry<ParticipantTypeElement, List<ParticipantTypeAttribute>>> it = stereotypeParticipantsList.entrySet().iterator(); while (it.hasNext()) { - Map.Entry<ParticipantTypeElement, List<ParticipantTypeAttribute>> pair = (Map.Entry<ParticipantTypeElement, List<ParticipantTypeAttribute>>)it.next(); + Map.Entry<ParticipantTypeElement, List<ParticipantTypeAttribute>> pair = it.next(); boolean toAdd = false; if (pair.getKey().isChecked()) { toAdd = true; } - + if (!toAdd) { for (ParticipantTypeAttribute attribute : pair.getValue()) { if (attribute.isChecked()) { @@ -625,25 +624,25 @@ public class PapyrusSearchPage extends DialogPage implements ISearchPage, IRepla } } } - + if (toAdd) { oldStereotypeParticipantsList.put(pair.getKey(), pair.getValue()); } } - + onlyAppliedStereotypesStateChanged = true; createStereotypesList(false); - + Iterator<Entry<ParticipantTypeElement, List<ParticipantTypeAttribute>>> it2 = oldStereotypeParticipantsList.entrySet().iterator(); while (it2.hasNext()) { - Map.Entry<ParticipantTypeElement, List<ParticipantTypeAttribute>> oldPair = (Map.Entry<ParticipantTypeElement, List<ParticipantTypeAttribute>>)it2.next(); + Map.Entry<ParticipantTypeElement, List<ParticipantTypeAttribute>> oldPair = it2.next(); Stereotype oldStereotype = (Stereotype) oldPair.getKey().getElement(); - + Iterator<Entry<ParticipantTypeElement, List<ParticipantTypeAttribute>>> it3 = stereotypeParticipantsList.entrySet().iterator(); while (it3.hasNext()) { - Map.Entry<ParticipantTypeElement, List<ParticipantTypeAttribute>> newPair = (Map.Entry<ParticipantTypeElement, List<ParticipantTypeAttribute>>)it3.next(); + Map.Entry<ParticipantTypeElement, List<ParticipantTypeAttribute>> newPair = it3.next(); Stereotype newStereotype = (Stereotype) newPair.getKey().getElement(); - + // Lazy second condition because otherwise performance is impacted too much if (EcoreUtil.getURI(newStereotype).equals(EcoreUtil.getURI(oldStereotype)) && newPair.getValue().size() == oldPair.getValue().size()) { @@ -654,55 +653,57 @@ public class PapyrusSearchPage extends DialogPage implements ISearchPage, IRepla } } } - + filterParticipantStereotypesByProfile(); // This refreshes the list too } }); - - //TODO Better solution than this empty label + + // TODO Better solution than this empty label emptyLabel = new Label(advancedSearchComposite, SWT.NONE); emptyLabel.setLayoutData(new GridData(SWT.FILL, SWT.FILL, false, false, 1, 1)); - emptyLabel.setText(""); - + emptyLabel.setText(""); //$NON-NLS-1$ + // Newline - + umlTypesLabel = new Label(advancedSearchComposite, SWT.NONE); umlTypesLabel.setLayoutData(new GridData(SWT.FILL, SWT.FILL, false, false, 1, 1)); umlTypesLabel.setText(Messages.PapyrusSearchPage_44); - + stereotypesLabel = new Label(advancedSearchComposite, SWT.NONE); stereotypesLabel.setLayoutData(new GridData(SWT.FILL, SWT.FILL, false, false, 1, 1)); stereotypesLabel.setText(Messages.PapyrusSearchPage_45); - - //TODO Better solution than this empty label + + // TODO Better solution than this empty label emptyLabel = new Label(advancedSearchComposite, SWT.NONE); emptyLabel.setLayoutData(new GridData(SWT.FILL, SWT.FILL, false, false, 1, 1)); - emptyLabel.setText(""); - + emptyLabel.setText(""); //$NON-NLS-1$ + // New line - + participantUMLTypesTree = new CheckBoxFilteredTree(advancedSearchComposite, SWT.BORDER | SWT.V_SCROLL | SWT.H_SCROLL | SWT.SINGLE, new PatternFilter(), true); participantUMLTypesTree.setLayout(new GridLayout()); GridData typesChechboxTreeViewerGridData = new GridData(SWT.FILL, SWT.FILL, true, true, 1, 1); typesChechboxTreeViewerGridData.heightHint = 150; participantUMLTypesTree.setLayoutData(typesChechboxTreeViewerGridData); - + participantStereotypesTree = new CheckBoxFilteredTree(advancedSearchComposite, SWT.BORDER | SWT.V_SCROLL | SWT.H_SCROLL | SWT.SINGLE, new PatternFilter(), true); participantStereotypesTree.setLayout(new GridLayout()); GridData stereotypesChechboxTreeViewerGridData = new GridData(SWT.FILL, SWT.FILL, true, true, 1, 1); stereotypesChechboxTreeViewerGridData.heightHint = 150; participantStereotypesTree.setLayoutData(stereotypesChechboxTreeViewerGridData); - + participantUMLTypesTreeViewer = (CheckboxTreeViewer) participantUMLTypesTree.getViewer(); participantUMLTypesTreeViewer.setContentProvider(new ParticipantTypeContentProvider()); participantUMLTypesTreeViewer.setLabelProvider(new ParticipantTypeLabelProvider()); participantUMLTypesTreeViewer.setSorter(new ViewerSorter()); participantUMLTypesTreeViewer.setCheckStateProvider(new ICheckStateProvider() { + @Override public boolean isGrayed(Object element) { return false; } + @Override public boolean isChecked(Object element) { if (element instanceof ParticipantTypeElement) { @@ -712,7 +713,7 @@ public class PapyrusSearchPage extends DialogPage implements ISearchPage, IRepla return false; } }); - + participantStereotypesTreeViewer = (CheckboxTreeViewer) participantStereotypesTree.getViewer(); // TODO ParticipantStereotypeContentProvider participantStereotypesTreeViewer.setContentProvider(new ParticipantTypeContentProvider()); @@ -721,10 +722,12 @@ public class PapyrusSearchPage extends DialogPage implements ISearchPage, IRepla participantStereotypesTreeViewer.setSorter(new ViewerSorter()); participantStereotypesTreeViewer.setCheckStateProvider(new ICheckStateProvider() { + @Override public boolean isGrayed(Object element) { return false; } + @Override public boolean isChecked(Object element) { if (element instanceof ParticipantTypeElement) { @@ -734,7 +737,7 @@ public class PapyrusSearchPage extends DialogPage implements ISearchPage, IRepla return false; } }); - + Composite participantManipualtionComposite = new Composite(advancedSearchComposite, SWT.NONE); participantManipualtionComposite.setLayout(new GridLayout(1, false)); participantManipualtionComposite.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, false, true, 1, 1)); @@ -752,7 +755,7 @@ public class PapyrusSearchPage extends DialogPage implements ISearchPage, IRepla Object selectedElement = ((IStructuredSelection) selection).getFirstElement(); if (selectedElement instanceof ParticipantTypeElement) { - List<ParticipantTypeAttribute> attributeParentList = new ArrayList<ParticipantTypeAttribute>(); + List<ParticipantTypeAttribute> attributeParentList = new ArrayList<>(); for (Object attribute : umlTypeParticipantsList.get(selectedElement)) { if (attribute instanceof ParticipantTypeAttribute) { @@ -822,7 +825,7 @@ public class PapyrusSearchPage extends DialogPage implements ISearchPage, IRepla participantUMLTypesTreeViewer.refresh(); } }); - + Button btnSelectAllSt = new Button(participantManipualtionComposite, SWT.PUSH); btnSelectAllSt.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, false, false, 1, 1)); btnSelectAllSt.setText(Messages.PapyrusSearchPage_46); @@ -864,7 +867,7 @@ public class PapyrusSearchPage extends DialogPage implements ISearchPage, IRepla participantStereotypesTreeViewer.refresh(); } }); - + Button btnRefreshTypes = new Button(participantManipualtionComposite, SWT.PUSH); btnRefreshTypes.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, false, false, 1, 1)); btnRefreshTypes.setText(Messages.PapyrusSearchPage_15); @@ -876,61 +879,61 @@ public class PapyrusSearchPage extends DialogPage implements ISearchPage, IRepla refreshByScope(); } }); - + participantUMLTypesTreeViewer.setInput(umlTypeParticipantsList); ((ICheckable) participantUMLTypesTreeViewer).addCheckStateListener(new ParticipantTypesTreeViewerCheckStateListener(participantUMLTypesTreeViewer, umlTypeParticipantsList)); - + participantStereotypesTreeViewer.setInput(stereotypeParticipantsList); ((ICheckable) participantStereotypesTreeViewer).addCheckStateListener(new ParticipantTypesTreeViewerCheckStateListener(participantStereotypesTreeViewer, stereotypeParticipantsList)); // New line - - //TODO Better solution than this empty label + + // TODO Better solution than this empty label emptyLabel = new Label(advancedSearchComposite, SWT.NONE); emptyLabel.setLayoutData(new GridData(SWT.FILL, SWT.FILL, false, false, 1, 1)); - emptyLabel.setText(""); - + emptyLabel.setText(""); //$NON-NLS-1$ + fBtnSearchForAllSelected = new Button(advancedSearchComposite, SWT.CHECK); fBtnSearchForAllSelected.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, false, false, 1, 1)); fBtnSearchForAllSelected.setText(Messages.PapyrusSearchPage_13); - - //TODO Better solution than this empty label + + // TODO Better solution than this empty label emptyLabel = new Label(advancedSearchComposite, SWT.NONE); emptyLabel.setLayoutData(new GridData(SWT.FILL, SWT.FILL, false, false, 1, 1)); - emptyLabel.setText(""); - + emptyLabel.setText(""); //$NON-NLS-1$ + // New line - - //TODO Better solution than this empty label + + // TODO Better solution than this empty label emptyLabel = new Label(advancedSearchComposite, SWT.NONE); emptyLabel.setLayoutData(new GridData(SWT.FILL, SWT.FILL, false, false, 1, 1)); - emptyLabel.setText(""); - + emptyLabel.setText(""); //$NON-NLS-1$ + fBtnSearchForAnySelected = new Button(advancedSearchComposite, SWT.CHECK); fBtnSearchForAnySelected.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, false, false, 1, 1)); fBtnSearchForAnySelected.setText(Messages.PapyrusSearchPage_49); - + currentSearchKind = ADVANCED_SEARCH; currentQueryKind = TEXT_QUERY_KIND; } - + protected void refreshByScope() { // Refresh UML types if (umlTypeParticipantsList.isEmpty()) { createUMLTypesList(); } - + // Refresh profiles selectedProfile = null; profilesComputed = false; createProfilesList(true); - + // Refresh stereotypes availableStereotypesComputed = false; appliedStereotypesComputed = false; createStereotypesList(true); - - + + // Refresh UI participantProfilesComboViewer.setSelection(new StructuredSelection(allProfiles)); participantProfilesComboViewer.refresh(); @@ -943,6 +946,7 @@ public class PapyrusSearchPage extends DialogPage implements ISearchPage, IRepla ProgressMonitorDialog dialog = new ProgressMonitorDialog(getShell()); IRunnableWithProgress computeAvailableTypes = new IRunnableWithProgress() { + @Override public void run(IProgressMonitor thePM) throws InterruptedException { for (Object element : umlTypeParticipantsList.keySet()) { if (element instanceof ParticipantTypeElement) { @@ -960,9 +964,9 @@ public class PapyrusSearchPage extends DialogPage implements ISearchPage, IRepla try { dialog.run(true, true, computeAvailableTypes); } catch (InvocationTargetException e) { - e.printStackTrace(); + Activator.log.error(e); } catch (InterruptedException e) { - e.printStackTrace(); + Activator.log.error(e); } @@ -997,6 +1001,7 @@ public class PapyrusSearchPage extends DialogPage implements ISearchPage, IRepla ProgressMonitorDialog dialog = new ProgressMonitorDialog(getShell()); IRunnableWithProgress computeAvailableTypes = new IRunnableWithProgress() { + @Override public void run(IProgressMonitor thePM) throws InterruptedException { for (Object element : umlTypeParticipantsList.keySet()) { if (element instanceof ParticipantTypeElement) { @@ -1011,11 +1016,9 @@ public class PapyrusSearchPage extends DialogPage implements ISearchPage, IRepla try { dialog.run(true, true, computeAvailableTypes); } catch (InvocationTargetException e1) { - // TODO Auto-generated catch block - e1.printStackTrace(); + Activator.log.error(e1); } catch (InterruptedException e1) { - // TODO Auto-generated catch block - e1.printStackTrace(); + Activator.log.error(e1); } } @@ -1058,14 +1061,14 @@ public class PapyrusSearchPage extends DialogPage implements ISearchPage, IRepla btnSearchAllStringAttributes = new Button(participantManipualtionComposite, SWT.RADIO); btnSearchAllStringAttributes.setText(Messages.PapyrusSearchPage_17); btnSearchAllStringAttributes.setLayoutData(new GridData(SWT.LEFT, SWT.TOP, false, false, 1, 1)); - + currentSearchKind = SIMPLE_SEARCH; currentQueryKind = TEXT_QUERY_KIND; } public Object[] getMetaClassesList() { - Set<EObject> umlMetaClasses = new HashSet<EObject>(); + Set<EObject> umlMetaClasses = new HashSet<>(); for (EClassifier eClassifier : UMLPackage.eINSTANCE.getEClassifiers()) { if (eClassifier instanceof EClass) { @@ -1100,7 +1103,7 @@ public class PapyrusSearchPage extends DialogPage implements ISearchPage, IRepla LabelProviderService labelProviderService = new LabelProviderServiceImpl(); ILabelProvider labelProvider = labelProviderService.getLabelProvider(); - ScopeEntry currentScope = getCurrentScopeEntry(); + IScopeEntry currentScope = getCurrentScopeEntry(); if (currentScope != null) { @@ -1127,7 +1130,6 @@ public class PapyrusSearchPage extends DialogPage implements ISearchPage, IRepla } } catch (NotFoundException notFoundException) { - Activator.log.error(Messages.PapyrusQuery_0 + currentScope.getModelSet(), notFoundException); } } @@ -1142,6 +1144,7 @@ public class PapyrusSearchPage extends DialogPage implements ISearchPage, IRepla oclEditor.getViewer().getTextWidget().addVerifyKeyListener(new VerifyKeyListener() { + @Override public void verifyKey(VerifyEvent e) { // System.out.println("verifyKey: " + e.keyCode); if (e.keyCode == SWT.KEYPAD_CR || e.keyCode == SWT.CR) { @@ -1157,20 +1160,20 @@ public class PapyrusSearchPage extends DialogPage implements ISearchPage, IRepla editorComposite.setLayoutData(data); refreshSelection(root); - + currentQueryKind = OCL_QUERY_KIND; } - protected ScopeEntry getCurrentScopeEntry() { + protected IScopeEntry getCurrentScopeEntry() { if (container.getSelectedScope() == ISearchPageContainer.SELECTION_SCOPE) { Collection<URI> scope = ScopeCollector.getInstance().computeSearchScope(container); // this is only used for OCL queries, which currently assume workspace-like availability of the model content - Collection<ScopeEntry> scopeEntries = WorkspaceQueryProvider.createScopeEntries(scope); + Collection<IScopeEntry> scopeEntries = WorkspaceQueryProvider.createScopeEntries(scope); if (scopeEntries.size() == 1) { Object[] entries = scopeEntries.toArray(); - ScopeEntry selectedResource = (ScopeEntry) entries[0]; + IScopeEntry selectedResource = (IScopeEntry) entries[0]; return selectedResource; } @@ -1178,6 +1181,7 @@ public class PapyrusSearchPage extends DialogPage implements ISearchPage, IRepla return null; } + @Override public void createControl(Composite parent) { initializeDialogUnits(parent); @@ -1198,7 +1202,7 @@ public class PapyrusSearchPage extends DialogPage implements ISearchPage, IRepla queryKind.select(TEXT_QUERY_KIND); queryKind.addSelectionListener(new SelectionAdapter() { - + @Override public void widgetSelected(SelectionEvent e) { if (queryKind.getSelectionIndex() != currentQueryKind) { @@ -1211,7 +1215,7 @@ public class PapyrusSearchPage extends DialogPage implements ISearchPage, IRepla } else { if (container.getSelectedScope() == ISearchPageContainer.SELECTION_SCOPE) { - ScopeEntry currentScope = getCurrentScopeEntry(); + IScopeEntry currentScope = getCurrentScopeEntry(); if (currentScope != null) { if (currentScope.getModelSet() != null) { @@ -1294,6 +1298,7 @@ public class PapyrusSearchPage extends DialogPage implements ISearchPage, IRepla final BaseDocument editorDocument = (BaseDocument) oclEditor.getDocument(); editorDocument.modify(new IUnitOfWork<Object, XtextResource>() { + @Override public Value exec(XtextResource resource) throws Exception { Object selectedObject = selected; if (selectedObject instanceof IOutlineNode) { @@ -1323,11 +1328,11 @@ public class PapyrusSearchPage extends DialogPage implements ISearchPage, IRepla EssentialOCLCSResource csResource = (EssentialOCLCSResource) resource; if (csResource != null) { if (contextObject != null) { - csResource.getCS2AS(); // FIXME redundant ?? + csResource.getCS2AS(); // FIXME redundant ?? } ResourceSet resourceSet = oclEditor.getResourceSet(); if (resourceSet != null) { - environmentFactory.adapt(resourceSet); // FIXME redundant ?? + environmentFactory.adapt(resourceSet); // FIXME redundant ?? } csResource.setParserContext(parserContext); } @@ -1339,12 +1344,12 @@ public class PapyrusSearchPage extends DialogPage implements ISearchPage, IRepla @SuppressWarnings("unused") - private Collection<ScopeEntry> createScopeEntries(Collection<URI> scope) { - Collection<ScopeEntry> results = new HashSet<ScopeEntry>(); + private Collection<IScopeEntry> createScopeEntries(Collection<URI> scope) { + Collection<IScopeEntry> results = new HashSet<>(); for (URI resource : scope) { - ScopeEntry scopeEntry = new ScopeEntry(resource); + IScopeEntry scopeEntry = new ScopeEntry(resource); results.add(scopeEntry); @@ -1355,7 +1360,7 @@ public class PapyrusSearchPage extends DialogPage implements ISearchPage, IRepla @SuppressWarnings("unused") private List<ParticipantTypeElement> getParticipantsToEvaluate(HashMap<ParticipantTypeElement, List<ParticipantTypeAttribute>> participantsList) { - List<ParticipantTypeElement> participantsToEvaluate = new ArrayList<ParticipantTypeElement>(); + List<ParticipantTypeElement> participantsToEvaluate = new ArrayList<>(); for (ParticipantTypeElement element : participantsList.keySet()) { if (element.isChecked()) { @@ -1370,6 +1375,7 @@ public class PapyrusSearchPage extends DialogPage implements ISearchPage, IRepla return participantsToEvaluate; } + @Override public boolean performAction() { if (queryKind.getSelectionIndex() == TEXT_QUERY_KIND) { @@ -1382,29 +1388,29 @@ public class PapyrusSearchPage extends DialogPage implements ISearchPage, IRepla return false; } else { // One query per di file to avoid one single slow query on many files - ArrayList<AbstractPapyrusQuery> queries = new ArrayList<AbstractPapyrusQuery>(scope.size()); - + ArrayList<AbstractPapyrusQuery> queries = new ArrayList<>(scope.size()); + for (URI uri : scope) { - Collection<URI> singleScope = new HashSet<URI>(); + Collection<URI> singleScope = new HashSet<>(); singleScope.add(uri); - + QueryInfo info = new QueryInfo(searchQueryText.getText(), btnCaseSensitive.getSelection(), btnRegularExpression.getSelection(), btnSearchAllStringAttributes.getSelection(), singleScope); ISearchQuery query = CompositePapyrusQueryProvider.getInstance().createSimpleSearchQuery(info); - + queries.add((AbstractPapyrusQuery) query); } - + compositeQuery = CompositePapyrusQuery.compose(queries); } } else { - List<ParticipantTypeElement> participantsToEvaluate = new ArrayList<ParticipantTypeElement>(); - + List<ParticipantTypeElement> participantsToEvaluate = new ArrayList<>(); + for (ParticipantTypeElement element : this.umlTypeParticipantsList.keySet()) { if (element.isChecked()) { participantsToEvaluate.add(element); - + if (searchQueryText.getText().length() > 0) { for (ParticipantTypeAttribute attributesToEvaluate : umlTypeParticipantsList.get(element)) { if (attributesToEvaluate.isChecked()) { @@ -1414,11 +1420,11 @@ public class PapyrusSearchPage extends DialogPage implements ISearchPage, IRepla } } } - + for (ParticipantTypeElement element : this.stereotypeParticipantsList.keySet()) { if (element.isChecked()) { participantsToEvaluate.add(element); - + if (searchQueryText.getText().length() > 0) { for (ParticipantTypeAttribute attributesToEvaluate : stereotypeParticipantsList.get(element)) { if (attributesToEvaluate.isChecked()) { @@ -1428,24 +1434,25 @@ public class PapyrusSearchPage extends DialogPage implements ISearchPage, IRepla } } } - + if (participantsToEvaluate.size() == 0) { MessageDialog.openError(Display.getCurrent().getActiveShell(), Messages.PapyrusSearchPage_31, Messages.PapyrusSearchPage_32); return false; } else { // One query per di file to avoid one single slow query on many files - ArrayList<AbstractPapyrusQuery> queries = new ArrayList<AbstractPapyrusQuery>(scope.size()); - + ArrayList<AbstractPapyrusQuery> queries = new ArrayList<>(scope.size()); + for (URI uri : scope) { - Collection<URI> singleScope = new HashSet<URI>(); + Collection<URI> singleScope = new HashSet<>(); singleScope.add(uri); - - QueryInfo info = new QueryInfo(searchQueryText.getText(), btnCaseSensitive.getSelection(), btnRegularExpression.getSelection(), participantsToEvaluate, singleScope, fBtnSearchForAllSelected.getSelection(), fBtnSearchForAnySelected.getSelection()); + + QueryInfo info = new QueryInfo(searchQueryText.getText(), btnCaseSensitive.getSelection(), btnRegularExpression.getSelection(), participantsToEvaluate, singleScope, fBtnSearchForAllSelected.getSelection(), + fBtnSearchForAnySelected.getSelection()); ISearchQuery query = CompositePapyrusQueryProvider.getInstance().createAdvancedSearchQuery(info); - + queries.add((AbstractPapyrusQuery) query); } - + compositeQuery = CompositePapyrusQuery.compose(queries); } @@ -1461,14 +1468,15 @@ public class PapyrusSearchPage extends DialogPage implements ISearchPage, IRepla } } else { - ScopeEntry scopeEntry = getCurrentScopeEntry(); + IScopeEntry scopeEntry = getCurrentScopeEntry(); if (scopeEntry != null) { try { PivotUtil.checkResourceErrors("", oclEditor.getResource()); //$NON-NLS-1$ - @SuppressWarnings("unused") ExpressionInOCL expressionInOCL = parserContext.getExpression((CSResource) oclEditor.getResource()); + @SuppressWarnings("unused") + ExpressionInOCL expressionInOCL = parserContext.getExpression((CSResource) oclEditor.getResource()); ISearchQuery query = new PapyrusOCLQuery((BaseDocument) oclEditor.getDocument(), parserContext, getEnvironmentFactory(), null, contextObject, scopeEntry); @@ -1476,7 +1484,8 @@ public class PapyrusSearchPage extends DialogPage implements ISearchPage, IRepla NewSearchUI.runQueryInBackground(query); } } catch (ParserException e) { - @SuppressWarnings("unused") Object value = new InvalidValueException(e, Messages.PapyrusSearchPage_35); + @SuppressWarnings("unused") + Object value = new InvalidValueException(e, Messages.PapyrusSearchPage_35); MessageDialog.openError(Display.getCurrent().getActiveShell(), SEARCH_ISSUE, OCL_QUERY_ILLFORMED); return false; } @@ -1488,11 +1497,13 @@ public class PapyrusSearchPage extends DialogPage implements ISearchPage, IRepla } } + @Override public void setContainer(ISearchPageContainer container) { this.container = container; this.container.setPerformActionEnabled(true); } + @Override public boolean performReplace() { if (queryKind.getSelectionIndex() == TEXT_QUERY_KIND) { if (container.getSelectedScope() == ISearchPageContainer.SELECTION_SCOPE) { @@ -1509,7 +1520,7 @@ public class PapyrusSearchPage extends DialogPage implements ISearchPage, IRepla QueryInfo info = new QueryInfo(searchQueryText.getText(), btnCaseSensitive.getSelection(), btnRegularExpression.getSelection(), btnSearchAllStringAttributes.getSelection(), scope); query = CompositePapyrusQueryProvider.getInstance().createSimpleSearchQuery(info); } else { - List<ParticipantTypeElement> participantsToEvaluate = new ArrayList<ParticipantTypeElement>(); + List<ParticipantTypeElement> participantsToEvaluate = new ArrayList<>(); for (ParticipantTypeElement element : this.umlTypeParticipantsList.keySet()) { if (element.isChecked()) { participantsToEvaluate.add(element); @@ -1542,7 +1553,8 @@ public class PapyrusSearchPage extends DialogPage implements ISearchPage, IRepla } } } - QueryInfo info = new QueryInfo(searchQueryText.getText(), btnCaseSensitive.getSelection(), btnRegularExpression.getSelection(), participantsToEvaluate, scope, fBtnSearchForAllSelected.getSelection(), fBtnSearchForAnySelected.getSelection()); + QueryInfo info = new QueryInfo(searchQueryText.getText(), btnCaseSensitive.getSelection(), btnRegularExpression.getSelection(), participantsToEvaluate, scope, fBtnSearchForAllSelected.getSelection(), + fBtnSearchForAnySelected.getSelection()); query = CompositePapyrusQueryProvider.getInstance().createAdvancedSearchQuery(info); } @@ -1552,6 +1564,7 @@ public class PapyrusSearchPage extends DialogPage implements ISearchPage, IRepla Display.getCurrent().syncExec(new Runnable() { + @Override public void run() { ISearchResultViewPart view = NewSearchUI.activateSearchResultView(); if (view != null) { diff --git a/plugins/uml/org.eclipse.papyrus.uml.search.ui/src/org/eclipse/papyrus/uml/search/ui/pages/PapyrusSearchResultPage.java b/plugins/uml/org.eclipse.papyrus.uml.search.ui/src/org/eclipse/papyrus/uml/search/ui/pages/PapyrusSearchResultPage.java index 7b5525c083d..d8564968c80 100644 --- a/plugins/uml/org.eclipse.papyrus.uml.search.ui/src/org/eclipse/papyrus/uml/search/ui/pages/PapyrusSearchResultPage.java +++ b/plugins/uml/org.eclipse.papyrus.uml.search.ui/src/org/eclipse/papyrus/uml/search/ui/pages/PapyrusSearchResultPage.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 @@ -11,6 +11,7 @@ * * Contributors: * CEA LIST - Initial API and implementation + * Pauline DEVILLE (CEA LIST) <pauline.deville@cea.fr> - Bug 581217 * *****************************************************************************/ package org.eclipse.papyrus.uml.search.ui.pages; @@ -34,7 +35,7 @@ import org.eclipse.papyrus.uml.search.ui.actions.FilterTypesAction; import org.eclipse.papyrus.uml.search.ui.providers.ResultContentProvider; import org.eclipse.papyrus.uml.search.ui.providers.ResultLabelProvider; import org.eclipse.papyrus.views.search.results.AbstractResultEntry; -import org.eclipse.papyrus.views.search.scope.ScopeEntry; +import org.eclipse.papyrus.views.search.scope.IScopeEntry; import org.eclipse.papyrus.views.search.utils.MatchUtils; import org.eclipse.search.ui.IContextMenuConstants; import org.eclipse.search.ui.text.AbstractTextSearchViewPage; @@ -45,11 +46,14 @@ import org.eclipse.uml2.uml.Element; /** * * Papyrus specific search results page + * * @since 2.0 * */ public class PapyrusSearchResultPage extends AbstractTextSearchViewPage { + private static final String ID_VIEW_MODELEXPLORER = "org.eclipse.papyrus.views.modelexplorer.navigation.target"; //$NON-NLS-1$ + ResultContentProvider fContentProvider = null; private IAction fFiltertypesAction = null; @@ -59,7 +63,7 @@ public class PapyrusSearchResultPage extends AbstractTextSearchViewPage { public PapyrusSearchResultPage() { super(FLAG_LAYOUT_TREE); - setElementLimit(new Integer(DEFAULT_ELEMENT_LIMIT)); + setElementLimit(Integer.valueOf(DEFAULT_ELEMENT_LIMIT)); fFiltertypesAction = new FilterTypesAction(this); } @@ -67,7 +71,7 @@ public class PapyrusSearchResultPage extends AbstractTextSearchViewPage { @Override public Match[] getDisplayedMatches(Object element) { - + Set<AbstractResultEntry> results = MatchUtils.getMatches(this.getInput(), true); if (element instanceof AbstractResultEntry) { @@ -116,13 +120,13 @@ public class PapyrusSearchResultPage extends AbstractTextSearchViewPage { if (firstElement instanceof AbstractResultEntry) { AbstractResultEntry resultEntry = (AbstractResultEntry) firstElement; - ScopeEntry scopeEntry = (ScopeEntry) resultEntry.getElement(); + IScopeEntry scopeEntry = (IScopeEntry) resultEntry.getElement(); if (scopeEntry != null && scopeEntry.getServicesRegistry() != null) { Object source = resultEntry.getSource(); if (source instanceof Element) { // UML element => use NavigationService to navigate to Model Explorer try { NavigationService navigationService = ServiceUtilsForEObject.getInstance().getService(NavigationService.class, (Element) source); - navigationService.navigate((Element) source, "org.eclipse.papyrus.views.modelexplorer.navigation.target"); + navigationService.navigate(source, ID_VIEW_MODELEXPLORER); } catch (ServiceException e) { Activator.log.error(e); } diff --git a/plugins/uml/org.eclipse.papyrus.uml.search.ui/src/org/eclipse/papyrus/uml/search/ui/providers/ResultContentProvider.java b/plugins/uml/org.eclipse.papyrus.uml.search.ui/src/org/eclipse/papyrus/uml/search/ui/providers/ResultContentProvider.java index b70c9dbd077..0b373f9d845 100644 --- a/plugins/uml/org.eclipse.papyrus.uml.search.ui/src/org/eclipse/papyrus/uml/search/ui/providers/ResultContentProvider.java +++ b/plugins/uml/org.eclipse.papyrus.uml.search.ui/src/org/eclipse/papyrus/uml/search/ui/providers/ResultContentProvider.java @@ -1,5 +1,5 @@ /***************************************************************************** - * Copyright (c) 2013 CEA LIST and others. + * Copyright (c) 2013, 2023 CEA LIST and others. * * * All rights reserved. This program and the accompanying materials @@ -12,6 +12,7 @@ * Contributors: * CEA LIST - Initial API and implementation * Christian W. Damus (CEA LIST) - Fix leaking of all UML models in search results + * Pauline DEVILLE (CEA LIST) <pauline.deville@cea.fr> - Bug 581217 * *****************************************************************************/ package org.eclipse.papyrus.uml.search.ui.providers; @@ -26,7 +27,6 @@ import org.eclipse.jface.viewers.ITreeContentProvider; import org.eclipse.jface.viewers.Viewer; import org.eclipse.papyrus.uml.search.ui.pages.PapyrusSearchResultPage; import org.eclipse.papyrus.uml.search.ui.query.AbstractPapyrusQuery; -import org.eclipse.papyrus.uml.search.ui.results.PapyrusSearchResult; import org.eclipse.papyrus.views.search.results.AbstractResultEntry; import org.eclipse.papyrus.views.search.results.ResultEntry; import org.eclipse.papyrus.views.search.utils.MatchUtils; @@ -65,13 +65,15 @@ public class ResultContentProvider implements ITreeContentProvider { this.fViewer = viewer; } + @Override public void dispose() { } + @Override public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { if (newInput != null) { - if (newInput instanceof PapyrusSearchResult) { + if (newInput instanceof AbstractTextSearchResult) { fResult = (AbstractTextSearchResult) newInput; initialize(); } @@ -83,6 +85,7 @@ public class ResultContentProvider implements ITreeContentProvider { } } + @Override public Object[] getElements(Object inputElement) { Object[] children = getChildren(inputElement); int elementLimit = getElementLimit(); @@ -108,7 +111,7 @@ public class ResultContentProvider implements ITreeContentProvider { public void initialize() { - fChildrenMap = new HashMap<Object, Set<Object>>(); + fChildrenMap = new HashMap<>(); Set<AbstractResultEntry> realMatches = MatchUtils.getMatches(fResult, true); @@ -123,7 +126,7 @@ public class ResultContentProvider implements ITreeContentProvider { Set<Object> children = fChildrenMap.get(parent); if (children == null) { - children = new HashSet<Object>(); + children = new HashSet<>(); fChildrenMap.put(parent, children); } @@ -326,10 +329,11 @@ public class ResultContentProvider implements ITreeContentProvider { } } } - + fViewer.refresh(); } + @Override public Object[] getChildren(Object parentElement) { Set<Object> children = fChildrenMap.get(parentElement); if (children == null) { @@ -338,6 +342,7 @@ public class ResultContentProvider implements ITreeContentProvider { return children.toArray(); } + @Override public Object getParent(Object element) { if (element instanceof AbstractResultEntry) { AbstractResultEntry match = (AbstractResultEntry) element; @@ -346,6 +351,7 @@ public class ResultContentProvider implements ITreeContentProvider { return null; } + @Override public boolean hasChildren(Object element) { return getChildren(element).length > 0; } diff --git a/plugins/uml/org.eclipse.papyrus.uml.search.ui/src/org/eclipse/papyrus/uml/search/ui/providers/ResultLabelProvider.java b/plugins/uml/org.eclipse.papyrus.uml.search.ui/src/org/eclipse/papyrus/uml/search/ui/providers/ResultLabelProvider.java index 32c4aa8beb3..42410749afa 100644 --- a/plugins/uml/org.eclipse.papyrus.uml.search.ui/src/org/eclipse/papyrus/uml/search/ui/providers/ResultLabelProvider.java +++ b/plugins/uml/org.eclipse.papyrus.uml.search.ui/src/org/eclipse/papyrus/uml/search/ui/providers/ResultLabelProvider.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 @@ -11,6 +11,7 @@ * * Contributors: * CEA LIST - Initial API and implementation + * Pauline DEVILLE (CEA LIST) <pauline.deville@cea.fr> - Bug 581217 * *****************************************************************************/ package org.eclipse.papyrus.uml.search.ui.providers; @@ -28,6 +29,8 @@ import org.eclipse.uml2.uml.NamedElement; public class ResultLabelProvider extends LabelProvider { + private static final String LABEL_PROVIDER_CONTEXT = "org.eclipse.papyrus.uml.search.ui.label.provider.context"; //$NON-NLS-1$ + private LabelProviderService labelProviderService; public ResultLabelProvider() { @@ -46,12 +49,12 @@ public class ResultLabelProvider extends LabelProvider { @Override public String getText(Object element) { if (element instanceof AbstractResultEntry) { - ILabelProvider labelProvider = labelProviderService.getLabelProvider(); - + ILabelProvider labelProvider = labelProviderService.getLabelProvider(LABEL_PROVIDER_CONTEXT); + if (element instanceof ViewerMatch) { return labelProvider.getText(((AbstractResultEntry) element).elementToDisplay()); } - + if (labelProvider instanceof ExtensibleLabelProvider) { String qualifierText = ((ExtensibleLabelProvider) labelProvider).getQualifierText(((AbstractResultEntry) element).elementToDisplay()); if (qualifierText == null) { @@ -63,7 +66,7 @@ public class ResultLabelProvider extends LabelProvider { return labelProvider.getText(((AbstractResultEntry) element).elementToDisplay()); } } - + return ""; //$NON-NLS-1$ } diff --git a/plugins/uml/org.eclipse.papyrus.uml.search.ui/src/org/eclipse/papyrus/uml/search/ui/query/PapyrusAdvancedQuery.java b/plugins/uml/org.eclipse.papyrus.uml.search.ui/src/org/eclipse/papyrus/uml/search/ui/query/PapyrusAdvancedQuery.java index f6b30e459ab..05ef1522c28 100644 --- a/plugins/uml/org.eclipse.papyrus.uml.search.ui/src/org/eclipse/papyrus/uml/search/ui/query/PapyrusAdvancedQuery.java +++ b/plugins/uml/org.eclipse.papyrus.uml.search.ui/src/org/eclipse/papyrus/uml/search/ui/query/PapyrusAdvancedQuery.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 @@ -11,6 +11,7 @@ * * Contributors: * CEA LIST - Initial API and implementation + * Pauline DEVILLE (CEA LIST) <pauline.deville@cea.fr> - Bug 581217 * *****************************************************************************/ package org.eclipse.papyrus.uml.search.ui.query; @@ -51,7 +52,7 @@ import org.eclipse.papyrus.views.search.results.AttributeMatch; import org.eclipse.papyrus.views.search.results.ModelElementMatch; import org.eclipse.papyrus.views.search.results.ModelMatch; import org.eclipse.papyrus.views.search.results.ViewerMatch; -import org.eclipse.papyrus.views.search.scope.ScopeEntry; +import org.eclipse.papyrus.views.search.scope.IScopeEntry; import org.eclipse.search.ui.ISearchResult; import org.eclipse.uml2.uml.Element; import org.eclipse.uml2.uml.EnumerationLiteral; @@ -83,7 +84,7 @@ public class PapyrusAdvancedQuery extends AbstractPapyrusQuery { private boolean isRegularExpression; - private Collection<ScopeEntry> scopeEntries; + private Collection<IScopeEntry> scopeEntries; private Object[] participantsChecked; @@ -100,11 +101,11 @@ public class PapyrusAdvancedQuery extends AbstractPapyrusQuery { private List<Property> propertyList; private boolean searchForAllSter; - + private boolean searchForAnySter; - public PapyrusAdvancedQuery(String searchQueryText, boolean isCaseSensitive, boolean isRegularExpression, Collection<ScopeEntry> scopeEntries, Object[] participantsChecked, boolean searchForAllSter, boolean searchForAnySter) { - this.propertyList = new ArrayList<Property>(); + public PapyrusAdvancedQuery(String searchQueryText, boolean isCaseSensitive, boolean isRegularExpression, Collection<IScopeEntry> scopeEntries, Object[] participantsChecked, boolean searchForAllSter, boolean searchForAnySter) { + this.propertyList = new ArrayList<>(); this.searchQueryText = searchQueryText; this.isCaseSensitive = isCaseSensitive; this.isRegularExpression = isRegularExpression; @@ -114,12 +115,12 @@ public class PapyrusAdvancedQuery extends AbstractPapyrusQuery { this.searchForAnySter = searchForAnySter; results = new PapyrusSearchResult(this); - participantsList = new HashMap<EObject, List<EAttribute>>(); - stereotypeList = new HashMap<Stereotype, ArrayList<Property>>(); + participantsList = new HashMap<>(); + stereotypeList = new HashMap<>(); for (Object participant : this.participantsChecked) { if (participant instanceof ParticipantTypeElement) { if (((ParticipantTypeElement) participant).getElement() instanceof ENamedElement) { - List<EAttribute> attributesChecked = new ArrayList<EAttribute>(); + List<EAttribute> attributesChecked = new ArrayList<>(); for (Object attributesFound : this.participantsChecked) { if (attributesFound instanceof ParticipantTypeAttribute) { if (((ParticipantTypeAttribute) attributesFound).getParent() == participant) { @@ -131,7 +132,7 @@ public class PapyrusAdvancedQuery extends AbstractPapyrusQuery { } else if (((ParticipantTypeElement) participant).getElement() instanceof Stereotype) { - ArrayList<Property> attributesChecked = new ArrayList<Property>(); + ArrayList<Property> attributesChecked = new ArrayList<>(); for (Object attributesFound : this.participantsChecked) { if (attributesFound instanceof ParticipantTypeAttribute) { if (((ParticipantTypeAttribute) attributesFound).getParent() == participant) { @@ -144,17 +145,18 @@ public class PapyrusAdvancedQuery extends AbstractPapyrusQuery { } } - fResults = new HashSet<AbstractResultEntry>(); + fResults = new HashSet<>(); } + @Override public IStatus run(IProgressMonitor monitor) throws OperationCanceledException { progressMonitor = SubMonitor.convert(monitor, scopeEntries.size() * 4); - progressMonitor.subTask("Searching"); - + progressMonitor.subTask("Searching"); //$NON-NLS-1$ + results.removeAll(); fResults.clear(); - for (ScopeEntry scopeEntry : scopeEntries) { + for (IScopeEntry scopeEntry : scopeEntries) { try { if (scopeEntry.getModelSet() != null) { UmlModel umlModel = (UmlModel) scopeEntry.getModelSet().getModelChecked(UmlModel.MODEL_ID); @@ -163,24 +165,24 @@ public class PapyrusAdvancedQuery extends AbstractPapyrusQuery { EList<EObject> contents = umlModel.getResource().getContents(); Collection<EObject> participants = ParticipantValidator.getInstance().getParticipants(root, participantsList.keySet().toArray()); - + progressMonitor.worked(1); - + Collection<EObject> stereotypedParticipants = ParticipantValidator.getInstance().getParticipantsStereotype(contents, stereotypeList.keySet().toArray()); progressMonitor.worked(1); - + if (searchForAllSter) { if (participantsList.keySet().size() == 0) { stereotypedParticipants = getElementsWithAllSter(stereotypedParticipants); evaluate(stereotypedParticipants, scopeEntry); - if (!searchQueryText.equals("")) { + if (!searchQueryText.equals("")) { //$NON-NLS-1$ evaluateStereotypes(stereotypedParticipants, scopeEntry); } } else { participants = getElementsWithAllSter(participants); evaluate(participants, scopeEntry); - if (!searchQueryText.equals("")) { + if (!searchQueryText.equals("")) { //$NON-NLS-1$ evaluateStereotypes(participants, scopeEntry); } } @@ -188,13 +190,13 @@ public class PapyrusAdvancedQuery extends AbstractPapyrusQuery { if (participantsList.keySet().size() == 0) { stereotypedParticipants = getElementsWithAnySter(stereotypedParticipants); evaluate(stereotypedParticipants, scopeEntry); - if (!searchQueryText.equals("")) { + if (!searchQueryText.equals("")) { //$NON-NLS-1$ evaluateStereotypes(stereotypedParticipants, scopeEntry); } } else { participants = getElementsWithAnySter(participants); evaluate(participants, scopeEntry); - if (!searchQueryText.equals("")) { + if (!searchQueryText.equals("")) { //$NON-NLS-1$ evaluateStereotypes(participants, scopeEntry); } } @@ -202,21 +204,21 @@ public class PapyrusAdvancedQuery extends AbstractPapyrusQuery { evaluate(participants, scopeEntry); evaluateStereotypes(stereotypedParticipants, scopeEntry); } - + progressMonitor.worked(1); } } catch (NotFoundException e) { Activator.log.error(Messages.PapyrusQuery_0 + scopeEntry.getModelSet(), e); } } - - //progressMonitor.done(); + + // progressMonitor.done(); return Status.OK_STATUS; } private Collection<EObject> getElementsWithAllSter(Collection<EObject> initialParticipants) { - Collection<EObject> participantsToKeep = new ArrayList<EObject>(); + Collection<EObject> participantsToKeep = new ArrayList<>(); for (EObject participants : initialParticipants) { if (participants instanceof Element) { int numberOfStereotypeToBeApplied = stereotypeList.size(); @@ -229,7 +231,7 @@ public class PapyrusAdvancedQuery extends AbstractPapyrusQuery { } } } - + if (numberOfStereotypeMatching == numberOfStereotypeToBeApplied) { participantsToKeep.add(participants); } @@ -238,14 +240,14 @@ public class PapyrusAdvancedQuery extends AbstractPapyrusQuery { } return participantsToKeep; } - + private Collection<EObject> getElementsWithAnySter(Collection<EObject> initialParticipants) { - Collection<EObject> participantsToKeep = new ArrayList<EObject>(); + Collection<EObject> participantsToKeep = new ArrayList<>(); for (EObject participants : initialParticipants) { if (participants instanceof Element) { boolean added = false; - - for (Stereotype stereotypeToBeApplied : stereotypeList.keySet()) { + + for (Stereotype stereotypeToBeApplied : stereotypeList.keySet()) { for (Stereotype stereotypeApplied : ((Element) participants).getAppliedStereotypes()) { if (EcoreUtil.getURI(stereotypeToBeApplied).equals(EcoreUtil.getURI(stereotypeApplied))) { participantsToKeep.add(participants); @@ -260,7 +262,7 @@ public class PapyrusAdvancedQuery extends AbstractPapyrusQuery { } } } - + return participantsToKeep; } @@ -278,7 +280,7 @@ public class PapyrusAdvancedQuery extends AbstractPapyrusQuery { * @param scopeEntry * the scopeEntry that contains the participant */ - protected void evaluateAndAddToResult(String value, Object attribute, Pattern pattern, Object participant, ScopeEntry scopeEntry, Stereotype stereotype) { + protected void evaluateAndAddToResult(String value, Object attribute, Pattern pattern, Object participant, IScopeEntry scopeEntry, Stereotype stereotype) { value = value != null ? value : ""; //$NON-NLS-1$ @@ -288,7 +290,7 @@ public class PapyrusAdvancedQuery extends AbstractPapyrusQuery { if (m.matches()) { int offset = m.start(); int length = m.end() - m.start(); - + ModelMatch match = new AttributeMatch(offset, length, participant, scopeEntry, attribute, stereotype); fResults.add(match); @@ -297,9 +299,9 @@ public class PapyrusAdvancedQuery extends AbstractPapyrusQuery { while (m.find()) { int offset = m.start(); int length = m.end() - m.start(); - + AttributeMatch match = new AttributeMatch(offset, length, participant, scopeEntry, attribute, stereotype); - + fResults.add(match); } } @@ -321,7 +323,7 @@ public class PapyrusAdvancedQuery extends AbstractPapyrusQuery { */ - protected void evaluate(Collection<EObject> participants, ScopeEntry scopeEntry) { + protected void evaluate(Collection<EObject> participants, IScopeEntry scopeEntry) { for (EObject participant : participants) { if (searchQueryText.equals("")) { //$NON-NLS-1$ @@ -340,7 +342,7 @@ public class PapyrusAdvancedQuery extends AbstractPapyrusQuery { } else { attributesList = participantsList.get(participant.eClass()); } - + for (EAttribute attribute : attributesList) { Object value = participant.eGet(attribute); @@ -358,12 +360,12 @@ public class PapyrusAdvancedQuery extends AbstractPapyrusQuery { } } - + findInDiagram(scopeEntry); } - protected void evaluateStereotypes(Collection<EObject> participants, ScopeEntry scopeEntry) { + protected void evaluateStereotypes(Collection<EObject> participants, IScopeEntry scopeEntry) { for (EObject participant : participants) { @@ -383,15 +385,16 @@ public class PapyrusAdvancedQuery extends AbstractPapyrusQuery { for (Stereotype stereotypeSelected : stereotypeList.keySet()) { if (EcoreUtil.getURI(stereotype).equals(EcoreUtil.getURI(stereotypeSelected))) { propertyList = this.getStereotypesAttributes(stereotype); - + for (Property property : propertyList) { if (stereotypeList.get(stereotypeSelected).size() == 0) { - String value = "[" + StereotypeUtil.displayPropertyValue(stereotype, property, (Element) participant, ";") + "]"; + String value = "[" + StereotypeUtil.displayPropertyValue(stereotype, property, (Element) participant, ";") + "]"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ evaluateAndAddToResult(value, property, pattern, participant, scopeEntry, stereotype); } else { for (Property property2 : (stereotypeList.get(stereotypeSelected))) { - if (EcoreUtil.getURI(property).equals(EcoreUtil.getURI(property2))) { // We loop through all selected attributes of all stereotypes, therefore this test is necessary to compare to currently searched stereotype's attributes - String value = StereotypeUtil.displayPropertyValueOnly(stereotype, property, (Element) participant, ""); + if (EcoreUtil.getURI(property).equals(EcoreUtil.getURI(property2))) { // We loop through all selected attributes of all stereotypes, therefore this test is necessary to compare to currently searched stereotype's + // attributes + String value = StereotypeUtil.displayPropertyValueOnly(stereotype, property, (Element) participant, ""); //$NON-NLS-1$ evaluateAndAddToResult(value, property, pattern, participant, scopeEntry, stereotype); } } @@ -410,9 +413,9 @@ public class PapyrusAdvancedQuery extends AbstractPapyrusQuery { private String getStringValue(Object value) { if (value == null) { - return ""; + return ""; //$NON-NLS-1$ } - + if (value instanceof String) { // Primitive types will hit this case return (String) value; } else if (value instanceof EnumerationLiteral) { @@ -426,10 +429,10 @@ public class PapyrusAdvancedQuery extends AbstractPapyrusQuery { return String.valueOf(value); } } - + private EList<String> getStringValuesOfProperty(Element element, Stereotype stereotype, Property property) { - BasicEList<String> results = new BasicEList<String>(); - + BasicEList<String> results = new BasicEList<>(); + Object values = element.getValue(stereotype, property.getName()); if (values instanceof EList) { for (Object val : (EList) values) { @@ -438,12 +441,12 @@ public class PapyrusAdvancedQuery extends AbstractPapyrusQuery { } else { results.add(getStringValue(values)); } - + return results; } public List<Property> getStereotypesAttributes(Object parentElement) { - List<Property> result = new ArrayList<Property>(); + List<Property> result = new ArrayList<>(); if (parentElement instanceof Stereotype) { for (Property property : ((Stereotype) parentElement).getAllAttributes()) { @@ -460,9 +463,9 @@ public class PapyrusAdvancedQuery extends AbstractPapyrusQuery { return result; } - protected void findInDiagram(ScopeEntry scopeEntry) { + protected void findInDiagram(IScopeEntry scopeEntry) { // Find diagrams that contain the elements that were found - Set<AbstractResultEntry> viewResults = new HashSet<AbstractResultEntry>(); + Set<AbstractResultEntry> viewResults = new HashSet<>(); for (AbstractResultEntry match : fResults) { Object source = match.getSource(); @@ -477,29 +480,33 @@ public class PapyrusAdvancedQuery extends AbstractPapyrusQuery { } } } - + fResults.addAll(viewResults); } + @Override public String getLabel() { return Messages.PapyrusQuery_6; } + @Override public boolean canRerun() { return true; } + @Override public boolean canRunInBackground() { return true; } + @Override public ISearchResult getSearchResult() { if (progressMonitor != null) { progressMonitor.setWorkRemaining(fResults.size()); - progressMonitor.subTask("Displaying Results"); + progressMonitor.subTask("Displaying Results"); //$NON-NLS-1$ } - - + + for (AbstractResultEntry match : fResults) { results.addMatch(match); @@ -507,11 +514,11 @@ public class PapyrusAdvancedQuery extends AbstractPapyrusQuery { progressMonitor.worked(1); } } - + if (progressMonitor != null) { progressMonitor.done(); } - + return results; } diff --git a/plugins/uml/org.eclipse.papyrus.uml.search.ui/src/org/eclipse/papyrus/uml/search/ui/query/PapyrusOCLQuery.java b/plugins/uml/org.eclipse.papyrus.uml.search.ui/src/org/eclipse/papyrus/uml/search/ui/query/PapyrusOCLQuery.java index 49314e1e2ab..6369c058780 100644 --- a/plugins/uml/org.eclipse.papyrus.uml.search.ui/src/org/eclipse/papyrus/uml/search/ui/query/PapyrusOCLQuery.java +++ b/plugins/uml/org.eclipse.papyrus.uml.search.ui/src/org/eclipse/papyrus/uml/search/ui/query/PapyrusOCLQuery.java @@ -1,5 +1,5 @@ /***************************************************************************** - * Copyright (c) 2013, 2014 CEA LIST and others. + * Copyright (c) 2013, 2014, 2023 CEA LIST and others. * * * All rights reserved. This program and the accompanying materials @@ -12,6 +12,7 @@ * Contributors: * CEA LIST - Initial API and implementation * Christian W. Damus (CEA) - bug 434681 + * Pauline DEVILLE (CEA LIST) <pauline.deville@cea.fr> - Bug 581217 * *****************************************************************************/ package org.eclipse.papyrus.uml.search.ui.query; @@ -54,7 +55,7 @@ import org.eclipse.papyrus.uml.search.ui.results.PapyrusSearchResult; import org.eclipse.papyrus.views.search.results.AbstractResultEntry; import org.eclipse.papyrus.views.search.results.ModelElementMatch; import org.eclipse.papyrus.views.search.results.ModelMatch; -import org.eclipse.papyrus.views.search.scope.ScopeEntry; +import org.eclipse.papyrus.views.search.scope.IScopeEntry; import org.eclipse.search.ui.ISearchResult; import org.eclipse.swt.widgets.Display; import org.eclipse.ui.PlatformUI; @@ -74,7 +75,7 @@ public class PapyrusOCLQuery extends AbstractPapyrusQuery { private PapyrusSearchResult results; - private ScopeEntry scopeEntry; + private IScopeEntry scopeEntry; private BaseDocument queryEditorDocument; @@ -86,7 +87,7 @@ public class PapyrusOCLQuery extends AbstractPapyrusQuery { protected Set<AbstractResultEntry> fResults = null; - public PapyrusOCLQuery(BaseDocument queryEditorDocument, ParserContext parserContext, EnvironmentFactory environmentFactory, ModelManager modelManager, EObject contextObject, ScopeEntry scopeEntry) { + public PapyrusOCLQuery(BaseDocument queryEditorDocument, ParserContext parserContext, EnvironmentFactory environmentFactory, ModelManager modelManager, EObject contextObject, IScopeEntry scopeEntry) { this.queryEditorDocument = queryEditorDocument; this.contextObject = contextObject; this.scopeEntry = scopeEntry; @@ -94,10 +95,10 @@ public class PapyrusOCLQuery extends AbstractPapyrusQuery { this.environmentFactory = environmentFactory; this.modelManager = modelManager; - Collection<ScopeEntry> scopeEntries = new ArrayList<ScopeEntry>(); + Collection<IScopeEntry> scopeEntries = new ArrayList<>(); scopeEntries.add(scopeEntry); results = new PapyrusSearchResult(this); - fResults = new HashSet<AbstractResultEntry>(); + fResults = new HashSet<>(); } @@ -112,7 +113,8 @@ public class PapyrusOCLQuery extends AbstractPapyrusQuery { try { - @SuppressWarnings("unused") IDocument doc = queryEditorDocument; + @SuppressWarnings("unused") + IDocument doc = queryEditorDocument; final BaseDocument editorDocument = queryEditorDocument; Object value = null; @@ -120,9 +122,11 @@ public class PapyrusOCLQuery extends AbstractPapyrusQuery { value = editorDocument.readOnly(new IUnitOfWork<Object, XtextResource>() { + @Override public Object exec(XtextResource state) throws Exception { assert state != null; - @SuppressWarnings("unused") IProgressService progressService = PlatformUI.getWorkbench().getProgressService(); + @SuppressWarnings("unused") + IProgressService progressService = PlatformUI.getWorkbench().getProgressService(); EvaluationRunnable runnable = new EvaluationRunnable((CSResource) state, expression); runnable.run(new NullProgressMonitor()); // progressService.busyCursorWhile(runnable); @@ -191,6 +195,7 @@ public class PapyrusOCLQuery extends AbstractPapyrusQuery { return value; } + @Override public void run(final IProgressMonitor monitor) { monitor.beginTask(NLS.bind(ConsoleMessages.Progress_Title, expression), 10); monitor.subTask(ConsoleMessages.Progress_Synchronising); @@ -246,6 +251,7 @@ public class PapyrusOCLQuery extends AbstractPapyrusQuery { } } + @Override public IStatus run(IProgressMonitor monitor) throws OperationCanceledException { results.removeAll(); fResults.clear(); @@ -271,11 +277,12 @@ public class PapyrusOCLQuery extends AbstractPapyrusQuery { * @param scopeEntry * the scopeEntry that contains the participant */ - protected void evaluateAndAddToResult(String value, Object attribute, Pattern pattern, Object participant, ScopeEntry scopeEntry) { + protected void evaluateAndAddToResult(String value, Object attribute, Pattern pattern, Object participant, IScopeEntry scopeEntry) { value = value != null ? value : ""; //$NON-NLS-1$ - @SuppressWarnings("unused") Matcher m = pattern.matcher(value); + @SuppressWarnings("unused") + Matcher m = pattern.matcher(value); // if(isRegularExpression) { // if(m.matches()) { @@ -303,13 +310,13 @@ public class PapyrusOCLQuery extends AbstractPapyrusQuery { * @param participants * @param scopeEntry */ - protected void evaluate(Collection<EObject> participants, ScopeEntry scopeEntry) { + protected void evaluate(Collection<EObject> participants, IScopeEntry scopeEntry) { // for(EObject participant : participants) { // // String query = searchQueryText; - // if(searchQueryText.equals("")) { //$NON-NLS-1$ - // query = ".*"; //$NON-NLS-1$ + // if(searchQueryText.equals("")) { //$NON-NLS-1$ + // query = ".*"; //$NON-NLS-1$ // } // // Pattern pattern = PatternHelper.getInstance().createPattern(query, isCaseSensitive, isRegularExpression); @@ -329,7 +336,7 @@ public class PapyrusOCLQuery extends AbstractPapyrusQuery { // } else { // if(participant instanceof NamedElement) { // String umlElementName = ((NamedElement)participant).getName(); - // umlElementName = umlElementName != null ? umlElementName : ""; //$NON-NLS-1$ + // umlElementName = umlElementName != null ? umlElementName : ""; //$NON-NLS-1$ // // evaluateAndAddToResult(umlElementName, UMLPackage.eINSTANCE.getNamedElement_Name(), pattern, participant, scopeEntry); // } @@ -390,18 +397,22 @@ public class PapyrusOCLQuery extends AbstractPapyrusQuery { // } } + @Override public String getLabel() { return Messages.PapyrusQuery_6; } + @Override public boolean canRerun() { return false; } + @Override public boolean canRunInBackground() { return true; } + @Override public ISearchResult getSearchResult() { for (AbstractResultEntry match : fResults) { results.addMatch(match); diff --git a/plugins/uml/org.eclipse.papyrus.uml.search.ui/src/org/eclipse/papyrus/uml/search/ui/query/PapyrusQuery.java b/plugins/uml/org.eclipse.papyrus.uml.search.ui/src/org/eclipse/papyrus/uml/search/ui/query/PapyrusQuery.java index c9aa51b4ebc..9bc27f105cb 100644 --- a/plugins/uml/org.eclipse.papyrus.uml.search.ui/src/org/eclipse/papyrus/uml/search/ui/query/PapyrusQuery.java +++ b/plugins/uml/org.eclipse.papyrus.uml.search.ui/src/org/eclipse/papyrus/uml/search/ui/query/PapyrusQuery.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 @@ -11,6 +11,7 @@ * * Contributors: * CEA LIST - Initial API and implementation + * Pauline DEVILLE (CEA LIST) <pauline.deville@cea.fr> - Bug 581217 * *****************************************************************************/ package org.eclipse.papyrus.uml.search.ui.query; @@ -42,7 +43,7 @@ import org.eclipse.papyrus.views.search.results.AbstractResultEntry; import org.eclipse.papyrus.views.search.results.AttributeMatch; import org.eclipse.papyrus.views.search.results.ModelMatch; import org.eclipse.papyrus.views.search.results.ViewerMatch; -import org.eclipse.papyrus.views.search.scope.ScopeEntry; +import org.eclipse.papyrus.views.search.scope.IScopeEntry; import org.eclipse.search.ui.ISearchResult; import org.eclipse.uml2.uml.Element; import org.eclipse.uml2.uml.NamedElement; @@ -73,7 +74,7 @@ public class PapyrusQuery extends AbstractPapyrusQuery { private boolean isRegularExpression; - private Collection<ScopeEntry> scopeEntries; + private Collection<IScopeEntry> scopeEntries; private Object[] participantsTypes; @@ -83,7 +84,7 @@ public class PapyrusQuery extends AbstractPapyrusQuery { protected Set<AbstractResultEntry> fResults = null; - public PapyrusQuery(String searchQueryText, boolean isCaseSensitive, boolean isRegularExpression, Collection<ScopeEntry> scopeEntries, Object[] participantsTypes, boolean searchAllStringAttributes) { + public PapyrusQuery(String searchQueryText, boolean isCaseSensitive, boolean isRegularExpression, Collection<IScopeEntry> scopeEntries, Object[] participantsTypes, boolean searchAllStringAttributes) { this.searchQueryText = searchQueryText; this.isCaseSensitive = isCaseSensitive; this.isRegularExpression = isRegularExpression; @@ -92,38 +93,39 @@ public class PapyrusQuery extends AbstractPapyrusQuery { this.searchAllStringAttributes = searchAllStringAttributes; results = new PapyrusSearchResult(this); - fResults = new HashSet<AbstractResultEntry>(); + fResults = new HashSet<>(); } + @Override public IStatus run(IProgressMonitor monitor) throws OperationCanceledException { progressMonitor = SubMonitor.convert(monitor, scopeEntries.size() * 3); - progressMonitor.subTask("Searching"); - + progressMonitor.subTask("Searching"); //$NON-NLS-1$ + results.removeAll(); fResults.clear(); - - for (ScopeEntry scopeEntry : scopeEntries) { + + for (IScopeEntry scopeEntry : scopeEntries) { try { if (scopeEntry.getModelSet() != null) { UmlModel umlModel = (UmlModel) scopeEntry.getModelSet().getModelChecked(UmlModel.MODEL_ID); - + EObject root = umlModel.lookupRoot(); - + Collection<EObject> participants = ParticipantValidator.getInstance().getParticipants(root, participantsTypes); progressMonitor.worked(1); - + evaluate(participants, scopeEntry); - + progressMonitor.worked(1); } } catch (NotFoundException e) { Activator.log.error(Messages.PapyrusQuery_0 + scopeEntry.getModelSet(), e); } } - + progressMonitor.done(); return Status.OK_STATUS; @@ -143,7 +145,7 @@ public class PapyrusQuery extends AbstractPapyrusQuery { * @param scopeEntry * the scopeEntry that contains the participant */ - protected void evaluateAndAddToResult(String value, Object attribute, Pattern pattern, Object participant, ScopeEntry scopeEntry, Stereotype stereotype) { + protected void evaluateAndAddToResult(String value, Object attribute, Pattern pattern, Object participant, IScopeEntry scopeEntry, Stereotype stereotype) { value = value != null ? value : ""; //$NON-NLS-1$ @@ -181,7 +183,7 @@ public class PapyrusQuery extends AbstractPapyrusQuery { * @param participants * @param scopeEntry */ - protected void evaluate(Collection<EObject> participants, ScopeEntry scopeEntry) { + protected void evaluate(Collection<EObject> participants, IScopeEntry scopeEntry) { for (EObject participant : participants) { String query = searchQueryText; @@ -229,15 +231,15 @@ public class PapyrusQuery extends AbstractPapyrusQuery { } } } - + // Find diagrams that contain the elements that were found - Set<AbstractResultEntry> viewResults = new HashSet<AbstractResultEntry>(); + Set<AbstractResultEntry> viewResults = new HashSet<>(); for (AbstractResultEntry match : fResults) { Object source = match.getSource(); - + if (source instanceof Element) { List<View> views = getViews((Element) source); - + if (views != null && !views.isEmpty()) { for (View view : views) { ViewerMatch viewMatch = new ViewerMatch(view, scopeEntry, source); @@ -246,7 +248,7 @@ public class PapyrusQuery extends AbstractPapyrusQuery { } } } - + fResults.addAll(viewResults); } @@ -254,37 +256,41 @@ public class PapyrusQuery extends AbstractPapyrusQuery { public Set<AbstractResultEntry> getResults() { return fResults; } - + + @Override public String getLabel() { return Messages.PapyrusQuery_6; } + @Override public boolean canRerun() { return false; } + @Override public boolean canRunInBackground() { return true; } + @Override public ISearchResult getSearchResult() { if (progressMonitor != null) { progressMonitor.setWorkRemaining(fResults.size()); - progressMonitor.subTask("Displaying Results"); + progressMonitor.subTask("Displaying Results"); //$NON-NLS-1$ } - + for (AbstractResultEntry match : fResults) { results.addMatch(match); - + if (progressMonitor != null) { progressMonitor.worked(1); } } - + if (progressMonitor != null) { progressMonitor.done(); } - + return results; } diff --git a/plugins/uml/org.eclipse.papyrus.uml.search.ui/src/org/eclipse/papyrus/uml/search/ui/query/WorkspaceQueryProvider.java b/plugins/uml/org.eclipse.papyrus.uml.search.ui/src/org/eclipse/papyrus/uml/search/ui/query/WorkspaceQueryProvider.java index 6ab5367dc40..03e81bf5c0a 100644 --- a/plugins/uml/org.eclipse.papyrus.uml.search.ui/src/org/eclipse/papyrus/uml/search/ui/query/WorkspaceQueryProvider.java +++ b/plugins/uml/org.eclipse.papyrus.uml.search.ui/src/org/eclipse/papyrus/uml/search/ui/query/WorkspaceQueryProvider.java @@ -23,6 +23,7 @@ import org.eclipse.emf.common.util.URI; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EClassifier; import org.eclipse.emf.ecore.EObject; +import org.eclipse.papyrus.views.search.scope.IScopeEntry; import org.eclipse.papyrus.views.search.scope.ScopeEntry; import org.eclipse.papyrus.views.search.utils.DefaultServiceRegistryTracker; import org.eclipse.papyrus.views.search.utils.IServiceRegistryTracker; @@ -34,25 +35,28 @@ import org.eclipse.uml2.uml.UMLPackage; */ public class WorkspaceQueryProvider implements IPapyrusQueryProvider { - protected Set<EObject> umlMetaClasses = new HashSet<EObject>(); + protected Set<EObject> umlMetaClasses = new HashSet<>(); public WorkspaceQueryProvider() { super(); } + @Override public boolean canProvideFor(URI scope) { // I always brute-force load the model to query it, so I can provide for any URI return true; } + @Override public AbstractPapyrusQuery createSimpleSearchQuery(QueryInfo queryInfo) { initMetaClasses(); - Collection<ScopeEntry> scopeEntries = createScopeEntries(queryInfo.getScope()); + Collection<IScopeEntry> scopeEntries = createScopeEntries(queryInfo.getScope()); return new PapyrusQuery(queryInfo.getQueryText(), queryInfo.isCaseSensitive(), queryInfo.isRegularExpression(), scopeEntries, umlMetaClasses.toArray(), queryInfo.isSearchAllStringAttributes()); } + @Override public AbstractPapyrusQuery createAdvancedSearchQuery(QueryInfo queryInfo) { - Collection<ScopeEntry> scopeEntries = createScopeEntries(queryInfo.getScope()); + Collection<IScopeEntry> scopeEntries = createScopeEntries(queryInfo.getScope()); return new PapyrusAdvancedQuery(queryInfo.getQueryText(), queryInfo.isCaseSensitive(), queryInfo.isRegularExpression(), scopeEntries, queryInfo.getParticipantTypes().toArray(), queryInfo.isSearchForAllSter(), queryInfo.isSearchForAnySter()); } @@ -73,13 +77,13 @@ public class WorkspaceQueryProvider implements IPapyrusQueryProvider { * * @return the created scopeEntries */ - public static Collection<ScopeEntry> createScopeEntries(Collection<URI> scope) { + public static Collection<IScopeEntry> createScopeEntries(Collection<URI> scope) { IServiceRegistryTracker tracker = createServiceRegistryTracker(); - Collection<ScopeEntry> results = new HashSet<ScopeEntry>(); - + Collection<IScopeEntry> results = new HashSet<>(); + for (URI uri : scope) { - ScopeEntry scopeEntry = new ScopeEntry(uri, tracker); + IScopeEntry scopeEntry = new ScopeEntry(uri, tracker); results.add(scopeEntry); diff --git a/plugins/uml/org.eclipse.papyrus.uml.search.ui/src/org/eclipse/papyrus/uml/search/ui/results/PapyrusSearchResult.java b/plugins/uml/org.eclipse.papyrus.uml.search.ui/src/org/eclipse/papyrus/uml/search/ui/results/PapyrusSearchResult.java index a284b7ff526..4d017860d14 100644 --- a/plugins/uml/org.eclipse.papyrus.uml.search.ui/src/org/eclipse/papyrus/uml/search/ui/results/PapyrusSearchResult.java +++ b/plugins/uml/org.eclipse.papyrus.uml.search.ui/src/org/eclipse/papyrus/uml/search/ui/results/PapyrusSearchResult.java @@ -1,5 +1,5 @@ /***************************************************************************** - * Copyright (c) 2013 CEA LIST and others. + * Copyright (c) 2013, 2023 CEA LIST and others. * * * All rights reserved. This program and the accompanying materials @@ -12,6 +12,7 @@ * Contributors: * CEA LIST - Initial API and implementation * Christian W. Damus (CEA LIST) - Replace workspace IResource dependency with URI for CDO compatibility + * Pauline DEVILLE (CEA LIST) <pauline.deville@cea.fr> - Bug 581217 * *****************************************************************************/ package org.eclipse.papyrus.uml.search.ui.results; @@ -45,7 +46,7 @@ import org.eclipse.papyrus.views.search.results.AttributeMatch; import org.eclipse.papyrus.views.search.results.ModelElementMatch; import org.eclipse.papyrus.views.search.results.ModelMatch; import org.eclipse.papyrus.views.search.results.ViewerMatch; -import org.eclipse.papyrus.views.search.scope.ScopeEntry; +import org.eclipse.papyrus.views.search.scope.IScopeEntry; import org.eclipse.papyrus.views.search.utils.MatchUtils; import org.eclipse.search.ui.text.AbstractTextSearchResult; import org.eclipse.search.ui.text.IEditorMatchAdapter; @@ -74,6 +75,7 @@ public class PapyrusSearchResult extends AbstractTextSearchResult implements IEd possibleMatchFilter = new MatchFilter[0]; } + @Override public AbstractPapyrusQuery getQuery() { return searchQuery; } @@ -89,16 +91,19 @@ public class PapyrusSearchResult extends AbstractTextSearchResult implements IEd } + @Override public String getLabel() { return getMatchCount() + Messages.PapyrusSearchResult_0 + searchQuery.getSearchQueryText() + Messages.PapyrusSearchResult_1; } + @Override public String getTooltip() { return Messages.PapyrusSearchResult_2; } + @Override public ImageDescriptor getImageDescriptor() { return ResourceManager.getPluginImageDescriptor(Activator.PLUGIN_ID, "icons/PapyrusSearch.png"); //$NON-NLS-1$ } @@ -113,14 +118,15 @@ public class PapyrusSearchResult extends AbstractTextSearchResult implements IEd return this; } + @Override public Match[] computeContainedMatches(AbstractTextSearchResult result, IFile file) { - Set<Match> results = new HashSet<Match>(); + Set<Match> results = new HashSet<>(); Set<AbstractResultEntry> allMatches = MatchUtils.getMatches(result, true); for (AbstractResultEntry modelMatch : allMatches) { Object element = modelMatch.getElement(); - if (element instanceof ScopeEntry) { - if (file.equals(getWorkspaceResource((ScopeEntry) element))) { + if (element instanceof IScopeEntry) { + if (file.equals(getWorkspaceResource((IScopeEntry) element))) { results.add(modelMatch); } } @@ -130,7 +136,7 @@ public class PapyrusSearchResult extends AbstractTextSearchResult implements IEd return results.toArray(arrayResult); } - protected IResource getWorkspaceResource(ScopeEntry scopeEntry) { + protected IResource getWorkspaceResource(IScopeEntry scopeEntry) { IResource result = null; URI uri = scopeEntry.getResourceURI(); @@ -142,9 +148,10 @@ public class PapyrusSearchResult extends AbstractTextSearchResult implements IEd return result; } + @Override public IFile getFile(Object element) { - if (element instanceof ScopeEntry) { - IResource resource = getWorkspaceResource((ScopeEntry) element); + if (element instanceof IScopeEntry) { + IResource resource = getWorkspaceResource((IScopeEntry) element); if (resource instanceof IFile) { return (IFile) resource; } @@ -152,11 +159,12 @@ public class PapyrusSearchResult extends AbstractTextSearchResult implements IEd return null; } + @Override public boolean isShownInEditor(Match match, IEditorPart editor) { if (match instanceof AbstractResultEntry) { Object element = match.getElement(); - if (element instanceof ScopeEntry) { - if (Objects.equal(EditorUtils.getResourceURI(editor), ((ScopeEntry) element).getResourceURI())) { + if (element instanceof IScopeEntry) { + if (Objects.equal(EditorUtils.getResourceURI(editor), ((IScopeEntry) element).getResourceURI())) { return true; } } @@ -169,8 +177,8 @@ public class PapyrusSearchResult extends AbstractTextSearchResult implements IEd public Match[] getMatches(Object element) { Match[] matchList = super.getMatches(element); - Set<Match> matchToKeep = new HashSet<Match>(); - List<Object> sourceList = new ArrayList<Object>(); + Set<Match> matchToKeep = new HashSet<>(); + List<Object> sourceList = new ArrayList<>(); // Get matches which are still true for (Match match : matchList) { if (match instanceof AbstractResultEntry) { @@ -179,12 +187,12 @@ public class PapyrusSearchResult extends AbstractTextSearchResult implements IEd Object attribute = ((AttributeMatch) match).getMetaAttribute(); String value = null; EObject target = (EObject) ((AbstractResultEntry) match).getSource(); - + if (attribute instanceof EAttribute) { value = String.valueOf(target.eGet((EStructuralFeature) attribute)); } else if (attribute instanceof Property) { - value = StereotypeUtil.displayPropertyValueOnly( ((AttributeMatch) match).getStereotype(), ((Property) attribute), (Element) ((AbstractResultEntry) match).getSource(), ""); - } + value = StereotypeUtil.displayPropertyValueOnly(((AttributeMatch) match).getStereotype(), ((Property) attribute), (Element) ((AbstractResultEntry) match).getSource(), ""); //$NON-NLS-1$ + } if (!this.getQuery().isRegularExpression()) { if (value.length() >= match.getLength() + match.getOffset()) { @@ -193,14 +201,14 @@ public class PapyrusSearchResult extends AbstractTextSearchResult implements IEd if (this.searchQuery.isCaseSensitive()) { if (value.equals(this.searchQuery.getSearchQueryText())) { - //((AbstractResultEntry) match).recursiveHierarchy((AbstractResultEntry) ((AbstractResultEntry) match).getParent()); + // ((AbstractResultEntry) match).recursiveHierarchy((AbstractResultEntry) ((AbstractResultEntry) match).getParent()); matchToKeep.add(match); sourceList.add(((AbstractResultEntry) match).getSource()); } } else { if (value.equalsIgnoreCase(this.searchQuery.getSearchQueryText())) { - //((AbstractResultEntry) match).recursiveHierarchy((AbstractResultEntry) ((AbstractResultEntry) match).getParent()); + // ((AbstractResultEntry) match).recursiveHierarchy((AbstractResultEntry) ((AbstractResultEntry) match).getParent()); matchToKeep.add(match); sourceList.add(((AbstractResultEntry) match).getSource()); @@ -222,7 +230,7 @@ public class PapyrusSearchResult extends AbstractTextSearchResult implements IEd } } } else if (match instanceof ModelElementMatch) { - //((AbstractResultEntry) match).recursiveHierarchy((AbstractResultEntry) match); + // ((AbstractResultEntry) match).recursiveHierarchy((AbstractResultEntry) match); matchToKeep.add(match); sourceList.add(((AbstractResultEntry) match).getSource()); @@ -246,13 +254,14 @@ public class PapyrusSearchResult extends AbstractTextSearchResult implements IEd // } + @Override public Match[] computeContainedMatches(AbstractTextSearchResult result, IEditorPart editor) { - Set<Object> results = new HashSet<Object>(); + Set<Object> results = new HashSet<>(); Set<AbstractResultEntry> allMatches = MatchUtils.getMatches(result, true); for (AbstractResultEntry modelMatch : allMatches) { Object element = modelMatch.getElement(); - if (element instanceof ScopeEntry) { - if (((ScopeEntry) element).getResourceURI().equals(EditorUtils.getResourceURI(editor))) { + if (element instanceof IScopeEntry) { + if (((IScopeEntry) element).getResourceURI().equals(EditorUtils.getResourceURI(editor))) { results.add(modelMatch); } } @@ -282,9 +291,9 @@ public class PapyrusSearchResult extends AbstractTextSearchResult implements IEd private String getStringValue(Object value) { if (value == null) { - return ""; + return ""; //$NON-NLS-1$ } - + if (value instanceof String) { // Primitive types will hit this case return (String) value; } else if (value instanceof EnumerationLiteral) { @@ -298,10 +307,10 @@ public class PapyrusSearchResult extends AbstractTextSearchResult implements IEd return String.valueOf(value); } } - + private EList<String> getStringValuesOfProperty(Element element, Stereotype stereotype, Property property) { - BasicEList<String> results = new BasicEList<String>(); - + BasicEList<String> results = new BasicEList<>(); + Object values = element.getValue(stereotype, property.getName()); if (values instanceof EList) { for (Object val : (EList) values) { @@ -310,7 +319,7 @@ public class PapyrusSearchResult extends AbstractTextSearchResult implements IEd } else { results.add(getStringValue(values)); } - + return results; } } diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types.ui/.classpath b/plugins/uml/org.eclipse.papyrus.uml.service.types.ui/.classpath index c8590e5cef6..1ed94f75bf9 100644 --- a/plugins/uml/org.eclipse.papyrus.uml.service.types.ui/.classpath +++ b/plugins/uml/org.eclipse.papyrus.uml.service.types.ui/.classpath @@ -2,6 +2,6 @@ <classpath> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <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="output" path="bin"/> </classpath> diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types.ui/.settings/org.eclipse.jdt.core.prefs b/plugins/uml/org.eclipse.papyrus.uml.service.types.ui/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/uml/org.eclipse.papyrus.uml.service.types.ui/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/uml/org.eclipse.papyrus.uml.service.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/uml/org.eclipse.papyrus.uml.service.types.ui/META-INF/MANIFEST.MF b/plugins/uml/org.eclipse.papyrus.uml.service.types.ui/META-INF/MANIFEST.MF index 02e8f29d8eb..c802a946b62 100644 --- a/plugins/uml/org.eclipse.papyrus.uml.service.types.ui/META-INF/MANIFEST.MF +++ b/plugins/uml/org.eclipse.papyrus.uml.service.types.ui/META-INF/MANIFEST.MF @@ -26,7 +26,7 @@ Bundle-Name: %pluginName Bundle-Activator: org.eclipse.papyrus.uml.service.types.internal.ui.Activator Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.uml.service.types.ui;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.eclipse.papyrus.uml.service.types.internal.ui;x-internal:=true, org.eclipse.papyrus.uml.service.types.internal.ui.advice;x-internal:=true, org.eclipse.papyrus.uml.service.types.internal.ui.commands;x-internal:=true, diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/.classpath b/plugins/uml/org.eclipse.papyrus.uml.service.types/.classpath index a239888e465..15d1c74bdc4 100644 --- a/plugins/uml/org.eclipse.papyrus.uml.service.types/.classpath +++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/.classpath @@ -3,6 +3,6 @@ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <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="output" path="bin"/> </classpath> diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/.settings/org.eclipse.jdt.core.prefs b/plugins/uml/org.eclipse.papyrus.uml.service.types/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/uml/org.eclipse.papyrus.uml.service.types/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/uml/org.eclipse.papyrus.uml.service.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/uml/org.eclipse.papyrus.uml.service.types/META-INF/MANIFEST.MF b/plugins/uml/org.eclipse.papyrus.uml.service.types/META-INF/MANIFEST.MF index 3b086e3fa67..bd0a99da444 100644 --- a/plugins/uml/org.eclipse.papyrus.uml.service.types/META-INF/MANIFEST.MF +++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/META-INF/MANIFEST.MF @@ -35,6 +35,6 @@ Bundle-Name: %pluginName Bundle-Activator: org.eclipse.papyrus.uml.service.types.Activator Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.uml.service.types;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="[32.0.0, 33.0.0)" Automatic-Module-Name: org.eclipse.papyrus.uml.service.types diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/command/InterfaceRealizationReorientCommand.java b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/command/InterfaceRealizationReorientCommand.java index 3925902b504..085aca004af 100644 --- a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/command/InterfaceRealizationReorientCommand.java +++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/command/InterfaceRealizationReorientCommand.java @@ -1,5 +1,5 @@ /***************************************************************************** - * Copyright (c) 2011, 2017 CEA LIST. + * Copyright (c) 2011, 2017, 2022 CEA LIST. * * * All rights reserved. This program and the accompanying materials @@ -11,8 +11,9 @@ * * Contributors: * - * Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation + * Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation * Fanch Bonnabesse (ALL4TEC) fanch.bonnabesse@alltec.net - Bug 515122 + * Ansgar Radermacher (CEA) - Bug 580557, InterfaceRealization element disappears * *****************************************************************************/ package org.eclipse.papyrus.uml.service.types.command; @@ -78,6 +79,18 @@ public class InterfaceRealizationReorientCommand extends DependencyReorientComma return (InterfaceRealization) getElementToEdit(); } + @Override + protected CommandResult reorientSource() throws ExecutionException { + if (getNewSource() instanceof BehavioredClassifier) { + // add interface-realization to new container (behaviored-classifier). If + // the old source is removed from the "client" list of the relationship, the + // interface realization is detached from its container otherwise (bug 580557). + BehavioredClassifier bClassifier = (BehavioredClassifier) getNewSource(); + bClassifier.getInterfaceRealizations().add(getLink()); + } + return super.reorientSource(); + } + /** * {@inheritDoc} */ diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/DirectedRelationshipEditHelper.java b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/DirectedRelationshipEditHelper.java index eac5bee423a..5a717a37f26 100644 --- a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/DirectedRelationshipEditHelper.java +++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/DirectedRelationshipEditHelper.java @@ -1,6 +1,6 @@ /***************************************************************************** - * Copyright (c) 2011, 2015 CEA LIST, Christian W. Damus, and others. - * + * Copyright (c) 2011, 2015, 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 * which accompanies this distribution, and is available at @@ -12,7 +12,7 @@ * Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation * Patrik Nandorf (Ericsson AB) - bug 458042 * Christian W. Damus - bug 459701 - * + * Vincent LORENZO (CEA LIST) - vincent.lorenzo@cea.fr - Bug 580838 *****************************************************************************/ package org.eclipse.papyrus.uml.service.types.helper; @@ -97,7 +97,7 @@ public abstract class DirectedRelationshipEditHelper extends ElementEditHelper { // If no common container is found try source nearest package if (proposedContainer == null) { EObject sourcePackage = EMFCoreUtil.getContainer(source, UMLPackage.eINSTANCE.getPackage()); - if (!isReadOnly(sourcePackage)) { + if (sourcePackage != null && !isReadOnly(sourcePackage)) { proposedContainer = sourcePackage; } } @@ -105,7 +105,7 @@ public abstract class DirectedRelationshipEditHelper extends ElementEditHelper { // If no common container is found try target nearest package if (proposedContainer == null) { EObject targetPackage = EMFCoreUtil.getContainer(target, UMLPackage.eINSTANCE.getPackage()); - if (!isReadOnly(targetPackage)) { + if (targetPackage != null && !isReadOnly(targetPackage)) { proposedContainer = targetPackage; } } diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.validation/.classpath b/plugins/uml/org.eclipse.papyrus.uml.service.validation/.classpath index e801ebfb468..81fe078c20c 100644 --- a/plugins/uml/org.eclipse.papyrus.uml.service.validation/.classpath +++ b/plugins/uml/org.eclipse.papyrus.uml.service.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/uml/org.eclipse.papyrus.uml.service.validation/.settings/org.eclipse.jdt.core.prefs b/plugins/uml/org.eclipse.papyrus.uml.service.validation/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/uml/org.eclipse.papyrus.uml.service.validation/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/uml/org.eclipse.papyrus.uml.service.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/uml/org.eclipse.papyrus.uml.service.validation/META-INF/MANIFEST.MF b/plugins/uml/org.eclipse.papyrus.uml.service.validation/META-INF/MANIFEST.MF index 382d6dd14b8..bc6074b2965 100644 --- a/plugins/uml/org.eclipse.papyrus.uml.service.validation/META-INF/MANIFEST.MF +++ b/plugins/uml/org.eclipse.papyrus.uml.service.validation/META-INF/MANIFEST.MF @@ -20,5 +20,5 @@ Bundle-Name: %pluginName Bundle-Activator: org.eclipse.papyrus.uml.service.validation.Activator Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.uml.service.validation;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.uml.service.validation diff --git a/plugins/uml/org.eclipse.papyrus.uml.services.decoration/.classpath b/plugins/uml/org.eclipse.papyrus.uml.services.decoration/.classpath index e801ebfb468..81fe078c20c 100644 --- a/plugins/uml/org.eclipse.papyrus.uml.services.decoration/.classpath +++ b/plugins/uml/org.eclipse.papyrus.uml.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/uml/org.eclipse.papyrus.uml.services.decoration/.settings/org.eclipse.jdt.core.prefs b/plugins/uml/org.eclipse.papyrus.uml.services.decoration/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/uml/org.eclipse.papyrus.uml.services.decoration/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/uml/org.eclipse.papyrus.uml.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/uml/org.eclipse.papyrus.uml.services.decoration/META-INF/MANIFEST.MF b/plugins/uml/org.eclipse.papyrus.uml.services.decoration/META-INF/MANIFEST.MF index 16a1f46381a..c079ad49b27 100644 --- a/plugins/uml/org.eclipse.papyrus.uml.services.decoration/META-INF/MANIFEST.MF +++ b/plugins/uml/org.eclipse.papyrus.uml.services.decoration/META-INF/MANIFEST.MF @@ -14,5 +14,5 @@ Bundle-Name: %pluginName Bundle-Activator: org.eclipse.papyrus.uml.services.decoration.Activator Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.uml.services.decoration;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.uml.services.decoration diff --git a/plugins/uml/org.eclipse.papyrus.uml.templaterepository/.classpath b/plugins/uml/org.eclipse.papyrus.uml.templaterepository/.classpath index e801ebfb468..81fe078c20c 100644 --- a/plugins/uml/org.eclipse.papyrus.uml.templaterepository/.classpath +++ b/plugins/uml/org.eclipse.papyrus.uml.templaterepository/.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/uml/org.eclipse.papyrus.uml.templaterepository/.settings/org.eclipse.jdt.core.prefs b/plugins/uml/org.eclipse.papyrus.uml.templaterepository/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/uml/org.eclipse.papyrus.uml.templaterepository/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/uml/org.eclipse.papyrus.uml.templaterepository/.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/uml/org.eclipse.papyrus.uml.templaterepository/META-INF/MANIFEST.MF b/plugins/uml/org.eclipse.papyrus.uml.templaterepository/META-INF/MANIFEST.MF index 84c01038a6f..39e92aba298 100644 --- a/plugins/uml/org.eclipse.papyrus.uml.templaterepository/META-INF/MANIFEST.MF +++ b/plugins/uml/org.eclipse.papyrus.uml.templaterepository/META-INF/MANIFEST.MF @@ -18,5 +18,5 @@ Bundle-Name: %pluginName Bundle-Activator: org.eclipse.papyrus.uml.templaterepository.Activator Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.uml.templaterepository;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.uml.templaterepository diff --git a/plugins/uml/org.eclipse.papyrus.uml.types.core/.classpath b/plugins/uml/org.eclipse.papyrus.uml.types.core/.classpath index 099e24f14fc..c3f9cf33e92 100644 --- a/plugins/uml/org.eclipse.papyrus.uml.types.core/.classpath +++ b/plugins/uml/org.eclipse.papyrus.uml.types.core/.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/uml/org.eclipse.papyrus.uml.types.core/.settings/org.eclipse.jdt.core.prefs b/plugins/uml/org.eclipse.papyrus.uml.types.core/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/uml/org.eclipse.papyrus.uml.types.core/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/uml/org.eclipse.papyrus.uml.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/uml/org.eclipse.papyrus.uml.types.core/META-INF/MANIFEST.MF b/plugins/uml/org.eclipse.papyrus.uml.types.core/META-INF/MANIFEST.MF index ea6f4ca6108..0a20e21b5d0 100644 --- a/plugins/uml/org.eclipse.papyrus.uml.types.core/META-INF/MANIFEST.MF +++ b/plugins/uml/org.eclipse.papyrus.uml.types.core/META-INF/MANIFEST.MF @@ -63,5 +63,5 @@ Bundle-Localization: plugin Bundle-ManifestVersion: 2 Bundle-Activator: org.eclipse.papyrus.uml.types.core.Activator Bundle-SymbolicName: org.eclipse.papyrus.uml.types.core;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.uml.types.core diff --git a/plugins/uml/org.eclipse.papyrus.uml.types.ui.properties/.classpath b/plugins/uml/org.eclipse.papyrus.uml.types.ui.properties/.classpath index c3ba59e4c3a..1a821310bdc 100644 --- a/plugins/uml/org.eclipse.papyrus.uml.types.ui.properties/.classpath +++ b/plugins/uml/org.eclipse.papyrus.uml.types.ui.properties/.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/uml/org.eclipse.papyrus.uml.types.ui.properties/.settings/org.eclipse.jdt.core.prefs b/plugins/uml/org.eclipse.papyrus.uml.types.ui.properties/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/uml/org.eclipse.papyrus.uml.types.ui.properties/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/uml/org.eclipse.papyrus.uml.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/uml/org.eclipse.papyrus.uml.types.ui.properties/META-INF/MANIFEST.MF b/plugins/uml/org.eclipse.papyrus.uml.types.ui.properties/META-INF/MANIFEST.MF index d2839706542..b29136360a6 100644 --- a/plugins/uml/org.eclipse.papyrus.uml.types.ui.properties/META-INF/MANIFEST.MF +++ b/plugins/uml/org.eclipse.papyrus.uml.types.ui.properties/META-INF/MANIFEST.MF @@ -26,7 +26,7 @@ Bundle-Name: %pluginName Bundle-Localization: plugin Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.uml.types.ui.properties;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.eclipse.papyrus.uml.types.ui.properties.modelelement, org.eclipse.papyrus.uml.types.ui.properties.providers, org.eclipse.papyrus.uml.types.ui.properties.widgets diff --git a/plugins/uml/org.eclipse.papyrus.uml.ui/.classpath b/plugins/uml/org.eclipse.papyrus.uml.ui/.classpath index e801ebfb468..81fe078c20c 100644 --- a/plugins/uml/org.eclipse.papyrus.uml.ui/.classpath +++ b/plugins/uml/org.eclipse.papyrus.uml.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/uml/org.eclipse.papyrus.uml.ui/.settings/org.eclipse.jdt.core.prefs b/plugins/uml/org.eclipse.papyrus.uml.ui/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/uml/org.eclipse.papyrus.uml.ui/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/uml/org.eclipse.papyrus.uml.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/uml/org.eclipse.papyrus.uml.ui/META-INF/MANIFEST.MF b/plugins/uml/org.eclipse.papyrus.uml.ui/META-INF/MANIFEST.MF index b71cd5130dc..ee4635fefb8 100644 --- a/plugins/uml/org.eclipse.papyrus.uml.ui/META-INF/MANIFEST.MF +++ b/plugins/uml/org.eclipse.papyrus.uml.ui/META-INF/MANIFEST.MF @@ -22,7 +22,7 @@ Bundle-Version: 2.0.0.qualifier Bundle-Name: %pluginName Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.uml.ui;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-Localization: plugin Bundle-Activator: org.eclipse.papyrus.uml.ui.Activator Automatic-Module-Name: org.eclipse.papyrus.uml.ui diff --git a/plugins/uml/profile/org.eclipse.papyrus.uml.profile.drafter.documentation/.classpath b/plugins/uml/profile/org.eclipse.papyrus.uml.profile.drafter.documentation/.classpath index bc3587db485..a7a673fa7ab 100644 --- a/plugins/uml/profile/org.eclipse.papyrus.uml.profile.drafter.documentation/.classpath +++ b/plugins/uml/profile/org.eclipse.papyrus.uml.profile.drafter.documentation/.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/uml/profile/org.eclipse.papyrus.uml.profile.drafter.documentation/.settings/org.eclipse.jdt.core.prefs b/plugins/uml/profile/org.eclipse.papyrus.uml.profile.drafter.documentation/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/uml/profile/org.eclipse.papyrus.uml.profile.drafter.documentation/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/uml/profile/org.eclipse.papyrus.uml.profile.drafter.documentation/.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/uml/profile/org.eclipse.papyrus.uml.profile.drafter.documentation/META-INF/MANIFEST.MF b/plugins/uml/profile/org.eclipse.papyrus.uml.profile.drafter.documentation/META-INF/MANIFEST.MF index c8b10eb89a9..d57c5cdf825 100644 --- a/plugins/uml/profile/org.eclipse.papyrus.uml.profile.drafter.documentation/META-INF/MANIFEST.MF +++ b/plugins/uml/profile/org.eclipse.papyrus.uml.profile.drafter.documentation/META-INF/MANIFEST.MF @@ -5,5 +5,5 @@ Bundle-Name: %pluginName Bundle-Localization: plugin Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.uml.profile.drafter.documentation;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.uml.profile.drafter.documentation diff --git a/plugins/uml/profile/org.eclipse.papyrus.uml.profile.drafter/.classpath b/plugins/uml/profile/org.eclipse.papyrus.uml.profile.drafter/.classpath index e801ebfb468..81fe078c20c 100644 --- a/plugins/uml/profile/org.eclipse.papyrus.uml.profile.drafter/.classpath +++ b/plugins/uml/profile/org.eclipse.papyrus.uml.profile.drafter/.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/uml/profile/org.eclipse.papyrus.uml.profile.drafter/.settings/org.eclipse.jdt.core.prefs b/plugins/uml/profile/org.eclipse.papyrus.uml.profile.drafter/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/uml/profile/org.eclipse.papyrus.uml.profile.drafter/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/uml/profile/org.eclipse.papyrus.uml.profile.drafter/.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/uml/profile/org.eclipse.papyrus.uml.profile.drafter/META-INF/MANIFEST.MF b/plugins/uml/profile/org.eclipse.papyrus.uml.profile.drafter/META-INF/MANIFEST.MF index 68bf443bc57..162c8c01f02 100644 --- a/plugins/uml/profile/org.eclipse.papyrus.uml.profile.drafter/META-INF/MANIFEST.MF +++ b/plugins/uml/profile/org.eclipse.papyrus.uml.profile.drafter/META-INF/MANIFEST.MF @@ -26,13 +26,13 @@ Export-Package: org.eclipse.papyrus.uml.profile.drafter, org.eclipse.papyrus.uml.profile.drafter.utils Bundle-Vendor: %providerName Bundle-ActivationPolicy: lazy -Bundle-Version: 2.1.0.qualifier +Bundle-Version: 2.2.0.qualifier Bundle-Name: %pluginName Bundle-Localization: plugin Bundle-ManifestVersion: 2 Bundle-Activator: org.eclipse.papyrus.uml.profile.drafter.Activator Bundle-SymbolicName: org.eclipse.papyrus.uml.profile.drafter;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="[32.0.0, 33.0.0)", + com.google.common.collect;version="[32.0.0, 33.0.0)" Automatic-Module-Name: org.eclipse.papyrus.uml.profile.drafter diff --git a/plugins/uml/profile/org.eclipse.papyrus.uml.profile.drafter/pom.xml b/plugins/uml/profile/org.eclipse.papyrus.uml.profile.drafter/pom.xml index 20b0dd0c2e6..50f7bdbbdf4 100644 --- a/plugins/uml/profile/org.eclipse.papyrus.uml.profile.drafter/pom.xml +++ b/plugins/uml/profile/org.eclipse.papyrus.uml.profile.drafter/pom.xml @@ -9,6 +9,6 @@ <version>0.0.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.papyrus.uml.profile.drafter</artifactId> - <version>2.1.0-SNAPSHOT</version> + <version>2.2.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project>
\ No newline at end of file diff --git a/plugins/uml/profile/org.eclipse.papyrus.uml.profile.drafter/src/org/eclipse/papyrus/uml/profile/drafter/ui/dialog/PropertiesEditorWidget.java b/plugins/uml/profile/org.eclipse.papyrus.uml.profile.drafter/src/org/eclipse/papyrus/uml/profile/drafter/ui/dialog/PropertiesEditorWidget.java index e00745d3a8d..1e9d3da7cfa 100644 --- a/plugins/uml/profile/org.eclipse.papyrus.uml.profile.drafter/src/org/eclipse/papyrus/uml/profile/drafter/ui/dialog/PropertiesEditorWidget.java +++ b/plugins/uml/profile/org.eclipse.papyrus.uml.profile.drafter/src/org/eclipse/papyrus/uml/profile/drafter/ui/dialog/PropertiesEditorWidget.java @@ -18,19 +18,18 @@ package org.eclipse.papyrus.uml.profile.drafter.ui.dialog; import java.util.List; import org.eclipse.core.databinding.DataBindingContext; -import org.eclipse.core.databinding.beans.BeanProperties; -import org.eclipse.core.databinding.beans.BeansObservables; import org.eclipse.core.databinding.beans.IBeanValueProperty; +import org.eclipse.core.databinding.beans.typed.BeanProperties; import org.eclipse.core.databinding.observable.list.WritableList; import org.eclipse.core.databinding.observable.map.IObservableMap; import org.eclipse.core.databinding.observable.value.IObservableValue; import org.eclipse.core.databinding.property.value.IValueProperty; import org.eclipse.emf.ecore.resource.ResourceSet; -import org.eclipse.jface.databinding.swt.WidgetProperties; +import org.eclipse.jface.databinding.swt.typed.WidgetProperties; import org.eclipse.jface.databinding.viewers.ObservableListContentProvider; import org.eclipse.jface.databinding.viewers.ObservableMapLabelProvider; import org.eclipse.jface.databinding.viewers.ObservableValueEditingSupport; -import org.eclipse.jface.databinding.viewers.ViewerProperties; +import org.eclipse.jface.databinding.viewers.typed.ViewerProperties; import org.eclipse.jface.viewers.ArrayContentProvider; import org.eclipse.jface.viewers.CellEditor; import org.eclipse.jface.viewers.ColumnLabelProvider; @@ -72,6 +71,7 @@ import org.eclipse.uml2.uml.Type; /** * A widget used to edit a list of {@link PropertyModel}. + * * @author dumoulin * */ @@ -79,10 +79,10 @@ public class PropertiesEditorWidget { private DataBindingContext m_bindingContext; private Composite contentArea; -// private List<PropertyModel> properties; + // private List<PropertyModel> properties; private WritableList properties; private NamedElement selectedElement; - + private TableViewer treeViewer; private TableViewerColumn nameViewerColumn; private TableViewerColumn typeViewerColumn; @@ -102,79 +102,82 @@ public class PropertiesEditorWidget { * The catalog of type associated to this class. Lazy creation. */ private ITypeCatalog typeCatalog; - + /** * Library of UML Primitive types. Lazy loading. */ private UMLPrimitiveTypesModel umlPrimitiveTypesLibrary; - + /** * Create the composite. + * * @param parent - * @param stereotype The stereotype defining the taggedValues - * @param selectedElement The uml {@link NamedElement} for which taggedValue are edited - * + * @param stereotype + * The stereotype defining the taggedValues + * @param selectedElement + * The uml {@link NamedElement} for which taggedValue are edited + * * @wbp.parser.entryPoint */ public PropertiesEditorWidget(Composite parent, List<PropertyModel> properties, NamedElement selectedElement) { -// this.properties = Properties.selfList(PropertyModel.class).observe(properties); - if( properties instanceof WritableList) { - this.properties = (WritableList)properties; - } - else { + // this.properties = Properties.selfList(PropertyModel.class).observe(properties); + if (properties instanceof WritableList) { + this.properties = (WritableList) properties; + } else { this.properties = new WritableList(properties, PropertyModel.class); } this.selectedElement = selectedElement; createContent(parent); } - + /** - * @param stereotype the stereotype to set + * @param stereotype + * the stereotype to set */ - public void setProperties( List<PropertyModel> properties) { -// this.properties = Properties.selfList(PropertyModel.class).observe(properties); - if( properties instanceof WritableList) { - this.properties = (WritableList)properties; - } - else { + public void setProperties(List<PropertyModel> properties) { + // this.properties = Properties.selfList(PropertyModel.class).observe(properties); + if (properties instanceof WritableList) { + this.properties = (WritableList) properties; + } else { this.properties = new WritableList(properties, PropertyModel.class); } -// treeViewer.setInput(properties); + // treeViewer.setInput(properties); } /** * Create the overall component. + * * @param parent */ protected void createContent(Composite parent) { contentArea = createContentArea(parent); - + // now lets bind the values - // No extra label provider / content provider / setInput required -// WritableList input; -// if( properties instanceof WritableList ) { -// input = (WritableList)properties; -// } -// else { -// input = new WritableList(properties, PropertyModel.class); -// } -// ViewerSupport.bind(treeViewer, -// input, -// BeanProperties.values(new String[] { "proposedName", "type", "modelStatus", "value" })); - - -// fillContentArea(); -// createDialogContents(); + // No extra label provider / content provider / setInput required + // WritableList input; + // if( properties instanceof WritableList ) { + // input = (WritableList)properties; + // } + // else { + // input = new WritableList(properties, PropertyModel.class); + // } + // ViewerSupport.bind(treeViewer, + // input, + // BeanProperties.values(new String[] { "proposedName", "type", "modelStatus", "value" })); + + + // fillContentArea(); + // createDialogContents(); } - + /** * Create the content area. - * + * * @param parent * @return */ @@ -185,87 +188,88 @@ public class PropertiesEditorWidget { layout.makeColumnsEqualWidth = true; composite.setLayout(layout); composite.setLayoutData(new GridData(GridData.FILL_BOTH)); - + Composite tableTitle = new Composite(composite, SWT.NONE); tableTitle.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, false, false, 1, 1)); tableTitle.setLayout(new FillLayout(SWT.HORIZONTAL)); - + Label label = new Label(tableTitle, SWT.NONE); label.setText("Properties"); - + Button addPropertyButton = new Button(tableTitle, SWT.NONE); addPropertyButton.setText("+"); addPropertyButton.addSelectionListener(new SelectionAdapter() { - @Override - public void widgetSelected(SelectionEvent e) { - addPropertyPressed(e); - } + @Override + public void widgetSelected(SelectionEvent e) { + addPropertyPressed(e); + } + + }); + - }); - - Button removePropertyButton = new Button(tableTitle, SWT.NONE); removePropertyButton.setText("-"); removePropertyButton.addSelectionListener(new SelectionAdapter() { - @Override - public void widgetSelected(SelectionEvent e) { - removePropertyPressed(e); - } + @Override + public void widgetSelected(SelectionEvent e) { + removePropertyPressed(e); + } - }); - - treeViewer = new TableViewer(composite, SWT.BORDER | SWT.FULL_SELECTION ); + }); + + treeViewer = new TableViewer(composite, SWT.BORDER | SWT.FULL_SELECTION); Table tree = treeViewer.getTable(); GridData gd_tree = new GridData(SWT.FILL, SWT.FILL, true, true, 1, 1); gd_tree.minimumHeight = 100; tree.setLayoutData(gd_tree); - + nameViewerColumn = new TableViewerColumn(treeViewer, SWT.NONE); TableColumn NameTableColumn = nameViewerColumn.getColumn(); NameTableColumn.setWidth(100); NameTableColumn.setText("name"); -// treeViewerColumn.setLabelProvider( new TaggedValueNameColumnLabelProvider() ); + // treeViewerColumn.setLabelProvider( new TaggedValueNameColumnLabelProvider() ); // Type column typeViewerColumn = new TableViewerColumn(treeViewer, SWT.NONE); TableColumn typeTableColumn = typeViewerColumn.getColumn(); typeTableColumn.setWidth(100); typeTableColumn.setText("type"); - + statusViewerColumn = new TableViewerColumn(treeViewer, SWT.NONE); TableColumn statusTableColumn = statusViewerColumn.getColumn(); statusTableColumn.setWidth(67); statusTableColumn.setText("status"); - + memberViewerColumn = new TableViewerColumn(treeViewer, SWT.NONE); TableColumn memberTableColumn = memberViewerColumn.getColumn(); memberTableColumn.setWidth(64); memberTableColumn.setText("member"); - + deletedViewerColumn = new TableViewerColumn(treeViewer, SWT.NONE); TableColumn deletedTableColumn = deletedViewerColumn.getColumn(); deletedTableColumn.setWidth(37); deletedTableColumn.setText("deleted"); -// treeViewerColumn_1.setLabelProvider( new TaggedValueNameColumnLabelProvider() ); - + // treeViewerColumn_1.setLabelProvider( new TaggedValueNameColumnLabelProvider() ); + valueViewerColumn = new TableViewerColumn(treeViewer, SWT.NONE); TableColumn valueTableColumn = valueViewerColumn.getColumn(); valueTableColumn.setWidth(100); valueTableColumn.setText("value"); -// treeViewerColumn_2.setLabelProvider( new TaggedValueValueColumnLabelProvider() ); + // treeViewerColumn_2.setLabelProvider( new TaggedValueValueColumnLabelProvider() ); tree.setHeaderVisible(true); m_bindingContext = initDataBindings(); -// initManualDataBindings(m_bindingContext); - + // initManualDataBindings(m_bindingContext); + return composite; - } - + } + /** * The add button has been pressed. + * * @param e */ private void addPropertyPressed(SelectionEvent e) { @@ -283,84 +287,85 @@ public class PropertiesEditorWidget { /** * The remove button has been pressed. + * * @param e */ private void removePropertyPressed(SelectionEvent e) { ISelection selection = treeViewer.getSelection(); - if( selection instanceof IStructuredSelection ) { - IStructuredSelection structSelection = (IStructuredSelection)selection; - removeProperty((PropertyModel)structSelection.getFirstElement()); + if (selection instanceof IStructuredSelection) { + IStructuredSelection structSelection = (IStructuredSelection) selection; + removeProperty((PropertyModel) structSelection.getFirstElement()); } } /** * remove the specified property from the property list. - * - * @param propertyModel model to remove. Can be null. + * + * @param propertyModel + * model to remove. Can be null. */ private void removeProperty(PropertyModel propertyModel) { - if(propertyModel == null) { + if (propertyModel == null) { return; } - - if(propertyModel.getStateKind() == StateKind.created) { + + if (propertyModel.getStateKind() == StateKind.created) { // We just created it. So we can safely remove properties.remove(propertyModel); - } - else if( propertyModel.getMemberKind() == MemberKind.owned) { + } else if (propertyModel.getMemberKind() == MemberKind.owned) { // We just change the status of the model. // This is done by sending the delete event propertyModel.deleteModelEvent(); - } - else { + } else { // We do not allow removal of other MemberKind } - + } private void createDialogContents() { - - + + } /** * Fill the content area with values found in stereotype. */ private void fillContentArea() { - - + + } /** * Get the name of the taggedValue + * * @author dumoulin * */ public class TaggedValueNameColumnLabelProvider extends ColumnLabelProvider { - + @Override public String getText(Object element) { - - Property property = (Property)element; + + Property property = (Property) element; return UMLLabelInternationalization.getInstance().getLabel(property); } } - + /** * Get the value of the taggedValue * */ public class TaggedValueValueColumnLabelProvider extends ColumnLabelProvider { - + @Override public String getText(Object element) { - - Property property = (Property)element; - Object value = selectedElement.getValue((Stereotype)property.getOwner(), property.getName()); - - if(value instanceof NamedElement) { - return UMLLabelInternationalization.getInstance().getLabel(((NamedElement)value)); + + Property property = (Property) element; + Object value = selectedElement.getValue((Stereotype) property.getOwner(), property.getName()); + + if (value instanceof NamedElement) { + return UMLLabelInternationalization.getInstance().getLabel(((NamedElement) value)); } // TODO // collections and arrays @@ -368,29 +373,29 @@ public class PropertiesEditorWidget { return value.toString(); } } - + /** * Content Provider for TaggedValues hierarchy * */ private class MyContentProvider implements ITreeContentProvider { - private Object[] EMPTY_ARRAY = new Object[]{}; - + private Object[] EMPTY_ARRAY = new Object[] {}; + @Override public void dispose() { - - + + } @Override public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { - - + + } /** - * + * * @see org.eclipse.jface.viewers.ITreeContentProvider#getElements(java.lang.Object) * * @param inputElement @@ -400,13 +405,13 @@ public class PropertiesEditorWidget { public Object[] getElements(Object inputElement) { - Stereotype stereotype = (Stereotype)inputElement; + Stereotype stereotype = (Stereotype) inputElement; // Return the stereotype's Properties return stereotype.getAllAttributes().toArray(); } /** - * + * * @see org.eclipse.jface.viewers.ITreeContentProvider#getChildren(java.lang.Object) * * @param parentElement @@ -417,9 +422,9 @@ public class PropertiesEditorWidget { return EMPTY_ARRAY; } - + /** - * + * * @see org.eclipse.jface.viewers.ITreeContentProvider#getParent(java.lang.Object) * * @param element @@ -427,7 +432,7 @@ public class PropertiesEditorWidget { */ @Override public Object getParent(Object element) { - Property property = (Property)element; + Property property = (Property) element; return property.getOwner(); } @@ -435,13 +440,13 @@ public class PropertiesEditorWidget { public boolean hasChildren(Object element) { return false; } - + } - + /** * Returns an ObservableValueEditingSupport instance which binds the given * cell editor property to the given element property. - * + * * @param viewer * the column viewer * @param dbc @@ -455,31 +460,34 @@ public class PropertiesEditorWidget { * the element property to be bound to the cell editor. * @return an ObservableValueEditingSupport instance using the given * arguments. - * copied from org.eclipse.jface.databinding.viewers.ObservableValueEditingSupport.create(ColumnViewer, DataBindingContext, CellEditor, IValueProperty, IValueProperty) + * copied from org.eclipse.jface.databinding.viewers.ObservableValueEditingSupport.create(ColumnViewer, DataBindingContext, CellEditor, IValueProperty, IValueProperty) */ protected static EditingSupport create(ColumnViewer viewer, DataBindingContext dbc, final CellEditor cellEditor, final IValueProperty cellEditorProperty, final IValueProperty elementProperty) { return new ObservableValueEditingSupport(viewer, dbc) { - protected IObservableValue doCreateCellEditorObservable( CellEditor cellEditor) { - //WidgetProperties.text(SWT.Modify).observe(cellEditor.getControl()); - if( cellEditor instanceof ComboBoxViewerCellEditor) { - return cellEditorProperty.observe(((ComboBoxViewerCellEditor)cellEditor).getViewer() ); + @Override + protected IObservableValue doCreateCellEditorObservable(CellEditor cellEditor) { + // WidgetProperties.text(SWT.Modify).observe(cellEditor.getControl()); + if (cellEditor instanceof ComboBoxViewerCellEditor) { + return cellEditorProperty.observe(((ComboBoxViewerCellEditor) cellEditor).getViewer()); } - + return cellEditorProperty.observe(cellEditor.getControl()); } - protected IObservableValue doCreateElementObservable( Object element, ViewerCell cell) { + @Override + protected IObservableValue doCreateElementObservable(Object element, ViewerCell cell) { return elementProperty.observe(element); } + @Override protected CellEditor getCellEditor(Object element) { return cellEditor; } - - + + }; } @@ -487,10 +495,16 @@ public class PropertiesEditorWidget { DataBindingContext bindingContext = new DataBindingContext(); // ObservableListContentProvider listContentProvider = new ObservableListContentProvider(); - IObservableMap[] observeMaps = BeansObservables.observeMaps(listContentProvider.getKnownElements(), PropertyModel.class, new String[]{"proposedName", "type", "stateKind", "memberKind", "lifeStatusKind", "value"}); + String[] propertyNames = new String[] { "proposedName", "type", "stateKind", "memberKind", "lifeStatusKind", "value" }; + IObservableMap[] observeMaps = new IObservableMap[propertyNames.length]; + for (int i = 0; i < propertyNames.length; i++) { + observeMaps[i] = BeanProperties.value(PropertyModel.class, propertyNames[i]).observeDetail(listContentProvider.getKnownElements()); + } + treeViewer.setLabelProvider(new ObservableMapLabelProvider(observeMaps) { /** * Handle Type + * * @see org.eclipse.jface.databinding.viewers.ObservableMapLabelProvider#getColumnText(java.lang.Object, int) * * @param element @@ -499,10 +513,10 @@ public class PropertiesEditorWidget { */ @Override public String getColumnText(Object element, int columnIndex) { - + if (columnIndex < attributeMaps.length) { Object result = attributeMaps[columnIndex].get(element); - if(result instanceof Type) { + if (result instanceof Type) { return getTypeLabelProvider().getText(result); } return result == null ? "" : result.toString(); //$NON-NLS-1$ @@ -510,16 +524,15 @@ public class PropertiesEditorWidget { return null; } }); - - - - - - + + + + + treeViewer.setContentProvider(listContentProvider); // treeViewer.setInput(properties); - + // Set Cell Editors // CellEditor cellEditor_0 = new TextCellEditor(treeViewer.getTable()); @@ -528,57 +541,57 @@ public class PropertiesEditorWidget { nameViewerColumn.setEditingSupport(create(treeViewer, bindingContext, cellEditor_0, cellEditorProperty_0, valueProperty_0)); // // Type column -// CellEditor cellEditor_1 = new TextCellEditor(treeViewer.getTable()); -// IValueProperty cellEditorProperty = WidgetProperties.text(SWT.Modify); -// IBeanValueProperty valueProperty_1 = BeanProperties.value("type"); -// treeViewerColumn_1.setEditingSupport(create(treeViewer, bindingContext, cellEditor_1, cellEditorProperty, valueProperty_1)); + // CellEditor cellEditor_1 = new TextCellEditor(treeViewer.getTable()); + // IValueProperty cellEditorProperty = WidgetProperties.text(SWT.Modify); + // IBeanValueProperty valueProperty_1 = BeanProperties.value("type"); + // treeViewerColumn_1.setEditingSupport(create(treeViewer, bindingContext, cellEditor_1, cellEditorProperty, valueProperty_1)); // Use a dedicated ComboBox CellEditor for type ComboBoxViewerCellEditor typeCellEditor = new ComboBoxViewerCellEditor(treeViewer.getTable()); typeCellEditor.setContentProvider(ArrayContentProvider.getInstance()); typeCellEditor.setLabelProvider(getTypeLabelProvider()); typeCellEditor.setInput(getTypeCatalog().getTypes()); // Use a special label provider - - IValueProperty typeCellEditorBindAnchor = ViewerProperties.singleSelection(); + + IValueProperty typeCellEditorBindAnchor = ViewerProperties.singleSelection(); WidgetProperties.text(SWT.Modify); IBeanValueProperty typeModelPropertyBindAnchor = BeanProperties.value("type"); typeViewerColumn.setEditingSupport(create(treeViewer, bindingContext, typeCellEditor, typeCellEditorBindAnchor, typeModelPropertyBindAnchor)); // CellEditor cellEditor_2 = new TextCellEditor(treeViewer.getTable()); - IValueProperty cellEditorProperty_1 = WidgetProperties.text(SWT.Modify); + IValueProperty cellEditorProperty_1 = WidgetProperties.text(SWT.Modify); IBeanValueProperty valueProperty_2 = BeanProperties.value("stateKind"); statusViewerColumn.setEditingSupport(create(treeViewer, bindingContext, cellEditor_2, cellEditorProperty_1, valueProperty_2)); // CellEditor cellEditor_3 = new TextCellEditor(treeViewer.getTable()); - IValueProperty cellEditorProperty_2 = WidgetProperties.text(SWT.Modify); + IValueProperty cellEditorProperty_2 = WidgetProperties.text(SWT.Modify); IBeanValueProperty valueProperty_3 = BeanProperties.value("value"); valueViewerColumn.setEditingSupport(create(treeViewer, bindingContext, cellEditor_3, cellEditorProperty_2, valueProperty_3)); // // CellEditor cellEditor_member = new TextCellEditor(treeViewer.getTable()); - IValueProperty cellEditorPropertyMember = WidgetProperties.text(SWT.Modify); + IValueProperty cellEditorPropertyMember = WidgetProperties.text(SWT.Modify); IBeanValueProperty valuePropertyMember = BeanProperties.value("memberKind"); memberViewerColumn.setEditingSupport(create(treeViewer, bindingContext, cellEditor_member, cellEditorPropertyMember, valuePropertyMember)); // CellEditor cellEditor_del = new TextCellEditor(treeViewer.getTable()); - IValueProperty cellEditorPropertyDel = WidgetProperties.text(SWT.Modify); + IValueProperty cellEditorPropertyDel = WidgetProperties.text(SWT.Modify); IBeanValueProperty valuePropertyDel = BeanProperties.value("lifeStatusKind"); memberViewerColumn.setEditingSupport(create(treeViewer, bindingContext, cellEditor_del, cellEditorPropertyDel, valuePropertyDel)); - - - + + + return bindingContext; } - + /** * Return the {@link TypeLabelProvider} associated to this class. - * + * * @return */ private ILabelProvider getTypeLabelProvider() { - if( typeLabelProvider == null) { + if (typeLabelProvider == null) { typeLabelProvider = new TypeLabelProvider(); } return typeLabelProvider; @@ -586,11 +599,11 @@ public class PropertiesEditorWidget { /** * Return the {@link ITypeCatalog} associated to this class. - * + * * @return */ private ITypeCatalog getTypeCatalog() { - if( typeCatalog == null) { + if (typeCatalog == null) { typeCatalog = new AccessibleTypeCatalog(selectedElement, getUMLPrimitiveTypeLibrary()); } return typeCatalog; @@ -598,13 +611,14 @@ public class PropertiesEditorWidget { /** * Get the Library of UML Primitive types. Lookup in the {@link ResourceSet} associated to the selected NamedElement. - * + * * @return the library found. - * - * @throws UnsupportedOperationException If the Library can't be found in the associated {@link ResourceSet}. + * + * @throws UnsupportedOperationException + * If the Library can't be found in the associated {@link ResourceSet}. */ private UMLPrimitiveTypesModel getUMLPrimitiveTypeLibrary() { - if( umlPrimitiveTypesLibrary == null) { + if (umlPrimitiveTypesLibrary == null) { // Create primitiveTypeModel from the ResourceSet associated to the element. // It will be used to add such types. try { @@ -621,6 +635,7 @@ public class PropertiesEditorWidget { /** * Additional databinding done manually. + * * @param bindingContext * @return */ @@ -633,17 +648,17 @@ public class PropertiesEditorWidget { nameViewerColumn.setEditingSupport(create(treeViewer, bindingContext, cellEditor_0, cellEditorProperty_0, valueProperty_0)); // CellEditor cellEditor_1 = new TextCellEditor(treeViewer.getTable()); - IValueProperty cellEditorProperty = WidgetProperties.text(SWT.Modify); + IValueProperty cellEditorProperty = WidgetProperties.text(SWT.Modify); IBeanValueProperty valueProperty_1 = BeanProperties.value("type"); typeViewerColumn.setEditingSupport(create(treeViewer, bindingContext, cellEditor_1, cellEditorProperty, valueProperty_1)); // CellEditor cellEditor_2 = new TextCellEditor(treeViewer.getTable()); - IValueProperty cellEditorProperty_1 = WidgetProperties.text(SWT.Modify); + IValueProperty cellEditorProperty_1 = WidgetProperties.text(SWT.Modify); IBeanValueProperty valueProperty_2 = BeanProperties.value("modelStatus"); statusViewerColumn.setEditingSupport(create(treeViewer, bindingContext, cellEditor_2, cellEditorProperty_1, valueProperty_2)); // CellEditor cellEditor_3 = new TextCellEditor(treeViewer.getTable()); - IValueProperty cellEditorProperty_2 = WidgetProperties.text(SWT.Modify); + IValueProperty cellEditorProperty_2 = WidgetProperties.text(SWT.Modify); IBeanValueProperty valueProperty_3 = BeanProperties.value("value"); valueViewerColumn.setEditingSupport(create(treeViewer, bindingContext, cellEditor_3, cellEditorProperty_2, valueProperty_3)); // diff --git a/plugins/uml/profile/org.eclipse.papyrus.uml.profile.drafter/src/org/eclipse/papyrus/uml/profile/drafter/ui/dialog/StereotypeUpdateDialog.java b/plugins/uml/profile/org.eclipse.papyrus.uml.profile.drafter/src/org/eclipse/papyrus/uml/profile/drafter/ui/dialog/StereotypeUpdateDialog.java index 41f383934ef..eabd028ecfa 100644 --- a/plugins/uml/profile/org.eclipse.papyrus.uml.profile.drafter/src/org/eclipse/papyrus/uml/profile/drafter/ui/dialog/StereotypeUpdateDialog.java +++ b/plugins/uml/profile/org.eclipse.papyrus.uml.profile.drafter/src/org/eclipse/papyrus/uml/profile/drafter/ui/dialog/StereotypeUpdateDialog.java @@ -4,10 +4,10 @@ import java.util.ArrayList; import java.util.List; import org.eclipse.core.databinding.DataBindingContext; -import org.eclipse.core.databinding.beans.BeanProperties; +import org.eclipse.core.databinding.beans.typed.BeanProperties; import org.eclipse.core.databinding.observable.value.IObservableValue; import org.eclipse.jface.bindings.keys.KeyStroke; -import org.eclipse.jface.databinding.swt.WidgetProperties; +import org.eclipse.jface.databinding.swt.typed.WidgetProperties; import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.dialogs.IDialogConstants; import org.eclipse.jface.fieldassist.ContentProposalAdapter; @@ -39,7 +39,7 @@ import org.eclipse.uml2.uml.Element; import org.eclipse.uml2.uml.NamedElement; /** - * + * * @author cedric dumoulin * */ @@ -52,28 +52,31 @@ public class StereotypeUpdateDialog extends Dialog { private StereotypeUpdateArgs value; private MultipleValueSelectorWidget extendedMetaclassSelector; private PropertiesEditorWidget propertiesEditorWidget; - + /** * An UML Element used to get the associated Resource. */ private Element anyUmlElement; private List<Class> selectedMetaclasses; - -// private StereotypeNameToProfileSynchronizer stereotypeNameToProfileSynchronizer; + + // private StereotypeNameToProfileSynchronizer stereotypeNameToProfileSynchronizer; private StereoptypeModel stereotypeModel; private ProfileCatalog profileCatalog; private Label quickSetLabel; private Label profileNameLabel; - + /** * Create the dialog. + * * @param parentShell - * @param selectedElement Any UML element that can be used to discover the ResourceSet. - * @param metaclassesToSelect Metaclasses that should be selected in the dialog. - * + * @param selectedElement + * Any UML element that can be used to discover the ResourceSet. + * @param metaclassesToSelect + * Metaclasses that should be selected in the dialog. + * */ - public StereotypeUpdateDialog(Shell parentShell, String title, Element selectedElement, List<Class> metaclassesToSelect ) { + public StereotypeUpdateDialog(Shell parentShell, String title, Element selectedElement, List<Class> metaclassesToSelect) { super(parentShell); // Allows dialog resize setShellStyle(getShellStyle() | SWT.RESIZE); @@ -82,76 +85,79 @@ public class StereotypeUpdateDialog extends Dialog { this.selectedMetaclasses = metaclassesToSelect; this.profileCatalog = new ProfileCatalog(selectedElement); stereotypeModel = new StereoptypeModel(profileCatalog, selectedElement); -// stereotypeNameToProfileSynchronizer = new StereotypeNameToProfileSynchronizer(profileCatalog); - + // stereotypeNameToProfileSynchronizer = new StereotypeNameToProfileSynchronizer(profileCatalog); + } /** * Create contents of the dialog. + * * @param parent */ @Override protected Control createDialogArea(Composite parent) { Composite container = (Composite) super.createDialogArea(parent); - + Composite namesContainer = new Composite(container, SWT.NONE); namesContainer.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false, 1, 1)); namesContainer.setLayout(new GridLayout(2, false)); - + quickSetLabel = new Label(namesContainer, SWT.NONE); quickSetLabel.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, false, false, 1, 1)); quickSetLabel.setText("Qualified Name"); - + quickSetText = new Text(namesContainer, SWT.BORDER); quickSetText.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false, 1, 1)); installContentAssistantProvider(quickSetText, new PossibleStereotypeContentProposalProvider(anyUmlElement)); - + profileNameLabel = new Label(namesContainer, SWT.NONE); profileNameLabel.setSize(43, 20); profileNameLabel.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, false, false, 1, 1)); profileNameLabel.setText("Profile"); - + profileText = new Text(namesContainer, SWT.BORDER); profileText.setSize(201, 26); profileText.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false, 1, 1)); - + Label stereotypeNameLabel = new Label(namesContainer, SWT.NONE); stereotypeNameLabel.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, false, false, 1, 1)); stereotypeNameLabel.setText("Stereotype"); - + stereotypeText = new Text(namesContainer, SWT.BORDER); stereotypeText.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false, 1, 1)); installContentAssistantProvider(stereotypeText, new StereotypeContentProposalProvider(anyUmlElement.getApplicableStereotypes())); - -// Composite extendedMetaclassesContainer = new Composite(container, SWT.NONE); -// extendedMetaclassesContainer.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false, 1, 1)); -// extendedMetaclassesContainer.setLayout(new GridLayout(1, false)); + + // Composite extendedMetaclassesContainer = new Composite(container, SWT.NONE); + // extendedMetaclassesContainer.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false, 1, 1)); + // extendedMetaclassesContainer.setLayout(new GridLayout(1, false)); createExtendedMetaclassArea(container); - + Composite extendedStereotypeContainer = new Composite(container, SWT.NONE); extendedStereotypeContainer.setLayout(new GridLayout(1, false)); extendedStereotypeContainer.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false, 1, 1)); - + Composite taggedValuesContainer = new Composite(container, SWT.NONE); taggedValuesContainer.setLayout(new GridLayout(1, false)); taggedValuesContainer.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false, 1, 1)); // Use the first applied stereotype for tests - propertiesEditorWidget = new PropertiesEditorWidget(taggedValuesContainer, stereotypeModel.getProperties(), (NamedElement)anyUmlElement); + propertiesEditorWidget = new PropertiesEditorWidget(taggedValuesContainer, stereotypeModel.getProperties(), (NamedElement) anyUmlElement); return container; } /** * Install content assistant provider. - * - * @param control The control to which content assist is installed. * - * @param contentProposalProvider The associated {@link ContentProposalAdapter}. + * @param control + * The control to which content assist is installed. + * + * @param contentProposalProvider + * The associated {@link ContentProposalAdapter}. */ protected void installContentAssistantProvider(Text control, IContentProposalProvider contentProposalProvider) { -// KeyStroke keyStroke = KeyStroke.getInstance("Ctrl+Space"); + // KeyStroke keyStroke = KeyStroke.getInstance("Ctrl+Space"); KeyStroke keyStroke = null; char[] autoActivationCharacters = null; int autoActivationDelay = 500; @@ -165,20 +171,20 @@ public class StereotypeUpdateDialog extends Dialog { // replace all text adapter.setProposalAcceptanceStyle(ContentProposalAdapter.PROPOSAL_REPLACE); - //this listener is activated when a stereotype item in popup menu is selected and - //the popup menu is closed. It is used to add the selected stereotype in to the right hand side part - //of the dialog, so that uers can economize one key hit. - //cf. proposalAccepted() operation in KeyTextListener -// adapter.addContentProposalListener(keyTextListener); + // this listener is activated when a stereotype item in popup menu is selected and + // the popup menu is closed. It is used to add the selected stereotype in to the right hand side part + // of the dialog, so that uers can economize one key hit. + // cf. proposalAccepted() operation in KeyTextListener + // adapter.addContentProposalListener(keyTextListener); } /** - * + * * @param parent */ private void createExtendedMetaclassArea(Composite parent) { - + ReferenceSelector selector = new ReferenceSelector(true); selector.setContentProvider(new UMLMetaclassContentProvider(anyUmlElement)); LabelProviderService serv = null; @@ -190,26 +196,27 @@ public class StereotypeUpdateDialog extends Dialog { ILabelProvider labelProvider = serv.getLabelProvider(); selector.setLabelProvider(labelProvider); - // EList<PackageableElement> importedElement = profile.getImportedElements(); - //we don't set initial selection to allows to draw new instance of imported metaclass -// final List<EObject> alreadyImportedElement = new ArrayList<EObject>(); -// for(final PackageableElement current : selectedMetaclasses){ -// if(current instanceof Class && ((Class)current).isMetaclass()){ -// alreadyImportedElement.add(current); -// } -// } + // EList<PackageableElement> importedElement = profile.getImportedElements(); + // we don't set initial selection to allows to draw new instance of imported metaclass + // final List<EObject> alreadyImportedElement = new ArrayList<EObject>(); + // for(final PackageableElement current : selectedMetaclasses){ + // if(current instanceof Class && ((Class)current).isMetaclass()){ + // alreadyImportedElement.add(current); + // } + // } // Create the selector widget extendedMetaclassSelector = new MultipleValueSelectorWidget(parent, selector); -// final MultipleValueSelectorDialog dialog = new MultipleValueSelectorDialog(Display.getDefault().getActiveShell(), selector, Messages.CustomSemanticCreateCommand_SelectMetaclass, true, false, -1); + // final MultipleValueSelectorDialog dialog = new MultipleValueSelectorDialog(Display.getDefault().getActiveShell(), selector, Messages.CustomSemanticCreateCommand_SelectMetaclass, true, false, -1); // Do not need a context element: no operations allowed. -// extendedMetaclassSelector.setContextElement(profile); + // extendedMetaclassSelector.setContextElement(profile); extendedMetaclassSelector.setLabelProvider(labelProvider); extendedMetaclassSelector.setInitialElementSelections(selectedMetaclasses); - + } /** * Create contents of the button bar. + * * @param parent */ @Override @@ -220,19 +227,19 @@ public class StereotypeUpdateDialog extends Dialog { IDialogConstants.CANCEL_LABEL, false); m_bindingContext = initDataBindings(); } - - /** - * (non-Javadoc) - * - * @see org.eclipse.jface.window.Window#configureShell(org.eclipse.swt.widgets.Shell) - */ - @Override + + /** + * (non-Javadoc) + * + * @see org.eclipse.jface.window.Window#configureShell(org.eclipse.swt.widgets.Shell) + */ + @Override protected void configureShell(Shell shell) { - super.configureShell(shell); - if (title != null) { + super.configureShell(shell); + if (title != null) { shell.setText(title); } - } + } /** @@ -240,13 +247,13 @@ public class StereotypeUpdateDialog extends Dialog { */ @Override protected Point getInitialSize() { -// return super.getInitialSize(); + // return super.getInitialSize(); return new Point(900, 900); } /** * Collect user data when the ok button is pressed. - * + * * @see org.eclipse.jface.dialogs.Dialog#okPressed() * */ @@ -255,41 +262,43 @@ public class StereotypeUpdateDialog extends Dialog { collectInput(); super.okPressed(); } - + /** * Collect data from the dialog. - * + * */ private void collectInput() { - + // Old fashion value = new StereotypeUpdateArgs(); value.setProfileName(profileText.getText()); value.setStereotypeName(stereotypeText.getText()); - + // Copy the result (to bypass cast pb) - List<Class> result = new ArrayList<Class>(); - for(Object obj : extendedMetaclassSelector.getResult()) { - result.add((Class)obj); + List<Class> result = new ArrayList<>(); + for (Object obj : extendedMetaclassSelector.getResult()) { + result.add((Class) obj); } value.setExtendedMetaclasses(result); - + // New fashion // Stereotype and profile names are already set in model. // Need to collect metaclasses MetaclassesModel metaclassesModel = stereotypeModel.getMetaclassesCollection(); - for(Object obj : extendedMetaclassSelector.getResult()) { - metaclassesModel.getSelectedMetaclasses().add((Class)obj); + for (Object obj : extendedMetaclassSelector.getResult()) { + metaclassesModel.getSelectedMetaclasses().add((Class) obj); } } /** * return the update args collected by the dialog. + * * @return */ public IStereotypeUpdateArgs getUpdateArgs() { return value; } + protected DataBindingContext initDataBindings() { DataBindingContext bindingContext = new DataBindingContext(); // @@ -308,7 +317,7 @@ public class StereotypeUpdateDialog extends Dialog { return bindingContext; } - + /** * @return the stereotypeModel */ diff --git a/plugins/uml/profile/org.eclipse.papyrus.uml.profile.drafter/src/org/eclipse/papyrus/uml/profile/drafter/ui/dialog/StereotypeUpdateDialogOld.java b/plugins/uml/profile/org.eclipse.papyrus.uml.profile.drafter/src/org/eclipse/papyrus/uml/profile/drafter/ui/dialog/StereotypeUpdateDialogOld.java index 4ceb6f75eac..86ac8ff0790 100644 --- a/plugins/uml/profile/org.eclipse.papyrus.uml.profile.drafter/src/org/eclipse/papyrus/uml/profile/drafter/ui/dialog/StereotypeUpdateDialogOld.java +++ b/plugins/uml/profile/org.eclipse.papyrus.uml.profile.drafter/src/org/eclipse/papyrus/uml/profile/drafter/ui/dialog/StereotypeUpdateDialogOld.java @@ -6,11 +6,11 @@ import java.util.List; import org.eclipse.core.databinding.Binding; import org.eclipse.core.databinding.DataBindingContext; import org.eclipse.core.databinding.UpdateValueStrategy; -import org.eclipse.core.databinding.beans.BeanProperties; -import org.eclipse.core.databinding.beans.PojoProperties; +import org.eclipse.core.databinding.beans.typed.BeanProperties; +import org.eclipse.core.databinding.beans.typed.PojoProperties; import org.eclipse.core.databinding.observable.value.IObservableValue; import org.eclipse.jface.bindings.keys.KeyStroke; -import org.eclipse.jface.databinding.swt.WidgetProperties; +import org.eclipse.jface.databinding.swt.typed.WidgetProperties; import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.dialogs.IDialogConstants; import org.eclipse.jface.fieldassist.ContentProposalAdapter; @@ -40,7 +40,7 @@ import org.eclipse.uml2.uml.NamedElement; import org.eclipse.uml2.uml.Stereotype; /** - * + * * @author cedric dumoulin * */ @@ -57,25 +57,28 @@ public class StereotypeUpdateDialogOld extends Dialog { private StereotypeUpdateArgs value; private MultipleValueSelectorWidget extendedMetaclassSelector; private TaggedValuesEditorWidget taggedValuesEditorWidget; - + /** * An UML Element used to get the associated Resource. */ private Element anyUmlElement; private List<Class> selectedMetaclasses; - + private StereotypeNameToProfileSynchronizer stereotypeNameToProfileSynchronizer; private ProfileCatalog profileCatalog; - + /** * Create the dialog. + * * @param parentShell - * @param selectedElement Any UML element that can be used to discover the ResourceSet. - * @param metaclassesToSelect Metaclasses that should be selected in the dialog. - * + * @param selectedElement + * Any UML element that can be used to discover the ResourceSet. + * @param metaclassesToSelect + * Metaclasses that should be selected in the dialog. + * */ - public StereotypeUpdateDialogOld(Shell parentShell, String title, Element selectedElement, List<Class> metaclassesToSelect ) { + public StereotypeUpdateDialogOld(Shell parentShell, String title, Element selectedElement, List<Class> metaclassesToSelect) { super(parentShell); // Allows dialog resize setShellStyle(getShellStyle() | SWT.RESIZE); @@ -84,11 +87,12 @@ public class StereotypeUpdateDialogOld extends Dialog { this.selectedMetaclasses = metaclassesToSelect; this.profileCatalog = new ProfileCatalog(selectedElement); stereotypeNameToProfileSynchronizer = new StereotypeNameToProfileSynchronizer(profileCatalog); - + } /** * Create contents of the dialog. + * * @param parent */ @Override @@ -96,64 +100,66 @@ public class StereotypeUpdateDialogOld extends Dialog { List<Stereotype> appliedStereotypes = anyUmlElement.getAppliedStereotypes(); Composite container = (Composite) super.createDialogArea(parent); - + Composite namesContainer = new Composite(container, SWT.NONE); namesContainer.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false, 1, 1)); namesContainer.setLayout(new GridLayout(2, false)); - + Label quickSetLabel = new Label(namesContainer, SWT.NONE); quickSetLabel.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, false, false, 1, 1)); quickSetLabel.setText("Quick Set"); - + quickSetText = new Text(namesContainer, SWT.BORDER); quickSetText.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false, 1, 1)); - + Label profileNameLabel = new Label(namesContainer, SWT.NONE); profileNameLabel.setSize(43, 20); profileNameLabel.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, false, false, 1, 1)); profileNameLabel.setText("Profile"); - + profileText = new Text(namesContainer, SWT.BORDER); profileText.setSize(201, 26); profileText.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false, 1, 1)); - + Label stereotypeNameLabel = new Label(namesContainer, SWT.NONE); stereotypeNameLabel.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, false, false, 1, 1)); stereotypeNameLabel.setText("Stereotype"); - + stereotypeText = new Text(namesContainer, SWT.BORDER); stereotypeText.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false, 1, 1)); installContentAssistantProvider(stereotypeText, new StereotypeContentProposalProvider(anyUmlElement.getApplicableStereotypes())); - -// Composite extendedMetaclassesContainer = new Composite(container, SWT.NONE); -// extendedMetaclassesContainer.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false, 1, 1)); -// extendedMetaclassesContainer.setLayout(new GridLayout(1, false)); + + // Composite extendedMetaclassesContainer = new Composite(container, SWT.NONE); + // extendedMetaclassesContainer.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false, 1, 1)); + // extendedMetaclassesContainer.setLayout(new GridLayout(1, false)); createExtendedMetaclassArea(container); - + Composite extendedStereotypeContainer = new Composite(container, SWT.NONE); extendedStereotypeContainer.setLayout(new GridLayout(1, false)); extendedStereotypeContainer.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false, 1, 1)); - + Composite taggedValuesContainer = new Composite(container, SWT.NONE); taggedValuesContainer.setLayout(new GridLayout(1, false)); taggedValuesContainer.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false, 1, 1)); // Use the first applied stereotype for tests - if( !appliedStereotypes.isEmpty()) { - taggedValuesEditorWidget = new TaggedValuesEditorWidget(taggedValuesContainer, appliedStereotypes.get(0), (NamedElement)anyUmlElement); + if (!appliedStereotypes.isEmpty()) { + taggedValuesEditorWidget = new TaggedValuesEditorWidget(taggedValuesContainer, appliedStereotypes.get(0), (NamedElement) anyUmlElement); } return container; } /** * Install content assistant provider. - * - * @param control The control to which content assist is installed. * - * @param contentProposalProvider The associated {@link ContentProposalAdapter}. + * @param control + * The control to which content assist is installed. + * + * @param contentProposalProvider + * The associated {@link ContentProposalAdapter}. */ protected void installContentAssistantProvider(Text control, IContentProposalProvider contentProposalProvider) { -// KeyStroke keyStroke = KeyStroke.getInstance("Ctrl+Space"); + // KeyStroke keyStroke = KeyStroke.getInstance("Ctrl+Space"); KeyStroke keyStroke = null; char[] autoActivationCharacters = null; int autoActivationDelay = 500; @@ -167,20 +173,20 @@ public class StereotypeUpdateDialogOld extends Dialog { // replace all text adapter.setProposalAcceptanceStyle(ContentProposalAdapter.PROPOSAL_REPLACE); - //this listener is activated when a stereotype item in popup menu is selected and - //the popup menu is closed. It is used to add the selected stereotype in to the right hand side part - //of the dialog, so that uers can economize one key hit. - //cf. proposalAccepted() operation in KeyTextListener -// adapter.addContentProposalListener(keyTextListener); + // this listener is activated when a stereotype item in popup menu is selected and + // the popup menu is closed. It is used to add the selected stereotype in to the right hand side part + // of the dialog, so that uers can economize one key hit. + // cf. proposalAccepted() operation in KeyTextListener + // adapter.addContentProposalListener(keyTextListener); } /** - * + * * @param parent */ private void createExtendedMetaclassArea(Composite parent) { - + ReferenceSelector selector = new ReferenceSelector(true); selector.setContentProvider(new UMLMetaclassContentProvider(anyUmlElement)); LabelProviderService serv = null; @@ -192,26 +198,27 @@ public class StereotypeUpdateDialogOld extends Dialog { ILabelProvider labelProvider = serv.getLabelProvider(); selector.setLabelProvider(labelProvider); - // EList<PackageableElement> importedElement = profile.getImportedElements(); - //we don't set initial selection to allows to draw new instance of imported metaclass -// final List<EObject> alreadyImportedElement = new ArrayList<EObject>(); -// for(final PackageableElement current : selectedMetaclasses){ -// if(current instanceof Class && ((Class)current).isMetaclass()){ -// alreadyImportedElement.add(current); -// } -// } + // EList<PackageableElement> importedElement = profile.getImportedElements(); + // we don't set initial selection to allows to draw new instance of imported metaclass + // final List<EObject> alreadyImportedElement = new ArrayList<EObject>(); + // for(final PackageableElement current : selectedMetaclasses){ + // if(current instanceof Class && ((Class)current).isMetaclass()){ + // alreadyImportedElement.add(current); + // } + // } // Create the selector widget extendedMetaclassSelector = new MultipleValueSelectorWidget(parent, selector); -// final MultipleValueSelectorDialog dialog = new MultipleValueSelectorDialog(Display.getDefault().getActiveShell(), selector, Messages.CustomSemanticCreateCommand_SelectMetaclass, true, false, -1); + // final MultipleValueSelectorDialog dialog = new MultipleValueSelectorDialog(Display.getDefault().getActiveShell(), selector, Messages.CustomSemanticCreateCommand_SelectMetaclass, true, false, -1); // Do not need a context element: no operations allowed. -// extendedMetaclassSelector.setContextElement(profile); + // extendedMetaclassSelector.setContextElement(profile); extendedMetaclassSelector.setLabelProvider(labelProvider); extendedMetaclassSelector.setInitialElementSelections(selectedMetaclasses); - + } /** * Create contents of the button bar. + * * @param parent */ @Override @@ -222,19 +229,19 @@ public class StereotypeUpdateDialogOld extends Dialog { IDialogConstants.CANCEL_LABEL, false); m_bindingContext = initDataBindings(); } - - /** - * (non-Javadoc) - * - * @see org.eclipse.jface.window.Window#configureShell(org.eclipse.swt.widgets.Shell) - */ - @Override + + /** + * (non-Javadoc) + * + * @see org.eclipse.jface.window.Window#configureShell(org.eclipse.swt.widgets.Shell) + */ + @Override protected void configureShell(Shell shell) { - super.configureShell(shell); - if (title != null) { + super.configureShell(shell); + if (title != null) { shell.setText(title); } - } + } /** @@ -242,13 +249,13 @@ public class StereotypeUpdateDialogOld extends Dialog { */ @Override protected Point getInitialSize() { -// return super.getInitialSize(); + // return super.getInitialSize(); return new Point(900, 900); } /** * Collect user data when the ok button is pressed. - * + * * @see org.eclipse.jface.dialogs.Dialog#okPressed() * */ @@ -257,32 +264,34 @@ public class StereotypeUpdateDialogOld extends Dialog { collectInput(); super.okPressed(); } - + /** * Collect data from the dialog. - * + * */ private void collectInput() { value = new StereotypeUpdateArgs(); value.setProfileName(profileText.getText()); value.setStereotypeName(stereotypeText.getText()); - + // Copy the result (to bypass cast pb) - List<Class> result = new ArrayList<Class>(); - for(Object obj : extendedMetaclassSelector.getResult()) { - result.add((Class)obj); + List<Class> result = new ArrayList<>(); + for (Object obj : extendedMetaclassSelector.getResult()) { + result.add((Class) obj); } value.setExtendedMetaclasses(result); - + } /** * return the update args collected by the dialog. + * * @return */ public IStereotypeUpdateArgs getUpdateArgs() { return value; } + protected DataBindingContext initDataBindings() { DataBindingContext bindingContext = new DataBindingContext(); // diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties.generation/.classpath b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.generation/.classpath index bb642933501..f574c0cbd4d 100644 --- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties.generation/.classpath +++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.generation/.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/uml/properties/org.eclipse.papyrus.uml.properties.generation/.settings/org.eclipse.jdt.core.prefs b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.generation/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties.generation/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.generation/.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/uml/properties/org.eclipse.papyrus.uml.properties.generation/META-INF/MANIFEST.MF b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.generation/META-INF/MANIFEST.MF index f077c946e40..85c0b3f45d2 100644 --- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties.generation/META-INF/MANIFEST.MF +++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.generation/META-INF/MANIFEST.MF @@ -41,5 +41,5 @@ Bundle-ManifestVersion: 2 Bundle-Activator: org.eclipse.papyrus.customization.properties.generation.Activator Bundle-Description: %pluginDescription Bundle-SymbolicName: org.eclipse.papyrus.uml.properties.generation;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.uml.properties.generation diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties.xtext/.classpath b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.xtext/.classpath index e801ebfb468..81fe078c20c 100644 --- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties.xtext/.classpath +++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.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="output" path="bin"/> diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties.xtext/.settings/org.eclipse.jdt.core.prefs b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.xtext/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties.xtext/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.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/uml/properties/org.eclipse.papyrus.uml.properties.xtext/META-INF/MANIFEST.MF b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.xtext/META-INF/MANIFEST.MF index 4086d371bd6..d5f8026cbf0 100644 --- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties.xtext/META-INF/MANIFEST.MF +++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.xtext/META-INF/MANIFEST.MF @@ -23,7 +23,7 @@ Bundle-Localization: plugin Bundle-Name: %pluginName Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.uml.properties.xtext;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.eclipse.papyrus.uml.properties.xtext, org.eclipse.papyrus.uml.properties.xtext.sheet, org.eclipse.papyrus.uml.properties.xtext.widget, diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/.classpath b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/.classpath index bb642933501..f574c0cbd4d 100644 --- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/.classpath +++ b/plugins/uml/properties/org.eclipse.papyrus.uml.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/uml/properties/org.eclipse.papyrus.uml.properties/.settings/org.eclipse.jdt.core.prefs b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/uml/properties/org.eclipse.papyrus.uml.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/uml/properties/org.eclipse.papyrus.uml.properties/META-INF/MANIFEST.MF b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/META-INF/MANIFEST.MF index 4dbfec6ec0e..29fb1a9aa06 100644 --- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/META-INF/MANIFEST.MF +++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/META-INF/MANIFEST.MF @@ -62,7 +62,7 @@ Require-Bundle: org.eclipse.core.databinding.property;bundle-version="[1.8.0,2.0 org.eclipse.papyrus.infra.gmfdiag.properties;bundle-version="5.0.0" Bundle-Vendor: %providerName Bundle-ActivationPolicy: lazy;exclude:=org.eclipse.papyrus.uml.properties.constraints -Bundle-Version: 4.1.0.qualifier +Bundle-Version: 4.1.100.qualifier Bundle-ClassPath: . Bundle-Name: %pluginName Bundle-Localization: plugin @@ -70,5 +70,5 @@ Bundle-Activator: org.eclipse.papyrus.uml.properties.Activator Bundle-ManifestVersion: 2 Bundle-Description: %pluginDescription Bundle-SymbolicName: org.eclipse.papyrus.uml.properties;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.uml.properties diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/pom.xml b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/pom.xml index 9e15e10cd3e..29e55786f50 100644 --- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/pom.xml +++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/pom.xml @@ -9,6 +9,6 @@ <version>0.0.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.papyrus.uml.properties</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.1.100-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project>
\ No newline at end of file diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/widgets/StereotypeExplorerDialog.java b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/widgets/StereotypeExplorerDialog.java index ced746e8592..f5283b615b1 100644 --- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/widgets/StereotypeExplorerDialog.java +++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/widgets/StereotypeExplorerDialog.java @@ -1,5 +1,5 @@ /***************************************************************************** - * Copyright (c) 2016 CEA LIST. + * Copyright (c) 2016, 2022 CEA LIST. * * 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: * Mickael ADAM (ALL4TEC) mickael.adam@all4tec.net - Initial API and Implementation + * Vincent LORENZO (CEA-LIST) vincent.lorenzo@cea.fr - Bug 579917 *****************************************************************************/ package org.eclipse.papyrus.uml.properties.widgets; @@ -251,14 +252,7 @@ public class StereotypeExplorerDialog extends SelectionStatusDialog { if (element instanceof String) { styledString.setStyle(0, text.length(), StyledString.COUNTER_STYLER); - } else if (element instanceof IRegisteredProfile) { - URI uri = resourceSet.getURIConverter().normalize(((IRegisteredProfile) element).getUri()).trimFragment(); - String path = new StringBuilder(" - ")//$NON-NLS-1$ - .append(uri.toPlatformString(true).substring(1)) - .toString(); - styledString.append(path, StyledString.QUALIFIER_STYLER); - - } else if (element instanceof Profile) { + }else if (element instanceof Profile) { URI uri = EcoreUtil.getURI((EObject) element).trimFragment(); String path = new StringBuilder(" - ")//$NON-NLS-1$ .append(uri.toPlatformString(true).substring(1)).toString(); diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.collaborationuse.xtext.ui/.classpath b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.collaborationuse.xtext.ui/.classpath index 0fa64c8e5fc..b5e203ff5c7 100644 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.collaborationuse.xtext.ui/.classpath +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.collaborationuse.xtext.ui/.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/uml/textedit/org.eclipse.papyrus.uml.textedit.collaborationuse.xtext.ui/.settings/org.eclipse.jdt.core.prefs b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.collaborationuse.xtext.ui/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.collaborationuse.xtext.ui/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.collaborationuse.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/uml/textedit/org.eclipse.papyrus.uml.textedit.collaborationuse.xtext.ui/META-INF/MANIFEST.MF b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.collaborationuse.xtext.ui/META-INF/MANIFEST.MF index c37c7421904..23f91e085f4 100644 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.collaborationuse.xtext.ui/META-INF/MANIFEST.MF +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.collaborationuse.xtext.ui/META-INF/MANIFEST.MF @@ -6,7 +6,7 @@ Export-Package: org.eclipse.papyrus.uml.textedit.collaborationuse.xtext.ui.conte Bundle-ActivationPolicy: lazy Bundle-Name: %pluginName Bundle-Localization: plugin -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Require-Bundle: org.apache.log4j;bundle-version="[1.2.0,2.0.0)", org.eclipse.emf.databinding;bundle-version="[1.5.0,2.0.0)", org.eclipse.gmf.runtime.diagram.ui.properties;bundle-version="[1.8.0,2.0.0)", diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.collaborationuse.xtext/.classpath b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.collaborationuse.xtext/.classpath index fbe714a1a8f..d9a61ae9310 100644 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.collaborationuse.xtext/.classpath +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.collaborationuse.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="xtend-gen"/> <classpathentry kind="src" path="src"/> diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.collaborationuse.xtext/.settings/org.eclipse.jdt.core.prefs b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.collaborationuse.xtext/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.collaborationuse.xtext/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.collaborationuse.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/uml/textedit/org.eclipse.papyrus.uml.textedit.collaborationuse.xtext/META-INF/MANIFEST.MF b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.collaborationuse.xtext/META-INF/MANIFEST.MF index fb6fe53aa27..5a8ed5032ca 100644 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.collaborationuse.xtext/META-INF/MANIFEST.MF +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.collaborationuse.xtext/META-INF/MANIFEST.MF @@ -16,15 +16,15 @@ Require-Bundle: org.eclipse.emf.mwe2.launch;bundle-version="[2.11.0,3.0.0)", org.eclipse.papyrus.uml.textedit.common.xtext;bundle-version="[3.0.0,4.0.0)", org.eclipse.uml2.codegen.ecore;bundle-version="[2.5.0,3.0.0)", org.eclipse.uml2.uml;bundle-version="[5.5.0,6.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)" 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-ManifestVersion: 2 Import-Package: org.apache.log4j;version="[1.2.0,2.0.0)", org.eclipse.xtext.xbase.lib;version="[2.10.0,3.0.0)" Bundle-SymbolicName: org.eclipse.papyrus.uml.textedit.collaborationuse.xtext;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.uml.textedit.collaborationuse.xtext diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.collaborationuse.xtext/pom.xml b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.collaborationuse.xtext/pom.xml index 40841bf4f42..80c17e8a82a 100644 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.collaborationuse.xtext/pom.xml +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.collaborationuse.xtext/pom.xml @@ -7,7 +7,7 @@ <version>0.0.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.papyrus.uml.textedit.collaborationuse.xtext</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.100-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> <build> <plugins> diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.common.xtext.ui/.classpath b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.common.xtext.ui/.classpath index 0fa64c8e5fc..b5e203ff5c7 100644 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.common.xtext.ui/.classpath +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.common.xtext.ui/.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/uml/textedit/org.eclipse.papyrus.uml.textedit.common.xtext.ui/.settings/org.eclipse.jdt.core.prefs b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.common.xtext.ui/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.common.xtext.ui/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.common.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/uml/textedit/org.eclipse.papyrus.uml.textedit.common.xtext.ui/META-INF/MANIFEST.MF b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.common.xtext.ui/META-INF/MANIFEST.MF index 175e6e19b50..fc4debd403c 100644 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.common.xtext.ui/META-INF/MANIFEST.MF +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.common.xtext.ui/META-INF/MANIFEST.MF @@ -10,7 +10,7 @@ Export-Package: org.eclipse.papyrus.uml.textedit.common.xtext.ui, Bundle-ActivationPolicy: lazy Bundle-Name: %pluginName Bundle-Localization: plugin -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Require-Bundle: org.apache.log4j;bundle-version="[1.2.0,2.0.0)", org.eclipse.gmf.runtime.diagram.ui;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/uml/textedit/org.eclipse.papyrus.uml.textedit.common.xtext/.classpath b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.common.xtext/.classpath index fbe714a1a8f..d9a61ae9310 100644 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.common.xtext/.classpath +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.common.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="xtend-gen"/> <classpathentry kind="src" path="src"/> diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.common.xtext/.settings/org.eclipse.jdt.core.prefs b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.common.xtext/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.common.xtext/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.common.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/uml/textedit/org.eclipse.papyrus.uml.textedit.common.xtext/META-INF/MANIFEST.MF b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.common.xtext/META-INF/MANIFEST.MF index 9d52b963751..7bc1940c211 100644 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.common.xtext/META-INF/MANIFEST.MF +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.common.xtext/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Require-Bundle: org.eclipse.emf.mwe2.launch;bundle-version="[2.11.0,3.0.0)", org.eclipse.papyrus.uml.xtext.integration.core;bundle-version="[3.0.0,4.0.0)", org.eclipse.uml2.codegen.ecore;bundle-version="[2.5.0,3.0.0)", org.eclipse.uml2.uml;bundle-version="[5.5.0,6.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)" Export-Package: org.eclipse.papyrus.uml.textedit.common.xtext, org.eclipse.papyrus.uml.textedit.common.xtext.formatting, org.eclipse.papyrus.uml.textedit.common.xtext.generator, @@ -20,12 +20,12 @@ Export-Package: org.eclipse.papyrus.uml.textedit.common.xtext, org.eclipse.papyrus.uml.textedit.common.xtext.validation Bundle-Vendor: %providerName Bundle-ActivationPolicy: lazy -Bundle-Version: 3.0.0.qualifier +Bundle-Version: 3.0.100.qualifier Bundle-Name: %pluginName Bundle-Localization: plugin Bundle-ManifestVersion: 2 Import-Package: org.apache.log4j;version="[1.2.0,2.0.0)", org.eclipse.xtext.xbase.lib;version="[2.10.0,3.0.0)" Bundle-SymbolicName: org.eclipse.papyrus.uml.textedit.common.xtext;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.uml.textedit.common.xtext diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.common.xtext/pom.xml b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.common.xtext/pom.xml index 64ef80ef1d8..7cff89d0467 100644 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.common.xtext/pom.xml +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.common.xtext/pom.xml @@ -9,7 +9,7 @@ <version>0.0.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.papyrus.uml.textedit.common.xtext</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.100-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> <build> <plugins> diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext.ui/.classpath b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext.ui/.classpath index 0fa64c8e5fc..b5e203ff5c7 100644 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext.ui/.classpath +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext.ui/.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/uml/textedit/org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext.ui/.settings/org.eclipse.jdt.core.prefs b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext.ui/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext.ui/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.connectionpointreference.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/uml/textedit/org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext.ui/META-INF/MANIFEST.MF b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext.ui/META-INF/MANIFEST.MF index 1c84694923e..5240d036f76 100644 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext.ui/META-INF/MANIFEST.MF +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext.ui/META-INF/MANIFEST.MF @@ -6,7 +6,7 @@ Export-Package: org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext. Bundle-ActivationPolicy: lazy Bundle-Name: %pluginName Bundle-Localization: plugin -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Require-Bundle: org.apache.log4j;bundle-version="[1.2.0,2.0.0)", org.eclipse.gmf.runtime.diagram.ui;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/uml/textedit/org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext/.classpath b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext/.classpath index fbe714a1a8f..d9a61ae9310 100644 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext/.classpath +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.connectionpointreference.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="xtend-gen"/> <classpathentry kind="src" path="src"/> diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext/.settings/org.eclipse.jdt.core.prefs b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.connectionpointreference.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/uml/textedit/org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext/META-INF/MANIFEST.MF b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext/META-INF/MANIFEST.MF index 96ec07f52ad..68050dc3bd8 100644 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext/META-INF/MANIFEST.MF +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Require-Bundle: org.eclipse.emf.mwe2.launch;bundle-version="[2.11.0,3.0.0)", org.eclipse.papyrus.uml.alf.common;bundle-version="[3.0.0,4.0.0)", org.eclipse.uml2.codegen.ecore;bundle-version="[2.5.0,3.0.0)", org.eclipse.uml2.uml;bundle-version="[5.5.0,6.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)" Export-Package: org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext, org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext.formatting, org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext.generator, @@ -18,12 +18,12 @@ Export-Package: org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext, org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext.validation 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-ManifestVersion: 2 Import-Package: org.apache.log4j;version="[1.2.0,2.0.0)", org.eclipse.xtext.xbase.lib;version="[2.10.0,3.0.0)" Bundle-SymbolicName: org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext/pom.xml b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext/pom.xml index 530e69a8074..a48710d3b87 100644 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext/pom.xml +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext/pom.xml @@ -7,7 +7,7 @@ <version>0.0.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.100-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> <build> <plugins> diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.constraintwithessentialocl.xtext/.classpath b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.constraintwithessentialocl.xtext/.classpath index e801ebfb468..81fe078c20c 100644 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.constraintwithessentialocl.xtext/.classpath +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.constraintwithessentialocl.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="output" path="bin"/> diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.constraintwithessentialocl.xtext/.settings/org.eclipse.jdt.core.prefs b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.constraintwithessentialocl.xtext/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.constraintwithessentialocl.xtext/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.constraintwithessentialocl.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/uml/textedit/org.eclipse.papyrus.uml.textedit.constraintwithessentialocl.xtext/META-INF/MANIFEST.MF b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.constraintwithessentialocl.xtext/META-INF/MANIFEST.MF index b19badf2f7e..b7d0afba95d 100644 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.constraintwithessentialocl.xtext/META-INF/MANIFEST.MF +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.constraintwithessentialocl.xtext/META-INF/MANIFEST.MF @@ -18,5 +18,5 @@ Bundle-Name: %pluginName Bundle-Activator: org.eclipse.papyrus.uml.textedit.constraintwithessentialocl.xtext.UMLConstraintEditorActivator Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.uml.textedit.constraintwithessentialocl.xtext;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.uml.textedit.constraintwithessentialocl.xtext diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.javaconstraint/.classpath b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.javaconstraint/.classpath index e801ebfb468..81fe078c20c 100644 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.javaconstraint/.classpath +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.javaconstraint/.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/uml/textedit/org.eclipse.papyrus.uml.textedit.javaconstraint/.settings/org.eclipse.jdt.core.prefs b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.javaconstraint/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.javaconstraint/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.javaconstraint/.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/uml/textedit/org.eclipse.papyrus.uml.textedit.javaconstraint/META-INF/MANIFEST.MF b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.javaconstraint/META-INF/MANIFEST.MF index 9f1a008d8e0..0c2433a1706 100644 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.javaconstraint/META-INF/MANIFEST.MF +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.javaconstraint/META-INF/MANIFEST.MF @@ -13,5 +13,5 @@ Bundle-Name: %pluginName Bundle-Activator: org.eclipse.papyrus.uml.textedit.javaconstraint.Activator Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.uml.textedit.javaconstraint;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.uml.textedit.javaconstraint diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext.ui/.classpath b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext.ui/.classpath index f206204fe0f..72fbf941627 100644 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext.ui/.classpath +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext.ui/.classpath @@ -3,6 +3,6 @@ <classpathentry kind="src" path="src"/> <classpathentry kind="src" path="src-gen"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> - <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="output" path="bin"/> </classpath> diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext.ui/.settings/org.eclipse.jdt.core.prefs b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext.ui/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext.ui/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.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/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext.ui/META-INF/MANIFEST.MF b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext.ui/META-INF/MANIFEST.MF index 6b3ed51c4a7..50c4bb3a1f0 100644 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext.ui/META-INF/MANIFEST.MF +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext.ui/META-INF/MANIFEST.MF @@ -6,7 +6,7 @@ Export-Package: org.eclipse.papyrus.uml.textedit.message.xtext.ui.contentassist, Bundle-ActivationPolicy: lazy Bundle-Name: %pluginName Bundle-Localization: plugin -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Require-Bundle: org.apache.log4j;bundle-version="[1.2.0,2.0.0)", org.eclipse.emf.databinding;bundle-version="[1.5.0,2.0.0)", org.eclipse.gmf.runtime.diagram.ui.properties;bundle-version="[1.8.0,2.0.0)", diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/.classpath b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/.classpath index fbe714a1a8f..d9a61ae9310 100644 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/.classpath +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.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="xtend-gen"/> <classpathentry kind="src" path="src"/> diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/.settings/org.eclipse.jdt.core.prefs b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.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/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/META-INF/MANIFEST.MF b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/META-INF/MANIFEST.MF index 3268cb889d6..7027227555f 100644 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/META-INF/MANIFEST.MF +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/META-INF/MANIFEST.MF @@ -15,15 +15,15 @@ Require-Bundle: org.eclipse.emf.mwe2.launch;bundle-version="[2.11.0,3.0.0)", org.eclipse.papyrus.uml.alf.common;bundle-version="[3.0.0,4.0.0)", org.eclipse.uml2.codegen.ecore;bundle-version="[2.5.0,3.0.0)", org.eclipse.uml2.uml;bundle-version="[5.5.0,6.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)" 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-ManifestVersion: 2 Import-Package: org.apache.log4j;version="[1.2.0,2.0.0)", org.eclipse.xtext.xbase.lib;version="[2.10.0,3.0.0)" Bundle-SymbolicName: org.eclipse.papyrus.uml.textedit.message.xtext;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.uml.textedit.message.xtext diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/pom.xml b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/pom.xml index 0206292244e..34adfa45197 100644 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/pom.xml +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext/pom.xml @@ -7,7 +7,7 @@ <version>0.0.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.papyrus.uml.textedit.message.xtext</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.100-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> <build> <plugins> diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.parameter.xtext.ui/.classpath b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.parameter.xtext.ui/.classpath index b56898d05cf..d94014b5333 100644 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.parameter.xtext.ui/.classpath +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.parameter.xtext.ui/.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>
\ No newline at end of file diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.parameter.xtext.ui/.settings/org.eclipse.jdt.core.prefs b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.parameter.xtext.ui/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.parameter.xtext.ui/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.parameter.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/uml/textedit/org.eclipse.papyrus.uml.textedit.parameter.xtext.ui/META-INF/MANIFEST.MF b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.parameter.xtext.ui/META-INF/MANIFEST.MF index f7dd1976e05..c6883c730cb 100644 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.parameter.xtext.ui/META-INF/MANIFEST.MF +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.parameter.xtext.ui/META-INF/MANIFEST.MF @@ -7,7 +7,7 @@ Export-Package: org.eclipse.papyrus.uml.textedit.parameter.xtext.ui.contentassis Bundle-ActivationPolicy: lazy Bundle-Name: %pluginName Bundle-Localization: plugin -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Require-Bundle: org.apache.log4j;bundle-version="[1.2.0,2.0.0)", org.eclipse.gmf.runtime.diagram.ui;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/uml/textedit/org.eclipse.papyrus.uml.textedit.parameter.xtext/.classpath b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.parameter.xtext/.classpath index fee06c30225..50416c78e05 100644 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.parameter.xtext/.classpath +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.parameter.xtext/.classpath @@ -3,7 +3,7 @@ <classpathentry kind="src" path="xtend-gen"/> <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/uml/textedit/org.eclipse.papyrus.uml.textedit.parameter.xtext/.settings/org.eclipse.jdt.core.prefs b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.parameter.xtext/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.parameter.xtext/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.parameter.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/uml/textedit/org.eclipse.papyrus.uml.textedit.parameter.xtext/META-INF/MANIFEST.MF b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.parameter.xtext/META-INF/MANIFEST.MF index 0881ce0914b..106bf7de586 100644 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.parameter.xtext/META-INF/MANIFEST.MF +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.parameter.xtext/META-INF/MANIFEST.MF @@ -16,15 +16,15 @@ Require-Bundle: org.eclipse.emf.mwe2.launch;bundle-version="[2.11.0,3.0.0)", org.eclipse.papyrus.uml.textedit.common.xtext;bundle-version="[3.0.0,4.0.0)", org.eclipse.uml2.codegen.ecore;bundle-version="[2.5.0,3.0.0)", org.eclipse.uml2.uml;bundle-version="[5.5.0,6.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)" 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-ManifestVersion: 2 Import-Package: org.apache.log4j;version="[1.2.0,2.0.0)", org.eclipse.xtext.xbase.lib;version="[2.10.0,3.0.0)" Bundle-SymbolicName: org.eclipse.papyrus.uml.textedit.parameter.xtext;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.uml.textedit.parameter.xtext diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.parameter.xtext/pom.xml b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.parameter.xtext/pom.xml index 1dd39713cc2..b6159234aed 100644 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.parameter.xtext/pom.xml +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.parameter.xtext/pom.xml @@ -7,7 +7,7 @@ <version>0.0.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.papyrus.uml.textedit.parameter.xtext</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.100-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> <build> <plugins> diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.xtext.ui/.classpath b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.xtext.ui/.classpath index ad5e13cce77..946fb3d346f 100644 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.xtext.ui/.classpath +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.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/uml/textedit/org.eclipse.papyrus.uml.textedit.port.xtext.ui/.settings/org.eclipse.jdt.core.prefs b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.xtext.ui/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.xtext.ui/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.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/uml/textedit/org.eclipse.papyrus.uml.textedit.port.xtext.ui/META-INF/MANIFEST.MF b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.xtext.ui/META-INF/MANIFEST.MF index dfdc1e48695..195257d3655 100644 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.xtext.ui/META-INF/MANIFEST.MF +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.xtext.ui/META-INF/MANIFEST.MF @@ -11,7 +11,7 @@ Export-Package: org.eclipse.papyrus.uml.textedit.port.xtext.ui, Bundle-ActivationPolicy: lazy Bundle-Name: %pluginName Bundle-Localization: plugin -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Require-Bundle: org.apache.log4j;bundle-version="[1.2.0,2.0.0)", org.eclipse.gmf.runtime.diagram.ui;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/uml/textedit/org.eclipse.papyrus.uml.textedit.port.xtext/.classpath b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.xtext/.classpath index 95cdcb1209f..108dc438a4a 100644 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.xtext/.classpath +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.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="src-gen"/> diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.xtext/.settings/org.eclipse.jdt.core.prefs b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.xtext/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.xtext/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.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/uml/textedit/org.eclipse.papyrus.uml.textedit.port.xtext/META-INF/MANIFEST.MF b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.xtext/META-INF/MANIFEST.MF index 76687bac75d..ef75192db5a 100644 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.xtext/META-INF/MANIFEST.MF +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.xtext/META-INF/MANIFEST.MF @@ -16,15 +16,15 @@ Require-Bundle: org.eclipse.emf.mwe2.launch;bundle-version="[2.11.0,3.0.0)", org.eclipse.papyrus.uml.xtext.integration.core;bundle-version="[3.0.0,4.0.0)", org.eclipse.uml2.codegen.ecore;bundle-version="[2.5.0,3.0.0)", org.eclipse.uml2.uml;bundle-version="[5.5.0,6.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)" 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-ManifestVersion: 2 Import-Package: org.apache.log4j;version="[1.2.0,2.0.0)", org.eclipse.xtext.xbase.lib;version="[2.10.0,3.0.0)" Bundle-SymbolicName: org.eclipse.papyrus.uml.textedit.port.xtext;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.uml.textedit.port.xtext diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.xtext/pom.xml b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.xtext/pom.xml index feda9c26682..f893e2db43b 100644 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.xtext/pom.xml +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.xtext/pom.xml @@ -7,7 +7,7 @@ <version>0.0.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.papyrus.uml.textedit.port.xtext</artifactId> - <version>2.0.0-SNAPSHOT</version> + <version>2.0.100-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> <build> <plugins> diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.xtext.ui/.classpath b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.xtext.ui/.classpath index ad5e13cce77..946fb3d346f 100644 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.xtext.ui/.classpath +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.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/uml/textedit/org.eclipse.papyrus.uml.textedit.property.xtext.ui/.settings/org.eclipse.jdt.core.prefs b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.xtext.ui/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.xtext.ui/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.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/uml/textedit/org.eclipse.papyrus.uml.textedit.property.xtext.ui/META-INF/MANIFEST.MF b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.xtext.ui/META-INF/MANIFEST.MF index 66266f4a80b..115cd33860f 100644 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.xtext.ui/META-INF/MANIFEST.MF +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.xtext.ui/META-INF/MANIFEST.MF @@ -11,7 +11,7 @@ Export-Package: org.eclipse.papyrus.uml.textedit.property.xtext.ui, Bundle-ActivationPolicy: lazy Bundle-Name: %pluginName Bundle-Localization: plugin -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Require-Bundle: org.apache.log4j;bundle-version="[1.2.0,2.0.0)", 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)", diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.xtext/.classpath b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.xtext/.classpath index fbe714a1a8f..d9a61ae9310 100644 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.xtext/.classpath +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.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="xtend-gen"/> <classpathentry kind="src" path="src"/> diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.xtext/.settings/org.eclipse.jdt.core.prefs b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.xtext/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.xtext/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.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/uml/textedit/org.eclipse.papyrus.uml.textedit.property.xtext/META-INF/MANIFEST.MF b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.xtext/META-INF/MANIFEST.MF index f6c9ea09e2f..15cb45e5326 100644 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.xtext/META-INF/MANIFEST.MF +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.xtext/META-INF/MANIFEST.MF @@ -6,7 +6,7 @@ Require-Bundle: org.eclipse.emf.mwe2.launch;bundle-version="[2.11.0,3.0.0)", org.eclipse.papyrus.uml.xtext.integration.core;bundle-version="[3.0.0,4.0.0)", org.eclipse.uml2.codegen.ecore;bundle-version="[2.5.0,3.0.0)", org.eclipse.uml2.uml;bundle-version="[5.5.0,6.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)" Export-Package: org.eclipse.papyrus.uml.textedit.property.xtext, org.eclipse.papyrus.uml.textedit.property.xtext.formatting, org.eclipse.papyrus.uml.textedit.property.xtext.generator, @@ -21,12 +21,12 @@ Export-Package: org.eclipse.papyrus.uml.textedit.property.xtext, org.eclipse.papyrus.uml.textedit.property.xtext.validation Bundle-Vendor: %providerName Bundle-ActivationPolicy: lazy -Bundle-Version: 3.0.0.qualifier +Bundle-Version: 3.0.100.qualifier Bundle-Name: %pluginName Bundle-Localization: plugin Bundle-ManifestVersion: 2 Import-Package: org.apache.log4j;version="[1.2.0,2.0.0)", org.eclipse.xtext.xbase.lib;version="[2.10.0,3.0.0)" Bundle-SymbolicName: org.eclipse.papyrus.uml.textedit.property.xtext;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.uml.textedit.property.xtext diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.xtext/pom.xml b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.xtext/pom.xml index 659d7540fb4..65e81fbe4a2 100644 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.xtext/pom.xml +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.xtext/pom.xml @@ -9,7 +9,7 @@ <version>0.0.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.papyrus.uml.textedit.property.xtext</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.100-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> <build> <plugins> diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext.ui/.classpath b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext.ui/.classpath index 0fa64c8e5fc..b5e203ff5c7 100755 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext.ui/.classpath +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext.ui/.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/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext.ui/.settings/org.eclipse.jdt.core.prefs b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext.ui/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext.ui/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.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/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext.ui/META-INF/MANIFEST.MF b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext.ui/META-INF/MANIFEST.MF index 20c07238802..26cbd48c3e9 100755 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext.ui/META-INF/MANIFEST.MF +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext.ui/META-INF/MANIFEST.MF @@ -6,7 +6,7 @@ Export-Package: org.eclipse.papyrus.uml.textedit.state.xtext.ui.contentassist, Bundle-ActivationPolicy: lazy Bundle-Name: %pluginName Bundle-Localization: plugin -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Require-Bundle: org.apache.log4j;bundle-version="[1.2.0,2.0.0)", 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)", diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext/.classpath b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext/.classpath index fbe714a1a8f..d9a61ae9310 100755 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext/.classpath +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.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="xtend-gen"/> <classpathentry kind="src" path="src"/> diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext/.settings/org.eclipse.jdt.core.prefs b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.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/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext/META-INF/MANIFEST.MF b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext/META-INF/MANIFEST.MF index 03cc36d4b70..3afd605738f 100755 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext/META-INF/MANIFEST.MF +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Require-Bundle: org.eclipse.emf.mwe2.launch;bundle-version="[2.11.0,3.0.0)", org.eclipse.papyrus.uml.xtext.integration.core;bundle-version="[3.0.0,4.0.0)", org.eclipse.uml2.codegen.ecore;bundle-version="[2.5.0,3.0.0)", org.eclipse.uml2.uml;bundle-version="[5.5.0,6.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)" Export-Package: org.eclipse.papyrus.uml.textedit.state.xtext, org.eclipse.papyrus.uml.textedit.state.xtext.formatting, org.eclipse.papyrus.uml.textedit.state.xtext.generator, @@ -20,12 +20,12 @@ Export-Package: org.eclipse.papyrus.uml.textedit.state.xtext, org.eclipse.papyrus.uml.textedit.state.xtext.validation Bundle-Vendor: %providerName Bundle-ActivationPolicy: lazy -Bundle-Version: 3.0.0.qualifier +Bundle-Version: 3.0.100.qualifier Bundle-Name: %pluginName Bundle-Localization: plugin Bundle-ManifestVersion: 2 Import-Package: org.apache.log4j;version="[1.2.0,2.0.0)", org.eclipse.xtext.xbase.lib;version="[2.10.0,3.0.0)" Bundle-SymbolicName: org.eclipse.papyrus.uml.textedit.state.xtext;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.uml.textedit.state.xtext diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext/pom.xml b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext/pom.xml index 4d07d1be331..6a76195f0c0 100644 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext/pom.xml +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.state.xtext/pom.xml @@ -7,7 +7,7 @@ <version>0.0.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.papyrus.uml.textedit.state.xtext</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.100-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> <build> <plugins> diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext.ui/.classpath b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext.ui/.classpath index ad5e13cce77..946fb3d346f 100644 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext.ui/.classpath +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.stereotypeproperty.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/uml/textedit/org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext.ui/.settings/org.eclipse.jdt.core.prefs b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext.ui/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext.ui/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.stereotypeproperty.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/uml/textedit/org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext.ui/META-INF/MANIFEST.MF b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext.ui/META-INF/MANIFEST.MF index df4447a701b..7ecf8534468 100644 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext.ui/META-INF/MANIFEST.MF +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext.ui/META-INF/MANIFEST.MF @@ -11,7 +11,7 @@ Export-Package: org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext.ui, Bundle-ActivationPolicy: lazy Bundle-Name: %pluginName Bundle-Localization: plugin -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Require-Bundle: org.apache.log4j;bundle-version="[1.2.0,2.0.0)", 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)", diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext/.classpath b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext/.classpath index 95cdcb1209f..108dc438a4a 100644 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext/.classpath +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.stereotypeproperty.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="src-gen"/> diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext/.settings/org.eclipse.jdt.core.prefs b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.stereotypeproperty.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/uml/textedit/org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext/META-INF/MANIFEST.MF b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext/META-INF/MANIFEST.MF index 6169b58a3cd..c7254d945b6 100644 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext/META-INF/MANIFEST.MF +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext/META-INF/MANIFEST.MF @@ -22,15 +22,15 @@ Require-Bundle: org.eclipse.emf.databinding;bundle-version="[1.5.0,2.0.0)", org.eclipse.papyrus.uml.xtext.integration.core;bundle-version="[3.0.0,4.0.0)", org.eclipse.uml2.codegen.ecore;bundle-version="[2.5.0,3.0.0)", org.eclipse.uml2.uml.editor;bundle-version="[5.5.0,6.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)" Bundle-Vendor: %providerName Bundle-ActivationPolicy: lazy -Bundle-Version: 4.0.0.qualifier +Bundle-Version: 4.0.100.qualifier Bundle-Localization: plugin Bundle-Name: %pluginName Bundle-ManifestVersion: 2 Import-Package: org.apache.log4j;version="[1.2.0,2.0.0)", org.eclipse.xtext.xbase.lib;version="[2.10.0,3.0.0)" Bundle-SymbolicName: org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext/pom.xml b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext/pom.xml index fd7ee70fecb..76d9ce72ae7 100644 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext/pom.xml +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext/pom.xml @@ -9,7 +9,7 @@ <version>0.0.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext</artifactId> - <version>4.0.0-SNAPSHOT</version> + <version>4.0.100-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> <build> diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.transition.xtext.ui/.classpath b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.transition.xtext.ui/.classpath index 0fa64c8e5fc..b5e203ff5c7 100644 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.transition.xtext.ui/.classpath +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.transition.xtext.ui/.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/uml/textedit/org.eclipse.papyrus.uml.textedit.transition.xtext.ui/.settings/org.eclipse.jdt.core.prefs b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.transition.xtext.ui/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.transition.xtext.ui/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.transition.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/uml/textedit/org.eclipse.papyrus.uml.textedit.transition.xtext.ui/META-INF/MANIFEST.MF b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.transition.xtext.ui/META-INF/MANIFEST.MF index 5671cfc50e0..b0d3fbb337b 100644 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.transition.xtext.ui/META-INF/MANIFEST.MF +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.transition.xtext.ui/META-INF/MANIFEST.MF @@ -35,5 +35,5 @@ Bundle-Name: %pluginName Bundle-Activator: org.eclipse.papyrus.uml.textedit.transition.xtext.ui.internal.UmlTransitionActivator Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.uml.textedit.transition.xtext.ui;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.uml.textedit.transition.xtext.ui diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.transition.xtext/.classpath b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.transition.xtext/.classpath index ad5e13cce77..946fb3d346f 100644 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.transition.xtext/.classpath +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.transition.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="src-gen"/> diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.transition.xtext/.settings/org.eclipse.jdt.core.prefs b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.transition.xtext/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.transition.xtext/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.transition.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/uml/textedit/org.eclipse.papyrus.uml.textedit.transition.xtext/META-INF/MANIFEST.MF b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.transition.xtext/META-INF/MANIFEST.MF index 265bbfd30ac..2493f45f447 100644 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.transition.xtext/META-INF/MANIFEST.MF +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.transition.xtext/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Require-Bundle: org.eclipse.emf.mwe2.launch;bundle-version="[2.11.0,3.0.0)", org.eclipse.papyrus.uml.xtext.integration.core;bundle-version="[3.0.0,4.0.0)", org.eclipse.uml2.codegen.ecore;bundle-version="[2.5.0,3.0.0)", org.eclipse.uml2.uml;bundle-version="[5.5.0,6.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)" Export-Package: org.eclipse.papyrus.uml.textedit.transition.xtext, org.eclipse.papyrus.uml.textedit.transition.xtext.formatting, org.eclipse.papyrus.uml.textedit.transition.xtext.parser.antlr, @@ -18,11 +18,11 @@ Export-Package: org.eclipse.papyrus.uml.textedit.transition.xtext, org.eclipse.papyrus.uml.textedit.transition.xtext.validation 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 Import-Package: org.apache.log4j;version="[1.2.0,2.0.0)" Bundle-SymbolicName: org.eclipse.papyrus.uml.textedit.transition.xtext;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.uml.textedit.transition.xtext diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.transition.xtext/pom.xml b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.transition.xtext/pom.xml index 4b14035639c..b2908b93da0 100644 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.transition.xtext/pom.xml +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.transition.xtext/pom.xml @@ -9,6 +9,6 @@ <version>0.0.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.papyrus.uml.textedit.transition.xtext</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/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/.classpath b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/.classpath index ad5e13cce77..946fb3d346f 100644 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/.classpath +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.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/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/.settings/org.eclipse.jdt.core.prefs b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.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/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/META-INF/MANIFEST.MF b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/META-INF/MANIFEST.MF index b46d217d4a7..cec2123a529 100644 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/META-INF/MANIFEST.MF +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui/META-INF/MANIFEST.MF @@ -29,5 +29,5 @@ Bundle-ManifestVersion: 2 Bundle-Activator: org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui.internal.UmlValueSpecificationActivator Bundle-Description: %pluginDescription Bundle-SymbolicName: org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext.utils/.classpath b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext.utils/.classpath index e801ebfb468..81fe078c20c 100644 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext.utils/.classpath +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext.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/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext.utils/.settings/org.eclipse.jdt.core.prefs b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext.utils/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext.utils/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext.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/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext.utils/META-INF/MANIFEST.MF b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext.utils/META-INF/MANIFEST.MF index cd75444da22..bdb8131f306 100644 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext.utils/META-INF/MANIFEST.MF +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext.utils/META-INF/MANIFEST.MF @@ -23,5 +23,5 @@ Bundle-ManifestVersion: 2 Bundle-Activator: org.eclipse.papyrus.uml.textedit.valuespecification.xtext.utils.Activator Bundle-Description: %pluginDescription Bundle-SymbolicName: org.eclipse.papyrus.uml.textedit.valuespecification.xtext.utils;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.uml.textedit.valuespecification.xtext.utils diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext/.classpath b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext/.classpath index a61354428b8..7e7c8905e60 100644 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext/.classpath +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.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/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext/.settings/org.eclipse.jdt.core.prefs b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.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/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext/META-INF/MANIFEST.MF b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext/META-INF/MANIFEST.MF index 3752dd9f34b..f960e790873 100644 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext/META-INF/MANIFEST.MF +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Require-Bundle: org.eclipse.emf.mwe2.launch;bundle-version="[2.11.0,3.0.0)", org.eclipse.papyrus.uml.xtext.integration.core;bundle-version="[3.0.0,4.0.0)", org.eclipse.uml2.codegen.ecore;bundle-version="[2.5.0,3.0.0)", org.eclipse.uml2.uml;bundle-version="[5.5.0,6.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)" Export-Package: org.eclipse.papyrus.uml.textedit.valuespecification.xtext, org.eclipse.papyrus.uml.textedit.valuespecification.xtext.formatting, org.eclipse.papyrus.uml.textedit.valuespecification.xtext.generator, @@ -20,7 +20,7 @@ Export-Package: org.eclipse.papyrus.uml.textedit.valuespecification.xtext, org.eclipse.papyrus.uml.textedit.valuespecification.xtext.umlValueSpecification.util 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 @@ -28,5 +28,5 @@ Bundle-Description: %pluginDescription Bundle-SymbolicName: org.eclipse.papyrus.uml.textedit.valuespecification.xtext;singleton:=true Import-Package: org.apache.log4j;version="[1.2.0,2.0.0)", org.eclipse.xtext.xbase.lib;version="[2.10.0,3.0.0)" -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.uml.textedit.valuespecification.xtext diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext/pom.xml b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext/pom.xml index b8d5b4c21bc..e0fc4c183a5 100644 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext/pom.xml +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.xtext/pom.xml @@ -7,7 +7,7 @@ <version>0.0.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.papyrus.uml.textedit.valuespecification.xtext</artifactId> - <version>2.0.0-SNAPSHOT</version> + <version>2.0.100-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> <build> <plugins> diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.utils/.classpath b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.utils/.classpath index e801ebfb468..81fe078c20c 100644 --- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.utils/.classpath +++ b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.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/uml/tools/org.eclipse.papyrus.uml.tools.utils/.settings/org.eclipse.jdt.core.prefs b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.utils/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.utils/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.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/uml/tools/org.eclipse.papyrus.uml.tools.utils/META-INF/MANIFEST.MF b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.utils/META-INF/MANIFEST.MF index e7a6c04b92c..7fa5a2b446f 100644 --- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.utils/META-INF/MANIFEST.MF +++ b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.utils/META-INF/MANIFEST.MF @@ -24,8 +24,8 @@ Bundle-Name: %pluginName Bundle-Activator: org.eclipse.papyrus.uml.tools.utils.Activator Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.uml.tools.utils;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="[32.0.0, 33.0.0)", + com.google.common.collect;version="[32.0.0, 33.0.0)" Bundle-Description: %Bundle-Description Automatic-Module-Name: org.eclipse.papyrus.uml.tools.utils diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools/.classpath b/plugins/uml/tools/org.eclipse.papyrus.uml.tools/.classpath index e801ebfb468..81fe078c20c 100644 --- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools/.classpath +++ b/plugins/uml/tools/org.eclipse.papyrus.uml.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/uml/tools/org.eclipse.papyrus.uml.tools/.settings/org.eclipse.jdt.core.prefs b/plugins/uml/tools/org.eclipse.papyrus.uml.tools/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/uml/tools/org.eclipse.papyrus.uml.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/uml/tools/org.eclipse.papyrus.uml.tools/META-INF/MANIFEST.MF b/plugins/uml/tools/org.eclipse.papyrus.uml.tools/META-INF/MANIFEST.MF index 16a3b45a2a3..295d1fda648 100644 --- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools/META-INF/MANIFEST.MF +++ b/plugins/uml/tools/org.eclipse.papyrus.uml.tools/META-INF/MANIFEST.MF @@ -46,13 +46,13 @@ Require-Bundle: org.eclipse.core.databinding.property;bundle-version="[1.8.0,2.0 org.eclipse.uml2.uml.validation;bundle-version="[5.5.0,6.0.0)" Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy -Bundle-Version: 5.1.0.qualifier +Bundle-Version: 5.2.0.qualifier Bundle-Name: %Bundle-Name Bundle-Activator: org.eclipse.papyrus.uml.tools.Activator Bundle-ManifestVersion: 2 Bundle-Description: %pluginDescription Bundle-SymbolicName: org.eclipse.papyrus.uml.tools;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 -Import-Package: 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.collect;version="[32.0.0, 33.0.0)", + com.google.common.util.concurrent;version="[32.0.0, 33.0.0)" Automatic-Module-Name: org.eclipse.papyrus.uml.tools diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools/pom.xml b/plugins/uml/tools/org.eclipse.papyrus.uml.tools/pom.xml index 7d198ecf21d..c2d2c625843 100644 --- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools/pom.xml +++ b/plugins/uml/tools/org.eclipse.papyrus.uml.tools/pom.xml @@ -9,7 +9,7 @@ <version>0.0.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.papyrus.uml.tools</artifactId> - <version>5.1.0-SNAPSHOT</version> + <version>5.2.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> <description>This plugin contributes a set of common tools for UML</description> </project>
\ No newline at end of file diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools/src/org/eclipse/papyrus/uml/tools/providers/UMLContainerContentProvider.java b/plugins/uml/tools/org.eclipse.papyrus.uml.tools/src/org/eclipse/papyrus/uml/tools/providers/UMLContainerContentProvider.java index a4e6131ebef..829020ab6a0 100644 --- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools/src/org/eclipse/papyrus/uml/tools/providers/UMLContainerContentProvider.java +++ b/plugins/uml/tools/org.eclipse.papyrus.uml.tools/src/org/eclipse/papyrus/uml/tools/providers/UMLContainerContentProvider.java @@ -1,5 +1,5 @@ /***************************************************************************** - * Copyright (c) 2012 CEA LIST. + * Copyright (c) 2012, 2022 CEA LIST. * * 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: * Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation + * Jessy Mallet (OBEO) jessy.mallet@obeo.fr - Bug 581090 *****************************************************************************/ package org.eclipse.papyrus.uml.tools.providers; @@ -44,6 +45,21 @@ public class UMLContainerContentProvider extends SemanticUMLContentProvider { type = (EClass) reference.getEType(); } + /** + * + * Constructor. + * + * @param editedEObject + * the edited element + * @param eClass + * the EClass typing the edited reference + * @since 5.2 + */ + public UMLContainerContentProvider(EObject editedEObject, EClass eClass) { + super(editedEObject, null); + type = eClass; + } + public UMLContainerContentProvider(EObject editedEObject, EReference reference, ResourceSet root) { super(editedEObject, reference, root); type = (EClass) reference.getEType(); diff --git a/plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.core/.classpath b/plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.core/.classpath index e801ebfb468..81fe078c20c 100644 --- a/plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.core/.classpath +++ b/plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.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/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.core/.settings/org.eclipse.jdt.core.prefs b/plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.core/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.core/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.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/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.core/META-INF/MANIFEST.MF b/plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.core/META-INF/MANIFEST.MF index 5d4472fbbf5..5e5db1c5193 100644 --- a/plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.core/META-INF/MANIFEST.MF +++ b/plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.core/META-INF/MANIFEST.MF @@ -6,5 +6,5 @@ Bundle-Version: 3.0.0.qualifier Bundle-Name: XText integration Core Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.uml.xtext.integration.core;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.uml.xtext.integration.core diff --git a/plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.ui/.classpath b/plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.ui/.classpath index e801ebfb468..81fe078c20c 100644 --- a/plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.ui/.classpath +++ b/plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.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/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.ui/.settings/org.eclipse.jdt.core.prefs b/plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.ui/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.ui/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.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/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.ui/META-INF/MANIFEST.MF b/plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.ui/META-INF/MANIFEST.MF index 15b8f149578..b6abbcbd1fd 100644 --- a/plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.ui/META-INF/MANIFEST.MF +++ b/plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.ui/META-INF/MANIFEST.MF @@ -23,5 +23,5 @@ Bundle-Name: Papyrus GMF Xtext Integration Bundle-Activator: org.eclipse.papyrus.uml.xtext.integration.ui.Activator Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.uml.xtext.integration.ui;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.uml.xtext.integration.ui diff --git a/plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.validation/.classpath b/plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.validation/.classpath index e801ebfb468..81fe078c20c 100644 --- a/plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.validation/.classpath +++ b/plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.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/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.validation/.settings/org.eclipse.jdt.core.prefs b/plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.validation/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.validation/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.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/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.validation/META-INF/MANIFEST.MF b/plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.validation/META-INF/MANIFEST.MF index 012249b1d83..6bbea2382cf 100644 --- a/plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.validation/META-INF/MANIFEST.MF +++ b/plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.validation/META-INF/MANIFEST.MF @@ -10,5 +10,5 @@ Bundle-Version: 3.0.0.qualifier Bundle-Name: GMF Xtext Integration Validation Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.uml.xtext.integration.validation;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.uml.xtext.integration.validation diff --git a/plugins/views/documentation/org.eclipse.papyrus.views.documentation/.classpath b/plugins/views/documentation/org.eclipse.papyrus.views.documentation/.classpath index c3ba59e4c3a..1a821310bdc 100644 --- a/plugins/views/documentation/org.eclipse.papyrus.views.documentation/.classpath +++ b/plugins/views/documentation/org.eclipse.papyrus.views.documentation/.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/views/documentation/org.eclipse.papyrus.views.documentation/.settings/org.eclipse.jdt.core.prefs b/plugins/views/documentation/org.eclipse.papyrus.views.documentation/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/views/documentation/org.eclipse.papyrus.views.documentation/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/views/documentation/org.eclipse.papyrus.views.documentation/.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/views/documentation/org.eclipse.papyrus.views.documentation/META-INF/MANIFEST.MF b/plugins/views/documentation/org.eclipse.papyrus.views.documentation/META-INF/MANIFEST.MF index a23d9668bb4..1834d992f55 100644 --- a/plugins/views/documentation/org.eclipse.papyrus.views.documentation/META-INF/MANIFEST.MF +++ b/plugins/views/documentation/org.eclipse.papyrus.views.documentation/META-INF/MANIFEST.MF @@ -20,7 +20,7 @@ Require-Bundle: org.eclipse.emf.databinding;bundle-version="[1.5.0,2.0.0)", org.eclipse.papyrus.uml.types.core;bundle-version="[5.0.0,6.0.0)", org.eclipse.papyrus.uml.ui;bundle-version="[2.0.0,3.0.0)", org.eclipse.uml2.uml.edit;bundle-version="[5.5.0,6.0.0)" -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-ActivationPolicy: lazy Bundle-Vendor: %Bundle-Vendor Bundle-Description: %pluginDescription diff --git a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.newchild/.classpath b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.newchild/.classpath index e801ebfb468..81fe078c20c 100644 --- a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.newchild/.classpath +++ b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.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"/> <classpathentry kind="output" path="bin"/> diff --git a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.newchild/.settings/org.eclipse.jdt.core.prefs b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.newchild/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.newchild/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.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/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.newchild/META-INF/MANIFEST.MF b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.newchild/META-INF/MANIFEST.MF index 11b9a28abb1..f6ed1f00af3 100644 --- a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.newchild/META-INF/MANIFEST.MF +++ b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.newchild/META-INF/MANIFEST.MF @@ -20,5 +20,5 @@ Bundle-Activator: org.eclipse.papyrus.views.modelexplorer.newchild.Activator Bundle-ManifestVersion: 2 Bundle-Description: %pluginDescription Bundle-SymbolicName: org.eclipse.papyrus.views.modelexplorer.newchild;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.views.modelexplorer.newchild diff --git a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.resourceloading/.classpath b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.resourceloading/.classpath index e801ebfb468..81fe078c20c 100644 --- a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.resourceloading/.classpath +++ b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.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/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.resourceloading/.settings/org.eclipse.jdt.core.prefs b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.resourceloading/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.resourceloading/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.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/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.resourceloading/META-INF/MANIFEST.MF b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.resourceloading/META-INF/MANIFEST.MF index 24871dddda9..97e643a1bb6 100644 --- a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.resourceloading/META-INF/MANIFEST.MF +++ b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.resourceloading/META-INF/MANIFEST.MF @@ -19,5 +19,5 @@ Bundle-Name: %pluginName Bundle-Activator: org.eclipse.papyrus.views.modelexplorer.resourceloading.Activator Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.views.modelexplorer.resourceloading;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.views.modelexplorer.resourceloading diff --git a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.widgets/.classpath b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.widgets/.classpath index e801ebfb468..81fe078c20c 100644 --- a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.widgets/.classpath +++ b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.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/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.widgets/.settings/org.eclipse.jdt.core.prefs b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.widgets/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.widgets/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.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/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.widgets/META-INF/MANIFEST.MF b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.widgets/META-INF/MANIFEST.MF index cf761a4565b..dece819db21 100644 --- a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.widgets/META-INF/MANIFEST.MF +++ b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.widgets/META-INF/MANIFEST.MF @@ -14,5 +14,5 @@ Bundle-Name: %pluginName Bundle-Activator: org.eclipse.papyrus.views.modelexplorer.widgets.Activator Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.views.modelexplorer.widgets;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.views.modelexplorer.widgets diff --git a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/.classpath b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/.classpath index e801ebfb468..81fe078c20c 100644 --- a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/.classpath +++ b/plugins/views/modelexplorer/org.eclipse.papyrus.views.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/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/.settings/org.eclipse.jdt.core.prefs b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/views/modelexplorer/org.eclipse.papyrus.views.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/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/META-INF/MANIFEST.MF b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/META-INF/MANIFEST.MF index cdd44d71c20..156844e2fdd 100644 --- a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/META-INF/MANIFEST.MF +++ b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/META-INF/MANIFEST.MF @@ -47,18 +47,19 @@ Require-Bundle: org.eclipse.core.expressions;bundle-version="[3.6.0,4.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.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.navigator;bundle-version="[3.9.0,4.0.0)", org.eclipse.uml2.types;bundle-version="[2.5.0,3.0.0)" Bundle-Vendor: %providerName Bundle-ActivationPolicy: lazy -Bundle-Version: 5.0.100.qualifier +Bundle-Version: 5.1.0.qualifier Bundle-Localization: plugin Bundle-Name: %pluginName Bundle-Activator: org.eclipse.papyrus.views.modelexplorer.Activator Bundle-ManifestVersion: 2 Bundle-Description: %pluginDescription Bundle-SymbolicName: org.eclipse.papyrus.views.modelexplorer;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="[32.0.0, 33.0.0)", + com.google.common.collect;version="[32.0.0, 33.0.0)" Automatic-Module-Name: org.eclipse.papyrus.views.modelexplorer diff --git a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/pom.xml b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/pom.xml index a1d940c69a9..be98511c1ca 100644 --- a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/pom.xml +++ b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/pom.xml @@ -9,6 +9,6 @@ <version>0.0.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.papyrus.views.modelexplorer</artifactId> - <version>5.0.100-SNAPSHOT</version> + <version>5.1.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project>
\ No newline at end of file diff --git a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/Activator.java b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/Activator.java index 6a17bf9e52b..35c4168296c 100644 --- a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/Activator.java +++ b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/Activator.java @@ -1,5 +1,5 @@ /***************************************************************************** - * Copyright (c) 2010, 2016 CEA LIST, Christian W. Damus, and others. + * Copyright (c) 2010, 2016, 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 @@ -11,7 +11,7 @@ * Contributors: * Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation * Christian W. Damus - bug 485220 - * + * Vincent LORENZO (CEA LIST) - vincent.lorenzo@cea.fr - bug 581073 *****************************************************************************/ package org.eclipse.papyrus.views.modelexplorer; @@ -29,10 +29,12 @@ import org.eclipse.papyrus.emf.facet.custom.core.ICustomizationManager; import org.eclipse.papyrus.infra.core.log.LogHelper; import org.eclipse.papyrus.infra.ui.emf.utils.ProviderHelper; import org.eclipse.papyrus.views.modelexplorer.handler.CollapseAllHandler; +import org.eclipse.papyrus.views.properties.services.IPropertySheetPageProviderService; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.handlers.IHandlerService; import org.eclipse.ui.plugin.AbstractUIPlugin; import org.osgi.framework.BundleContext; +import org.osgi.framework.ServiceReference; /** * The activator class controls the plug-in life cycle @@ -59,13 +61,25 @@ public class Activator extends AbstractUIPlugin { log = new LogHelper(plugin); EMFEditPlugin.getComposedAdapterFactoryDescriptorRegistry(); + // 1. get the bundle context + 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 ModelExplorer + provider.registerPropertySheetPageProvider(new ModelExplorerPropertySheetPageProvider()); + } + } + // FIXME Workaround for Bug 467000 (Eclipse Platform), Bug 463564 (ModelExplorer) String workaround = "eclipse.workaround.bug467000"; //$NON-NLS-1$ if (System.getProperty(workaround) == null) { // Only change the value if it is not explicitly set already (Don't override user-defined value) System.setProperty(workaround, Boolean.toString(true)); } - //Replace collapseHandler in handler service + // Replace collapseHandler in handler service IHandlerService handlerService = PlatformUI.getWorkbench().getService(IHandlerService.class); handlerService.activateHandler(org.eclipse.ui.handlers.CollapseAllHandler.COMMAND_ID, new CollapseAllHandler()); } @@ -114,7 +128,7 @@ public class Activator extends AbstractUIPlugin { * @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(); diff --git a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/ModelExplorerPageBookView.java b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/ModelExplorerPageBookView.java index 95f0128de76..7354b187906 100644 --- a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/ModelExplorerPageBookView.java +++ b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/ModelExplorerPageBookView.java @@ -1,5 +1,5 @@ /***************************************************************************** - * Copyright (c) 2010, 2014 LIFL, CEA LIST, Christian W. Damus, and others. + * Copyright (c) 2010, 2022 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,6 +16,7 @@ * Christian W. Damus - bug 450536 * Christian W. Damus - bug 451683 * Christian W. Damus - bug 454536 + * Vincent LORENZO (CEA) - vincent.lorenzo@cea.fr - bug 581073 * *****************************************************************************/ @@ -30,10 +31,12 @@ import org.eclipse.emf.common.util.URI; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.EValidator; import org.eclipse.emf.edit.domain.EditingDomain; +import org.eclipse.papyrus.infra.ui.Activator; import org.eclipse.papyrus.views.modelexplorer.core.ui.pagebookview.MultiViewPageBookView; import org.eclipse.papyrus.views.modelexplorer.core.ui.pagebookview.ViewPartPage; import org.eclipse.papyrus.views.modelexplorer.sorting.DefaultTreeViewerSorting; import org.eclipse.papyrus.views.modelexplorer.sorting.ITreeViewerSorting; +import org.eclipse.papyrus.views.properties.services.IPropertySheetPageProviderService; import org.eclipse.ui.IMemento; import org.eclipse.ui.IViewPart; import org.eclipse.ui.IViewSite; @@ -44,6 +47,8 @@ import org.eclipse.ui.navigator.CommonViewer; import org.eclipse.ui.part.IPage; import org.eclipse.ui.views.properties.IPropertySheetPage; import org.eclipse.ui.views.properties.tabbed.ITabbedPropertySheetPageContributor; +import org.osgi.framework.BundleContext; +import org.osgi.framework.ServiceReference; import com.google.common.collect.Lists; @@ -62,9 +67,9 @@ public class ModelExplorerPageBookView extends MultiViewPageBookView implements private final SharedModelExplorerState state = new SharedModelExplorerState(); /** The property sheet pages. */ - private List<IPropertySheetPage> propertiesSheetPages = new LinkedList<IPropertySheetPage>(); + private List<IPropertySheetPage> propertiesSheetPages = new LinkedList<>(); - private final CopyOnWriteArrayList<IPageBookViewPageListener> pageListeners = new CopyOnWriteArrayList<IPageBookViewPageListener>(); + private final CopyOnWriteArrayList<IPageBookViewPageListener> pageListeners = new CopyOnWriteArrayList<>(); @Override public void init(IViewSite site, IMemento memento) throws PartInitException { @@ -95,11 +100,39 @@ public class ModelExplorerPageBookView extends MultiViewPageBookView implements * @return */ private IPropertySheetPage getPropertySheetPage() { - IPropertySheetPage propertySheetPage = new ModelExplorerPropertySheetPage(this); - propertiesSheetPages.add(propertySheetPage); + IPropertySheetPage propertySheetPage = null; + // 1. get the service + final IPropertySheetPageProviderService provider = getPropertySheetPageProviderService(); + if (provider != null) { + // 2. get the property page + propertySheetPage = provider.createPropertySheetPage(this, VIEW_ID); // $NON-NLS-1$ + } + if (propertySheetPage != null) { + propertiesSheetPages.add(propertySheetPage); + } return propertySheetPage; } + /** + * 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 Object getAdapter(@SuppressWarnings("rawtypes") Class adapter) { @@ -130,11 +163,12 @@ public class ModelExplorerPageBookView extends MultiViewPageBookView implements return super.getAdapter(adapter); } + @Override public String getContributorId() { - // return Activator.PLUGIN_ID; return "TreeOutlinePage"; //$NON-NLS-1$ } + @Override public void gotoMarker(IMarker marker) { String uriAttribute = marker.getAttribute(EValidator.URI_ATTRIBUTE, null); if (uriAttribute != null) { @@ -197,8 +231,8 @@ public class ModelExplorerPageBookView extends MultiViewPageBookView implements try { super.setFocus(); } catch (Exception ex) { - //Tentative workaround to reduce error log cluttering during test execution on Linux - //Only log a warning instead of the full stack trace, since NPEs happen a lot during tests on Linux + // Tentative workaround to reduce error log cluttering during test execution on Linux + // Only log a warning instead of the full stack trace, since NPEs happen a lot during tests on Linux Activator.log.warn("Error setting focus"); } @@ -210,8 +244,13 @@ public class ModelExplorerPageBookView extends MultiViewPageBookView implements @Override public void dispose() { - for (IPropertySheetPage page : propertiesSheetPages) { - page.dispose(); + // 1. get the service + final IPropertySheetPageProviderService provider = getPropertySheetPageProviderService(); + if (provider != null) { + // 2. dispose each property page + for (IPropertySheetPage propertySheetPage : this.propertiesSheetPages) { + provider.dispose(propertySheetPage); + } } propertiesSheetPages.clear(); super.dispose(); diff --git a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/ModelExplorerPropertySheetPageProvider.java b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/ModelExplorerPropertySheetPageProvider.java new file mode 100755 index 00000000000..74c1184c067 --- /dev/null +++ b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/ModelExplorerPropertySheetPageProvider.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.views.modelexplorer; + +import org.eclipse.papyrus.views.properties.services.IPropertySheetPageProvider; +import org.eclipse.ui.views.properties.IPropertySheetPage; + +/** + * Papyrus ModelExplorer Property Sheet Page Provider using the XWT Renderer + * + * @since 5.1 + */ +public class ModelExplorerPropertySheetPageProvider implements IPropertySheetPageProvider { + + /** + * @see org.eclipse.papyrus.views.properties.services.IPropertySheetPageProvider#getRendererID() + * + * @return + */ + @Override + public String getRendererID() { + return "XWT"; //$NON-NLS-1$ //TODO How it is linkded to XWT ? + } + + /** + * @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 ModelExplorerPageBookView; + } + + /** + * @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 ModelExplorerPageBookView) { + return new ModelExplorerPropertySheetPage((ModelExplorerPageBookView) 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/views/org.eclipse.papyrus.views.search/.classpath b/plugins/views/org.eclipse.papyrus.views.search/.classpath index edc8895124d..a7bc712151f 100644 --- a/plugins/views/org.eclipse.papyrus.views.search/.classpath +++ b/plugins/views/org.eclipse.papyrus.views.search/.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/views/org.eclipse.papyrus.views.search/.settings/org.eclipse.jdt.core.prefs b/plugins/views/org.eclipse.papyrus.views.search/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/views/org.eclipse.papyrus.views.search/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/views/org.eclipse.papyrus.views.search/.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/views/org.eclipse.papyrus.views.search/META-INF/MANIFEST.MF b/plugins/views/org.eclipse.papyrus.views.search/META-INF/MANIFEST.MF index 7bc9c90cbb6..7eec7143142 100644 --- a/plugins/views/org.eclipse.papyrus.views.search/META-INF/MANIFEST.MF +++ b/plugins/views/org.eclipse.papyrus.views.search/META-INF/MANIFEST.MF @@ -6,7 +6,7 @@ Export-Package: org.eclipse.papyrus.views.search.regex, Bundle-ActivationPolicy: lazy 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;bundle-version="[4.0.0,5.0.0)", org.eclipse.papyrus.infra.core.log;bundle-version="[2.0.0,3.0.0)", @@ -19,7 +19,7 @@ Require-Bundle: org.eclipse.gmf.runtime.emf.type.core;bundle-version="[1.9.0,2.0 org.eclipse.ui.views.properties.tabbed;bundle-version="[3.8.0,4.0.0)", org.eclipse.uml2.uml;bundle-version="[5.5.0,6.0.0)" Bundle-Vendor: %vendorName -Bundle-Version: 3.0.0.qualifier +Bundle-Version: 3.1.0.qualifier Bundle-ManifestVersion: 2 Bundle-Activator: org.eclipse.papyrus.views.search.Activator Bundle-SymbolicName: org.eclipse.papyrus.views.search;singleton:=true diff --git a/plugins/views/org.eclipse.papyrus.views.search/pom.xml b/plugins/views/org.eclipse.papyrus.views.search/pom.xml index 87c2fbd5d8e..2e5c7c69352 100644 --- a/plugins/views/org.eclipse.papyrus.views.search/pom.xml +++ b/plugins/views/org.eclipse.papyrus.views.search/pom.xml @@ -7,6 +7,6 @@ <version>0.0.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.papyrus.views.search</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/views/org.eclipse.papyrus.views.search/src/org/eclipse/papyrus/views/search/results/AbstractResultEntry.java b/plugins/views/org.eclipse.papyrus.views.search/src/org/eclipse/papyrus/views/search/results/AbstractResultEntry.java index ed3702cdd8c..1f32a22d290 100644 --- a/plugins/views/org.eclipse.papyrus.views.search/src/org/eclipse/papyrus/views/search/results/AbstractResultEntry.java +++ b/plugins/views/org.eclipse.papyrus.views.search/src/org/eclipse/papyrus/views/search/results/AbstractResultEntry.java @@ -1,5 +1,5 @@ /***************************************************************************** - * Copyright (c) 2013 CEA LIST and others. + * Copyright (c) 2013, 2023 CEA LIST and others. * * * All rights reserved. This program and the accompanying materials @@ -13,6 +13,7 @@ * CEA LIST - Initial API and implementation * Christian W. Damus (CEA LIST) - Replace workspace IResource dependency with URI for CDO compatibility * Christian W. Damus (CEA LIST) - Fix equals() to avoid resolving source objects and add missing hashCode() + * Pauline DEVILLE (CEA LIST) <pauline.deville@cea.fr> - Bug 581217 * *****************************************************************************/ package org.eclipse.papyrus.views.search.results; @@ -28,7 +29,7 @@ import org.eclipse.emf.ecore.resource.ResourceSet; import org.eclipse.emf.ecore.util.EcoreUtil; import org.eclipse.papyrus.infra.core.services.ServiceException; import org.eclipse.papyrus.infra.services.openelement.service.OpenElementService; -import org.eclipse.papyrus.views.search.scope.ScopeEntry; +import org.eclipse.papyrus.views.search.scope.IScopeEntry; import org.eclipse.search.ui.text.Match; import org.eclipse.search.ui.text.MatchFilter; import org.eclipse.ui.PartInitException; @@ -92,24 +93,24 @@ public abstract class AbstractResultEntry extends Match { * @param child * the element to search parents for * @param scopeEntry - * the {@link ScopeEntry} corresponding to the resource that contains the element that matches + * the {@link IScopeEntry} corresponding to the resource that contains the element that matches */ public void recursiveHierarchy(AbstractResultEntry child) { if (child.getSource() instanceof EObject) { EObject potentialParent = ((EObject) child.getSource()).eContainer(); if (potentialParent != null) { - ResultEntry theParent = new ResultEntry(potentialParent, (ScopeEntry) this.getElement()); + ResultEntry theParent = new ResultEntry(potentialParent, (IScopeEntry) this.getElement()); child.setParent(theParent); recursiveHierarchy(theParent); } else { - ResultEntry theParent = new ResultEntry(((ScopeEntry) this.getElement()).getResourceURI(), (ScopeEntry) this.getElement()); + ResultEntry theParent = new ResultEntry(((IScopeEntry) this.getElement()).getResourceURI(), (IScopeEntry) this.getElement()); child.setParent(theParent); } } } - protected AbstractResultEntry getLastParent(AbstractResultEntry child, ScopeEntry scopeEntry) { + protected AbstractResultEntry getLastParent(AbstractResultEntry child, IScopeEntry scopeEntry) { if (child.getSource() instanceof EObject) { @@ -121,7 +122,7 @@ public abstract class AbstractResultEntry extends Match { theParent = new ResultEntry(potentialParent, scopeEntry); theParent.setParent(new ResultEntry(scopeEntry.getResourceURI(), scopeEntry)); } - + potentialParent = potentialParent.eContainer(); } @@ -210,13 +211,12 @@ public abstract class AbstractResultEntry extends Match { * @param source * the element that raised the match * @param scopeEntry - * the {@link ScopeEntry} that correspond to the resource that contains the element that raised the match + * the {@link IScopeEntry} that correspond to the resource that contains the element that raised the match */ - public AbstractResultEntry(int offset, int lenght, Object source, ScopeEntry scopeEntry) { + public AbstractResultEntry(int offset, int lenght, Object source, IScopeEntry scopeEntry) { super(scopeEntry, offset, lenght); // this.source = source; if (source instanceof EObject) { - this.uriSource = EcoreUtil.getURI((EObject) source); } else if (source instanceof IResource) { this.uriResource = ((IResource) source).getLocationURI(); @@ -234,7 +234,7 @@ public abstract class AbstractResultEntry extends Match { public Object getSource() { if (this.uriSource != null) { - ResourceSet resSet = ((ScopeEntry) this.getElement()).getModelSet(); + ResourceSet resSet = ((IScopeEntry) this.getElement()).getModelSet(); return resSet.getEObject(this.uriSource, true); } else if (this.uriResource != null) { @@ -244,7 +244,7 @@ public abstract class AbstractResultEntry extends Match { IPath path = new Path(this.uriResource.getPath()); return root.getFile(path); } else if (this.uriEResource != null) { - ResourceSet rset = ((ScopeEntry) this.getElement()).getModelSet(); + ResourceSet rset = ((IScopeEntry) this.getElement()).getModelSet(); return rset.getResource(this.uriEResource, true); } diff --git a/plugins/views/org.eclipse.papyrus.views.search/src/org/eclipse/papyrus/views/search/results/AttributeMatch.java b/plugins/views/org.eclipse.papyrus.views.search/src/org/eclipse/papyrus/views/search/results/AttributeMatch.java index 7905c9de4a4..4072184f70a 100644 --- a/plugins/views/org.eclipse.papyrus.views.search/src/org/eclipse/papyrus/views/search/results/AttributeMatch.java +++ b/plugins/views/org.eclipse.papyrus.views.search/src/org/eclipse/papyrus/views/search/results/AttributeMatch.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 @@ -11,6 +11,7 @@ * * Contributors: * CEA LIST - Initial API and implementation + * Pauline DEVILLE (CEA LIST) <pauline.deville@cea.fr> - Bug 581217 * *****************************************************************************/ package org.eclipse.papyrus.views.search.results; @@ -20,7 +21,7 @@ import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.util.EcoreUtil; import org.eclipse.papyrus.infra.core.services.ServiceException; import org.eclipse.papyrus.infra.services.openelement.service.OpenElementService; -import org.eclipse.papyrus.views.search.scope.ScopeEntry; +import org.eclipse.papyrus.views.search.scope.IScopeEntry; import org.eclipse.ui.PartInitException; import org.eclipse.uml2.uml.Stereotype; @@ -55,7 +56,7 @@ public class AttributeMatch extends ModelMatch { * @param attribute * the attribute that raised the match */ - public AttributeMatch(int offset, int lenght, Object target, ScopeEntry scopeEntry, Object attribute, Stereotype stereotype) { + public AttributeMatch(int offset, int lenght, Object target, IScopeEntry scopeEntry, Object attribute, Stereotype stereotype) { super(offset, lenght, target, scopeEntry); this.attribute = attribute; this.stereotype = stereotype; @@ -65,7 +66,7 @@ public class AttributeMatch extends ModelMatch { // } this.parent = new ResultEntry(target, scopeEntry); ((ResultEntry) this.parent).setParent(new ResultEntry(scopeEntry.getResourceURI(), scopeEntry)); - + // recursiveHierarchy((AbstractResultEntry) parent); } @@ -82,7 +83,7 @@ public class AttributeMatch extends ModelMatch { * the attribute that raised the match */ public AttributeMatch(AbstractResultEntry parent, int offset, int length, Object target, Object attribute, Stereotype stereotype) { - super(offset, length, target, (ScopeEntry) parent.getElement()); + super(offset, length, target, (IScopeEntry) parent.getElement()); this.attribute = attribute; this.stereotype = stereotype; @@ -121,13 +122,13 @@ public class AttributeMatch extends ModelMatch { return false; } } - + /** * @see org.eclipse.papyrus.views.search.results.AbstractResultEntry#hashCode() - * - * Adds the identity hash since two instances of match with same offset and length will have - * the same hash code, although they should not if they are two different attributes. - * + * + * Adds the identity hash since two instances of match with same offset and length will have + * the same hash code, although they should not if they are two different attributes. + * */ @Override public int hashCode() { @@ -189,7 +190,7 @@ public class AttributeMatch extends ModelMatch { } public Object getMetaAttribute() { - + return this.attribute; } diff --git a/plugins/views/org.eclipse.papyrus.views.search/src/org/eclipse/papyrus/views/search/results/ModelElementMatch.java b/plugins/views/org.eclipse.papyrus.views.search/src/org/eclipse/papyrus/views/search/results/ModelElementMatch.java index e99ce1cc698..73202ad7788 100644 --- a/plugins/views/org.eclipse.papyrus.views.search/src/org/eclipse/papyrus/views/search/results/ModelElementMatch.java +++ b/plugins/views/org.eclipse.papyrus.views.search/src/org/eclipse/papyrus/views/search/results/ModelElementMatch.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 @@ -11,6 +11,7 @@ * * Contributors: * CEA LIST - Initial API and implementation + * Pauline DEVILLE (CEA LIST) <pauline.deville@cea.fr> - Bug 581217 * *****************************************************************************/ package org.eclipse.papyrus.views.search.results; @@ -19,7 +20,7 @@ import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.resource.ResourceSet; import org.eclipse.papyrus.infra.core.services.ServiceException; import org.eclipse.papyrus.infra.services.openelement.service.OpenElementService; -import org.eclipse.papyrus.views.search.scope.ScopeEntry; +import org.eclipse.papyrus.views.search.scope.IScopeEntry; import org.eclipse.ui.PartInitException; /** @@ -31,7 +32,7 @@ public class ModelElementMatch extends ModelMatch { - public ModelElementMatch(Object source, ScopeEntry scopeEntry) { + public ModelElementMatch(Object source, IScopeEntry scopeEntry) { super(UNSPECIFIED, UNSPECIFIED, source, scopeEntry); this.setParent(new ResultEntry(scopeEntry.getResourceURI(), scopeEntry)); // recursiveHierarchy(this); @@ -53,7 +54,7 @@ public class ModelElementMatch extends ModelMatch { public Object elementToDisplay() { // return this.getSource(); if (this.uriSource != null) { - ResourceSet resSet = ((ScopeEntry) this.getElement()).getModelSet(); + ResourceSet resSet = ((IScopeEntry) this.getElement()).getModelSet(); return resSet.getEObject(this.uriSource, true); } return null; diff --git a/plugins/views/org.eclipse.papyrus.views.search/src/org/eclipse/papyrus/views/search/results/ModelMatch.java b/plugins/views/org.eclipse.papyrus.views.search/src/org/eclipse/papyrus/views/search/results/ModelMatch.java index e846a9eb2cc..0b302359af1 100644 --- a/plugins/views/org.eclipse.papyrus.views.search/src/org/eclipse/papyrus/views/search/results/ModelMatch.java +++ b/plugins/views/org.eclipse.papyrus.views.search/src/org/eclipse/papyrus/views/search/results/ModelMatch.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 @@ -11,11 +11,12 @@ * * Contributors: * CEA LIST - Initial API and implementation + * Pauline DEVILLE (CEA LIST) <pauline.deville@cea.fr> - Bug 581217 * *****************************************************************************/ package org.eclipse.papyrus.views.search.results; -import org.eclipse.papyrus.views.search.scope.ScopeEntry; +import org.eclipse.papyrus.views.search.scope.IScopeEntry; /** * @@ -24,7 +25,7 @@ import org.eclipse.papyrus.views.search.scope.ScopeEntry; */ public abstract class ModelMatch extends AbstractResultEntry { - public ModelMatch(int offset, int lenght, Object source, ScopeEntry scopeEntry) { + public ModelMatch(int offset, int lenght, Object source, IScopeEntry scopeEntry) { super(offset, lenght, source, scopeEntry); } diff --git a/plugins/views/org.eclipse.papyrus.views.search/src/org/eclipse/papyrus/views/search/results/ResultEntry.java b/plugins/views/org.eclipse.papyrus.views.search/src/org/eclipse/papyrus/views/search/results/ResultEntry.java index 256fab86d67..5941f73d6f7 100644 --- a/plugins/views/org.eclipse.papyrus.views.search/src/org/eclipse/papyrus/views/search/results/ResultEntry.java +++ b/plugins/views/org.eclipse.papyrus.views.search/src/org/eclipse/papyrus/views/search/results/ResultEntry.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 @@ -11,6 +11,7 @@ * * Contributors: * CEA LIST - Initial API and implementation + * Pauline DEVILLE (CEA LIST) <pauline.deville@cea.fr> - Bug 581217 * *****************************************************************************/ package org.eclipse.papyrus.views.search.results; @@ -19,7 +20,7 @@ package org.eclipse.papyrus.views.search.results; import org.eclipse.emf.ecore.EObject; import org.eclipse.papyrus.infra.core.services.ServiceException; import org.eclipse.papyrus.infra.services.openelement.service.OpenElementService; -import org.eclipse.papyrus.views.search.scope.ScopeEntry; +import org.eclipse.papyrus.views.search.scope.IScopeEntry; import org.eclipse.ui.PartInitException; /** @@ -31,7 +32,7 @@ public class ResultEntry extends AbstractResultEntry { - public ResultEntry(Object source, ScopeEntry scopeEntry) { + public ResultEntry(Object source, IScopeEntry scopeEntry) { super(UNSPECIFIED, UNSPECIFIED, source, scopeEntry); diff --git a/plugins/views/org.eclipse.papyrus.views.search/src/org/eclipse/papyrus/views/search/results/ViewerMatch.java b/plugins/views/org.eclipse.papyrus.views.search/src/org/eclipse/papyrus/views/search/results/ViewerMatch.java index af17440d14e..12b01fd18b7 100644 --- a/plugins/views/org.eclipse.papyrus.views.search/src/org/eclipse/papyrus/views/search/results/ViewerMatch.java +++ b/plugins/views/org.eclipse.papyrus.views.search/src/org/eclipse/papyrus/views/search/results/ViewerMatch.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 @@ -11,6 +11,7 @@ * * Contributors: * CEA LIST - Initial API and implementation + * Pauline DEVILLE (CEA LIST) <pauline.deville@cea.fr> - Bug 581217 * *****************************************************************************/ package org.eclipse.papyrus.views.search.results; @@ -21,7 +22,7 @@ import org.eclipse.emf.ecore.resource.ResourceSet; import org.eclipse.emf.ecore.util.EcoreUtil; import org.eclipse.papyrus.infra.core.services.ServiceException; import org.eclipse.papyrus.infra.services.openelement.service.OpenElementService; -import org.eclipse.papyrus.views.search.scope.ScopeEntry; +import org.eclipse.papyrus.views.search.scope.IScopeEntry; import org.eclipse.ui.PartInitException; /** @@ -36,7 +37,7 @@ public class ViewerMatch extends AbstractResultEntry { */ protected URI URIsemanticElement; - public ViewerMatch(Object source, ScopeEntry scopeEntry, Object semanticElement) { + public ViewerMatch(Object source, IScopeEntry scopeEntry, Object semanticElement) { super(UNSPECIFIED, UNSPECIFIED, source, scopeEntry); if (semanticElement instanceof EObject) { this.URIsemanticElement = EcoreUtil.getURI((EObject) semanticElement); @@ -50,7 +51,7 @@ public class ViewerMatch extends AbstractResultEntry { public Object getSemanticElement() { if (this.URIsemanticElement != null) { - ResourceSet resSet = ((ScopeEntry) this.getElement()).getModelSet(); + ResourceSet resSet = ((IScopeEntry) this.getElement()).getModelSet(); return resSet.getEObject(this.URIsemanticElement, true); } return null; @@ -82,7 +83,7 @@ public class ViewerMatch extends AbstractResultEntry { @Override public Object elementToCheckFilterFor() { if (this.URIsemanticElement != null) { - ResourceSet resSet = ((ScopeEntry) this.getElement()).getModelSet(); + ResourceSet resSet = ((IScopeEntry) this.getElement()).getModelSet(); return resSet.getEObject(this.URIsemanticElement, true); } return null; diff --git a/plugins/views/org.eclipse.papyrus.views.search/src/org/eclipse/papyrus/views/search/scope/IScopeEntry.java b/plugins/views/org.eclipse.papyrus.views.search/src/org/eclipse/papyrus/views/search/scope/IScopeEntry.java new file mode 100644 index 00000000000..67ed3fcf9cb --- /dev/null +++ b/plugins/views/org.eclipse.papyrus.views.search/src/org/eclipse/papyrus/views/search/scope/IScopeEntry.java @@ -0,0 +1,55 @@ +/***************************************************************************** + * 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: + * Pauline DEVILLE (CEA LIST) <pauline.deville@cea.fr> - Initial API and implementation + * + *****************************************************************************/ + +package org.eclipse.papyrus.views.search.scope; + +import org.eclipse.emf.common.util.URI; +import org.eclipse.papyrus.infra.core.resource.ModelSet; +import org.eclipse.papyrus.infra.core.services.ServicesRegistry; + +/** + * This interface is used to aggregate information about the resource that contains the element that raised a match + */ +public interface IScopeEntry { + + /** + * Get the modelSet that contains the model element + * + * @return the modelSet + */ + ModelSet getModelSet(); + + /** + * Get the ServiceRegistry corresponding to the modelSet + * + * @return the ServiceRegistry + */ + ServicesRegistry getServicesRegistry(); + + /** + * Get the resource uri + * + * @return + */ + URI getResourceURI(); + + /** + * Set the resource uri + * + * @param resourceURI + */ + void setResourceURI(URI resourceURI); + +}
\ No newline at end of file diff --git a/plugins/views/org.eclipse.papyrus.views.search/src/org/eclipse/papyrus/views/search/scope/ScopeEntry.java b/plugins/views/org.eclipse.papyrus.views.search/src/org/eclipse/papyrus/views/search/scope/ScopeEntry.java index 7dcabaee5e3..205a8684bb2 100644 --- a/plugins/views/org.eclipse.papyrus.views.search/src/org/eclipse/papyrus/views/search/scope/ScopeEntry.java +++ b/plugins/views/org.eclipse.papyrus.views.search/src/org/eclipse/papyrus/views/search/scope/ScopeEntry.java @@ -1,5 +1,5 @@ /***************************************************************************** - * Copyright (c) 2013, 2014 CEA LIST and others. + * Copyright (c) 2013, 2014, 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 @@ * Christian W. Damus (CEA LIST) - Fix leaking of all UML models in search results * Christian W. Damus (CEA LIST) - Replace workspace IResource dependency with URI for CDO compatibility * Christian W. Damus (CEA) - bug 431953 (fix start-up of selective services to require only their dependencies) + * Pauline DEVILLE (CEA LIST) <pauline.deville@cea.fr> - Bug 581217 * *****************************************************************************/ package org.eclipse.papyrus.views.search.scope; @@ -48,7 +49,8 @@ import org.eclipse.ui.PlatformUI; * This class is used to aggregate information about the resource that contains the element that raised a match * */ -public class ScopeEntry { +public class ScopeEntry implements IScopeEntry { + /** * Tracks service registries created implicitly (not borrowed from editors) by scope entries, so that they may * be properly shut down when no longer needed. @@ -94,7 +96,7 @@ public class ScopeEntry { } private Collection<IEditorPart> getEditors() { - Collection<IEditorPart> results = new HashSet<IEditorPart>(); + Collection<IEditorPart> results = new HashSet<>(); IWorkbenchWindow[] windows = PlatformUI.getWorkbench().getWorkbenchWindows(); for (IWorkbenchWindow iWorkbenchWindow : windows) { IWorkbenchPage[] pages = iWorkbenchWindow.getPages(); @@ -134,6 +136,7 @@ public class ScopeEntry { return null; } + @Override public ModelSet getModelSet() { // If null, try to find one or create one if (modelSet == null) { @@ -154,7 +157,7 @@ public class ScopeEntry { } } } - + return modelSet; } @@ -177,7 +180,7 @@ public class ScopeEntry { IEditorPart editor = editorOnResource(); if (editor != null) { - ServicesRegistry registry = (ServicesRegistry) editor.getAdapter(ServicesRegistry.class); + ServicesRegistry registry = editor.getAdapter(ServicesRegistry.class); return registry; @@ -186,6 +189,7 @@ public class ScopeEntry { return servicesRegistry; } + @Override public ServicesRegistry getServicesRegistry() { if (servicesRegistry == null) { @@ -209,10 +213,12 @@ public class ScopeEntry { return servicesRegistry; } + @Override public URI getResourceURI() { return resourceURI; } + @Override public void setResourceURI(URI resourceURI) { this.resourceURI = resourceURI; } diff --git a/plugins/views/org.eclipse.papyrus.views.search/src/org/eclipse/papyrus/views/search/utils/IServiceRegistryTracker.java b/plugins/views/org.eclipse.papyrus.views.search/src/org/eclipse/papyrus/views/search/utils/IServiceRegistryTracker.java index a8aedbefaac..4a2b76c13e2 100644 --- a/plugins/views/org.eclipse.papyrus.views.search/src/org/eclipse/papyrus/views/search/utils/IServiceRegistryTracker.java +++ b/plugins/views/org.eclipse.papyrus.views.search/src/org/eclipse/papyrus/views/search/utils/IServiceRegistryTracker.java @@ -1,5 +1,5 @@ /***************************************************************************** - * Copyright (c) 2013 CEA LIST and others. + * Copyright (c) 2013, 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 @@ -10,15 +10,17 @@ * * Contributors: * CEA LIST - Initial API and implementation + * Pauline DEVILLE (CEA LIST) <pauline.deville@cea.fr> - Bug 581217 + * *****************************************************************************/ package org.eclipse.papyrus.views.search.utils; import org.eclipse.papyrus.infra.core.services.ServicesRegistry; -import org.eclipse.papyrus.views.search.scope.ScopeEntry; +import org.eclipse.papyrus.views.search.scope.IScopeEntry; /** - * A tracker of references to service registries used by {@linkplain ScopeEntry scope entries}, which automatically shuts them down + * A tracker of references to service registries used by {@linkplain IScopeEntry scope entries}, which automatically shuts them down * when they are no longer needed. */ public interface IServiceRegistryTracker { diff --git a/plugins/views/org.eclipse.papyrus.views.search/src/org/eclipse/papyrus/views/search/utils/MatchUtils.java b/plugins/views/org.eclipse.papyrus.views.search/src/org/eclipse/papyrus/views/search/utils/MatchUtils.java index b07fa775736..f0cb2e339e7 100644 --- a/plugins/views/org.eclipse.papyrus.views.search/src/org/eclipse/papyrus/views/search/utils/MatchUtils.java +++ b/plugins/views/org.eclipse.papyrus.views.search/src/org/eclipse/papyrus/views/search/utils/MatchUtils.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 @@ -11,6 +11,7 @@ * * Contributors: * CEA LIST - Initial API and implementation + * Pauline DEVILLE (CEA LIST) <pauline.deville@cea.fr> - Bug 581217 * *****************************************************************************/ package org.eclipse.papyrus.views.search.utils; @@ -21,7 +22,7 @@ import java.util.List; import java.util.Set; import org.eclipse.papyrus.views.search.results.AbstractResultEntry; -import org.eclipse.papyrus.views.search.scope.ScopeEntry; +import org.eclipse.papyrus.views.search.scope.IScopeEntry; import org.eclipse.search.ui.text.AbstractTextSearchResult; import org.eclipse.search.ui.text.Match; @@ -43,7 +44,7 @@ public class MatchUtils { * @return */ public static Set<AbstractResultEntry> getMatches(AbstractTextSearchResult searchResult, Class<?> type, boolean checkFiltered) { - Set<AbstractResultEntry> results = new HashSet<AbstractResultEntry>(); + Set<AbstractResultEntry> results = new HashSet<>(); List<Object> elementList = Arrays.asList(searchResult.getElements()); @@ -52,7 +53,7 @@ public class MatchUtils { if (match instanceof AbstractResultEntry) { - if (match.getElement() instanceof ScopeEntry) { + if (match.getElement() instanceof IScopeEntry) { // ScopeEntry scope = (ScopeEntry)match.getElement(); // ((AbstractResultEntry)element).recursiveHierarchy((AbstractResultEntry)element, scope); diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties.model.xwt/.classpath b/plugins/views/properties/org.eclipse.papyrus.views.properties.model.xwt/.classpath index dc9f3ae4e70..77e4cb429f3 100644 --- a/plugins/views/properties/org.eclipse.papyrus.views.properties.model.xwt/.classpath +++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.model.xwt/.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"> <attributes> <attribute name="module" value="true"/> </attributes> diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties.model.xwt/.settings/org.eclipse.jdt.core.prefs b/plugins/views/properties/org.eclipse.papyrus.views.properties.model.xwt/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/views/properties/org.eclipse.papyrus.views.properties.model.xwt/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.model.xwt/.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/views/properties/org.eclipse.papyrus.views.properties.model.xwt/META-INF/MANIFEST.MF b/plugins/views/properties/org.eclipse.papyrus.views.properties.model.xwt/META-INF/MANIFEST.MF index a1cdcc4bda4..f66132252b7 100755 --- a/plugins/views/properties/org.eclipse.papyrus.views.properties.model.xwt/META-INF/MANIFEST.MF +++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.model.xwt/META-INF/MANIFEST.MF @@ -22,5 +22,5 @@ Bundle-Activator: org.eclipse.papyrus.views.properties.model.xwt.Activator Bundle-ManifestVersion: 2 Bundle-Description: %pluginDescription Bundle-SymbolicName: org.eclipse.papyrus.views.properties.model.xwt;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.views.properties.model.xwt diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties.services/.classpath b/plugins/views/properties/org.eclipse.papyrus.views.properties.services/.classpath new file mode 100755 index 00000000000..81fe078c20c --- /dev/null +++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.services/.classpath @@ -0,0 +1,7 @@ +<?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-17"/> + <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> + <classpathentry kind="src" path="src"/> + <classpathentry kind="output" path="bin"/> +</classpath> diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties.services/.project b/plugins/views/properties/org.eclipse.papyrus.views.properties.services/.project new file mode 100755 index 00000000000..964135fae81 --- /dev/null +++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.services/.project @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.views.properties.services</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.jdt.core.javabuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.pde.ManifestBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.pde.SchemaBuilder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + </natures> +</projectDescription> diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties.services/.settings/org.eclipse.core.resources.prefs b/plugins/views/properties/org.eclipse.papyrus.views.properties.services/.settings/org.eclipse.core.resources.prefs new file mode 100755 index 00000000000..896a9a53a53 --- /dev/null +++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.services/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +encoding/<project>=UTF-8
\ No newline at end of file diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties.services/.settings/org.eclipse.core.runtime.prefs b/plugins/views/properties/org.eclipse.papyrus.views.properties.services/.settings/org.eclipse.core.runtime.prefs new file mode 100755 index 00000000000..5a0ad22d2a7 --- /dev/null +++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.services/.settings/org.eclipse.core.runtime.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +line.separator=\n diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties.services/.settings/org.eclipse.jdt.core.prefs b/plugins/views/properties/org.eclipse.papyrus.views.properties.services/.settings/org.eclipse.jdt.core.prefs new file mode 100755 index 00000000000..a8cc7ef70ef --- /dev/null +++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.services/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,319 @@ +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=17 +org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve +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 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +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=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 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16 +org.eclipse.jdt.core.formatter.alignment_for_assignment=0 +org.eclipse.jdt.core.formatter.alignment_for_bitwise_operator=16 +org.eclipse.jdt.core.formatter.alignment_for_compact_if=16 +org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80 +org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0 +org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16 +org.eclipse.jdt.core.formatter.alignment_for_logical_operator=16 +org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0 +org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16 +org.eclipse.jdt.core.formatter.alignment_for_multiplicative_operator=16 +org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80 +org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16 +org.eclipse.jdt.core.formatter.alignment_for_string_concatenation=16 +org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16 +org.eclipse.jdt.core.formatter.blank_lines_after_imports=1 +org.eclipse.jdt.core.formatter.blank_lines_after_package=1 +org.eclipse.jdt.core.formatter.blank_lines_before_field=0 +org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0 +org.eclipse.jdt.core.formatter.blank_lines_before_imports=1 +org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1 +org.eclipse.jdt.core.formatter.blank_lines_before_method=1 +org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1 +org.eclipse.jdt.core.formatter.blank_lines_before_package=0 +org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1 +org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1 +org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line +org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false +org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false +org.eclipse.jdt.core.formatter.comment.format_block_comments=true +org.eclipse.jdt.core.formatter.comment.format_header=false +org.eclipse.jdt.core.formatter.comment.format_html=true +org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true +org.eclipse.jdt.core.formatter.comment.format_line_comments=true +org.eclipse.jdt.core.formatter.comment.format_source_code=true +org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true +org.eclipse.jdt.core.formatter.comment.indent_root_tags=true +org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert +org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert +org.eclipse.jdt.core.formatter.comment.line_length=260 +org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true +org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true +org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false +org.eclipse.jdt.core.formatter.compact_else_if=true +org.eclipse.jdt.core.formatter.continuation_indentation=2 +org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2 +org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off +org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on +org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false +org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true +org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true +org.eclipse.jdt.core.formatter.indent_empty_lines=false +org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true +org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true +org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true +org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false +org.eclipse.jdt.core.formatter.indentation.size=4 +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_after_additive_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert +org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_bitwise_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert +org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert +org.eclipse.jdt.core.formatter.insert_space_after_logical_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_multiplicative_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_relational_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert +org.eclipse.jdt.core.formatter.insert_space_after_shift_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_string_concatenation=insert +org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_additive_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert +org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_bitwise_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert +org.eclipse.jdt.core.formatter.insert_space_before_logical_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_multiplicative_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert +org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert +org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert +org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_relational_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_shift_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_string_concatenation=insert +org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.join_lines_in_comments=false +org.eclipse.jdt.core.formatter.join_wrapped_lines=false +org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false +org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false +org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false +org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false +org.eclipse.jdt.core.formatter.lineSplit=260 +org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false +org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false +org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0 +org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=5 +org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true +org.eclipse.jdt.core.formatter.tabulation.char=tab +org.eclipse.jdt.core.formatter.tabulation.size=4 +org.eclipse.jdt.core.formatter.use_on_off_tags=false +org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false +org.eclipse.jdt.core.formatter.wrap_before_additive_operator=true +org.eclipse.jdt.core.formatter.wrap_before_bitwise_operator=true +org.eclipse.jdt.core.formatter.wrap_before_logical_operator=true +org.eclipse.jdt.core.formatter.wrap_before_multiplicative_operator=true +org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true +org.eclipse.jdt.core.formatter.wrap_before_string_concatenation=true +org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties.services/.settings/org.eclipse.jdt.ui.prefs b/plugins/views/properties/org.eclipse.papyrus.views.properties.services/.settings/org.eclipse.jdt.ui.prefs new file mode 100755 index 00000000000..ba7542ef658 --- /dev/null +++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.services/.settings/org.eclipse.jdt.ui.prefs @@ -0,0 +1,127 @@ +cleanup.add_default_serial_version_id=true +cleanup.add_generated_serial_version_id=false +cleanup.add_missing_annotations=true +cleanup.add_missing_deprecated_annotations=true +cleanup.add_missing_methods=false +cleanup.add_missing_nls_tags=false +cleanup.add_missing_override_annotations=true +cleanup.add_missing_override_annotations_interface_methods=true +cleanup.add_serial_version_id=false +cleanup.always_use_blocks=true +cleanup.always_use_parentheses_in_expressions=false +cleanup.always_use_this_for_non_static_field_access=false +cleanup.always_use_this_for_non_static_method_access=false +cleanup.convert_functional_interfaces=false +cleanup.convert_to_enhanced_for_loop=false +cleanup.correct_indentation=false +cleanup.format_source_code=false +cleanup.format_source_code_changes_only=false +cleanup.insert_inferred_type_arguments=false +cleanup.make_local_variable_final=true +cleanup.make_parameters_final=false +cleanup.make_private_fields_final=true +cleanup.make_type_abstract_if_missing_method=false +cleanup.make_variable_declarations_final=false +cleanup.never_use_blocks=false +cleanup.never_use_parentheses_in_expressions=true +cleanup.organize_imports=false +cleanup.qualify_static_field_accesses_with_declaring_class=false +cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true +cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true +cleanup.qualify_static_member_accesses_with_declaring_class=true +cleanup.qualify_static_method_accesses_with_declaring_class=false +cleanup.remove_private_constructors=true +cleanup.remove_redundant_type_arguments=true +cleanup.remove_trailing_whitespaces=true +cleanup.remove_trailing_whitespaces_all=true +cleanup.remove_trailing_whitespaces_ignore_empty=false +cleanup.remove_unnecessary_casts=true +cleanup.remove_unnecessary_nls_tags=true +cleanup.remove_unused_imports=true +cleanup.remove_unused_local_variables=false +cleanup.remove_unused_private_fields=true +cleanup.remove_unused_private_members=false +cleanup.remove_unused_private_methods=true +cleanup.remove_unused_private_types=true +cleanup.sort_members=false +cleanup.sort_members_all=false +cleanup.use_anonymous_class_creation=false +cleanup.use_blocks=true +cleanup.use_blocks_only_for_return_and_throw=false +cleanup.use_lambda=true +cleanup.use_parentheses_in_expressions=false +cleanup.use_this_for_non_static_field_access=false +cleanup.use_this_for_non_static_field_access_only_if_necessary=true +cleanup.use_this_for_non_static_method_access=false +cleanup.use_this_for_non_static_method_access_only_if_necessary=true +cleanup.use_type_arguments=false +cleanup_profile=_Papyrus +cleanup_settings_version=2 +eclipse.preferences.version=1 +editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true +formatter_profile=_Papyrus +formatter_settings_version=12 +org.eclipse.jdt.ui.ignorelowercasenames=true +org.eclipse.jdt.ui.importorder=java;javax;org;com; +org.eclipse.jdt.ui.javadoc=true +org.eclipse.jdt.ui.ondemandthreshold=99 +org.eclipse.jdt.ui.staticondemandthreshold=99 +org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * @return the ${bare_field_name}\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n * @param ${param} the ${bare_field_name} to set\n */</template><template autoinsert\="false" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * Constructor.\n *\n * ${tags}\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*****************************************************************************\n * Copyright (c) ${year} CEA LIST and others.\n * \n * All rights reserved. This program and the accompanying materials\n * are made available under the terms of the Eclipse Public License 2.0\n * which accompanies this distribution, and is available at\n * http\://www.eclipse.org/legal/epl-2.0/\n *\n * SPDX-License-Identifier: EPL-2.0\n *\n * Contributors\:\n * CEA LIST - Initial API and implementation\n * \n *****************************************************************************/\n</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n * @author ${user}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\n * \n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\n * ${see_to_overridden}\n *\n * ${tags}\n */</template><template autoinsert\="false" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${see_to_target}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\n${package_declaration}\n\n${typecomment}\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates> +sp_cleanup.add_default_serial_version_id=true +sp_cleanup.add_generated_serial_version_id=false +sp_cleanup.add_missing_annotations=true +sp_cleanup.add_missing_deprecated_annotations=true +sp_cleanup.add_missing_methods=false +sp_cleanup.add_missing_nls_tags=false +sp_cleanup.add_missing_override_annotations=true +sp_cleanup.add_missing_override_annotations_interface_methods=true +sp_cleanup.add_serial_version_id=false +sp_cleanup.always_use_blocks=true +sp_cleanup.always_use_parentheses_in_expressions=false +sp_cleanup.always_use_this_for_non_static_field_access=false +sp_cleanup.always_use_this_for_non_static_method_access=false +sp_cleanup.convert_functional_interfaces=false +sp_cleanup.convert_to_enhanced_for_loop=false +sp_cleanup.correct_indentation=false +sp_cleanup.format_source_code=true +sp_cleanup.format_source_code_changes_only=false +sp_cleanup.insert_inferred_type_arguments=false +sp_cleanup.make_local_variable_final=true +sp_cleanup.make_parameters_final=false +sp_cleanup.make_private_fields_final=true +sp_cleanup.make_type_abstract_if_missing_method=false +sp_cleanup.make_variable_declarations_final=false +sp_cleanup.never_use_blocks=false +sp_cleanup.never_use_parentheses_in_expressions=true +sp_cleanup.on_save_use_additional_actions=true +sp_cleanup.organize_imports=true +sp_cleanup.qualify_static_field_accesses_with_declaring_class=false +sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true +sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true +sp_cleanup.qualify_static_member_accesses_with_declaring_class=false +sp_cleanup.qualify_static_method_accesses_with_declaring_class=false +sp_cleanup.remove_private_constructors=true +sp_cleanup.remove_redundant_modifiers=false +sp_cleanup.remove_redundant_type_arguments=true +sp_cleanup.remove_trailing_whitespaces=true +sp_cleanup.remove_trailing_whitespaces_all=true +sp_cleanup.remove_trailing_whitespaces_ignore_empty=false +sp_cleanup.remove_unnecessary_casts=true +sp_cleanup.remove_unnecessary_nls_tags=true +sp_cleanup.remove_unused_imports=true +sp_cleanup.remove_unused_local_variables=false +sp_cleanup.remove_unused_private_fields=true +sp_cleanup.remove_unused_private_members=false +sp_cleanup.remove_unused_private_methods=true +sp_cleanup.remove_unused_private_types=true +sp_cleanup.sort_members=false +sp_cleanup.sort_members_all=false +sp_cleanup.use_anonymous_class_creation=false +sp_cleanup.use_blocks=true +sp_cleanup.use_blocks_only_for_return_and_throw=false +sp_cleanup.use_lambda=true +sp_cleanup.use_parentheses_in_expressions=false +sp_cleanup.use_this_for_non_static_field_access=false +sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true +sp_cleanup.use_this_for_non_static_method_access=false +sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties.services/.settings/org.eclipse.pde.api.tools.prefs b/plugins/views/properties/org.eclipse.papyrus.views.properties.services/.settings/org.eclipse.pde.api.tools.prefs new file mode 100755 index 00000000000..b2260f87129 --- /dev/null +++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.services/.settings/org.eclipse.pde.api.tools.prefs @@ -0,0 +1,104 @@ +ANNOTATION_ELEMENT_TYPE_ADDED_FIELD=Error +ANNOTATION_ELEMENT_TYPE_ADDED_METHOD_WITHOUT_DEFAULT_VALUE=Error +ANNOTATION_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error +ANNOTATION_ELEMENT_TYPE_REMOVED_FIELD=Error +ANNOTATION_ELEMENT_TYPE_REMOVED_METHOD=Error +ANNOTATION_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error +API_COMPONENT_ELEMENT_TYPE_REMOVED_API_TYPE=Error +API_COMPONENT_ELEMENT_TYPE_REMOVED_REEXPORTED_API_TYPE=Warning +API_COMPONENT_ELEMENT_TYPE_REMOVED_REEXPORTED_TYPE=Warning +API_COMPONENT_ELEMENT_TYPE_REMOVED_TYPE=Error +API_USE_SCAN_FIELD_SEVERITY=Error +API_USE_SCAN_METHOD_SEVERITY=Error +API_USE_SCAN_TYPE_SEVERITY=Error +CLASS_ELEMENT_TYPE_ADDED_FIELD=Warning +CLASS_ELEMENT_TYPE_ADDED_METHOD=Error +CLASS_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error +CLASS_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error +CLASS_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error +CLASS_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error +CLASS_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error +CLASS_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error +CLASS_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error +CLASS_ELEMENT_TYPE_REMOVED_CONSTRUCTOR=Error +CLASS_ELEMENT_TYPE_REMOVED_FIELD=Error +CLASS_ELEMENT_TYPE_REMOVED_METHOD=Error +CLASS_ELEMENT_TYPE_REMOVED_SUPERCLASS=Error +CLASS_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error +CLASS_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error +CONSTRUCTOR_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error +CONSTRUCTOR_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error +CONSTRUCTOR_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error +CONSTRUCTOR_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error +ENUM_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error +ENUM_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error +ENUM_ELEMENT_TYPE_REMOVED_ENUM_CONSTANT=Error +ENUM_ELEMENT_TYPE_REMOVED_FIELD=Error +ENUM_ELEMENT_TYPE_REMOVED_METHOD=Error +ENUM_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error +FIELD_ELEMENT_TYPE_ADDED_VALUE=Warning +FIELD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error +FIELD_ELEMENT_TYPE_CHANGED_FINAL_TO_NON_FINAL_STATIC_CONSTANT=Error +FIELD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error +FIELD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error +FIELD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error +FIELD_ELEMENT_TYPE_CHANGED_TYPE=Error +FIELD_ELEMENT_TYPE_CHANGED_VALUE=Warning +FIELD_ELEMENT_TYPE_REMOVED_TYPE_ARGUMENT=Error +FIELD_ELEMENT_TYPE_REMOVED_VALUE=Error +ILLEGAL_EXTEND=Warning +ILLEGAL_IMPLEMENT=Warning +ILLEGAL_INSTANTIATE=Warning +ILLEGAL_OVERRIDE=Warning +ILLEGAL_REFERENCE=Warning +INTERFACE_ELEMENT_TYPE_ADDED_DEFAULT_METHOD=Warning +INTERFACE_ELEMENT_TYPE_ADDED_FIELD=Ignore +INTERFACE_ELEMENT_TYPE_ADDED_METHOD=Error +INTERFACE_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error +INTERFACE_ELEMENT_TYPE_ADDED_SUPER_INTERFACE_WITH_METHODS=Error +INTERFACE_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error +INTERFACE_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error +INTERFACE_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error +INTERFACE_ELEMENT_TYPE_REMOVED_FIELD=Error +INTERFACE_ELEMENT_TYPE_REMOVED_METHOD=Error +INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error +INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error +INVALID_ANNOTATION=Ignore +INVALID_JAVADOC_TAG=Ignore +INVALID_REFERENCE_IN_SYSTEM_LIBRARIES=Ignore +LEAK_EXTEND=Warning +LEAK_FIELD_DECL=Warning +LEAK_IMPLEMENT=Warning +LEAK_METHOD_PARAM=Warning +LEAK_METHOD_RETURN_TYPE=Warning +METHOD_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error +METHOD_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error +METHOD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error +METHOD_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error +METHOD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error +METHOD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error +METHOD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error +METHOD_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error +METHOD_ELEMENT_TYPE_REMOVED_ANNOTATION_DEFAULT_VALUE=Error +METHOD_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error +MISSING_EE_DESCRIPTIONS=Error +TYPE_PARAMETER_ELEMENT_TYPE_ADDED_CLASS_BOUND=Error +TYPE_PARAMETER_ELEMENT_TYPE_ADDED_INTERFACE_BOUND=Error +TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_CLASS_BOUND=Error +TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_INTERFACE_BOUND=Error +TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_CLASS_BOUND=Error +TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_INTERFACE_BOUND=Error +UNUSED_PROBLEM_FILTERS=Warning +automatically_removed_unused_problem_filters=Enabled +changed_execution_env=Warning +eclipse.preferences.version=1 +incompatible_api_component_version=Warning +incompatible_api_component_version_include_major_without_breaking_change=Disabled +incompatible_api_component_version_include_minor_without_api_change=Disabled +incompatible_api_component_version_report_major_without_breaking_change=Error +incompatible_api_component_version_report_minor_without_api_change=Error +invalid_since_tag_version=Error +malformed_since_tag=Error +missing_since_tag=Error +report_api_breakage_when_major_version_incremented=Disabled +report_resolution_errors_api_component=Warning diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties.services/META-INF/MANIFEST.MF b/plugins/views/properties/org.eclipse.papyrus.views.properties.services/META-INF/MANIFEST.MF new file mode 100755 index 00000000000..ceeca4b1b8f --- /dev/null +++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.services/META-INF/MANIFEST.MF @@ -0,0 +1,16 @@ +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-Name: %pluginName +Bundle-SymbolicName: org.eclipse.papyrus.views.properties.services;singleton:=true +Bundle-Version: 1.0.0.qualifier +Bundle-Activator: org.eclipse.papyrus.views.properties.services.Activator +Bundle-Vendor: %providerName +Require-Bundle: org.apache.logging.log4j;bundle-version="[2.17.0,3.0.0)", + org.eclipse.core.runtime;bundle-version="[3.25.0,4.0.0)", + org.eclipse.papyrus.infra.tools;bundle-version="[4.2.0,5.0.0)", + org.eclipse.ui;bundle-version="[3.201.0,4.0.0)", + org.eclipse.ui.views;bundle-version="[3.11.0,4.0.0)" +Bundle-RequiredExecutionEnvironment: JavaSE-17 +Automatic-Module-Name: org.eclipse.papyrus.views.properties.services +Bundle-ActivationPolicy: lazy +Export-Package: org.eclipse.papyrus.views.properties.services diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties.services/OSGI-INF/l10n/bundle.properties b/plugins/views/properties/org.eclipse.papyrus.views.properties.services/OSGI-INF/l10n/bundle.properties new file mode 100755 index 00000000000..de95a7bcb56 --- /dev/null +++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.services/OSGI-INF/l10n/bundle.properties @@ -0,0 +1,4 @@ +#Properties file for org.eclipse.papyrus.views.properties.services +page.name = Properties UI +providerName = Eclipse Modeling Project +pluginName = Papyrus - Views Properties Services
\ No newline at end of file diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties.services/about.html b/plugins/views/properties/org.eclipse.papyrus.views.properties.services/about.html new file mode 100755 index 00000000000..997c5a2284d --- /dev/null +++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.services/about.html @@ -0,0 +1,28 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml"> +<head> +<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/> +<title>About</title> +</head> +<body lang="EN-US"> +<h2>About This Content</h2> + +<p>November 30, 2017</p> +<h3>License</h3> + +<p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise +indicated below, the Content is provided to you under the terms and conditions of the +Eclipse Public License Version 2.0 ("EPL"). A copy of the EPL is available +at <a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>. +For purposes of the EPL, "Program" will mean the Content.</p> + +<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is +being redistributed by another party ("Redistributor") and different terms and conditions may +apply to your use of any object code in the Content. Check the Redistributor's license that was +provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise +indicated below, the terms and conditions of the EPL still apply to any source code in the Content +and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p> + +</body> +</html> diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties.services/build.properties b/plugins/views/properties/org.eclipse.papyrus.views.properties.services/build.properties new file mode 100755 index 00000000000..c1711a9ebcf --- /dev/null +++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.services/build.properties @@ -0,0 +1,8 @@ +source.. = src/ +output.. = bin/ +bin.includes = META-INF/,\ + .,\ + plugin.xml,\ + about.html,\ + OSGI-INF/l10n/bundle.properties +src.includes = about.html diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties.services/plugin.xml b/plugins/views/properties/org.eclipse.papyrus.views.properties.services/plugin.xml new file mode 100755 index 00000000000..2aeab6de867 --- /dev/null +++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.services/plugin.xml @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="UTF-8"?> +<?eclipse version="3.4"?> +<plugin> + <extension + point="org.eclipse.ui.preferencePages"> + <page + category="org.eclipse.papyrus.infra.core.sasheditor.preferences.generalcategory" + class="org.eclipse.papyrus.views.properties.services.internal.preferences.PropertiesRenderingPreferencePage" + id="org.eclipse.papyrus.views.properties.services.preferences" + name="%page.name"> + </page> + </extension> + +</plugin> diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties.services/pom.xml b/plugins/views/properties/org.eclipse.papyrus.views.properties.services/pom.xml new file mode 100755 index 00000000000..26ccedf3aea --- /dev/null +++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.services/pom.xml @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + <parent> + <artifactId>org.eclipse.papyrus.views-properties</artifactId> + <groupId>org.eclipse.papyrus</groupId> + <version>0.0.1-SNAPSHOT</version> + </parent> + <artifactId>org.eclipse.papyrus.views.properties.services</artifactId> + <version>1.0.0-SNAPSHOT</version> + <packaging>eclipse-plugin</packaging> +</project>
\ No newline at end of file diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties.services/src/org/eclipse/papyrus/views/properties/services/Activator.java b/plugins/views/properties/org.eclipse.papyrus.views.properties.services/src/org/eclipse/papyrus/views/properties/services/Activator.java new file mode 100755 index 00000000000..957033acdfc --- /dev/null +++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.services/src/org/eclipse/papyrus/views/properties/services/Activator.java @@ -0,0 +1,86 @@ +/***************************************************************************** + * 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.views.properties.services; + +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.eclipse.papyrus.views.properties.services.internal.PropertySheetPageProviderService; +import org.eclipse.ui.plugin.AbstractUIPlugin; +import org.osgi.framework.BundleContext; +import org.osgi.framework.ServiceReference; + +/** + * The activator class controls the plug-in life cycle + */ +public class Activator extends AbstractUIPlugin { + + // The plug-in ID + public static final String PLUGIN_ID = "org.eclipse.papyrus.views.properties.services"; //$NON-NLS-1$ + + // The shared instance + private static Activator plugin; + + /** + * the Logger to use in this plugin + */ + public static final Logger log = LogManager.getLogger(PLUGIN_ID); + + /** + * The constructor + */ + public Activator() { + } + + /** + * + * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext) + * + * @param context + * @throws Exception + */ + @Override + public void start(BundleContext context) throws Exception { + super.start(context); + plugin = this; + context.registerService(IPropertySheetPageProviderService.class, new PropertySheetPageProviderService(), null); + } + + /** + * + * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext) + * + * @param context + * @throws Exception + */ + @Override + public void stop(BundleContext context) throws Exception { + plugin = null; + final ServiceReference<IPropertySheetPageProviderService> serviceReference = context.getServiceReference(IPropertySheetPageProviderService.class); + if (serviceReference != null) { + context.ungetService(serviceReference); + } + super.stop(context); + } + + /** + * Returns the shared instance + * + * @return the shared instance + */ + public static Activator getDefault() { + return plugin; + } + +} diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties.services/src/org/eclipse/papyrus/views/properties/services/IPropertySheetPageProvider.java b/plugins/views/properties/org.eclipse.papyrus.views.properties.services/src/org/eclipse/papyrus/views/properties/services/IPropertySheetPageProvider.java new file mode 100755 index 00000000000..3cac05770cf --- /dev/null +++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.services/src/org/eclipse/papyrus/views/properties/services/IPropertySheetPageProvider.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.views.properties.services; + +import org.eclipse.ui.views.properties.IPropertySheetPage; + +/** + * + * Common interface to implement to register {@link IPropertySheetPage} contribution + * + */ +public interface IPropertySheetPageProvider { + + /** + * + * @return + * the ID of the used renderer + */ + public String getRendererID(); + + /** + * + * @param realContributor + * @param viewID + * @return + * <code>true</code> if the contribution provides a {@link IPropertySheetPage} for the given parameter + */ + public boolean provides(final Object realContributor, final String viewID); + + /** + * + * @param realContributor + * @param viewID + * @return + * the created {@link IPropertySheetPage} + */ + public IPropertySheetPage createPropertyPage(final Object realContributor, final String viewID); + + /** + * This method is used to dispose {@link IPropertySheetPage} + * + * @param propertySheetPage + * the page to dispose + */ + public void dispose(final IPropertySheetPage propertySheetPage); + +} + + diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties.services/src/org/eclipse/papyrus/views/properties/services/IPropertySheetPageProviderService.java b/plugins/views/properties/org.eclipse.papyrus.views.properties.services/src/org/eclipse/papyrus/views/properties/services/IPropertySheetPageProviderService.java new file mode 100755 index 00000000000..a0c3f8daaab --- /dev/null +++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.services/src/org/eclipse/papyrus/views/properties/services/IPropertySheetPageProviderService.java @@ -0,0 +1,73 @@ +/***************************************************************************** + * 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.views.properties.services; + +import java.util.List; + +import org.eclipse.ui.views.properties.IPropertySheetPage; + +/** + * + * Service used to contribute Property Pages associated to a renderer + * + */ +public interface IPropertySheetPageProviderService { + + /** + * This method allows to register a property page provider + * + * @param provider + * the property page provider + */ + void registerPropertySheetPageProvider(final IPropertySheetPageProvider provider); + + /** + * This method creates the property sheet page to use + * + * @param realContributor + * the caller wanting a Property View (the Papyrus editor, or the ModelExplorer for example + * @param viewID + * the id of the caller + * @return + * the property page to use, or <code>null</code> if not found + */ + IPropertySheetPage createPropertySheetPage(final Object realContributor, final String viewID); + + /** + * This method returns the selected renderer + * + * @return + * the string representing the selected renderer to use + */ + String getSelectedRenderer(); + + /** + * This method returns the available renderer + * + * @return + * the list of the available renderer + */ + List<String> getAvailableRenderers(); + + + /** + * This method dispose the page + * + * @param page + * the page to dispose + */ + void dispose(IPropertySheetPage page); + +} diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties.services/src/org/eclipse/papyrus/views/properties/services/PropertyRendererPreferencesConstants.java b/plugins/views/properties/org.eclipse.papyrus.views.properties.services/src/org/eclipse/papyrus/views/properties/services/PropertyRendererPreferencesConstants.java new file mode 100755 index 00000000000..dc122fd191f --- /dev/null +++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.services/src/org/eclipse/papyrus/views/properties/services/PropertyRendererPreferencesConstants.java @@ -0,0 +1,37 @@ +/***************************************************************************** + * 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.views.properties.services; + +/** + * + * Preferences Constants for the plugin + * + */ +public class PropertyRendererPreferencesConstants { + + /** + * + * Constructor. + * + */ + private PropertyRendererPreferencesConstants() { + // to prevent instantiation + } + + /** + * The string used to save the preferred renderer + */ + public static final String PREFERRED_RENDERER = "PREFERRED_RENDERER"; //$NON-NLS-1$ +} diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties.services/src/org/eclipse/papyrus/views/properties/services/internal/PropertySheetPageProviderService.java b/plugins/views/properties/org.eclipse.papyrus.views.properties.services/src/org/eclipse/papyrus/views/properties/services/internal/PropertySheetPageProviderService.java new file mode 100755 index 00000000000..4145e37a0fd --- /dev/null +++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.services/src/org/eclipse/papyrus/views/properties/services/internal/PropertySheetPageProviderService.java @@ -0,0 +1,305 @@ +/***************************************************************************** + * 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.views.properties.services.internal; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; + +import org.eclipse.core.runtime.NullProgressMonitor; +import org.eclipse.papyrus.views.properties.services.Activator; +import org.eclipse.papyrus.views.properties.services.IPropertySheetPageProvider; +import org.eclipse.papyrus.views.properties.services.IPropertySheetPageProviderService; +import org.eclipse.papyrus.views.properties.services.PropertyRendererPreferencesConstants; +import org.eclipse.swt.widgets.Display; +import org.eclipse.ui.IEditorPart; +import org.eclipse.ui.IEditorReference; +import org.eclipse.ui.IViewReference; +import org.eclipse.ui.IWorkbench; +import org.eclipse.ui.IWorkbenchPage; +import org.eclipse.ui.IWorkbenchWindow; +import org.eclipse.ui.PartInitException; +import org.eclipse.ui.PlatformUI; +import org.eclipse.ui.views.properties.IPropertySheetPage; + +/** + * + * This service is used to get the PropertySheetPage to use according to the user preferences + * + */ +public class PropertySheetPageProviderService implements IPropertySheetPageProviderService { + + /** + * the selected renderer to use + */ + private String selectedRenderedID = null; + + /** + * Map of the registered {@link IPropertySheetPageProvider} + */ + private Map<String, Collection<IPropertySheetPageProvider>> map = new HashMap<>(); + + /** + * ID of Eclipse Property Sheet View + */ + private static final String PROPERTY_SHEET_ID = "org.eclipse.ui.views.PropertySheet"; //$NON-NLS-1$ + + private static final String PAPYRUS_EDITOR_ID = "org.eclipse.papyrus.infra.core.papyrusEditor";//$NON-NLS-1$ // dependency is not possible here + + /** + * the list of renderers not found (so called before the end of the registration of the renderer) + */ + private Collection<String> renderersRequiringReload = new ArrayList<>(); + + /** + * map of provided + */ + private Map<IPropertySheetPage, IPropertySheetPageProvider> mapOfProvidedSheetPage = new HashMap<>(); + + /** + * @Override + * @see org.eclipse.papyrus.views.properties.services.IPropertySheetPageProviderService#createPropertySheetPage(java.lang.Object, java.lang.String) + * + * @param realContributor + * @param viewID + * @return + */ + @Override + public IPropertySheetPage createPropertySheetPage(final Object realContributor, final String viewID) { + final String selectedRender = getSelectedRenderer(); + IPropertySheetPage returnedPage = null; + // 1. look for the selected rendered + if (selectedRender != null) { + returnedPage = createPropertySheetPage(realContributor, viewID, selectedRender); + } + + // 2. check if we found the wanted renderer + if (returnedPage == null) { + // as we don't found the required renderer with keep it for a future reload + this.renderersRequiringReload.add(selectedRender); + } + + // 3. use the first renderer as default one when the wanted one is not found + if (returnedPage == null) { + final Iterator<String> iter = getAvailableRenderers().iterator(); + + while (returnedPage == null && iter.hasNext()) { + returnedPage = createPropertySheetPage(realContributor, viewID, iter.next()); + } + } + + return returnedPage; + } + + /** + * + * * @param realContributor + * the caller wanting a Property View (the Papyrus editor, or the ModelExplorer for example + * + * @param viewID + * the id of the caller + * @param rendererID + * the renderer to use + * @return + * the created {@link IPropertySheetPage} or <code>null</code> when there is no provider + */ + private IPropertySheetPage createPropertySheetPage(final Object realContributor, final String viewID, final String rendererID) { + IPropertySheetPage returnedPage = null; + final Collection<IPropertySheetPageProvider> values = this.map.get(rendererID); + if (values != null) {// the preferred rendering has not yet been loaded + final Iterator<IPropertySheetPageProvider> iter = values.iterator(); + + while (iter.hasNext() && returnedPage == null) { + final IPropertySheetPageProvider current = iter.next(); + if (current.provides(realContributor, viewID)) { + returnedPage = current.createPropertyPage(realContributor, viewID); + // save the provider and the provided page (for dispose usage) + this.mapOfProvidedSheetPage.put(returnedPage, current); + } + } + } + return returnedPage; + } + + + /** + * + * @see org.eclipse.papyrus.views.properties.services.IPropertySheetPageProviderService#registerPropertySheetPageProvider(org.eclipse.papyrus.views.properties.services.IPropertySheetPageProvider) + * + * @param provider + */ + @Override + public void registerPropertySheetPageProvider(final IPropertySheetPageProvider provider) { + // 1. register the new provider + final String renderer = provider.getRendererID(); + Collection<IPropertySheetPageProvider> coll = this.map.get(renderer); + if (coll == null) { + coll = new ArrayList<>(); + this.map.put(renderer, coll); + } + coll.add(provider); + + if (this.renderersRequiringReload.contains(renderer)) { + // if we are here, the property view has already been initialized, but the wanted was not found during the previous call + // that's why we reload the property view! + reloadPropertyView(); + } + } + + /** + * Reload the Property View + */ + private void reloadPropertyView() { + // at this step, Eclipse probably doesn't yet finished to load, that's why we do an asynch exec + // this runnable is in charge to hide the property view and to reopen it + Display.getDefault().asyncExec(new Runnable() { + + @Override + public void run() { + // 1. find property view + final IWorkbenchPage wp = getActivePage(); + final IViewReference properties = getPropertyView(wp); + + if (properties != null) { + + // 2. find all Papyrus editor (we assume only Papyrus (Papyrus-Sirius) is concerned by the save problem due to a reload + for (final IEditorReference ref : getAllPapyrusEditors(wp)) { + final IEditorPart p = ref.getEditor(false); + // p can be null when there are several Papyrus CoreMultiDiagramEditors opened in the same time in Eclipse. + // In this case, when we reopen Eclipse, only the first one is really loaded, + // the others are just visible as tab, but they are not really created, consequently, 'p' is null for these editors. + if (p != null && p.isDirty()) { + // we force the save + p.doSave(new NullProgressMonitor()); + } + } + // 3. we hide the property view + wp.hideView(properties); + try { + wp.showView(PROPERTY_SHEET_ID); + } catch (PartInitException e) { + Activator.log.error(e.getLocalizedMessage(), e); + } + } + + } + }); + } + + + + /** + * + * @return + * the activePage or <code>null</code> when not found + */ + private IWorkbenchPage getActivePage() { + final IWorkbench wb = PlatformUI.getWorkbench(); + if (wb != null) { + final IWorkbenchWindow activeWorkbench = wb.getActiveWorkbenchWindow(); + if (activeWorkbench != null) { + return activeWorkbench.getActivePage(); + + } + } + return null; + } + + /** + * + * @param wp + * the workbench page + * @return + * the {@link IViewReference} representing the Pro + */ + private IViewReference getPropertyView(final IWorkbenchPage wp) { + for (final IViewReference current : wp.getViewReferences()) { + if (PROPERTY_SHEET_ID.equals(current.getId())) { + return current; + } + } + return null; + } + + /** + * + * @param wp + * a workbench page + * @return + * all {@link IEditorReference} representing a Papyrus Editor + */ + private Collection<IEditorReference> getAllPapyrusEditors(final IWorkbenchPage wp) { + final Collection<IEditorReference> papyrus = new ArrayList<>(); + for (final IEditorReference current : wp.getEditorReferences()) { + if (PAPYRUS_EDITOR_ID.equals(current.getId())) { + papyrus.add(current); + } + } + return papyrus; + } + + /** + * + * @see org.eclipse.papyrus.views.properties.services.IPropertySheetPageProviderService#getSelectedRenderer() + * If the user already defined a preference, we return the prefered renderer. If not, we sort the existing renderer by alphabetic order and we return the first one + * + * @return + * the renderer to use or <code>null</code> if there is no renderer + */ + @Override + public String getSelectedRenderer() { + final String prefered = Activator.getDefault().getPreferenceStore().getString(PropertyRendererPreferencesConstants.PREFERRED_RENDERER); + if (prefered != null && !prefered.isEmpty()) { + return prefered; + } else if (this.selectedRenderedID == null && this.map.keySet().size() > 0) { + final List<String> keys = new ArrayList<>(this.map.keySet()); + Collections.sort(keys); + this.selectedRenderedID = keys.get(0); + Activator.getDefault().getPreferenceStore().setDefault(PropertyRendererPreferencesConstants.PREFERRED_RENDERER, this.selectedRenderedID); + } + return this.selectedRenderedID; + } + + /** + * + * @see org.eclipse.papyrus.views.properties.services.IPropertySheetPageProviderService#getAvailableRenderers() + * + * @return + */ + @Override + public List<String> getAvailableRenderers() { + final List<String> keys = new ArrayList<>(this.map.keySet()); + Collections.sort(keys); + return keys; + } + + /** + * @see org.eclipse.papyrus.views.properties.services.IPropertySheetPageProviderService#dispose(org.eclipse.ui.views.properties.IPropertySheetPage) + * + * @param page + */ + @Override + public void dispose(final IPropertySheetPage page) { + final IPropertySheetPageProvider current = this.mapOfProvidedSheetPage.remove(page); + if (current != null) { + current.dispose(page); + } + } + +} diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties.services/src/org/eclipse/papyrus/views/properties/services/internal/messages/Messages.java b/plugins/views/properties/org.eclipse.papyrus.views.properties.services/src/org/eclipse/papyrus/views/properties/services/internal/messages/Messages.java new file mode 100755 index 00000000000..92516e33ef5 --- /dev/null +++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.services/src/org/eclipse/papyrus/views/properties/services/internal/messages/Messages.java @@ -0,0 +1,33 @@ +/***************************************************************************** + * 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.views.properties.services.internal.messages; + +import org.eclipse.osgi.util.NLS; + +/** + * + */ +public class Messages extends NLS { + private static final String BUNDLE_NAME = Messages.class.getPackageName() + ".messages"; //$NON-NLS-1$ + public static String SelectTheRendererToUse; + static { + // initialize resource bundle + NLS.initializeMessages(BUNDLE_NAME, Messages.class); + } + + private Messages() { + } +} diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties.services/src/org/eclipse/papyrus/views/properties/services/internal/messages/messages.properties b/plugins/views/properties/org.eclipse.papyrus.views.properties.services/src/org/eclipse/papyrus/views/properties/services/internal/messages/messages.properties new file mode 100755 index 00000000000..af28065b1a4 --- /dev/null +++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.services/src/org/eclipse/papyrus/views/properties/services/internal/messages/messages.properties @@ -0,0 +1 @@ +SelectTheRendererToUse=Selet the renderer to use for Properties Views diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties.services/src/org/eclipse/papyrus/views/properties/services/internal/preferences/PropertiesRenderingPreferencePage.java b/plugins/views/properties/org.eclipse.papyrus.views.properties.services/src/org/eclipse/papyrus/views/properties/services/internal/preferences/PropertiesRenderingPreferencePage.java new file mode 100755 index 00000000000..4d587b7ab1f --- /dev/null +++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.services/src/org/eclipse/papyrus/views/properties/services/internal/preferences/PropertiesRenderingPreferencePage.java @@ -0,0 +1,92 @@ +/***************************************************************************** + * 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.views.properties.services.internal.preferences; + +import java.util.Collections; +import java.util.List; + +import org.eclipse.jface.preference.FieldEditorPreferencePage; +import org.eclipse.jface.preference.RadioGroupFieldEditor; +import org.eclipse.papyrus.views.properties.services.Activator; +import org.eclipse.papyrus.views.properties.services.IPropertySheetPageProviderService; +import org.eclipse.papyrus.views.properties.services.PropertyRendererPreferencesConstants; +import org.eclipse.papyrus.views.properties.services.internal.messages.Messages; +import org.eclipse.ui.IWorkbench; +import org.eclipse.ui.IWorkbenchPreferencePage; +import org.osgi.framework.BundleContext; +import org.osgi.framework.ServiceReference; + +/** + * + * The preference page used to select the renderer to use + * + */ +public class PropertiesRenderingPreferencePage extends FieldEditorPreferencePage implements IWorkbenchPreferencePage { + + /** + * The radio group used to select the renderer + */ + private RadioGroupFieldEditor radioGroupFieldEditor; + + /** + * + * @see org.eclipse.ui.IWorkbenchPreferencePage#init(org.eclipse.ui.IWorkbench) + * + * @param workbench + */ + @Override + public void init(IWorkbench workbench) { + setPreferenceStore(Activator.getDefault().getPreferenceStore()); + } + + /** + * + * @see org.eclipse.jface.preference.FieldEditorPreferencePage#createFieldEditors() + * + */ + @Override + protected void createFieldEditors() { + List<String> renderers = getRenderers(); + String[][] array = new String[renderers.size()][2]; + + int i = 0; + for (String delegate : renderers) { + array[i][0] = delegate; + array[i][1] = delegate; + i++; + } + + this.radioGroupFieldEditor = new RadioGroupFieldEditor(PropertyRendererPreferencesConstants.PREFERRED_RENDERER, Messages.SelectTheRendererToUse, 1, array, getFieldEditorParent()); + addField(this.radioGroupFieldEditor); + } + + /** + * + * @return + */ + private List<String> getRenderers() { + final BundleContext bundleContext = Activator.getDefault().getBundle().getBundleContext(); + final ServiceReference<IPropertySheetPageProviderService> servreg = Activator.getDefault().getBundle().getBundleContext().getServiceReference(IPropertySheetPageProviderService.class); + + if (servreg != null) { + final IPropertySheetPageProviderService provider = bundleContext.getService(servreg); + if (provider != null) { + return provider.getAvailableRenderers(); + } + } + return Collections.emptyList(); + } + +} diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/.classpath b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/.classpath index 8a70e54eb76..561cf8205d8 100644 --- a/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/.classpath +++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/.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 exported="true" kind="lib" path="bin" sourcepath="bin"/> diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/.settings/org.eclipse.jdt.core.prefs b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/.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/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/META-INF/MANIFEST.MF b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/META-INF/MANIFEST.MF index ddfe74355ae..10c891d9e90 100755 --- a/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/META-INF/MANIFEST.MF +++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/META-INF/MANIFEST.MF @@ -40,6 +40,6 @@ Bundle-Activator: org.eclipse.papyrus.views.properties.toolsmiths.Activator Bundle-ManifestVersion: 2 Bundle-Description: %pluginDescription Bundle-SymbolicName: org.eclipse.papyrus.views.properties.toolsmiths;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="[32.0.0, 33.0.0)" Automatic-Module-Name: org.eclipse.papyrus.views.properties.toolsmiths diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties/.classpath b/plugins/views/properties/org.eclipse.papyrus.views.properties/.classpath index bb642933501..f574c0cbd4d 100644 --- a/plugins/views/properties/org.eclipse.papyrus.views.properties/.classpath +++ b/plugins/views/properties/org.eclipse.papyrus.views.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/views/properties/org.eclipse.papyrus.views.properties/.settings/org.eclipse.jdt.core.prefs b/plugins/views/properties/org.eclipse.papyrus.views.properties/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/views/properties/org.eclipse.papyrus.views.properties/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/views/properties/org.eclipse.papyrus.views.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/views/properties/org.eclipse.papyrus.views.properties/META-INF/MANIFEST.MF b/plugins/views/properties/org.eclipse.papyrus.views.properties/META-INF/MANIFEST.MF index 6eb4087a7ca..ab367960b45 100644 --- a/plugins/views/properties/org.eclipse.papyrus.views.properties/META-INF/MANIFEST.MF +++ b/plugins/views/properties/org.eclipse.papyrus.views.properties/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.draw2d;bundle-version="[3.10.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/views/properties/pom.xml b/plugins/views/properties/pom.xml index 75ef5b7871b..8c69063b2a4 100644 --- a/plugins/views/properties/pom.xml +++ b/plugins/views/properties/pom.xml @@ -17,6 +17,7 @@ <modules> <module>org.eclipse.papyrus.views.properties</module> <module>org.eclipse.papyrus.views.properties.model.xwt</module> + <module>org.eclipse.papyrus.views.properties.services</module> </modules> </project> diff --git a/plugins/views/references/org.eclipse.papyrus.views.references/.classpath b/plugins/views/references/org.eclipse.papyrus.views.references/.classpath index e801ebfb468..81fe078c20c 100644 --- a/plugins/views/references/org.eclipse.papyrus.views.references/.classpath +++ b/plugins/views/references/org.eclipse.papyrus.views.references/.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/views/references/org.eclipse.papyrus.views.references/.settings/org.eclipse.jdt.core.prefs b/plugins/views/references/org.eclipse.papyrus.views.references/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/views/references/org.eclipse.papyrus.views.references/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/views/references/org.eclipse.papyrus.views.references/.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/views/references/org.eclipse.papyrus.views.references/META-INF/MANIFEST.MF b/plugins/views/references/org.eclipse.papyrus.views.references/META-INF/MANIFEST.MF index 2af8ebd3f46..7be7474cef4 100644 --- a/plugins/views/references/org.eclipse.papyrus.views.references/META-INF/MANIFEST.MF +++ b/plugins/views/references/org.eclipse.papyrus.views.references/META-INF/MANIFEST.MF @@ -13,7 +13,7 @@ Require-Bundle: org.eclipse.gmf.runtime.emf.type.core;bundle-version="[1.9.0,2.0 org.eclipse.papyrus.infra.ui;bundle-version="[3.0.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-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-ActivationPolicy: lazy Bundle-Vendor: %Bundle-Vendor Bundle-Description: %pluginDescription diff --git a/plugins/views/validation/org.eclipse.papyrus.views.validation/.classpath b/plugins/views/validation/org.eclipse.papyrus.views.validation/.classpath index e801ebfb468..81fe078c20c 100644 --- a/plugins/views/validation/org.eclipse.papyrus.views.validation/.classpath +++ b/plugins/views/validation/org.eclipse.papyrus.views.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/views/validation/org.eclipse.papyrus.views.validation/.settings/org.eclipse.jdt.core.prefs b/plugins/views/validation/org.eclipse.papyrus.views.validation/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/views/validation/org.eclipse.papyrus.views.validation/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/views/validation/org.eclipse.papyrus.views.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/views/validation/org.eclipse.papyrus.views.validation/META-INF/MANIFEST.MF b/plugins/views/validation/org.eclipse.papyrus.views.validation/META-INF/MANIFEST.MF index f32c3b67fb3..cac8186c690 100644 --- a/plugins/views/validation/org.eclipse.papyrus.views.validation/META-INF/MANIFEST.MF +++ b/plugins/views/validation/org.eclipse.papyrus.views.validation/META-INF/MANIFEST.MF @@ -22,7 +22,7 @@ Bundle-Localization: plugin Bundle-ManifestVersion: 2 Bundle-Activator: org.eclipse.papyrus.views.validation.internal.Activator Bundle-SymbolicName: org.eclipse.papyrus.views.validation;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="[32.0.0, 33.0.0)", + com.google.common.collect;version="[32.0.0, 33.0.0)" Automatic-Module-Name: org.eclipse.papyrus.views.validation diff --git a/releng/main/pom.xml b/releng/main/pom.xml index ae223c897f2..972c982fb90 100755 --- a/releng/main/pom.xml +++ b/releng/main/pom.xml @@ -14,8 +14,8 @@ <properties> <!-- https://repo.maven.apache.org/maven2/ --> - <mojo.buildhelper.version>3.2.0</mojo.buildhelper.version> - <mylyn.wikitext.version>3.0.38</mylyn.wikitext.version> + <mojo.buildhelper.version>3.4.0</mojo.buildhelper.version> + <mylyn.wikitext.version>3.0.42</mylyn.wikitext.version> <target.platform>org.eclipse.papyrus.main.targetplatform</target.platform> </properties> diff --git a/releng/main/site/category.xml b/releng/main/site/category.xml index 0fef2bc4cc0..b72152fc08f 100644 --- a/releng/main/site/category.xml +++ b/releng/main/site/category.xml @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> <site> - <feature url="features/org.eclipse.papyrus.sdk.feature_6.2.0.qualifier.jar" id="org.eclipse.papyrus.sdk.feature" version="6.2.0.qualifier"> + <feature url="features/org.eclipse.papyrus.sdk.feature_6.6.0.qualifier.jar" id="org.eclipse.papyrus.sdk.feature" version="6.6.0.qualifier"> <category name="org.eclipse.papyrus.category"/> </feature> - <feature url="features/org.eclipse.papyrus.sdk.feature.source_6.2.0.qualifier.jar" id="org.eclipse.papyrus.sdk.feature.source" version="6.2.0.qualifier"> + <feature url="features/org.eclipse.papyrus.sdk.feature.source_6.6.0.qualifier.jar" id="org.eclipse.papyrus.sdk.feature.source" version="6.6.0.qualifier"> <category name="org.eclipse.papyrus.category"/> </feature> <feature url="features/org.eclipse.papyrus.user.examples.feature_0.0.3.qualifier.jar" id="org.eclipse.papyrus.user.examples.feature" version="0.0.3.qualifier"> @@ -22,6 +22,10 @@ Papyrus User Examples offers a set of plugins dedicated to gather examples of Papyrus usage. </description> </category-def> - <repository-reference location="https://download.eclipse.org/tools/orbit/downloads/drops/R20220302172233/repository/" enabled="true" /> - <repository-reference location="https://download.eclipse.org/xwt/milestones-1.7.0/1.7.0-S/" enabled="true" /> + <repository-reference location="https://download.eclipse.org/tools/orbit/downloads/drops/R20230531010532/repository/" enabled="true" /> + <repository-reference location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2023-12/" enabled="true" /> + <repository-reference location="https://download.eclipse.org/modeling/gmp/gmf-runtime/updates/releases/R202311130907" enabled="true" /> + <repository-reference location="https://download.eclipse.org/modeling/gmp/gmf-notation/updates/releases/R202211151334" enabled="true" /> + <repository-reference location="https://download.eclipse.org/xwt/release-1.9.100/" enabled="true" /> + <repository-reference location="https://download.eclipse.org/cbi/updates/tpd/nightly/latest" enabled="true" /> </site> diff --git a/releng/main/site/pom.xml b/releng/main/site/pom.xml index d9fe1bae7ea..ecfe63a0c18 100644 --- a/releng/main/site/pom.xml +++ b/releng/main/site/pom.xml @@ -11,7 +11,7 @@ </parent> <artifactId>org.eclipse.papyrus.p2</artifactId> - <version>6.2.0-SNAPSHOT</version> + <version>6.6.0-SNAPSHOT</version> <packaging>eclipse-repository</packaging> diff --git a/releng/main/targetPlatform/org.eclipse.papyrus.main.targetplatform.target b/releng/main/targetPlatform/org.eclipse.papyrus.main.targetplatform.target index 7dfceab368e..8e0480eb5fd 100755 --- a/releng/main/targetPlatform/org.eclipse.papyrus.main.targetplatform.target +++ b/releng/main/targetPlatform/org.eclipse.papyrus.main.targetplatform.target @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <?pde?> <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl --> -<target name="Papyrus Main" sequenceNumber="1651648009"> +<target name="Papyrus Main" sequenceNumber="1704448694"> <locations> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.nebula.widgets.richtext.feature.feature.group" version="1.2.0.201703081533"/> @@ -18,91 +18,88 @@ <repository id="nattable" location="http://download.eclipse.org/nattable/releases/1.5.0/repository"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="com.google.guava" version="30.1.0.v20210127-2300"/> - <unit id="com.google.guava.source" version="30.1.0.v20210127-2300"/> - <unit id="com.google.gson" version="2.7.0.v20170129-0911"/> - <unit id="com.google.gson.source" version="2.7.0.v20170129-0911"/> - <unit id="org.apache.commons.lang3" version="3.1.0.v201403281430"/> - <unit id="org.apache.commons.lang3.source" version="3.1.0.v201403281430"/> - <unit id="org.objectweb.asm" version="5.0.1.v201404251740"/> - <unit id="org.objectweb.asm.source" version="5.0.1.v201404251740"/> - <unit id="com.google.inject" version="3.0.0.v201605172100"/> - <unit id="org.apache.batik.anim" version="1.14.0.v20210324-0332"/> - <unit id="org.apache.batik.dom" version="1.14.0.v20210324-0332"/> - <unit id="org.apache.batik.dom.svg" version="1.14.0.v20210324-0332"/> - <unit id="org.apache.batik.xml" version="1.14.0.v20210324-0332"/> - <repository id="orbit" location="https://download.eclipse.org/tools/orbit/downloads/drops/R20220302172233/repository/"/> + <unit id="org.apache.commons.io" version="2.8.0.v20210415-0900"/> + <unit id="org.apache.logging.log4j" version="2.17.1.v20220106-2156"/> + <repository id="orbit2" location="https://download.eclipse.org/tools/orbit/downloads/drops/R20230531010532/repository/"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.xwt.feature.feature.group" version="0.0.0"/> - <repository id="xwt" location="https://download.eclipse.org/xwt/milestones-1.7.0/1.7.0-S/"/> + <unit id="com.google.guava" version="32.1.3.jre"/> + <unit id="com.google.guava.source" version="32.1.3.jre"/> + <unit id="com.google.gson" version="2.10.1"/> + <unit id="com.google.gson.source" version="2.10.1"/> + <unit id="org.apache.batik.anim" version="1.17.0.v20231009-1000"/> + <unit id="org.apache.batik.dom" version="1.17.0.v20231009-1000"/> + <unit id="org.apache.batik.dom.svg" version="1.17.0.v20231009-1000"/> + <unit id="org.apache.batik.xml" version="1.17.0.v20231009-1000"/> + <unit id="com.google.inject" version="7.0.0"/> + <unit id="org.eclipse.orbit.xml-apis-ext" version="1.0.0.v20230923-0644"/> + <repository id="orbit" location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2023-12/"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.m2m.qvt.oml.sdk.feature.group" version="3.10.6.v20220309-1013"/> - <repository id="qvto" location="https://download.eclipse.org/mmt/qvto/updates/releases/3.10.6"/> + <unit id="org.eclipse.xwt.feature.feature.group" version="0.0.0"/> + <repository id="xwt" location="https://download.eclipse.org/xwt/release-1.9.100/"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.xpand.sdk.feature.group" version="2.2.0.v201605260315"/> - <unit id="org.eclipse.xtend.feature.group" version="2.2.0.v201605260315"/> - <repository id="xpand" location="https://download.eclipse.org/modeling/m2t/xpand/updates/releases/R201605260315/"/> + <unit id="org.eclipse.m2m.qvt.oml.sdk.feature.group" version="3.10.8.v20231126-0839"/> + <repository id="qvto" location="https://download.eclipse.org/mmt/qvto/updates/releases/3.10.8"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.uml2.sdk.feature.group" version="5.5.2.v20210228-1829"/> + <unit id="org.eclipse.uml2.sdk.feature.group" version="5.5.3.v20221116-1811"/> <repository id="uml" location="https://download.eclipse.org/modeling/mdt/uml2/updates/5.5"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.sdk.feature.group" version="4.24.0.v20220428-1800"/> - <repository id="platform" location="https://download.eclipse.org/eclipse/updates/4.24-I-builds/I20220428-1800/"/> + <unit id="org.eclipse.sdk.feature.group" version="4.30.0.v20231201-0512"/> + <repository id="platform" location="https://download.eclipse.org/eclipse/updates/4.30/R-4.30-202312010110"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.ocl.examples.classic.feature.group" version="5.17.1.v20220309-0840"/> - <unit id="org.eclipse.ocl.examples.feature.group" version="6.17.1.v20220309-0840"/> - <repository id="ocl" location="https://download.eclipse.org/modeling/mdt/ocl/updates/releases/6.17.1"/> + <unit id="org.eclipse.ocl.examples.classic.feature.group" version="5.19.0.v20231129-1236"/> + <unit id="org.eclipse.ocl.examples.feature.group" version="6.19.0.v20231129-1236"/> + <repository id="ocl" location="https://download.eclipse.org/modeling/mdt/ocl/updates/releases/6.19.0"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.xtext.sdk.feature.group" version="2.27.0.v20220501-1041"/> - <unit id="org.eclipse.xtend.sdk.feature.group" version="2.27.0.v20220501-1041"/> - <unit id="org.eclipse.xtext.redist.feature.group" version="2.27.0.v20220501-1041"/> - <unit id="org.eclipse.xtext.runtime.feature.group" version="2.27.0.v20220501-1041"/> - <unit id="org.eclipse.xtext.ui.feature.group" version="2.27.0.v20220501-1041"/> - <unit id="org.eclipse.xtext.generator.feature.group" version="2.27.0.v20220501-1041"/> - <repository id="xtext" location="https://download.eclipse.org/modeling/tmf/xtext/updates/milestones/S202205011041"/> + <unit id="org.eclipse.xtext.sdk.feature.group" version="2.33.0.v20231121-0955"/> + <unit id="org.eclipse.xtend.sdk.feature.group" version="2.33.0.v20231121-0955"/> + <unit id="org.eclipse.xtext.redist.feature.group" version="2.33.0.v20231121-0955"/> + <unit id="org.eclipse.xtext.runtime.feature.group" version="2.33.0.v20231121-0955"/> + <unit id="org.eclipse.xtext.ui.feature.group" version="2.33.0.v20231121-0955"/> + <unit id="org.eclipse.xtext.xtext.generator" version="2.33.0.v20231121-0955"/> + <repository id="xtext" location="https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.33.0"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.emf.mwe2.language.sdk.feature.group" version="2.13.0.v20220429-1234"/> - <repository id="mwe" location="https://download.eclipse.org/modeling/emft/mwe/updates/milestones/S202204291234/"/> + <unit id="org.eclipse.emf.mwe2.language.sdk.feature.group" version="2.16.0.v20231117-0522"/> + <repository id="mwe" location="https://download.eclipse.org/modeling/emft/mwe/updates/releases/2.16.0/"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.wst.xml_ui.feature.feature.group" version="0.0.0"/> - <repository id="webtools" location="https://download.eclipse.org/webtools/downloads/drops/R3.26.0/S-3.26M1a-20220411232710/repository/"/> + <repository id="webtools" location="https://download.eclipse.org/webtools/downloads/drops/R3.32.0/S-3.32M3a-20231114230950/repository/"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="1.14.2.202204130739"/> - <repository id="gmfRuntime" location="https://download.eclipse.org/modeling/gmp/gmf-runtime/updates/releases/R202204130739"/> + <unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="1.16.2.202311130907"/> + <repository id="gmfRuntime" location="https://download.eclipse.org/modeling/gmp/gmf-runtime/updates/releases/R202311130907/"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.gmf.runtime.notation.sdk.feature.group" version="1.13.0.202004160913"/> - <repository id="gmfNotation" location="https://download.eclipse.org/modeling/gmp/gmf-notation/updates/releases/R202004160913"/> + <unit id="org.eclipse.gmf.runtime.notation.sdk.feature.group" version="1.13.1.202211151334"/> + <repository id="gmfNotation" location="https://download.eclipse.org/modeling/gmp/gmf-notation/updates/releases/R202211151334"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.emf.sdk.feature.group" version="2.30.0.v20220426-0617"/> - <repository id="emf" location="https://download.eclipse.org/modeling/emf/emf/builds/milestone/S202204260307"/> + <unit id="org.eclipse.emf.sdk.feature.group" version="2.36.0.v20231107-0612"/> + <repository id="emf" location="https://download.eclipse.org/modeling/emf/emf/builds/release/2.36.0"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.emf.query.sdk.feature.group" version="1.12.0.201805030653"/> - <repository id="emfQuery" location="https://download.eclipse.org/modeling/emf/query/updates/releases/R201805030653"/> + <unit id="org.eclipse.emf.query.sdk.feature.group" version="1.12.1.202208101410"/> + <repository id="emfQuery" location="https://download.eclipse.org/modeling/emf/query/updates/releases/R202208101410"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.emf.validation.sdk.feature.group" version="1.12.2.202008210805"/> - <repository id="emfValidation" location="https://download.eclipse.org/modeling/emf/validation/updates/releases/R202008210805"/> + <unit id="org.eclipse.emf.validation.sdk.feature.group" version="1.13.3.202305230712"/> + <repository id="emfValidation" location="https://download.eclipse.org/modeling/emf/validation/updates/releases/R202305230712"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.emf.transaction.sdk.feature.group" version="1.12.0.201805140824"/> - <repository id="emfTransaction" location="https://download.eclipse.org/modeling/emf/transaction/updates/releases/R201805140824/"/> + <unit id="org.eclipse.emf.transaction.sdk.feature.group" version="1.13.0.202208110935"/> + <repository id="emfTransaction" location="https://download.eclipse.org/modeling/emf/transaction/updates/releases/R202208110935"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.gef.feature.group" version="3.11.0.201606061308"/> - <repository id="gef" location="https://download.eclipse.org/tools/gef/updates/legacy/releases/4.0.0_gef-master_1952"/> + <unit id="org.eclipse.gef.feature.group" version="3.18.0.202311222042"/> + <repository id="gef" location="https://download.eclipse.org/tools/gef/classic/releases/3.18.0"/> </location> </locations> </target> diff --git a/releng/main/targetPlatform/org.eclipse.papyrus.main.targetplatform.tpd b/releng/main/targetPlatform/org.eclipse.papyrus.main.targetplatform.tpd index f5ea26b968f..0d48a46d590 100755 --- a/releng/main/targetPlatform/org.eclipse.papyrus.main.targetplatform.tpd +++ b/releng/main/targetPlatform/org.eclipse.papyrus.main.targetplatform.tpd @@ -2,6 +2,7 @@ target "Papyrus Main" with requirements source // I-build should be referenced lazily due to their volatility, unless a specific version is needed /*** Manual referencing ***/ + // manualUpdate location nebula "http://download.eclipse.org/nebula/releases/1.2.0/" { org.eclipse.nebula.widgets.richtext.feature.feature.group @@ -19,38 +20,38 @@ location nattable "http://download.eclipse.org/nattable/releases/1.5.0/repositor } // manualUpdate -location orbit "https://download.eclipse.org/tools/orbit/downloads/drops/R20220302172233/repository/" { - com.google.guava [21.0.0,31.0.0) // emf.compare still needs guava 21.0.0 - com.google.guava.source [21.0.0,31.0.0) - com.google.gson [2.7.0,2.8.0) - com.google.gson.source [2.7.0,2.8.0) - org.apache.commons.lang3 3.1.0 - org.apache.commons.lang3.source 3.1.0 - org.objectweb.asm [5.0.1, 6.0.0) - org.objectweb.asm.source [5.0.1, 6.0.0) - com.google.inject [3.0.0, 4.0.0) - // update batik to be in adequation with latest gmf runtime https://www.eclipse.org/lists/mdt-papyrus.dev/msg04486.html - org.apache.batik.anim [1.14.0,1.15.0) - org.apache.batik.dom [1.14.0,1.15.0) - org.apache.batik.dom.svg [1.14.0,1.15.0) - org.apache.batik.xml [1.14.0,1.15.0) +location orbit2 "https://download.eclipse.org/tools/orbit/downloads/drops/R20230531010532/repository/" { + org.apache.commons.io [2.8.0,3.0.0) + org.apache.logging.log4j [2.17.1,3.0.0) } -/*** Updates from the Simrel repository ***/ -// updateFrom("XWT",0) -location xwt "https://download.eclipse.org/xwt/milestones-1.7.0/1.7.0-S/" { - org.eclipse.xwt.feature.feature.group lazy +// manualUpdate +location orbit "https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2023-12/" { + com.google.guava [32.1.3,32.2.0) + com.google.guava.source [32.1.3,32.2.0) + // This disappeared from the baseline, need to look at simrel messages + //org.apache.commons.io + // update dependencies to be in adequation with latest gmf runtime + com.google.gson [2.9.1,3.0.0) + com.google.gson.source [2.9.1,3.0.0) + org.apache.batik.anim [1.17.0,1.18.0) + org.apache.batik.dom [1.17.0,1.18.0) + org.apache.batik.dom.svg [1.17.0,1.18.0) + org.apache.batik.xml [1.17.0,1.18.0) + com.google.inject [7.0.0,8.0.0) + org.eclipse.orbit.xml-apis-ext [1.0.0,2.0.0] // for org.w3c.css.sac + org.w3c.dom.svg package } -// updateFrom("QVT Operational for 2022-06",0) -location qvto "https://download.eclipse.org/mmt/qvto/updates/releases/3.10.6" { - org.eclipse.m2m.qvt.oml.sdk.feature.group +// manualUpdate +location xwt "https://download.eclipse.org/xwt/release-1.9.100/" { + org.eclipse.xwt.feature.feature.group lazy } -// updateFrom("M2T Xpand for 2021-03",0) -location xpand "https://download.eclipse.org/modeling/m2t/xpand/updates/releases/R201605260315/" { - org.eclipse.xpand.sdk.feature.group - org.eclipse.xtend.feature.group +/*** Updates from the Simrel repository ***/ + +// updateFrom("QVT Operational for 2023-12",0) +location qvto "https://download.eclipse.org/mmt/qvto/updates/releases/3.10.8" { + org.eclipse.m2m.qvt.oml.sdk.feature.group } // updateFrom("MDT UML2",0) @@ -59,68 +60,70 @@ location uml "https://download.eclipse.org/modeling/mdt/uml2/updates/5.5" { } // updateFrom("Eclipse",0) -location platform "https://download.eclipse.org/eclipse/updates/4.24-I-builds/I20220428-1800/" { +location platform "https://download.eclipse.org/eclipse/updates/4.30/R-4.30-202312010110" { org.eclipse.sdk.feature.group } -// updateFrom("OCL for 2022-06",0) -location ocl "https://download.eclipse.org/modeling/mdt/ocl/updates/releases/6.17.1" { +// updateFrom("OCL for 2023-12",0) +location ocl "https://download.eclipse.org/modeling/mdt/ocl/updates/releases/6.19.0" { org.eclipse.ocl.examples.classic.feature.group org.eclipse.ocl.examples.feature.group } // updateFrom("Xtext, Xtend",0) -location xtext "https://download.eclipse.org/modeling/tmf/xtext/updates/milestones/S202205011041" { +location xtext "https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.33.0" { org.eclipse.xtext.sdk.feature.group org.eclipse.xtend.sdk.feature.group org.eclipse.xtext.redist.feature.group org.eclipse.xtext.runtime.feature.group org.eclipse.xtext.ui.feature.group - org.eclipse.xtext.generator.feature.group + org.eclipse.xtext.xtext.generator } -// updateFrom("EMFT MWE for 2022-06",0) -location mwe "https://download.eclipse.org/modeling/emft/mwe/updates/milestones/S202204291234/" { +// updateFrom("EMFT MWE for 2023-12",0) +location mwe "https://download.eclipse.org/modeling/emft/mwe/updates/releases/2.16.0/" { org.eclipse.emf.mwe2.language.sdk.feature.group } -// updateFrom("Web Tools Platform 3.26 for SimRel 2022-06",0) -location webtools "https://download.eclipse.org/webtools/downloads/drops/R3.26.0/S-3.26M1a-20220411232710/repository/" { +// updateFrom("Web Tools Platform",0) +location webtools "https://download.eclipse.org/webtools/downloads/drops/R3.32.0/S-3.32M3a-20231114230950/repository/" { org.eclipse.wst.xml_ui.feature.feature.group lazy } -// updateFrom("GMF Runtime 1.14.2 for SimRel 2022-06",0) -location gmfRuntime "https://download.eclipse.org/modeling/gmp/gmf-runtime/updates/releases/R202204130739" { +//updateFrom("GMF Runtime",0) +location gmfRuntime "https://download.eclipse.org/modeling/gmp/gmf-runtime/updates/releases/R202311130907/" { org.eclipse.gmf.runtime.sdk.feature.group } -// updateFrom("GMF Runtime 1.14.2 for SimRel 2022-06",1) -location gmfNotation "https://download.eclipse.org/modeling/gmp/gmf-notation/updates/releases/R202004160913" { +// updateFrom("GMF Runtime",1) +location gmfNotation "https://download.eclipse.org/modeling/gmp/gmf-notation/updates/releases/R202211151334" { org.eclipse.gmf.runtime.notation.sdk.feature.group } // updateFrom("EMF (Core)",0) -location emf "https://download.eclipse.org/modeling/emf/emf/builds/milestone/S202204260307" { +location emf "https://download.eclipse.org/modeling/emf/emf/builds/release/2.36.0" { org.eclipse.emf.sdk.feature.group } -// updateFrom("EMF Services for SimRel 2021-09",0) -location emfQuery "https://download.eclipse.org/modeling/emf/query/updates/releases/R201805030653" { +// updateFrom("EMF Services",0) +location emfQuery "https://download.eclipse.org/modeling/emf/query/updates/releases/R202208101410" { org.eclipse.emf.query.sdk.feature.group } -// updateFrom("EMF Services for SimRel 2021-09",1) -location emfValidation "https://download.eclipse.org/modeling/emf/validation/updates/releases/R202008210805" { +// updateFrom("EMF Services",1) +location emfValidation "https://download.eclipse.org/modeling/emf/validation/updates/releases/R202305230712" { org.eclipse.emf.validation.sdk.feature.group } -// updateFrom("EMF Services for SimRel 2021-09",2) -location emfTransaction "https://download.eclipse.org/modeling/emf/transaction/updates/releases/R201805140824/" { +// updateFrom("EMF Services",2) +location emfTransaction "https://download.eclipse.org/modeling/emf/transaction/updates/releases/R202208110935" { org.eclipse.emf.transaction.sdk.feature.group } // updateFrom("GEF",0) -location gef "https://download.eclipse.org/tools/gef/updates/legacy/releases/4.0.0_gef-master_1952" { +location gef "https://download.eclipse.org/tools/gef/classic/releases/3.18.0" { org.eclipse.gef.feature.group } + + diff --git a/releng/org.eclipse.papyrus.oomph/setups/papyrus.setup b/releng/org.eclipse.papyrus.oomph/setups/papyrus.setup index a0e1aab1729..df5d46619c9 100755..100644 --- a/releng/org.eclipse.papyrus.oomph/setups/papyrus.setup +++ b/releng/org.eclipse.papyrus.oomph/setups/papyrus.setup @@ -1,52 +1,106 @@ <?xml version="1.0" encoding="ASCII"?> -<setup:Project xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:git="http://www.eclipse.org/oomph/setup/git/1.0" xmlns:jdt="http://www.eclipse.org/oomph/setup/jdt/1.0" xmlns:mylyn="http://www.eclipse.org/oomph/setup/mylyn/1.0" xmlns:predicates="http://www.eclipse.org/oomph/predicates/1.0" xmlns:projects="http://www.eclipse.org/oomph/setup/projects/1.0" xmlns:setup="http://www.eclipse.org/oomph/setup/1.0" xmlns:setup.p2="http://www.eclipse.org/oomph/setup/p2/1.0" xmlns:setup.targlets="http://www.eclipse.org/oomph/setup/targlets/1.0" xmlns:setup.workingsets="http://www.eclipse.org/oomph/setup/workingsets/1.0" xmlns:workingsets="http://www.eclipse.org/oomph/workingsets/1.0" xsi:schemaLocation="http://www.eclipse.org/oomph/setup/git/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Git.ecore http://www.eclipse.org/oomph/setup/jdt/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/JDT.ecore http://www.eclipse.org/oomph/setup/mylyn/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Mylyn.ecore http://www.eclipse.org/oomph/predicates/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Predicates.ecore http://www.eclipse.org/oomph/setup/projects/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Projects.ecore http://www.eclipse.org/oomph/setup/targlets/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/SetupTarglets.ecore http://www.eclipse.org/oomph/setup/workingsets/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/SetupWorkingSets.ecore http://www.eclipse.org/oomph/workingsets/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/WorkingSets.ecore" name="papyrus" label="Papyrus"> - <logicalProjectContainer xsi:type="setup:ProjectCatalog" href="index:/org.eclipse.setup#//@projectCatalogs[name='org.eclipse']"/> - <description>Workbench and workspace configuration for development on Papyrus</description> - <setupTask xsi:type="setup.p2:P2Task" label="Core Development Tools"> - <requirement name="org.eclipse.emf.sdk.feature.group"/> - <requirement name="org.eclipse.gmf.runtime.notation.sdk.feature.group"/> - <requirement name="org.eclipse.gmf.runtime.sdk.feature.group"/> - <requirement name="org.eclipse.gmf.sdk.feature.group"/> - <requirement name="org.eclipse.uml2.sdk.feature.group"/> - <requirement name="org.eclipse.papyrus.sdk.feature.feature.group"/> - <requirement name="org.eclipse.pde.api.tools.ee.feature.feature.group"/> - <requirement name="org.eclipse.mylyn.ide_feature.feature.group"/> - <requirement name="org.eclipse.mylyn.java_feature.feature.group"/> - <requirement name="org.eclipse.mylyn.pde_feature.feature.group"/> - <requirement name="org.eclipse.mylyn.team_feature.feature.group"/> - <requirement name="org.eclipse.mylyn.gerrit.feature.feature.group"/> - <requirement name="org.eclipse.mylyn_feature.feature.group"/> - <requirement name="org.eclipse.mylyn.bugzilla_feature.feature.group"/> - <requirement name="org.eclipse.mylyn.git.feature.group"/> - <requirement name="org.eclipse.mylyn.hudson.feature.group"/> - <requirement name="org.eclipse.mylyn.wikitext_feature.feature.group"/> - <requirement name="org.eclipse.egit.feature.group"/> - <requirement name="org.eclipse.egit.mylyn.feature.group"/> - <requirement name="org.eclipse.m2e.feature.feature.group"/> - <repository url="http://download.eclipse.org/modeling/gmp/gmf-tooling/updates/releases-3.3.1a"/> - <repository url="https://download.eclipse.org/modeling/mdt/uml2/updates/5.5milestones/"/> +<setup:Project + xmi:version="2.0" + xmlns:xmi="http://www.omg.org/XMI" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns:git="http://www.eclipse.org/oomph/setup/git/1.0" + xmlns:jdt="http://www.eclipse.org/oomph/setup/jdt/1.0" + xmlns:mylyn="http://www.eclipse.org/oomph/setup/mylyn/1.0" + xmlns:predicates="http://www.eclipse.org/oomph/predicates/1.0" + xmlns:projects="http://www.eclipse.org/oomph/setup/projects/1.0" + xmlns:setup="http://www.eclipse.org/oomph/setup/1.0" + xmlns:setup.p2="http://www.eclipse.org/oomph/setup/p2/1.0" + xmlns:setup.targlets="http://www.eclipse.org/oomph/setup/targlets/1.0" + xmlns:setup.workingsets="http://www.eclipse.org/oomph/setup/workingsets/1.0" + xmlns:workingsets="http://www.eclipse.org/oomph/workingsets/1.0" + xsi:schemaLocation="http://www.eclipse.org/oomph/setup/git/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Git.ecore http://www.eclipse.org/oomph/setup/jdt/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/JDT.ecore http://www.eclipse.org/oomph/setup/mylyn/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Mylyn.ecore http://www.eclipse.org/oomph/predicates/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Predicates.ecore http://www.eclipse.org/oomph/setup/projects/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Projects.ecore http://www.eclipse.org/oomph/setup/targlets/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/SetupTarglets.ecore http://www.eclipse.org/oomph/setup/workingsets/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/SetupWorkingSets.ecore http://www.eclipse.org/oomph/workingsets/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/WorkingSets.ecore" + name="papyrus" + label="Papyrus"> + <setupTask + xsi:type="setup.p2:P2Task" + label="Core Development Tools"> + <requirement + name="org.eclipse.emf.sdk.feature.group"/> + <requirement + name="org.eclipse.gmf.runtime.notation.sdk.feature.group"/> + <requirement + name="org.eclipse.gmf.runtime.sdk.feature.group"/> + <requirement + name="org.eclipse.uml2.sdk.feature.group"/> + <requirement + name="org.eclipse.papyrus.sdk.feature.feature.group"/> + <requirement + name="org.eclipse.mylyn.ide_feature.feature.group"/> + <requirement + name="org.eclipse.mylyn.java_feature.feature.group"/> + <requirement + name="org.eclipse.mylyn.pde_feature.feature.group"/> + <requirement + name="org.eclipse.mylyn.team_feature.feature.group"/> + <requirement + name="org.eclipse.mylyn.gerrit.feature.feature.group"/> + <requirement + name="org.eclipse.mylyn_feature.feature.group"/> + <requirement + name="org.eclipse.mylyn.bugzilla_feature.feature.group"/> + <requirement + name="org.eclipse.mylyn.git.feature.group"/> + <requirement + name="org.eclipse.mylyn.hudson.feature.group"/> + <requirement + name="org.eclipse.mylyn.wikitext_feature.feature.group"/> + <requirement + name="org.eclipse.egit.feature.group"/> + <requirement + name="org.eclipse.egit.mylyn.feature.group"/> + <requirement + name="org.eclipse.m2e.feature.feature.group"/> + <repository + url="https://download.eclipse.org/modeling/mdt/uml2/updates/5.5milestones/"/> </setupTask> - <setupTask xsi:type="setup.p2:P2Task" label="Releng Tools"> - <requirement name="org.eclipse.oomph.projectconfig.feature.group"/> - <requirement name="org.eclipse.oomph.projectcopy.feature.group"/> - <requirement name="org.eclipse.oomph.workingsets.feature.group"/> - <requirement name="org.eclipse.oomph.version.feature.group"/> - <requirement name="org.sonatype.tycho.m2e.feature.feature.group"/> - <requirement name="org.eclipse.cbi.targetplatform-feature.feature.group"/> - <repository url="https://repo1.maven.org/maven2/.m2e/connectors/m2eclipse-tycho/0.9.0/N/LATEST/"/> - <repository url="https://download.eclipse.org/cbi/tpd/3.0.0-SNAPSHOT/"/> + <setupTask + xsi:type="setup.p2:P2Task" + label="Releng Tools"> + <requirement + name="org.eclipse.oomph.projectconfig.feature.group"/> + <requirement + name="org.eclipse.oomph.projectcopy.feature.group"/> + <requirement + name="org.eclipse.oomph.workingsets.feature.group"/> + <requirement + name="org.eclipse.oomph.version.feature.group"/> + <requirement + name="org.eclipse.cbi.targetplatform-feature.feature.group"/> + <repository + url="https://download.eclipse.org/cbi/tpd/3.0.0-SNAPSHOT/"/> </setupTask> - <setupTask xsi:type="setup.p2:P2Task" label="Code Quality Tools"> - <requirement name="com.mountainminds.eclemma.feature.feature.group" optional="true"/> - <requirement name="net.sf.eclipsecs.feature.group" optional="true"/> - <requirement name="edu.umd.cs.findbugs.plugin.eclipse.feature.group" optional="true"/> - <repository url="http://update.eclemma.org/"/> - <repository url="https://checkstyle.org/eclipse-cs-update-site"/> - <repository url="http://findbugs.cs.umd.edu/eclipse/"/> + <setupTask + xsi:type="setup.p2:P2Task" + label="Code Quality Tools"> + <requirement + name="com.mountainminds.eclemma.feature.feature.group" + optional="true"/> + <requirement + name="net.sf.eclipsecs.feature.group" + optional="true"/> + <repository + url="http://update.eclemma.org/"/> </setupTask> - <setupTask xsi:type="setup:EclipseIniTask" option="-Xmx" value="2048m" vm="true"/> - <setupTask xsi:type="setup:EclipseIniTask" option="-Dosgi.bundlefile.limit" value="200" vm="true"/> - <setupTask xsi:type="setup:ResourceCreationTask" excludedTriggers="STARTUP MANUAL" targetURL="${workspace.location|uri}/.metadata/.plugins/org.eclipse.jdt.ui/dialog_settings.xml" encoding="UTF-8"> + <setupTask + xsi:type="setup:EclipseIniTask" + option="-Xmx" + value="2048m" + vm="true"/> + <setupTask + xsi:type="setup:EclipseIniTask" + option="-Dosgi.bundlefile.limit" + value="200" + vm="true"/> + <setupTask + xsi:type="setup:ResourceCreationTask" + excludedTriggers="STARTUP MANUAL" + targetURL="${workspace.location|uri}/.metadata/.plugins/org.eclipse.jdt.ui/dialog_settings.xml" + encoding="UTF-8"> <content> <?xml version="1.0" encoding="UTF-8"?> <section name="Workbench"> @@ -64,7 +118,9 @@ </content> </setupTask> - <setupTask xsi:type="setup:ResourceCreationTask" targetURL="${workspace.location|uri}/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.ui.prefs"> + <setupTask + xsi:type="setup:ResourceCreationTask" + targetURL="${workspace.location|uri}/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.ui.prefs"> <description>Code formatting and clean-up profiles for Papyrus.</description> <content> cleanup_profile=_Papyrus @@ -81,1326 +137,1606 @@ </content> </setupTask> - <setupTask xsi:type="setup:CompoundTask" name="Compiler Preferences"> - <setupTask xsi:type="setup:PreferenceTask" key="instance/org.eclipse.jdt.launching/org.eclipse.jdt.launching.PREF_STRICTLY_COMPATIBLE_JRE_NOT_AVAILABLE" value="ignore"/> - <setupTask xsi:type="setup:PreferenceTask" key="instance/org.eclipse.pde/compilers.f.unresolved-features" value="2"/> - <setupTask xsi:type="setup:CompoundTask" name="org.eclipse.pde.api.tools"> - <setupTask xsi:type="setup:PreferenceTask" key="/instance/org.eclipse.pde.api.tools/missing_default_api_profile" value="Ignore"/> + <setupTask + xsi:type="setup:CompoundTask" + name="Compiler Preferences"> + <setupTask + xsi:type="setup:PreferenceTask" + key="instance/org.eclipse.jdt.launching/org.eclipse.jdt.launching.PREF_STRICTLY_COMPATIBLE_JRE_NOT_AVAILABLE" + value="ignore"/> + <setupTask + xsi:type="setup:PreferenceTask" + key="instance/org.eclipse.pde/compilers.f.unresolved-features" + value="2"/> + <setupTask + xsi:type="setup:CompoundTask" + name="org.eclipse.pde.api.tools"> + <setupTask + xsi:type="setup:PreferenceTask" + key="/instance/org.eclipse.pde.api.tools/missing_default_api_profile" + value="Ignore"/> </setupTask> </setupTask> - <setupTask xsi:type="setup:VariableTask" name="git.checkout.branch" value="${scope.project.stream.name}"/> - <setupTask xsi:type="setup:VariableTask" name="eclipse.target.platform" defaultValue="2021-06" storageURI="scope://Workspace"/> - <setupTask xsi:type="git:GitCloneTask" id="papyrus.git.clone" remoteURI="papyrus/org.eclipse.papyrus" pushURI="" checkoutBranch="${git.checkout.branch}"> - <description>Papyrus</description> - <annotation source="http://www.eclipse.org/oomph/setup/InducedChoices"> - <detail key="inherit"> + <setupTask + xsi:type="setup:VariableTask" + name="git.checkout.branch" + value="${scope.project.stream.name}"/> + <setupTask + xsi:type="setup:VariableTask" + name="eclipse.target.platform" + defaultValue="2022-12" + storageURI="scope://Workspace"/> + <setupTask + xsi:type="git:GitCloneTask" + id="papyrus.git.clone" + remoteURI="papyrus/org.eclipse.papyrus" + pushURI="" + checkoutBranch="${git.checkout.branch}"> + <annotation + source="http://www.eclipse.org/oomph/setup/InducedChoices"> + <detail + key="inherit"> <value>eclipse.git.gerrit.remoteURIs</value> </detail> - <detail key="label"> + <detail + key="label"> <value>Papyrus Git or Gerrit Repository</value> </detail> - <detail key="target"> + <detail + key="target"> <value>remoteURI</value> </detail> </annotation> + <description>Papyrus</description> </setupTask> - <setupTask xsi:type="setup.targlets:TargletTask"> - <targlet activeRepositoryList="${eclipse.target.platform}" name="Papyrus Main Dependencies"> - <requirement name="org.eclipse.sdk.feature.group"/> - <requirement name="org.eclipse.uml2.sdk.feature.group"/> - <requirement name="org.eclipse.emf.sdk.feature.group"/> - <requirement name="org.apache.xerces"/> - <requirement name="org.eclipse.wst.xml.core"/> - <repositoryList name="2021-06"> - <repository url="https://download.eclipse.org/eclipse/updates/4.20/R-4.20-202106111600/"> - <annotation source="http://www.eclipse.org/Papyrus/2014/releng/dependencytools"> - <detail key="updateFrom"> + <setupTask + xsi:type="setup.targlets:TargletTask"> + <targlet + name="Papyrus Main Dependencies" + activeRepositoryList="${eclipse.target.platform}"> + <requirement + name="org.eclipse.sdk.feature.group"/> + <requirement + name="org.eclipse.uml2.sdk.feature.group"/> + <requirement + name="org.eclipse.emf.sdk.feature.group"/> + <requirement + name="org.apache.xerces"/> + <requirement + name="org.eclipse.wst.xml.core"/> + <repositoryList + name="2022-12"> + <repository + url="https://download.eclipse.org/eclipse/updates/4.26/R-4.26-202211231800/"> + <annotation + source="http://www.eclipse.org/Papyrus/2014/releng/dependencytools"> + <detail + key="updateFrom"> <value>Eclipse</value> </detail> </annotation> </repository> - <repository url="https://download.eclipse.org/modeling/emf/emf/builds/release/2.26"> - <annotation source="http://www.eclipse.org/Papyrus/2014/releng/dependencytools"> - <detail key="updateFrom"> + <repository + url="https://download.eclipse.org/modeling/emf/emf/builds/release/2.32"> + <annotation + source="http://www.eclipse.org/Papyrus/2014/releng/dependencytools"> + <detail + key="updateFrom"> <value>EMF (Core)</value> </detail> </annotation> </repository> - <repository url="https://download.eclipse.org/modeling/emf/transaction/updates/releases/R201805140824/"/> - <repository url="https://download.eclipse.org/modeling/emf/validation/updates/releases/R202008210805"/> - <repository url="https://download.eclipse.org/tools/gef/updates/legacy/releases/4.0.0_gef-master_1952"> - <annotation source="http://www.eclipse.org/Papyrus/2014/releng/dependencytools"> - <detail key="updateFrom"> + <repository + url="https://download.eclipse.org/modeling/emf/transaction/updates/releases/R202208110935"/> + <repository + url="https://download.eclipse.org/modeling/emf/validation/updates/releases/R202208271102"/> + <repository + url="https://download.eclipse.org/tools/gef/classic/releases/3.15.0"> + <annotation + source="http://www.eclipse.org/Papyrus/2014/releng/dependencytools"> + <detail + key="updateFrom"> <value>GEF</value> </detail> </annotation> </repository> - <repository url="https://download.eclipse.org/modeling/gmp/gmf-runtime/updates/releases/R202004160913"> - <annotation source="http://www.eclipse.org/Papyrus/2014/releng/dependencytools"> - <detail key="updateFrom"> - <value>GMF Runtime</value> - </detail> - </annotation> - </repository> - <repository url="https://download.eclipse.org/modeling/gmp/gmf-notation/updates/releases/R202004160913"/> - <repository url="https://download.eclipse.org/modeling/emft/mwe/updates/releases/2.12.1/"> - <annotation source="http://www.eclipse.org/Papyrus/2014/releng/dependencytools"> - <detail key="updateFrom"> + <repository + url="https://download.eclipse.org/modeling/gmp/gmf-runtime/updates/releases/R202211041032"/> + <repository + url="https://download.eclipse.org/modeling/gmp/gmf-notation/updates/releases/R202211151334"/> + <repository + url="https://download.eclipse.org/modeling/emft/mwe/updates/releases/2.14.0/"> + <annotation + source="http://www.eclipse.org/Papyrus/2014/releng/dependencytools"> + <detail + key="updateFrom"> <value>EMFT MWE</value> </detail> </annotation> </repository> - <repository url="https://download.eclipse.org/mmt/qvto/updates/releases/3.10.4"> - <annotation source="http://www.eclipse.org/Papyrus/2014/releng/dependencytools"> - <detail key="updateFrom"> + <repository + url="https://download.eclipse.org/mmt/qvto/updates/releases/3.10.7"> + <annotation + source="http://www.eclipse.org/Papyrus/2014/releng/dependencytools"> + <detail + key="updateFrom"> <value>QVT Operational</value> </detail> </annotation> </repository> - <repository url="https://download.eclipse.org/acceleo/updates/releases/3.7/R202102190929/"> - <annotation source="http://www.eclipse.org/Papyrus/2014/releng/dependencytools"> - <detail key="updateFrom"> + <repository + url="https://download.eclipse.org/acceleo/updates/releases/3.7/R202211151354/"> + <annotation + source="http://www.eclipse.org/Papyrus/2014/releng/dependencytools"> + <detail + key="updateFrom"> <value>M2T ACCELEO</value> </detail> </annotation> </repository> - <repository url="https://download.eclipse.org/modeling/mdt/ocl/updates/releases/6.15.0"> - <annotation source="http://www.eclipse.org/Papyrus/2014/releng/dependencytools"> - <detail key="updateFrom"> + <repository + url="https://download.eclipse.org/modeling/mdt/ocl/updates/releases/6.18.0"> + <annotation + source="http://www.eclipse.org/Papyrus/2014/releng/dependencytools"> + <detail + key="updateFrom"> <value>OCL</value> </detail> </annotation> </repository> - <repository url="https://download.eclipse.org/modeling/mdt/uml2/updates/5.5"> - <annotation source="http://www.eclipse.org/Papyrus/2014/releng/dependencytools"> - <detail key="updateFrom"> + <repository + url="https://download.eclipse.org/modeling/mdt/uml2/updates/5.5"> + <annotation + source="http://www.eclipse.org/Papyrus/2014/releng/dependencytools"> + <detail + key="updateFrom"> <value>MDT UML2</value> </detail> </annotation> </repository> - <repository url="https://download.eclipse.org/modeling/m2t/xpand/updates/releases/R201605260315/"> - <annotation source="http://www.eclipse.org/Papyrus/2014/releng/dependencytools"> - <detail key="updateFrom"> + <repository + url="https://download.eclipse.org/modeling/m2t/xpand/updates/releases/R201605260315/"> + <annotation + source="http://www.eclipse.org/Papyrus/2014/releng/dependencytools"> + <detail + key="updateFrom"> <value>M2T Xpand</value> </detail> </annotation> </repository> - <repository url="https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.25.0"> - <annotation source="http://www.eclipse.org/Papyrus/2014/releng/dependencytools"> - <detail key="updateFrom"> + <repository + url="https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.29.0"> + <annotation + source="http://www.eclipse.org/Papyrus/2014/releng/dependencytools"> + <detail + key="updateFrom"> <value>Xtext, Xtend</value> </detail> </annotation> </repository> - <repository url="https://download.eclipse.org/modeling/emf/compare/updates/milestones/3.3/S202102231741"> - <annotation source="http://www.eclipse.org/Papyrus/2014/releng/dependencytools"> - <detail key="updateFrom"> + <repository + url="https://download.eclipse.org/modeling/emf/compare/updates/releases/3.3/R202211161457/"> + <annotation + source="http://www.eclipse.org/Papyrus/2014/releng/dependencytools"> + <detail + key="updateFrom"> <value>EMF Compare</value> </detail> </annotation> </repository> - <repository url="https://download.eclipse.org/webtools/downloads/drops/R3.22.0/S-3.22.0.RC3a-20210612170523/repository/"> - <annotation source="http://www.eclipse.org/Papyrus/2014/releng/dependencytools"> - <detail key="updateFrom"> + <repository + url="https://download.eclipse.org/webtools/downloads/drops/R3.28.0/S-3.28RC1-20221120050827/repository/"> + <annotation + source="http://www.eclipse.org/Papyrus/2014/releng/dependencytools"> + <detail + key="updateFrom"> <value>Web Tools Platform:0</value> </detail> </annotation> </repository> - <repository url="https://download.eclipse.org/xwt/milestones-1.7.0/1.7.0-S/"/> - <repository url="http://download.eclipse.org/modeling/gmp/gmf-tooling/updates/releases-3.3.1a"/> - <repository url="http://download.eclipse.org/nattable/releases/1.5.0/repository/"/> - <repository url="http://download.eclipse.org/nebula/releases/1.2.0/"/> - <repository url="https://download.eclipse.org/tools/orbit/downloads/drops/R20201130205003/repository/"/> - </repositoryList> - <repositoryList name="2020-06"> - <repository url="https://download.eclipse.org/eclipse/updates/4.16/R-4.16-202006040540/"> - <annotation source="http://www.eclipse.org/Papyrus/2014/releng/dependencytools"> - <detail key="updateFrom"> - <value>Eclipse</value> - </detail> - </annotation> - </repository> - <repository url="http://download.eclipse.org/modeling/emf/emf/builds/release/2.22"> - <annotation source="http://www.eclipse.org/Papyrus/2014/releng/dependencytools"> - <detail key="updateFrom"> - <value>EMF (Core)</value> - </detail> - </annotation> - </repository> - <repository url="https://download.eclipse.org/modeling/emf/transaction/updates/releases/R201805140824/"/> - <repository url="https://download.eclipse.org/modeling/emf/validation/updates/releases/R202008210805"/> - <repository url="https://download.eclipse.org/tools/gef/updates/legacy/releases/4.0.0_gef-master_1952"> - <annotation source="http://www.eclipse.org/Papyrus/2014/releng/dependencytools"> - <detail key="updateFrom"> - <value>GEF</value> - </detail> - </annotation> - </repository> - <repository url="https://download.eclipse.org/modeling/gmp/gmf-runtime/updates/releases/R202004160913"> - <annotation source="http://www.eclipse.org/Papyrus/2014/releng/dependencytools"> - <detail key="updateFrom"> - <value>GMF Runtime 1.13.0 for SimRel 2020-06</value> - </detail> - </annotation> - </repository> - <repository url="https://download.eclipse.org/modeling/gmp/gmf-notation/updates/releases/R202004160913"/> - <repository url="https://download.eclipse.org/modeling/emft/mwe/updates/releases/2.11.3"> - <annotation source="http://www.eclipse.org/Papyrus/2014/releng/dependencytools"> - <detail key="updateFrom"> - <value>EMFT MWE for 2020-06</value> - </detail> - </annotation> - </repository> - <repository url="https://download.eclipse.org/mmt/qvto/updates/releases/3.10.2"> - <annotation source="http://www.eclipse.org/Papyrus/2014/releng/dependencytools"> - <detail key="updateFrom"> - <value>QVT Operational for 2020-06</value> - </detail> - </annotation> - </repository> - <repository url="https://download.eclipse.org/acceleo/updates/milestones/3.7/S202002210922"> - <annotation source="http://www.eclipse.org/Papyrus/2014/releng/dependencytools"> - <detail key="updateFrom"> - <value>M2T ACCELEO</value> - </detail> - </annotation> - </repository> - <repository url="https://download.eclipse.org/modeling/mdt/ocl/updates/releases/6.12.0"> - <annotation source="http://www.eclipse.org/Papyrus/2014/releng/dependencytools"> - <detail key="updateFrom"> - <value>OCL for 2020-06</value> - </detail> - </annotation> - </repository> - <repository url="https://download.eclipse.org/modeling/mdt/uml2/updates/5.5"> - <annotation source="http://www.eclipse.org/Papyrus/2014/releng/dependencytools"> - <detail key="updateFrom"> - <value>MDT UML2</value> - </detail> - </annotation> - </repository> - <repository url="https://download.eclipse.org/modeling/m2t/xpand/updates/releases/R201605260315/"> - <annotation source="http://www.eclipse.org/Papyrus/2014/releng/dependencytools"> - <detail key="updateFrom"> - <value>M2T XPAND for 2020-06</value> - </detail> - </annotation> - </repository> - <repository url="https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.22.0"> - <annotation source="http://www.eclipse.org/Papyrus/2014/releng/dependencytools"> - <detail key="updateFrom"> - <value>Xtext, Xtend</value> - </detail> - </annotation> - </repository> - <repository url="https://download.eclipse.org/modeling/emf/compare/updates/milestones/3.3/S202005260905"> - <annotation source="http://www.eclipse.org/Papyrus/2014/releng/dependencytools"> - <detail key="updateFrom"> - <value>EMF COMPARE</value> - </detail> - </annotation> - </repository> - <repository url="https://download.eclipse.org/webtools/downloads/drops/R3.18.0/R-3.18.0-20200605032700/repository/"> - <annotation source="http://www.eclipse.org/Papyrus/2014/releng/dependencytools"> - <detail key="updateFrom"> - <value>Web Tools Platform 3.18 for Simrel 2020-06</value> - </detail> - </annotation> - </repository> - <repository url="https://download.eclipse.org/xwt/release-1.4.100/"> - <annotation source="http://www.eclipse.org/Papyrus/2014/releng/dependencytools"> - <detail key="updateFrom"> - <value>XWT</value> - </detail> - </annotation> - </repository> - <repository url="http://download.eclipse.org/modeling/gmp/gmf-tooling/updates/releases-3.3.1a"/> - <repository url="http://download.eclipse.org/nattable/releases/1.5.0/repository/"/> - <repository url="http://download.eclipse.org/nebula/releases/1.2.0/"/> - <repository url="https://download.eclipse.org/tools/orbit/downloads/drops/R20200529191137/repository/"/> - </repositoryList> - <repositoryList name="Oxygen"> - <repository url="http://download.eclipse.org/eclipse/updates/4.7/R-4.7.3-201803010715/"> - <annotation source="http://www.eclipse.org/Papyrus/2014/releng/dependencytools"> - <detail key="updateFrom"> - <value>Eclipse</value> - </detail> - </annotation> - </repository> - <repository url="http://download.eclipse.org/modeling/emf/emf/updates/2.13/"> - <annotation source="http://www.eclipse.org/Papyrus/2014/releng/dependencytools"> - <detail key="updateFrom"> - <value>EMF (Core)</value> - </detail> - </annotation> - </repository> - <repository url="http://download.eclipse.org/modeling/emf/transaction/updates/releases/R201706061339"> - <annotation source="http://www.eclipse.org/Papyrus/2014/releng/dependencytools"> - <detail key="updateFrom"> - <value>EMF TRANSACTION</value> - </detail> - </annotation> - </repository> - <repository url="http://download.eclipse.org/modeling/emf/validation/updates/releases/R201706061352"> - <annotation source="http://www.eclipse.org/Papyrus/2014/releng/dependencytools"> - <detail key="updateFrom"> - <value>EMF VALIDATION</value> - </detail> - </annotation> - </repository> - <repository url="http://download.eclipse.org/tools/gef/updates/legacy/releases/4.0.0_gef-master_1952"> - <annotation source="http://www.eclipse.org/Papyrus/2014/releng/dependencytools"> - <detail key="updateFrom"> - <value>GEF</value> - </detail> - </annotation> - </repository> - <repository url="http://download.eclipse.org/modeling/gmp/gmf-runtime/updates/releases/R201706061437"> - <annotation source="http://www.eclipse.org/Papyrus/2014/releng/dependencytools"> - <detail key="updateFrom"> - <value>GMF Runtime</value> - </detail> - </annotation> - </repository> - <repository url="http://download.eclipse.org/modeling/gmp/gmf-notation/updates/releases/R201706061354"> - <annotation source="http://www.eclipse.org/Papyrus/2014/releng/dependencytools"> - <detail key="updateFrom"> - <value>GMF Notation</value> - </detail> - </annotation> - </repository> - <repository url="http://download.eclipse.org/modeling/emft/mwe/updates/releases/2.9.1/"> - <annotation source="http://www.eclipse.org/Papyrus/2014/releng/dependencytools"> - <detail key="updateFrom"> - <value>EMFT MWE</value> - </detail> - </annotation> - </repository> - <repository url="http://download.eclipse.org/mmt/qvto/updates/releases/3.7.0"> - <annotation source="http://www.eclipse.org/Papyrus/2014/releng/dependencytools"> - <detail key="updateFrom"> - <value>QVT Operational</value> - </detail> - </annotation> - </repository> - <repository url="http://download.eclipse.org/acceleo/updates/milestones/3.7/S201708211328"> - <annotation source="http://www.eclipse.org/Papyrus/2014/releng/dependencytools"> - <detail key="updateFrom"> - <value>M2T ACCELEO</value> - </detail> - </annotation> - </repository> - <repository url="http://download.eclipse.org/modeling/mdt/ocl/updates/releases/6.3.0"> - <annotation source="http://www.eclipse.org/Papyrus/2014/releng/dependencytools"> - <detail key="updateFrom"> - <value>Eclipse OCL 6.3</value> - </detail> - </annotation> - </repository> - <repository url="http://download.eclipse.org/modeling/mdt/uml2/updates/5.3"> - <annotation source="http://www.eclipse.org/Papyrus/2014/releng/dependencytools"> - <detail key="updateFrom"> - <value>MDT UML2</value> - </detail> - </annotation> - </repository> - <repository url="http://download.eclipse.org/modeling/m2t/xpand/updates/releases/R201605260315/"> - <annotation source="http://www.eclipse.org/Papyrus/2014/releng/dependencytools"> - <detail key="updateFrom"> - <value>M2T XPAND</value> - </detail> - </annotation> - </repository> - <repository url="http://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.12.0/"> - <annotation source="http://www.eclipse.org/Papyrus/2014/releng/dependencytools"> - <detail key="updateFrom"> - <value>Xtext, Xtend</value> - </detail> - </annotation> - </repository> - <repository url="http://download.eclipse.org/modeling/emf/compare/updates/milestones/3.3/S201709090201"> - <annotation source="http://www.eclipse.org/Papyrus/2014/releng/dependencytools"> - <detail key="updateFrom"> - <value>EMF COMPARE</value> - </detail> - </annotation> - </repository> - <repository url="http://download.eclipse.org/webtools/downloads/drops/R3.9.5/R-3.9.5-20180409100740/repository/"> - <annotation source="http://www.eclipse.org/Papyrus/2014/releng/dependencytools"> - <detail key="updateFrom"> - <value>WebTools</value> - </detail> - </annotation> - </repository> - <repository url="http://download.eclipse.org/xwt/updates/"> - <annotation source="http://www.eclipse.org/Papyrus/2014/releng/dependencytools"> - <detail key="updateFrom"> - <value>XWT</value> - </detail> - </annotation> - </repository> - <repository url="http://download.eclipse.org/modeling/gmp/gmf-tooling/updates/releases-3.3.1a"/> - <repository url="http://download.eclipse.org/nattable/releases/1.5.0/repository/"/> - <repository url="http://download.eclipse.org/nebula/releases/1.2.0/"/> - <repository url="http://download.eclipse.org/tools/orbit/downloads/drops/R20180330011457/repository"/> + <repository + url="https://download.eclipse.org/xwt/milestones-1.8.0/1.8.0-S"/> + <repository + url="http://download.eclipse.org/nattable/releases/1.5.0/repository/"/> + <repository + url="http://download.eclipse.org/nebula/releases/1.2.0/"/> + <repository + url="https://download.eclipse.org/tools/orbit/downloads/drops/R20221123021534/repository"/> + <repository + url="https://download.eclipse.org/tools/orbit/downloads/drops/R20220302172233/repository"/> </repositoryList> </targlet> - <targlet activeRepositoryList="${eclipse.target.platform}" name="Papyrus Test Dependencies"> - <requirement name="org.apache.commons.lang3" versionRange="[3.1.0,3.1.1)"/> - <requirement name="org.eclipse.emf.compare" versionRange="[3.3.0,4.0.0)"/> - <requirement name="org.eclipse.gmf.tooling.feature.group"/> - <requirement name="org.eclipse.m2m.qvt.oml.feature.group" versionRange="[3.6.0,4.0.0)"/> - <repositoryList name="2021-06"/> - <repositoryList name="2020-06"/> - <repositoryList name="Oxygen"/> + <targlet + name="Papyrus Test Dependencies" + activeRepositoryList="${eclipse.target.platform}"> + <requirement + name="org.eclipse.emf.compare" + versionRange="[3.3.0,4.0.0)"/> + <requirement + name="org.eclipse.m2m.qvt.oml.feature.group" + versionRange="[3.6.0,4.0.0)"/> + <repositoryList + name="2022-12"/> </targlet> - <targlet activeRepositoryList="${eclipse.target.platform}" name="Papyrus Main Plug-ins"> - <requirement name="org.eclipse.papyrus.sdk.feature.feature.group"/> - <repositoryList name="2021-06"> - <repository url="http://download.eclipse.org/modeling/mdt/papyrus/updates/nightly/master"/> - </repositoryList> - <repositoryList name="2020-06"> - <repository url="http://download.eclipse.org/modeling/mdt/papyrus/updates/releases/2020-06"/> - </repositoryList> - <repositoryList name="Oxygen"> - <repository url="http://download.eclipse.org/modeling/mdt/papyrus/updates/releases/oxygen"/> + <targlet + name="Papyrus Main Plug-ins" + activeRepositoryList="${eclipse.target.platform}"> + <repositoryList + name="2022-12"> + <repository + url="https://download.eclipse.org/modeling/mdt/papyrus/updates/releases/2022-12"/> </repositoryList> </targlet> - <targlet activeRepositoryList="${eclipse.target.platform}" name="Papyrus Toolsmiths Dependencies"> - <requirement name="org.eclipse.gmf.tooling.feature.group"/> - <requirement name="org.eclipse.emf.compare" versionRange="[3.3.0,4.0.0)"/> - <repositoryList name="2021-06"> - <repository url="https://download.eclipse.org/oomph/drops/release/1.21.0"> - <annotation source="http://www.eclipse.org/Papyrus/2014/releng/dependencytools"> - <detail key="updateFrom"> + <targlet + name="Papyrus Toolsmiths Dependencies" + activeRepositoryList="${eclipse.target.platform}"> + <requirement + name="org.eclipse.emf.compare" + versionRange="[3.3.0,4.0.0)"/> + <repositoryList + name="2022-12"> + <repository + url="https://download.eclipse.org/oomph/drops/release/1.27.0"> + <annotation + source="http://www.eclipse.org/Papyrus/2014/releng/dependencytools"> + <detail + key="updateFrom"> <value>Oomph</value> </detail> </annotation> </repository> - <repository url="https://download.eclipse.org/egit/updates-5.12"> - <annotation source="http://www.eclipse.org/Papyrus/2014/releng/dependencytools"> - <detail key="updateFrom"> + <repository + url="https://download.eclipse.org/egit/updates-6.4"> + <annotation + source="http://www.eclipse.org/Papyrus/2014/releng/dependencytools"> + <detail + key="updateFrom"> <value>EGit:0</value> </detail> </annotation> </repository> - <repository url="https://download.eclipse.org/technology/m2e/releases/1.18.0/"> - <annotation source="http://www.eclipse.org/Papyrus/2014/releng/dependencytools"> - <detail key="updateFrom"> + <repository + url="https://download.eclipse.org/technology/m2e/releases/2.1.2/"> + <annotation + source="http://www.eclipse.org/Papyrus/2014/releng/dependencytools"> + <detail + key="updateFrom"> <value>m2e</value> </detail> </annotation> </repository> - <repository url="https://download.eclipse.org/mylyn/drops/3.25.2/v20200831-1956"> - <annotation source="http://www.eclipse.org/Papyrus/2014/releng/dependencytools"> - <detail key="updateFrom"> + <repository + url="https://download.eclipse.org/oomph/simrel-mylyn"> + <annotation + source="http://www.eclipse.org/Papyrus/2014/releng/dependencytools"> + <detail + key="updateFrom"> <value>Mylyn</value> </detail> </annotation> </repository> - <repository url="https://download.eclipse.org/cbi/tpd/3.0.0-SNAPSHOT/"/> - <repository url="https://download.eclipse.org/cbi/updates/aggregator/ide/4.13/"/> - <repository url="https://download.eclipse.org/modeling/emf/compare/updates/milestones/3.3/S202102231741"> - <annotation source="http://www.eclipse.org/Papyrus/2014/releng/dependencytools"> - <detail key="updateFrom"> + <repository + url="https://download.eclipse.org/cbi/tpd/3.0.0-SNAPSHOT/"/> + <repository + url="https://download.eclipse.org/cbi/updates/aggregator/ide/4.13/"/> + <repository + url="https://download.eclipse.org/modeling/emf/compare/updates/releases/3.3/R202211161457/"> + <annotation + source="http://www.eclipse.org/Papyrus/2014/releng/dependencytools"> + <detail + key="updateFrom"> <value>EMF Compare</value> </detail> </annotation> </repository> - <repository url="http://download.eclipse.org/modeling/gmp/gmf-tooling/updates/releases-3.3.1a"/> - <repository url="${oomph.update.url}"/> - </repositoryList> - <repositoryList name="2020-06"> - <repository url="https://download.eclipse.org/oomph/drops/release/1.17.0"> - <annotation source="http://www.eclipse.org/Papyrus/2014/releng/dependencytools"> - <detail key="updateFrom"> - <value>oomph</value> - </detail> - </annotation> - </repository> - <repository url="https://download.eclipse.org/egit/updates-5.8"> - <annotation source="http://www.eclipse.org/Papyrus/2014/releng/dependencytools"> - <detail key="updateFrom"> - <value>EGIT</value> - </detail> - </annotation> - </repository> - <repository url="http://download.eclipse.org/technology/m2e/milestones/1.9/1.9.0.20180313-2237"> - <annotation source="http://www.eclipse.org/Papyrus/2014/releng/dependencytools"> - <detail key="updateFrom"> - <value>m2e</value> - </detail> - </annotation> - </repository> - <repository url="http://download.eclipse.org/mylyn/drops/3.24.2/v20180905-2014"> - <annotation source="http://www.eclipse.org/Papyrus/2014/releng/dependencytools"> - <detail key="updateFrom"> - <value>Mylyn</value> - </detail> - </annotation> - </repository> - <repository url="https://download.eclipse.org/cbi/tpd/3.0.0-SNAPSHOT/"/> - <repository url="https://download.eclipse.org/cbi/updates/aggregator/ide/4.13/"/> - <repository url="http://download.eclipse.org/modeling/emf/compare/updates/releases/latest"> - <annotation source="http://www.eclipse.org/Papyrus/2014/releng/dependencytools"> - <detail key="updateFrom"> - <value>EMF COMPARE</value> - </detail> - </annotation> - </repository> - <repository url="http://download.eclipse.org/modeling/gmp/gmf-tooling/updates/releases-3.3.1a"/> - <repository url="${oomph.update.url}"/> + <repository + url="${oomph.update.url}"/> </repositoryList> </targlet> </setupTask> - <setupTask xsi:type="setup:CompoundTask" name="Mylyn Queries"> - <setupTask xsi:type="setup:VariableTask" name="papyrus.bugzilla.repository" value="https://bugs.eclipse.org/bugs"/> - <setupTask xsi:type="setup:VariableTask" name="papyrus.bugzilla.prefix" value="/buglist.cgi?classification=Modeling&product=Papyrus&${papyrus.bugzilla.version}"/> - <setupTask xsi:type="setup:VariableTask" name="papyrus.bugzilla.open" value="bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED"/> - <setupTask xsi:type="mylyn:MylynQueriesTask" repositoryURL="${papyrus.bugzilla.repository}"> - <query summary="Papyrus Flagged for Review" url="${papyrus.bugzilla.prefix}&${papyrus.bugzilla.open}&query_format=advanced&field0-0-0=flagtypes.name&type0-0-0=equals&value0-0-0=review%3F"/> - <query summary="Papyrus Open Bugs" url="${papyrus.bugzilla.prefix}&${papyrus.bugzilla.open}&bug_severity=blocker&bug_severity=critical&bug_severity=major&bug_severity=normal&bug_severity=minor&bug_severity=trivial"/> - <query summary="Papyrus Open Enhancement Requests" url="${papyrus.bugzilla.prefix}&${papyrus.bugzilla.open}&bug_severity=enhancement"/> - <query summary="Papyrus Resolved Items" url="${papyrus.bugzilla.prefix}&bug_status=RESOLVED&resolution=FIXED"/> + <setupTask + xsi:type="setup:CompoundTask" + name="Mylyn Queries"> + <setupTask + xsi:type="setup:VariableTask" + name="papyrus.bugzilla.repository" + value="https://bugs.eclipse.org/bugs"/> + <setupTask + xsi:type="setup:VariableTask" + name="papyrus.bugzilla.prefix" + value="/buglist.cgi?classification=Modeling&product=Papyrus&${papyrus.bugzilla.version}"/> + <setupTask + xsi:type="setup:VariableTask" + name="papyrus.bugzilla.open" + value="bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED"/> + <setupTask + xsi:type="mylyn:MylynQueriesTask" + repositoryURL="${papyrus.bugzilla.repository}"> + <query + summary="Papyrus Flagged for Review" + url="${papyrus.bugzilla.prefix}&${papyrus.bugzilla.open}&query_format=advanced&field0-0-0=flagtypes.name&type0-0-0=equals&value0-0-0=review%3F"/> + <query + summary="Papyrus Open Bugs" + url="${papyrus.bugzilla.prefix}&${papyrus.bugzilla.open}&bug_severity=blocker&bug_severity=critical&bug_severity=major&bug_severity=normal&bug_severity=minor&bug_severity=trivial"/> + <query + summary="Papyrus Open Enhancement Requests" + url="${papyrus.bugzilla.prefix}&${papyrus.bugzilla.open}&bug_severity=enhancement"/> + <query + summary="Papyrus Resolved Items" + url="${papyrus.bugzilla.prefix}&bug_status=RESOLVED&resolution=FIXED"/> </setupTask> - <setupTask xsi:type="mylyn:MylynQueriesTask" connectorKind="org.eclipse.mylyn.gerrit" repositoryURL="https://git.eclipse.org/r" userID="${bugzilla.id}" password="${eclipse.user.password}"> - <query summary="Papyrus Open Gerrit Reviews"> - <attribute key="gerrit query type" value="custom"/> - <attribute key="gerrit query project" value="papyrus/org.eclipse.papyrus"/> - <attribute key="gerrit query string" value="project:papyrus/org.eclipse.papyrus status:open branch:${git.checkout.branch}"/> + <setupTask + xsi:type="mylyn:MylynQueriesTask" + connectorKind="org.eclipse.mylyn.gerrit" + repositoryURL="https://git.eclipse.org/r" + userID="${bugzilla.id}" + password="${eclipse.user.password}"> + <query + summary="Papyrus Open Gerrit Reviews"> + <attribute + key="gerrit query type" + value="custom"/> + <attribute + key="gerrit query project" + value="papyrus/org.eclipse.papyrus"/> + <attribute + key="gerrit query string" + value="project:papyrus/org.eclipse.papyrus status:open branch:${git.checkout.branch}"/> </query> </setupTask> - <setupTask xsi:type="mylyn:MylynBuildsTask" serverURL="https://hudson.eclipse.org/papyrus/" userID="${bugzilla.id}" password="${eclipse.user.password}"> - <buildPlan name="Papyrus-Master-Full"/> - <buildPlan name="Papyrus-Master"/> - <buildPlan name="Papyrus-Master-Tests"/> - </setupTask> - <setupTask xsi:type="setup:VariableTask" name="papyrus.bugzver.oxygen" value="version=3.0.0&version=3.1.0&version=3.2.0&version=3.3.0&version=3.4.0"/> - <setupTask xsi:type="setup:VariableTask" name="papyrus.bugzver.202103" value="version=5.0.0&version=5.1.0"/> - <setupTask xsi:type="setup:VariableTask" name="papyrus.bugzver.202006" value="version=4.7.0&version=4.8.0"/> - </setupTask> - <setupTask xsi:type="projects:ProjectsImportTask"> - <sourceLocator rootFolder="${papyrus.git.clone.location/tests/junit/framework}"> - <predicate xsi:type="predicates:OrPredicate"> - <operand xsi:type="predicates:NamePredicate" pattern="org\.eclipse\.papyrus\.junit\.framework"/> - <operand xsi:type="predicates:NamePredicate" pattern="org\.eclipse\.papyrus\.junit\.utils"/> - </predicate> - </sourceLocator> + <setupTask + xsi:type="setup:VariableTask" + name="papyrus.bugzver.202212" + value="version=6.3.0"/> </setupTask> - <project label="Main" name="main"> - <project label="Infra" name="infra"> - <setupTask xsi:type="projects:ProjectsImportTask"> - <sourceLocator rootFolder="${papyrus.git.clone.location/plugins/infra}"> - <predicate xsi:type="predicates:AndPredicate"> - <operand xsi:type="predicates:OrPredicate"> - <operand xsi:type="predicates:NamePredicate" pattern="org\.eclipse\.papyrus\.infra\..*"/> - <operand xsi:type="predicates:NamePredicate" pattern="org\.eclipse\.papyrus\.eclipse\.project\.editors"/> - <operand xsi:type="predicates:NamePredicate" pattern="org\.eclipse\.papyrus\.extensionpoints\.editors"/> - </operand> - <operand xsi:type="predicates:NotPredicate"> - <operand xsi:type="predicates:OrPredicate"> - <operand xsi:type="predicates:NamePredicate" pattern="org\.eclipse\.papyrus\.infra\.emf\.(?:embedded)?editor"/> - <operand xsi:type="predicates:NamePredicate" pattern="org\.eclipse\.papyrus\.infra\.emf\.facet\.queries"/> - <operand xsi:type="predicates:NamePredicate" pattern="org\.eclipse\.papyrus\.infra\.emf\.newchild"/> - </operand> - </operand> - </predicate> - </sourceLocator> - <sourceLocator rootFolder="${papyrus.git.clone.location/plugins/editor}"/> - <sourceLocator rootFolder="${papyrus.git.clone.location/tests/junit/plugins/infra}"/> - <sourceLocator rootFolder="${papyrus.git.clone.location/tests/junit/plugins/core}"> - <predicate xsi:type="predicates:NotPredicate"> - <operand xsi:type="predicates:NamePredicate" pattern="org\.eclipse\.papyrus\.tests"/> + <project name="main" + label="Main"> + <project + name="doc" + label="Documentation"> + <setupTask + xsi:type="projects:ProjectsImportTask"> + <sourceLocator + rootFolder="${papyrus.git.clone.location/plugins/doc}"/> + <sourceLocator + rootFolder="${papyrus.git.clone.location/features}"> + <predicate + xsi:type="predicates:AndPredicate"> + <operand + xsi:type="predicates:NamePredicate" + pattern="org\.eclipse\.papyrus(\..+)?\.doc($|\..+)"/> </predicate> </sourceLocator> - <sourceLocator rootFolder="${papyrus.git.clone.location/features}"> - <predicate xsi:type="predicates:NamePredicate" pattern="org\.eclipse\.papyrus\.(tests\.)?infra($|\..+)"/> - </sourceLocator> </setupTask> - <setupTask xsi:type="setup.workingsets:WorkingSetTask"> - <workingSet id="papyrus-infra" name="Papyrus Infra"> - <predicate xsi:type="predicates:AndPredicate"> - <operand xsi:type="predicates:RepositoryPredicate" project="org.eclipse.papyrus.infra.core"/> - <operand xsi:type="predicates:NaturePredicate" nature="org.eclipse.pde.PluginNature"/> - <operand xsi:type="predicates:OrPredicate"> - <operand xsi:type="predicates:NamePredicate" pattern="org\.eclipse\.papyrus\.infra\..*"/> - <operand xsi:type="predicates:NamePredicate" pattern="org\.eclipse\.papyrus\.editor($|\..+)"/> - <operand xsi:type="predicates:NamePredicate" pattern="org\.eclipse\.papyrus\.eclipse\.project\.editors"/> - </operand> - <operand xsi:type="workingsets:ExclusionPredicate" excludedWorkingSet="//@projects[name='main']/@projects[name='infra']/@setupTasks.1/@workingSets[name='Papyrus%20Infra%20Diagram'] //@projects[name='main']/@projects[name='infra']/@setupTasks.1/@workingSets[name='Papyrus%20Infra%20Nattable'] //@projects[name='main']/@projects[name='infra']/@setupTasks.1/@workingSets[name='Papyrus%20Infra%20Services'] //@projects[name='main']/@projects[name='infra']/@setupTasks.1/@workingSets[name='Papyrus%20Infra%20Tests'] //@projects[name='main']/@projects[name='infra']/@setupTasks.1/@workingSets[name='Papyrus%20Infra%20Viewpoints']"/> + <setupTask + xsi:type="setup.workingsets:WorkingSetTask"> + <workingSet + name="Papyrus Documentation" + id="papyrus-doc"> + <predicate + xsi:type="predicates:AndPredicate"> + <operand + xsi:type="predicates:RepositoryPredicate" + project="org.eclipse.papyrus.uml.doc"/> + <operand + xsi:type="predicates:NaturePredicate" + nature="org.eclipse.pde.PluginNature"/> + <operand + xsi:type="predicates:NamePredicate" + pattern="org\.eclipse\.papyrus(\..*)?doc(umentation)?"/> </predicate> </workingSet> - <workingSet id="papyrus-infra-diagram" name="Papyrus Infra Diagram"> - <predicate xsi:type="predicates:AndPredicate"> - <operand xsi:type="predicates:RepositoryPredicate" project="org.eclipse.papyrus.infra.gmfdiag.common"/> - <operand xsi:type="predicates:NaturePredicate" nature="org.eclipse.pde.PluginNature"/> - <operand xsi:type="workingsets:ExclusionPredicate" excludedWorkingSet="//@projects[name='main']/@projects[name='infra']/@setupTasks.1/@workingSets[name='Papyrus%20Infra%20Tests']"/> - <operand xsi:type="predicates:OrPredicate"> - <operand xsi:type="predicates:NamePredicate" pattern="org\.eclipse\.papyrus\.infra\.gmfdiag($|\..+)"/> - <operand xsi:type="predicates:NamePredicate" pattern="org\.eclipse\.papyrus\.extensionpoints\.editors"/> - </operand> + <workingSet + name="Papyrus Documentation Features" + id="papyrus-doc-features"> + <predicate + xsi:type="predicates:AndPredicate"> + <operand + xsi:type="predicates:RepositoryPredicate" + project="org.eclipse.papyrus.doc.feature"/> + <operand + xsi:type="predicates:NaturePredicate" + nature="org.eclipse.pde.FeatureNature"/> + <operand + xsi:type="predicates:NamePredicate" + pattern="org\.eclipse\.papyrus(\..*)?doc($|\..+)"/> </predicate> </workingSet> - <workingSet id="papyrus-infra-nattable" name="Papyrus Infra Nattable"> - <predicate xsi:type="predicates:AndPredicate"> - <operand xsi:type="predicates:RepositoryPredicate" project="org.eclipse.papyrus.infra.nattable"/> - <operand xsi:type="predicates:NaturePredicate" nature="org.eclipse.pde.PluginNature"/> - <operand xsi:type="predicates:NamePredicate" pattern="org\.eclipse\.papyrus\.infra\.(?:emf\.)?nattable($|\..+)"/> - <operand xsi:type="workingsets:ExclusionPredicate" excludedWorkingSet="//@projects[name='main']/@projects[name='infra']/@setupTasks.1/@workingSets[name='Papyrus%20Infra%20Tests']"/> + </setupTask> + <stream + name="6.3.0" + label="6.3.0 (2022-12/6.3)"> + <setupTask + xsi:type="setup:VariableTask" + name="papyrus.bugzilla.version" + value="${papyrus.bugzver.202212}"/> + </stream> + </project> + <project + name="editor" + label="Editor"> + <setupTask + xsi:type="projects:ProjectsImportTask"> + <sourceLocator + rootFolder="${papyrus.git.clone.location/plugins/editor}"/> + <sourceLocator + rootFolder="${papyrus.git.clone.location/tests/junit/plugins/editor}"/> + <sourceLocator + rootFolder="${papyrus.git.clone.location/features}"> + <predicate + xsi:type="predicates:NamePredicate" + pattern="org\.eclipse\.papyrus\.(tests\.)?editor($|\..+)"/> + </sourceLocator> + </setupTask> + <setupTask + xsi:type="setup.workingsets:WorkingSetTask"> + <workingSet + name="Papyrus Editor" + id="papyrus-editor"> + <predicate + xsi:type="predicates:AndPredicate"> + <operand + xsi:type="predicates:RepositoryPredicate" + project="org.eclipse.papyrus.editor"/> + <operand + xsi:type="predicates:NaturePredicate" + nature="org.eclipse.pde.PluginNature"/> + <operand + xsi:type="predicates:NamePredicate" + pattern="org\.eclipse\.papyrus\.editor($|\..+)"/> + <operand + xsi:type="workingsets:ExclusionPredicate" + excludedWorkingSet="//@projects[name='main']/@projects[name='editor']/@setupTasks.1/@workingSets[name='Papyrus%20Editor%20Tests']"/> </predicate> </workingSet> - <workingSet id="papyrus-infra-services" name="Papyrus Infra Services"> - <predicate xsi:type="predicates:AndPredicate"> - <operand xsi:type="predicates:RepositoryPredicate" project="org.eclipse.papyrus.infra.services.labelprovider"/> - <operand xsi:type="predicates:NaturePredicate" nature="org.eclipse.pde.PluginNature"/> - <operand xsi:type="predicates:NamePredicate" pattern="org\.eclipse\.papyrus\.infra\.services($|\..+)"/> - <operand xsi:type="workingsets:ExclusionPredicate" excludedWorkingSet="//@projects[name='main']/@projects[name='infra']/@setupTasks.1/@workingSets[name='Papyrus%20Infra%20Tests']"/> + <workingSet + name="Papyrus Editor Tests" + id="papyrus-editor-tests"> + <predicate + xsi:type="predicates:AndPredicate"> + <operand + xsi:type="predicates:RepositoryPredicate" + project="org.eclipse.papyrus.editors.suite.tests"/> + <operand + xsi:type="predicates:NaturePredicate" + nature="org.eclipse.pde.PluginNature"/> + <operand + xsi:type="predicates:NamePredicate" + pattern="org\.eclipse\.papyrus(\..*)?editor(s)?(\..*)?test(s)?"/> </predicate> </workingSet> - <workingSet id="papyrus-infra-viewpoints" name="Papyrus Infra Viewpoints"> - <predicate xsi:type="predicates:AndPredicate"> - <operand xsi:type="predicates:RepositoryPredicate" project="org.eclipse.papyrus.infra.viewpoints.policy"/> - <operand xsi:type="predicates:NaturePredicate" nature="org.eclipse.pde.PluginNature"/> - <operand xsi:type="predicates:NamePredicate" pattern="org\.eclipse\.papyrus\.infra\.viewpoints($|\..+)"/> - <operand xsi:type="workingsets:ExclusionPredicate" excludedWorkingSet="//@projects[name='main']/@projects[name='infra']/@setupTasks.1/@workingSets[name='Papyrus%20Infra%20Tests']"/> + <workingSet + name="Papyrus Editor Features" + id="papyrus-editor-features"> + <predicate + xsi:type="predicates:AndPredicate"> + <operand + xsi:type="predicates:RepositoryPredicate" + project="org.eclipse.papyrus.editor.feature"/> + <operand + xsi:type="predicates:NaturePredicate" + nature="org.eclipse.pde.FeatureNature"/> + <operand + xsi:type="predicates:NamePredicate" + pattern="org\.eclipse\.papyrus\.(tests\.)?editor($|\..+)"/> </predicate> </workingSet> - <workingSet id="papyrus-infra-tests" name="Papyrus Infra Tests"> - <predicate xsi:type="predicates:AndPredicate"> - <operand xsi:type="predicates:RepositoryPredicate" project="org.eclipse.papyrus.infra.core.tests"/> - <operand xsi:type="predicates:NaturePredicate" nature="org.eclipse.pde.PluginNature"/> - <operand xsi:type="predicates:OrPredicate"> - <operand xsi:type="predicates:NamePredicate" pattern="org\.eclipse\.papyrus\.infra(\..+)?\.tests"/> - <operand xsi:type="predicates:NamePredicate" pattern="org\.eclipse\.papyrus\.editor(\..+)?\.tests"/> - </operand> + </setupTask> + <stream + name="6.3.0" + label="6.3.0 (2022-12/6.3)"> + <setupTask + xsi:type="setup:VariableTask" + name="papyrus.bugzilla.version" + value="${papyrus.bugzver.202212}"/> + </stream> + </project> + <project + name="emf" + label="Emf"> + <setupTask + xsi:type="projects:ProjectsImportTask"> + <sourceLocator + rootFolder="${papyrus.git.clone.location/plugins/emf}"/> + <sourceLocator + rootFolder="${papyrus.git.clone.location/features}"> + <predicate + xsi:type="predicates:NamePredicate" + pattern="org\.eclipse\.papyrus\.(tests\.)?emf($|\..+)"/> + </sourceLocator> + </setupTask> + <setupTask + xsi:type="setup.workingsets:WorkingSetTask"> + <workingSet + name="Papyrus Emf" + id="papyrus-emf"> + <predicate + xsi:type="predicates:AndPredicate"> + <operand + xsi:type="predicates:RepositoryPredicate" + project="org.eclipse.papyrus.emf"/> + <operand + xsi:type="predicates:NaturePredicate" + nature="org.eclipse.pde.PluginNature"/> + <operand + xsi:type="predicates:NamePredicate" + pattern="org\.eclipse\.papyrus\.emf($|\..+)"/> + <operand + xsi:type="workingsets:ExclusionPredicate" + excludedWorkingSet="//@projects[name='main']/@projects[name='emf']/@setupTasks.1/@workingSets[name='Papyrus%20Emf%20Tests']"/> </predicate> </workingSet> - <workingSet id="papyrus-infra-features" name="Papyrus Infra Features"> - <predicate xsi:type="predicates:AndPredicate"> - <operand xsi:type="predicates:RepositoryPredicate" project="org.eclipse.papyrus.infra.core.feature"/> - <operand xsi:type="predicates:NaturePredicate" nature="org.eclipse.pde.FeatureNature"/> - <operand xsi:type="predicates:NamePredicate" pattern="org\.eclipse\.papyrus(\.tests)?\.infra($|\..+)"/> + <workingSet + name="Papyrus Emf Tests" + id="papyrus-emf-tests"> + <predicate + xsi:type="predicates:AndPredicate"> + <operand + xsi:type="predicates:RepositoryPredicate" + project="org.eclipse.papyrus.emf.tests"/> + <operand + xsi:type="predicates:NaturePredicate" + nature="org.eclipse.pde.PluginNature"/> + <operand + xsi:type="predicates:NamePredicate" + pattern="org\.eclipse\.papyrus\.emf(\..*)?\.test(s)?"/> + </predicate> + </workingSet> + <workingSet + name="Papyrus Emf Features" + id="papyrus-emf-features"> + <predicate + xsi:type="predicates:AndPredicate"> + <operand + xsi:type="predicates:RepositoryPredicate" + project="org.eclipse.papyrus.emf.feature"/> + <operand + xsi:type="predicates:NaturePredicate" + nature="org.eclipse.pde.FeatureNature"/> + <operand + xsi:type="predicates:NamePredicate" + pattern="org\.eclipse\.papyrus\.(tests\.)?emf($|\..+)"/> </predicate> </workingSet> </setupTask> - <setupTask xsi:type="setup.targlets:TargletTask"> - <targlet activeRepositoryList="${eclipse.target.platform}" name="Papyrus Infra Dependencies"> - <requirement name="org.eclipse.xtext.xbase.feature.group"/> - <requirement name="org.eclipse.emf.mwe2.launcher.feature.group"/> - </targlet> - </setupTask> - <stream label="master (2021-06/5.2)" name="master"> - <setupTask xsi:type="setup:VariableTask" name="papyrus.bugzilla.version" value="${papyrus.bugzver.202103}"/> - <setupTask xsi:type="setup.targlets:TargletTask"> - <targlet activeRepositoryList="${eclipse.target.platform}" name="Papyrus Infra Master Dependencies"> - <requirement name="org.eclipse.nebula.widgets.tablecombo.feature.feature.group"/> - </targlet> - </setupTask> - </stream> - <stream label="4.8.0 (2020-06/4.8)" name="4.8.0_RC2"> - <setupTask xsi:type="setup:VariableTask" name="papyrus.bugzilla.version" value="${papyrus.bugzver.202006}"/> - <setupTask xsi:type="setup.targlets:TargletTask"> - <targlet activeRepositoryList="${eclipse.target.platform}" name="Papyrus Infra Master Dependencies"> - <requirement name="org.eclipse.nebula.widgets.tablecombo.feature.feature.group"/> - </targlet> - </setupTask> - </stream> - <stream label="streams/3.0-maintenance (Oxygen/3.x)" name="streams/3.0-maintenance"> - <setupTask xsi:type="setup:VariableTask" name="papyrus.bugzilla.version" value="${papyrus.bugzver.oxygen}"/> - <setupTask xsi:type="setup.targlets:TargletTask"> - <targlet activeRepositoryList="${eclipse.target.platform}" name="Papyrus Infra Oxygen Dependencies"> - <requirement name="org.eclipse.nebula.widgets.tablecombo.feature.feature.group"/> - </targlet> - </setupTask> + <stream + name="6.3.0" + label="6.3.0 (2022-12/6.3)"> + <setupTask + xsi:type="setup:VariableTask" + name="papyrus.bugzilla.version" + value="${papyrus.bugzver.202212}"/> </stream> </project> - <project label="Views" name="views"> - <setupTask xsi:type="projects:ProjectsImportTask"> - <sourceLocator rootFolder="${papyrus.git.clone.location/plugins/views}"/> - <sourceLocator rootFolder="${papyrus.git.clone.location/tests/junit/plugins/views}"/> - <sourceLocator rootFolder="${papyrus.git.clone.location/features}"> - <predicate xsi:type="predicates:NamePredicate" pattern="org\.eclipse\.papyrus\.(tests\.)?views($|\..+)"/> + <project + name="emffacet" + label="EMF Facet"> + <setupTask + xsi:type="projects:ProjectsImportTask"> + <sourceLocator + rootFolder="${papyrus.git.clone.location/plugins/facet}"> + <predicate + xsi:type="predicates:NamePredicate" + pattern="org\.eclipse\.papyrus\.emf\.facet\..*"/> + </sourceLocator> + <sourceLocator + rootFolder="${papyrus.git.clone.location/features}"> + <predicate + xsi:type="predicates:AndPredicate"> + <operand + xsi:type="predicates:NamePredicate" + pattern="org\.eclipse\.papyrus\.(tests\.)?emf\.facet($|\..+)"/> + </predicate> </sourceLocator> </setupTask> - <setupTask xsi:type="setup.workingsets:WorkingSetTask"> - <workingSet id="papyrus-views" name="Papyrus Views"> - <predicate xsi:type="predicates:AndPredicate"> - <operand xsi:type="predicates:RepositoryPredicate" project="org.eclipse.papyrus.views.properties"/> - <operand xsi:type="predicates:NaturePredicate" nature="org.eclipse.pde.PluginNature"/> - <operand xsi:type="predicates:NamePredicate" pattern="org\.eclipse\.papyrus\.views($|\..+)"/> - <operand xsi:type="workingsets:ExclusionPredicate" excludedWorkingSet="//@projects[name='main']/@projects[name='views']/@setupTasks.1/@workingSets[name='Papyrus%20Views%20Tests']"/> + <setupTask + xsi:type="setup.workingsets:WorkingSetTask"> + <workingSet + name="Papyrus EMF Facet" + id="papyrus-emffacet"> + <predicate + xsi:type="predicates:AndPredicate"> + <operand + xsi:type="predicates:RepositoryPredicate" + project="org.eclipse.papyrus.emf.facet.common.core"/> + <operand + xsi:type="predicates:NaturePredicate" + nature="org.eclipse.pde.PluginNature"/> + <operand + xsi:type="predicates:NamePredicate" + pattern="org\.eclipse\.papyrus\.emf\.facet($|\..+)"/> + <operand + xsi:type="workingsets:ExclusionPredicate" + excludedWorkingSet="//@projects[name='main']/@projects[name='emffacet']/@setupTasks.1/@workingSets[name='Papyrus%20EMF%20Facet%20Tests']"/> </predicate> </workingSet> - <workingSet id="papyrus-views-tests" name="Papyrus Views Tests"> - <predicate xsi:type="predicates:AndPredicate"> - <operand xsi:type="predicates:RepositoryPredicate" project="org.eclipse.papyrus.views.modelexplorer.tests"/> - <operand xsi:type="predicates:NaturePredicate" nature="org.eclipse.pde.PluginNature"/> - <operand xsi:type="predicates:NamePredicate" pattern="org\.eclipse\.papyrus\.views(\..+)?\.tests"/> + <workingSet + name="Papyrus EMF Facet Tests" + id="papyrus-emffacet-tests"> + <predicate + xsi:type="predicates:AndPredicate"> + <operand + xsi:type="predicates:RepositoryPredicate" + project="org.eclipse.papyrus.emf.facet.architecture.tests"/> + <operand + xsi:type="predicates:NaturePredicate" + nature="org.eclipse.pde.PluginNature"/> + <operand + xsi:type="predicates:NamePredicate" + pattern="org\.eclipse\.papyrus\.emf\.facet(\..*)?\.test(s)?"/> </predicate> </workingSet> - <workingSet id="papyrus-views-features" name="Papyrus Views Features"> - <predicate xsi:type="predicates:AndPredicate"> - <operand xsi:type="predicates:RepositoryPredicate" project="org.eclipse.papyrus.views.properties.feature"/> - <operand xsi:type="predicates:NaturePredicate" nature="org.eclipse.pde.FeatureNature"/> - <operand xsi:type="predicates:NamePredicate" pattern="org\.eclipse\.papyrus\.(tests\.)?views($|\..+)"/> + <workingSet + name="Papyrus EMF Facet Features" + id="papyrus-emffacet-features"> + <predicate + xsi:type="predicates:AndPredicate"> + <operand + xsi:type="predicates:RepositoryPredicate" + project="org.eclipse.papyrus.emf.facet.feature"/> + <operand + xsi:type="predicates:NaturePredicate" + nature="org.eclipse.pde.FeatureNature"/> + <operand + xsi:type="predicates:NamePredicate" + pattern="org\.eclipse\.papyrus(\.tests)?\.emf\.facet($|\..+)"/> </predicate> </workingSet> </setupTask> - <stream label="master (2021-06/5.2)" name="master"> - <setupTask xsi:type="setup:VariableTask" name="papyrus.bugzilla.version" value="${papyrus.bugzver.202103}"/> - </stream> - <stream label="4.8.0 (2020-06/4.8)" name="4.8.0_RC2"> - <setupTask xsi:type="setup:VariableTask" name="papyrus.bugzilla.version" value="${papyrus.bugzver.202006}"/> - </stream> - <stream label="streams/3.0-maintenance (Oxygen/3.x)" name="streams/3.0-maintenance"> - <setupTask xsi:type="setup:VariableTask" name="papyrus.bugzilla.version" value="${papyrus.bugzver.oxygen}"/> + <stream + name="6.3.0" + label="6.3.0 (2022-12/6.3)"> + <setupTask + xsi:type="setup:VariableTask" + name="papyrus.bugzilla.version" + value="${papyrus.bugzver.202212}"/> </stream> </project> - <project label="UML" name="uml"> - <setupTask xsi:type="projects:ProjectsImportTask"> - <sourceLocator rootFolder="${papyrus.git.clone.location/plugins/uml}"> - <predicate xsi:type="predicates:NotPredicate"> - <operand xsi:type="predicates:NamePredicate" pattern=".*\.(alf|textedit|xtext)($|\..+)"/> + <project + name="infra" + label="Infra"> + <setupTask + xsi:type="projects:ProjectsImportTask"> + <sourceLocator + rootFolder="${papyrus.git.clone.location/plugins/infra}"> + <predicate + xsi:type="predicates:AndPredicate"> + <operand + xsi:type="predicates:OrPredicate"> + <operand + xsi:type="predicates:NamePredicate" + pattern="org\.eclipse\.papyrus\.infra\..*"/> + <operand + xsi:type="predicates:NamePredicate" + pattern="org\.eclipse\.papyrus\.eclipse\.project\.editors"/> + <operand + xsi:type="predicates:NamePredicate" + pattern="org\.eclipse\.papyrus\.extensionpoints\.editors"/> + </operand> + <operand + xsi:type="predicates:NotPredicate"> + <operand + xsi:type="predicates:OrPredicate"> + <operand + xsi:type="predicates:NamePredicate" + pattern="org\.eclipse\.papyrus\.infra\.emf\.(?:embedded)?editor"/> + <operand + xsi:type="predicates:NamePredicate" + pattern="org\.eclipse\.papyrus\.infra\.emf\.facet\.queries"/> + <operand + xsi:type="predicates:NamePredicate" + pattern="org\.eclipse\.papyrus\.infra\.emf\.newchild"/> + </operand> + </operand> </predicate> </sourceLocator> - <sourceLocator rootFolder="${papyrus.git.clone.location/tests/junit/plugins/uml}"> - <predicate xsi:type="predicates:NotPredicate"> - <operand xsi:type="predicates:NamePredicate" pattern=".*\.(alf|textedit|xtext)($|\..+)"/> + <sourceLocator + rootFolder="${papyrus.git.clone.location/plugins/editor}"/> + <sourceLocator + rootFolder="${papyrus.git.clone.location/tests/junit/plugins/infra}"/> + <sourceLocator + rootFolder="${papyrus.git.clone.location/tests/junit/plugins/core}"> + <predicate + xsi:type="predicates:NotPredicate"> + <operand + xsi:type="predicates:NamePredicate" + pattern="org\.eclipse\.papyrus\.tests"/> </predicate> </sourceLocator> - <sourceLocator rootFolder="${papyrus.git.clone.location/features}"> - <predicate xsi:type="predicates:AndPredicate"> - <operand xsi:type="predicates:NamePredicate" pattern="org\.eclipse\.papyrus\.(tests\.)?uml($|\..+)"/> - <operand xsi:type="predicates:NotPredicate"> - <operand xsi:type="predicates:NamePredicate" pattern=".*\.(alf|textedit|xtext)($|\..+)"/> - </operand> - </predicate> + <sourceLocator + rootFolder="${papyrus.git.clone.location/features}"> + <predicate + xsi:type="predicates:NamePredicate" + pattern="org\.eclipse\.papyrus\.(tests\.)?infra($|\..+)"/> </sourceLocator> </setupTask> - <setupTask xsi:type="setup.workingsets:WorkingSetTask"> - <workingSet id="papyrus-uml" name="Papyrus UML"> - <predicate xsi:type="predicates:AndPredicate"> - <operand xsi:type="predicates:RepositoryPredicate" project="org.eclipse.papyrus.uml.commands"/> - <operand xsi:type="predicates:NaturePredicate" nature="org.eclipse.pde.PluginNature"/> - <operand xsi:type="predicates:NamePredicate" pattern="org\.eclipse\.papyrus\.uml($|\..+)"/> - <operand xsi:type="predicates:NotPredicate"> - <operand xsi:type="predicates:NamePredicate" pattern=".*\.(alf|textedit|xtext)($|\..+)"/> + <setupTask + xsi:type="setup.workingsets:WorkingSetTask"> + <workingSet + name="Papyrus Infra" + id="papyrus-infra"> + <predicate + xsi:type="predicates:AndPredicate"> + <operand + xsi:type="predicates:RepositoryPredicate" + project="org.eclipse.papyrus.infra.core"/> + <operand + xsi:type="predicates:NaturePredicate" + nature="org.eclipse.pde.PluginNature"/> + <operand + xsi:type="predicates:OrPredicate"> + <operand + xsi:type="predicates:NamePredicate" + pattern="org\.eclipse\.papyrus\.infra(\..*)?"/> + <operand + xsi:type="predicates:NamePredicate" + pattern="org\.eclipse\.papyrus\.editor($|\..+)"/> + <operand + xsi:type="predicates:NamePredicate" + pattern="org\.eclipse\.papyrus\.eclipse\.project\.editors"/> </operand> - <operand xsi:type="workingsets:ExclusionPredicate" excludedWorkingSet="//@projects[name='main']/@projects[name='uml']/@setupTasks.1/@workingSets[name='Papyrus%20UML%20Diagrams'] //@projects[name='main']/@projects[name='uml']/@setupTasks.1/@workingSets[name='Papyrus%20UML%20Tables'] //@projects[name='main']/@projects[name='uml']/@setupTasks.1/@workingSets[name='Papyrus%20UML%20Tests']"/> + <operand + xsi:type="workingsets:ExclusionPredicate" + excludedWorkingSet="//@projects[name='main']/@projects[name='infra']/@setupTasks.1/@workingSets[name='Papyrus%20Infra%20Diagram'] //@projects[name='main']/@projects[name='infra']/@setupTasks.1/@workingSets[name='Papyrus%20Infra%20Nattable'] //@projects[name='main']/@projects[name='infra']/@setupTasks.1/@workingSets[name='Papyrus%20Infra%20Services'] //@projects[name='main']/@projects[name='infra']/@setupTasks.1/@workingSets[name='Papyrus%20Infra%20Viewpoints'] //@projects[name='main']/@projects[name='infra']/@setupTasks.1/@workingSets[name='Papyrus%20Infra%20Tests']"/> </predicate> </workingSet> - <workingSet id="papyrus-uml-diagram" name="Papyrus UML Diagrams"> - <predicate xsi:type="predicates:AndPredicate"> - <operand xsi:type="predicates:RepositoryPredicate" project="org.eclipse.papyrus.uml.diagram.common"/> - <operand xsi:type="predicates:NaturePredicate" nature="org.eclipse.pde.PluginNature"/> - <operand xsi:type="predicates:NamePredicate" pattern="org\.eclipse\.papyrus\.uml\.diagram.*"/> - <operand xsi:type="predicates:NotPredicate"> - <operand xsi:type="predicates:NamePredicate" pattern=".*\.(alf|textedit|xtext)($|\..+)"/> + <workingSet + name="Papyrus Infra Diagram" + id="papyrus-infra-diagram"> + <predicate + xsi:type="predicates:AndPredicate"> + <operand + xsi:type="predicates:RepositoryPredicate" + project="org.eclipse.papyrus.infra.gmfdiag.common"/> + <operand + xsi:type="predicates:NaturePredicate" + nature="org.eclipse.pde.PluginNature"/> + <operand + xsi:type="workingsets:ExclusionPredicate" + excludedWorkingSet="//@projects[name='main']/@projects[name='infra']/@setupTasks.1/@workingSets[name='Papyrus%20Infra%20Tests']"/> + <operand + xsi:type="predicates:OrPredicate"> + <operand + xsi:type="predicates:NamePredicate" + pattern="org\.eclipse\.papyrus\.infra\.gmfdiag($|\..+)"/> + <operand + xsi:type="predicates:NamePredicate" + pattern="org\.eclipse\.papyrus\.extensionpoints\.editors"/> </operand> - <operand xsi:type="workingsets:ExclusionPredicate" excludedWorkingSet="//@projects[name='main']/@projects[name='uml']/@setupTasks.1/@workingSets[name='Papyrus%20UML%20Tests']"/> </predicate> </workingSet> - <workingSet id="papyrus-uml-table" name="Papyrus UML Tables"> - <predicate xsi:type="predicates:AndPredicate"> - <operand xsi:type="predicates:RepositoryPredicate" project="org.eclipse.papyrus.uml.nattable"/> - <operand xsi:type="predicates:NaturePredicate" nature="org.eclipse.pde.PluginNature"/> - <operand xsi:type="predicates:NamePredicate" pattern="org\.eclipse\.papyrus\.uml\.nattable.*"/> - <operand xsi:type="predicates:NotPredicate"> - <operand xsi:type="predicates:NamePredicate" pattern=".*\.(alf|textedit|xtext)($|\..+)"/> - </operand> - <operand xsi:type="workingsets:ExclusionPredicate" excludedWorkingSet="//@projects[name='main']/@projects[name='uml']/@setupTasks.1/@workingSets[name='Papyrus%20UML%20Tests']"/> + <workingSet + name="Papyrus Infra Nattable" + id="papyrus-infra-nattable"> + <predicate + xsi:type="predicates:AndPredicate"> + <operand + xsi:type="predicates:RepositoryPredicate" + project="org.eclipse.papyrus.infra.nattable"/> + <operand + xsi:type="predicates:NaturePredicate" + nature="org.eclipse.pde.PluginNature"/> + <operand + xsi:type="predicates:NamePredicate" + pattern="org\.eclipse\.papyrus\.infra\.(?:emf\.)?nattable($|\..+)"/> + <operand + xsi:type="workingsets:ExclusionPredicate" + excludedWorkingSet="//@projects[name='main']/@projects[name='infra']/@setupTasks.1/@workingSets[name='Papyrus%20Infra%20Tests']"/> </predicate> </workingSet> - <workingSet id="papyrus-uml-tests" name="Papyrus UML Tests"> - <predicate xsi:type="predicates:AndPredicate"> - <operand xsi:type="predicates:RepositoryPredicate" project="org.eclipse.papyrus.uml.diagram.common.tests"/> - <operand xsi:type="predicates:NaturePredicate" nature="org.eclipse.pde.PluginNature"/> - <operand xsi:type="predicates:NamePredicate" pattern="org\.eclipse\.papyrus\.uml(\..+)?\.tests"/> - <operand xsi:type="predicates:NotPredicate"> - <operand xsi:type="predicates:NamePredicate" pattern=".*\.alf.*|.*\.uml\.textedit.*"/> - </operand> + <workingSet + name="Papyrus Infra Services" + id="papyrus-infra-services"> + <predicate + xsi:type="predicates:AndPredicate"> + <operand + xsi:type="predicates:RepositoryPredicate" + project="org.eclipse.papyrus.infra.services.labelprovider"/> + <operand + xsi:type="predicates:NaturePredicate" + nature="org.eclipse.pde.PluginNature"/> + <operand + xsi:type="predicates:NamePredicate" + pattern="org\.eclipse\.papyrus\.infra\.services($|\..+)"/> + <operand + xsi:type="workingsets:ExclusionPredicate" + excludedWorkingSet="//@projects[name='main']/@projects[name='infra']/@setupTasks.1/@workingSets[name='Papyrus%20Infra%20Tests']"/> </predicate> </workingSet> - <workingSet id="papyrus-uml-features" name="Papyrus UML Features"> - <predicate xsi:type="predicates:AndPredicate"> - <operand xsi:type="predicates:RepositoryPredicate" project="org.eclipse.papyrus.uml.feature"/> - <operand xsi:type="predicates:NaturePredicate" nature="org.eclipse.pde.FeatureNature"/> - <operand xsi:type="predicates:NamePredicate" pattern="org\.eclipse\.papyrus(\.tests)?\.uml($|\..+)"/> - <operand xsi:type="predicates:NotPredicate"> - <operand xsi:type="predicates:NamePredicate" pattern=".*\.(alf|textedit|xtext)($|\..+)"/> - </operand> + <workingSet + name="Papyrus Infra Viewpoints" + id="papyrus-infra-viewpoints"> + <predicate + xsi:type="predicates:AndPredicate"> + <operand + xsi:type="predicates:RepositoryPredicate" + project="org.eclipse.papyrus.infra.viewpoints.policy"/> + <operand + xsi:type="predicates:NaturePredicate" + nature="org.eclipse.pde.PluginNature"/> + <operand + xsi:type="predicates:NamePredicate" + pattern="org\.eclipse\.papyrus\.infra\.viewpoints($|\..+)"/> + <operand + xsi:type="workingsets:ExclusionPredicate" + excludedWorkingSet="//@projects[name='main']/@projects[name='infra']/@setupTasks.1/@workingSets[name='Papyrus%20Infra%20Tests']"/> + </predicate> + </workingSet> + <workingSet + name="Papyrus Infra Tests" + id="papyrus-infra-tests"> + <predicate + xsi:type="predicates:AndPredicate"> + <operand + xsi:type="predicates:RepositoryPredicate" + project="org.eclipse.papyrus.infra.core.tests"/> + <operand + xsi:type="predicates:NaturePredicate" + nature="org.eclipse.pde.PluginNature"/> + <operand + xsi:type="predicates:NamePredicate" + pattern="org\.eclipse\.papyrus\.(infra|editor)(\..*)?test(s)?"/> + </predicate> + </workingSet> + <workingSet + name="Papyrus Infra Features" + id="papyrus-infra-features"> + <predicate + xsi:type="predicates:AndPredicate"> + <operand + xsi:type="predicates:RepositoryPredicate" + project="org.eclipse.papyrus.infra.core.feature"/> + <operand + xsi:type="predicates:NaturePredicate" + nature="org.eclipse.pde.FeatureNature"/> + <operand + xsi:type="predicates:NamePredicate" + pattern="org\.eclipse\.papyrus(\.tests)?\.infra($|\..+)"/> </predicate> </workingSet> </setupTask> - <setupTask xsi:type="setup.targlets:TargletTask"> - <targlet activeRepositoryList="" name="Additional UML Dependencies"> - <requirement name="org.eclipse.ocl.jdt.annotation7" optional="true"/> + <setupTask + xsi:type="setup.targlets:TargletTask"> + <targlet + name="Papyrus Infra Dependencies" + activeRepositoryList="${eclipse.target.platform}"> + <requirement + name="org.eclipse.xtext.xbase.feature.group"/> + <requirement + name="org.eclipse.emf.mwe2.launcher.feature.group"/> </targlet> </setupTask> - <setupTask xsi:type="setup.p2:P2Task"> - <requirement name="org.eclipse.xtend.sdk.feature.group"/> - </setupTask> - <stream label="master (2021-06/5.2)" name="master"> - <setupTask xsi:type="setup:VariableTask" name="papyrus.bugzilla.version" value="${papyrus.bugzver.202103}"/> - </stream> - <stream label="4.8.0 (2020-06/4.8)" name="4.8.0_RC2"> - <setupTask xsi:type="setup:VariableTask" name="papyrus.bugzilla.version" value="${papyrus.bugzver.202006}"/> - </stream> - <stream label="streams/3.0-maintenance (Oxygen/3.x)" name="streams/3.0-maintenance"> - <setupTask xsi:type="setup:VariableTask" name="papyrus.bugzilla.version" value="${papyrus.bugzver.oxygen}"/> + <stream + name="6.3.0" + label="6.3.0 (2022-12/6.3)"> + <setupTask + xsi:type="setup:VariableTask" + name="papyrus.bugzilla.version" + value="${papyrus.bugzver.202212}"/> </stream> </project> - <project label="UML ALF" name="uml-alf"> - <setupTask xsi:type="projects:ProjectsImportTask"> - <sourceLocator rootFolder="${papyrus.git.clone.location/plugins/uml}"> - <predicate xsi:type="predicates:NamePredicate" pattern="org\.eclipse\.papyrus\.uml\.alf($|\..+)"/> + <project + name="uml" + label="UML"> + <setupTask + xsi:type="projects:ProjectsImportTask"> + <sourceLocator + rootFolder="${papyrus.git.clone.location/plugins/uml}"> + <predicate + xsi:type="predicates:NotPredicate"> + <operand + xsi:type="predicates:NamePredicate" + pattern=".*\.(alf|textedit|xtext)($|\..+)"/> + </predicate> </sourceLocator> - <sourceLocator rootFolder="${papyrus.git.clone.location/tests/junit/plugins/uml}"> - <predicate xsi:type="predicates:NamePredicate" pattern="org\.eclipse\.papyrus\.uml\.alf($|\..+)"/> + <sourceLocator + rootFolder="${papyrus.git.clone.location/tests/junit/plugins/uml}"> + <predicate + xsi:type="predicates:NotPredicate"> + <operand + xsi:type="predicates:NamePredicate" + pattern=".*\.(alf|textedit|xtext)($|\..+)"/> + </predicate> </sourceLocator> - <sourceLocator rootFolder="${papyrus.git.clone.location/features}"> - <predicate xsi:type="predicates:NamePredicate" pattern="org\.eclipse\.papyrus\.(tests\.)?uml\.alf($|\..+)"/> + <sourceLocator + rootFolder="${papyrus.git.clone.location/features}"> + <predicate + xsi:type="predicates:AndPredicate"> + <operand + xsi:type="predicates:NamePredicate" + pattern="org\.eclipse\.papyrus\.(tests\.)?uml($|\..+)"/> + <operand + xsi:type="predicates:NotPredicate"> + <operand + xsi:type="predicates:NamePredicate" + pattern=".*\.(alf|textedit|xtext)($|\..+)"/> + </operand> + </predicate> </sourceLocator> </setupTask> - <setupTask xsi:type="setup.workingsets:WorkingSetTask"> - <workingSet id="papyrus-uml-alf" name="Papyrus UML ALF"> - <predicate xsi:type="predicates:AndPredicate"> - <operand xsi:type="predicates:RepositoryPredicate" project="org.eclipse.papyrus.uml.alf.common"/> - <operand xsi:type="predicates:NaturePredicate" nature="org.eclipse.pde.PluginNature"/> - <operand xsi:type="predicates:NamePredicate" pattern="org\.eclipse\.papyrus\.uml\.alf($|\..+)"/> - <operand xsi:type="workingsets:ExclusionPredicate" excludedWorkingSet="//@projects[name='main']/@projects[name='uml-alf']/@setupTasks.1/@workingSets[name='Papyrus%20UML%20ALF%20Tests']"/> + <setupTask + xsi:type="setup.workingsets:WorkingSetTask"> + <workingSet + name="Papyrus UML" + id="papyrus-uml"> + <predicate + xsi:type="predicates:AndPredicate"> + <operand + xsi:type="predicates:RepositoryPredicate" + project="org.eclipse.papyrus.uml.commands"/> + <operand + xsi:type="predicates:NaturePredicate" + nature="org.eclipse.pde.PluginNature"/> + <operand + xsi:type="predicates:NamePredicate" + pattern="org\.eclipse\.papyrus\.uml($|\..+)"/> + <operand + xsi:type="predicates:NotPredicate"> + <operand + xsi:type="predicates:NamePredicate" + pattern=".*\.(alf|textedit|xtext)($|\..+)"/> + </operand> + <operand + xsi:type="workingsets:ExclusionPredicate" + excludedWorkingSet="//@projects[name='main']/@projects[name='uml']/@setupTasks.1/@workingSets[name='Papyrus%20UML%20Diagrams'] //@projects[name='main']/@projects[name='uml']/@setupTasks.1/@workingSets[name='Papyrus%20UML%20Tables'] //@projects[name='main']/@projects[name='uml']/@setupTasks.1/@workingSets[name='Papyrus%20UML%20Tests']"/> </predicate> </workingSet> - <workingSet id="papyrus-uml-alf-tests" name="Papyrus UML ALF Tests"> - <predicate xsi:type="predicates:AndPredicate"> - <operand xsi:type="predicates:RepositoryPredicate" project="org.eclipse.papyrus.uml.alf.tests"/> - <operand xsi:type="predicates:NaturePredicate" nature="org.eclipse.pde.PluginNature"/> - <operand xsi:type="predicates:NamePredicate" pattern="org\.eclipse\.papyrus\.uml\.alf(\..+)?\.tests"/> + <workingSet + name="Papyrus UML Diagrams" + id="papyrus-uml-diagram"> + <predicate + xsi:type="predicates:AndPredicate"> + <operand + xsi:type="predicates:RepositoryPredicate" + project="org.eclipse.papyrus.uml.diagram.common"/> + <operand + xsi:type="predicates:NaturePredicate" + nature="org.eclipse.pde.PluginNature"/> + <operand + xsi:type="predicates:NamePredicate" + pattern="org\.eclipse\.papyrus\.uml\.diagram.*"/> + <operand + xsi:type="predicates:NotPredicate"> + <operand + xsi:type="predicates:NamePredicate" + pattern=".*\.(alf|textedit|xtext)($|\..+)"/> + </operand> + <operand + xsi:type="workingsets:ExclusionPredicate" + excludedWorkingSet="//@projects[name='main']/@projects[name='uml']/@setupTasks.1/@workingSets[name='Papyrus%20UML%20Tests']"/> </predicate> </workingSet> - <workingSet id="papyrus-uml-alf-features" name="Papyrus UML ALF Features"> - <predicate xsi:type="predicates:AndPredicate"> - <operand xsi:type="predicates:RepositoryPredicate" project="org.eclipse.papyrus.uml.alf.feature"/> - <operand xsi:type="predicates:NaturePredicate" nature="org.eclipse.pde.FeatureNature"/> - <operand xsi:type="predicates:NamePredicate" pattern="org\.eclipse\.papyrus\.uml\.alf($|\..+)"/> + <workingSet + name="Papyrus UML Tables" + id="papyrus-uml-table"> + <predicate + xsi:type="predicates:AndPredicate"> + <operand + xsi:type="predicates:RepositoryPredicate" + project="org.eclipse.papyrus.uml.nattable"/> + <operand + xsi:type="predicates:NaturePredicate" + nature="org.eclipse.pde.PluginNature"/> + <operand + xsi:type="predicates:NamePredicate" + pattern="org\.eclipse\.papyrus\.uml\.nattable.*"/> + <operand + xsi:type="predicates:NotPredicate"> + <operand + xsi:type="predicates:NamePredicate" + pattern=".*\.(alf|textedit|xtext)($|\..+)"/> + </operand> + <operand + xsi:type="workingsets:ExclusionPredicate" + excludedWorkingSet="//@projects[name='main']/@projects[name='uml']/@setupTasks.1/@workingSets[name='Papyrus%20UML%20Tests']"/> + </predicate> + </workingSet> + <workingSet + name="Papyrus UML Tests" + id="papyrus-uml-tests"> + <predicate + xsi:type="predicates:AndPredicate"> + <operand + xsi:type="predicates:RepositoryPredicate" + project="org.eclipse.papyrus.uml.diagram.common.tests"/> + <operand + xsi:type="predicates:NaturePredicate" + nature="org.eclipse.pde.PluginNature"/> + <operand + xsi:type="predicates:NamePredicate" + pattern="org\.eclipse\.papyrus\.uml(\..*)?test(s)?"/> + <operand + xsi:type="predicates:NotPredicate"> + <operand + xsi:type="predicates:NamePredicate" + pattern=".*\.alf.*|.*\.uml\.textedit.*"/> + </operand> + </predicate> + </workingSet> + <workingSet + name="Papyrus UML Features" + id="papyrus-uml-features"> + <predicate + xsi:type="predicates:AndPredicate"> + <operand + xsi:type="predicates:RepositoryPredicate" + project="org.eclipse.papyrus.uml.feature"/> + <operand + xsi:type="predicates:NaturePredicate" + nature="org.eclipse.pde.FeatureNature"/> + <operand + xsi:type="predicates:NamePredicate" + pattern="org\.eclipse\.papyrus(\.tests)?\.uml($|\..+)"/> + <operand + xsi:type="predicates:NotPredicate"> + <operand + xsi:type="predicates:NamePredicate" + pattern=".*\.(alf|textedit|xtext)($|\..+)"/> + </operand> </predicate> </workingSet> </setupTask> - <setupTask xsi:type="setup.p2:P2Task"> - <requirement name="org.eclipse.xtend.sdk.feature.group"/> - </setupTask> - <setupTask xsi:type="setup.targlets:TargletTask"> - <targlet activeRepositoryList="${eclipse.target.platform}" name="Papyrus ALF Dependencies"> - <requirement name="org.eclipse.ocl.core.sdk.feature.group"/> - <requirement name="org.eclipse.m2m.qvt.oml.runtime.feature.group"/> + <setupTask + xsi:type="setup.targlets:TargletTask"> + <targlet + name="Additional UML Dependencies" + activeRepositoryList=""> + <requirement + name="org.eclipse.ocl.jdt.annotation7" + optional="true"/> </targlet> </setupTask> - <stream label="master (2021-06/5.2)" name="master"> - <setupTask xsi:type="setup:VariableTask" name="papyrus.bugzilla.version" value="${papyrus.bugzver.202103}"/> - </stream> - <stream label="4.8.0 (2020-06/4.8)" name="4.8.0_RC2"> - <setupTask xsi:type="setup:VariableTask" name="papyrus.bugzilla.version" value="${papyrus.bugzver.202006}"/> - </stream> - <stream label="streams/3.0-maintenance (Oxygen/3.x)" name="streams/3.0-maintenance"> - <setupTask xsi:type="setup:VariableTask" name="papyrus.bugzilla.version" value="${papyrus.bugzver.oxygen}"/> + <setupTask + xsi:type="setup.p2:P2Task"> + <requirement + name="org.eclipse.xtend.sdk.feature.group"/> + </setupTask> + <stream + name="6.3.0" + label="6.3.0 (2022-12/6.3)"> + <setupTask + xsi:type="setup:VariableTask" + name="papyrus.bugzilla.version" + value="${papyrus.bugzver.202212}"/> </stream> </project> - <project label="UML Text Editors" name="uml-text"> - <setupTask xsi:type="projects:ProjectsImportTask"> - <sourceLocator rootFolder="${papyrus.git.clone.location/plugins/uml}"> - <predicate xsi:type="predicates:NamePredicate" pattern="org\.eclipse\.papyrus\.uml\.(textedit|xtext)($|\..+)"/> + <project + name="uml-alf" + label="UML ALF"> + <setupTask + xsi:type="projects:ProjectsImportTask"> + <sourceLocator + rootFolder="${papyrus.git.clone.location/plugins/uml}"> + <predicate + xsi:type="predicates:NamePredicate" + pattern="org\.eclipse\.papyrus\.uml\.alf($|\..+)"/> </sourceLocator> - <sourceLocator rootFolder="${papyrus.git.clone.location/tests/junit/plugins/uml}"> - <predicate xsi:type="predicates:NamePredicate" pattern="org\.eclipse\.papyrus\.uml\.(textedit|xtext)($|\..+)"/> + <sourceLocator + rootFolder="${papyrus.git.clone.location/tests/junit/plugins/uml}"> + <predicate + xsi:type="predicates:NamePredicate" + pattern="org\.eclipse\.papyrus\.uml\.alf($|\..+)"/> </sourceLocator> - <sourceLocator rootFolder="${papyrus.git.clone.location/features}"> - <predicate xsi:type="predicates:NamePredicate" pattern="org\.eclipse\.papyrus\.(tests\.)?uml\.(textedit|xtext)($|\..+)"/> + <sourceLocator + rootFolder="${papyrus.git.clone.location/features}"> + <predicate + xsi:type="predicates:NamePredicate" + pattern="org\.eclipse\.papyrus\.(tests\.)?uml\.alf($|\..+)"/> </sourceLocator> </setupTask> - <setupTask xsi:type="setup.workingsets:WorkingSetTask"> - <workingSet id="papyrus-uml-text" name="Papyrus UML Text Editors"> - <predicate xsi:type="predicates:AndPredicate"> - <operand xsi:type="predicates:RepositoryPredicate" project="org.eclipse.papyrus.uml.textedit.common.xtext"/> - <operand xsi:type="predicates:NaturePredicate" nature="org.eclipse.pde.PluginNature"/> - <operand xsi:type="predicates:NamePredicate" pattern="org\.eclipse\.papyrus\.uml\.(textedit|xtext)($|\..+)"/> - <operand xsi:type="workingsets:ExclusionPredicate" excludedWorkingSet="//@projects[name='main']/@projects[name='uml-text']/@setupTasks.1/@workingSets[name='Papyrus%20UML%20Text%20Editors%20Tests']"/> + <setupTask + xsi:type="setup.workingsets:WorkingSetTask"> + <workingSet + name="Papyrus UML Alf" + id="papyrus-uml-alf"> + <predicate + xsi:type="predicates:AndPredicate"> + <operand + xsi:type="predicates:RepositoryPredicate" + project="org.eclipse.papyrus.uml.alf.common"/> + <operand + xsi:type="predicates:NaturePredicate" + nature="org.eclipse.pde.PluginNature"/> + <operand + xsi:type="predicates:NamePredicate" + pattern="org\.eclipse\.papyrus\.uml\.alf($|\..+)?"/> + <operand + xsi:type="workingsets:ExclusionPredicate" + excludedWorkingSet="//@projects[name='main']/@projects[name='uml-alf']/@setupTasks.1/@workingSets[name='Papyrus%20UML%20Alf%20Tests']"/> </predicate> </workingSet> - <workingSet id="papyrus-uml-text-tests" name="Papyrus UML Text Editors Tests"> - <predicate xsi:type="predicates:AndPredicate"> - <operand xsi:type="predicates:RepositoryPredicate" project="org.eclipse.papyrus.uml.textedit.parameter.tests"/> - <operand xsi:type="predicates:NaturePredicate" nature="org.eclipse.pde.PluginNature"/> - <operand xsi:type="predicates:NamePredicate" pattern="org\.eclipse\.papyrus\.uml\.textedit(\..+)?\.tests"/> + <workingSet + name="Papyrus UML Alf Tests" + id="papyrus-uml-alf-tests"> + <predicate + xsi:type="predicates:AndPredicate"> + <operand + xsi:type="predicates:RepositoryPredicate" + project="org.eclipse.papyrus.uml.alf.tests"/> + <operand + xsi:type="predicates:NaturePredicate" + nature="org.eclipse.pde.PluginNature"/> + <operand + xsi:type="predicates:NamePredicate" + pattern="org\.eclipse\.papyrus\.uml\.alf(\..*)?test(s)?"/> </predicate> </workingSet> - <workingSet id="papyrus-uml-text-features" name="Papyrus UML Text Editors Features"> - <predicate xsi:type="predicates:AndPredicate"> - <operand xsi:type="predicates:RepositoryPredicate" project="org.eclipse.papyrus.uml.textedit.feature"/> - <operand xsi:type="predicates:NaturePredicate" nature="org.eclipse.pde.FeatureNature"/> - <operand xsi:type="predicates:NamePredicate" pattern="org\.eclipse\.papyrus\.uml\.(textedit|xtext)($|\..+)"/> + <workingSet + name="Papyrus UML Alf Features" + id="papyrus-uml-alf-features"> + <predicate + xsi:type="predicates:AndPredicate"> + <operand + xsi:type="predicates:RepositoryPredicate" + project="org.eclipse.papyrus.uml.alf.feature"/> + <operand + xsi:type="predicates:NaturePredicate" + nature="org.eclipse.pde.FeatureNature"/> + <operand + xsi:type="predicates:NamePredicate" + pattern="org\.eclipse\.papyrus(\.tests)?\.uml\.alf($|\..+)?"/> </predicate> </workingSet> </setupTask> - <setupTask xsi:type="setup.p2:P2Task"> - <requirement name="org.eclipse.xtend.sdk.feature.group"/> + <setupTask + xsi:type="setup.p2:P2Task"> + <requirement + name="org.eclipse.xtend.sdk.feature.group"/> </setupTask> - <stream label="master (2021-06/5.2)" name="master"> - <setupTask xsi:type="setup:VariableTask" name="papyrus.bugzilla.version" value="${papyrus.bugzver.202103}"/> - </stream> - <stream label="4.8.0 (2020-06/4.8)" name="4.8.0_RC2"> - <setupTask xsi:type="setup:VariableTask" name="papyrus.bugzilla.version" value="${papyrus.bugzver.202006}"/> - </stream> - <stream label="streams/3.0-maintenance (Oxygen/3.x)" name="streams/3.0-maintenance"> - <setupTask xsi:type="setup:VariableTask" name="papyrus.bugzilla.version" value="${papyrus.bugzver.oxygen}"/> + <setupTask + xsi:type="setup.targlets:TargletTask"> + <targlet + name="Papyrus ALF Dependencies" + activeRepositoryList="${eclipse.target.platform}"> + <requirement + name="org.eclipse.ocl.core.sdk.feature.group"/> + <requirement + name="org.eclipse.m2m.qvt.oml.runtime.feature.group"/> + <requirement + name="org.eclipse.xtext.junit4"/> + </targlet> + </setupTask> + <stream + name="6.3.0" + label="6.3.0 (2022-12/6.3)"> + <setupTask + xsi:type="setup:VariableTask" + name="papyrus.bugzilla.version" + value="${papyrus.bugzver.202212}"/> </stream> </project> - <project label="EMF Facet" name="emffacet"> - <setupTask xsi:type="projects:ProjectsImportTask"> - <sourceLocator rootFolder="${papyrus.git.clone.location/plugins/facet}"> - <predicate xsi:type="predicates:NamePredicate" pattern="org\.eclipse\.papyrus\.emf\.facet\..*"/> + <project + name="uml-text" + label="UML Text Editors"> + <setupTask + xsi:type="projects:ProjectsImportTask"> + <sourceLocator + rootFolder="${papyrus.git.clone.location/plugins/uml}"> + <predicate + xsi:type="predicates:NamePredicate" + pattern="org\.eclipse\.papyrus\.uml\.(textedit|xtext)($|\..+)"/> </sourceLocator> - <sourceLocator rootFolder="${papyrus.git.clone.location/features}"> - <predicate xsi:type="predicates:AndPredicate"> - <operand xsi:type="predicates:NamePredicate" pattern="org\.eclipse\.papyrus\.(tests\.)?emf\.facet($|\..+)"/> - </predicate> + <sourceLocator + rootFolder="${papyrus.git.clone.location/tests/junit/plugins/uml}"> + <predicate + xsi:type="predicates:NamePredicate" + pattern="org\.eclipse\.papyrus\.uml\.(textedit|xtext)($|\..+)"/> </sourceLocator> - </setupTask> - <setupTask xsi:type="setup.workingsets:WorkingSetTask"> - <workingSet id="papyrus-emffacet" name="Papyrus EMF Facet"> - <predicate xsi:type="predicates:AndPredicate"> - <operand xsi:type="predicates:RepositoryPredicate" project="org.eclipse.papyrus.emf.facet.common.core"/> - <operand xsi:type="predicates:NaturePredicate" nature="org.eclipse.pde.PluginNature"/> - <operand xsi:type="predicates:NamePredicate" pattern="org\.eclipse\.papyrus\.emf\.facet($|\..+)"/> - </predicate> - </workingSet> - <workingSet id="papyrus-emffacet-features" name="Papyrus EMF Facet Features"> - <predicate xsi:type="predicates:AndPredicate"> - <operand xsi:type="predicates:RepositoryPredicate" project="org.eclipse.papyrus.emf.facet.feature"/> - <operand xsi:type="predicates:NaturePredicate" nature="org.eclipse.pde.FeatureNature"/> - <operand xsi:type="predicates:NamePredicate" pattern="org\.eclipse\.papyrus(\.tests)?\.emf\.facet($|\..+)"/> - </predicate> - </workingSet> - </setupTask> - <stream label="master (2021-06/5.2)" name="master"> - <setupTask xsi:type="setup:VariableTask" name="papyrus.bugzilla.version" value="${papyrus.bugzver.202103}"/> - </stream> - <stream label="4.8.0 (2020-06/4.8)" name="4.8.0_RC2"> - <setupTask xsi:type="setup:VariableTask" name="papyrus.bugzilla.version" value="${papyrus.bugzver.202006}"/> - </stream> - <stream label="streams/3.0-maintenance (Oxygen/3.x)" name="streams/3.0-maintenance"> - <setupTask xsi:type="setup:VariableTask" name="papyrus.bugzilla.version" value="${papyrus.bugzver.oxygen}"/> - </stream> - </project> - <project label="Documentation" name="doc"> - <setupTask xsi:type="projects:ProjectsImportTask"> - <sourceLocator rootFolder="${papyrus.git.clone.location/plugins/doc}"/> - <sourceLocator rootFolder="${papyrus.git.clone.location/features}"> - <predicate xsi:type="predicates:AndPredicate"> - <operand xsi:type="predicates:NamePredicate" pattern="org\.eclipse\.papyrus(\..+)?\.doc($|\..+)"/> - </predicate> + <sourceLocator + rootFolder="${papyrus.git.clone.location/features}"> + <predicate + xsi:type="predicates:NamePredicate" + pattern="org\.eclipse\.papyrus\.(tests\.)?uml\.(textedit|xtext)($|\..+)"/> </sourceLocator> </setupTask> - <setupTask xsi:type="setup.workingsets:WorkingSetTask"> - <workingSet id="papyrus-doc" name="Papyrus Documentation"> - <predicate xsi:type="predicates:AndPredicate"> - <operand xsi:type="predicates:RepositoryPredicate" project="org.eclipse.papyrus.uml.doc"/> - <operand xsi:type="predicates:NaturePredicate" nature="org.eclipse.pde.PluginNature"/> - <operand xsi:type="predicates:NamePredicate" pattern="org\.eclipse\.papyrus(\..+)?\.doc(umentation)?"/> + <setupTask + xsi:type="setup.workingsets:WorkingSetTask"> + <workingSet + name="Papyrus UML Text Editors" + id="papyrus-uml-text"> + <predicate + xsi:type="predicates:AndPredicate"> + <operand + xsi:type="predicates:RepositoryPredicate" + project="org.eclipse.papyrus.uml.textedit.common.xtext"/> + <operand + xsi:type="predicates:NaturePredicate" + nature="org.eclipse.pde.PluginNature"/> + <operand + xsi:type="predicates:NamePredicate" + pattern="org\.eclipse\.papyrus\.uml\.(textedit|xtext)($|\..+)"/> + <operand + xsi:type="workingsets:ExclusionPredicate" + excludedWorkingSet="//@projects[name='main']/@projects[name='uml-text']/@setupTasks.1/@workingSets[name='Papyrus%20UML%20Text%20Editors%20Tests']"/> </predicate> </workingSet> - <workingSet id="papyrus-doc-features" name="Papyrus Documentation Features"> - <predicate xsi:type="predicates:AndPredicate"> - <operand xsi:type="predicates:RepositoryPredicate" project="org.eclipse.papyrus.doc.feature"/> - <operand xsi:type="predicates:NaturePredicate" nature="org.eclipse.pde.FeatureNature"/> - <operand xsi:type="predicates:NamePredicate" pattern="org\.eclipse\.papyrus(\..+)?\.doc($|\..+)"/> + <workingSet + name="Papyrus UML Text Editors Tests" + id="papyrus-uml-text-tests"> + <predicate + xsi:type="predicates:AndPredicate"> + <operand + xsi:type="predicates:RepositoryPredicate" + project="org.eclipse.papyrus.uml.textedit.parameter.tests"/> + <operand + xsi:type="predicates:NaturePredicate" + nature="org.eclipse.pde.PluginNature"/> + <operand + xsi:type="predicates:NamePredicate" + pattern="org\.eclipse\.papyrus\.uml\.(textedit|xtext)(\..*)?test(s)?"/> </predicate> </workingSet> - </setupTask> - <stream label="master (2020-03/5.1)" name="master"> - <setupTask xsi:type="setup:VariableTask" name="papyrus.bugzilla.version" value="${papyrus.bugzver.202103}"/> - </stream> - <stream label="4.8.0 (2020-06/4.8)" name="4.8.0_RC2"> - <setupTask xsi:type="setup:VariableTask" name="papyrus.bugzilla.version" value="${papyrus.bugzver.202006}"/> - </stream> - <stream label="streams/3.0-maintenance (Oxygen/3.x)" name="streams/3.0-maintenance"> - <setupTask xsi:type="setup:VariableTask" name="papyrus.bugzilla.version" value="${papyrus.bugzver.oxygen}"/> - </stream> - </project> - <project label="All Tests" name="alltests"> - <setupTask xsi:type="projects:ProjectsImportTask"> - <sourceLocator rootFolder="${papyrus.git.clone.location/tests/junit/plugins}"/> - <sourceLocator rootFolder="${papyrus.git.clone.location/features}"> - <predicate xsi:type="predicates:AndPredicate"> - <operand xsi:type="predicates:NamePredicate" pattern="org\.eclipse\.papyrus\.tests\..+"/> - <operand xsi:type="predicates:NotPredicate"> - <operand xsi:type="predicates:NamePredicate" pattern=".*\.extra\..*"/> - </operand> - </predicate> - </sourceLocator> - </setupTask> - <setupTask xsi:type="setup.workingsets:WorkingSetTask"> - <workingSet id="papyrus-alltests" name="Papyrus All Tests"> - <predicate xsi:type="predicates:AndPredicate"> - <operand xsi:type="predicates:RepositoryPredicate" project="org.eclipse.papyrus.tests"/> - <operand xsi:type="predicates:NaturePredicate" nature="org.eclipse.pde.PluginNature"/> - <operand xsi:type="predicates:NamePredicate" pattern="org\.eclipse\.papyrus(\..+)?\.tests"/> - </predicate> - </workingSet> - <workingSet id="papyrus-alltests-features" name="Papyrus All Test Features"> - <predicate xsi:type="predicates:AndPredicate"> - <operand xsi:type="predicates:RepositoryPredicate" project="org.eclipse.papyrus.tests.feature"/> - <operand xsi:type="predicates:NaturePredicate" nature="org.eclipse.pde.FeatureNature"/> - <operand xsi:type="predicates:NamePredicate" pattern="org\.eclipse\.papyrus\.tests($|\..+)"/> + <workingSet + name="Papyrus UML Text Editors Features" + id="papyrus-uml-text-features"> + <predicate + xsi:type="predicates:AndPredicate"> + <operand + xsi:type="predicates:RepositoryPredicate" + project="org.eclipse.papyrus.uml.textedit.feature"/> + <operand + xsi:type="predicates:NaturePredicate" + nature="org.eclipse.pde.FeatureNature"/> + <operand + xsi:type="predicates:NamePredicate" + pattern="org\.eclipse\.papyrus(\.tests)?\.uml\.(textedit|xtext)($|\..+)"/> </predicate> </workingSet> </setupTask> - <setupTask xsi:type="setup.targlets:TargletTask"> - <targlet activeRepositoryList="${eclipse.target.platform}" name="Papyrus ALF Test Dependencies"> - <requirement name="org.eclipse.ocl.all.feature.group"/> - <requirement name="org.eclipse.m2m.qvt.oml.runtime.feature.group"/> - <requirement name="org.eclipse.xtext.junit4"/> - </targlet> + <setupTask + xsi:type="setup.p2:P2Task"> + <requirement + name="org.eclipse.xtend.sdk.feature.group"/> </setupTask> - <stream label="master (2021-06/5.2)" name="master"> - <setupTask xsi:type="setup:VariableTask" name="papyrus.bugzilla.version" value="${papyrus.bugzver.202103}"/> - </stream> - <stream label="4.8.0 (2020-06/4.8)" name="4.8.0_RC2"> - <setupTask xsi:type="setup:VariableTask" name="papyrus.bugzilla.version" value="${papyrus.bugzver.202006}"/> - </stream> - <stream label="streams/3.0-maintenance (Oxygen/3.x)" name="streams/3.0-maintenance"> - <setupTask xsi:type="setup:VariableTask" name="papyrus.bugzilla.version" value="${papyrus.bugzver.oxygen}"/> - </stream> - </project> - <project label="Others" name="misc"> - <stream label="master (2021-06/5.2)" name="master"> - <setupTask xsi:type="setup:VariableTask" name="papyrus.bugzilla.version" value="${papyrus.bugzver.202103}"/> - </stream> - <stream label="4.8.0 (2020-06/4.8)" name="4.8.0_RC2"> - <setupTask xsi:type="setup:VariableTask" name="papyrus.bugzilla.version" value="${papyrus.bugzver.202006}"/> - </stream> - <stream label="streams/3.0-maintenance (Oxygen/3.x)" name="streams/3.0-maintenance"> - <setupTask xsi:type="setup:VariableTask" name="papyrus.bugzilla.version" value="${papyrus.bugzver.oxygen}"/> + <stream + name="6.3.0" + label="6.3.0 (2022-12/6.3)"> + <setupTask + xsi:type="setup:VariableTask" + name="papyrus.bugzilla.version" + value="${papyrus.bugzver.202212}"/> </stream> </project> - <project label="Toolsmiths" name="toolsmiths"> - <setupTask xsi:type="setup.targlets:TargletTask"> - <targlet activeRepositoryList="${eclipse.target.platform}" name="Papyrus Releng Tools Dependencies"> - <requirement name="org.eclipse.oomph.setup.workingsets.feature.group" optional="true"/> - <requirement name="org.eclipse.oomph.setup.targlets.feature.group" optional="true"/> - <requirement name="org.eclipse.oomph.setup.feature.group" optional="true"/> - <requirement name="org.eclipse.cbi.p2repo.aggregator.engine.feature.feature.group"/> - <repositoryList name="2021-06"> - <repository url="${oomph.update.url}"/> - <repository url="https://download.eclipse.org/cbi/updates/aggregator/ide/4.13/"/> - </repositoryList> - <repositoryList name="2020-06"> - <repository url="${oomph.update.url}"/> - <repository url="https://download.eclipse.org/cbi/updates/aggregator/ide/4.13/"/> - </repositoryList> - </targlet> - </setupTask> - <setupTask xsi:type="setup.p2:P2Task"> - <requirement name="org.eclipse.m2m.qvt.oml.sdk.feature.group"/> - <requirement name="org.eclipse.xtend.sdk.feature.group"/> - <requirement name="org.eclipse.acceleo.feature.group"/> - <requirement name="org.eclipse.gmf.tooling.codegen.xtend2.feature.group"/> - </setupTask> - <setupTask xsi:type="projects:ProjectsImportTask"> - <sourceLocator rootFolder="${papyrus.git.clone.location/plugins/customization}"/> - <sourceLocator rootFolder="${papyrus.git.clone.location/tests/junit/plugins/customization}"/> - <sourceLocator rootFolder="${papyrus.git.clone.location/features/papyrus-toolsmiths-features}"/> - </setupTask> - <setupTask xsi:type="projects:ProjectsImportTask"> - <sourceLocator rootFolder="${papyrus.git.clone.location/plugins/toolsmiths}"/> - <sourceLocator rootFolder="${papyrus.git.clone.location/tests/junit/framework}"/> - <sourceLocator rootFolder="${papyrus.git.clone.location/features/papyrus-toolsmiths-features}"/> - <sourceLocator rootFolder="${papyrus.git.clone.location/releng}"/> + <project + name="views" + label="Views"> + <setupTask + xsi:type="projects:ProjectsImportTask"> + <sourceLocator + rootFolder="${papyrus.git.clone.location/plugins/views}"/> + <sourceLocator + rootFolder="${papyrus.git.clone.location/tests/junit/plugins/views}"/> + <sourceLocator + rootFolder="${papyrus.git.clone.location/features}"> + <predicate + xsi:type="predicates:NamePredicate" + pattern="org\.eclipse\.papyrus\.(tests\.)?views($|\..+)"/> + </sourceLocator> </setupTask> - <setupTask xsi:type="setup.workingsets:WorkingSetTask"> - <workingSet id="papyrus-toolsmiths" name="Papyrus Toolsmiths"> - <predicate xsi:type="predicates:AndPredicate"> - <operand xsi:type="predicates:RepositoryPredicate" project="org.eclipse.papyrus.toolsmiths"/> - <operand xsi:type="predicates:NaturePredicate" nature="org.eclipse.pde.PluginNature"/> - <operand xsi:type="workingsets:ExclusionPredicate" excludedWorkingSet="//@projects[name='dev']/@projects[name='releng']/@setupTasks.3/@workingSets[name='Papyrus%20Releng']"/> - <operand xsi:type="predicates:OrPredicate"> - <operand xsi:type="predicates:LocationPredicate" pattern="\Q${papyrus.git.clone.location|plugins/toolsmiths/}\E"/> - <operand xsi:type="predicates:NamePredicate" pattern=".*\.codegen.*|.*\.def.*|.*\.mwe2.*|.*\.toolsmiths.*|.*\.junit.*"/> - <operand xsi:type="predicates:NamePredicate" pattern=".*\.uml.profile.assistants.*|.*\.uml.profile.newchildmenu.*|.*\.uml.profile.types.*"/> - <operand xsi:type="predicates:NamePredicate" pattern=".*\.customization.nattableconfiguration.*"/> - <operand xsi:type="predicates:NamePredicate" pattern=".*\.qvto.tests.*|.*\.papyrus.gmf.*|.*\.emf.commandstack.*|.*\.css.debug"/> - </operand> - <operand xsi:type="predicates:NotPredicate"> - <operand xsi:type="predicates:NamePredicate" pattern=".*\.tests|.*\.test|.*\.doc"/> - </operand> - </predicate> - <predicate xsi:type="predicates:AndPredicate"> - <operand xsi:type="predicates:NaturePredicate" nature="org.eclipse.pde.PluginNature"/> - <operand xsi:type="predicates:OrPredicate"> - <operand xsi:type="predicates:NamePredicate" pattern="org\.eclipse\.papyrus\.customization(?:$|\..+)"/> - </operand> + <setupTask + xsi:type="setup.workingsets:WorkingSetTask"> + <workingSet + name="Papyrus Views" + id="papyrus-views"> + <predicate + xsi:type="predicates:AndPredicate"> + <operand + xsi:type="predicates:RepositoryPredicate" + project="org.eclipse.papyrus.views.properties"/> + <operand + xsi:type="predicates:NaturePredicate" + nature="org.eclipse.pde.PluginNature"/> + <operand + xsi:type="predicates:NamePredicate" + pattern="org\.eclipse\.papyrus\.views($|\..+)"/> + <operand + xsi:type="workingsets:ExclusionPredicate" + excludedWorkingSet="//@projects[name='main']/@projects[name='views']/@setupTasks.1/@workingSets[name='Papyrus%20Views%20Tests']"/> </predicate> </workingSet> - <workingSet id="papyrus-toolsmiths-features" name="Papyrus Toolsmiths Features"> - <predicate xsi:type="predicates:AndPredicate"> - <operand xsi:type="predicates:RepositoryPredicate" project="org.eclipse.papyrus.toolsmiths.feature"/> - <operand xsi:type="predicates:NaturePredicate" nature="org.eclipse.pde.FeatureNature"/> - <operand xsi:type="workingsets:ExclusionPredicate" excludedWorkingSet="//@projects[name='dev']/@projects[name='releng']/@setupTasks.3/@workingSets[name='Papyrus%20Releng%20Features']"/> - <operand xsi:type="predicates:OrPredicate"> - <operand xsi:type="predicates:LocationPredicate" pattern="\Q${papyrus.git.clone.location/plugins/papyrus-toolsmiths-features/}\E.+"/> - <operand xsi:type="predicates:NamePredicate" pattern=".*\.debug.*|.*\.diagramgen.*|.*\.junit.*|.*\.toolsmiths.*|.*\.assistants.*|.*\.qvto.*"/> - </operand> - <operand xsi:type="predicates:NotPredicate"> - <operand xsi:type="predicates:NamePredicate" pattern=".*\.tests|.*\.test|.*\.tests.*"/> - </operand> - </predicate> - <predicate xsi:type="predicates:AndPredicate"> - <operand xsi:type="predicates:RepositoryPredicate" project="org.eclipse.papyrus.toolsmiths.feature"/> - <operand xsi:type="predicates:NaturePredicate" nature="org.eclipse.pde.FeatureNature"/> - <operand xsi:type="predicates:NamePredicate" pattern="org\.eclipse\.papyrus\.toolsmiths(?:$|\..+)"/> + <workingSet + name="Papyrus Views Tests" + id="papyrus-views-tests"> + <predicate + xsi:type="predicates:AndPredicate"> + <operand + xsi:type="predicates:RepositoryPredicate" + project="org.eclipse.papyrus.views.modelexplorer.tests"/> + <operand + xsi:type="predicates:NaturePredicate" + nature="org.eclipse.pde.PluginNature"/> + <operand + xsi:type="predicates:NamePredicate" + pattern="org\.eclipse\.papyrus\.views(\..+)?\.tests"/> </predicate> </workingSet> - <workingSet id="papyrus-toolsmiths-tests" name="Papyrus Toolsmiths Tests"> - <predicate xsi:type="predicates:AndPredicate"> - <operand xsi:type="predicates:RepositoryPredicate" project="org.eclipse.papyrus.tests"/> - <operand xsi:type="predicates:NaturePredicate" nature="org.eclipse.pde.PluginNature"/> - <operand xsi:type="predicates:OrPredicate"> - <operand xsi:type="predicates:NamePredicate" pattern="org\.eclipse\.papyrus.bundles.tests"/> - <operand xsi:type="predicates:NamePredicate" pattern="org\.eclipse\.papyrus(\..+)?\.editors(\..+)?\.tests|org\.eclipse\.papyrus(\..+)?\.toolsmiths(\..+)?\.tests"/> - </operand> - </predicate> - <predicate xsi:type="predicates:AndPredicate"> - <operand xsi:type="predicates:RepositoryPredicate" project="org.eclipse.papyrus.tests.feature"/> - <operand xsi:type="predicates:NaturePredicate" nature="org.eclipse.pde.FeatureNature"/> - <operand xsi:type="predicates:OrPredicate"> - <operand xsi:type="predicates:NamePredicate" pattern="org\.eclipse\.papyrus\.tests\.toolsmiths\.feature"/> - </operand> + <workingSet + name="Papyrus Views Features" + id="papyrus-views-features"> + <predicate + xsi:type="predicates:AndPredicate"> + <operand + xsi:type="predicates:RepositoryPredicate" + project="org.eclipse.papyrus.views.properties.feature"/> + <operand + xsi:type="predicates:NaturePredicate" + nature="org.eclipse.pde.FeatureNature"/> + <operand + xsi:type="predicates:NamePredicate" + pattern="org\.eclipse\.papyrus\.(tests\.)?views($|\..+)"/> </predicate> </workingSet> </setupTask> - <stream label="master (2021-06/5.2)" name="master"> - <setupTask xsi:type="setup:VariableTask" name="papyrus.bugzilla.version" value="${papyrus.bugzver.202103}"/> - </stream> - <stream label="4.8.0 (2020-06/4.8)" name="4.8.0_RC2"> - <setupTask xsi:type="setup:VariableTask" name="papyrus.bugzilla.version" value="${papyrus.bugzver.202006}"/> - </stream> - <stream label="streams/3.0-maintenance (Oxygen/3.x)" name="streams/3.0-maintenance"> - <setupTask xsi:type="setup:VariableTask" name="papyrus.bugzilla.version" value="${papyrus.bugzver.oxygen}"/> + <stream + name="6.3.0" + label="6.3.0 (2022-12/6.3)"> + <setupTask + xsi:type="setup:VariableTask" + name="papyrus.bugzilla.version" + value="${papyrus.bugzver.202212}"/> </stream> </project> <description>Tools, dependencies, and sources for development of the main Papyrus components. Required for any Papyrus development.</description> </project> - <project label="Developer" name="dev"> - <setupTask xsi:type="projects:ProjectsImportTask"> - <sourceLocator rootFolder="${papyrus.git.clone.location/plugins/developer}"> - <predicate xsi:type="predicates:NotPredicate"> - <operand xsi:type="predicates:OrPredicate"> - <operand xsi:type="predicates:NamePredicate" pattern="org\.eclipse\.papyrus\.sysml\.sysmloveruml\.codegen"/> - <operand xsi:type="predicates:NamePredicate" pattern="org\.eclipse\.papyrus\.dev\.view\.services\.edit\.request"/> - <operand xsi:type="predicates:NamePredicate" pattern="org\.eclipse\.papyrus\.diagramdev\.modelexplorer"/> - <operand xsi:type="predicates:NamePredicate" pattern="org\.eclipse\.papyrus\.releng\.tools"/> - </operand> - </predicate> - </sourceLocator> - <sourceLocator rootFolder="${papyrus.git.clone.location/features/papyrus-dev-features}"/> - <sourceLocator rootFolder="${papyrus.git.clone.location/tests/junit/plugins/developer}"/> + <project name="toolsmiths" + label="Toolsmiths"> + <setupTask + xsi:type="setup.targlets:TargletTask"> + <targlet + name="Papyrus Releng Tools Dependencies" + activeRepositoryList="${eclipse.target.platform}"> + <requirement + name="org.eclipse.oomph.setup.workingsets.feature.group" + optional="true"/> + <requirement + name="org.eclipse.oomph.setup.targlets.feature.group" + optional="true"/> + <requirement + name="org.eclipse.oomph.setup.feature.group" + optional="true"/> + <requirement + name="org.eclipse.cbi.p2repo.aggregator.engine.feature.feature.group"/> + <repositoryList + name="2022-12"> + <repository + url="${oomph.update.url}"/> + <repository + url="https://download.eclipse.org/cbi/updates/aggregator/ide/4.13/"/> + </repositoryList> + </targlet> </setupTask> - <setupTask xsi:type="projects:ProjectsImportTask"> - <sourceLocator rootFolder="${papyrus.git.clone.location/plugins/toolsmiths}"/> - <sourceLocator rootFolder="${papyrus.git.clone.location/tests/junit/framework}"/> - <sourceLocator rootFolder="${papyrus.git.clone.location/features/papyrus-toolsmiths-features}"/> - <sourceLocator rootFolder="${papyrus.git.clone.location/releng}"/> + <setupTask + xsi:type="setup.p2:P2Task"> + <requirement + name="org.eclipse.m2m.qvt.oml.sdk.feature.group"/> + <requirement + name="org.eclipse.xtend.sdk.feature.group"/> + <requirement + name="org.eclipse.acceleo.feature.group"/> </setupTask> - <setupTask xsi:type="setup.targlets:TargletTask"> - <targlet name="Papyrus Developer Tools Dependencies"> - <requirement name="org.eclipse.gmf.tooling.codegen.xtend2.feature.group"/> - <requirement name="org.eclipse.acceleo.feature.group"/> - <requirement name="org.eclipse.gmf.tooling.feature.group"/> - <requirement name="org.eclipse.nebula.widgets.tablecombo.feature.feature.group"/> - </targlet> + <setupTask + xsi:type="projects:ProjectsImportTask"> + <sourceLocator + rootFolder="${papyrus.git.clone.location/plugins/toolsmiths}"/> + <sourceLocator + rootFolder="${papyrus.git.clone.location/tests/junit/framework}"/> + <sourceLocator + rootFolder="${papyrus.git.clone.location/features/papyrus-toolsmiths-features}"/> + <sourceLocator + rootFolder="${papyrus.git.clone.location/releng}"/> </setupTask> - <setupTask xsi:type="setup.p2:P2Task"> - <requirement name="org.eclipse.xtend.sdk.feature.group"/> - <requirement name="org.eclipse.acceleo.feature.group"/> + <setupTask + xsi:type="setup.workingsets:WorkingSetTask"> + <workingSet + name="Papyrus Toolsmiths" + id="papyrus-toolsmiths"> + <predicate + xsi:type="predicates:AndPredicate"> + <operand + xsi:type="predicates:RepositoryPredicate" + project="org.eclipse.papyrus.toolsmiths"/> + <operand + xsi:type="predicates:NaturePredicate" + nature="org.eclipse.pde.PluginNature"/> + <operand + xsi:type="workingsets:ExclusionPredicate" + excludedWorkingSet="//@projects[name='toolsmiths']/@setupTasks.3/@workingSets[name='Papyrus%20Toolsmiths%20Tests']"/> + <operand + xsi:type="predicates:OrPredicate"> + <operand + xsi:type="predicates:NamePredicate" + pattern="org\.eclipse\.papyrus(\..*)?(toolsmiths)(\..+)?"/> + <operand + xsi:type="predicates:NamePredicate" + pattern="org\.eclipse\.papyrus(\..*)?(rcp|releng)(\..+)?"/> + <operand + xsi:type="predicates:NamePredicate" + pattern="org\.eclipse\.papyrus(\..*)?(codegen|def|mwe2|junit|dev|gmf|architectureview)(\..+)?"/> + <operand + xsi:type="predicates:NamePredicate" + pattern="org\.eclipse\.papyrus(\..*)?(qvto.tests|emf.commandstack|css.debug|customization.nattableconfiguration)(\..+)?"/> + <operand + xsi:type="predicates:NamePredicate" + pattern="org\.eclipse\.papyrus(\..*)?(uml.profile.assistants|uml.profile.newchildmenu|uml.profile.types)(\..+)?"/> + </operand> + </predicate> + </workingSet> + <workingSet + name="Papyrus Toolsmiths Features" + id="papyrus-toolsmiths-features"> + <predicate + xsi:type="predicates:AndPredicate"> + <operand + xsi:type="predicates:RepositoryPredicate" + project="org.eclipse.papyrus.toolsmiths.feature"/> + <operand + xsi:type="predicates:NaturePredicate" + nature="org.eclipse.pde.FeatureNature"/> + <operand + xsi:type="predicates:OrPredicate"> + <operand + xsi:type="predicates:NamePredicate" + pattern="org\.eclipse\.papyrus(\.tests)?(\..*)?(toolsmiths)(\..+)?"/> + <operand + xsi:type="predicates:NamePredicate" + pattern="org\.eclipse\.papyrus(\.tests)?(\..*)?(releng|rcp)(\..+)?"/> + <operand + xsi:type="predicates:NamePredicate" + pattern="org\.eclipse\.papyrus(\.tests)?(\..*)?(debug|diagramgen|junit|assistants|qvto)(\..+)?"/> + </operand> + </predicate> + </workingSet> + <workingSet + name="Papyrus Toolsmiths Tests" + id="papyrus-toolsmiths-tests"> + <predicate + xsi:type="predicates:AndPredicate"> + <operand + xsi:type="predicates:RepositoryPredicate" + project="org.eclipse.papyrus.toolsmiths.suite.tests"/> + <operand + xsi:type="predicates:NaturePredicate" + nature="org.eclipse.pde.PluginNature"/> + <operand + xsi:type="predicates:OrPredicate"> + <operand + xsi:type="predicates:NamePredicate" + pattern="org\.eclipse\.papyrus(\..*)?(toolsmiths)(\..*)?test(s)?"/> + <operand + xsi:type="predicates:NamePredicate" + pattern="org\.eclipse\.papyrus(\..*)?(developer|bundles)(\..*)?test(s)?"/> + </operand> + </predicate> + </workingSet> </setupTask> - <project label="Oomph Setup" name="Oomph"> - <setupTask xsi:type="setup:EclipseIniTask" option="-Doomph.redirection.papyrussetups" value="=http://git.eclipse.org/c/papyrus/org.eclipse.papyrus.git/plain/releng/org.eclipse.papyrus.oomph/setups/->${papyrus.git.clone.location|uri}/releng/org.eclipse.papyrus.oomph/setups/" vm="true"/> - <stream label="master (2021-06/5.2)" name="master"> - <setupTask xsi:type="setup:VariableTask" name="papyrus.bugzilla.version" value="${papyrus.bugzver.202103}"/> - </stream> - <stream label="4.8.0 (2020-06/4.8)" name="4.8.0_RC2"> - <setupTask xsi:type="setup:VariableTask" name="papyrus.bugzilla.version" value="${papyrus.bugzver.202006}"/> - </stream> - <stream label="streams/3.0-maintenance (Oxygen/3.x)" name="streams/3.0-maintenance"> - <setupTask xsi:type="setup:VariableTask" name="papyrus.bugzilla.version" value="${papyrus.bugzver.master}"/> - <setupTask xsi:type="setup.targlets:TargletTask"> - <targlet activeRepositoryList="${eclipse.target.platform}" name="Papyrus Infra Oxygen Dependencies"> - <requirement name="org.eclipse.nebula.widgets.tablecombo.feature.feature.group"/> - </targlet> - </setupTask> - </stream> - <description>Additional configuration for developing and testing the Oomph setup model.</description> - </project> - <project label="Releng" name="releng"> - <setupTask xsi:type="setup.targlets:TargletTask"> - <targlet activeRepositoryList="${eclipse.target.platform}" name="Papyrus Releng Tools Dependencies"> - <requirement name="org.eclipse.oomph.setup.workingsets.feature.group" optional="true"/> - <requirement name="org.eclipse.oomph.setup.targlets.feature.group" optional="true"/> - <requirement name="org.eclipse.oomph.setup.feature.group" optional="true"/> - <requirement name="org.eclipse.cbi.p2repo.aggregator.engine.feature.feature.group"/> - <requirement name="org.eclipse.cbi.targetplatform-feature.feature.group"/> - <repositoryList name="2021-06"> - <repository url="${oomph.update.url}"/> - <repository url="https://download.eclipse.org/cbi/updates/aggregator/ide/4.13/"/> - <repository url="https://download.eclipse.org/cbi/tpd/3.0.0-SNAPSHOT"/> - </repositoryList> - <repositoryList name="2020-06"> - <repository url="${oomph.update.url}"/> - <repository url="https://download.eclipse.org/cbi/updates/aggregator/ide/4.13/"/> - <repository url="https://download.eclipse.org/cbi/tpd/3.0.0-SNAPSHOT"/> - </repositoryList> - <repositoryList name="Oxygen"> - <repository url="${oomph.update.url}"/> - <repository url="https://download.eclipse.org/cbi/updates/aggregator/ide/4.6/"/> - </repositoryList> - </targlet> - </setupTask> - <setupTask xsi:type="projects:ProjectsImportTask"> - <sourceLocator locateNestedProjects="true" rootFolder="${papyrus.git.clone.location/plugins/developer}"> - <predicate xsi:type="predicates:NamePredicate" pattern="org\.eclipse\.papyrus\.releng\.tools"/> - </sourceLocator> - <sourceLocator locateNestedProjects="true" rootFolder="${papyrus.git.clone.location/releng}"> - <excludedPath>emfgen</excludedPath> - </sourceLocator> - </setupTask> - <setupTask xsi:type="projects:ProjectsImportTask"> - <sourceLocator rootFolder="${papyrus.git.clone.location/tests/junit/plugins/customization}"/> - <sourceLocator rootFolder="${papyrus.git.clone.location/features/papyrus-toolsmiths-features}"/> - </setupTask> - <setupTask xsi:type="setup.workingsets:WorkingSetTask"> - <workingSet id="papyrus-releng" name="Papyrus Releng"> - <predicate xsi:type="predicates:AndPredicate"> - <operand xsi:type="predicates:RepositoryPredicate" project="releng"/> - <operand xsi:type="predicates:NamePredicate" pattern=".*\.releng.*|.*\.oomph.*|releng"/> - </predicate> - <predicate xsi:type="predicates:AndPredicate"> - <operand xsi:type="predicates:RepositoryPredicate" project="org.eclipse.papyrus.toolsmiths"/> - <operand xsi:type="predicates:NaturePredicate" nature="org.eclipse.pde.PluginNature"/> - <operand xsi:type="predicates:OrPredicate"> - <operand xsi:type="predicates:LocationPredicate" pattern="\Q${papyrus.git.clone.location/plugins/toolsmiths/}\E.+"/> - <operand xsi:type="predicates:NamePredicate" pattern=".*\.dev.*|.*\.releng.*"/> - <operand xsi:type="predicates:NamePredicate" pattern=".*\.oomph.*|releng"/> - </operand> - </predicate> - </workingSet> - <workingSet id="papyrus-releng-features" name="Papyrus Releng Features"> - <predicate xsi:type="predicates:AndPredicate"> - <operand xsi:type="predicates:RepositoryPredicate" project="org.eclipse.papyrus.releng.feature"/> - <operand xsi:type="predicates:NaturePredicate" nature="org.eclipse.pde.FeatureNature"/> - <operand xsi:type="predicates:OrPredicate"> - <operand xsi:type="predicates:LocationPredicate" pattern="\Q${papyrus.git.clone.location/plugins/papyrus-toolsmiths-features/}\E.+"/> - <operand xsi:type="predicates:NamePredicate" pattern="org\.eclipse\.papyrus\.releng(?:$|\..+)"/> - </operand> - </predicate> - </workingSet> - </setupTask> - <setupTask xsi:type="setup.p2:P2Task"> - <requirement name="org.eclipse.papyrus.releng.feature.feature.group"/> - <requirement name="org.eclipse.papyrus.editor.feature.feature.group"/> - <repository url="https://download.eclipse.org/modeling/mdt/papyrus/updates/releases/latest/"/> - </setupTask> - <stream label="master (2021-06/5.2)" name="master"> - <setupTask xsi:type="setup:VariableTask" name="papyrus.bugzilla.version" value="${papyrus.bugzver.202103}"/> - </stream> - <stream label="4.8.0 (2020-06/4.8)" name="4.8.0_RC2"> - <setupTask xsi:type="setup:VariableTask" name="papyrus.bugzilla.version" value="${papyrus.bugzver.202006}"/> - </stream> - <stream label="streams/3.0-maintenance (Oxygen/3.x)" name="streams/3.0-maintenance"> - <setupTask xsi:type="setup:VariableTask" name="papyrus.bugzilla.version" value="${papyrus.bugzver.master}"/> - <setupTask xsi:type="setup.targlets:TargletTask"> - <targlet activeRepositoryList="${eclipse.target.platform}" name="Papyrus Infra Oxygen Dependencies"> - <requirement name="org.eclipse.nebula.widgets.tablecombo.feature.feature.group"/> - </targlet> - </setupTask> - </stream> - <description>Release engineering tools, including the POM and Oomph Setup dependencies updater actions.</description> - </project> - <stream label="master (2021-06/5.2)" name="master"> - <setupTask xsi:type="setup:VariableTask" name="papyrus.bugzilla.version" value="${papyrus.bugzver.202103}"/> - </stream> - <stream label="4.8.0 (2020-06/4.8)" name="4.8.0_RC2"> - <setupTask xsi:type="setup:VariableTask" name="papyrus.bugzilla.version" value="${papyrus.bugzver.202006}"/> - </stream> - <stream label="streams/3.0-maintenance (Oxygen/3.x)" name="streams/3.0-maintenance"> - <setupTask xsi:type="setup:VariableTask" name="papyrus.bugzilla.version" value="${papyrus.bugzver.master}"/> + <stream + name="6.3.0" + label="6.3.0 (2022-12/6.3)"> + <setupTask + xsi:type="setup:VariableTask" + name="papyrus.bugzilla.version" + value="${papyrus.bugzver.202212}"/> </stream> - <description>Sources and tools required for working on the Papyrus developer tools (not part of the product). Does not install the developer tools in your IDE: use the Developer Tools sub-project for that.</description> </project> - <stream label="master (2021-06/5.2)" name="master"> - <setupTask xsi:type="setup:VariableTask" name="papyrus.bugzilla.version" value="${papyrus.bugzver.202103}"/> - <setupTask xsi:type="jdt:JRETask" version="JavaSE-11" location="${jre.location-11}" name="JRE for JavaSE-11"/> - <setupTask xsi:type="setup.targlets:TargletTask"> - <targlet name="Papyrus Test Generation Framework Dependencies"> - <requirement name="org.eclipse.upr.utp" optional="true"/> - <requirement name="org.eclipse.upr.utp.papyrus" optional="true"/> - <requirement name="org.eclipse.gmf.tooling.codegen.xtend2.feature.group"/> - <repositoryList> - <repository url="http://download.eclipse.org/upr/nightly/standardized/update/"/> - </repositoryList> - </targlet> - <targlet name="Papyrus Widgets Dependencies"> - <requirement name="org.eclipse.nebula.widgets.richtext.feature.feature.group"/> - <requirement name="org.eclipse.nebula.cwt.feature.feature.group"/> - </targlet> - </setupTask> - <setupTask xsi:type="setup.p2:P2Task" label="Papyrus Test Generation Framework Tools"> - <requirement name="org.eclipse.upr.utp" optional="true"/> - <requirement name="org.eclipse.upr.utp.papyrus" optional="true"/> - <repository url="http://download.eclipse.org/upr/nightly/standardized/update/"/> + <project name="alltests" + label="All Tests"> + <setupTask + xsi:type="projects:ProjectsImportTask"> + <sourceLocator + rootFolder="${papyrus.git.clone.location/tests/junit/framework}"> + <predicate + xsi:type="predicates:OrPredicate"> + <operand + xsi:type="predicates:NamePredicate" + pattern="org\.eclipse\.papyrus\.junit\.framework"/> + <operand + xsi:type="predicates:NamePredicate" + pattern="org\.eclipse\.papyrus\.junit\.utils"/> + </predicate> + </sourceLocator> + <sourceLocator + rootFolder="${papyrus.git.clone.location/tests/junit/plugins}"/> + <sourceLocator + rootFolder="${papyrus.git.clone.location/features}"> + <predicate + xsi:type="predicates:AndPredicate"> + <operand + xsi:type="predicates:NamePredicate" + pattern="org\.eclipse\.papyrus\.tests\..+"/> + </predicate> + </sourceLocator> </setupTask> - </stream> - <stream label="4.8.0 (2020-06/4.8)" name="4.8.0_RC2"> - <setupTask xsi:type="setup:VariableTask" name="papyrus.bugzilla.version" value="${papyrus.bugzver.202006}"/> - <setupTask xsi:type="jdt:JRETask" version="JavaSE-1.8" location="${jre.location-1.8}" name="JRE for JavaSE-1.8"/> - <setupTask xsi:type="setup.targlets:TargletTask"> - <targlet name="Papyrus Test Generation Framework Dependencies"> - <requirement name="org.eclipse.upr.utp" optional="true"/> - <requirement name="org.eclipse.upr.utp.papyrus" optional="true"/> - <requirement name="org.eclipse.gmf.tooling.codegen.xtend2.feature.group"/> - <repositoryList> - <repository url="http://download.eclipse.org/upr/nightly/standardized/update/"/> - </repositoryList> - </targlet> - <targlet name="Papyrus Widgets Dependencies"> - <requirement name="org.eclipse.nebula.widgets.richtext.feature.feature.group"/> - <requirement name="org.eclipse.nebula.cwt.feature.feature.group"/> + <setupTask + xsi:type="setup.targlets:TargletTask"> + <targlet + name="Papyrus ALF Test Dependencies" + activeRepositoryList="${eclipse.target.platform}"> + <requirement + name="org.eclipse.ocl.all.feature.group"/> + <requirement + name="org.eclipse.m2m.qvt.oml.runtime.feature.group"/> </targlet> </setupTask> - <setupTask xsi:type="setup.p2:P2Task" label="Papyrus Test Generation Framework Tools"> - <requirement name="org.eclipse.upr.utp" optional="true"/> - <requirement name="org.eclipse.upr.utp.papyrus" optional="true"/> - <repository url="http://download.eclipse.org/upr/nightly/standardized/update/"/> + <setupTask + xsi:type="setup.workingsets:WorkingSetTask"> + <workingSet + name="Papyrus All Tests" + id="papyrus-all-tests"> + <predicate + xsi:type="predicates:AndPredicate"> + <operand + xsi:type="predicates:NaturePredicate" + nature="org.eclipse.pde.PluginNature"/> + <operand + xsi:type="predicates:OrPredicate"> + <operand + xsi:type="predicates:NamePredicate" + pattern="org\.eclipse\.papyrus(\..*)?test(s)?"/> + </operand> + <operand + xsi:type="workingsets:ExclusionPredicate" + excludedWorkingSet="//@projects[name='main']/@projects[name='editor']/@setupTasks.1/@workingSets[name='Papyrus%20Editor%20Tests'] //@projects[name='main']/@projects[name='emffacet']/@setupTasks.1/@workingSets[name='Papyrus%20EMF%20Facet%20Tests'] //@projects[name='main']/@projects[name='emf']/@setupTasks.1/@workingSets[name='Papyrus%20Emf%20Tests'] //@projects[name='main']/@projects[name='infra']/@setupTasks.1/@workingSets[name='Papyrus%20Infra%20Tests'] //@projects[name='toolsmiths']/@setupTasks.3/@workingSets[name='Papyrus%20Toolsmiths%20Tests'] //@projects[name='main']/@projects[name='uml-alf']/@setupTasks.1/@workingSets[name='Papyrus%20UML%20Alf%20Tests'] //@projects[name='main']/@projects[name='uml']/@setupTasks.1/@workingSets[name='Papyrus%20UML%20Tests'] //@projects[name='main']/@projects[name='uml-text']/@setupTasks.1/@workingSets[name='Papyrus%20UML%20Text%20Editors%20Tests'] //@projects[name='main']/@projects[name='views']/@setupTasks.1/@workingSets[name='Papyrus%20Views%20Tests']"/> + </predicate> + </workingSet> </setupTask> - </stream> - <stream label="streams/3.0-maintenance (Oxygen/3.x)" name="streams/3.0-maintenance"> - <setupTask xsi:type="setup:VariableTask" name="papyrus.bugzilla.version" value="${papyrus.bugzver.oxygen}"/> - <setupTask xsi:type="jdt:JRETask" version="JavaSE-1.8" location="${jre.location-1.8}" name="JRE for JavaSE-1.8"/> - <setupTask xsi:type="setup.targlets:TargletTask"> - <targlet name="Papyrus Test Generation Framework Dependencies"> - <requirement name="org.eclipse.upr.utp" optional="true"/> - <requirement name="org.eclipse.upr.utp.papyrus" optional="true"/> - <requirement name="org.eclipse.gmf.tooling.codegen.xtend2.feature.group"/> + <stream + name="6.3.0" + label="6.3.0 (2022-12/6.3)"> + <setupTask + xsi:type="setup:VariableTask" + name="papyrus.bugzilla.version" + value="${papyrus.bugzver.202212}"/> + </stream> + </project> + <stream name="6.3.0" + label="6.3.0 (2022-12/6.3)"> + <setupTask + xsi:type="setup:VariableTask" + name="papyrus.bugzilla.version" + value="${papyrus.bugzver.202212}"/> + <setupTask + xsi:type="jdt:JRETask" + version="JavaSE-11" + location="${jre.location-11}" + name="JRE for JavaSE-11"/> + <setupTask + xsi:type="setup.targlets:TargletTask"> + <targlet + name="Papyrus Test Generation Framework Dependencies"> + <requirement + name="org.eclipse.upr.utp" + optional="true"/> + <requirement + name="org.eclipse.upr.utp.papyrus" + optional="true"/> <repositoryList> - <repository url="http://download.eclipse.org/upr/nightly/standardized/update/"/> + <repository + url="http://download.eclipse.org/upr/nightly/standardized/update/"/> </repositoryList> </targlet> - <targlet name="Papyrus Widgets Dependencies"> - <requirement name="org.eclipse.nebula.widgets.richtext.feature.feature.group"/> + <targlet + name="Papyrus Widgets Dependencies"> + <requirement + name="org.eclipse.nebula.widgets.richtext.feature.feature.group"/> + <requirement + name="org.eclipse.nebula.cwt.feature.feature.group"/> </targlet> </setupTask> - <setupTask xsi:type="setup.p2:P2Task" label="Papyrus Test Generation Framework Tools"> - <requirement name="org.eclipse.upr.utp" optional="true"/> - <requirement name="org.eclipse.upr.utp.papyrus" optional="true"/> - <repository url="http://download.eclipse.org/upr/nightly/standardized/update/"/> + <setupTask + xsi:type="setup.p2:P2Task" + label="Papyrus Test Generation Framework Tools"> + <requirement + name="org.eclipse.upr.utp" + optional="true"/> + <requirement + name="org.eclipse.upr.utp.papyrus" + optional="true"/> + <repository + url="http://download.eclipse.org/upr/nightly/standardized/update/"/> </setupTask> </stream> + <logicalProjectContainer + xsi:type="setup:ProjectCatalog" + href="index:/org.eclipse.setup#//@projectCatalogs[name='org.eclipse']"/> + <description>Workbench and workspace configuration for development on Papyrus</description> </setup:Project> diff --git a/releng/pom.xml b/releng/pom.xml index 15d37989fa1..4af0d593c5c 100644 --- a/releng/pom.xml +++ b/releng/pom.xml @@ -10,21 +10,21 @@ <properties> <!-- https://repo.maven.apache.org/maven2/ --> - <tycho-version>2.4.0</tycho-version> - <tychoExtrasVersion>2.4.0</tychoExtrasVersion> - <xtend-version>2.25.0.M1</xtend-version> - <xtext.version>2.25.0.M1</xtext.version> - <maven.resources.version>3.2.0</maven.resources.version> - <maven.clean.version>3.1.0</maven.clean.version> + <tycho-version>4.0.3</tycho-version> + <tychoExtrasVersion>4.0.3</tychoExtrasVersion> + <xtend-version>2.31.0</xtend-version> + <xtext.version>2.31.0</xtext.version> + <maven.resources.version>3.3.1</maven.resources.version> + <maven.clean.version>3.3.1</maven.clean.version> <mojo.execmaven.version>3.0.0</mojo.execmaven.version> <findbugs.version>3.0.5</findbugs.version> - <maven.compiler.version>3.8.1</maven.compiler.version> + <maven.compiler.version>3.11.0</maven.compiler.version> <!-- https://repo.eclipse.org/content/repositories/cbi-releases/ --> - <eclipse-cbi.version>1.3.2</eclipse-cbi.version> + <eclipse-cbi.version>1.4.2</eclipse-cbi.version> - <java.source.version>11</java.source.version> - <java.target.version>11</java.target.version> + <java.source.version>17</java.source.version> + <java.target.version>17</java.target.version> <skipAllTests>false</skipAllTests> <skipInnerTests>true</skipInnerTests> <!-- Set buildAll to true when building this pom directly (Rather than diff --git a/releng/rcp/org.eclipse.papyrus.rcp.feature/.settings/org.eclipse.jdt.core.prefs b/releng/rcp/org.eclipse.papyrus.rcp.feature/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/releng/rcp/org.eclipse.papyrus.rcp.feature/.settings/org.eclipse.jdt.core.prefs +++ b/releng/rcp/org.eclipse.papyrus.rcp.feature/.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/releng/rcp/org.eclipse.papyrus.rcp.feature/feature.properties b/releng/rcp/org.eclipse.papyrus.rcp.feature/feature.properties index d44e2b1ae0c..ccbd040cea7 100755 --- a/releng/rcp/org.eclipse.papyrus.rcp.feature/feature.properties +++ b/releng/rcp/org.eclipse.papyrus.rcp.feature/feature.properties @@ -1,5 +1,5 @@ ############################################################################### -# Copyright (c) 2017-2022 CEA LIST. +# 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 @@ -24,7 +24,7 @@ as indicated by feature numbers less than 1.0.0 on the feature list.\n # "copyright" property - text of the "Feature Update Copyright" copyright=\ -Copyright (c) 2022 CEA LIST.\n\ +Copyright (c) 2022-2023 CEA LIST.\n\ All rights reserved. This program and the accompanying materials\n\ are made available under the terms of the Eclipse Public License 2.0\n\ which accompanies this distribution, and is available at\n\ diff --git a/releng/rcp/org.eclipse.papyrus.rcp.feature/feature.xml b/releng/rcp/org.eclipse.papyrus.rcp.feature/feature.xml index 670383e2772..eb45098d7f7 100755 --- a/releng/rcp/org.eclipse.papyrus.rcp.feature/feature.xml +++ b/releng/rcp/org.eclipse.papyrus.rcp.feature/feature.xml @@ -2,7 +2,7 @@ <feature id="org.eclipse.papyrus.rcp.feature" label="%featureName" - version="6.2.0.qualifier" + version="6.6.0.qualifier" provider-name="%providerName" license-feature="org.eclipse.license" license-feature-version="2.0.2"> @@ -20,8 +20,8 @@ </license> <url> - <discovery label="2022-06" url="http://download.eclipse.org/releases/2022-06/"/> - <discovery label="Eclipse Platform 4.24" url="http://download.eclipse.org/eclipse/updates/4.24"/> + <discovery label="2023-12" url="http://download.eclipse.org/releases/2023-12/"/> + <discovery label="Eclipse Platform 4.30" url="http://download.eclipse.org/eclipse/updates/4.30"/> </url> <requires> @@ -48,7 +48,6 @@ <import feature="org.eclipse.emf.validation.sdk"/> <import feature="org.eclipse.emf.compare.source"/> <import feature="org.eclipse.emf.compare.ide.ui.source"/> - <import feature="org.eclipse.emf.cdo.epp"/> <import feature="org.eclipse.gmf.runtime.sdk"/> <import feature="org.eclipse.egit"/> <import feature="org.eclipse.egit.import"/> diff --git a/releng/rcp/org.eclipse.papyrus.rcp.feature/pom.xml b/releng/rcp/org.eclipse.papyrus.rcp.feature/pom.xml index 2b9ec2aa9ec..8649e6d7e9a 100755 --- a/releng/rcp/org.eclipse.papyrus.rcp.feature/pom.xml +++ b/releng/rcp/org.eclipse.papyrus.rcp.feature/pom.xml @@ -7,7 +7,7 @@ <parent> <artifactId>org.eclipse.papyrus.rcp.releng</artifactId> <groupId>org.eclipse.papyrus</groupId> - <version>6.2.0-SNAPSHOT</version> + <version>6.6.0-SNAPSHOT</version> </parent> <artifactId>org.eclipse.papyrus.rcp.feature</artifactId> diff --git a/releng/rcp/org.eclipse.papyrus.rcp.product/.settings/org.eclipse.jdt.core.prefs b/releng/rcp/org.eclipse.papyrus.rcp.product/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/releng/rcp/org.eclipse.papyrus.rcp.product/.settings/org.eclipse.jdt.core.prefs +++ b/releng/rcp/org.eclipse.papyrus.rcp.product/.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/releng/rcp/org.eclipse.papyrus.rcp.product/papyrus.product b/releng/rcp/org.eclipse.papyrus.rcp.product/papyrus.product index d110ba26608..3f7d7209185 100644 --- a/releng/rcp/org.eclipse.papyrus.rcp.product/papyrus.product +++ b/releng/rcp/org.eclipse.papyrus.rcp.product/papyrus.product @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <?pde version="3.5"?> -<product name="Papyrus" uid="org.eclipse.papyrus.rcp.product" id="org.eclipse.papyrus.rcp.product" application="org.eclipse.ui.ide.workbench" version="6.2.0.qualifier" useFeatures="true" includeLaunchers="true"> +<product name="Papyrus" uid="org.eclipse.papyrus.rcp.product" id="org.eclipse.papyrus.rcp.product" application="org.eclipse.ui.ide.workbench" version="6.6.0.qualifier" useFeatures="true" includeLaunchers="true" autoIncludeRequirements="true"> <aboutInfo> <image path="/org.eclipse.papyrus.rcp/icons/papyrus_lg.png"/> @@ -11,9 +11,9 @@ Version: {1} Build id: {0} -Copyright CEA LIST and others 2018-2022. http://www.eclipse.org/papyrus +Copyright CEA LIST and others 2018-2023. http://www.eclipse.org/papyrus -(c) Copyright Eclipse contributors and others 2000-2022. All rights reserved. Eclipse and the Eclipse logo are trademarks of the Eclipse Foundation, Inc., https://www.eclipse.org/. The Eclipse logo cannot be altered without Eclipse's permission. Eclipse logos are provided for use under the Eclipse logo and trademark guidelines, https://www.eclipse.org/logotm/. Oracle and Java are trademarks or registered trademarks of Oracle and/or its affiliates. Other names may be trademarks of their respective owners. +(c) Copyright Eclipse contributors and others 2000-2023. All rights reserved. Eclipse and the Eclipse logo are trademarks of the Eclipse Foundation, Inc., https://www.eclipse.org/. The Eclipse logo cannot be altered without Eclipse's permission. Eclipse logos are provided for use under the Eclipse logo and trademark guidelines, https://www.eclipse.org/logotm/. Oracle and Java are trademarks or registered trademarks of Oracle and/or its affiliates. Other names may be trademarks of their respective owners. This product includes software developed by other open source projects including the Apache Software Foundation, https://www.apache.org/. </text> @@ -200,16 +200,16 @@ Java and all Java-based trademarks are trademarks of Oracle Corporation in the U <plugin id="org.eclipse.equinox.p2.reconciler.dropins" autoStart="true" startLevel="4" /> <plugin id="org.eclipse.equinox.simpleconfigurator" autoStart="true" startLevel="1" /> <plugin id="org.eclipse.update.configurator" autoStart="true" startLevel="3" /> + <property name="osgi.bundles.defaultStartLevel" value="4" /> <property name="osgi.instance.area.default" value="@user.home/workspace-papyrus" /> <property name="org.eclipse.update.reconcile" value="false" /> - <property name="osgi.requiredJavaVersion" value="11" /> - <property name="osgi.bundles.defaultStartLevel" value="4" /> + <property name="osgi.requiredJavaVersion" value="17" /> </configurations> <repositories> - <repository location="https://download.eclipse.org/modeling/mdt/papyrus/updates/nightly/master/" enabled="true" /> <repository location="https://download.eclipse.org/releases/latest/" enabled="true" /> - <repository location="https://download.eclipse.org/eclipse/updates/4.24/" enabled="true" /> + <repository location="https://download.eclipse.org/eclipse/updates/4.30/" enabled="true" /> + <repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2023-12/" enabled="true"/> </repositories> <preferencesInfo> diff --git a/releng/rcp/org.eclipse.papyrus.rcp.product/pom.xml b/releng/rcp/org.eclipse.papyrus.rcp.product/pom.xml index 906b064dccd..d2231f4856a 100644 --- a/releng/rcp/org.eclipse.papyrus.rcp.product/pom.xml +++ b/releng/rcp/org.eclipse.papyrus.rcp.product/pom.xml @@ -7,7 +7,7 @@ <parent> <artifactId>org.eclipse.papyrus.rcp.releng</artifactId> <groupId>org.eclipse.papyrus</groupId> - <version>6.2.0-SNAPSHOT</version> + <version>6.6.0-SNAPSHOT</version> <relativePath>..</relativePath> </parent> diff --git a/releng/rcp/org.eclipse.papyrus.rcp/.classpath b/releng/rcp/org.eclipse.papyrus.rcp/.classpath index bc3587db485..a7a673fa7ab 100644 --- a/releng/rcp/org.eclipse.papyrus.rcp/.classpath +++ b/releng/rcp/org.eclipse.papyrus.rcp/.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/releng/rcp/org.eclipse.papyrus.rcp/.settings/org.eclipse.jdt.core.prefs b/releng/rcp/org.eclipse.papyrus.rcp/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/releng/rcp/org.eclipse.papyrus.rcp/.settings/org.eclipse.jdt.core.prefs +++ b/releng/rcp/org.eclipse.papyrus.rcp/.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/releng/rcp/org.eclipse.papyrus.rcp/META-INF/MANIFEST.MF b/releng/rcp/org.eclipse.papyrus.rcp/META-INF/MANIFEST.MF index fd43456c679..8dd98214c01 100644 --- a/releng/rcp/org.eclipse.papyrus.rcp/META-INF/MANIFEST.MF +++ b/releng/rcp/org.eclipse.papyrus.rcp/META-INF/MANIFEST.MF @@ -2,11 +2,11 @@ Manifest-Version: 1.0 Require-Bundle: org.eclipse.e4.ui.css.swt.theme Bundle-Vendor: %pluginProvider Bundle-ActivationPolicy: lazy -Bundle-Version: 6.2.0.qualifier +Bundle-Version: 6.6.0.qualifier Eclipse-BundleShape: dir Bundle-Name: %pluginName Bundle-Localization: plugin Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.rcp;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.rcp diff --git a/releng/rcp/org.eclipse.papyrus.rcp/icons/splash.svg b/releng/rcp/org.eclipse.papyrus.rcp/icons/splash.svg index 6a644d3acd9..652db37c2de 100644 --- a/releng/rcp/org.eclipse.papyrus.rcp/icons/splash.svg +++ b/releng/rcp/org.eclipse.papyrus.rcp/icons/splash.svg @@ -1,22 +1,22 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <svg - xmlns:dc="http://purl.org/dc/elements/1.1/" - xmlns:cc="http://creativecommons.org/ns#" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns="http://www.w3.org/2000/svg" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" id="svg2" height="350" width="460" version="1.2" sodipodi:docname="splash.svg" - inkscape:version="0.92.4 (5da689c313, 2019-01-14)" + inkscape:version="1.1 (c68e22c387, 2021-05-23)" inkscape:export-filename="C:\cygwin64\home\Papyrus\Papyrus-Master\releng\rcp\org.eclipse.papyrus.rcp\icons\splash.png" inkscape:export-xdpi="96" - inkscape:export-ydpi="96"> + inkscape:export-ydpi="96" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> <sodipodi:namedview pagecolor="#ffffff" bordercolor="#666666" @@ -26,18 +26,20 @@ guidetolerance="10" inkscape:pageopacity="0" inkscape:pageshadow="2" - inkscape:window-width="2560" - inkscape:window-height="1377" + inkscape:window-width="1920" + inkscape:window-height="1017" id="namedview334" showgrid="false" inkscape:zoom="1.3485714" - inkscape:cx="-230.98517" - inkscape:cy="102.70127" - inkscape:window-x="4472" + inkscape:cx="121.23941" + inkscape:cy="217.63772" + inkscape:window-x="-8" inkscape:window-y="-8" inkscape:window-maximized="1" inkscape:current-layer="svg2" - inkscape:pagecheckerboard="0" /> + inkscape:pagecheckerboard="0" + inkscape:showpageshadow="2" + inkscape:deskcolor="#d1d1d1" /> <defs id="defs4"> <linearGradient @@ -1776,15 +1778,15 @@ style="fill:#ffffff;fill-opacity:1;stroke:none" /> <text xml:space="preserve" - style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:14.66670036px;line-height:0%;font-family:'Indie Flower';-inkscape-font-specification:'Indie Flower';letter-spacing:0px;word-spacing:0px;fill:#0099ba;fill-opacity:1;stroke:none;stroke-width:1;stroke-opacity:1" - x="197.48167" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:14.6667px;line-height:0%;font-family:'Indie Flower';-inkscape-font-specification:'Indie Flower';letter-spacing:0px;word-spacing:0px;fill:#0099ba;fill-opacity:1;stroke:none;stroke-width:1;stroke-opacity:1" + x="205.48167" y="240.93285" id="text4834" inkscape:export-xdpi="96" inkscape:export-ydpi="96"><tspan id="tspan4832" - x="197.48167" + x="205.48167" y="240.93285" - style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:14.66670036px;line-height:1.25;font-family:'Open Sans';-inkscape-font-specification:'Open Sans';fill:#333333;fill-opacity:1;stroke:none;stroke-width:1;stroke-opacity:1" - dy="-2.2245762 0 0 0 0 0 0 0 -2.2245762">2022-06N</tspan></text> + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:14.6667px;line-height:1.25;font-family:'Open Sans';-inkscape-font-specification:'Open Sans';fill:#333333;fill-opacity:1;stroke:none;stroke-width:1;stroke-opacity:1" + dy="-2.2245762 0 0 0 0 0 0 -2.2245762">2023-12</tspan></text> </svg> diff --git a/releng/rcp/org.eclipse.papyrus.rcp/plugin.properties b/releng/rcp/org.eclipse.papyrus.rcp/plugin.properties index 122651986ca..8f8ff1de978 100644 --- a/releng/rcp/org.eclipse.papyrus.rcp/plugin.properties +++ b/releng/rcp/org.eclipse.papyrus.rcp/plugin.properties @@ -1,5 +1,5 @@ ################################################################################ -# Copyright (c) 2008-2022 CEA LIST. +# Copyright (c) 2008-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 diff --git a/releng/rcp/org.eclipse.papyrus.rcp/plugin.xml b/releng/rcp/org.eclipse.papyrus.rcp/plugin.xml index 1b6239e4e76..2d0ebf398ff 100644 --- a/releng/rcp/org.eclipse.papyrus.rcp/plugin.xml +++ b/releng/rcp/org.eclipse.papyrus.rcp/plugin.xml @@ -6,7 +6,7 @@ point="org.eclipse.core.runtime.products"> <product application="org.eclipse.ui.ide.workbench" - description="Papyrus

Version: {1}

(c) Copyright Eclipse contributors and others 2000-2022. All rights reserved.
Visit http://www.eclipse.org/platform

This product includes software developed by the
Apache Software Foundation http://www.apache.org/" + description="Papyrus

Version: {1}

(c) Copyright Eclipse contributors and others 2000-2023. All rights reserved.
Visit http://www.eclipse.org/platform

This product includes software developed by the
Apache Software Foundation http://www.apache.org/" name="Papyrus"> <property name="windowImages" value="icons/papyrus16.png,icons/papyrus32.png,icons/papyrus48.png,icons/papyrus64.png,icons/papyrus128.png"/> <property name="aboutImage" value="icons/papyrus_lg.png"/> @@ -47,7 +47,7 @@ </property> <property name="aboutText" - value="Papyrus

Version: {1}
Build id: {0}

Copyright CEA LIST and others 2022. http://www.eclipse.org/papyrus

(c) Copyright Eclipse contributors and others 2000-2022. All rights reserved. Eclipse and the Eclipse logo are trademarks of the Eclipse Foundation, Inc., https://www.eclipse.org/. The Eclipse logo cannot be altered without Eclipse's permission. Eclipse logos are provided for use under the Eclipse logo and trademark guidelines, https://www.eclipse.org/logotm/. Oracle and Java are trademarks or registered trademarks of Oracle and/or its affiliates. Other names may be trademarks of their respective owners.

This product includes software developed by other open source projects including the Apache Software Foundation, https://www.apache.org/.
"> + value="Papyrus

Version: {1}
Build id: {0}

Copyright CEA LIST and others 2023. http://www.eclipse.org/papyrus

(c) Copyright Eclipse contributors and others 2000-2023. All rights reserved. Eclipse and the Eclipse logo are trademarks of the Eclipse Foundation, Inc., https://www.eclipse.org/. The Eclipse logo cannot be altered without Eclipse's permission. Eclipse logos are provided for use under the Eclipse logo and trademark guidelines, https://www.eclipse.org/logotm/. Oracle and Java are trademarks or registered trademarks of Oracle and/or its affiliates. Other names may be trademarks of their respective owners.

This product includes software developed by other open source projects including the Apache Software Foundation, https://www.apache.org/.
"> </property> <property name="preferenceCustomization" diff --git a/releng/rcp/org.eclipse.papyrus.rcp/pom.xml b/releng/rcp/org.eclipse.papyrus.rcp/pom.xml index 6ad3ef30589..0ee02011f55 100755 --- a/releng/rcp/org.eclipse.papyrus.rcp/pom.xml +++ b/releng/rcp/org.eclipse.papyrus.rcp/pom.xml @@ -7,7 +7,7 @@ <parent> <artifactId>org.eclipse.papyrus.rcp.releng</artifactId> <groupId>org.eclipse.papyrus</groupId> - <version>6.2.0-SNAPSHOT</version> + <version>6.6.0-SNAPSHOT</version> </parent> <artifactId>org.eclipse.papyrus.rcp</artifactId> diff --git a/releng/rcp/org.eclipse.papyrus.rcp/splash.bmp b/releng/rcp/org.eclipse.papyrus.rcp/splash.bmp Binary files differindex 593eab993f4..5611a0e25dc 100755 --- a/releng/rcp/org.eclipse.papyrus.rcp/splash.bmp +++ b/releng/rcp/org.eclipse.papyrus.rcp/splash.bmp diff --git a/releng/rcp/pom.xml b/releng/rcp/pom.xml index 8b69bac19e6..96219b2129a 100644 --- a/releng/rcp/pom.xml +++ b/releng/rcp/pom.xml @@ -11,7 +11,7 @@ </parent> <artifactId>org.eclipse.papyrus.rcp.releng</artifactId> - <version>6.2.0-SNAPSHOT</version> + <version>6.6.0-SNAPSHOT</version> <packaging>pom</packaging> <modules> @@ -26,7 +26,7 @@ <eclipse.simultaneous.release.build>${maven.build.timestamp}</eclipse.simultaneous.release.build> <!-- Human readable name of the release, e.g. used in the about dialog (see about.mappings) --> - <eclipse.simultaneous.release.name>2022-06 (4.24)</eclipse.simultaneous.release.name> + <eclipse.simultaneous.release.name>2023-12 (4.30)</eclipse.simultaneous.release.name> <target.platform>org.eclipse.papyrus.rcp.targetplatform</target.platform> </properties> diff --git a/releng/rcp/targetPlatform/org.eclipse.papyrus.rcp.targetplatform.target b/releng/rcp/targetPlatform/org.eclipse.papyrus.rcp.targetplatform.target index e36d588e3e9..96b4baa4759 100755 --- a/releng/rcp/targetPlatform/org.eclipse.papyrus.rcp.targetplatform.target +++ b/releng/rcp/targetPlatform/org.eclipse.papyrus.rcp.targetplatform.target @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <?pde?> <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl --> -<target name="Papyrus RCP" sequenceNumber="1651648009"> +<target name="Papyrus RCP" sequenceNumber="1704448694"> <locations> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.nebula.widgets.richtext.feature.feature.group" version="1.2.0.201703081533"/> @@ -18,87 +18,84 @@ <repository id="nattable" location="http://download.eclipse.org/nattable/releases/1.5.0/repository"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="com.google.guava" version="30.1.0.v20210127-2300"/> - <unit id="com.google.guava.source" version="30.1.0.v20210127-2300"/> - <unit id="com.google.gson" version="2.7.0.v20170129-0911"/> - <unit id="com.google.gson.source" version="2.7.0.v20170129-0911"/> - <unit id="org.apache.commons.lang3" version="3.1.0.v201403281430"/> - <unit id="org.apache.commons.lang3.source" version="3.1.0.v201403281430"/> - <unit id="org.objectweb.asm" version="5.0.1.v201404251740"/> - <unit id="org.objectweb.asm.source" version="5.0.1.v201404251740"/> - <unit id="com.google.inject" version="3.0.0.v201605172100"/> - <unit id="org.apache.batik.anim" version="1.14.0.v20210324-0332"/> - <unit id="org.apache.batik.dom" version="1.14.0.v20210324-0332"/> - <unit id="org.apache.batik.dom.svg" version="1.14.0.v20210324-0332"/> - <unit id="org.apache.batik.xml" version="1.14.0.v20210324-0332"/> - <repository id="orbit" location="https://download.eclipse.org/tools/orbit/downloads/drops/R20220302172233/repository/"/> + <unit id="org.apache.commons.io" version="2.8.0.v20210415-0900"/> + <unit id="org.apache.logging.log4j" version="2.17.1.v20220106-2156"/> + <repository id="orbit2" location="https://download.eclipse.org/tools/orbit/downloads/drops/R20230531010532/repository/"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.xwt.feature.feature.group" version="0.0.0"/> - <repository id="xwt" location="https://download.eclipse.org/xwt/milestones-1.7.0/1.7.0-S/"/> + <unit id="com.google.guava" version="32.1.3.jre"/> + <unit id="com.google.guava.source" version="32.1.3.jre"/> + <unit id="com.google.gson" version="2.10.1"/> + <unit id="com.google.gson.source" version="2.10.1"/> + <unit id="org.apache.batik.anim" version="1.17.0.v20231009-1000"/> + <unit id="org.apache.batik.dom" version="1.17.0.v20231009-1000"/> + <unit id="org.apache.batik.dom.svg" version="1.17.0.v20231009-1000"/> + <unit id="org.apache.batik.xml" version="1.17.0.v20231009-1000"/> + <unit id="com.google.inject" version="7.0.0"/> + <unit id="org.eclipse.orbit.xml-apis-ext" version="1.0.0.v20230923-0644"/> + <repository id="orbit" location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2023-12/"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.m2m.qvt.oml.sdk.feature.group" version="3.10.6.v20220309-1013"/> - <repository id="qvto" location="https://download.eclipse.org/mmt/qvto/updates/releases/3.10.6"/> + <unit id="org.eclipse.xwt.feature.feature.group" version="0.0.0"/> + <repository id="xwt" location="https://download.eclipse.org/xwt/release-1.9.100/"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.xpand.sdk.feature.group" version="2.2.0.v201605260315"/> - <unit id="org.eclipse.xtend.feature.group" version="2.2.0.v201605260315"/> - <repository id="xpand" location="https://download.eclipse.org/modeling/m2t/xpand/updates/releases/R201605260315/"/> + <unit id="org.eclipse.m2m.qvt.oml.sdk.feature.group" version="3.10.8.v20231126-0839"/> + <repository id="qvto" location="https://download.eclipse.org/mmt/qvto/updates/releases/3.10.8"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.uml2.sdk.feature.group" version="5.5.2.v20210228-1829"/> + <unit id="org.eclipse.uml2.sdk.feature.group" version="5.5.3.v20221116-1811"/> <repository id="uml" location="https://download.eclipse.org/modeling/mdt/uml2/updates/5.5"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.ocl.examples.classic.feature.group" version="5.17.1.v20220309-0840"/> - <unit id="org.eclipse.ocl.examples.feature.group" version="6.17.1.v20220309-0840"/> - <repository id="ocl" location="https://download.eclipse.org/modeling/mdt/ocl/updates/releases/6.17.1"/> + <unit id="org.eclipse.ocl.examples.classic.feature.group" version="5.19.0.v20231129-1236"/> + <unit id="org.eclipse.ocl.examples.feature.group" version="6.19.0.v20231129-1236"/> + <repository id="ocl" location="https://download.eclipse.org/modeling/mdt/ocl/updates/releases/6.19.0"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.xtext.sdk.feature.group" version="2.27.0.v20220501-1041"/> - <unit id="org.eclipse.xtend.sdk.feature.group" version="2.27.0.v20220501-1041"/> - <unit id="org.eclipse.xtext.redist.feature.group" version="2.27.0.v20220501-1041"/> - <unit id="org.eclipse.xtext.runtime.feature.group" version="2.27.0.v20220501-1041"/> - <unit id="org.eclipse.xtext.ui.feature.group" version="2.27.0.v20220501-1041"/> - <unit id="org.eclipse.xtext.generator.feature.group" version="2.27.0.v20220501-1041"/> - <repository id="xtext" location="https://download.eclipse.org/modeling/tmf/xtext/updates/milestones/S202205011041"/> + <unit id="org.eclipse.xtext.sdk.feature.group" version="2.33.0.v20231121-0955"/> + <unit id="org.eclipse.xtend.sdk.feature.group" version="2.33.0.v20231121-0955"/> + <unit id="org.eclipse.xtext.redist.feature.group" version="2.33.0.v20231121-0955"/> + <unit id="org.eclipse.xtext.runtime.feature.group" version="2.33.0.v20231121-0955"/> + <unit id="org.eclipse.xtext.ui.feature.group" version="2.33.0.v20231121-0955"/> + <unit id="org.eclipse.xtext.xtext.generator" version="2.33.0.v20231121-0955"/> + <repository id="xtext" location="https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.33.0"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.emf.mwe2.language.sdk.feature.group" version="2.13.0.v20220429-1234"/> - <repository id="mwe" location="https://download.eclipse.org/modeling/emft/mwe/updates/milestones/S202204291234/"/> + <unit id="org.eclipse.emf.mwe2.language.sdk.feature.group" version="2.16.0.v20231117-0522"/> + <repository id="mwe" location="https://download.eclipse.org/modeling/emft/mwe/updates/releases/2.16.0/"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.wst.xml_ui.feature.feature.group" version="0.0.0"/> - <repository id="webtools" location="https://download.eclipse.org/webtools/downloads/drops/R3.26.0/S-3.26M1a-20220411232710/repository/"/> + <repository id="webtools" location="https://download.eclipse.org/webtools/downloads/drops/R3.32.0/S-3.32M3a-20231114230950/repository/"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="1.14.2.202204130739"/> - <repository id="gmfRuntime" location="https://download.eclipse.org/modeling/gmp/gmf-runtime/updates/releases/R202204130739"/> + <unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="1.16.2.202311130907"/> + <repository id="gmfRuntime" location="https://download.eclipse.org/modeling/gmp/gmf-runtime/updates/releases/R202311130907/"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.gmf.runtime.notation.sdk.feature.group" version="1.13.0.202004160913"/> - <repository id="gmfNotation" location="https://download.eclipse.org/modeling/gmp/gmf-notation/updates/releases/R202004160913"/> + <unit id="org.eclipse.gmf.runtime.notation.sdk.feature.group" version="1.13.1.202211151334"/> + <repository id="gmfNotation" location="https://download.eclipse.org/modeling/gmp/gmf-notation/updates/releases/R202211151334"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.emf.query.sdk.feature.group" version="1.12.0.201805030653"/> - <repository id="emfQuery" location="https://download.eclipse.org/modeling/emf/query/updates/releases/R201805030653"/> + <unit id="org.eclipse.emf.query.sdk.feature.group" version="1.12.1.202208101410"/> + <repository id="emfQuery" location="https://download.eclipse.org/modeling/emf/query/updates/releases/R202208101410"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.emf.validation.sdk.feature.group" version="1.12.2.202008210805"/> - <repository id="emfValidation" location="https://download.eclipse.org/modeling/emf/validation/updates/releases/R202008210805"/> + <unit id="org.eclipse.emf.validation.sdk.feature.group" version="1.13.3.202305230712"/> + <repository id="emfValidation" location="https://download.eclipse.org/modeling/emf/validation/updates/releases/R202305230712"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.emf.transaction.sdk.feature.group" version="1.12.0.201805140824"/> - <repository id="emfTransaction" location="https://download.eclipse.org/modeling/emf/transaction/updates/releases/R201805140824/"/> + <unit id="org.eclipse.emf.transaction.sdk.feature.group" version="1.13.0.202208110935"/> + <repository id="emfTransaction" location="https://download.eclipse.org/modeling/emf/transaction/updates/releases/R202208110935"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.gef.feature.group" version="3.11.0.201606061308"/> - <repository id="gef" location="https://download.eclipse.org/tools/gef/updates/legacy/releases/4.0.0_gef-master_1952"/> + <unit id="org.eclipse.gef.feature.group" version="3.18.0.202311222042"/> + <repository id="gef" location="https://download.eclipse.org/tools/gef/classic/releases/3.18.0"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.justj.openjdk.hotspot.jre.full.feature.group" version="0.0.0"/> - <repository id="justj" location="https://download.eclipse.org/justj/jres/11/updates/release"/> + <repository id="justj" location="https://download.eclipse.org/justj/jres/17/updates/release"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.mylyn.ide_feature.feature.group" version="3.25.2.v20200828-1617"/> @@ -110,33 +107,29 @@ <repository id="mylyn" location="https://download.eclipse.org/mylyn/drops/3.25.2/v20200831-1956"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.egit.feature.group" version="6.1.0.202203080745-r"/> - <repository id="egit" location="https://download.eclipse.org/egit/updates-6.1"/> - </location> - <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.e4.core.tools.feature.feature.group" version="4.24.0.v20220420-0901"/> - <unit id="org.eclipse.rcp.configuration.feature.group" version="1.1.1700.v20220428-1800"/> - <unit id="org.eclipse.equinox.executable.feature.group" version="3.8.1700.v20220419-2255"/> - <unit id="org.eclipse.sdk.feature.group" version="4.24.0.v20220428-1800"/> - <repository id="platform" location="https://download.eclipse.org/eclipse/updates/4.24-I-builds/I20220428-1800/"/> + <unit id="org.eclipse.egit.feature.group" version="6.8.0.202311291450-r"/> + <repository id="egit" location="https://download.eclipse.org/egit/updates-6.8"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.emf.compare.source.feature.group" version="3.3.18.202202240907"/> - <unit id="org.eclipse.emf.compare.ide.ui.source.feature.group" version="3.3.18.202202240907"/> - <repository id="emfCompare" location="https://download.eclipse.org/modeling/emf/compare/updates/milestones/3.3/S202202240907"/> + <unit id="org.eclipse.e4.core.tools.feature.feature.group" version="4.30.0.v20231106-1600"/> + <unit id="org.eclipse.rcp.configuration.feature.group" version="1.1.2100.v20231004-0459"/> + <unit id="org.eclipse.equinox.executable.feature.group" version="3.8.2300.v20231106-1826"/> + <unit id="org.eclipse.sdk.feature.group" version="4.30.0.v20231201-0512"/> + <repository id="platform" location="https://download.eclipse.org/eclipse/updates/4.30/R-4.30-202312010110"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.xsd.sdk.feature.group" version="2.30.0.v20220317-1532"/> - <unit id="org.eclipse.emf.sdk.feature.group" version="2.30.0.v20220426-0617"/> - <repository id="emf" location="https://download.eclipse.org/modeling/emf/emf/builds/milestone/S202204260307"/> + <unit id="org.eclipse.emf.compare.source.feature.group" version="3.3.23.202311200811"/> + <unit id="org.eclipse.emf.compare.ide.ui.source.feature.group" version="3.3.23.202311200811"/> + <repository id="emfCompare" location="https://download.eclipse.org/modeling/emf/compare/updates/milestones/3.3/S202311200811/"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.emf.cdo.epp.feature.group" version="4.18.0.v20220309-1619"/> - <repository id="cdo" location="https://download.eclipse.org/modeling/emf/cdo/drops/R20220309-1120"/> + <unit id="org.eclipse.xsd.sdk.feature.group" version="2.36.0.v20230916-0637"/> + <unit id="org.eclipse.emf.sdk.feature.group" version="2.36.0.v20231107-0612"/> + <repository id="emf" location="https://download.eclipse.org/modeling/emf/emf/builds/release/2.36.0"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.epp.mpc.feature.group" version="1.10.0.v20220502-0731"/> - <repository id="marketPlace" location="https://download.eclipse.org/mpc/drops/1.10.0/v20220502-0731/"/> + <unit id="org.eclipse.epp.mpc.feature.group" version="1.10.2.v20231116-1812"/> + <repository id="marketPlace" location="https://download.eclipse.org/mpc/drops/1.10.2/v20231116-1812/"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.userstorage.feature.group" version="1.2.0.v20210517-0327"/> diff --git a/releng/rcp/targetPlatform/org.eclipse.papyrus.rcp.targetplatform.tpd b/releng/rcp/targetPlatform/org.eclipse.papyrus.rcp.targetplatform.tpd index fe407a89a24..ca085c6ad01 100644 --- a/releng/rcp/targetPlatform/org.eclipse.papyrus.rcp.targetplatform.tpd +++ b/releng/rcp/targetPlatform/org.eclipse.papyrus.rcp.targetplatform.tpd @@ -3,10 +3,11 @@ target "Papyrus RCP" with requirements source include "../../main/targetPlatform/org.eclipse.papyrus.main.targetplatform.tpd" // manualUpdate -location "https://download.eclipse.org/justj/jres/11/updates/release" justj { +location "https://download.eclipse.org/justj/jres/17/updates/release" justj { org.eclipse.justj.openjdk.hotspot.jre.full.feature.group lazy } +// manualUpdate location mylyn "https://download.eclipse.org/mylyn/drops/3.25.2/v20200831-1956" { org.eclipse.mylyn.ide_feature.feature.group org.eclipse.mylyn.java_feature.feature.group @@ -18,35 +19,30 @@ location mylyn "https://download.eclipse.org/mylyn/drops/3.25.2/v20200831-1956" /*** Updates from the Simrel repository ***/ // updateFrom("EGit",0) -location egit "https://download.eclipse.org/egit/updates-6.1" { +location egit "https://download.eclipse.org/egit/updates-6.8" { org.eclipse.egit.feature.group } // updateFrom("Eclipse",0) -location platform "https://download.eclipse.org/eclipse/updates/4.24-I-builds/I20220428-1800/" { +location platform "https://download.eclipse.org/eclipse/updates/4.30/R-4.30-202312010110" { org.eclipse.e4.core.tools.feature.feature.group org.eclipse.rcp.configuration.feature.group org.eclipse.equinox.executable.feature.group } // updateFrom("EMF Compare",0) -location emfCompare "https://download.eclipse.org/modeling/emf/compare/updates/milestones/3.3/S202202240907" { +location emfCompare "https://download.eclipse.org/modeling/emf/compare/updates/milestones/3.3/S202311200811/" { org.eclipse.emf.compare.source.feature.group org.eclipse.emf.compare.ide.ui.source.feature.group } // updateFrom("EMF (Core)",0) -location emf "https://download.eclipse.org/modeling/emf/emf/builds/milestone/S202204260307" { +location emf "https://download.eclipse.org/modeling/emf/emf/builds/release/2.36.0" { org.eclipse.xsd.sdk.feature.group } -// updateFrom("EMF CDO",0) -location cdo "https://download.eclipse.org/modeling/emf/cdo/drops/R20220309-1120" { - org.eclipse.emf.cdo.epp.feature.group -} - // updateFrom("EPP Marketplace Client",0) -location marketPlace "https://download.eclipse.org/mpc/drops/1.10.0/v20220502-0731/" { +location marketPlace "https://download.eclipse.org/mpc/drops/1.10.2/v20231116-1812/" { org.eclipse.epp.mpc.feature.group } diff --git a/releng/rcp/targetPlatform/pom.xml b/releng/rcp/targetPlatform/pom.xml index ec9377c2c60..577f7966a81 100644 --- a/releng/rcp/targetPlatform/pom.xml +++ b/releng/rcp/targetPlatform/pom.xml @@ -7,7 +7,7 @@ <parent> <artifactId>org.eclipse.papyrus.rcp.releng</artifactId> <groupId>org.eclipse.papyrus</groupId> - <version>6.2.0-SNAPSHOT</version> + <version>6.6.0-SNAPSHOT</version> </parent> <artifactId>org.eclipse.papyrus.rcp.targetplatform</artifactId> diff --git a/releng/tests/main-tests-with-cdo/targetPlatform/org.eclipse.papyrus.main.tests.cdo.targetplatform.target b/releng/tests/main-tests-with-cdo/targetPlatform/org.eclipse.papyrus.main.tests.cdo.targetplatform.target index f487fec7324..fe8ee0bac66 100755 --- a/releng/tests/main-tests-with-cdo/targetPlatform/org.eclipse.papyrus.main.tests.cdo.targetplatform.target +++ b/releng/tests/main-tests-with-cdo/targetPlatform/org.eclipse.papyrus.main.tests.cdo.targetplatform.target @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <?pde?> <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl --> -<target name="Papyrus CDO Tests" sequenceNumber="1651648009"> +<target name="Papyrus CDO Tests" sequenceNumber="1704448694"> <locations> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.nebula.widgets.richtext.feature.feature.group" version="1.2.0.201703081533"/> @@ -18,95 +18,92 @@ <repository id="nattable" location="http://download.eclipse.org/nattable/releases/1.5.0/repository"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="com.google.guava" version="30.1.0.v20210127-2300"/> - <unit id="com.google.guava.source" version="30.1.0.v20210127-2300"/> - <unit id="com.google.gson" version="2.7.0.v20170129-0911"/> - <unit id="com.google.gson.source" version="2.7.0.v20170129-0911"/> - <unit id="org.apache.commons.lang3" version="3.1.0.v201403281430"/> - <unit id="org.apache.commons.lang3.source" version="3.1.0.v201403281430"/> - <unit id="org.objectweb.asm" version="5.0.1.v201404251740"/> - <unit id="org.objectweb.asm.source" version="5.0.1.v201404251740"/> - <unit id="com.google.inject" version="3.0.0.v201605172100"/> - <unit id="org.apache.batik.anim" version="1.14.0.v20210324-0332"/> - <unit id="org.apache.batik.dom" version="1.14.0.v20210324-0332"/> - <unit id="org.apache.batik.dom.svg" version="1.14.0.v20210324-0332"/> - <unit id="org.apache.batik.xml" version="1.14.0.v20210324-0332"/> - <repository id="orbit" location="https://download.eclipse.org/tools/orbit/downloads/drops/R20220302172233/repository/"/> + <unit id="org.apache.commons.io" version="2.8.0.v20210415-0900"/> + <unit id="org.apache.logging.log4j" version="2.17.1.v20220106-2156"/> + <repository id="orbit2" location="https://download.eclipse.org/tools/orbit/downloads/drops/R20230531010532/repository/"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.xwt.feature.feature.group" version="0.0.0"/> - <repository id="xwt" location="https://download.eclipse.org/xwt/milestones-1.7.0/1.7.0-S/"/> + <unit id="com.google.guava" version="32.1.3.jre"/> + <unit id="com.google.guava.source" version="32.1.3.jre"/> + <unit id="com.google.gson" version="2.10.1"/> + <unit id="com.google.gson.source" version="2.10.1"/> + <unit id="org.apache.batik.anim" version="1.17.0.v20231009-1000"/> + <unit id="org.apache.batik.dom" version="1.17.0.v20231009-1000"/> + <unit id="org.apache.batik.dom.svg" version="1.17.0.v20231009-1000"/> + <unit id="org.apache.batik.xml" version="1.17.0.v20231009-1000"/> + <unit id="com.google.inject" version="7.0.0"/> + <unit id="org.eclipse.orbit.xml-apis-ext" version="1.0.0.v20230923-0644"/> + <repository id="orbit" location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2023-12/"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.m2m.qvt.oml.sdk.feature.group" version="3.10.6.v20220309-1013"/> - <repository id="qvto" location="https://download.eclipse.org/mmt/qvto/updates/releases/3.10.6"/> + <unit id="org.eclipse.xwt.feature.feature.group" version="0.0.0"/> + <repository id="xwt" location="https://download.eclipse.org/xwt/release-1.9.100/"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.xpand.sdk.feature.group" version="2.2.0.v201605260315"/> - <unit id="org.eclipse.xtend.feature.group" version="2.2.0.v201605260315"/> - <repository id="xpand" location="https://download.eclipse.org/modeling/m2t/xpand/updates/releases/R201605260315/"/> + <unit id="org.eclipse.m2m.qvt.oml.sdk.feature.group" version="3.10.8.v20231126-0839"/> + <repository id="qvto" location="https://download.eclipse.org/mmt/qvto/updates/releases/3.10.8"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.uml2.sdk.feature.group" version="5.5.2.v20210228-1829"/> + <unit id="org.eclipse.uml2.sdk.feature.group" version="5.5.3.v20221116-1811"/> <repository id="uml" location="https://download.eclipse.org/modeling/mdt/uml2/updates/5.5"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.sdk.feature.group" version="4.24.0.v20220428-1800"/> - <repository id="platform" location="https://download.eclipse.org/eclipse/updates/4.24-I-builds/I20220428-1800/"/> + <unit id="org.eclipse.sdk.feature.group" version="4.30.0.v20231201-0512"/> + <repository id="platform" location="https://download.eclipse.org/eclipse/updates/4.30/R-4.30-202312010110"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.ocl.examples.classic.feature.group" version="5.17.1.v20220309-0840"/> - <unit id="org.eclipse.ocl.examples.feature.group" version="6.17.1.v20220309-0840"/> - <repository id="ocl" location="https://download.eclipse.org/modeling/mdt/ocl/updates/releases/6.17.1"/> + <unit id="org.eclipse.ocl.examples.classic.feature.group" version="5.19.0.v20231129-1236"/> + <unit id="org.eclipse.ocl.examples.feature.group" version="6.19.0.v20231129-1236"/> + <repository id="ocl" location="https://download.eclipse.org/modeling/mdt/ocl/updates/releases/6.19.0"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.xtext.sdk.feature.group" version="2.27.0.v20220501-1041"/> - <unit id="org.eclipse.xtend.sdk.feature.group" version="2.27.0.v20220501-1041"/> - <unit id="org.eclipse.xtext.redist.feature.group" version="2.27.0.v20220501-1041"/> - <unit id="org.eclipse.xtext.runtime.feature.group" version="2.27.0.v20220501-1041"/> - <unit id="org.eclipse.xtext.ui.feature.group" version="2.27.0.v20220501-1041"/> - <unit id="org.eclipse.xtext.generator.feature.group" version="2.27.0.v20220501-1041"/> - <repository id="xtext" location="https://download.eclipse.org/modeling/tmf/xtext/updates/milestones/S202205011041"/> + <unit id="org.eclipse.xtext.sdk.feature.group" version="2.33.0.v20231121-0955"/> + <unit id="org.eclipse.xtend.sdk.feature.group" version="2.33.0.v20231121-0955"/> + <unit id="org.eclipse.xtext.redist.feature.group" version="2.33.0.v20231121-0955"/> + <unit id="org.eclipse.xtext.runtime.feature.group" version="2.33.0.v20231121-0955"/> + <unit id="org.eclipse.xtext.ui.feature.group" version="2.33.0.v20231121-0955"/> + <unit id="org.eclipse.xtext.xtext.generator" version="2.33.0.v20231121-0955"/> + <repository id="xtext" location="https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.33.0"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.emf.mwe2.language.sdk.feature.group" version="2.13.0.v20220429-1234"/> - <repository id="mwe" location="https://download.eclipse.org/modeling/emft/mwe/updates/milestones/S202204291234/"/> + <unit id="org.eclipse.emf.mwe2.language.sdk.feature.group" version="2.16.0.v20231117-0522"/> + <repository id="mwe" location="https://download.eclipse.org/modeling/emft/mwe/updates/releases/2.16.0/"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.wst.xml_ui.feature.feature.group" version="0.0.0"/> - <repository id="webtools" location="https://download.eclipse.org/webtools/downloads/drops/R3.26.0/S-3.26M1a-20220411232710/repository/"/> + <repository id="webtools" location="https://download.eclipse.org/webtools/downloads/drops/R3.32.0/S-3.32M3a-20231114230950/repository/"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="1.14.2.202204130739"/> - <repository id="gmfRuntime" location="https://download.eclipse.org/modeling/gmp/gmf-runtime/updates/releases/R202204130739"/> + <unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="1.16.2.202311130907"/> + <repository id="gmfRuntime" location="https://download.eclipse.org/modeling/gmp/gmf-runtime/updates/releases/R202311130907/"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.gmf.runtime.notation.sdk.feature.group" version="1.13.0.202004160913"/> - <repository id="gmfNotation" location="https://download.eclipse.org/modeling/gmp/gmf-notation/updates/releases/R202004160913"/> + <unit id="org.eclipse.gmf.runtime.notation.sdk.feature.group" version="1.13.1.202211151334"/> + <repository id="gmfNotation" location="https://download.eclipse.org/modeling/gmp/gmf-notation/updates/releases/R202211151334"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.emf.sdk.feature.group" version="2.30.0.v20220426-0617"/> - <repository id="emf" location="https://download.eclipse.org/modeling/emf/emf/builds/milestone/S202204260307"/> + <unit id="org.eclipse.emf.sdk.feature.group" version="2.36.0.v20231107-0612"/> + <repository id="emf" location="https://download.eclipse.org/modeling/emf/emf/builds/release/2.36.0"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.emf.query.sdk.feature.group" version="1.12.0.201805030653"/> - <repository id="emfQuery" location="https://download.eclipse.org/modeling/emf/query/updates/releases/R201805030653"/> + <unit id="org.eclipse.emf.query.sdk.feature.group" version="1.12.1.202208101410"/> + <repository id="emfQuery" location="https://download.eclipse.org/modeling/emf/query/updates/releases/R202208101410"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.emf.validation.sdk.feature.group" version="1.12.2.202008210805"/> - <repository id="emfValidation" location="https://download.eclipse.org/modeling/emf/validation/updates/releases/R202008210805"/> + <unit id="org.eclipse.emf.validation.sdk.feature.group" version="1.13.3.202305230712"/> + <repository id="emfValidation" location="https://download.eclipse.org/modeling/emf/validation/updates/releases/R202305230712"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.emf.transaction.sdk.feature.group" version="1.12.0.201805140824"/> - <repository id="emfTransaction" location="https://download.eclipse.org/modeling/emf/transaction/updates/releases/R201805140824/"/> + <unit id="org.eclipse.emf.transaction.sdk.feature.group" version="1.13.0.202208110935"/> + <repository id="emfTransaction" location="https://download.eclipse.org/modeling/emf/transaction/updates/releases/R202208110935"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.gef.feature.group" version="3.11.0.201606061308"/> - <repository id="gef" location="https://download.eclipse.org/tools/gef/updates/legacy/releases/4.0.0_gef-master_1952"/> + <unit id="org.eclipse.gef.feature.group" version="3.18.0.202311222042"/> + <repository id="gef" location="https://download.eclipse.org/tools/gef/classic/releases/3.18.0"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.emf.compare.source.feature.group" version="3.3.18.202202240907"/> - <repository id="emfCompare" location="https://download.eclipse.org/modeling/emf/compare/updates/milestones/3.3/S202202240907"/> + <unit id="org.eclipse.emf.compare.source.feature.group" version="3.3.23.202311200811"/> + <repository id="emfCompare" location="https://download.eclipse.org/modeling/emf/compare/updates/milestones/3.3/S202311200811/"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.emf.cdo.admin" version="0.0.0"/> @@ -118,7 +115,7 @@ <unit id="org.eclipse.emf.cdo.gmf.notation" version="0.0.0"/> <unit id="org.eclipse.emf.cdo.server.ocl" version="0.0.0"/> <unit id="org.eclipse.emf.cdo.ui.admin" version="0.0.0"/> - <repository id="cdo" location="https://download.eclipse.org/modeling/emf/cdo/drops/R20220309-1120"/> + <repository id="cdo" location="https://download.eclipse.org/modeling/emf/cdo/drops/R20231129-0739"/> </location> </locations> </target> diff --git a/releng/tests/main-tests-with-cdo/targetPlatform/org.eclipse.papyrus.main.tests.cdo.targetplatform.tpd b/releng/tests/main-tests-with-cdo/targetPlatform/org.eclipse.papyrus.main.tests.cdo.targetplatform.tpd index efc0a926128..0f666722928 100755 --- a/releng/tests/main-tests-with-cdo/targetPlatform/org.eclipse.papyrus.main.tests.cdo.targetplatform.tpd +++ b/releng/tests/main-tests-with-cdo/targetPlatform/org.eclipse.papyrus.main.tests.cdo.targetplatform.tpd @@ -4,7 +4,7 @@ include "../../main-tests/targetPlatform/org.eclipse.papyrus.main.tests.targetpl /*** Updates from the Simrel repository ***/ // updateFrom("EMF CDO",0) -location cdo "https://download.eclipse.org/modeling/emf/cdo/drops/R20220309-1120" { +location cdo "https://download.eclipse.org/modeling/emf/cdo/drops/R20231129-0739" { org.eclipse.emf.cdo.admin lazy org.eclipse.emf.cdo.dawn lazy org.eclipse.emf.cdo.dawn.gmf lazy diff --git a/releng/tests/main-tests/targetPlatform/org.eclipse.papyrus.main.tests.targetplatform.target b/releng/tests/main-tests/targetPlatform/org.eclipse.papyrus.main.tests.targetplatform.target index 56929a76009..87d4116a901 100755 --- a/releng/tests/main-tests/targetPlatform/org.eclipse.papyrus.main.tests.targetplatform.target +++ b/releng/tests/main-tests/targetPlatform/org.eclipse.papyrus.main.tests.targetplatform.target @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <?pde?> <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl --> -<target name="Papyrus Tests" sequenceNumber="1651648009"> +<target name="Papyrus Tests" sequenceNumber="1704448694"> <locations> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.nebula.widgets.richtext.feature.feature.group" version="1.2.0.201703081533"/> @@ -18,95 +18,92 @@ <repository id="nattable" location="http://download.eclipse.org/nattable/releases/1.5.0/repository"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="com.google.guava" version="30.1.0.v20210127-2300"/> - <unit id="com.google.guava.source" version="30.1.0.v20210127-2300"/> - <unit id="com.google.gson" version="2.7.0.v20170129-0911"/> - <unit id="com.google.gson.source" version="2.7.0.v20170129-0911"/> - <unit id="org.apache.commons.lang3" version="3.1.0.v201403281430"/> - <unit id="org.apache.commons.lang3.source" version="3.1.0.v201403281430"/> - <unit id="org.objectweb.asm" version="5.0.1.v201404251740"/> - <unit id="org.objectweb.asm.source" version="5.0.1.v201404251740"/> - <unit id="com.google.inject" version="3.0.0.v201605172100"/> - <unit id="org.apache.batik.anim" version="1.14.0.v20210324-0332"/> - <unit id="org.apache.batik.dom" version="1.14.0.v20210324-0332"/> - <unit id="org.apache.batik.dom.svg" version="1.14.0.v20210324-0332"/> - <unit id="org.apache.batik.xml" version="1.14.0.v20210324-0332"/> - <repository id="orbit" location="https://download.eclipse.org/tools/orbit/downloads/drops/R20220302172233/repository/"/> + <unit id="org.apache.commons.io" version="2.8.0.v20210415-0900"/> + <unit id="org.apache.logging.log4j" version="2.17.1.v20220106-2156"/> + <repository id="orbit2" location="https://download.eclipse.org/tools/orbit/downloads/drops/R20230531010532/repository/"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.xwt.feature.feature.group" version="0.0.0"/> - <repository id="xwt" location="https://download.eclipse.org/xwt/milestones-1.7.0/1.7.0-S/"/> + <unit id="com.google.guava" version="32.1.3.jre"/> + <unit id="com.google.guava.source" version="32.1.3.jre"/> + <unit id="com.google.gson" version="2.10.1"/> + <unit id="com.google.gson.source" version="2.10.1"/> + <unit id="org.apache.batik.anim" version="1.17.0.v20231009-1000"/> + <unit id="org.apache.batik.dom" version="1.17.0.v20231009-1000"/> + <unit id="org.apache.batik.dom.svg" version="1.17.0.v20231009-1000"/> + <unit id="org.apache.batik.xml" version="1.17.0.v20231009-1000"/> + <unit id="com.google.inject" version="7.0.0"/> + <unit id="org.eclipse.orbit.xml-apis-ext" version="1.0.0.v20230923-0644"/> + <repository id="orbit" location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2023-12/"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.m2m.qvt.oml.sdk.feature.group" version="3.10.6.v20220309-1013"/> - <repository id="qvto" location="https://download.eclipse.org/mmt/qvto/updates/releases/3.10.6"/> + <unit id="org.eclipse.xwt.feature.feature.group" version="0.0.0"/> + <repository id="xwt" location="https://download.eclipse.org/xwt/release-1.9.100/"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.xpand.sdk.feature.group" version="2.2.0.v201605260315"/> - <unit id="org.eclipse.xtend.feature.group" version="2.2.0.v201605260315"/> - <repository id="xpand" location="https://download.eclipse.org/modeling/m2t/xpand/updates/releases/R201605260315/"/> + <unit id="org.eclipse.m2m.qvt.oml.sdk.feature.group" version="3.10.8.v20231126-0839"/> + <repository id="qvto" location="https://download.eclipse.org/mmt/qvto/updates/releases/3.10.8"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.uml2.sdk.feature.group" version="5.5.2.v20210228-1829"/> + <unit id="org.eclipse.uml2.sdk.feature.group" version="5.5.3.v20221116-1811"/> <repository id="uml" location="https://download.eclipse.org/modeling/mdt/uml2/updates/5.5"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.sdk.feature.group" version="4.24.0.v20220428-1800"/> - <repository id="platform" location="https://download.eclipse.org/eclipse/updates/4.24-I-builds/I20220428-1800/"/> + <unit id="org.eclipse.sdk.feature.group" version="4.30.0.v20231201-0512"/> + <repository id="platform" location="https://download.eclipse.org/eclipse/updates/4.30/R-4.30-202312010110"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.ocl.examples.classic.feature.group" version="5.17.1.v20220309-0840"/> - <unit id="org.eclipse.ocl.examples.feature.group" version="6.17.1.v20220309-0840"/> - <repository id="ocl" location="https://download.eclipse.org/modeling/mdt/ocl/updates/releases/6.17.1"/> + <unit id="org.eclipse.ocl.examples.classic.feature.group" version="5.19.0.v20231129-1236"/> + <unit id="org.eclipse.ocl.examples.feature.group" version="6.19.0.v20231129-1236"/> + <repository id="ocl" location="https://download.eclipse.org/modeling/mdt/ocl/updates/releases/6.19.0"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.xtext.sdk.feature.group" version="2.27.0.v20220501-1041"/> - <unit id="org.eclipse.xtend.sdk.feature.group" version="2.27.0.v20220501-1041"/> - <unit id="org.eclipse.xtext.redist.feature.group" version="2.27.0.v20220501-1041"/> - <unit id="org.eclipse.xtext.runtime.feature.group" version="2.27.0.v20220501-1041"/> - <unit id="org.eclipse.xtext.ui.feature.group" version="2.27.0.v20220501-1041"/> - <unit id="org.eclipse.xtext.generator.feature.group" version="2.27.0.v20220501-1041"/> - <repository id="xtext" location="https://download.eclipse.org/modeling/tmf/xtext/updates/milestones/S202205011041"/> + <unit id="org.eclipse.xtext.sdk.feature.group" version="2.33.0.v20231121-0955"/> + <unit id="org.eclipse.xtend.sdk.feature.group" version="2.33.0.v20231121-0955"/> + <unit id="org.eclipse.xtext.redist.feature.group" version="2.33.0.v20231121-0955"/> + <unit id="org.eclipse.xtext.runtime.feature.group" version="2.33.0.v20231121-0955"/> + <unit id="org.eclipse.xtext.ui.feature.group" version="2.33.0.v20231121-0955"/> + <unit id="org.eclipse.xtext.xtext.generator" version="2.33.0.v20231121-0955"/> + <repository id="xtext" location="https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.33.0"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.emf.mwe2.language.sdk.feature.group" version="2.13.0.v20220429-1234"/> - <repository id="mwe" location="https://download.eclipse.org/modeling/emft/mwe/updates/milestones/S202204291234/"/> + <unit id="org.eclipse.emf.mwe2.language.sdk.feature.group" version="2.16.0.v20231117-0522"/> + <repository id="mwe" location="https://download.eclipse.org/modeling/emft/mwe/updates/releases/2.16.0/"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.wst.xml_ui.feature.feature.group" version="0.0.0"/> - <repository id="webtools" location="https://download.eclipse.org/webtools/downloads/drops/R3.26.0/S-3.26M1a-20220411232710/repository/"/> + <repository id="webtools" location="https://download.eclipse.org/webtools/downloads/drops/R3.32.0/S-3.32M3a-20231114230950/repository/"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="1.14.2.202204130739"/> - <repository id="gmfRuntime" location="https://download.eclipse.org/modeling/gmp/gmf-runtime/updates/releases/R202204130739"/> + <unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="1.16.2.202311130907"/> + <repository id="gmfRuntime" location="https://download.eclipse.org/modeling/gmp/gmf-runtime/updates/releases/R202311130907/"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.gmf.runtime.notation.sdk.feature.group" version="1.13.0.202004160913"/> - <repository id="gmfNotation" location="https://download.eclipse.org/modeling/gmp/gmf-notation/updates/releases/R202004160913"/> + <unit id="org.eclipse.gmf.runtime.notation.sdk.feature.group" version="1.13.1.202211151334"/> + <repository id="gmfNotation" location="https://download.eclipse.org/modeling/gmp/gmf-notation/updates/releases/R202211151334"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.emf.sdk.feature.group" version="2.30.0.v20220426-0617"/> - <repository id="emf" location="https://download.eclipse.org/modeling/emf/emf/builds/milestone/S202204260307"/> + <unit id="org.eclipse.emf.sdk.feature.group" version="2.36.0.v20231107-0612"/> + <repository id="emf" location="https://download.eclipse.org/modeling/emf/emf/builds/release/2.36.0"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.emf.query.sdk.feature.group" version="1.12.0.201805030653"/> - <repository id="emfQuery" location="https://download.eclipse.org/modeling/emf/query/updates/releases/R201805030653"/> + <unit id="org.eclipse.emf.query.sdk.feature.group" version="1.12.1.202208101410"/> + <repository id="emfQuery" location="https://download.eclipse.org/modeling/emf/query/updates/releases/R202208101410"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.emf.validation.sdk.feature.group" version="1.12.2.202008210805"/> - <repository id="emfValidation" location="https://download.eclipse.org/modeling/emf/validation/updates/releases/R202008210805"/> + <unit id="org.eclipse.emf.validation.sdk.feature.group" version="1.13.3.202305230712"/> + <repository id="emfValidation" location="https://download.eclipse.org/modeling/emf/validation/updates/releases/R202305230712"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.emf.transaction.sdk.feature.group" version="1.12.0.201805140824"/> - <repository id="emfTransaction" location="https://download.eclipse.org/modeling/emf/transaction/updates/releases/R201805140824/"/> + <unit id="org.eclipse.emf.transaction.sdk.feature.group" version="1.13.0.202208110935"/> + <repository id="emfTransaction" location="https://download.eclipse.org/modeling/emf/transaction/updates/releases/R202208110935"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.gef.feature.group" version="3.11.0.201606061308"/> - <repository id="gef" location="https://download.eclipse.org/tools/gef/updates/legacy/releases/4.0.0_gef-master_1952"/> + <unit id="org.eclipse.gef.feature.group" version="3.18.0.202311222042"/> + <repository id="gef" location="https://download.eclipse.org/tools/gef/classic/releases/3.18.0"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.emf.compare.source.feature.group" version="3.3.18.202202240907"/> - <repository id="emfCompare" location="https://download.eclipse.org/modeling/emf/compare/updates/milestones/3.3/S202202240907"/> + <unit id="org.eclipse.emf.compare.source.feature.group" version="3.3.23.202311200811"/> + <repository id="emfCompare" location="https://download.eclipse.org/modeling/emf/compare/updates/milestones/3.3/S202311200811/"/> </location> </locations> </target> diff --git a/releng/tests/main-tests/targetPlatform/org.eclipse.papyrus.main.tests.targetplatform.tpd b/releng/tests/main-tests/targetPlatform/org.eclipse.papyrus.main.tests.targetplatform.tpd index f005ea7fa75..37bc8d133d5 100644 --- a/releng/tests/main-tests/targetPlatform/org.eclipse.papyrus.main.tests.targetplatform.tpd +++ b/releng/tests/main-tests/targetPlatform/org.eclipse.papyrus.main.tests.targetplatform.tpd @@ -3,6 +3,6 @@ target "Papyrus Tests" with source requirements include "../../../main/targetPlatform/org.eclipse.papyrus.main.targetplatform.tpd" // updateFrom("EMF Compare",0) -location emfCompare "https://download.eclipse.org/modeling/emf/compare/updates/milestones/3.3/S202202240907" { +location emfCompare "https://download.eclipse.org/modeling/emf/compare/updates/milestones/3.3/S202311200811/" { org.eclipse.emf.compare.source.feature.group }
\ No newline at end of file diff --git a/releng/tests/pom.xml b/releng/tests/pom.xml index ebf0aac9619..ea68cf6164f 100755 --- a/releng/tests/pom.xml +++ b/releng/tests/pom.xml @@ -16,7 +16,7 @@ <properties> <testConfig>CI_TESTS_CONFIG</testConfig> <!-- See org.eclipse.papyrus.junit.framework.classification.ClassificationConfig --> <testSuiteClass>org.eclipse.papyrus.tests.AllTests</testSuiteClass> - <jacoco.version>0.8.6</jacoco.version> <!-- https://repo.maven.apache.org/maven2/ --> + <jacoco.version>0.8.10</jacoco.version> <!-- https://repo.maven.apache.org/maven2/ --> <!-- Separate property for test argLine seems to be required when running Jacoco + Surefire --> <test.argLine>-Xms512m -Xmx2048m -XX:SoftRefLRUPolicyMSPerMB=100</test.argLine> diff --git a/releng/toolkit/migrateToJava17.sh b/releng/toolkit/migrateToJava17.sh new file mode 100644 index 00000000000..63f268516cf --- /dev/null +++ b/releng/toolkit/migrateToJava17.sh @@ -0,0 +1,72 @@ +#!/bin/bash + +############################################## +# This script should help to do the migration from java 11 to java 17 +# on Manifest, classpath and prefs files +# +# arg1 = the path to the root directory of the repo you want to migrate +# +# WARNING : poms.xml files should be check manualy unless for version number +############################################## + +if [ -n $1 ]; then + rootPath=$1 +else + rootPath=. +fi + +####################################### +# MANIFEST dans pom.xml files +####################################### +echo "Update Manifest and pom.xml" + +find $rootPath -type f -name "MANIFEST.MF"| while read fname; do + # replace java 11 by java 17 + sed -i 's/JavaSE-11/JavaSE-17/g' $fname + + + # update version for manifest + majorVersion=0 + minorVersion=0 + newMinorVersion=0 + integrationVersion=0 + + while read -r line; do + if [[ "$line" =~ Bundle-Version:\ ([0-9].*)\.([0-9].*)\.([0-9].*)\.qualifier ]] + then + majorVersion=${BASH_REMATCH[1]} + minorVersion=${BASH_REMATCH[2]} + integrationVersion=${BASH_REMATCH[3]} + + newMinorVersion=$((BASH_REMATCH[2]+1)) # increase minor + fi + done < $fname + + sed -i "s/\(Bundle-Version:\ [0-9].*\.\)\([0-9].*\)\(\.[0-9].*\.qualifier\)/\1$newMinorVersion\3/g" $fname + + # update version for associated pom.xml + if [[ "$fname" =~ (.*)/META-INF/MANIFEST.MF ]] + then + pomName=${BASH_REMATCH[1]}/pom.xml + sed -i "s|<version>$majorVersion\.$minorVersion\.$integrationVersion-SNAPSHOT<\/version>|<version>$majorVersion.$newMinorVersion.$integrationVersion-SNAPSHOT</version>|g" $pomName + fi + +done + + +####################################### +# Classpath files +####################################### +echo "Update classpath" +find $rootPath -type f -name ".classpath" -exec sed -i 's/JavaSE-11/JavaSE-17/g' {} \; + +####################################### +# Prefs files +####################################### +echo "Update .prefs" + +find $rootPath -type f -name "org\.eclipse\.jdt\.core\.prefs"| while read fname; do + sed -i 's/org\.eclipse\.jdt\.core\.compiler\.codegen\.targetPlatform=.*/org.eclipse.jdt.core.compiler.codegen.targetPlatform=17/g' $fname + sed -i 's/org\.eclipse\.jdt\.core\.compiler\.source=.*/org.eclipse.jdt.core.compiler.source=17/g' $fname + sed -i 's/org\.eclipse\.jdt\.core\.compiler\.compliance=.*/org.eclipse.jdt.core.compiler.compliance=17/g' $fname +done
\ No newline at end of file diff --git a/releng/toolkit/relengplatform/org.eclipse.papyrus.releng.platform.target b/releng/toolkit/relengplatform/org.eclipse.papyrus.releng.platform.target index 7ee45e30b5d..02ffc2d7ee2 100755 --- a/releng/toolkit/relengplatform/org.eclipse.papyrus.releng.platform.target +++ b/releng/toolkit/relengplatform/org.eclipse.papyrus.releng.platform.target @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <?pde?> <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl --> -<target name="Papyrus Releng" sequenceNumber="1651648012"> +<target name="Papyrus Releng" sequenceNumber="1704448696"> <locations> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.nebula.widgets.richtext.feature.feature.group" version="1.2.0.201703081533"/> @@ -18,134 +18,131 @@ <repository id="nattable" location="http://download.eclipse.org/nattable/releases/1.5.0/repository"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="com.google.guava" version="30.1.0.v20210127-2300"/> - <unit id="com.google.guava.source" version="30.1.0.v20210127-2300"/> - <unit id="com.google.gson" version="2.7.0.v20170129-0911"/> - <unit id="com.google.gson.source" version="2.7.0.v20170129-0911"/> - <unit id="org.apache.commons.lang3" version="3.1.0.v201403281430"/> - <unit id="org.apache.commons.lang3.source" version="3.1.0.v201403281430"/> - <unit id="org.objectweb.asm" version="5.0.1.v201404251740"/> - <unit id="org.objectweb.asm.source" version="5.0.1.v201404251740"/> - <unit id="com.google.inject" version="3.0.0.v201605172100"/> - <unit id="org.apache.batik.anim" version="1.14.0.v20210324-0332"/> - <unit id="org.apache.batik.dom" version="1.14.0.v20210324-0332"/> - <unit id="org.apache.batik.dom.svg" version="1.14.0.v20210324-0332"/> - <unit id="org.apache.batik.xml" version="1.14.0.v20210324-0332"/> - <repository id="orbit" location="https://download.eclipse.org/tools/orbit/downloads/drops/R20220302172233/repository/"/> + <unit id="org.apache.commons.io" version="2.8.0.v20210415-0900"/> + <unit id="org.apache.logging.log4j" version="2.17.1.v20220106-2156"/> + <repository id="orbit2" location="https://download.eclipse.org/tools/orbit/downloads/drops/R20230531010532/repository/"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.xwt.feature.feature.group" version="0.0.0"/> - <repository id="xwt" location="https://download.eclipse.org/xwt/milestones-1.7.0/1.7.0-S/"/> + <unit id="com.google.guava" version="32.1.3.jre"/> + <unit id="com.google.guava.source" version="32.1.3.jre"/> + <unit id="com.google.gson" version="2.10.1"/> + <unit id="com.google.gson.source" version="2.10.1"/> + <unit id="org.apache.batik.anim" version="1.17.0.v20231009-1000"/> + <unit id="org.apache.batik.dom" version="1.17.0.v20231009-1000"/> + <unit id="org.apache.batik.dom.svg" version="1.17.0.v20231009-1000"/> + <unit id="org.apache.batik.xml" version="1.17.0.v20231009-1000"/> + <unit id="com.google.inject" version="7.0.0"/> + <unit id="org.eclipse.orbit.xml-apis-ext" version="1.0.0.v20230923-0644"/> + <repository id="orbit" location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2023-12/"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.m2m.qvt.oml.sdk.feature.group" version="3.10.6.v20220309-1013"/> - <repository id="qvto" location="https://download.eclipse.org/mmt/qvto/updates/releases/3.10.6"/> + <unit id="org.eclipse.xwt.feature.feature.group" version="0.0.0"/> + <repository id="xwt" location="https://download.eclipse.org/xwt/release-1.9.100/"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.xpand.sdk.feature.group" version="2.2.0.v201605260315"/> - <unit id="org.eclipse.xtend.feature.group" version="2.2.0.v201605260315"/> - <repository id="xpand" location="https://download.eclipse.org/modeling/m2t/xpand/updates/releases/R201605260315/"/> + <unit id="org.eclipse.m2m.qvt.oml.sdk.feature.group" version="3.10.8.v20231126-0839"/> + <repository id="qvto" location="https://download.eclipse.org/mmt/qvto/updates/releases/3.10.8"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.uml2.sdk.feature.group" version="5.5.2.v20210228-1829"/> + <unit id="org.eclipse.uml2.sdk.feature.group" version="5.5.3.v20221116-1811"/> <repository id="uml" location="https://download.eclipse.org/modeling/mdt/uml2/updates/5.5"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.sdk.feature.group" version="4.24.0.v20220428-1800"/> - <repository id="platform" location="https://download.eclipse.org/eclipse/updates/4.24-I-builds/I20220428-1800/"/> + <unit id="org.eclipse.sdk.feature.group" version="4.30.0.v20231201-0512"/> + <repository id="platform" location="https://download.eclipse.org/eclipse/updates/4.30/R-4.30-202312010110"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.ocl.examples.classic.feature.group" version="5.17.1.v20220309-0840"/> - <unit id="org.eclipse.ocl.examples.feature.group" version="6.17.1.v20220309-0840"/> - <repository id="ocl" location="https://download.eclipse.org/modeling/mdt/ocl/updates/releases/6.17.1"/> + <unit id="org.eclipse.ocl.examples.classic.feature.group" version="5.19.0.v20231129-1236"/> + <unit id="org.eclipse.ocl.examples.feature.group" version="6.19.0.v20231129-1236"/> + <repository id="ocl" location="https://download.eclipse.org/modeling/mdt/ocl/updates/releases/6.19.0"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.xtext.sdk.feature.group" version="2.27.0.v20220501-1041"/> - <unit id="org.eclipse.xtend.sdk.feature.group" version="2.27.0.v20220501-1041"/> - <unit id="org.eclipse.xtext.redist.feature.group" version="2.27.0.v20220501-1041"/> - <unit id="org.eclipse.xtext.runtime.feature.group" version="2.27.0.v20220501-1041"/> - <unit id="org.eclipse.xtext.ui.feature.group" version="2.27.0.v20220501-1041"/> - <unit id="org.eclipse.xtext.generator.feature.group" version="2.27.0.v20220501-1041"/> - <repository id="xtext" location="https://download.eclipse.org/modeling/tmf/xtext/updates/milestones/S202205011041"/> + <unit id="org.eclipse.xtext.sdk.feature.group" version="2.33.0.v20231121-0955"/> + <unit id="org.eclipse.xtend.sdk.feature.group" version="2.33.0.v20231121-0955"/> + <unit id="org.eclipse.xtext.redist.feature.group" version="2.33.0.v20231121-0955"/> + <unit id="org.eclipse.xtext.runtime.feature.group" version="2.33.0.v20231121-0955"/> + <unit id="org.eclipse.xtext.ui.feature.group" version="2.33.0.v20231121-0955"/> + <unit id="org.eclipse.xtext.xtext.generator" version="2.33.0.v20231121-0955"/> + <repository id="xtext" location="https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.33.0"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.emf.mwe2.language.sdk.feature.group" version="2.13.0.v20220429-1234"/> - <repository id="mwe" location="https://download.eclipse.org/modeling/emft/mwe/updates/milestones/S202204291234/"/> + <unit id="org.eclipse.emf.mwe2.language.sdk.feature.group" version="2.16.0.v20231117-0522"/> + <repository id="mwe" location="https://download.eclipse.org/modeling/emft/mwe/updates/releases/2.16.0/"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.wst.xml_ui.feature.feature.group" version="0.0.0"/> - <repository id="webtools" location="https://download.eclipse.org/webtools/downloads/drops/R3.26.0/S-3.26M1a-20220411232710/repository/"/> + <repository id="webtools" location="https://download.eclipse.org/webtools/downloads/drops/R3.32.0/S-3.32M3a-20231114230950/repository/"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="1.14.2.202204130739"/> - <repository id="gmfRuntime" location="https://download.eclipse.org/modeling/gmp/gmf-runtime/updates/releases/R202204130739"/> + <unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="1.16.2.202311130907"/> + <repository id="gmfRuntime" location="https://download.eclipse.org/modeling/gmp/gmf-runtime/updates/releases/R202311130907/"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.gmf.runtime.notation.sdk.feature.group" version="1.13.0.202004160913"/> - <repository id="gmfNotation" location="https://download.eclipse.org/modeling/gmp/gmf-notation/updates/releases/R202004160913"/> + <unit id="org.eclipse.gmf.runtime.notation.sdk.feature.group" version="1.13.1.202211151334"/> + <repository id="gmfNotation" location="https://download.eclipse.org/modeling/gmp/gmf-notation/updates/releases/R202211151334"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.emf.sdk.feature.group" version="2.30.0.v20220426-0617"/> - <repository id="emf" location="https://download.eclipse.org/modeling/emf/emf/builds/milestone/S202204260307"/> + <unit id="org.eclipse.emf.sdk.feature.group" version="2.36.0.v20231107-0612"/> + <repository id="emf" location="https://download.eclipse.org/modeling/emf/emf/builds/release/2.36.0"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.emf.query.sdk.feature.group" version="1.12.0.201805030653"/> - <repository id="emfQuery" location="https://download.eclipse.org/modeling/emf/query/updates/releases/R201805030653"/> + <unit id="org.eclipse.emf.query.sdk.feature.group" version="1.12.1.202208101410"/> + <repository id="emfQuery" location="https://download.eclipse.org/modeling/emf/query/updates/releases/R202208101410"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.emf.validation.sdk.feature.group" version="1.12.2.202008210805"/> - <repository id="emfValidation" location="https://download.eclipse.org/modeling/emf/validation/updates/releases/R202008210805"/> + <unit id="org.eclipse.emf.validation.sdk.feature.group" version="1.13.3.202305230712"/> + <repository id="emfValidation" location="https://download.eclipse.org/modeling/emf/validation/updates/releases/R202305230712"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.emf.transaction.sdk.feature.group" version="1.12.0.201805140824"/> - <repository id="emfTransaction" location="https://download.eclipse.org/modeling/emf/transaction/updates/releases/R201805140824/"/> + <unit id="org.eclipse.emf.transaction.sdk.feature.group" version="1.13.0.202208110935"/> + <repository id="emfTransaction" location="https://download.eclipse.org/modeling/emf/transaction/updates/releases/R202208110935"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.gef.feature.group" version="3.11.0.201606061308"/> - <repository id="gef" location="https://download.eclipse.org/tools/gef/updates/legacy/releases/4.0.0_gef-master_1952"/> + <unit id="org.eclipse.gef.feature.group" version="3.18.0.202311222042"/> + <repository id="gef" location="https://download.eclipse.org/tools/gef/classic/releases/3.18.0"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.cbi.targetplatform-feature.feature.group" version="0.0.0"/> - <repository id="tpd" location="http://download.eclipse.org/cbi/tpd/3.0.0-SNAPSHOT"/> + <unit id="org.eclipse.cbi.targetplatform.feature.feature.group" version="0.0.0"/> + <repository id="tpd" location="https://download.eclipse.org/cbi/updates/tpd/nightly/latest/"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.cbi.p2repo.aggregator.editor.feature.source.feature.group" version="0.0.0"/> <unit id="org.eclipse.cbi.p2repo.aggregator.editor.feature.feature.group" version="0.0.0"/> <unit id="org.eclipse.cbi.p2repo.aggregator.engine.feature.source.feature.group" version="0.0.0"/> - <repository id="cbiAggregator" location="https://download.eclipse.org/cbi/updates/aggregator/ide/4.13/"/> + <repository id="cbiAggregator" location="https://download.eclipse.org/cbi/updates/p2-aggregator/tools/milestone/S202311221637/"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.oomph.version.feature.group" version="1.16.0.v20220301-0958"/> - <unit id="org.eclipse.oomph.setup.workingsets.feature.group" version="1.16.0.v20220301-0958"/> - <unit id="org.eclipse.oomph.projectconfig.feature.group" version="1.15.0.v20220301-0958"/> - <unit id="org.eclipse.oomph.setup.targlets.feature.group" version="1.16.0.v20220301-0958"/> - <unit id="org.eclipse.oomph.setup.mylyn.feature.group" version="1.17.0.v20220301-0958"/> - <unit id="org.eclipse.oomph.setup.workbench.feature.group" version="1.15.0.v20220301-0958"/> - <unit id="org.eclipse.oomph.setup.projectset.feature.group" version="1.15.0.v20220301-0958"/> - <unit id="org.eclipse.oomph.setup.pde.feature.group" version="1.15.0.v20220301-0958"/> - <unit id="org.eclipse.oomph.targlets.feature.group" version="1.20.0.v20220301-0958"/> - <unit id="org.eclipse.oomph.setup.jdt.feature.group" version="1.19.0.v20220301-0958"/> - <unit id="org.eclipse.oomph.setup.projects.feature.group" version="1.16.0.v20220301-0958"/> - <unit id="org.eclipse.oomph.setup.git.feature.group" version="1.21.0.v20220301-0958"/> - <unit id="org.eclipse.oomph.setup.maven.feature.group" version="1.17.0.v20220413-0631"/> - <unit id="org.eclipse.oomph.p2.feature.group" version="1.23.0.v20220413-1200"/> - <unit id="org.eclipse.oomph.setup.feature.group" version="1.25.0.v20220413-1200"/> - <unit id="org.eclipse.oomph.preferences.feature.group" version="1.15.0.v20220301-0958"/> - <repository id="oomph" location="https://download.eclipse.org/oomph/drops/milestone/S20220413-080151-1.25.0-M1a"/> + <unit id="org.eclipse.oomph.version.feature.group" version="1.19.0.v20231106-0758"/> + <unit id="org.eclipse.oomph.setup.workingsets.feature.group" version="1.19.0.v20230617-1322"/> + <unit id="org.eclipse.oomph.projectconfig.feature.group" version="1.17.0.v20230828-1517"/> + <unit id="org.eclipse.oomph.setup.targlets.feature.group" version="1.19.0.v20230617-1322"/> + <unit id="org.eclipse.oomph.setup.mylyn.feature.group" version="1.20.0.v20230731-0700"/> + <unit id="org.eclipse.oomph.setup.workbench.feature.group" version="1.18.0.v20230828-1517"/> + <unit id="org.eclipse.oomph.setup.projectset.feature.group" version="1.17.0.v20230617-1322"/> + <unit id="org.eclipse.oomph.setup.pde.feature.group" version="1.17.0.v20230617-1322"/> + <unit id="org.eclipse.oomph.targlets.feature.group" version="1.25.0.v20231120-1324"/> + <unit id="org.eclipse.oomph.setup.jdt.feature.group" version="1.23.0.v20231119-1528"/> + <unit id="org.eclipse.oomph.setup.projects.feature.group" version="1.18.0.v20230617-1322"/> + <unit id="org.eclipse.oomph.setup.git.feature.group" version="1.24.0.v20231119-1528"/> + <unit id="org.eclipse.oomph.setup.maven.feature.group" version="1.20.0.v20230617-1322"/> + <unit id="org.eclipse.oomph.p2.feature.group" version="1.28.0.v20231120-1324"/> + <unit id="org.eclipse.oomph.setup.feature.group" version="1.30.0.v20231122-0734"/> + <unit id="org.eclipse.oomph.preferences.feature.group" version="1.17.0.v20230828-1517"/> + <repository id="oomph" location="https://download.eclipse.org/oomph/drops/release/1.31.0"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <repository id="egit" location="https://download.eclipse.org/egit/updates-6.1"/> + <repository id="egit" location="https://download.eclipse.org/egit/updates-6.8"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <repository id="m2e" location="https://download.eclipse.org/technology/m2e/releases/1.20.1/"/> + <repository id="m2e" location="https://download.eclipse.org/technology/m2e/releases/2.5.0/"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <repository id="mylyn" location="https://download.eclipse.org/mylyn/drops/3.25.2/v20200831-1956"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.emf.compare.source.feature.group" version="3.3.18.202202240907"/> + <unit id="org.eclipse.emf.compare.source.feature.group" version="3.3.23.202311200811"/> <unit id="org.eclipse.emf.compare.ide.ui.feature.group" version="0.0.0"/> - <repository id="emfCompare" location="https://download.eclipse.org/modeling/emf/compare/updates/milestones/3.3/S202202240907"/> + <repository id="emfCompare" location="https://download.eclipse.org/modeling/emf/compare/updates/milestones/3.3/S202311200811/"/> </location> </locations> </target> diff --git a/releng/toolkit/server/checkUTF8andLF.sh b/releng/toolkit/server/checkUTF8andLF.sh new file mode 100755 index 00000000000..4572f162212 --- /dev/null +++ b/releng/toolkit/server/checkUTF8andLF.sh @@ -0,0 +1,106 @@ +#!/bin/bash + +set +e + +pwd + +{ + +#cat contributedFiles.txt | while read line; do +# printf "alllines $line\n" +#done + +if [ -f notASCII.log ] ; then + rm notASCII.log +fi +if [ -f notUTF8.log ] ; then + rm notUTF8.log +fi +if [ -f notLF.log ] ; then + rm notLF.log +fi + +cd source + + +notASCII=() +notUTF8=() +notLF=() + + +# This command will fetch the path of the changed files +# This is the equivalent of a local: git show --pretty="" --name-only > contributedFiles.txt +# Then filters out the binary files if any were contributed as the UTF8 check is bound to fail on those +gerritHash=$(git rev-parse HEAD) +git diff-tree --no-commit-id --name-only -r $gerritHash | xargs grep -lIs . line > ../contributedFiles.txt +# Papyrus source is in to the "source/" folder of the workspace +#sed -i -e 's/^/.\/source\//' contributedFiles.txt + + +# We exclude the xtend files as they are required to be in ISO-8859-1 for some reasons +# Then it will verify if there are only ASCII characters, hence it is UTF8 by default +cat ../contributedFiles.txt | while read line; do + if [ -f $line && $line != *.xtend && $line != *.properties ] ; then + retval=$(tr -d \\000-\\177 < $line | wc -c) + if [ "$retval" -gt "0" ] ; then + notASCII+=$(echo "$line") + echo "$line" >> ../notASCII.log + fi + fi +done + +# If there are non ASCII characters we will now check if it is at least UTF8 compliant +cat ../contributedFiles.txt | while read line; do + if [ -f $line && $line != *.xtend && $line != *.properties ] ; then + iconv -f utf-8 -t ucs-4 < $line >/dev/null 2>&1 + retval=$? + if [ "$retval" -ne 0 ] ; then + notUTF8+=$(echo "$line") + echo "$line" >> ../notUTF8.log + fi + fi +done + +# This checks the end of line for the contributed files alone before checking the entire git base +cat ../contributedFiles.txt | while read line; do + if [ -f $line ] ; then + retval=$(grep -lIs $'\r$' $line)>/dev/null + if [ -n "$retval" ] ; then + notLF+=$(echo "$line") + echo "$line" >> ../notLF.log + fi + fi +done + +} &> /dev/null + +#printf "%s" "${notASCII[@]}" +#printf "%s" "${notUTF8[@]}" +#printf "%s" "${notLF[@]}" +#cat ../contributedFiles.txt + +if [ -f ../notUTF8.log ] ; then + if [ $(cat ../notUTF8.log | wc -l) -gt 0 ] ; then + echo "The contributed files are not UTF8 compliant. Please look at notUTF8.log" + cat ../notUTF8.log + exit 1 + fi +else + echo "All contributed files are UTF8 compliant" +fi + +if [ -f ../notLF.log ] ; then + if [ $(cat ../notLF.log | wc -l) -gt 0 ] ; then + echo "There are non LF line endings in the contributed files. Please have a look at notLF.log" + cat ../notLF.log + exit 1 + fi +else + echo "All contributed files respect the Linux line endings" +fi + +cd .. + +set -e + +javac -version
\ No newline at end of file diff --git a/releng/toolkit/server/release_publish.sh b/releng/toolkit/server/release_publish.sh index ae49c69d9bb..d3625c4204e 100755 --- a/releng/toolkit/server/release_publish.sh +++ b/releng/toolkit/server/release_publish.sh @@ -79,36 +79,39 @@ function getZip() { } - # ============================== USER PARAMETERS ============================== echo "-------------------- env parameters --------------------" echo "branchName: $branchName" +echo "mainBuildJob: $mainBuildJob" echo "mainBuildNumber: $mainBuildNumber" +echo "toolsmithsBuildJob: $toolsmithsBuildJob" echo "toolsmithsBuildNumber: $toolsmithsBuildNumber" +echo "testsBuildJob: $testsBuildJob" echo "testsBuildNumber: $testsBuildNumber" +echo "sbomsBuildJob: $sbomsBuildJob" +echo "sbomsBuildNumber: $sbomsBuildNumber" echo "version: $version" echo "updateSite: $updateSite" -echo "mainBuildJob: $mainBuildJob" -echo "toolsmithsBuildJob: $toolsmithsBuildJob" -echo "testsBuildJob: $testsBuildJob" branchName=$branchName mainBuildNumber=$mainBuildNumber toolsmithsBuildNumber=$toolsmithsBuildNumber -if [[ -z ${mainBuildNumber+x} || -z ${toolsmithsBuildNumber+x} ]] ; then - IFS=":" - read mainBuildNumber toolsmithsBuildNumber <<< "$(getLastSuccessfulBuildNumbers $branchName)" -fi - testsBuildNumber=$testsBuildNumber version=$version -if [[ -z ${version+x} ]] ; then - read version <<< "$(versionID "Papyrus-$branchName")" -fi updateSite=$updateSite +## This was meant for an automatic nightly release but mirrors had problems catching up hence this should be deactivated to avoid pushing unsigned/broken content +#if [[ -z ${mainBuildNumber+x} || -z ${toolsmithsBuildNumber+x} && ! -z ${$branchName+x} ]] ; then +# IFS=":" +# read mainBuildNumber toolsmithsBuildNumber <<< "$(getLastSuccessfulBuildNumbers $branchName)" +#fi +# +#if [[ -z ${version+x} && ! -z ${$branchName+x} ]] ; then +# read version <<< "$(versionID "Papyrus-$branchName")" +#fi + echo "-------------------- check parameters --------------------" if [[ ! "$branchName" =~ ^(Oxygen|Master|Reexport)$ ]]; then @@ -144,19 +147,19 @@ fi echo "-------------------- initialized parameters --------------------" -echo "branchName: $branchName" -echo "mainBuildNumber: $mainBuildNumber" -echo "toolsmithsBuildNumber: $toolsmithsBuildNumber" -echo "testsBuildNumber: $testsBuildNumber" -echo "version: $version" -echo "updateSite: $updateSite" -echo "mainBuildJob: $mainBuildJob" -echo "toolsmithsBuildJob: $toolsmithsBuildJob" -echo "testsBuildJob: $testsBuildJob" echo "nightlyID: $(nightlyID "Papyrus-$branchName")" echo "updateSiteDir: $updateSiteDir" #exit 0 +# The following variables must be set in order to progress somewhat safely +viparams=("mainBuildJob" "mainBuildNumber" "toolsmithsBuildJob" "toolsmithsBuildNumber" "version" "updateSite") +for param in "${viparams[@]}"; do + if [[ -z ${!param+x} ]]; then + echo "Error: $param is not set." + exit 1 + fi +done + deleteUpdateSite="no" if [ -e "$updateSiteDir" ]; then @@ -203,6 +206,40 @@ echo "publishing main (version='$version') to the updateSite directory '$updateS ssh $sshGenie@$sshRemote mkdir -p "$updateSiteDir" updateSiteZipName=$(basename $(ssh $sshGenie@$sshRemote ls -1 "$buildsDir/$folderName/${updateZipPrefix}"*.zip)) ssh $sshGenie@$sshRemote unzip -o "$buildsDir/$folderName/${updateSiteZipName}" -d "$updateSiteDir/main" + +# ============================== PUBLISH TOOLSMITHS ============================== +if [[ "$toolsmithsBuildNumber" != "0" ]]; then + jenkinsURL="https://ci.eclipse.org/papyrus/job/$toolsmithsBuildJob/$toolsmithsBuildNumber/artifact" + zipName="Papyrus-Toolsmiths.zip" + updateZipPrefix="Papyrus-Toolsmiths" + ## The function might be executed in a subshell preventing the zip to be present in the workspace + getZip "$zipName" "$jenkinsURL" + + if [ ! -f "$zipName" ]; then + echo "ERROR: $zipName (from Jenkins) not found"; + exit -2; + fi + ls -la + #exit 0; + + foldersInZip=$(unzip -t "$zipName" | egrep "testing: *[^/]*/ +OK" | sed 's%^ *testing: *\([^/]*\)/ *OK$%\1%') + [ $(echo "$foldersInZip" | wc -l) == 1 ] || { echo "one directory expected in zip"; exit 1; } + folderNameToolsmith="$foldersInZip" + + echo "publishing toolsmiths (version='$version') to the builds directory '$buildsDir'..." + #ziploc=$(find . -type f -name "$zipName" -print) + #ssh $sshGenie@$sshRemote unzip -o "$ziploc" -d "$buildsDir/$folderName" + scp $zipName $sshGenie@$sshRemote:/$buildsDir/$folderName + ssh $sshGenie@$sshRemote unzip -o "$buildsDir/$folderName/$zipName" -d "$buildsDir/$folderName" + ssh $sshGenie@$sshRemote rm "$buildsDir/$folderName/$zipName" + +echo "publishing toolsmiths (version='$version') to the updateSite directory '$updateSiteDir'..." + updateSiteZipName=$(basename $(ssh $sshGenie@$sshRemote ls -1 "$buildsDir/$folderName/$folderNameToolsmith/${updateZipPrefix}"*.zip)) + ssh $sshGenie@$sshRemote unzip -o "$buildsDir/$folderName/$folderNameToolsmith/$updateSiteZipName" -d "$updateSiteDir/toolsmiths" + +fi + +# ============================== CREATE UPDATE SITE COMPOSITES ============================== function cleanComposites () { if [ -f compositeArtifacts.xml ] ; then rm compositeArtifacts.xml @@ -211,8 +248,6 @@ function cleanComposites () { rm compositeArtifacts.xml fi } - -# create the composite update site newTimeStamp=$(date +%s000) cleanComposites @@ -244,39 +279,16 @@ EOF scp compositeContent.xml $sshGenie@$sshRemote:$updateSiteDir/compositeContent.xml -# ============================== PUBLISH TOOLSMITHS ============================== -if [[ "$toolsmithsBuildNumber" != "0" ]]; then - jenkinsURL="https://ci.eclipse.org/papyrus/job/$toolsmithsBuildJob/$toolsmithsBuildNumber/artifact" - zipName="Papyrus-Toolsmiths.zip" - updateZipPrefix="Papyrus-Toolsmiths" - ## The function might be executed in a subshell preventing the zip to be present in the workspace - getZip "$zipName" "$jenkinsURL" - - if [ ! -f "$zipName" ]; then - echo "ERROR: $zipName (from Jenkins) not found"; - exit -2; - fi - ls -la - #exit 0; - - foldersInZip=$(unzip -t "$zipName" | egrep "testing: *[^/]*/ +OK" | sed 's%^ *testing: *\([^/]*\)/ *OK$%\1%') - [ $(echo "$foldersInZip" | wc -l) == 1 ] || { echo "one directory expected in zip"; exit 1; } - folderNameToolsmith="$foldersInZip" - - echo "publishing toolsmiths (version='$version') to the builds directory '$buildsDir'..." - #ziploc=$(find . -type f -name "$zipName" -print) - #ssh $sshGenie@$sshRemote unzip -o "$ziploc" -d "$buildsDir/$folderName" - scp $zipName $sshGenie@$sshRemote:/$buildsDir/$folderName - ssh $sshGenie@$sshRemote unzip -o "$buildsDir/$folderName/$zipName" -d "$buildsDir/$folderName" - ssh $sshGenie@$sshRemote rm "$buildsDir/$folderName/$zipName" - -echo "publishing toolsmiths (version='$version') to the updateSite directory '$updateSiteDir'..." - updateSiteZipName=$(basename $(ssh $sshGenie@$sshRemote ls -1 "$buildsDir/$folderName/$folderNameToolsmith/${updateZipPrefix}"*.zip)) - ssh $sshGenie@$sshRemote unzip -o "$buildsDir/$folderName/$folderNameToolsmith/$updateSiteZipName" -d "$updateSiteDir/toolsmiths" +# ============================== PUBLISH SBOMS ============================== +if [[ -z ${sbomsBuildJob+x} || -z ${sbomsBuildNumber+x} ]] ; then + echo "SBOMs Job and Number provided, proceeding to download and publish the reports at the root of the new p2 repository." + jenkinsURL="https://ci.eclipse.org/papyrus/job/$sbomsBuildJob/$sbomsBuildNumber/artifact" + curl -O "$jenkinsURL*" --create-dirs --output "SBOMs" + + scp -r SBOMs $sshGenie@$sshRemote:$updateSiteDir fi - # ============================== PUBLISH TESTS ============================== if [[ "$testsBuildNumber" != "0" ]]; then nfsURL="" ## Not supported for HIPP builds. Leave the variable since the promote functions are still shared with the Shared Hudson Instance builds @@ -294,7 +306,8 @@ updateSiteChildren=$(($(ssh $sshGenie@$sshRemote find $updateSiteDir/.. -maxdept folderArray=($(ssh $sshGenie@$sshRemote ls -d $updateSiteDir/../*/)) #echo "${folderArray[@]}" -# Update the releaseRoot composites + +# ============================== UPDATE ROOT COMPOSITES ============================== cleanComposites cat > compositeArtifacts.xml <<EOF <?xml version="1.0" encoding="UTF-8"?> @@ -330,4 +343,4 @@ scp compositeContent.xml $sshGenie@$sshRemote:$updateSiteDir/../compositeContent setAccessRights "$updateSiteDir/.." -echo "publishing done."
\ No newline at end of file +echo "publishing done." diff --git a/releng/toolsmiths/site/category.xml b/releng/toolsmiths/site/category.xml index 027f54ca33b..547ac3af4b0 100644 --- a/releng/toolsmiths/site/category.xml +++ b/releng/toolsmiths/site/category.xml @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> <site> - <feature url="features/org.eclipse.papyrus.toolsmiths.feature_1.2.0.qualifier.jar" id="org.eclipse.papyrus.toolsmiths.feature" version="1.2.0.qualifier"> + <feature url="features/org.eclipse.papyrus.toolsmiths.feature_1.3.0.qualifier.jar" id="org.eclipse.papyrus.toolsmiths.feature" version="1.3.0.qualifier"> <category name="org.eclipse.papyrus.toolsmiths.category"/> </feature> - <feature url="features/org.eclipse.papyrus.toolsmiths.feature.source_1.2.0.qualifier.jar" id="org.eclipse.papyrus.toolsmiths.feature.source" version="1.2.0.qualifier"> + <feature url="features/org.eclipse.papyrus.toolsmiths.feature.source_1.3.0.qualifier.jar" id="org.eclipse.papyrus.toolsmiths.feature.source" version="1.3.0.qualifier"> <category name="org.eclipse.papyrus.toolsmiths.category"/> </feature> <feature url="features/org.eclipse.papyrus.uml.assistants.feature_4.0.0.qualifier.jar" id="org.eclipse.papyrus.uml.assistants.feature" version="4.0.0.qualifier"> @@ -24,16 +24,16 @@ <feature url="features/org.eclipse.papyrus.debug.feature.source_1.0.0.qualifier.jar" id="org.eclipse.papyrus.debug.feature.source" version="1.0.0.qualifier"> <category name="org.eclipse.papyrus.toolsmiths.category"/> </feature> - <feature url="features/org.eclipse.papyrus.junit.feature_1.1.0.qualifier.jar" id="org.eclipse.papyrus.junit.feature" version="1.1.0.qualifier"> + <feature url="features/org.eclipse.papyrus.junit.feature_1.2.0.qualifier.jar" id="org.eclipse.papyrus.junit.feature" version="1.2.0.qualifier"> <category name="org.eclipse.papyrus.toolsmiths.category"/> </feature> - <feature url="features/org.eclipse.papyrus.junit.feature.source_1.1.0.qualifier.jar" id="org.eclipse.papyrus.junit.feature.source" version="1.1.0.qualifier"> + <feature url="features/org.eclipse.papyrus.junit.feature.source_1.2.0.qualifier.jar" id="org.eclipse.papyrus.junit.feature.source" version="1.2.0.qualifier"> <category name="org.eclipse.papyrus.toolsmiths.category"/> </feature> - <feature url="features/org.eclipse.papyrus.releng.feature_1.0.0.qualifier.jar" id="org.eclipse.papyrus.releng.feature" version="1.0.0.qualifier"> + <feature url="features/org.eclipse.papyrus.releng.feature_1.2.0.qualifier.jar" id="org.eclipse.papyrus.releng.feature" version="1.2.0.qualifier"> <category name="org.eclipse.papyrus.releng.category"/> </feature> - <feature url="features/org.eclipse.papyrus.releng.feature.source_1.0.0.qualifier.jar" id="org.eclipse.papyrus.releng.feature.source" version="1.0.0.qualifier"> + <feature url="features/org.eclipse.papyrus.releng.feature.source_1.2.0.qualifier.jar" id="org.eclipse.papyrus.releng.feature.source" version="1.2.0.qualifier"> <category name="org.eclipse.papyrus.releng.category"/> </feature> <feature url="features/org.eclipse.papyrus.toolsmiths.validation.feature_1.0.0.qualifier.jar" id="org.eclipse.papyrus.toolsmiths.validation.feature" version="1.0.0.qualifier"> @@ -48,10 +48,10 @@ <feature url="features/org.eclipse.papyrus.toolsmiths.builder.feature.source_1.0.0.qualifier.jar" id="org.eclipse.papyrus.toolsmiths.builder.feature" version="1.0.0.qualifier"> <category name="org.eclipse.papyrus.toolsmiths.category"/> </feature> - <feature url="features/org.eclipse.papyrus.infra.textedit.feature_1.0.0.qualifier.jar" id="org.eclipse.papyrus.infra.textedit.feature" version="1.0.0.qualifier"> + <feature url="features/org.eclipse.papyrus.infra.textedit.feature_1.1.0.qualifier.jar" id="org.eclipse.papyrus.infra.textedit.feature" version="1.1.0.qualifier"> <category name="org.eclipse.papyrus.toolsmiths.category"/> </feature> - <feature url="features/org.eclipse.papyrus.infra.textedit.feature.source_1.0.0.qualifier.jar" id="org.eclipse.papyrus.infra.textedit.feature.source" version="1.0.0.qualifier"> + <feature url="features/org.eclipse.papyrus.infra.textedit.feature.source_1.1.0.qualifier.jar" id="org.eclipse.papyrus.infra.textedit.feature.source" version="1.1.0.qualifier"> <category name="org.eclipse.papyrus.toolsmiths.category"/> </feature> <category-def name="org.eclipse.papyrus.toolsmiths.category" label="Papyrus Toolsmiths"> @@ -64,5 +64,6 @@ Papyrus tools used for releng purposes. </description> </category-def> - <repository-reference location="https://download.eclipse.org/cbi/tpd/3.0.0-SNAPSHOT" enabled="true" /> + <repository-reference location="https://download.eclipse.org/cbi/updates/tpd/nightly/latest" enabled="true" /> + <repository-reference location="https://download.eclipse.org/cbi/updates/p2-aggregator/tools/nightly/latest" enabled="true" /> </site> diff --git a/releng/toolsmiths/targetPlatform/org.eclipse.papyrus.toolsmiths.targetplatform.target b/releng/toolsmiths/targetPlatform/org.eclipse.papyrus.toolsmiths.targetplatform.target index ace791f7798..f14f8d3a0fd 100755 --- a/releng/toolsmiths/targetPlatform/org.eclipse.papyrus.toolsmiths.targetplatform.target +++ b/releng/toolsmiths/targetPlatform/org.eclipse.papyrus.toolsmiths.targetplatform.target @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <?pde?> <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl --> -<target name="Papyrus Toolsmiths" sequenceNumber="1651648012"> +<target name="Papyrus Toolsmiths" sequenceNumber="1704448696"> <locations> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.nebula.widgets.richtext.feature.feature.group" version="1.2.0.201703081533"/> @@ -18,134 +18,131 @@ <repository id="nattable" location="http://download.eclipse.org/nattable/releases/1.5.0/repository"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="com.google.guava" version="30.1.0.v20210127-2300"/> - <unit id="com.google.guava.source" version="30.1.0.v20210127-2300"/> - <unit id="com.google.gson" version="2.7.0.v20170129-0911"/> - <unit id="com.google.gson.source" version="2.7.0.v20170129-0911"/> - <unit id="org.apache.commons.lang3" version="3.1.0.v201403281430"/> - <unit id="org.apache.commons.lang3.source" version="3.1.0.v201403281430"/> - <unit id="org.objectweb.asm" version="5.0.1.v201404251740"/> - <unit id="org.objectweb.asm.source" version="5.0.1.v201404251740"/> - <unit id="com.google.inject" version="3.0.0.v201605172100"/> - <unit id="org.apache.batik.anim" version="1.14.0.v20210324-0332"/> - <unit id="org.apache.batik.dom" version="1.14.0.v20210324-0332"/> - <unit id="org.apache.batik.dom.svg" version="1.14.0.v20210324-0332"/> - <unit id="org.apache.batik.xml" version="1.14.0.v20210324-0332"/> - <repository id="orbit" location="https://download.eclipse.org/tools/orbit/downloads/drops/R20220302172233/repository/"/> + <unit id="org.apache.commons.io" version="2.8.0.v20210415-0900"/> + <unit id="org.apache.logging.log4j" version="2.17.1.v20220106-2156"/> + <repository id="orbit2" location="https://download.eclipse.org/tools/orbit/downloads/drops/R20230531010532/repository/"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.xwt.feature.feature.group" version="0.0.0"/> - <repository id="xwt" location="https://download.eclipse.org/xwt/milestones-1.7.0/1.7.0-S/"/> + <unit id="com.google.guava" version="32.1.3.jre"/> + <unit id="com.google.guava.source" version="32.1.3.jre"/> + <unit id="com.google.gson" version="2.10.1"/> + <unit id="com.google.gson.source" version="2.10.1"/> + <unit id="org.apache.batik.anim" version="1.17.0.v20231009-1000"/> + <unit id="org.apache.batik.dom" version="1.17.0.v20231009-1000"/> + <unit id="org.apache.batik.dom.svg" version="1.17.0.v20231009-1000"/> + <unit id="org.apache.batik.xml" version="1.17.0.v20231009-1000"/> + <unit id="com.google.inject" version="7.0.0"/> + <unit id="org.eclipse.orbit.xml-apis-ext" version="1.0.0.v20230923-0644"/> + <repository id="orbit" location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2023-12/"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.m2m.qvt.oml.sdk.feature.group" version="3.10.6.v20220309-1013"/> - <repository id="qvto" location="https://download.eclipse.org/mmt/qvto/updates/releases/3.10.6"/> + <unit id="org.eclipse.xwt.feature.feature.group" version="0.0.0"/> + <repository id="xwt" location="https://download.eclipse.org/xwt/release-1.9.100/"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.xpand.sdk.feature.group" version="2.2.0.v201605260315"/> - <unit id="org.eclipse.xtend.feature.group" version="2.2.0.v201605260315"/> - <repository id="xpand" location="https://download.eclipse.org/modeling/m2t/xpand/updates/releases/R201605260315/"/> + <unit id="org.eclipse.m2m.qvt.oml.sdk.feature.group" version="3.10.8.v20231126-0839"/> + <repository id="qvto" location="https://download.eclipse.org/mmt/qvto/updates/releases/3.10.8"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.uml2.sdk.feature.group" version="5.5.2.v20210228-1829"/> + <unit id="org.eclipse.uml2.sdk.feature.group" version="5.5.3.v20221116-1811"/> <repository id="uml" location="https://download.eclipse.org/modeling/mdt/uml2/updates/5.5"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.sdk.feature.group" version="4.24.0.v20220428-1800"/> - <repository id="platform" location="https://download.eclipse.org/eclipse/updates/4.24-I-builds/I20220428-1800/"/> + <unit id="org.eclipse.sdk.feature.group" version="4.30.0.v20231201-0512"/> + <repository id="platform" location="https://download.eclipse.org/eclipse/updates/4.30/R-4.30-202312010110"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.ocl.examples.classic.feature.group" version="5.17.1.v20220309-0840"/> - <unit id="org.eclipse.ocl.examples.feature.group" version="6.17.1.v20220309-0840"/> - <repository id="ocl" location="https://download.eclipse.org/modeling/mdt/ocl/updates/releases/6.17.1"/> + <unit id="org.eclipse.ocl.examples.classic.feature.group" version="5.19.0.v20231129-1236"/> + <unit id="org.eclipse.ocl.examples.feature.group" version="6.19.0.v20231129-1236"/> + <repository id="ocl" location="https://download.eclipse.org/modeling/mdt/ocl/updates/releases/6.19.0"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.xtext.sdk.feature.group" version="2.27.0.v20220501-1041"/> - <unit id="org.eclipse.xtend.sdk.feature.group" version="2.27.0.v20220501-1041"/> - <unit id="org.eclipse.xtext.redist.feature.group" version="2.27.0.v20220501-1041"/> - <unit id="org.eclipse.xtext.runtime.feature.group" version="2.27.0.v20220501-1041"/> - <unit id="org.eclipse.xtext.ui.feature.group" version="2.27.0.v20220501-1041"/> - <unit id="org.eclipse.xtext.generator.feature.group" version="2.27.0.v20220501-1041"/> - <repository id="xtext" location="https://download.eclipse.org/modeling/tmf/xtext/updates/milestones/S202205011041"/> + <unit id="org.eclipse.xtext.sdk.feature.group" version="2.33.0.v20231121-0955"/> + <unit id="org.eclipse.xtend.sdk.feature.group" version="2.33.0.v20231121-0955"/> + <unit id="org.eclipse.xtext.redist.feature.group" version="2.33.0.v20231121-0955"/> + <unit id="org.eclipse.xtext.runtime.feature.group" version="2.33.0.v20231121-0955"/> + <unit id="org.eclipse.xtext.ui.feature.group" version="2.33.0.v20231121-0955"/> + <unit id="org.eclipse.xtext.xtext.generator" version="2.33.0.v20231121-0955"/> + <repository id="xtext" location="https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.33.0"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.emf.mwe2.language.sdk.feature.group" version="2.13.0.v20220429-1234"/> - <repository id="mwe" location="https://download.eclipse.org/modeling/emft/mwe/updates/milestones/S202204291234/"/> + <unit id="org.eclipse.emf.mwe2.language.sdk.feature.group" version="2.16.0.v20231117-0522"/> + <repository id="mwe" location="https://download.eclipse.org/modeling/emft/mwe/updates/releases/2.16.0/"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.wst.xml_ui.feature.feature.group" version="0.0.0"/> - <repository id="webtools" location="https://download.eclipse.org/webtools/downloads/drops/R3.26.0/S-3.26M1a-20220411232710/repository/"/> + <repository id="webtools" location="https://download.eclipse.org/webtools/downloads/drops/R3.32.0/S-3.32M3a-20231114230950/repository/"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="1.14.2.202204130739"/> - <repository id="gmfRuntime" location="https://download.eclipse.org/modeling/gmp/gmf-runtime/updates/releases/R202204130739"/> + <unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="1.16.2.202311130907"/> + <repository id="gmfRuntime" location="https://download.eclipse.org/modeling/gmp/gmf-runtime/updates/releases/R202311130907/"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.gmf.runtime.notation.sdk.feature.group" version="1.13.0.202004160913"/> - <repository id="gmfNotation" location="https://download.eclipse.org/modeling/gmp/gmf-notation/updates/releases/R202004160913"/> + <unit id="org.eclipse.gmf.runtime.notation.sdk.feature.group" version="1.13.1.202211151334"/> + <repository id="gmfNotation" location="https://download.eclipse.org/modeling/gmp/gmf-notation/updates/releases/R202211151334"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.emf.sdk.feature.group" version="2.30.0.v20220426-0617"/> - <repository id="emf" location="https://download.eclipse.org/modeling/emf/emf/builds/milestone/S202204260307"/> + <unit id="org.eclipse.emf.sdk.feature.group" version="2.36.0.v20231107-0612"/> + <repository id="emf" location="https://download.eclipse.org/modeling/emf/emf/builds/release/2.36.0"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.emf.query.sdk.feature.group" version="1.12.0.201805030653"/> - <repository id="emfQuery" location="https://download.eclipse.org/modeling/emf/query/updates/releases/R201805030653"/> + <unit id="org.eclipse.emf.query.sdk.feature.group" version="1.12.1.202208101410"/> + <repository id="emfQuery" location="https://download.eclipse.org/modeling/emf/query/updates/releases/R202208101410"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.emf.validation.sdk.feature.group" version="1.12.2.202008210805"/> - <repository id="emfValidation" location="https://download.eclipse.org/modeling/emf/validation/updates/releases/R202008210805"/> + <unit id="org.eclipse.emf.validation.sdk.feature.group" version="1.13.3.202305230712"/> + <repository id="emfValidation" location="https://download.eclipse.org/modeling/emf/validation/updates/releases/R202305230712"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.emf.transaction.sdk.feature.group" version="1.12.0.201805140824"/> - <repository id="emfTransaction" location="https://download.eclipse.org/modeling/emf/transaction/updates/releases/R201805140824/"/> + <unit id="org.eclipse.emf.transaction.sdk.feature.group" version="1.13.0.202208110935"/> + <repository id="emfTransaction" location="https://download.eclipse.org/modeling/emf/transaction/updates/releases/R202208110935"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.gef.feature.group" version="3.11.0.201606061308"/> - <repository id="gef" location="https://download.eclipse.org/tools/gef/updates/legacy/releases/4.0.0_gef-master_1952"/> + <unit id="org.eclipse.gef.feature.group" version="3.18.0.202311222042"/> + <repository id="gef" location="https://download.eclipse.org/tools/gef/classic/releases/3.18.0"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.cbi.targetplatform-feature.feature.group" version="0.0.0"/> - <repository id="tpd" location="http://download.eclipse.org/cbi/tpd/3.0.0-SNAPSHOT"/> + <unit id="org.eclipse.cbi.targetplatform.feature.feature.group" version="0.0.0"/> + <repository id="tpd" location="https://download.eclipse.org/cbi/updates/tpd/nightly/latest/"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.cbi.p2repo.aggregator.editor.feature.source.feature.group" version="0.0.0"/> <unit id="org.eclipse.cbi.p2repo.aggregator.editor.feature.feature.group" version="0.0.0"/> <unit id="org.eclipse.cbi.p2repo.aggregator.engine.feature.source.feature.group" version="0.0.0"/> - <repository id="cbiAggregator" location="https://download.eclipse.org/cbi/updates/aggregator/ide/4.13/"/> + <repository id="cbiAggregator" location="https://download.eclipse.org/cbi/updates/p2-aggregator/tools/milestone/S202311221637/"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <unit id="org.eclipse.oomph.version.feature.group" version="1.16.0.v20220301-0958"/> - <unit id="org.eclipse.oomph.setup.workingsets.feature.group" version="1.16.0.v20220301-0958"/> - <unit id="org.eclipse.oomph.projectconfig.feature.group" version="1.15.0.v20220301-0958"/> - <unit id="org.eclipse.oomph.setup.targlets.feature.group" version="1.16.0.v20220301-0958"/> - <unit id="org.eclipse.oomph.setup.mylyn.feature.group" version="1.17.0.v20220301-0958"/> - <unit id="org.eclipse.oomph.setup.workbench.feature.group" version="1.15.0.v20220301-0958"/> - <unit id="org.eclipse.oomph.setup.projectset.feature.group" version="1.15.0.v20220301-0958"/> - <unit id="org.eclipse.oomph.setup.pde.feature.group" version="1.15.0.v20220301-0958"/> - <unit id="org.eclipse.oomph.targlets.feature.group" version="1.20.0.v20220301-0958"/> - <unit id="org.eclipse.oomph.setup.jdt.feature.group" version="1.19.0.v20220301-0958"/> - <unit id="org.eclipse.oomph.setup.projects.feature.group" version="1.16.0.v20220301-0958"/> - <unit id="org.eclipse.oomph.setup.git.feature.group" version="1.21.0.v20220301-0958"/> - <unit id="org.eclipse.oomph.setup.maven.feature.group" version="1.17.0.v20220413-0631"/> - <unit id="org.eclipse.oomph.p2.feature.group" version="1.23.0.v20220413-1200"/> - <unit id="org.eclipse.oomph.setup.feature.group" version="1.25.0.v20220413-1200"/> - <unit id="org.eclipse.oomph.preferences.feature.group" version="1.15.0.v20220301-0958"/> - <repository id="oomph" location="https://download.eclipse.org/oomph/drops/milestone/S20220413-080151-1.25.0-M1a"/> + <unit id="org.eclipse.oomph.version.feature.group" version="1.19.0.v20231106-0758"/> + <unit id="org.eclipse.oomph.setup.workingsets.feature.group" version="1.19.0.v20230617-1322"/> + <unit id="org.eclipse.oomph.projectconfig.feature.group" version="1.17.0.v20230828-1517"/> + <unit id="org.eclipse.oomph.setup.targlets.feature.group" version="1.19.0.v20230617-1322"/> + <unit id="org.eclipse.oomph.setup.mylyn.feature.group" version="1.20.0.v20230731-0700"/> + <unit id="org.eclipse.oomph.setup.workbench.feature.group" version="1.18.0.v20230828-1517"/> + <unit id="org.eclipse.oomph.setup.projectset.feature.group" version="1.17.0.v20230617-1322"/> + <unit id="org.eclipse.oomph.setup.pde.feature.group" version="1.17.0.v20230617-1322"/> + <unit id="org.eclipse.oomph.targlets.feature.group" version="1.25.0.v20231120-1324"/> + <unit id="org.eclipse.oomph.setup.jdt.feature.group" version="1.23.0.v20231119-1528"/> + <unit id="org.eclipse.oomph.setup.projects.feature.group" version="1.18.0.v20230617-1322"/> + <unit id="org.eclipse.oomph.setup.git.feature.group" version="1.24.0.v20231119-1528"/> + <unit id="org.eclipse.oomph.setup.maven.feature.group" version="1.20.0.v20230617-1322"/> + <unit id="org.eclipse.oomph.p2.feature.group" version="1.28.0.v20231120-1324"/> + <unit id="org.eclipse.oomph.setup.feature.group" version="1.30.0.v20231122-0734"/> + <unit id="org.eclipse.oomph.preferences.feature.group" version="1.17.0.v20230828-1517"/> + <repository id="oomph" location="https://download.eclipse.org/oomph/drops/release/1.31.0"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <repository id="egit" location="https://download.eclipse.org/egit/updates-6.1"/> + <repository id="egit" location="https://download.eclipse.org/egit/updates-6.8"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> - <repository id="m2e" location="https://download.eclipse.org/technology/m2e/releases/1.20.1/"/> + <repository id="m2e" location="https://download.eclipse.org/technology/m2e/releases/2.5.0/"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <repository id="mylyn" location="https://download.eclipse.org/mylyn/drops/3.25.2/v20200831-1956"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.emf.compare.ide.ui.feature.group" version="0.0.0"/> - <unit id="org.eclipse.emf.compare.source.feature.group" version="3.3.18.202202240907"/> - <repository id="emfCompare" location="https://download.eclipse.org/modeling/emf/compare/updates/milestones/3.3/S202202240907"/> + <unit id="org.eclipse.emf.compare.source.feature.group" version="3.3.23.202311200811"/> + <repository id="emfCompare" location="https://download.eclipse.org/modeling/emf/compare/updates/milestones/3.3/S202311200811/"/> </location> </locations> </target> diff --git a/releng/toolsmiths/targetPlatform/org.eclipse.papyrus.toolsmiths.targetplatform.tpd b/releng/toolsmiths/targetPlatform/org.eclipse.papyrus.toolsmiths.targetplatform.tpd index e7746b615d6..435369c6a41 100644 --- a/releng/toolsmiths/targetPlatform/org.eclipse.papyrus.toolsmiths.targetplatform.tpd +++ b/releng/toolsmiths/targetPlatform/org.eclipse.papyrus.toolsmiths.targetplatform.tpd @@ -5,20 +5,21 @@ include "../../main/targetPlatform/org.eclipse.papyrus.main.targetplatform.tpd" /*** Manual referencing ***/ // manualUpdate // This will need to be changed as soon as the new build is available @see Bug 538414 -location tpd "http://download.eclipse.org/cbi/tpd/3.0.0-SNAPSHOT" { - org.eclipse.cbi.targetplatform-feature.feature.group lazy +location tpd "https://download.eclipse.org/cbi/updates/tpd/nightly/latest/" { + org.eclipse.cbi.targetplatform.feature.feature.group lazy } // manualUpdate -location cbiAggregator "https://download.eclipse.org/cbi/updates/aggregator/ide/4.13/" { +location cbiAggregator "https://download.eclipse.org/cbi/updates/p2-aggregator/tools/milestone/S202311221637/" { org.eclipse.cbi.p2repo.aggregator.editor.feature.source.feature.group lazy org.eclipse.cbi.p2repo.aggregator.editor.feature.feature.group lazy org.eclipse.cbi.p2repo.aggregator.engine.feature.source.feature.group lazy } /*** Updates from the Simrel repository ***/ -// updateFrom("Oomph",0) -location oomph "https://download.eclipse.org/oomph/drops/milestone/S20220413-080151-1.25.0-M1a" { + +// updateFrom("Oomph",0) +location oomph "https://download.eclipse.org/oomph/drops/release/1.31.0" { org.eclipse.oomph.version.feature.group org.eclipse.oomph.setup.workingsets.feature.group org.eclipse.oomph.projectconfig.feature.group @@ -38,15 +39,17 @@ location oomph "https://download.eclipse.org/oomph/drops/milestone/S20220413-080 } // updateFrom("EGit",0) -location egit "https://download.eclipse.org/egit/updates-6.1" // oomph +location egit "https://download.eclipse.org/egit/updates-6.8" // oomph -// updateFrom("m2e",0) -location m2e "https://download.eclipse.org/technology/m2e/releases/1.20.1/" // oomph +// updateFrom("m2e",0) +location m2e "https://download.eclipse.org/technology/m2e/releases/2.5.0/" // oomph +// Mylyn is disabled in the current Sirmrel repo +// manualUpdate location mylyn "https://download.eclipse.org/mylyn/drops/3.25.2/v20200831-1956" // oomph // updateFrom("EMF Compare",0) -location emfCompare "https://download.eclipse.org/modeling/emf/compare/updates/milestones/3.3/S202202240907" { +location emfCompare "https://download.eclipse.org/modeling/emf/compare/updates/milestones/3.3/S202311200811/" { org.eclipse.emf.compare.ide.ui.feature.group lazy org.eclipse.emf.compare.source.feature.group } diff --git a/tests/compatibility/cdo/org.eclipse.papyrus.compatibility.cdo.tests/.classpath b/tests/compatibility/cdo/org.eclipse.papyrus.compatibility.cdo.tests/.classpath index a42a828e04a..675a5e2962b 100755 --- a/tests/compatibility/cdo/org.eclipse.papyrus.compatibility.cdo.tests/.classpath +++ b/tests/compatibility/cdo/org.eclipse.papyrus.compatibility.cdo.tests/.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"> <attributes> diff --git a/tests/compatibility/cdo/org.eclipse.papyrus.compatibility.cdo.tests/.settings/org.eclipse.jdt.core.prefs b/tests/compatibility/cdo/org.eclipse.papyrus.compatibility.cdo.tests/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/tests/compatibility/cdo/org.eclipse.papyrus.compatibility.cdo.tests/.settings/org.eclipse.jdt.core.prefs +++ b/tests/compatibility/cdo/org.eclipse.papyrus.compatibility.cdo.tests/.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/tests/compatibility/cdo/org.eclipse.papyrus.compatibility.cdo.tests/META-INF/MANIFEST.MF b/tests/compatibility/cdo/org.eclipse.papyrus.compatibility.cdo.tests/META-INF/MANIFEST.MF index 131a756bea6..301881c77a2 100755 --- a/tests/compatibility/cdo/org.eclipse.papyrus.compatibility.cdo.tests/META-INF/MANIFEST.MF +++ b/tests/compatibility/cdo/org.eclipse.papyrus.compatibility.cdo.tests/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-SymbolicName: org.eclipse.papyrus.compatibility.cdo.tests Bundle-Version: 2.0.0.qualifier Bundle-Vendor: %Bundle-Vendor Automatic-Module-Name: org.eclipse.papyrus.compatibility.cdo.tests -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Require-Bundle: org.eclipse.gmf.runtime.notation;bundle-version="[1.10.0,2.0.0)", org.eclipse.papyrus.infra.gmfdiag.style;bundle-version="[3.0.0,4.0.0)", org.eclipse.papyrus.junit.framework;bundle-version="[2.0.0,3.0.0)", diff --git a/tests/junit/benchmarks/org.eclipse.papyrus.uml.performances.tests/.classpath b/tests/junit/benchmarks/org.eclipse.papyrus.uml.performances.tests/.classpath index 9cb19c81c76..c0255c320e6 100644 --- a/tests/junit/benchmarks/org.eclipse.papyrus.uml.performances.tests/.classpath +++ b/tests/junit/benchmarks/org.eclipse.papyrus.uml.performances.tests/.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="test"/> <classpathentry kind="output" path="bin"/> diff --git a/tests/junit/benchmarks/org.eclipse.papyrus.uml.performances.tests/.settings/org.eclipse.jdt.core.prefs b/tests/junit/benchmarks/org.eclipse.papyrus.uml.performances.tests/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/tests/junit/benchmarks/org.eclipse.papyrus.uml.performances.tests/.settings/org.eclipse.jdt.core.prefs +++ b/tests/junit/benchmarks/org.eclipse.papyrus.uml.performances.tests/.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/tests/junit/benchmarks/org.eclipse.papyrus.uml.performances.tests/META-INF/MANIFEST.MF b/tests/junit/benchmarks/org.eclipse.papyrus.uml.performances.tests/META-INF/MANIFEST.MF index 691ec0ba6f3..c7f4ba02583 100644 --- a/tests/junit/benchmarks/org.eclipse.papyrus.uml.performances.tests/META-INF/MANIFEST.MF +++ b/tests/junit/benchmarks/org.eclipse.papyrus.uml.performances.tests/META-INF/MANIFEST.MF @@ -9,7 +9,8 @@ Require-Bundle: org.eclipse.emf.databinding;bundle-version="[1.5.0,2.0.0)", org.eclipse.papyrus.uml.diagram.wizards;bundle-version="[4.0.0,5.0.0)", org.eclipse.papyrus.uml.service.types;bundle-version="[5.0.0,6.0.0)", org.eclipse.uml2.uml.editor;bundle-version="[5.5.0,6.0.0)", - org.junit;bundle-version="[4.13.0,5.0.0)" + org.junit;bundle-version="[4.13.0,5.0.0)", + org.eclipse.papyrus.infra.emf;bundle-version="[4.2.0,5.0.0)" Export-Package: org.eclipse.papyrus.uml.performances.test Bundle-Vendor: %providerName Bundle-ActivationPolicy: lazy @@ -19,5 +20,5 @@ Bundle-Localization: plugin Bundle-ManifestVersion: 2 Bundle-Activator: org.eclipse.papyrus.uml.performances.test.Activator Bundle-SymbolicName: org.eclipse.papyrus.uml.performances.tests;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.uml.performances.tests diff --git a/tests/junit/benchmarks/org.eclipse.papyrus.uml.performances.tests/test/org/eclipse/papyrus/uml/performances/test/PapyrusUMLPerformancesTest.java b/tests/junit/benchmarks/org.eclipse.papyrus.uml.performances.tests/test/org/eclipse/papyrus/uml/performances/test/PapyrusUMLPerformancesTest.java index a2ad9644808..a4c626c6d77 100644 --- a/tests/junit/benchmarks/org.eclipse.papyrus.uml.performances.tests/test/org/eclipse/papyrus/uml/performances/test/PapyrusUMLPerformancesTest.java +++ b/tests/junit/benchmarks/org.eclipse.papyrus.uml.performances.tests/test/org/eclipse/papyrus/uml/performances/test/PapyrusUMLPerformancesTest.java @@ -1,5 +1,5 @@ /***************************************************************************** - * Copyright (c) 2019 CEA LIST and others. + * Copyright (c) 2019, 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 @@ -10,6 +10,7 @@ * * Contributors: * Nicolas FAUVERGUE (CEA LIST) nicolas.fauvergue@cea.fr - Initial API and implementation + * Pauline DEVILLE (CEA LIST) - bug 562218 * *****************************************************************************/ @@ -33,7 +34,7 @@ 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.ServicesRegistry; -import org.eclipse.papyrus.uml.diagram.wizards.command.NewPapyrusModelCommand; +import org.eclipse.papyrus.infra.emf.commands.CreateModelInModelSetCommand; import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes; import org.eclipse.uml2.uml.Model; import org.junit.Assert; @@ -68,7 +69,7 @@ public class PapyrusUMLPerformancesTest extends AbstractUMLPerformancesTest { createBaseURI(size); final URI diURI = umlURI.trimFileExtension().appendFileExtension(DiModel.MODEL_FILE_EXTENSION); - final RecordingCommand command = new NewPapyrusModelCommand(this.modelSet, diURI); + final RecordingCommand command = new CreateModelInModelSetCommand(this.modelSet, diURI); modelSet.getTransactionalEditingDomain().getCommandStack().execute(command); save(); diff --git a/tests/junit/framework/org.eclipse.papyrus.bundles.tests/.classpath b/tests/junit/framework/org.eclipse.papyrus.bundles.tests/.classpath index 342926282f7..c4fbe4c68b5 100644 --- a/tests/junit/framework/org.eclipse.papyrus.bundles.tests/.classpath +++ b/tests/junit/framework/org.eclipse.papyrus.bundles.tests/.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="org/eclipse/pde/api/tools/internal/provisional/**"/> diff --git a/tests/junit/framework/org.eclipse.papyrus.bundles.tests/.settings/org.eclipse.jdt.core.prefs b/tests/junit/framework/org.eclipse.papyrus.bundles.tests/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/tests/junit/framework/org.eclipse.papyrus.bundles.tests/.settings/org.eclipse.jdt.core.prefs +++ b/tests/junit/framework/org.eclipse.papyrus.bundles.tests/.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/tests/junit/framework/org.eclipse.papyrus.bundles.tests/META-INF/MANIFEST.MF b/tests/junit/framework/org.eclipse.papyrus.bundles.tests/META-INF/MANIFEST.MF index 3d1fd262a26..73b38bde3ad 100644 --- a/tests/junit/framework/org.eclipse.papyrus.bundles.tests/META-INF/MANIFEST.MF +++ b/tests/junit/framework/org.eclipse.papyrus.bundles.tests/META-INF/MANIFEST.MF @@ -12,12 +12,11 @@ Require-Bundle: org.eclipse.emf.edit.ui;bundle-version="[2.18.0,3.0.0)", Export-Package: org.eclipse.papyrus.bundles.tests Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy -Bundle-Version: 3.0.0.qualifier +Bundle-Version: 3.1.0.qualifier Bundle-Name: %Bundle-Name Bundle-ManifestVersion: 2 Bundle-Activator: org.eclipse.papyrus.bundles.tests.Activator Bundle-Description: %pluginDescription Bundle-SymbolicName: org.eclipse.papyrus.bundles.tests;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 -Import-Package: org.apache.commons.lang3.text.translate;version="3.1.0" +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.bundles.tests diff --git a/tests/junit/framework/org.eclipse.papyrus.bundles.tests/pom.xml b/tests/junit/framework/org.eclipse.papyrus.bundles.tests/pom.xml index 1207d717662..70662cc9725 100644 --- a/tests/junit/framework/org.eclipse.papyrus.bundles.tests/pom.xml +++ b/tests/junit/framework/org.eclipse.papyrus.bundles.tests/pom.xml @@ -10,7 +10,7 @@ </parent> <groupId>org.eclipse.papyrus.tests</groupId> <artifactId>org.eclipse.papyrus.bundles.tests</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.1.0-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> <build> diff --git a/tests/junit/framework/org.eclipse.papyrus.bundles.tests/src/org/eclipse/papyrus/bundles/tests/BundleTestsUtils.java b/tests/junit/framework/org.eclipse.papyrus.bundles.tests/src/org/eclipse/papyrus/bundles/tests/BundleTestsUtils.java index 47b4e234c7b..bc4fa79c623 100644 --- a/tests/junit/framework/org.eclipse.papyrus.bundles.tests/src/org/eclipse/papyrus/bundles/tests/BundleTestsUtils.java +++ b/tests/junit/framework/org.eclipse.papyrus.bundles.tests/src/org/eclipse/papyrus/bundles/tests/BundleTestsUtils.java @@ -1,5 +1,5 @@ /***************************************************************************** - * Copyright (c) 2012, 2016 CEA LIST, Christian W. Damus, and others. + * Copyright (c) 2012, 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,7 +11,8 @@ * Contributors: * Vincent Lorenzo (CEA LIST) Vincent.Lorenzo@cea.fr - Initial API and implementation * Christian W. Damus - bug 485220 - * + * Pauline DEVILLE (CEA LIST) pauline.deville@cea.fr - Bug 581848 + * Vincent Lorenzo (CEA LIST) vincent.Lorenzo@cea.fr - Bug 582667 *****************************************************************************/ package org.eclipse.papyrus.bundles.tests; @@ -49,6 +50,8 @@ public class BundleTestsUtils { public static final String BUNDLE_REQUIREDEXECUTIONENVIRONMENT = "Bundle-RequiredExecutionEnvironment"; //$NON-NLS-1$ + public static final String REQUIRE_CAPABILITY = "Require-Capability"; //$NON-NLS-1$ + public static final String BUNDLE_IMPORT_PACKAGE = "Import-Package"; //$NON-NLS-1$ public static final String JAVA_VERSION_5 = "J2SE-1.5"; //$NON-NLS-1$ @@ -61,14 +64,18 @@ public class BundleTestsUtils { public static final String JAVA_VERSION_11 = "JavaSE-11"; //$NON-NLS-1$ - public static final String JAVA_VERSION_REGEX = Stream.of(JAVA_VERSION_5, JAVA_VERSION_6, JAVA_VERSION_7, JAVA_VERSION_8, JAVA_VERSION_11) + public static final String JAVA_VERSION_17 = "JavaSE-17"; //$NON-NLS-1$ + + public static final String JAVA_VERSION_REGEX = Stream.of(JAVA_VERSION_5, JAVA_VERSION_6, JAVA_VERSION_7, JAVA_VERSION_8, JAVA_VERSION_11, JAVA_VERSION_17) .map(Pattern::quote) .collect(Collectors.joining("|")); //$NON-NLS-1$ + public static final String JAVA_17_CAPABILITY = "osgi\\.ee;filter:=\"\\(&\\(osgi\\.ee=JavaSE\\)\\(version=17\\)\\)\""; //$NON-NLS-1$ + public static final String REQUIRE_BUNDLE = "Require-Bundle"; //$NON-NLS-1$ private BundleTestsUtils() { - // to prevent instanciation + // to prevent instantiation } /** diff --git a/tests/junit/framework/org.eclipse.papyrus.bundles.tests/src/org/eclipse/papyrus/bundles/tests/BundlesTests.java b/tests/junit/framework/org.eclipse.papyrus.bundles.tests/src/org/eclipse/papyrus/bundles/tests/BundlesTests.java index 977e37259b7..38d80b02227 100755 --- a/tests/junit/framework/org.eclipse.papyrus.bundles.tests/src/org/eclipse/papyrus/bundles/tests/BundlesTests.java +++ b/tests/junit/framework/org.eclipse.papyrus.bundles.tests/src/org/eclipse/papyrus/bundles/tests/BundlesTests.java @@ -1,5 +1,5 @@ /***************************************************************************** - * Copyright (c) 2012, 2017, 2021 CEA LIST, Christian W. Damus, and others. + * Copyright (c) 2012, 2017, 2021, 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 @@ -14,6 +14,7 @@ * Christian W. Damus - bugs 433206, 485220 * Thanh Liem PHAN (ALL4TEC) thanhliem.phan@all4tec.net - Bug 513963 * Quentin Le Menez (CEA LIST) quentin.lemenez@cea.fr - Bug 570716 + * Vincent Lorenzo (CEA LIST) vincent.Lorenzo@cea.fr - Bug 582667 *****************************************************************************/ package org.eclipse.papyrus.bundles.tests; @@ -59,12 +60,18 @@ public class BundlesTests extends AbstractPapyrusTest { private static final String INCUBATION_KEYWORD = "(Incubation)"; //$NON-NLS-1$ - private static final String BATIK_VERSION = "\"[1.14.0,1.15.0)\""; //$NON-NLS-1$ + private static final String BATIK_VERSION = "\"[1.17.0,1.18.0)\""; //$NON-NLS-1$ + + private static final String INJECT_VERSION = "\"[7.0.0,8.0.0)\""; //$NON-NLS-1$ private static final String NATTABLE_VERSION = "1.5.0"; //$NON-NLS-1$ private static final String GLAZED_LIST_VERSION = "1.9.0";//$NON-NLS-1$ + private static final String GUAVA_VERSION = "32.1.3"; //$NON-NLS-1$ + + private static final String GSON_VERSION = "2.9.1"; //$NON-NLS-1$ + private static final String UML2_UML_VERSION_RANGE = "bundle-version=\"[5.3.0,6.0.0)\"";//$NON-NLS-1$ @Condition @@ -113,7 +120,37 @@ public class BundlesTests extends AbstractPapyrusTest { */ @Test public void javaVersionTest() { - testManifestProperty(BundleTestsUtils.BUNDLE_REQUIREDEXECUTIONENVIRONMENT, BundleTestsUtils.JAVA_VERSION_REGEX, false, true); + boolean onlyOnJavaProject = true; + String message = null; + int nb = 0; + Pattern bundleRequirementPattern = Pattern.compile(BundleTestsUtils.JAVA_VERSION_17); + Pattern capabilityPattern = Pattern.compile(BundleTestsUtils.JAVA_17_CAPABILITY); + + + for (final Bundle current : BundleTestsUtils.getPapyrusBundles()) { + + if (onlyOnJavaProject && !BundleTestsUtils.isJavaProject(current)) { + continue; // useful for oep.infra.gmfdiag.css.theme for example + } + boolean result = false; + + String value = current.getHeaders().get(BundleTestsUtils.BUNDLE_REQUIREDEXECUTIONENVIRONMENT); + if (value != null) { + result = bundleRequirementPattern.matcher(value).matches(); // Don't fail yet if invalid + } else { + value = current.getHeaders().get(BundleTestsUtils.REQUIRE_CAPABILITY); + result = capabilityPattern.matcher(value).matches(); // Don't fail yet if invalid + } + if (!result) { + if (message == null) { + message = "Wrong java version for :"; //$NON-NLS-1$ + } + message += "\n "; //$NON-NLS-1$ + message += current.getSymbolicName(); + nb++; + } + } + Assert.assertNull(nb + " problems!", message); //$NON-NLS-1$ } /** @@ -216,7 +253,7 @@ public class BundlesTests extends AbstractPapyrusTest { */ @Test public void batikDependencyVersionTest() { - testPapyrusDependencies2("org.apache.batik", BATIK_VERSION);//$NON-NLS-1$ + testPapyrusDependencies("org.apache.batik", BATIK_VERSION, Collections.emptyList());//$NON-NLS-1$ } @Test @@ -226,12 +263,22 @@ public class BundlesTests extends AbstractPapyrusTest { @Test public void glazedListDependencyVersionTest() { - testPapyrusDependencies2("ca.odell.glazedlists", GLAZED_LIST_VERSION);//$NON-NLS-1$ + testPapyrusDependencies("ca.odell.glazedlists", GLAZED_LIST_VERSION, Collections.emptyList());//$NON-NLS-1$ } @Test public void guavaDependencyVersionTest() { - testPapyrusDependencies2("com.google.guava", "30.1.0");//$NON-NLS-1$ //$NON-NLS-2$ + testPapyrusDependencies("com.google.guava", GUAVA_VERSION, Collections.emptyList());//$NON-NLS-1$ + } + + @Test + public void injectDependencyVersionTest() { + testPapyrusDependencies("com.google.inject", INJECT_VERSION, Collections.emptyList());//$NON-NLS-1$ + } + + @Test + public void gsonDependencyVersionTest() { + testPapyrusDependencies("com.google.gson", GSON_VERSION, Collections.emptyList());//$NON-NLS-1$ } @Test @@ -441,7 +488,6 @@ public class BundlesTests extends AbstractPapyrusTest { possibleIds.add("ID");//$NON-NLS-1$ possibleIds.add("PLUGIN_ID");//$NON-NLS-1$ int nbError = 0; - int nbWarning = 0; for (final Bundle current : BundleTestsUtils.getPapyrusBundles()) { if (!BundleTestsUtils.isJavaProject(current)) { continue; // useful for oep.infra.gmfdiag.css.theme for example @@ -466,7 +512,6 @@ public class BundlesTests extends AbstractPapyrusTest { } } else { // Never happens. An exception is thrown. - nbWarning++; warningMessage.append(NLS.bind("The activator of {0} has no field named PLUGIN_ID.\n", current.getSymbolicName())); //$NON-NLS-1$ } } catch (final Exception e) { diff --git a/tests/junit/framework/org.eclipse.papyrus.bundles.tests/src/org/eclipse/papyrus/bundles/tests/apireport/Java8DeltaXMLVisitor.java b/tests/junit/framework/org.eclipse.papyrus.bundles.tests/src/org/eclipse/papyrus/bundles/tests/apireport/Java8DeltaXMLVisitor.java deleted file mode 100644 index c1af3530789..00000000000 --- a/tests/junit/framework/org.eclipse.papyrus.bundles.tests/src/org/eclipse/papyrus/bundles/tests/apireport/Java8DeltaXMLVisitor.java +++ /dev/null @@ -1,217 +0,0 @@ -/***************************************************************************** - * Copyright (c) 2016 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 - * https://www.eclipse.org/legal/epl-2.0/ - * - * SPDX-License-Identifier: EPL-2.0 - * - * Contributors: - * Christian W. Damus - Initial API and implementation - * - *****************************************************************************/ - -package org.eclipse.papyrus.bundles.tests.apireport; - -import java.io.IOException; -import java.lang.reflect.Field; -import java.util.HashMap; -import java.util.Map; - -import org.eclipse.core.runtime.CoreException; -import org.eclipse.jdt.core.Flags; -import org.eclipse.pde.api.tools.internal.IApiXmlConstants; -import org.eclipse.pde.api.tools.internal.provisional.comparator.IDelta; -import org.w3c.dom.Element; -import org.w3c.dom.NodeList; - -/** - * A specialized {@link SafeDeltaXmlVisitor} that accounts for new - * compatibility scenarios in Java8's interface evoluation - * capabilities (such as default and static methods). - */ -public class Java8DeltaXMLVisitor extends SafeDeltaXmlVisitor { - private static final Map<String, Integer> deltaConstantsDecoder = new HashMap<>(); - - private final Element root; - - static { - try { - for (Field next : IDelta.class.getFields()) { - if (next.getType() == int.class) { - deltaConstantsDecoder.put(next.getName(), next.getInt(null)); - } - } - } catch (Exception e) { - // Won't happen because we iterate known fields of an interface, which - // are by definition always accessible - throw new Error(e); - } - } - - public Java8DeltaXMLVisitor() throws CoreException { - super(); - - root = getDocument().getDocumentElement(); - } - - - /** - * Appends my XML content to a given {@code appendable}. - * - * @param appendable - * the appenable on which to append me - * - * @throws IOException - * on failure to append - */ - public void appendTo(Appendable appendable) throws IOException { - try { - appendable.append(getXML()); - } catch (CoreException e) { - throw new IOException(e); - } - } - - @Override - protected void processLeafDelta(IDelta delta) { - super.processLeafDelta(delta); - - Element deltaElement = getNewElement(); - if (isIncompatible(deltaElement)) { - amend(deltaElement); - } - } - - /** - * Obtains the element most recently added to the delta report. - * - * @return the newest delta element - */ - Element getNewElement() { - NodeList nodes = root.getChildNodes(); - // We don't append interstitial text - return (Element) nodes.item(nodes.getLength() - 1); - } - - public boolean isIncompatible(Element delta) { - String result = getString(delta, IApiXmlConstants.ATTR_NAME_COMPATIBLE); - return !Boolean.parseBoolean(result); - } - - protected void setCompatible(Element delta, boolean compatible) { - set(delta, IApiXmlConstants.ATTR_NAME_COMPATIBLE, compatible); - } - - protected String getString(Element element, String attribute) { - return element.getAttribute(attribute); - } - - protected void set(Element element, String attribute, String value) { - if (value == null) { - element.removeAttribute(attribute); - } else { - element.setAttribute(attribute, value); - } - } - - protected boolean getBoolean(Element element, String attribute) { - String result = getString(element, attribute); - return Boolean.parseBoolean(result); - } - - protected void set(Element element, String attribute, boolean value) { - set(element, attribute, Boolean.toString(value)); - } - - protected int getInt(Element element, String attribute) { - String result = getString(element, attribute); - return (result == null) ? 0 : Integer.parseInt(result); - } - - protected void set(Element element, String attribute, int value) { - set(element, attribute, Integer.toString(value)); - } - - protected void amend(Element delta) { - Integer elementType = deltaConstantsDecoder.getOrDefault( - getString(delta, IApiXmlConstants.ATTR_NAME_ELEMENT_TYPE), - 0); - - switch (elementType) { - case IDelta.INTERFACE_ELEMENT_TYPE: - amendInterface(delta); - break; - } - } - - protected void amendInterface(Element delta) { - boolean compatible = false; - Integer kind = deltaConstantsDecoder.getOrDefault( - getString(delta, IApiXmlConstants.ATTR_KIND), - 0); - String newMessage = null; - - switch (kind) { - case IDelta.ADDED: - // Something was added to the interface - switch (getInt(delta, IApiXmlConstants.ATTR_FLAGS)) { - case IDelta.FIELD: - // Interfaces can only have static fields, so of course this is - // compatible because the linkage is static - compatible = isStatic(delta); - if (compatible) { - newMessage = getString(delta, IApiXmlConstants.ATTR_MESSAGE); - if (newMessage != null) { - newMessage = newMessage.replaceFirst("field", "static field"); - newMessage = newMessage.replaceFirst("in an interface that .*? has", "has"); - } - } - break; - case IDelta.METHOD: - // Java 8 default and static methods are a compatible addition - compatible = isDefaultOrStaticMethod(delta); - if (compatible) { - newMessage = getString(delta, IApiXmlConstants.ATTR_MESSAGE); - if (newMessage != null) { - newMessage = newMessage.replaceFirst("method", - isStatic(delta) ? "static method" : "default method"); - newMessage = newMessage.replaceFirst("in an interface that .*? has", "has"); - } - } - break; - } - break; - } - - if (compatible) { - setCompatible(delta, compatible); - if (newMessage != null) { - set(delta, IApiXmlConstants.ATTR_MESSAGE, newMessage); - } - } - } - - private boolean isDefaultOrStaticMethod(Element delta) { - // Assume not if we can't get the method details - boolean result = false; - - int modifiers = getInt(delta, IApiXmlConstants.ATTR_NAME_NEW_MODIFIERS); - result = Flags.isDefaultMethod(modifiers) || Flags.isStatic(modifiers) - || !Flags.isAbstract(modifiers); // May not know that it's explicitly default - - return result; - } - - private boolean isStatic(Element delta) { - // Assume not if we can't get the method details - boolean result = false; - - int modifiers = getInt(delta, IApiXmlConstants.ATTR_NAME_NEW_MODIFIERS); - result = Flags.isStatic(modifiers); - - return result; - } -} diff --git a/tests/junit/framework/org.eclipse.papyrus.bundles.tests/src/org/eclipse/papyrus/bundles/tests/apireport/SafeDeltaXmlVisitor.java b/tests/junit/framework/org.eclipse.papyrus.bundles.tests/src/org/eclipse/papyrus/bundles/tests/apireport/SafeDeltaXmlVisitor.java deleted file mode 100644 index 7f14d0a8ba9..00000000000 --- a/tests/junit/framework/org.eclipse.papyrus.bundles.tests/src/org/eclipse/papyrus/bundles/tests/apireport/SafeDeltaXmlVisitor.java +++ /dev/null @@ -1,179 +0,0 @@ -/***************************************************************************** - * Copyright (c) 2017 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 - * https://www.eclipse.org/legal/epl-2.0/ - * - * SPDX-License-Identifier: EPL-2.0 - * - * Contributors: - * CEA LIST - Initial API and implementation - * - *****************************************************************************/ -/******************************************************************************* - * Copyright (c) 2007, 2013 IBM Corporation 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 - * https://www.eclipse.org/legal/epl-2.0/ - * - * SPDX-License-Identifier: EPL-2.0 - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.papyrus.bundles.tests.apireport; - -import java.io.IOException; -import java.io.Writer; - -import org.apache.commons.lang3.text.translate.AggregateTranslator; -import org.apache.commons.lang3.text.translate.CharSequenceTranslator; -import org.apache.commons.lang3.text.translate.CodePointTranslator; -import org.apache.commons.lang3.text.translate.EntityArrays; -import org.apache.commons.lang3.text.translate.LookupTranslator; -import org.apache.commons.lang3.text.translate.NumericEntityEscaper; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.pde.api.tools.internal.IApiXmlConstants; -import org.eclipse.pde.api.tools.internal.provisional.comparator.ApiComparator; -import org.eclipse.pde.api.tools.internal.provisional.comparator.DeltaProcessor; -import org.eclipse.pde.api.tools.internal.provisional.comparator.DeltaVisitor; -import org.eclipse.pde.api.tools.internal.provisional.comparator.IDelta; -import org.eclipse.pde.api.tools.internal.util.Util; -import org.w3c.dom.Document; -import org.w3c.dom.Element; - -/** - * Copy of org.eclipse.pde.api.tools.internal.comparator.DeltaXmlVisitor that has a fix to escape xml special chars - * - * Delta visitor that generates XML for the delta. - * - * @since 1.0.0 - */ -public class SafeDeltaXmlVisitor extends DeltaVisitor { - /** - * XML doc being generated - */ - private Document fDoc; - - /** - * Top deltas element - */ - private Element fDeltas; - - /** - * Constructs a new visitor for the given component. - * - * @param component - * API component - * @throws CoreException - * if unable to construct the visitor - */ - public SafeDeltaXmlVisitor() throws CoreException { - fDoc = Util.newDocument(); - fDeltas = fDoc.createElement(IApiXmlConstants.DELTAS_ELEMENT_NAME); - fDoc.appendChild(fDeltas); - } - - @Override - public boolean visit(IDelta delta) { - if (delta == ApiComparator.NO_DELTA) { - return false; - } - if (delta.getChildren().length == 0) { - processLeafDelta(delta); - } - return true; - } - - protected void processLeafDelta(IDelta delta) { - Element deltaElement = fDoc.createElement(IApiXmlConstants.DELTA_ELEMENT_NAME); - deltaElement.setAttribute(IApiXmlConstants.ATTR_FLAGS, Integer.toString(delta.getFlags())); - deltaElement.setAttribute(IApiXmlConstants.ATTR_KIND, Util.getDeltaKindName(delta)); - deltaElement.setAttribute(IApiXmlConstants.ATTR_NAME_ELEMENT_TYPE, Util.getDeltaElementType(delta)); - deltaElement.setAttribute(IApiXmlConstants.ATTR_KEY, delta.getKey()); - String typeName = delta.getTypeName(); - if (typeName != null) { - deltaElement.setAttribute(IApiXmlConstants.ATTR_NAME_TYPE_NAME, typeName); - } - deltaElement.setAttribute(IApiXmlConstants.ATTR_NAME_COMPATIBLE, Boolean.toString(DeltaProcessor.isCompatible(delta))); - deltaElement.setAttribute(IApiXmlConstants.ATTR_NAME_OLD_MODIFIERS, Integer.toString(delta.getOldModifiers())); - deltaElement.setAttribute(IApiXmlConstants.ATTR_NAME_NEW_MODIFIERS, Integer.toString(delta.getNewModifiers())); - deltaElement.setAttribute(IApiXmlConstants.ATTR_RESTRICTIONS, Integer.toString(delta.getCurrentRestrictions())); - String apiComponentID = delta.getComponentVersionId(); - if (apiComponentID != null) { - deltaElement.setAttribute(IApiXmlConstants.ATTR_NAME_COMPONENT_ID, apiComponentID); - } - - deltaElement.setAttribute(IApiXmlConstants.ATTR_MESSAGE, ESCAPE_XML11.translate(delta.getMessage())); - String[] messageArguments = delta.getArguments(); - int length = messageArguments.length; - if (length > 0) { - Element messageArgumentsElement = fDoc.createElement(IApiXmlConstants.ELEMENT_DELTA_MESSAGE_ARGUMENTS); - for (int j = 0; j < length; j++) { - Element messageArgumentElement = fDoc.createElement(IApiXmlConstants.ELEMENT_DELTA_MESSAGE_ARGUMENT); - - messageArgumentElement.setAttribute(IApiXmlConstants.ATTR_VALUE, ESCAPE_XML11.translate(String.valueOf(messageArguments[j]))); - - messageArgumentsElement.appendChild(messageArgumentElement); - } - deltaElement.appendChild(messageArgumentsElement); - } - fDeltas.appendChild(deltaElement); - } - - public CharSequenceTranslator ESCAPE_XML11 = new AggregateTranslator( - new LookupTranslator(EntityArrays.BASIC_ESCAPE()), - new LookupTranslator(EntityArrays.APOS_ESCAPE()), - new LookupTranslator( - new String[][] { - { "\u0000", "" }, - { "\u000b", "" }, - { "\u000c", "" }, - { "\ufffe", "" }, - { "\uffff", "" } - }), - NumericEntityEscaper.between(0x1, 0x8), - NumericEntityEscaper.between(0xe, 0x1f), - NumericEntityEscaper.between(0x7f, 0x84), - NumericEntityEscaper.between(0x86, 0x9f), - new UnicodeUnpairedSurrogateRemover()); - - public class UnicodeUnpairedSurrogateRemover extends CodePointTranslator { - @Override - public boolean translate(final int codepoint, final Writer out) throws IOException { - if (codepoint <= Character.MAX_SURROGATE && codepoint >= Character.MIN_SURROGATE) { - return true; - } - return false; - } - } - - @Override - public void endVisit(IDelta delta) { - // nothing to do - } - - /** - * Returns the settings as a UTF-8 string containing XML. - * - * @return XML - * @throws CoreException - * if something goes wrong - */ - public String getXML() throws CoreException { - return Util.serializeDocument(fDoc); - } - - /** - * Return the xml dom document this visitor generates. Use {@link #getXML()} - * to get the serialized xml string. - * - * @return xml dom document - */ - public Document getDocument() { - return fDoc; - } -}
\ No newline at end of file diff --git a/tests/junit/framework/org.eclipse.papyrus.junit.framework/.classpath b/tests/junit/framework/org.eclipse.papyrus.junit.framework/.classpath index e801ebfb468..81fe078c20c 100644 --- a/tests/junit/framework/org.eclipse.papyrus.junit.framework/.classpath +++ b/tests/junit/framework/org.eclipse.papyrus.junit.framework/.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/tests/junit/framework/org.eclipse.papyrus.junit.framework/.settings/org.eclipse.jdt.core.prefs b/tests/junit/framework/org.eclipse.papyrus.junit.framework/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/tests/junit/framework/org.eclipse.papyrus.junit.framework/.settings/org.eclipse.jdt.core.prefs +++ b/tests/junit/framework/org.eclipse.papyrus.junit.framework/.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/tests/junit/framework/org.eclipse.papyrus.junit.framework/META-INF/MANIFEST.MF b/tests/junit/framework/org.eclipse.papyrus.junit.framework/META-INF/MANIFEST.MF index f14d4bb3bf1..405fd9afce4 100644 --- a/tests/junit/framework/org.eclipse.papyrus.junit.framework/META-INF/MANIFEST.MF +++ b/tests/junit/framework/org.eclipse.papyrus.junit.framework/META-INF/MANIFEST.MF @@ -13,8 +13,8 @@ Bundle-Version: 2.2.0.qualifier Bundle-Name: Conditional Junit Annotations Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.junit.framework;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 -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)" +Bundle-RequiredExecutionEnvironment: JavaSE-17 +Import-Package: com.google.common.base;version="[32.0.0, 33.0.0)", + com.google.common.cache;version="[32.0.0, 33.0.0)", + com.google.common.collect;version="[32.0.0, 33.0.0)" Automatic-Module-Name: org.eclipse.papyrus.junit.framework diff --git a/tests/junit/framework/org.eclipse.papyrus.junit.utils/.classpath b/tests/junit/framework/org.eclipse.papyrus.junit.utils/.classpath index e801ebfb468..81fe078c20c 100644 --- a/tests/junit/framework/org.eclipse.papyrus.junit.utils/.classpath +++ b/tests/junit/framework/org.eclipse.papyrus.junit.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/tests/junit/framework/org.eclipse.papyrus.junit.utils/.settings/org.eclipse.jdt.core.prefs b/tests/junit/framework/org.eclipse.papyrus.junit.utils/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/tests/junit/framework/org.eclipse.papyrus.junit.utils/.settings/org.eclipse.jdt.core.prefs +++ b/tests/junit/framework/org.eclipse.papyrus.junit.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/tests/junit/framework/org.eclipse.papyrus.junit.utils/META-INF/MANIFEST.MF b/tests/junit/framework/org.eclipse.papyrus.junit.utils/META-INF/MANIFEST.MF index 3a56801134e..8cc9e8bf000 100644 --- a/tests/junit/framework/org.eclipse.papyrus.junit.utils/META-INF/MANIFEST.MF +++ b/tests/junit/framework/org.eclipse.papyrus.junit.utils/META-INF/MANIFEST.MF @@ -41,16 +41,16 @@ Export-Package: org.eclipse.papyrus.junit.matchers, org.eclipse.papyrus.junit.utils.xtext Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy -Bundle-Version: 3.2.0.qualifier +Bundle-Version: 3.3.0.qualifier Bundle-Name: %Bundle-Name Bundle-ManifestVersion: 2 Bundle-Activator: org.eclipse.papyrus.junit.utils.Activator Bundle-Description: %pluginDescription Bundle-SymbolicName: org.eclipse.papyrus.junit.utils;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 -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.io;version="[30.1.0, 31.0.0)", - com.google.common.primitives;version="[30.1.0, 31.0.0)" +Bundle-RequiredExecutionEnvironment: JavaSE-17 +Import-Package: com.google.common.base;version="[32.0.0, 33.0.0)", + com.google.common.cache;version="[32.0.0, 33.0.0)", + com.google.common.collect;version="[32.0.0, 33.0.0)", + com.google.common.io;version="[32.0.0, 33.0.0)", + com.google.common.primitives;version="[32.0.0, 33.0.0)" Automatic-Module-Name: org.eclipse.papyrus.junit.utils diff --git a/tests/junit/framework/org.eclipse.papyrus.junit.utils/pom.xml b/tests/junit/framework/org.eclipse.papyrus.junit.utils/pom.xml index 957dd2a1092..ca2fa57e374 100644 --- a/tests/junit/framework/org.eclipse.papyrus.junit.utils/pom.xml +++ b/tests/junit/framework/org.eclipse.papyrus.junit.utils/pom.xml @@ -10,6 +10,6 @@ </parent> <groupId>org.eclipse.papyrus</groupId> <artifactId>org.eclipse.papyrus.junit.utils</artifactId> - <version>3.2.0-SNAPSHOT</version> + <version>3.3.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project>
\ No newline at end of file diff --git a/tests/junit/framework/org.eclipse.papyrus.junit.utils/src/org/eclipse/papyrus/junit/utils/rules/PapyrusEditorFixture.java b/tests/junit/framework/org.eclipse.papyrus.junit.utils/src/org/eclipse/papyrus/junit/utils/rules/PapyrusEditorFixture.java index 8f59b899337..9bb2c7a2c99 100644 --- a/tests/junit/framework/org.eclipse.papyrus.junit.utils/src/org/eclipse/papyrus/junit/utils/rules/PapyrusEditorFixture.java +++ b/tests/junit/framework/org.eclipse.papyrus.junit.utils/src/org/eclipse/papyrus/junit/utils/rules/PapyrusEditorFixture.java @@ -13,7 +13,7 @@ * Christian W. Damus - bugs 433206, 465416, 434983, 483721, 469188, 485220, 491542, 497865, 533673, 533682, 533676, 533679, 536486 * Thanh Liem PHAN (ALL4TEC) thanhliem.phan@all4tec.net - Bug 521550 * EclipseSource - Bug 536631 - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Bug 549108 + * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Bug 549108, 580192 *****************************************************************************/ package org.eclipse.papyrus.junit.utils.rules; @@ -894,6 +894,7 @@ public class PapyrusEditorFixture extends AbstractModelFixture<TransactionalEdit ServiceUtils.getInstance().getService(IPageManager.class, editor.getServicesRegistry()).closePage(diagram); flushDisplayEvents(); } + activeDiagramEditor = null; } catch (Exception e) { throw new IllegalStateException("Cannot close diagram", e); } @@ -1591,13 +1592,17 @@ public class PapyrusEditorFixture extends AbstractModelFixture<TransactionalEdit return getNewEditPart(parent, request.getViewDescriptors()); } - private IGraphicalEditPart getNewEditPart(EditPart context, Collection<? extends ViewDescriptor> viewDescriptors) { + + /** + * @since 3.3 + */ + protected IGraphicalEditPart getNewEditPart(EditPart context, Collection<? extends ViewDescriptor> viewDescriptors) { return viewDescriptors.stream() .map(desc -> desc.getAdapter(View.class)).map(View.class::cast) .filter(Objects::nonNull) .map(view -> DiagramEditPartsUtil.getEditPartFromView(view, context)) .filter(IGraphicalEditPart.class::isInstance).map(IGraphicalEditPart.class::cast) - .findAny().orElseGet(failOnAbsence("Could not find newly created edit-part")); + .findAny().orElseGet(failOnAbsence("Could not find newly created edit-part")); //$NON-NLS-1$ } /** diff --git a/tests/junit/plugins/bundlestests/org.eclipse.papyrus.developer.suite.tests/.classpath b/tests/junit/plugins/bundlestests/org.eclipse.papyrus.developer.suite.tests/.classpath index 8f8662d1d43..76c5ab8d8d8 100755 --- a/tests/junit/plugins/bundlestests/org.eclipse.papyrus.developer.suite.tests/.classpath +++ b/tests/junit/plugins/bundlestests/org.eclipse.papyrus.developer.suite.tests/.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="test"> <attributes> diff --git a/tests/junit/plugins/bundlestests/org.eclipse.papyrus.developer.suite.tests/.settings/org.eclipse.jdt.core.prefs b/tests/junit/plugins/bundlestests/org.eclipse.papyrus.developer.suite.tests/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/tests/junit/plugins/bundlestests/org.eclipse.papyrus.developer.suite.tests/.settings/org.eclipse.jdt.core.prefs +++ b/tests/junit/plugins/bundlestests/org.eclipse.papyrus.developer.suite.tests/.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/tests/junit/plugins/bundlestests/org.eclipse.papyrus.developer.suite.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/bundlestests/org.eclipse.papyrus.developer.suite.tests/META-INF/MANIFEST.MF index 86db89c8c96..f5dd3c92a6d 100755 --- a/tests/junit/plugins/bundlestests/org.eclipse.papyrus.developer.suite.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/bundlestests/org.eclipse.papyrus.developer.suite.tests/META-INF/MANIFEST.MF @@ -6,7 +6,7 @@ Bundle-Localization: plugin Bundle-ManifestVersion: 2 Bundle-Activator: org.eclipse.papyrus.developer.suite.tests.Activator Bundle-SymbolicName: org.eclipse.papyrus.developer.suite.tests;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Manifest-Version: 1.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)", diff --git a/tests/junit/plugins/editor/org.eclipse.papyrus.eclipse.project.editors.tests/.classpath b/tests/junit/plugins/editor/org.eclipse.papyrus.eclipse.project.editors.tests/.classpath index e801ebfb468..81fe078c20c 100644 --- a/tests/junit/plugins/editor/org.eclipse.papyrus.eclipse.project.editors.tests/.classpath +++ b/tests/junit/plugins/editor/org.eclipse.papyrus.eclipse.project.editors.tests/.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/tests/junit/plugins/editor/org.eclipse.papyrus.eclipse.project.editors.tests/.settings/org.eclipse.jdt.core.prefs b/tests/junit/plugins/editor/org.eclipse.papyrus.eclipse.project.editors.tests/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/tests/junit/plugins/editor/org.eclipse.papyrus.eclipse.project.editors.tests/.settings/org.eclipse.jdt.core.prefs +++ b/tests/junit/plugins/editor/org.eclipse.papyrus.eclipse.project.editors.tests/.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/tests/junit/plugins/editor/org.eclipse.papyrus.eclipse.project.editors.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/editor/org.eclipse.papyrus.eclipse.project.editors.tests/META-INF/MANIFEST.MF index c249269172c..61567034f61 100644 --- a/tests/junit/plugins/editor/org.eclipse.papyrus.eclipse.project.editors.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/editor/org.eclipse.papyrus.eclipse.project.editors.tests/META-INF/MANIFEST.MF @@ -13,6 +13,6 @@ Bundle-Version: 3.1.0.qualifier Bundle-Name: Papyrus Project Editor Tests Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.eclipse.project.editors.tests;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="[32.0.0, 33.0.0)" Automatic-Module-Name: org.eclipse.papyrus.eclipse.project.editors.tests diff --git a/tests/junit/plugins/editor/org.eclipse.papyrus.eclipse.project.editors.tests/resources/manifest_project/META-INF/MANIFEST.MF b/tests/junit/plugins/editor/org.eclipse.papyrus.eclipse.project.editors.tests/resources/manifest_project/META-INF/MANIFEST.MF index b0098cb7d39..7a139e13e05 100644 --- a/tests/junit/plugins/editor/org.eclipse.papyrus.eclipse.project.editors.tests/resources/manifest_project/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/editor/org.eclipse.papyrus.eclipse.project.editors.tests/resources/manifest_project/META-INF/MANIFEST.MF @@ -14,7 +14,7 @@ Bundle-Name: Papyrus Test Bundle Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.foo Bundle-Localization: plugin -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Name: author-info Full-Name: Christian W. Damus diff --git a/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/.classpath b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/.classpath index e801ebfb468..81fe078c20c 100644 --- a/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/.classpath +++ b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/.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/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/.settings/org.eclipse.jdt.core.prefs b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/.settings/org.eclipse.jdt.core.prefs +++ b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/.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/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/META-INF/MANIFEST.MF index bd68d3dd601..4e77701b1e7 100644 --- a/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/META-INF/MANIFEST.MF @@ -39,7 +39,7 @@ Bundle-Name: Papyrus Editor Integration Tests Bundle-ManifestVersion: 2 Bundle-Activator: org.eclipse.papyrus.editor.integration.tests.Activator Bundle-SymbolicName: org.eclipse.papyrus.editor.integration.tests;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="[32.0.0, 33.0.0)", + com.google.common.collect;version="[32.0.0, 33.0.0)" Automatic-Module-Name: org.eclipse.papyrus.editor.integration.tests diff --git a/tests/junit/plugins/editor/org.eclipse.papyrus.editors.suite.tests/.classpath b/tests/junit/plugins/editor/org.eclipse.papyrus.editors.suite.tests/.classpath index 9cb19c81c76..c0255c320e6 100755 --- a/tests/junit/plugins/editor/org.eclipse.papyrus.editors.suite.tests/.classpath +++ b/tests/junit/plugins/editor/org.eclipse.papyrus.editors.suite.tests/.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="test"/> <classpathentry kind="output" path="bin"/> diff --git a/tests/junit/plugins/editor/org.eclipse.papyrus.editors.suite.tests/.settings/org.eclipse.jdt.core.prefs b/tests/junit/plugins/editor/org.eclipse.papyrus.editors.suite.tests/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/tests/junit/plugins/editor/org.eclipse.papyrus.editors.suite.tests/.settings/org.eclipse.jdt.core.prefs +++ b/tests/junit/plugins/editor/org.eclipse.papyrus.editors.suite.tests/.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/tests/junit/plugins/editor/org.eclipse.papyrus.editors.suite.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/editor/org.eclipse.papyrus.editors.suite.tests/META-INF/MANIFEST.MF index 891206d773b..d12cb9ea1a2 100755 --- a/tests/junit/plugins/editor/org.eclipse.papyrus.editors.suite.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/editor/org.eclipse.papyrus.editors.suite.tests/META-INF/MANIFEST.MF @@ -6,7 +6,7 @@ Bundle-Localization: plugin Bundle-ManifestVersion: 2 Bundle-Activator: org.eclipse.papyrus.editors.suite.tests.Activator Bundle-SymbolicName: org.eclipse.papyrus.editors.suite.tests;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Manifest-Version: 1.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)", diff --git a/tests/junit/plugins/facet/org.eclipse.papyrus.emf.facet.architecture.tests/.classpath b/tests/junit/plugins/facet/org.eclipse.papyrus.emf.facet.architecture.tests/.classpath index a42a828e04a..675a5e2962b 100755 --- a/tests/junit/plugins/facet/org.eclipse.papyrus.emf.facet.architecture.tests/.classpath +++ b/tests/junit/plugins/facet/org.eclipse.papyrus.emf.facet.architecture.tests/.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"> <attributes> diff --git a/tests/junit/plugins/facet/org.eclipse.papyrus.emf.facet.architecture.tests/.settings/org.eclipse.jdt.core.prefs b/tests/junit/plugins/facet/org.eclipse.papyrus.emf.facet.architecture.tests/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/tests/junit/plugins/facet/org.eclipse.papyrus.emf.facet.architecture.tests/.settings/org.eclipse.jdt.core.prefs +++ b/tests/junit/plugins/facet/org.eclipse.papyrus.emf.facet.architecture.tests/.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/tests/junit/plugins/facet/org.eclipse.papyrus.emf.facet.architecture.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/facet/org.eclipse.papyrus.emf.facet.architecture.tests/META-INF/MANIFEST.MF index 3b95715d41a..8e750befb07 100755 --- a/tests/junit/plugins/facet/org.eclipse.papyrus.emf.facet.architecture.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/facet/org.eclipse.papyrus.emf.facet.architecture.tests/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-SymbolicName: org.eclipse.papyrus.emf.facet.architecture.tests Bundle-Version: 1.0.0.qualifier Bundle-Vendor: Eclipse Modeling Project Automatic-Module-Name: org.eclipse.papyrus.emf.facet.architecture.tests -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Require-Bundle: org.eclipse.papyrus.emf.facet.architecture;bundle-version="[1.0.0,2.0.0)", org.eclipse.papyrus.infra.architecture;bundle-version="[3.0.0,4.0.0)", org.eclipse.papyrus.infra.core;bundle-version="[4.0.0,5.0.0)", diff --git a/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.clipboard.tests/.classpath b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.clipboard.tests/.classpath index e801ebfb468..81fe078c20c 100755 --- a/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.clipboard.tests/.classpath +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.clipboard.tests/.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/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.clipboard.tests/.settings/org.eclipse.jdt.core.prefs b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.clipboard.tests/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.clipboard.tests/.settings/org.eclipse.jdt.core.prefs +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.clipboard.tests/.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/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.clipboard.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.clipboard.tests/META-INF/MANIFEST.MF index 3721e2f122c..6c7a0d3419a 100755 --- a/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.clipboard.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.clipboard.tests/META-INF/MANIFEST.MF @@ -18,5 +18,5 @@ Bundle-Localization: plugin Bundle-ManifestVersion: 2 Bundle-Activator: org.eclipse.papyrus.infra.core.clipboard.tests.Activator Bundle-SymbolicName: org.eclipse.papyrus.infra.core.clipboard.tests;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.infra.core.clipboard.tests diff --git a/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/.classpath b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/.classpath index 9cb19c81c76..c0255c320e6 100644 --- a/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/.classpath +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/.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="test"/> <classpathentry kind="output" path="bin"/> diff --git a/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/.settings/org.eclipse.jdt.core.prefs b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/.settings/org.eclipse.jdt.core.prefs +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/.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/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/META-INF/MANIFEST.MF index 027496ddfa2..d3a55f79a3a 100644 --- a/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/META-INF/MANIFEST.MF @@ -18,5 +18,5 @@ Bundle-Version: 2.0.0.qualifier Bundle-Name: %Bundle-Name Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.infra.core.sasheditor.di.tests;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.infra.core.sasheditor.di.tests diff --git a/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.tests/.classpath b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.tests/.classpath index 9cb19c81c76..c0255c320e6 100644 --- a/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.tests/.classpath +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.tests/.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="test"/> <classpathentry kind="output" path="bin"/> diff --git a/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.tests/.settings/org.eclipse.jdt.core.prefs b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.tests/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.tests/.settings/org.eclipse.jdt.core.prefs +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.tests/.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/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.tests/META-INF/MANIFEST.MF index 1556b35e1bd..8f71d75d322 100644 --- a/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.tests/META-INF/MANIFEST.MF @@ -26,5 +26,5 @@ Bundle-Name: %pluginName Bundle-Localization: plugin Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.infra.core.sasheditor.tests;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.infra.core.sasheditor.tests diff --git a/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.suite.tests/.classpath b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.suite.tests/.classpath index 9cb19c81c76..c0255c320e6 100755 --- a/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.suite.tests/.classpath +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.suite.tests/.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="test"/> <classpathentry kind="output" path="bin"/> diff --git a/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.suite.tests/.settings/org.eclipse.jdt.core.prefs b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.suite.tests/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.suite.tests/.settings/org.eclipse.jdt.core.prefs +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.suite.tests/.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/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.suite.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.suite.tests/META-INF/MANIFEST.MF index 8703f0ae743..0f7ab7fe26c 100755 --- a/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.suite.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.suite.tests/META-INF/MANIFEST.MF @@ -7,7 +7,7 @@ Bundle-Localization: plugin Bundle-ManifestVersion: 2 Bundle-Activator: org.eclipse.papyrus.infra.core.suite.tests.Activator Bundle-SymbolicName: org.eclipse.papyrus.infra.core.suite.tests;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 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)", diff --git a/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.tests/.classpath b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.tests/.classpath index 8250562e070..9c90450b962 100644 --- a/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.tests/.classpath +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.tests/.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="org/eclipse/papyrus/infra/core/internal/**"/> diff --git a/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.tests/.settings/org.eclipse.jdt.core.prefs b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.tests/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.tests/.settings/org.eclipse.jdt.core.prefs +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.tests/.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/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.tests/META-INF/MANIFEST.MF index 084ba3ae1d4..79afc3acf9d 100644 --- a/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.tests/META-INF/MANIFEST.MF @@ -20,8 +20,8 @@ Bundle-Name: %pluginName Bundle-Localization: plugin Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.infra.core.tests;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="[32.0.0, 33.0.0)", + com.google.common.collect;version="[32.0.0, 33.0.0)", + com.google.common.util.concurrent;version="[32.0.0, 33.0.0)" Automatic-Module-Name: org.eclipse.papyrus.infra.core.tests diff --git a/tests/junit/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome.tests/.classpath b/tests/junit/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome.tests/.classpath index c89056f7def..4a53b5d7234 100644 --- a/tests/junit/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome.tests/.classpath +++ b/tests/junit/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome.tests/.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"> <accessrules> <accessrule kind="accessible" pattern="org/eclipse/papyrus/infra/editor/welcome/**"/> diff --git a/tests/junit/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome.tests/.settings/org.eclipse.jdt.core.prefs b/tests/junit/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome.tests/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/tests/junit/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome.tests/.settings/org.eclipse.jdt.core.prefs +++ b/tests/junit/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome.tests/.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/tests/junit/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome.tests/META-INF/MANIFEST.MF index a068cdcf8fd..303db61b7ce 100644 --- a/tests/junit/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome.tests/META-INF/MANIFEST.MF @@ -23,5 +23,5 @@ Bundle-Name: %pluginName Bundle-Localization: plugin Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.infra.editor.welcome.tests;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.infra.editor.welcome.tests diff --git a/tests/junit/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.tests/.classpath b/tests/junit/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.tests/.classpath index e801ebfb468..81fe078c20c 100755 --- a/tests/junit/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.tests/.classpath +++ b/tests/junit/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.tests/.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/tests/junit/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.tests/.settings/org.eclipse.jdt.core.prefs b/tests/junit/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.tests/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/tests/junit/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.tests/.settings/org.eclipse.jdt.core.prefs +++ b/tests/junit/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.tests/.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/tests/junit/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.tests/META-INF/MANIFEST.MF index 5179ca24573..de7212b915c 100755 --- a/tests/junit/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.tests/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.papyrus.infra.emf.expressions.tests Bundle-Version: 2.0.0.qualifier Bundle-Vendor: %Bundle-Vendor -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Require-Bundle: org.eclipse.emf.ecore;bundle-version="[2.22.0,3.0.0)", org.eclipse.papyrus.infra.emf.expressions;bundle-version="[2.0.0,3.0.0)", org.eclipse.papyrus.junit.framework;bundle-version="[2.0.0,3.0.0)", diff --git a/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.gmf.tests/.classpath b/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.gmf.tests/.classpath index 512b1535459..2614910d923 100644 --- a/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.gmf.tests/.classpath +++ b/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.gmf.tests/.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="tests"/> <classpathentry kind="output" path="bin"/> diff --git a/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.gmf.tests/.settings/org.eclipse.jdt.core.prefs b/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.gmf.tests/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.gmf.tests/.settings/org.eclipse.jdt.core.prefs +++ b/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.gmf.tests/.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/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.gmf.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.gmf.tests/META-INF/MANIFEST.MF index 2b9368b1039..d5a7e7ac402 100644 --- a/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.gmf.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.gmf.tests/META-INF/MANIFEST.MF @@ -16,5 +16,5 @@ Bundle-Name: %pluginName Bundle-Localization: plugin Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.infra.emf.gmf.tests;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.infra.emf.gmf.tests diff --git a/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly.tests/.classpath b/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly.tests/.classpath index e801ebfb468..81fe078c20c 100644 --- a/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly.tests/.classpath +++ b/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly.tests/.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/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly.tests/.settings/org.eclipse.jdt.core.prefs b/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly.tests/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly.tests/.settings/org.eclipse.jdt.core.prefs +++ b/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly.tests/.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/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly.tests/META-INF/MANIFEST.MF index d94aba09780..ace184dcf85 100644 --- a/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly.tests/META-INF/MANIFEST.MF @@ -22,7 +22,7 @@ Bundle-Name: %pluginName Bundle-Localization: plugin Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.infra.emf.readonly.tests;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="[32.0.0, 33.0.0)", + com.google.common.collect;version="[32.0.0, 33.0.0)" Automatic-Module-Name: org.eclipse.papyrus.infra.emf.readonly.tests diff --git a/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.tests/.classpath b/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.tests/.classpath index 3497c5411ca..3f43cd8d639 100644 --- a/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.tests/.classpath +++ b/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.tests/.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="org/eclipse/papyrus/infra/emf/internal/**"/> diff --git a/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.tests/.settings/org.eclipse.jdt.core.prefs b/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.tests/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.tests/.settings/org.eclipse.jdt.core.prefs +++ b/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.tests/.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/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.tests/META-INF/MANIFEST.MF index 850c7f435d6..c080e300891 100644 --- a/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.tests/META-INF/MANIFEST.MF @@ -22,9 +22,9 @@ Bundle-Name: %pluginName Bundle-Localization: fragment Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.infra.emf.tests;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="[32.0.0, 33.0.0)", + com.google.common.collect;version="[32.0.0, 33.0.0)", + com.google.common.io;version="[32.0.0, 33.0.0)", + com.google.common.util.concurrent;version="[32.0.0, 33.0.0)" Automatic-Module-Name: org.eclipse.papyrus.infra.emf.tests diff --git a/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.ui.emf.tests/.classpath b/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.ui.emf.tests/.classpath index e801ebfb468..81fe078c20c 100644 --- a/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.ui.emf.tests/.classpath +++ b/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.ui.emf.tests/.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/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.ui.emf.tests/.settings/org.eclipse.jdt.core.prefs b/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.ui.emf.tests/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.ui.emf.tests/.settings/org.eclipse.jdt.core.prefs +++ b/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.ui.emf.tests/.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/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.ui.emf.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.ui.emf.tests/META-INF/MANIFEST.MF index 9ff71a1b0c4..5de146c191d 100644 --- a/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.ui.emf.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.ui.emf.tests/META-INF/MANIFEST.MF @@ -22,7 +22,7 @@ Bundle-Name: %pluginName Bundle-Localization: plugin Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.infra.ui.emf.tests;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="[32.0.0, 33.0.0)", + com.google.common.collect;version="[32.0.0, 33.0.0)" Automatic-Module-Name: org.eclipse.papyrus.infra.ui.emf.tests diff --git a/tests/junit/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.tests/.classpath b/tests/junit/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.tests/.classpath index bb642933501..f574c0cbd4d 100644 --- a/tests/junit/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.tests/.classpath +++ b/tests/junit/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.tests/.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/tests/junit/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.tests/.settings/org.eclipse.jdt.core.prefs b/tests/junit/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.tests/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/tests/junit/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.tests/.settings/org.eclipse.jdt.core.prefs +++ b/tests/junit/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.tests/.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/tests/junit/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.tests/META-INF/MANIFEST.MF index 9a3fc11e866..d05a4398f56 100644 --- a/tests/junit/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.tests/META-INF/MANIFEST.MF @@ -24,7 +24,7 @@ Bundle-Name: %pluginName Bundle-Localization: plugin Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.assistant.tests;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="[32.0.0, 33.0.0)", + com.google.common.collect;version="[32.0.0, 33.0.0)" Automatic-Module-Name: org.eclipse.papyrus.infra.gmfdiag.assistant.tests diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical.tests/.classpath b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical.tests/.classpath index e801ebfb468..81fe078c20c 100644 --- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical.tests/.classpath +++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical.tests/.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/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical.tests/.settings/org.eclipse.jdt.core.prefs b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical.tests/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical.tests/.settings/org.eclipse.jdt.core.prefs +++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical.tests/.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/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical.tests/META-INF/MANIFEST.MF index e0d004cd454..46eb2435bed 100644 --- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical.tests/META-INF/MANIFEST.MF @@ -27,8 +27,8 @@ Bundle-Localization: plugin Bundle-ManifestVersion: 2 Bundle-Activator: org.eclipse.papyrus.infra.gmfdiag.canonical.tests.internal.Activator Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.canonical.tests;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="[32.0.0, 33.0.0)", + com.google.common.collect;version="[32.0.0, 33.0.0)", + com.google.common.util.concurrent;version="[32.0.0, 33.0.0)" Automatic-Module-Name: org.eclipse.papyrus.infra.gmfdiag.canonical.tests diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands.tests/.classpath b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands.tests/.classpath index e801ebfb468..81fe078c20c 100644 --- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands.tests/.classpath +++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands.tests/.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/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands.tests/.settings/org.eclipse.jdt.core.prefs b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands.tests/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands.tests/.settings/org.eclipse.jdt.core.prefs +++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands.tests/.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/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands.tests/META-INF/MANIFEST.MF index abd780c610c..f406b8d5a62 100644 --- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands.tests/META-INF/MANIFEST.MF @@ -18,7 +18,7 @@ Bundle-Name: %pluginName Bundle-Localization: plugin Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.commands.tests;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="[32.0.0, 33.0.0)", + com.google.common.collect;version="[32.0.0, 33.0.0)" Automatic-Module-Name: org.eclipse.papyrus.infra.gmfdiag.commands.tests diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/.classpath b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/.classpath index e801ebfb468..81fe078c20c 100644 --- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/.classpath +++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/.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/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/.settings/org.eclipse.jdt.core.prefs b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/.settings/org.eclipse.jdt.core.prefs +++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/.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/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/META-INF/MANIFEST.MF index eebe9ba26df..bdb17184506 100644 --- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/META-INF/MANIFEST.MF @@ -40,6 +40,6 @@ Bundle-Name: %pluginName Bundle-Localization: plugin Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.common.tests;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 -Import-Package: com.google.common.util.concurrent;version="[30.1.0, 31.0.0)" +Bundle-RequiredExecutionEnvironment: JavaSE-17 +Import-Package: com.google.common.util.concurrent;version="[32.0.0, 33.0.0)" Automatic-Module-Name: org.eclipse.papyrus.infra.gmfdiag.common.tests diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/.classpath b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/.classpath index e801ebfb468..81fe078c20c 100644 --- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/.classpath +++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/.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/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/.settings/org.eclipse.jdt.core.prefs b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/.settings/org.eclipse.jdt.core.prefs +++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/.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/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/META-INF/MANIFEST.MF index 41166ba3624..45acbb44b55 100644 --- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.tests/META-INF/MANIFEST.MF @@ -27,5 +27,5 @@ Bundle-Name: CSS Tests Bundle-ManifestVersion: 2 Bundle-Activator: org.eclipse.papyrus.infra.gmfdiag.css.tests.Activator Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.css.tests;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.infra.gmfdiag.css.tests diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.expansion.tests/.classpath b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.expansion.tests/.classpath index 004db3fba20..2377d859931 100644 --- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.expansion.tests/.classpath +++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.expansion.tests/.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/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.expansion.tests/.settings/org.eclipse.jdt.core.prefs b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.expansion.tests/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.expansion.tests/.settings/org.eclipse.jdt.core.prefs +++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.expansion.tests/.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/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.expansion.tests/resources/org.eclipse.papyrus.infra.gmfdiag.expansion.tests.project/.classpath b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.expansion.tests/resources/org.eclipse.papyrus.infra.gmfdiag.expansion.tests.project/.classpath index a42a828e04a..675a5e2962b 100644 --- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.expansion.tests/resources/org.eclipse.papyrus.infra.gmfdiag.expansion.tests.project/.classpath +++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.expansion.tests/resources/org.eclipse.papyrus.infra.gmfdiag.expansion.tests.project/.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"> <attributes> diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.expansion.tests/resources/org.eclipse.papyrus.infra.gmfdiag.expansion.tests.project/.settings/org.eclipse.jdt.core.prefs b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.expansion.tests/resources/org.eclipse.papyrus.infra.gmfdiag.expansion.tests.project/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100644 --- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.expansion.tests/resources/org.eclipse.papyrus.infra.gmfdiag.expansion.tests.project/.settings/org.eclipse.jdt.core.prefs +++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.expansion.tests/resources/org.eclipse.papyrus.infra.gmfdiag.expansion.tests.project/.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/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.expansion.tests/resources/org.eclipse.papyrus.infra.gmfdiag.expansion.tests.project/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.expansion.tests/resources/org.eclipse.papyrus.infra.gmfdiag.expansion.tests.project/META-INF/MANIFEST.MF index 6768e091c37..460a191dd1d 100644 --- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.expansion.tests/resources/org.eclipse.papyrus.infra.gmfdiag.expansion.tests.project/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.expansion.tests/resources/org.eclipse.papyrus.infra.gmfdiag.expansion.tests.project/META-INF/MANIFEST.MF @@ -5,6 +5,6 @@ Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.expansion.tests.project Bundle-Version: 1.0.0.qualifier Bundle-Vendor: Eclipse Modeling Project Automatic-Module-Name: org.eclipse.papyrus.infra.gmfdiag.expansion.tests.project -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Require-Bundle: org.eclipse.gmf.runtime.diagram.core;bundle-version="[1.7.0,2.0.0)", org.eclipse.gmf.runtime.diagram.ui;bundle-version="[1.9.0,2.0.0)" diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.menu.tests/.classpath b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.menu.tests/.classpath index e801ebfb468..81fe078c20c 100644 --- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.menu.tests/.classpath +++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.menu.tests/.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/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.menu.tests/.settings/org.eclipse.jdt.core.prefs b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.menu.tests/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.menu.tests/.settings/org.eclipse.jdt.core.prefs +++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.menu.tests/.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/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.menu.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.menu.tests/META-INF/MANIFEST.MF index 3ba77fba666..28e84d4aa2f 100644 --- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.menu.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.menu.tests/META-INF/MANIFEST.MF @@ -14,5 +14,5 @@ Bundle-Name: GMF Diagram Menu Tests Bundle-ManifestVersion: 2 Bundle-Activator: org.eclipse.papyrus.infra.gmfdiag.menu.tests.Activator Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.menu.tests;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.infra.gmfdiag.menu.tests diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.tests/.classpath b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.tests/.classpath index e801ebfb468..81fe078c20c 100644 --- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.tests/.classpath +++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.tests/.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/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.tests/.settings/org.eclipse.jdt.core.prefs b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.tests/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.tests/.settings/org.eclipse.jdt.core.prefs +++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.tests/.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/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.tests/META-INF/MANIFEST.MF index bede88afcdf..d281a539ef4 100644 --- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.tests/META-INF/MANIFEST.MF @@ -13,7 +13,7 @@ Bundle-Name: %Bundle-Name Bundle-ManifestVersion: 2 Bundle-Activator: org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.tests.Activator Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.tests;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="[32.0.0, 33.0.0)", + com.google.common.collect;version="[32.0.0, 33.0.0)" Automatic-Module-Name: org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.tests diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.welcome.tests/.classpath b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.welcome.tests/.classpath index 11440440e5b..2c9a78bb8be 100644 --- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.welcome.tests/.classpath +++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.welcome.tests/.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="org/eclipse/papyrus/infra/gmfdiag/welcome/**"/> diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.welcome.tests/.settings/org.eclipse.jdt.core.prefs b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.welcome.tests/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.welcome.tests/.settings/org.eclipse.jdt.core.prefs +++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.welcome.tests/.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/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.welcome.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.welcome.tests/META-INF/MANIFEST.MF index bfc1d40683b..285350aa556 100644 --- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.welcome.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.welcome.tests/META-INF/MANIFEST.MF @@ -26,5 +26,5 @@ Bundle-Name: %pluginName Bundle-Localization: plugin Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.welcome.tests;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.infra.gmfdiag.welcome.tests diff --git a/tests/junit/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization.tests/.classpath b/tests/junit/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization.tests/.classpath index e801ebfb468..81fe078c20c 100644 --- a/tests/junit/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization.tests/.classpath +++ b/tests/junit/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization.tests/.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/tests/junit/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization.tests/.settings/org.eclipse.jdt.core.prefs b/tests/junit/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization.tests/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/tests/junit/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization.tests/.settings/org.eclipse.jdt.core.prefs +++ b/tests/junit/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization.tests/.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/tests/junit/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization.tests/META-INF/MANIFEST.MF index 2758f7debfb..d6e3e482f40 100644 --- a/tests/junit/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization.tests/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.tests, org.eclipse.papyrus.infra.internationalization.tests.tests Require-Bundle: org.eclipse.emf.databinding;bundle-version="[1.5.0,2.0.0)", diff --git a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common.tests/.classpath b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common.tests/.classpath index e801ebfb468..81fe078c20c 100644 --- a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common.tests/.classpath +++ b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common.tests/.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/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common.tests/.settings/org.eclipse.jdt.core.prefs b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common.tests/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common.tests/.settings/org.eclipse.jdt.core.prefs +++ b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common.tests/.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/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common.tests/META-INF/MANIFEST.MF index f87ddd32ced..4451da5c167 100644 --- a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common.tests/META-INF/MANIFEST.MF @@ -21,7 +21,7 @@ Require-Bundle: org.eclipse.emf.databinding;bundle-version="[1.5.0,2.0.0)", org.eclipse.uml2.uml.edit;bundle-version="[5.5.0,6.0.0)", org.eclipse.xtext.ui;bundle-version="[2.22.0,3.0.0)", org.junit;bundle-version="[4.13.0,5.0.0)" -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-ActivationPolicy: lazy Bundle-Description: %Bundle-Description Export-Package: org.eclipse.papyrus.infra.nattable.common.tests diff --git a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.tests/.classpath b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.tests/.classpath index e801ebfb468..81fe078c20c 100644 --- a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.tests/.classpath +++ b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.tests/.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/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.tests/.settings/org.eclipse.jdt.core.prefs b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.tests/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.tests/.settings/org.eclipse.jdt.core.prefs +++ b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.tests/.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/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.tests/META-INF/MANIFEST.MF index 2927bbd7560..c216b2eea6d 100644 --- a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.tests/META-INF/MANIFEST.MF @@ -17,5 +17,5 @@ Bundle-Activator: org.eclipse.papyrus.infra.nattable.model.tests.Activator Bundle-ManifestVersion: 2 Bundle-Description: This plugin provides JUnit test for the Papyrus NatTable metamodel Bundle-SymbolicName: org.eclipse.papyrus.infra.nattable.model.tests;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.infra.nattable.model.tests diff --git a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.suite.tests/.classpath b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.suite.tests/.classpath index 9cb19c81c76..c0255c320e6 100755 --- a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.suite.tests/.classpath +++ b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.suite.tests/.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="test"/> <classpathentry kind="output" path="bin"/> diff --git a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.suite.tests/.settings/org.eclipse.jdt.core.prefs b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.suite.tests/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.suite.tests/.settings/org.eclipse.jdt.core.prefs +++ b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.suite.tests/.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/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.suite.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.suite.tests/META-INF/MANIFEST.MF index f94d9e51e34..b9b6365c562 100755 --- a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.suite.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.suite.tests/META-INF/MANIFEST.MF @@ -7,7 +7,7 @@ Bundle-Localization: plugin Bundle-ManifestVersion: 2 Bundle-Activator: org.eclipse.papyrus.infra.nattable.suite.tests.Activator Bundle-SymbolicName: org.eclipse.papyrus.infra.nattable.suite.tests;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Require-Bundle: org.eclipse.gmf.runtime.diagram.ui.properties;bundle-version="[1.8.0,2.0.0)", org.eclipse.papyrus.infra.nattable.common.tests;bundle-version="[2.0.0,3.0.0)", org.eclipse.papyrus.infra.nattable.model.tests;bundle-version="[2.0.0,3.0.0)", diff --git a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.tests/.classpath b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.tests/.classpath index e801ebfb468..81fe078c20c 100644 --- a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.tests/.classpath +++ b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.tests/.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/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.tests/.settings/org.eclipse.jdt.core.prefs b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.tests/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.tests/.settings/org.eclipse.jdt.core.prefs +++ b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.tests/.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/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.tests/META-INF/MANIFEST.MF index bd508283134..6ef6659cae6 100644 --- a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.tests/META-INF/MANIFEST.MF @@ -27,5 +27,5 @@ Bundle-Activator: org.eclipse.papyrus.infra.nattable.tests.Activator Bundle-ManifestVersion: 2 Bundle-Description: T%Bundle-Description Bundle-SymbolicName: org.eclipse.papyrus.infra.nattable.tests;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.infra.nattable.tests diff --git a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.tests/.classpath b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.tests/.classpath index e801ebfb468..81fe078c20c 100755 --- a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.tests/.classpath +++ b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.tests/.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/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.tests/.settings/org.eclipse.jdt.core.prefs b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.tests/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.tests/.settings/org.eclipse.jdt.core.prefs +++ b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.tests/.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/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.tests/META-INF/MANIFEST.MF index 3b1b85b4247..d7b9b769a51 100755 --- a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.tests/META-INF/MANIFEST.MF @@ -36,5 +36,5 @@ Bundle-Activator: org.eclipse.papyrus.infra.nattable.views.tests.Activator Bundle-ManifestVersion: 2 Bundle-Description: %Bundle-Description Bundle-SymbolicName: org.eclipse.papyrus.infra.nattable.views.tests;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.infra.nattable.views.tests diff --git a/tests/junit/plugins/infra/org.eclipse.papyrus.infra.architecture.tests/.classpath b/tests/junit/plugins/infra/org.eclipse.papyrus.infra.architecture.tests/.classpath index 3bc2d6b2e55..1148bcc6912 100644 --- a/tests/junit/plugins/infra/org.eclipse.papyrus.infra.architecture.tests/.classpath +++ b/tests/junit/plugins/infra/org.eclipse.papyrus.infra.architecture.tests/.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"> <attributes> diff --git a/tests/junit/plugins/infra/org.eclipse.papyrus.infra.architecture.tests/.settings/org.eclipse.jdt.core.prefs b/tests/junit/plugins/infra/org.eclipse.papyrus.infra.architecture.tests/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/tests/junit/plugins/infra/org.eclipse.papyrus.infra.architecture.tests/.settings/org.eclipse.jdt.core.prefs +++ b/tests/junit/plugins/infra/org.eclipse.papyrus.infra.architecture.tests/.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/tests/junit/plugins/infra/org.eclipse.papyrus.infra.architecture.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/org.eclipse.papyrus.infra.architecture.tests/META-INF/MANIFEST.MF index 101a2338fd1..eec4b430047 100644 --- a/tests/junit/plugins/infra/org.eclipse.papyrus.infra.architecture.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/infra/org.eclipse.papyrus.infra.architecture.tests/META-INF/MANIFEST.MF @@ -8,7 +8,7 @@ Bundle-Version: 2.0.0.qualifier Bundle-Name: %pluginName Bundle-Localization: plugin Automatic-Module-Name: org.eclipse.papyrus.infra.architecture.tests -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Require-Bundle: org.eclipse.emf.common;bundle-version="[2.19.0,3.0.0)", org.eclipse.papyrus.infra.architecture;bundle-version="[3.0.0,4.0.0)", org.eclipse.papyrus.infra.core.architecture;bundle-version="[3.0.0,4.0.0)", @@ -26,4 +26,4 @@ Export-Package: org.eclipse.papyrus.infra.architecture.tests, org.eclipse.papyrus.infra.architecture.tests.merged, org.eclipse.papyrus.infra.core.architecture.tests, org.eclipse.papyrus.infra.core.internal.architecture.merger.tests;x-internal:=true -Import-Package: com.google.common.collect;version="[30.1.0,31.0.0)" +Import-Package: com.google.common.collect;version="[32.0.0,33.0.0)" diff --git a/tests/junit/plugins/infra/org.eclipse.papyrus.infra.filters.tests/.classpath b/tests/junit/plugins/infra/org.eclipse.papyrus.infra.filters.tests/.classpath index 099e24f14fc..c3f9cf33e92 100644 --- a/tests/junit/plugins/infra/org.eclipse.papyrus.infra.filters.tests/.classpath +++ b/tests/junit/plugins/infra/org.eclipse.papyrus.infra.filters.tests/.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/tests/junit/plugins/infra/org.eclipse.papyrus.infra.filters.tests/.settings/org.eclipse.jdt.core.prefs b/tests/junit/plugins/infra/org.eclipse.papyrus.infra.filters.tests/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/tests/junit/plugins/infra/org.eclipse.papyrus.infra.filters.tests/.settings/org.eclipse.jdt.core.prefs +++ b/tests/junit/plugins/infra/org.eclipse.papyrus.infra.filters.tests/.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/tests/junit/plugins/infra/org.eclipse.papyrus.infra.filters.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/org.eclipse.papyrus.infra.filters.tests/META-INF/MANIFEST.MF index 88d5d2160a7..752153709f5 100644 --- a/tests/junit/plugins/infra/org.eclipse.papyrus.infra.filters.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/infra/org.eclipse.papyrus.infra.filters.tests/META-INF/MANIFEST.MF @@ -13,5 +13,5 @@ Bundle-Name: %pluginName Bundle-Localization: plugin Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.infra.filters.tests;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.infra.filters.tests diff --git a/tests/junit/plugins/infra/org.eclipse.papyrus.infra.newchild.tests/.classpath b/tests/junit/plugins/infra/org.eclipse.papyrus.infra.newchild.tests/.classpath index e801ebfb468..81fe078c20c 100644 --- a/tests/junit/plugins/infra/org.eclipse.papyrus.infra.newchild.tests/.classpath +++ b/tests/junit/plugins/infra/org.eclipse.papyrus.infra.newchild.tests/.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/tests/junit/plugins/infra/org.eclipse.papyrus.infra.newchild.tests/.settings/org.eclipse.jdt.core.prefs b/tests/junit/plugins/infra/org.eclipse.papyrus.infra.newchild.tests/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/tests/junit/plugins/infra/org.eclipse.papyrus.infra.newchild.tests/.settings/org.eclipse.jdt.core.prefs +++ b/tests/junit/plugins/infra/org.eclipse.papyrus.infra.newchild.tests/.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/tests/junit/plugins/infra/org.eclipse.papyrus.infra.newchild.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/org.eclipse.papyrus.infra.newchild.tests/META-INF/MANIFEST.MF index 71b3ee3e833..051a24da191 100644 --- a/tests/junit/plugins/infra/org.eclipse.papyrus.infra.newchild.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/infra/org.eclipse.papyrus.infra.newchild.tests/META-INF/MANIFEST.MF @@ -15,5 +15,5 @@ Bundle-Name: %pluginName Bundle-Localization: plugin Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.infra.newchild.tests;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.infra.newchild.tests diff --git a/tests/junit/plugins/infra/org.eclipse.papyrus.infra.suite.tests/.classpath b/tests/junit/plugins/infra/org.eclipse.papyrus.infra.suite.tests/.classpath index ab1409effd1..c5f6ad29d4e 100755 --- a/tests/junit/plugins/infra/org.eclipse.papyrus.infra.suite.tests/.classpath +++ b/tests/junit/plugins/infra/org.eclipse.papyrus.infra.suite.tests/.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="test"> <attributes> diff --git a/tests/junit/plugins/infra/org.eclipse.papyrus.infra.suite.tests/.settings/org.eclipse.jdt.core.prefs b/tests/junit/plugins/infra/org.eclipse.papyrus.infra.suite.tests/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/tests/junit/plugins/infra/org.eclipse.papyrus.infra.suite.tests/.settings/org.eclipse.jdt.core.prefs +++ b/tests/junit/plugins/infra/org.eclipse.papyrus.infra.suite.tests/.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/tests/junit/plugins/infra/org.eclipse.papyrus.infra.suite.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/org.eclipse.papyrus.infra.suite.tests/META-INF/MANIFEST.MF index f9ed88b0b77..47842567331 100755 --- a/tests/junit/plugins/infra/org.eclipse.papyrus.infra.suite.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/infra/org.eclipse.papyrus.infra.suite.tests/META-INF/MANIFEST.MF @@ -7,7 +7,7 @@ Bundle-Localization: plugin Bundle-ManifestVersion: 2 Bundle-Activator: org.eclipse.papyrus.infra.suite.tests.Activator Bundle-SymbolicName: org.eclipse.papyrus.infra.suite.tests;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Require-Bundle: org.eclipse.gmf.runtime.diagram.ui.properties;bundle-version="[1.8.0,2.0.0)", org.eclipse.papyrus.infra.architecture.tests;bundle-version="[2.0.0,3.0.0)", org.eclipse.papyrus.infra.editor.welcome.tests;bundle-version="[2.0.0,3.0.0)", diff --git a/tests/junit/plugins/infra/org.eclipse.papyrus.infra.tools.tests/.classpath b/tests/junit/plugins/infra/org.eclipse.papyrus.infra.tools.tests/.classpath index e801ebfb468..81fe078c20c 100644 --- a/tests/junit/plugins/infra/org.eclipse.papyrus.infra.tools.tests/.classpath +++ b/tests/junit/plugins/infra/org.eclipse.papyrus.infra.tools.tests/.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/tests/junit/plugins/infra/org.eclipse.papyrus.infra.tools.tests/.settings/org.eclipse.jdt.core.prefs b/tests/junit/plugins/infra/org.eclipse.papyrus.infra.tools.tests/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/tests/junit/plugins/infra/org.eclipse.papyrus.infra.tools.tests/.settings/org.eclipse.jdt.core.prefs +++ b/tests/junit/plugins/infra/org.eclipse.papyrus.infra.tools.tests/.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/tests/junit/plugins/infra/org.eclipse.papyrus.infra.tools.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/org.eclipse.papyrus.infra.tools.tests/META-INF/MANIFEST.MF index 0549e4697ee..905dc448ed9 100644 --- a/tests/junit/plugins/infra/org.eclipse.papyrus.infra.tools.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/infra/org.eclipse.papyrus.infra.tools.tests/META-INF/MANIFEST.MF @@ -1,22 +1,23 @@ Manifest-Version: 1.0 -Require-Bundle: org.eclipse.core.databinding.beans;bundle-version="[1.6.0,2.0.0)", - org.eclipse.emf.databinding;bundle-version="[1.5.0,2.0.0)", +Require-Bundle: org.eclipse.emf.databinding;bundle-version="[1.5.0,2.0.0)", org.eclipse.papyrus.infra.tools;bundle-version="[4.0.0,5.0.0)", org.eclipse.papyrus.junit.framework;bundle-version="[2.0.0,3.0.0)", org.eclipse.papyrus.junit.utils;bundle-version="[3.0.0,4.0.0)", org.junit;bundle-version="[4.13.0,5.0.0)", org.eclipse.core.resources;bundle-version="[3.13.900,4.0.0)", org.eclipse.core.runtime;bundle-version="[3.20.0,4.0.0)", - org.eclipse.jdt.core;bundle-version="[3.24.0,4.0.0)" + org.eclipse.jdt.core;bundle-version="[3.24.0,4.0.0)", + org.eclipse.core.databinding.beans;bundle-version="[1.9.0,2.0.0)", + org.eclipse.core.databinding.property;bundle-version="[1.9.0,2.0.0)" Export-Package: org.eclipse.papyrus.infra.tools.databinding, org.eclipse.papyrus.infra.tools.tests, org.eclipse.papyrus.infra.tools.util Bundle-Vendor: Eclipse Modeling Project -Bundle-Version: 2.1.0.qualifier +Bundle-Version: 2.2.0.qualifier Bundle-Name: Papyrus Infrastructure Tools Tests Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.infra.tools.tests;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="[32.0.0, 33.0.0)" Automatic-Module-Name: org.eclipse.papyrus.infra.tools.tests Eclipse-BundleShape: dir diff --git a/tests/junit/plugins/infra/org.eclipse.papyrus.infra.tools.tests/pom.xml b/tests/junit/plugins/infra/org.eclipse.papyrus.infra.tools.tests/pom.xml index f28f88b6501..f790ee5eaed 100644 --- a/tests/junit/plugins/infra/org.eclipse.papyrus.infra.tools.tests/pom.xml +++ b/tests/junit/plugins/infra/org.eclipse.papyrus.infra.tools.tests/pom.xml @@ -10,6 +10,6 @@ </parent> <groupId>org.eclipse.papyrus.tests</groupId> <artifactId>org.eclipse.papyrus.infra.tools.tests</artifactId> - <version>2.1.0-SNAPSHOT</version> + <version>2.2.0-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> </project>
\ No newline at end of file diff --git a/tests/junit/plugins/infra/org.eclipse.papyrus.infra.tools.tests/resources/projects/org.eclipse.papyrus.test.project1/.classpath b/tests/junit/plugins/infra/org.eclipse.papyrus.infra.tools.tests/resources/projects/org.eclipse.papyrus.test.project1/.classpath index d54800d3c97..57bca725467 100644 --- a/tests/junit/plugins/infra/org.eclipse.papyrus.infra.tools.tests/resources/projects/org.eclipse.papyrus.test.project1/.classpath +++ b/tests/junit/plugins/infra/org.eclipse.papyrus.infra.tools.tests/resources/projects/org.eclipse.papyrus.test.project1/.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"> <attributes> <attribute name="module" value="true"/> </attributes> diff --git a/tests/junit/plugins/infra/org.eclipse.papyrus.infra.tools.tests/resources/projects/org.eclipse.papyrus.test.project1/.settings/org.eclipse.jdt.core.prefs b/tests/junit/plugins/infra/org.eclipse.papyrus.infra.tools.tests/resources/projects/org.eclipse.papyrus.test.project1/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/tests/junit/plugins/infra/org.eclipse.papyrus.infra.tools.tests/resources/projects/org.eclipse.papyrus.test.project1/.settings/org.eclipse.jdt.core.prefs +++ b/tests/junit/plugins/infra/org.eclipse.papyrus.infra.tools.tests/resources/projects/org.eclipse.papyrus.test.project1/.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/tests/junit/plugins/infra/org.eclipse.papyrus.infra.tools.tests/resources/projects/org.eclipse.papyrus.test.project2/.classpath b/tests/junit/plugins/infra/org.eclipse.papyrus.infra.tools.tests/resources/projects/org.eclipse.papyrus.test.project2/.classpath index 1e4b0b80fe9..44c8c54f2ce 100644 --- a/tests/junit/plugins/infra/org.eclipse.papyrus.infra.tools.tests/resources/projects/org.eclipse.papyrus.test.project2/.classpath +++ b/tests/junit/plugins/infra/org.eclipse.papyrus.infra.tools.tests/resources/projects/org.eclipse.papyrus.test.project2/.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"> <attributes> <attribute name="module" value="true"/> </attributes> diff --git a/tests/junit/plugins/infra/org.eclipse.papyrus.infra.tools.tests/resources/projects/org.eclipse.papyrus.test.project2/.settings/org.eclipse.jdt.core.prefs b/tests/junit/plugins/infra/org.eclipse.papyrus.infra.tools.tests/resources/projects/org.eclipse.papyrus.test.project2/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100644 --- a/tests/junit/plugins/infra/org.eclipse.papyrus.infra.tools.tests/resources/projects/org.eclipse.papyrus.test.project2/.settings/org.eclipse.jdt.core.prefs +++ b/tests/junit/plugins/infra/org.eclipse.papyrus.infra.tools.tests/resources/projects/org.eclipse.papyrus.test.project2/.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/tests/junit/plugins/infra/org.eclipse.papyrus.infra.tools.tests/src/org/eclipse/papyrus/infra/tools/databinding/DelegatingObservableListTest.java b/tests/junit/plugins/infra/org.eclipse.papyrus.infra.tools.tests/src/org/eclipse/papyrus/infra/tools/databinding/DelegatingObservableListTest.java index 5b09082a1c2..35819ad34a0 100644 --- a/tests/junit/plugins/infra/org.eclipse.papyrus.infra.tools.tests/src/org/eclipse/papyrus/infra/tools/databinding/DelegatingObservableListTest.java +++ b/tests/junit/plugins/infra/org.eclipse.papyrus.infra.tools.tests/src/org/eclipse/papyrus/infra/tools/databinding/DelegatingObservableListTest.java @@ -26,7 +26,7 @@ import java.beans.PropertyChangeSupport; import java.util.List; import java.util.ListIterator; -import org.eclipse.core.databinding.beans.BeansObservables; +import org.eclipse.core.databinding.beans.typed.BeanProperties; import org.eclipse.core.databinding.observable.IObservable; import org.eclipse.core.databinding.observable.IObserving; import org.eclipse.core.databinding.observable.list.IListChangeListener; @@ -293,7 +293,11 @@ public abstract class DelegatingObservableListTest extends DelegatingObservableC @Override protected IObservableList createDelegate() { - return BeansObservables.observeDetailList(master, "names", String.class); + Class beanClass = null; + if (master.getValueType() instanceof Class) { + beanClass = (Class) master.getValueType(); + } + return BeanProperties.list(beanClass, "names", String.class).observeDetail(master); } @Override diff --git a/tests/junit/plugins/infra/org.eclipse.papyrus.infra.tools.tests/src/org/eclipse/papyrus/infra/tools/databinding/DelegatingObservableSetTest.java b/tests/junit/plugins/infra/org.eclipse.papyrus.infra.tools.tests/src/org/eclipse/papyrus/infra/tools/databinding/DelegatingObservableSetTest.java index 766c1da41c2..575c782d450 100644 --- a/tests/junit/plugins/infra/org.eclipse.papyrus.infra.tools.tests/src/org/eclipse/papyrus/infra/tools/databinding/DelegatingObservableSetTest.java +++ b/tests/junit/plugins/infra/org.eclipse.papyrus.infra.tools.tests/src/org/eclipse/papyrus/infra/tools/databinding/DelegatingObservableSetTest.java @@ -26,7 +26,7 @@ import java.beans.PropertyChangeSupport; import java.util.Collections; import java.util.Set; -import org.eclipse.core.databinding.beans.BeansObservables; +import org.eclipse.core.databinding.beans.typed.BeanProperties; import org.eclipse.core.databinding.observable.IObservable; import org.eclipse.core.databinding.observable.IObserving; import org.eclipse.core.databinding.observable.set.IObservableSet; @@ -163,7 +163,11 @@ public abstract class DelegatingObservableSetTest extends DelegatingObservableCo @Override protected IObservableSet createDelegate() { - return BeansObservables.observeDetailSet(master, "strings", String.class); + Class beanClass = null; + if (master.getValueType() instanceof Class) { + beanClass = (Class) master.getValueType(); + } + return BeanProperties.set(beanClass, "strings", String.class).observeDetail(master); } @Override diff --git a/tests/junit/plugins/infra/org.eclipse.papyrus.infra.tools.tests/src/org/eclipse/papyrus/infra/tools/databinding/DelegatingObservableValueTest.java b/tests/junit/plugins/infra/org.eclipse.papyrus.infra.tools.tests/src/org/eclipse/papyrus/infra/tools/databinding/DelegatingObservableValueTest.java index f56cf9a51c7..7ea72c794c6 100644 --- a/tests/junit/plugins/infra/org.eclipse.papyrus.infra.tools.tests/src/org/eclipse/papyrus/infra/tools/databinding/DelegatingObservableValueTest.java +++ b/tests/junit/plugins/infra/org.eclipse.papyrus.infra.tools.tests/src/org/eclipse/papyrus/infra/tools/databinding/DelegatingObservableValueTest.java @@ -21,7 +21,7 @@ import static org.hamcrest.MatcherAssert.assertThat; import java.beans.PropertyChangeListener; import java.beans.PropertyChangeSupport; -import org.eclipse.core.databinding.beans.BeansObservables; +import org.eclipse.core.databinding.beans.typed.BeanProperties; import org.eclipse.core.databinding.observable.IObservable; import org.eclipse.core.databinding.observable.IObserving; import org.eclipse.core.databinding.observable.value.IObservableValue; @@ -165,7 +165,11 @@ public abstract class DelegatingObservableValueTest extends DelegatingObservable @Override protected IObservableValue createDelegate() { - return BeansObservables.observeDetailValue(master, "name", String.class); + Class beanClass = null; + if (master.getValueType() instanceof Class) { + beanClass = (Class) master.getValueType(); + } + return BeanProperties.value(beanClass, "name", String.class).observeDetail(master); } @Override diff --git a/tests/junit/plugins/infra/org.eclipse.papyrus.infra.ui.architecture.tests/.classpath b/tests/junit/plugins/infra/org.eclipse.papyrus.infra.ui.architecture.tests/.classpath index a42a828e04a..675a5e2962b 100644 --- a/tests/junit/plugins/infra/org.eclipse.papyrus.infra.ui.architecture.tests/.classpath +++ b/tests/junit/plugins/infra/org.eclipse.papyrus.infra.ui.architecture.tests/.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"> <attributes> diff --git a/tests/junit/plugins/infra/org.eclipse.papyrus.infra.ui.architecture.tests/.settings/org.eclipse.jdt.core.prefs b/tests/junit/plugins/infra/org.eclipse.papyrus.infra.ui.architecture.tests/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/tests/junit/plugins/infra/org.eclipse.papyrus.infra.ui.architecture.tests/.settings/org.eclipse.jdt.core.prefs +++ b/tests/junit/plugins/infra/org.eclipse.papyrus.infra.ui.architecture.tests/.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/tests/junit/plugins/infra/org.eclipse.papyrus.infra.ui.architecture.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/org.eclipse.papyrus.infra.ui.architecture.tests/META-INF/MANIFEST.MF index 817065bd4cd..cc6e8e41470 100644 --- a/tests/junit/plugins/infra/org.eclipse.papyrus.infra.ui.architecture.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/infra/org.eclipse.papyrus.infra.ui.architecture.tests/META-INF/MANIFEST.MF @@ -8,7 +8,7 @@ Bundle-Version: 2.0.0.qualifier Bundle-Name: %pluginName Bundle-Localization: plugin Automatic-Module-Name: org.eclipse.papyrus.infra.ui.architecture.tests -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 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)", org.eclipse.gmf.runtime.diagram.ui;bundle-version="[1.9.0,2.0.0)", diff --git a/tests/junit/plugins/infra/org.eclipse.papyrus.infra.ui.tests/.classpath b/tests/junit/plugins/infra/org.eclipse.papyrus.infra.ui.tests/.classpath index e801ebfb468..81fe078c20c 100644 --- a/tests/junit/plugins/infra/org.eclipse.papyrus.infra.ui.tests/.classpath +++ b/tests/junit/plugins/infra/org.eclipse.papyrus.infra.ui.tests/.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/tests/junit/plugins/infra/org.eclipse.papyrus.infra.ui.tests/.settings/org.eclipse.jdt.core.prefs b/tests/junit/plugins/infra/org.eclipse.papyrus.infra.ui.tests/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/tests/junit/plugins/infra/org.eclipse.papyrus.infra.ui.tests/.settings/org.eclipse.jdt.core.prefs +++ b/tests/junit/plugins/infra/org.eclipse.papyrus.infra.ui.tests/.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/tests/junit/plugins/infra/org.eclipse.papyrus.infra.ui.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/org.eclipse.papyrus.infra.ui.tests/META-INF/MANIFEST.MF index 2b005d00a14..c2941507257 100644 --- a/tests/junit/plugins/infra/org.eclipse.papyrus.infra.ui.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/infra/org.eclipse.papyrus.infra.ui.tests/META-INF/MANIFEST.MF @@ -19,5 +19,5 @@ Bundle-Version: 2.0.0.qualifier Bundle-Name: Papyrus Infrastructure UI Tests Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.infra.ui.tests;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.infra.ui.tests diff --git a/tests/junit/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui.tests/.classpath b/tests/junit/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui.tests/.classpath index e801ebfb468..81fe078c20c 100644 --- a/tests/junit/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui.tests/.classpath +++ b/tests/junit/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui.tests/.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/tests/junit/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui.tests/.settings/org.eclipse.jdt.core.prefs b/tests/junit/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui.tests/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/tests/junit/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui.tests/.settings/org.eclipse.jdt.core.prefs +++ b/tests/junit/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui.tests/.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/tests/junit/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui.tests/META-INF/MANIFEST.MF index 14f64fd1e48..b9aafb5ce8f 100644 --- a/tests/junit/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui.tests/META-INF/MANIFEST.MF @@ -17,5 +17,5 @@ Bundle-Version: 3.0.0.qualifier Bundle-Name: Papyrus Properties UI Tests Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.infra.properties.ui.tests;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.infra.properties.ui.tests diff --git a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/.classpath b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/.classpath index e801ebfb468..81fe078c20c 100644 --- a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/.classpath +++ b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/.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/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/.settings/org.eclipse.jdt.core.prefs b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/.settings/org.eclipse.jdt.core.prefs +++ b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/.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/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/META-INF/MANIFEST.MF index 56408e886d5..cd59401b259 100644 --- a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/META-INF/MANIFEST.MF @@ -24,6 +24,6 @@ Bundle-Name: %Bundle-Name Bundle-ManifestVersion: 2 Bundle-Activator: org.eclipse.papyrus.infra.services.controlmode.tests.control.Activator Bundle-SymbolicName: org.eclipse.papyrus.infra.services.controlmode.tests;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="[32.0.0, 33.0.0)" Automatic-Module-Name: org.eclipse.papyrus.infra.services.controlmode.tests diff --git a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.tests/.classpath b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.tests/.classpath index e801ebfb468..81fe078c20c 100644 --- a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.tests/.classpath +++ b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.tests/.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/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.tests/.settings/org.eclipse.jdt.core.prefs b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.tests/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.tests/.settings/org.eclipse.jdt.core.prefs +++ b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.tests/.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/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.tests/META-INF/MANIFEST.MF index e9d31d7df27..9ee9fc504c7 100644 --- a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.tests/META-INF/MANIFEST.MF @@ -26,5 +26,5 @@ Bundle-Name: %pluginName Bundle-Localization: plugin Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.infra.services.edit.tests;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.infra.services.edit.tests diff --git a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.ui.tests/.classpath b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.ui.tests/.classpath index e801ebfb468..81fe078c20c 100644 --- a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.ui.tests/.classpath +++ b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.ui.tests/.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/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.ui.tests/.settings/org.eclipse.jdt.core.prefs b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.ui.tests/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.ui.tests/.settings/org.eclipse.jdt.core.prefs +++ b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.ui.tests/.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/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.ui.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.ui.tests/META-INF/MANIFEST.MF index d84b7965bd4..1f0a2bb944c 100644 --- a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.ui.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.ui.tests/META-INF/MANIFEST.MF @@ -15,5 +15,5 @@ Bundle-Name: %pluginName Bundle-Localization: plugin Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.infra.services.edit.ui.tests;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.infra.services.edit.ui.tests diff --git a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.labelprovider.tests/.classpath b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.labelprovider.tests/.classpath index e801ebfb468..81fe078c20c 100644 --- a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.labelprovider.tests/.classpath +++ b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.labelprovider.tests/.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/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.labelprovider.tests/.settings/org.eclipse.jdt.core.prefs b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.labelprovider.tests/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.labelprovider.tests/.settings/org.eclipse.jdt.core.prefs +++ b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.labelprovider.tests/.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/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.labelprovider.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.labelprovider.tests/META-INF/MANIFEST.MF index 649c25671a8..a075cf89092 100644 --- a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.labelprovider.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.labelprovider.tests/META-INF/MANIFEST.MF @@ -20,5 +20,5 @@ Bundle-Name: LabelProvider Service Tests Bundle-ManifestVersion: 2 Bundle-Activator: org.eclipse.papyrus.infra.services.labelprovider.tests.Activator Bundle-SymbolicName: org.eclipse.papyrus.infra.services.labelprovider.tests;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.infra.services.labelprovider.tests diff --git a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.tests/.classpath b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.tests/.classpath index 9cb19c81c76..c0255c320e6 100644 --- a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.tests/.classpath +++ b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.tests/.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="test"/> <classpathentry kind="output" path="bin"/> diff --git a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.tests/.settings/org.eclipse.jdt.core.prefs b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.tests/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.tests/.settings/org.eclipse.jdt.core.prefs +++ b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.tests/.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/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.tests/META-INF/MANIFEST.MF index 7f9c7388315..adffbed0217 100644 --- a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.tests/META-INF/MANIFEST.MF @@ -19,5 +19,5 @@ Bundle-Name: %fragmentName Bundle-Localization: plugin Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.infra.services.resourceloading.tests;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.infra.services.resourceloading.tests diff --git a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.semantic.tests/.classpath b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.semantic.tests/.classpath index e801ebfb468..81fe078c20c 100644 --- a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.semantic.tests/.classpath +++ b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.semantic.tests/.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/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.semantic.tests/.settings/org.eclipse.jdt.core.prefs b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.semantic.tests/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.semantic.tests/.settings/org.eclipse.jdt.core.prefs +++ b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.semantic.tests/.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/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.semantic.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.semantic.tests/META-INF/MANIFEST.MF index 6889c0b683d..006035cada5 100644 --- a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.semantic.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.semantic.tests/META-INF/MANIFEST.MF @@ -18,5 +18,5 @@ Bundle-Name: %pluginName Bundle-Localization: plugin Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.infra.services.semantic.tests;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.infra.services.semantic.tests diff --git a/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.tests/.classpath b/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.tests/.classpath index bb642933501..f574c0cbd4d 100644 --- a/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.tests/.classpath +++ b/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.tests/.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/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.tests/.settings/org.eclipse.jdt.core.prefs b/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.tests/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.tests/.settings/org.eclipse.jdt.core.prefs +++ b/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.tests/.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/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.tests/META-INF/MANIFEST.MF index c7bec932a6a..bee222d0102 100644 --- a/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.tests/META-INF/MANIFEST.MF @@ -21,5 +21,5 @@ Bundle-Localization: plugin Bundle-ManifestVersion: 2 Bundle-Activator: org.eclipse.papyrus.infra.types.tests.Activator Bundle-SymbolicName: org.eclipse.papyrus.infra.types.tests;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.infra.types.tests diff --git a/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.ui.tests/.classpath b/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.ui.tests/.classpath index e54abfc9d66..3420c0d9b60 100644 --- a/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.ui.tests/.classpath +++ b/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.ui.tests/.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"> <attributes> <attribute name="module" value="true"/> </attributes> diff --git a/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.ui.tests/.settings/org.eclipse.jdt.core.prefs b/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.ui.tests/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.ui.tests/.settings/org.eclipse.jdt.core.prefs +++ b/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.ui.tests/.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/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.ui.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.ui.tests/META-INF/MANIFEST.MF index a1e4f625c94..87f553502b8 100644 --- a/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.ui.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.ui.tests/META-INF/MANIFEST.MF @@ -23,6 +23,6 @@ Bundle-Name: %pluginName Bundle-Localization: plugin Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.infra.types.ui.tests;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.infra.types.ui.tests -Import-Package: com.google.common.base;version="[30.1.0,31.0.0)" +Import-Package: com.google.common.base;version="[32.0.0,33.0.0)" diff --git a/tests/junit/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy.tests/.classpath b/tests/junit/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy.tests/.classpath index c2a9d38066d..e7f21ec57af 100644 --- a/tests/junit/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy.tests/.classpath +++ b/tests/junit/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy.tests/.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"> <attributes> <attribute name="module" value="true"/> </attributes> diff --git a/tests/junit/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy.tests/.settings/org.eclipse.jdt.core.prefs b/tests/junit/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy.tests/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/tests/junit/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy.tests/.settings/org.eclipse.jdt.core.prefs +++ b/tests/junit/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy.tests/.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/tests/junit/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy.tests/META-INF/MANIFEST.MF index 1623cf6cbc1..9b8cf600946 100644 --- a/tests/junit/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy.tests/META-INF/MANIFEST.MF @@ -22,5 +22,5 @@ Bundle-Name: %pluginName Bundle-Localization: plugin Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.infra.viewpoints.policy.tests;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.infra.viewpoints.policy.tests diff --git a/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.profilemigration.tests/.classpath b/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.profilemigration.tests/.classpath index e801ebfb468..81fe078c20c 100644 --- a/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.profilemigration.tests/.classpath +++ b/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.profilemigration.tests/.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/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.profilemigration.tests/.settings/org.eclipse.jdt.core.prefs b/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.profilemigration.tests/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.profilemigration.tests/.settings/org.eclipse.jdt.core.prefs +++ b/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.profilemigration.tests/.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/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.profilemigration.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.profilemigration.tests/META-INF/MANIFEST.MF index 394d7bce44f..142f190fb0e 100644 --- a/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.profilemigration.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.profilemigration.tests/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.papyrus.toolsmiths.profilemigration.tests;singleton:=true Bundle-Version: 1.0.0.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Require-Bundle: org.eclipse.emf.compare;bundle-version="[3.5.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/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.suite.tests/.classpath b/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.suite.tests/.classpath index 9cb19c81c76..c0255c320e6 100755 --- a/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.suite.tests/.classpath +++ b/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.suite.tests/.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="test"/> <classpathentry kind="output" path="bin"/> diff --git a/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.suite.tests/.settings/org.eclipse.jdt.core.prefs b/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.suite.tests/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.suite.tests/.settings/org.eclipse.jdt.core.prefs +++ b/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.suite.tests/.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/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.suite.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.suite.tests/META-INF/MANIFEST.MF index 013ad8ecf0d..55f3564c2b1 100755 --- a/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.suite.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.suite.tests/META-INF/MANIFEST.MF @@ -6,7 +6,7 @@ Bundle-Localization: plugin Bundle-ManifestVersion: 2 Bundle-Activator: org.eclipse.papyrus.toolsmiths.suite.tests.Activator Bundle-SymbolicName: org.eclipse.papyrus.toolsmiths.suite.tests;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Manifest-Version: 1.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)", diff --git a/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.validation.architecture.tests/.classpath b/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.validation.architecture.tests/.classpath index a1bdb036c0f..a0fe8b4d611 100644 --- a/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.validation.architecture.tests/.classpath +++ b/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.validation.architecture.tests/.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"> <attributes> <attribute name="module" value="true"/> </attributes> diff --git a/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.validation.architecture.tests/.settings/org.eclipse.jdt.core.prefs b/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.validation.architecture.tests/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100644 --- a/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.validation.architecture.tests/.settings/org.eclipse.jdt.core.prefs +++ b/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.validation.architecture.tests/.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/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.validation.architecture.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.validation.architecture.tests/META-INF/MANIFEST.MF index c38247bb36a..88fb0aa4f92 100644 --- a/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.validation.architecture.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.validation.architecture.tests/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.papyrus.toolsmiths.validation.architecture.tests;singleton:=true Bundle-Version: 2.0.0.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 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)", diff --git a/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.validation.architecture.tests/resources/bug570097-dependencies/META-INF/MANIFEST-missingArchitecture.MF b/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.validation.architecture.tests/resources/bug570097-dependencies/META-INF/MANIFEST-missingArchitecture.MF index cd58735c58a..653b23bd28a 100644 --- a/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.validation.architecture.tests/resources/bug570097-dependencies/META-INF/MANIFEST-missingArchitecture.MF +++ b/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.validation.architecture.tests/resources/bug570097-dependencies/META-INF/MANIFEST-missingArchitecture.MF @@ -23,6 +23,6 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.18.0,4.0.0)", org.eclipse.papyrus.uml.service.types;bundle-version="[5.0.0,6.0.0)", org.eclipse.papyrus.uml.diagram.common;bundle-version="[5.0.0,6.0.0)", org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration;bundle-version="[5.0.0,6.0.0)" -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.toolsmiths.validation.elementtypes.example Bundle-ActivationPolicy: lazy diff --git a/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.validation.architecture.tests/resources/org.eclipse.papyrus.toolsmiths.validation.architecture.classdiagram/.classpath b/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.validation.architecture.tests/resources/org.eclipse.papyrus.toolsmiths.validation.architecture.classdiagram/.classpath index e801ebfb468..81fe078c20c 100644 --- a/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.validation.architecture.tests/resources/org.eclipse.papyrus.toolsmiths.validation.architecture.classdiagram/.classpath +++ b/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.validation.architecture.tests/resources/org.eclipse.papyrus.toolsmiths.validation.architecture.classdiagram/.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/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.validation.architecture.tests/resources/org.eclipse.papyrus.toolsmiths.validation.architecture.classdiagram/.settings/org.eclipse.jdt.core.prefs b/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.validation.architecture.tests/resources/org.eclipse.papyrus.toolsmiths.validation.architecture.classdiagram/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100644 --- a/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.validation.architecture.tests/resources/org.eclipse.papyrus.toolsmiths.validation.architecture.classdiagram/.settings/org.eclipse.jdt.core.prefs +++ b/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.validation.architecture.tests/resources/org.eclipse.papyrus.toolsmiths.validation.architecture.classdiagram/.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/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.validation.architecture.tests/resources/org.eclipse.papyrus.toolsmiths.validation.architecture.classdiagram/META-INF/MANIFEST.MF b/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.validation.architecture.tests/resources/org.eclipse.papyrus.toolsmiths.validation.architecture.classdiagram/META-INF/MANIFEST.MF index bdc4d2f8eda..e847f3cb3ff 100644 --- a/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.validation.architecture.tests/resources/org.eclipse.papyrus.toolsmiths.validation.architecture.classdiagram/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.validation.architecture.tests/resources/org.eclipse.papyrus.toolsmiths.validation.architecture.classdiagram/META-INF/MANIFEST.MF @@ -24,6 +24,6 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.18.0,4.0.0)", org.eclipse.papyrus.uml.diagram.common;bundle-version="[5.0.0,6.0.0)", org.eclipse.papyrus.uml.diagram.clazz;bundle-version="[5.0.0,6.0.0)", org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration;bundle-version="[5.0.0,6.0.0)" -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.toolsmiths.validation.elementtypes.classdiagram Bundle-ActivationPolicy: lazy diff --git a/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.validation.architecture.tests/resources/org.eclipse.papyrus.toolsmiths.validation.architecture.example/.classpath b/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.validation.architecture.tests/resources/org.eclipse.papyrus.toolsmiths.validation.architecture.example/.classpath index e801ebfb468..81fe078c20c 100644 --- a/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.validation.architecture.tests/resources/org.eclipse.papyrus.toolsmiths.validation.architecture.example/.classpath +++ b/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.validation.architecture.tests/resources/org.eclipse.papyrus.toolsmiths.validation.architecture.example/.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/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.validation.architecture.tests/resources/org.eclipse.papyrus.toolsmiths.validation.architecture.example/.settings/org.eclipse.jdt.core.prefs b/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.validation.architecture.tests/resources/org.eclipse.papyrus.toolsmiths.validation.architecture.example/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100644 --- a/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.validation.architecture.tests/resources/org.eclipse.papyrus.toolsmiths.validation.architecture.example/.settings/org.eclipse.jdt.core.prefs +++ b/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.validation.architecture.tests/resources/org.eclipse.papyrus.toolsmiths.validation.architecture.example/.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/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.validation.architecture.tests/resources/org.eclipse.papyrus.toolsmiths.validation.architecture.example/META-INF/MANIFEST.MF b/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.validation.architecture.tests/resources/org.eclipse.papyrus.toolsmiths.validation.architecture.example/META-INF/MANIFEST.MF index 902ae98899e..98d116ae848 100644 --- a/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.validation.architecture.tests/resources/org.eclipse.papyrus.toolsmiths.validation.architecture.example/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.validation.architecture.tests/resources/org.eclipse.papyrus.toolsmiths.validation.architecture.example/META-INF/MANIFEST.MF @@ -24,6 +24,6 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.18.0,4.0.0)", org.eclipse.papyrus.uml.service.types;bundle-version="[5.0.0,6.0.0)", org.eclipse.papyrus.uml.diagram.common;bundle-version="[5.0.0,6.0.0)", org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration;bundle-version="[5.0.0,6.0.0)" -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.toolsmiths.validation.elementtypes.example Bundle-ActivationPolicy: lazy diff --git a/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.validation.architecture.tests/resources/org.eclipse.papyrus.toolsmiths.validation.architecture.usedbooks/.classpath b/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.validation.architecture.tests/resources/org.eclipse.papyrus.toolsmiths.validation.architecture.usedbooks/.classpath index e801ebfb468..81fe078c20c 100644 --- a/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.validation.architecture.tests/resources/org.eclipse.papyrus.toolsmiths.validation.architecture.usedbooks/.classpath +++ b/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.validation.architecture.tests/resources/org.eclipse.papyrus.toolsmiths.validation.architecture.usedbooks/.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/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.validation.architecture.tests/resources/org.eclipse.papyrus.toolsmiths.validation.architecture.usedbooks/.settings/org.eclipse.jdt.core.prefs b/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.validation.architecture.tests/resources/org.eclipse.papyrus.toolsmiths.validation.architecture.usedbooks/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100644 --- a/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.validation.architecture.tests/resources/org.eclipse.papyrus.toolsmiths.validation.architecture.usedbooks/.settings/org.eclipse.jdt.core.prefs +++ b/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.validation.architecture.tests/resources/org.eclipse.papyrus.toolsmiths.validation.architecture.usedbooks/.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/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.validation.architecture.tests/resources/org.eclipse.papyrus.toolsmiths.validation.architecture.usedbooks/META-INF/MANIFEST.MF b/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.validation.architecture.tests/resources/org.eclipse.papyrus.toolsmiths.validation.architecture.usedbooks/META-INF/MANIFEST.MF index c1b00b67db9..e20c439ac27 100644 --- a/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.validation.architecture.tests/resources/org.eclipse.papyrus.toolsmiths.validation.architecture.usedbooks/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.validation.architecture.tests/resources/org.eclipse.papyrus.toolsmiths.validation.architecture.usedbooks/META-INF/MANIFEST.MF @@ -24,6 +24,6 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.18.0,4.0.0)", org.eclipse.papyrus.uml.diagram.common;bundle-version="[5.0.0,6.0.0)", org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration;bundle-version="[5.0.0,6.0.0)", org.eclipse.papyrus.toolsmiths.validation.architecture.example;bundle-version="[2.0.0,3.0.0)" -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.toolsmiths.validation.elementtypes.usedbooks Bundle-ActivationPolicy: lazy diff --git a/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.validation.common.tests/.classpath b/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.validation.common.tests/.classpath index e93ba39e5af..05fe82c61ca 100644 --- a/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.validation.common.tests/.classpath +++ b/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.validation.common.tests/.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"> <attributes> <attribute name="module" value="true"/> </attributes> diff --git a/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.validation.common.tests/.settings/org.eclipse.jdt.core.prefs b/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.validation.common.tests/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100644 --- a/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.validation.common.tests/.settings/org.eclipse.jdt.core.prefs +++ b/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.validation.common.tests/.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/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.validation.common.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.validation.common.tests/META-INF/MANIFEST.MF index b4d03a432f0..a94fd8fcf73 100644 --- a/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.validation.common.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.validation.common.tests/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.papyrus.toolsmiths.validation.common.tests;singleton:=true Bundle-Version: 2.0.0.qualifier -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.junit.framework;bundle-version="[2.0.0,3.0.0)", @@ -22,4 +22,4 @@ Export-Package: org.eclipse.papyrus.toolsmiths.validation.common.tests, Automatic-Module-Name: org.eclipse.papyrus.toolsmiths.validation.common.tests Bundle-Vendor: %providerName Bundle-Localization: plugin -Import-Package: com.google.common.collect;version="[30.1.0,31.0.0)" +Import-Package: com.google.common.collect;version="[32.0.0,33.0.0)" diff --git a/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.validation.common.tests/resources/org.eclipse.papyrus.toolsmiths.validation.common.example/.classpath b/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.validation.common.tests/resources/org.eclipse.papyrus.toolsmiths.validation.common.example/.classpath index e801ebfb468..81fe078c20c 100644 --- a/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.validation.common.tests/resources/org.eclipse.papyrus.toolsmiths.validation.common.example/.classpath +++ b/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.validation.common.tests/resources/org.eclipse.papyrus.toolsmiths.validation.common.example/.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/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.validation.common.tests/resources/org.eclipse.papyrus.toolsmiths.validation.common.example/.settings/org.eclipse.jdt.core.prefs b/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.validation.common.tests/resources/org.eclipse.papyrus.toolsmiths.validation.common.example/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.validation.common.tests/resources/org.eclipse.papyrus.toolsmiths.validation.common.example/.settings/org.eclipse.jdt.core.prefs +++ b/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.validation.common.tests/resources/org.eclipse.papyrus.toolsmiths.validation.common.example/.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/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.validation.common.tests/resources/org.eclipse.papyrus.toolsmiths.validation.common.example/META-INF/MANIFEST.MF b/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.validation.common.tests/resources/org.eclipse.papyrus.toolsmiths.validation.common.example/META-INF/MANIFEST.MF index ce93313d7c9..95bde469230 100644 --- a/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.validation.common.tests/resources/org.eclipse.papyrus.toolsmiths.validation.common.example/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.validation.common.tests/resources/org.eclipse.papyrus.toolsmiths.validation.common.example/META-INF/MANIFEST.MF @@ -11,7 +11,7 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.18.0,4.0.0)", org.eclipse.uml2.uml;bundle-version="[5.5.0,6.0.0)", org.eclipse.uml2.uml.resources;bundle-version="[5.5.0,6.0.0)", org.eclipse.uml2.types;bundle-version="[2.5.0,3.0.0)" -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.toolsmiths.validation.common.example Bundle-ActivationPolicy: lazy Bundle-Activator: org.eclipse.papyrus.toolsmiths.validation.common.example.Activator diff --git a/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.validation.elementtypes.tests/.classpath b/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.validation.elementtypes.tests/.classpath index e801ebfb468..81fe078c20c 100644 --- a/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.validation.elementtypes.tests/.classpath +++ b/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.validation.elementtypes.tests/.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/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.validation.elementtypes.tests/.settings/org.eclipse.jdt.core.prefs b/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.validation.elementtypes.tests/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.validation.elementtypes.tests/.settings/org.eclipse.jdt.core.prefs +++ b/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.validation.elementtypes.tests/.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/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.validation.elementtypes.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.validation.elementtypes.tests/META-INF/MANIFEST.MF index 6ce1b3e58b6..c6a92bb559d 100644 --- a/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.validation.elementtypes.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.validation.elementtypes.tests/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.papyrus.toolsmiths.validation.elementtypes.tests;singleton:=true Bundle-Version: 2.0.0.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 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)", diff --git a/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.validation.elementtypes.tests/resources/bug569357-ok/META-INF/MANIFEST.MF b/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.validation.elementtypes.tests/resources/bug569357-ok/META-INF/MANIFEST.MF index 286247154f0..fca7441746c 100644 --- a/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.validation.elementtypes.tests/resources/bug569357-ok/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.validation.elementtypes.tests/resources/bug569357-ok/META-INF/MANIFEST.MF @@ -13,6 +13,6 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.18.0,4.0.0)", org.eclipse.papyrus.infra.types.core;bundle-version="[1.0.0,99.0.0)", org.eclipse.papyrus.uml.service.types;bundle-version="[1.0.0,99.0.0)", org.eclipse.papyrus.sysml16.service.types;bundle-version="[1.0.0,99.0.0)" -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.toolsmiths.validation.elementtypes.example Bundle-ActivationPolicy: lazy diff --git a/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.validation.elementtypes.tests/resources/org.eclipse.papyrus.toolsmiths.validation.elementtypes.example/.classpath b/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.validation.elementtypes.tests/resources/org.eclipse.papyrus.toolsmiths.validation.elementtypes.example/.classpath index e801ebfb468..81fe078c20c 100644 --- a/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.validation.elementtypes.tests/resources/org.eclipse.papyrus.toolsmiths.validation.elementtypes.example/.classpath +++ b/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.validation.elementtypes.tests/resources/org.eclipse.papyrus.toolsmiths.validation.elementtypes.example/.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/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.validation.elementtypes.tests/resources/org.eclipse.papyrus.toolsmiths.validation.elementtypes.example/.settings/org.eclipse.jdt.core.prefs b/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.validation.elementtypes.tests/resources/org.eclipse.papyrus.toolsmiths.validation.elementtypes.example/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.validation.elementtypes.tests/resources/org.eclipse.papyrus.toolsmiths.validation.elementtypes.example/.settings/org.eclipse.jdt.core.prefs +++ b/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.validation.elementtypes.tests/resources/org.eclipse.papyrus.toolsmiths.validation.elementtypes.example/.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/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.validation.elementtypes.tests/resources/org.eclipse.papyrus.toolsmiths.validation.elementtypes.example/META-INF/MANIFEST.MF b/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.validation.elementtypes.tests/resources/org.eclipse.papyrus.toolsmiths.validation.elementtypes.example/META-INF/MANIFEST.MF index 0618e74f2eb..47d480b8a5b 100644 --- a/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.validation.elementtypes.tests/resources/org.eclipse.papyrus.toolsmiths.validation.elementtypes.example/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.validation.elementtypes.tests/resources/org.eclipse.papyrus.toolsmiths.validation.elementtypes.example/META-INF/MANIFEST.MF @@ -8,6 +8,6 @@ Bundle-Activator: org.eclipse.papyrus.toolsmiths.validation.elementtypes.example Bundle-Vendor: %providerName Bundle-Localization: plugin Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.18.0,4.0.0)" -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.toolsmiths.validation.elementtypes.example Bundle-ActivationPolicy: lazy diff --git a/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.validation.elementtypes.tests/resources/org.eclipse.papyrus.toolsmiths.validation.elementtypes.resources/.classpath b/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.validation.elementtypes.tests/resources/org.eclipse.papyrus.toolsmiths.validation.elementtypes.resources/.classpath index bc3587db485..a7a673fa7ab 100644 --- a/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.validation.elementtypes.tests/resources/org.eclipse.papyrus.toolsmiths.validation.elementtypes.resources/.classpath +++ b/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.validation.elementtypes.tests/resources/org.eclipse.papyrus.toolsmiths.validation.elementtypes.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="output" path="bin"/> </classpath> diff --git a/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.validation.elementtypes.tests/resources/org.eclipse.papyrus.toolsmiths.validation.elementtypes.resources/.settings/org.eclipse.jdt.core.prefs b/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.validation.elementtypes.tests/resources/org.eclipse.papyrus.toolsmiths.validation.elementtypes.resources/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.validation.elementtypes.tests/resources/org.eclipse.papyrus.toolsmiths.validation.elementtypes.resources/.settings/org.eclipse.jdt.core.prefs +++ b/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.validation.elementtypes.tests/resources/org.eclipse.papyrus.toolsmiths.validation.elementtypes.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/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.validation.elementtypes.tests/resources/org.eclipse.papyrus.toolsmiths.validation.elementtypes.resources/META-INF/MANIFEST.MF b/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.validation.elementtypes.tests/resources/org.eclipse.papyrus.toolsmiths.validation.elementtypes.resources/META-INF/MANIFEST.MF index c506cf80ff7..5cd556a1b14 100644 --- a/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.validation.elementtypes.tests/resources/org.eclipse.papyrus.toolsmiths.validation.elementtypes.resources/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.validation.elementtypes.tests/resources/org.eclipse.papyrus.toolsmiths.validation.elementtypes.resources/META-INF/MANIFEST.MF @@ -7,6 +7,6 @@ Bundle-ClassPath: . Bundle-Vendor: %providerName Bundle-Localization: plugin Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.18.0,4.0.0)" -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.toolsmiths.validation.elementtypes.resources Bundle-ActivationPolicy: lazy diff --git a/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.validation.newchild.tests/.classpath b/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.validation.newchild.tests/.classpath index e801ebfb468..81fe078c20c 100644 --- a/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.validation.newchild.tests/.classpath +++ b/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.validation.newchild.tests/.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/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.validation.newchild.tests/.settings/org.eclipse.jdt.core.prefs b/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.validation.newchild.tests/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100644 --- a/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.validation.newchild.tests/.settings/org.eclipse.jdt.core.prefs +++ b/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.validation.newchild.tests/.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/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.validation.newchild.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.validation.newchild.tests/META-INF/MANIFEST.MF index e389fb15e9a..88bf1d1b4fd 100644 --- a/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.validation.newchild.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.validation.newchild.tests/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.papyrus.toolsmiths.validation.newchild.tests;singleton:=true Bundle-Version: 2.0.0.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 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)", diff --git a/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.validation.newchild.tests/resources/bug572633-dependencies/META-INF/MANIFEST-missingNewChild.MF b/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.validation.newchild.tests/resources/bug572633-dependencies/META-INF/MANIFEST-missingNewChild.MF index ce714879420..1631c1bf38a 100644 --- a/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.validation.newchild.tests/resources/bug572633-dependencies/META-INF/MANIFEST-missingNewChild.MF +++ b/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.validation.newchild.tests/resources/bug572633-dependencies/META-INF/MANIFEST-missingNewChild.MF @@ -23,6 +23,6 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.18.0,4.0.0)", org.eclipse.papyrus.uml.service.types;bundle-version="[5.0.0,6.0.0)", org.eclipse.papyrus.uml.diagram.common;bundle-version="[5.0.0,6.0.0)", org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration;bundle-version="[5.0.0,6.0.0)" -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.toolsmiths.validation.elementtypes.example Bundle-ActivationPolicy: lazy diff --git a/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.validation.newchild.tests/resources/org.eclipse.papyrus.toolsmiths.validation.newchild.example/.classpath b/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.validation.newchild.tests/resources/org.eclipse.papyrus.toolsmiths.validation.newchild.example/.classpath index bc3587db485..a7a673fa7ab 100644 --- a/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.validation.newchild.tests/resources/org.eclipse.papyrus.toolsmiths.validation.newchild.example/.classpath +++ b/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.validation.newchild.tests/resources/org.eclipse.papyrus.toolsmiths.validation.newchild.example/.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/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.validation.newchild.tests/resources/org.eclipse.papyrus.toolsmiths.validation.newchild.example/.settings/org.eclipse.jdt.core.prefs b/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.validation.newchild.tests/resources/org.eclipse.papyrus.toolsmiths.validation.newchild.example/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100644 --- a/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.validation.newchild.tests/resources/org.eclipse.papyrus.toolsmiths.validation.newchild.example/.settings/org.eclipse.jdt.core.prefs +++ b/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.validation.newchild.tests/resources/org.eclipse.papyrus.toolsmiths.validation.newchild.example/.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/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.validation.newchild.tests/resources/org.eclipse.papyrus.toolsmiths.validation.newchild.example/META-INF/MANIFEST.MF b/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.validation.newchild.tests/resources/org.eclipse.papyrus.toolsmiths.validation.newchild.example/META-INF/MANIFEST.MF index 8bab945d0c7..d753673839a 100644 --- a/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.validation.newchild.tests/resources/org.eclipse.papyrus.toolsmiths.validation.newchild.example/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.validation.newchild.tests/resources/org.eclipse.papyrus.toolsmiths.validation.newchild.example/META-INF/MANIFEST.MF @@ -24,6 +24,6 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.18.0,4.0.0)", org.eclipse.papyrus.uml.diagram.common;bundle-version="[5.0.0,6.0.0)", org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration;bundle-version="[5.0.0,6.0.0)", org.eclipse.papyrus.infra.newchild;bundle-version="[5.0.0,6.0.0)" -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.toolsmiths.validation.newchild.example Bundle-ActivationPolicy: lazy diff --git a/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.validation.profile.tests/.classpath b/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.validation.profile.tests/.classpath index e801ebfb468..81fe078c20c 100644 --- a/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.validation.profile.tests/.classpath +++ b/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.validation.profile.tests/.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/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.validation.profile.tests/.settings/org.eclipse.jdt.core.prefs b/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.validation.profile.tests/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.validation.profile.tests/.settings/org.eclipse.jdt.core.prefs +++ b/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.validation.profile.tests/.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/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.validation.profile.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.validation.profile.tests/META-INF/MANIFEST.MF index 44af0f3982e..92763b8f106 100644 --- a/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.validation.profile.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.validation.profile.tests/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.papyrus.toolsmiths.validation.profile.tests;singleton:=true Bundle-Version: 2.0.0.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 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)", diff --git a/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.validation.profile.tests/resources/org.eclipse.papyrus.toolsmiths.validation.profile.example/.classpath b/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.validation.profile.tests/resources/org.eclipse.papyrus.toolsmiths.validation.profile.example/.classpath index e801ebfb468..81fe078c20c 100644 --- a/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.validation.profile.tests/resources/org.eclipse.papyrus.toolsmiths.validation.profile.example/.classpath +++ b/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.validation.profile.tests/resources/org.eclipse.papyrus.toolsmiths.validation.profile.example/.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/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.validation.profile.tests/resources/org.eclipse.papyrus.toolsmiths.validation.profile.example/.settings/org.eclipse.jdt.core.prefs b/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.validation.profile.tests/resources/org.eclipse.papyrus.toolsmiths.validation.profile.example/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.validation.profile.tests/resources/org.eclipse.papyrus.toolsmiths.validation.profile.example/.settings/org.eclipse.jdt.core.prefs +++ b/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.validation.profile.tests/resources/org.eclipse.papyrus.toolsmiths.validation.profile.example/.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/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.validation.profile.tests/resources/org.eclipse.papyrus.toolsmiths.validation.profile.example/META-INF/MANIFEST.MF b/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.validation.profile.tests/resources/org.eclipse.papyrus.toolsmiths.validation.profile.example/META-INF/MANIFEST.MF index 6770acb019c..e2fa863fd58 100644 --- a/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.validation.profile.tests/resources/org.eclipse.papyrus.toolsmiths.validation.profile.example/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.validation.profile.tests/resources/org.eclipse.papyrus.toolsmiths.validation.profile.example/META-INF/MANIFEST.MF @@ -8,6 +8,6 @@ Bundle-Activator: org.eclipse.papyrus.toolsmiths.validation.profile.example.Acti Bundle-Vendor: %providerName Bundle-Localization: plugin Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.18.0,4.0.0)" -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.toolsmiths.validation.profile.example Bundle-ActivationPolicy: lazy diff --git a/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.validation.properties.tests/.classpath b/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.validation.properties.tests/.classpath index 9758da65af4..60deb67ce54 100644 --- a/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.validation.properties.tests/.classpath +++ b/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.validation.properties.tests/.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"> <attributes> <attribute name="module" value="true"/> </attributes> diff --git a/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.validation.properties.tests/.settings/org.eclipse.jdt.core.prefs b/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.validation.properties.tests/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100644 --- a/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.validation.properties.tests/.settings/org.eclipse.jdt.core.prefs +++ b/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.validation.properties.tests/.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/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.validation.properties.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.validation.properties.tests/META-INF/MANIFEST.MF index 893286a4350..c0422ab4d71 100644 --- a/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.validation.properties.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.validation.properties.tests/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.papyrus.toolsmiths.validation.properties.tests;singleton:=true Bundle-Version: 1.0.0.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 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)", diff --git a/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.validation.properties.tests/resources/manifest/MANIFEST-missingDependency.MF b/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.validation.properties.tests/resources/manifest/MANIFEST-missingDependency.MF index b44914d908e..192f08119c5 100644 --- a/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.validation.properties.tests/resources/manifest/MANIFEST-missingDependency.MF +++ b/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.validation.properties.tests/resources/manifest/MANIFEST-missingDependency.MF @@ -29,6 +29,6 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.18.0,4.0.0)", org.eclipse.papyrus.infra.widgets;bundle-version="[4.1.0,5.0.0)", org.eclipse.core.databinding;bundle-version="[1.10.100,2.0.0)", org.eclipse.jface;bundle-version="[3.22.100,4.0.0)" -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.toolsmiths.validation.properties.example Bundle-ActivationPolicy: lazy diff --git a/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.validation.properties.tests/resources/org.eclipse.papyrus.toolsmiths.validation.properties.example.dependency1/.classpath b/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.validation.properties.tests/resources/org.eclipse.papyrus.toolsmiths.validation.properties.example.dependency1/.classpath index e801ebfb468..81fe078c20c 100644 --- a/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.validation.properties.tests/resources/org.eclipse.papyrus.toolsmiths.validation.properties.example.dependency1/.classpath +++ b/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.validation.properties.tests/resources/org.eclipse.papyrus.toolsmiths.validation.properties.example.dependency1/.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/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.validation.properties.tests/resources/org.eclipse.papyrus.toolsmiths.validation.properties.example.dependency1/.settings/org.eclipse.jdt.core.prefs b/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.validation.properties.tests/resources/org.eclipse.papyrus.toolsmiths.validation.properties.example.dependency1/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100644 --- a/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.validation.properties.tests/resources/org.eclipse.papyrus.toolsmiths.validation.properties.example.dependency1/.settings/org.eclipse.jdt.core.prefs +++ b/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.validation.properties.tests/resources/org.eclipse.papyrus.toolsmiths.validation.properties.example.dependency1/.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/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.validation.properties.tests/resources/org.eclipse.papyrus.toolsmiths.validation.properties.example.dependency1/META-INF/MANIFEST.MF b/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.validation.properties.tests/resources/org.eclipse.papyrus.toolsmiths.validation.properties.example.dependency1/META-INF/MANIFEST.MF index 3852fd4991b..74a3c8fad61 100644 --- a/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.validation.properties.tests/resources/org.eclipse.papyrus.toolsmiths.validation.properties.example.dependency1/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.validation.properties.tests/resources/org.eclipse.papyrus.toolsmiths.validation.properties.example.dependency1/META-INF/MANIFEST.MF @@ -30,6 +30,6 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.18.0,4.0.0)", org.eclipse.core.databinding;bundle-version="[1.10.100,2.0.0)", org.eclipse.jface;bundle-version="[3.22.100,4.0.0)", org.eclipse.papyrus.uml.properties;bundle-version="[4.1.0,5.0.0)" -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.toolsmiths.validation.properties.example.dependency1 Bundle-ActivationPolicy: lazy diff --git a/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.validation.properties.tests/resources/org.eclipse.papyrus.toolsmiths.validation.properties.example/.classpath b/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.validation.properties.tests/resources/org.eclipse.papyrus.toolsmiths.validation.properties.example/.classpath index e801ebfb468..81fe078c20c 100644 --- a/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.validation.properties.tests/resources/org.eclipse.papyrus.toolsmiths.validation.properties.example/.classpath +++ b/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.validation.properties.tests/resources/org.eclipse.papyrus.toolsmiths.validation.properties.example/.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/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.validation.properties.tests/resources/org.eclipse.papyrus.toolsmiths.validation.properties.example/.settings/org.eclipse.jdt.core.prefs b/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.validation.properties.tests/resources/org.eclipse.papyrus.toolsmiths.validation.properties.example/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100644 --- a/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.validation.properties.tests/resources/org.eclipse.papyrus.toolsmiths.validation.properties.example/.settings/org.eclipse.jdt.core.prefs +++ b/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.validation.properties.tests/resources/org.eclipse.papyrus.toolsmiths.validation.properties.example/.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/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.validation.properties.tests/resources/org.eclipse.papyrus.toolsmiths.validation.properties.example/META-INF/MANIFEST.MF b/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.validation.properties.tests/resources/org.eclipse.papyrus.toolsmiths.validation.properties.example/META-INF/MANIFEST.MF index fcd5e11a4b3..24536bfacdd 100644 --- a/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.validation.properties.tests/resources/org.eclipse.papyrus.toolsmiths.validation.properties.example/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.validation.properties.tests/resources/org.eclipse.papyrus.toolsmiths.validation.properties.example/META-INF/MANIFEST.MF @@ -30,6 +30,6 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.18.0,4.0.0)", org.eclipse.core.databinding;bundle-version="[1.10.100,2.0.0)", org.eclipse.jface;bundle-version="[3.22.100,4.0.0)", org.eclipse.papyrus.uml.properties;bundle-version="[4.1.0,5.0.0)" -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.toolsmiths.validation.properties.example Bundle-ActivationPolicy: lazy diff --git a/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.backend.tests/.classpath b/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.backend.tests/.classpath index e801ebfb468..81fe078c20c 100644 --- a/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.backend.tests/.classpath +++ b/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.backend.tests/.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/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.backend.tests/.settings/org.eclipse.jdt.core.prefs b/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.backend.tests/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.backend.tests/.settings/org.eclipse.jdt.core.prefs +++ b/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.backend.tests/.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/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.backend.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.backend.tests/META-INF/MANIFEST.MF index b48eb2bc397..b83615551ba 100644 --- a/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.backend.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.backend.tests/META-INF/MANIFEST.MF @@ -15,7 +15,7 @@ Require-Bundle: org.eclipse.emf.databinding;bundle-version="[1.5.0,2.0.0)", org.eclipse.papyrus.uml.extensionpoints;bundle-version="[2.0.0,3.0.0)", org.eclipse.uml2.uml;bundle-version="[5.5.0,6.0.0)", org.junit;bundle-version="[4.13.0,5.0.0)" -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-ActivationPolicy: lazy Bundle-Vendor: Eclipse Modeling Project Automatic-Module-Name: org.eclipse.papyrus.uml.alf.backend.tests diff --git a/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/.classpath b/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/.classpath index 5f5ca0cbd8a..236ce9c375c 100644 --- a/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/.classpath +++ b/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/.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/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/.settings/org.eclipse.jdt.core.prefs b/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/.settings/org.eclipse.jdt.core.prefs +++ b/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/.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/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/META-INF/MANIFEST.MF index 3919974846b..983b46ee26f 100644 --- a/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/META-INF/MANIFEST.MF @@ -9,7 +9,6 @@ Require-Bundle: org.eclipse.gmf.runtime.diagram.ui;bundle-version="[1.9.0,2.0.0) org.eclipse.papyrus.uml.alf.ui;bundle-version="[4.0.0,5.0.0)", org.eclipse.papyrus.uml.extensionpoints;bundle-version="[2.0.0,3.0.0)", org.eclipse.uml2.uml.resources;bundle-version="[5.5.0,6.0.0)", - org.eclipse.xtend;bundle-version="[2.2.0,3.0.0)", org.eclipse.xtext.junit4;bundle-version="[2.22.0,3.0.0)", org.eclipse.xtext.ui;bundle-version="[2.22.0,3.0.0)", org.eclipse.xtext.xbase;bundle-version="[2.22.0,3.0.0)", @@ -21,7 +20,7 @@ Bundle-ActivationPolicy: lazy Bundle-ClassPath: ., Alf/, UML/ -Bundle-Version: 2.0.0.qualifier +Bundle-Version: 2.0.100.qualifier Bundle-Name: ALF Tests Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.uml.alf.tests;singleton:=true @@ -33,5 +32,5 @@ Import-Package: org.apache.log4j, org.junit.runner.notification;version="4.5.0", org.junit.runners;version="4.5.0", org.junit.runners.model;version="4.5.0" -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.uml.alf.tests diff --git a/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/pom.xml b/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/pom.xml index b771efeed9c..d4d5ecbb344 100644 --- a/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/pom.xml +++ b/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/pom.xml @@ -11,7 +11,7 @@ </parent> <groupId>org.eclipse.papyrus.tests</groupId> <artifactId>org.eclipse.papyrus.uml.alf.tests</artifactId> - <version>2.0.0-SNAPSHOT</version> + <version>2.0.100-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> <build> <plugins> diff --git a/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.tests/.classpath b/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.tests/.classpath index e801ebfb468..81fe078c20c 100644 --- a/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.tests/.classpath +++ b/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.tests/.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/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.tests/.settings/org.eclipse.jdt.core.prefs b/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.tests/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.tests/.settings/org.eclipse.jdt.core.prefs +++ b/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.tests/.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/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.tests/META-INF/MANIFEST.MF index 2566d625a54..5c6f2b85939 100755 --- a/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.tests/META-INF/MANIFEST.MF @@ -23,5 +23,5 @@ Bundle-Name: %pluginName Bundle-ManifestVersion: 2 Bundle-Description: %pluginDescription Bundle-SymbolicName: org.eclipse.papyrus.uml.profile.assistants.generator.tests;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.uml.profile.assistants.generator.tests diff --git a/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.tests/.classpath b/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.tests/.classpath index e801ebfb468..81fe078c20c 100644 --- a/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.tests/.classpath +++ b/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.tests/.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/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.tests/.settings/org.eclipse.jdt.core.prefs b/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.tests/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.tests/.settings/org.eclipse.jdt.core.prefs +++ b/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.tests/.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/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.tests/META-INF/MANIFEST.MF index a47f80250eb..db98519358e 100644 --- a/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.tests/META-INF/MANIFEST.MF @@ -23,5 +23,5 @@ Bundle-Name: %pluginName Bundle-ManifestVersion: 2 Bundle-Description: %pluginDescription Bundle-SymbolicName: org.eclipse.papyrus.uml.profile.types.generator.tests;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.uml.profile.types.generator.tests diff --git a/tests/junit/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.controlmode.tests/.classpath b/tests/junit/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.controlmode.tests/.classpath index e801ebfb468..81fe078c20c 100644 --- a/tests/junit/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.controlmode.tests/.classpath +++ b/tests/junit/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.controlmode.tests/.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/tests/junit/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.controlmode.tests/.settings/org.eclipse.jdt.core.prefs b/tests/junit/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.controlmode.tests/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/tests/junit/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.controlmode.tests/.settings/org.eclipse.jdt.core.prefs +++ b/tests/junit/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.controlmode.tests/.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/tests/junit/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.controlmode.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.controlmode.tests/META-INF/MANIFEST.MF index 71bbf1223d5..541a96b03fc 100644 --- a/tests/junit/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.controlmode.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.controlmode.tests/META-INF/MANIFEST.MF @@ -19,6 +19,6 @@ Bundle-Name: %pluginName Bundle-Localization: plugin Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.uml.decoratormodel.controlmode.tests;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="[32.0.0, 33.0.0)" Automatic-Module-Name: org.eclipse.papyrus.uml.decoratormodel.controlmode.tests diff --git a/tests/junit/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.tests/.classpath b/tests/junit/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.tests/.classpath index e801ebfb468..81fe078c20c 100644 --- a/tests/junit/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.tests/.classpath +++ b/tests/junit/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.tests/.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/tests/junit/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.tests/.settings/org.eclipse.jdt.core.prefs b/tests/junit/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.tests/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/tests/junit/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.tests/.settings/org.eclipse.jdt.core.prefs +++ b/tests/junit/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.tests/.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/tests/junit/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.tests/META-INF/MANIFEST.MF index 3f7f472dbaa..7af4b03531d 100644 --- a/tests/junit/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.tests/META-INF/MANIFEST.MF @@ -25,9 +25,9 @@ Bundle-Name: %pluginName Bundle-Localization: plugin Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.uml.decoratormodel.tests;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="[32.0.0, 33.0.0)", + com.google.common.collect;version="[32.0.0, 33.0.0)", + com.google.common.io;version="[32.0.0, 33.0.0)", + com.google.common.util.concurrent;version="[32.0.0, 33.0.0)" Automatic-Module-Name: org.eclipse.papyrus.uml.decoratormodel.tests diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/.classpath b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/.classpath index e801ebfb468..81fe078c20c 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/.classpath +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/.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/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/.settings/org.eclipse.jdt.core.prefs b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/.settings/org.eclipse.jdt.core.prefs +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/.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/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/META-INF/MANIFEST.MF index c0669c74a48..5478e6c8391 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/META-INF/MANIFEST.MF @@ -24,11 +24,11 @@ Export-Package: org.eclipse.papyrus.uml.diagram.activity.tests, org.eclipse.papyrus.uml.diagram.activity.tests.canonical;x-friends:="org.eclipse.papyrus.uml.diagram.interactionoverview.tests" 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.uml.diagram.activity.tests.Activator Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.activity.tests;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.uml.diagram.activity.tests diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/pom.xml b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/pom.xml index 885aa40df70..9b5974763ce 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/pom.xml +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/pom.xml @@ -10,7 +10,7 @@ </parent> <groupId>org.eclipse.papyrus.tests</groupId> <artifactId>org.eclipse.papyrus.uml.diagram.activity.tests</artifactId> - <version>2.0.0-SNAPSHOT</version> + <version>2.0.100-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> <properties> diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/src/org/eclipse/papyrus/uml/diagram/activity/tests/canonical/TestActivityDiagramChildNode.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/src/org/eclipse/papyrus/uml/diagram/activity/tests/canonical/TestActivityDiagramChildNode.java index 26d3d6f1cb4..f8b11efc742 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/src/org/eclipse/papyrus/uml/diagram/activity/tests/canonical/TestActivityDiagramChildNode.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/src/org/eclipse/papyrus/uml/diagram/activity/tests/canonical/TestActivityDiagramChildNode.java @@ -1,5 +1,5 @@ /***************************************************************************** - * Copyright (c) 2009 CEA LIST. + * Copyright (c) 2009, 2023 CEA LIST. * * * All rights reserved. This program and the accompanying materials @@ -11,7 +11,7 @@ * * Contributors: * Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation - * + * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - bug 582007 *****************************************************************************/ package org.eclipse.papyrus.uml.diagram.activity.tests.canonical; @@ -51,7 +51,6 @@ public class TestActivityDiagramChildNode extends AbstractTestActivityChildNode @Override protected boolean isSemanticTest() { - return true; } diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/.classpath b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/.classpath index 9cb19c81c76..c0255c320e6 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/.classpath +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/.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="test"/> <classpathentry kind="output" path="bin"/> diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/.settings/org.eclipse.jdt.core.prefs b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/.settings/org.eclipse.jdt.core.prefs +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/.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/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/META-INF/MANIFEST.MF index 954ea08ee6e..bd32dce45e8 100755 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/META-INF/MANIFEST.MF @@ -42,5 +42,5 @@ Bundle-Localization: plugin Bundle-ManifestVersion: 2 Bundle-Activator: org.eclipse.papyrus.uml.diagram.clazz.test.Activator Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.clazz.tests;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.uml.diagram.clazz.tests diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/.classpath b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/.classpath index e801ebfb468..81fe078c20c 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/.classpath +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/.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/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/.settings/org.eclipse.jdt.core.prefs b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/.settings/org.eclipse.jdt.core.prefs +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/.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/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/META-INF/MANIFEST.MF index 264568dac2c..654db2b395b 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/META-INF/MANIFEST.MF @@ -41,5 +41,5 @@ Bundle-Activator: org.eclipse.papyrus.uml.diagram.common.tests.Activator Bundle-ManifestVersion: 2 Bundle-Description: This plugin provides tests for the papyrus plugin UML Diagram Common Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.common.tests;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.uml.diagram.common.tests diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication.tests/.classpath b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication.tests/.classpath index e801ebfb468..81fe078c20c 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication.tests/.classpath +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication.tests/.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/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication.tests/.settings/org.eclipse.jdt.core.prefs b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication.tests/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication.tests/.settings/org.eclipse.jdt.core.prefs +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication.tests/.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/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication.tests/META-INF/MANIFEST.MF index da2fbce81fb..e1f47000672 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication.tests/META-INF/MANIFEST.MF @@ -18,5 +18,5 @@ Bundle-Localization: plugin Bundle-ManifestVersion: 2 Bundle-Activator: org.eclipse.papyrus.uml.diagram.communication.tests.Activator Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.communication.tests;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.uml.diagram.communication.tests diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/.classpath b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/.classpath index e801ebfb468..81fe078c20c 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/.classpath +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/.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/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/.settings/org.eclipse.jdt.core.prefs b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/.settings/org.eclipse.jdt.core.prefs +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/.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/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/META-INF/MANIFEST.MF index 5ea7b9f9aaf..57fc77fa616 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component.tests/META-INF/MANIFEST.MF @@ -23,5 +23,5 @@ Bundle-Localization: plugin Bundle-ManifestVersion: 2 Bundle-Activator: org.eclipse.papyrus.uml.diagram.component.test.Activator Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.component.tests;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.uml.diagram.component.tests diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite.tests/.classpath b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite.tests/.classpath index 9cb19c81c76..c0255c320e6 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite.tests/.classpath +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite.tests/.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="test"/> <classpathentry kind="output" path="bin"/> diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite.tests/.settings/org.eclipse.jdt.core.prefs b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite.tests/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite.tests/.settings/org.eclipse.jdt.core.prefs +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite.tests/.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/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite.tests/META-INF/MANIFEST.MF index fd3bd00744d..0c5cc65c614 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite.tests/META-INF/MANIFEST.MF @@ -31,5 +31,5 @@ Bundle-Localization: plugin Bundle-ManifestVersion: 2 Bundle-Activator: org.eclipse.papyrus.uml.diagram.composite.test.Activator Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.composite.tests;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.uml.diagram.composite.tests diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite.tests/test/org/eclipse/papyrus/uml/diagram/composite/test/canonical/TestCompositeDiagramElementWithSameParentLink.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite.tests/test/org/eclipse/papyrus/uml/diagram/composite/test/canonical/TestCompositeDiagramElementWithSameParentLink.java index bb3d8e4d44e..1796e2817e4 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite.tests/test/org/eclipse/papyrus/uml/diagram/composite/test/canonical/TestCompositeDiagramElementWithSameParentLink.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite.tests/test/org/eclipse/papyrus/uml/diagram/composite/test/canonical/TestCompositeDiagramElementWithSameParentLink.java @@ -24,8 +24,8 @@ import org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart; import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest; import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequestFactory; import org.eclipse.gmf.runtime.emf.type.core.IElementType; -import org.eclipse.papyrus.infra.gmfdiag.common.updater.DiagramUpdater; import org.eclipse.papyrus.commands.ICreationCommand; +import org.eclipse.papyrus.infra.gmfdiag.common.updater.DiagramUpdater; import org.eclipse.papyrus.junit.framework.classification.InteractiveTest; import org.eclipse.papyrus.uml.diagram.composite.CreateCompositeDiagramCommand; import org.eclipse.papyrus.uml.diagram.composite.part.UMLDiagramUpdater; @@ -117,7 +117,8 @@ public class TestCompositeDiagramElementWithSameParentLink extends TestLinkWithP diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command); // FIXME : get(0) : header; get(1) : container - List<GraphicalEditPart> children = parent.getChildren(); + @SuppressWarnings("unchecked") + List<GraphicalEditPart> children = (List<GraphicalEditPart>) parent.getChildren(); target = children.get(3); } diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/.classpath b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/.classpath index e801ebfb468..81fe078c20c 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/.classpath +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/.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/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/.settings/org.eclipse.jdt.core.prefs b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/.settings/org.eclipse.jdt.core.prefs +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/.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/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/META-INF/MANIFEST.MF index 9b3dd908768..98b3b1d8c68 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/META-INF/MANIFEST.MF @@ -20,5 +20,5 @@ Bundle-Localization: plugin Bundle-ManifestVersion: 2 Bundle-Activator: org.eclipse.papyrus.uml.diagram.deployment.test.Activator Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.deployment.tests;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.uml.diagram.deployment.tests diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.dnd.tests/.classpath b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.dnd.tests/.classpath index e801ebfb468..81fe078c20c 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.dnd.tests/.classpath +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.dnd.tests/.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/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.dnd.tests/.settings/org.eclipse.jdt.core.prefs b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.dnd.tests/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.dnd.tests/.settings/org.eclipse.jdt.core.prefs +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.dnd.tests/.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/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.dnd.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.dnd.tests/META-INF/MANIFEST.MF index b1522c85027..6eacc18687b 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.dnd.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.dnd.tests/META-INF/MANIFEST.MF @@ -22,5 +22,5 @@ Bundle-Name: DND Tests Bundle-ManifestVersion: 2 Bundle-Activator: org.eclipse.papyrus.uml.diagram.dnd.tests.Activator Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.dnd.tests;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.uml.diagram.dnd.tests diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview.tests/.classpath b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview.tests/.classpath index e801ebfb468..81fe078c20c 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview.tests/.classpath +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview.tests/.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/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview.tests/.settings/org.eclipse.jdt.core.prefs b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview.tests/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview.tests/.settings/org.eclipse.jdt.core.prefs +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview.tests/.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/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview.tests/META-INF/MANIFEST.MF index 83295ae5aec..5de37e3b283 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview.tests/META-INF/MANIFEST.MF @@ -20,10 +20,10 @@ Require-Bundle: org.eclipse.emf.databinding;bundle-version="[1.5.0,2.0.0)", Export-Package: org.eclipse.papyrus.uml.diagram.interactionoverview.tests Bundle-Vendor: Eclipse Modeling Project Bundle-ActivationPolicy: lazy -Bundle-Version: 2.0.0.qualifier +Bundle-Version: 2.0.100.qualifier Bundle-Name: IODiagram Tests Bundle-ManifestVersion: 2 Bundle-Activator: org.eclipse.papyrus.uml.diagram.interactionoverview.tests.Activator Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.interactionoverview.tests;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.uml.diagram.interactionoverview.tests diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview.tests/pom.xml b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview.tests/pom.xml index ae97a06dc75..0fc0713c674 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview.tests/pom.xml +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview.tests/pom.xml @@ -10,6 +10,6 @@ </parent> <groupId>org.eclipse.papyrus.tests</groupId> <artifactId>org.eclipse.papyrus.uml.diagram.interactionoverview.tests</artifactId> - <version>2.0.0-SNAPSHOT</version> + <version>2.0.100-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> </project>
\ No newline at end of file diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview.tests/src/org/eclipse/papyrus/uml/diagram/interactionoverview/tests/canonical/AbstractInteractionOverviewDiagramTestCase.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview.tests/src/org/eclipse/papyrus/uml/diagram/interactionoverview/tests/canonical/AbstractInteractionOverviewDiagramTestCase.java index d6d214ab610..3699674b40e 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview.tests/src/org/eclipse/papyrus/uml/diagram/interactionoverview/tests/canonical/AbstractInteractionOverviewDiagramTestCase.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview.tests/src/org/eclipse/papyrus/uml/diagram/interactionoverview/tests/canonical/AbstractInteractionOverviewDiagramTestCase.java @@ -53,9 +53,9 @@ import org.eclipse.gmf.runtime.diagram.ui.util.INotationType; import org.eclipse.gmf.runtime.emf.type.core.IElementType; import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest; import org.eclipse.gmf.runtime.notation.View; -import org.eclipse.papyrus.infra.gmfdiag.common.updater.DiagramUpdater; import org.eclipse.papyrus.commands.ICreationCommand; import org.eclipse.papyrus.commands.wrappers.GEFtoEMFCommandWrapper; +import org.eclipse.papyrus.infra.gmfdiag.common.updater.DiagramUpdater; import org.eclipse.papyrus.uml.diagram.activity.edit.parts.ActivityActivityContentCompartmentEditPart; import org.eclipse.papyrus.uml.diagram.activity.providers.UMLElementTypes; import org.eclipse.papyrus.uml.diagram.common.editparts.UMLNodeEditPart; @@ -75,11 +75,12 @@ import org.eclipse.uml2.uml.NamedElement; public class AbstractInteractionOverviewDiagramTestCase extends TestChildNode { - + @Override public DiagramUpdater getDiagramUpdater() { return null; } + protected boolean operationFailed = false; @Override @@ -107,9 +108,9 @@ public class AbstractInteractionOverviewDiagramTestCase extends TestChildNode { * </ul> * * @param elementType - * the type for which to create a view (and possibly a model element) + * the type for which to create a view (and possibly a model element) * @param parentEditPart - * the edit part to which the creation request must be sent + * the edit part to which the creation request must be sent * @return the created View */ protected View createView(final IElementType elementType, final EditPart parentEditPart) { @@ -126,25 +127,26 @@ public class AbstractInteractionOverviewDiagramTestCase extends TestChildNode { * </ul> * * @param elementType - * the type for which to create a view (and possibly a model element) + * the type for which to create a view (and possibly a model element) * @param location - * the position of the new view (may be <code>null</code>) + * the position of the new view (may be <code>null</code>) * @param size - * the size of the new view (may be <code>null</code>) + * the size of the new view (may be <code>null</code>) * @param parentEditPart - * the edit part to which the creation request must be sent + * the edit part to which the creation request must be sent * @return the created View */ protected View createView(final IElementType elementType, final Point location, final Dimension size, final EditPart parentEditPart) { final View[] result = new View[1]; Display.getDefault().syncExec(new Runnable() { + @Override public void run() { final CreateViewRequest createRequest = CreateViewRequestFactory.getCreateShapeRequest(elementType, getDiagramEditPart().getDiagramPreferencesHint()); - if(size != null) { + if (size != null) { createRequest.setSize(size); } - if(location != null) { + if (location != null) { createRequest.setLocation(location); } final Command command = parentEditPart.getCommand(createRequest); @@ -158,14 +160,14 @@ public class AbstractInteractionOverviewDiagramTestCase extends TestChildNode { } protected static View getCreatedViewFromCommand(final Command command) { - final List<CreateCommand> createCommands = new ArrayList<CreateCommand>(); + final List<CreateCommand> createCommands = new ArrayList<>(); findNestedCreateCommands(command, createCommands); assertEquals("There should be one CreateCommand inside the command", 1, createCommands.size()); final Object returnValue = createCommands.get(0).getCommandResult().getReturnValue(); - if(returnValue instanceof IAdaptable) { - final IAdaptable adaptableResult = (IAdaptable)returnValue; - final View view = (View)adaptableResult.getAdapter(View.class); - if(view != null) { + if (returnValue instanceof IAdaptable) { + final IAdaptable adaptableResult = (IAdaptable) returnValue; + final View view = adaptableResult.getAdapter(View.class); + if (view != null) { return view; } } @@ -174,37 +176,37 @@ public class AbstractInteractionOverviewDiagramTestCase extends TestChildNode { } private static void findNestedCreateCommands(final Command gefCommand, final List<CreateCommand> createCommands) { - if(gefCommand instanceof CompoundCommand) { - final CompoundCommand compoundCommand = (CompoundCommand)gefCommand; + if (gefCommand instanceof CompoundCommand) { + final CompoundCommand compoundCommand = (CompoundCommand) gefCommand; @SuppressWarnings("unchecked") - final List<Command> commands = compoundCommand.getCommands(); - for(final Command childCommand : commands) { + final List<? extends Command> commands = compoundCommand.getCommands(); + for (final Command childCommand : commands) { findNestedCreateCommands(childCommand, createCommands); } - } else if(gefCommand instanceof ICommandProxy) { - final ICommandProxy commandProxy = (ICommandProxy)gefCommand; + } else if (gefCommand instanceof ICommandProxy) { + final ICommandProxy commandProxy = (ICommandProxy) gefCommand; final ICommand iCommand = commandProxy.getICommand(); findNestedCreateCommands(iCommand, createCommands); } } private static void findNestedCreateCommands(final ICommand gmfCommand, final List<CreateCommand> createCommands) { - if(gmfCommand instanceof CompositeCommand) { - final CompositeCommand compositeCommand = (CompositeCommand)gmfCommand; + if (gmfCommand instanceof CompositeCommand) { + final CompositeCommand compositeCommand = (CompositeCommand) gmfCommand; final Iterator<?> iterator = compositeCommand.iterator(); - while(iterator.hasNext()) { + while (iterator.hasNext()) { final Object element = iterator.next(); - if(element instanceof ICommand) { - final ICommand subCommand = (ICommand)element; + if (element instanceof ICommand) { + final ICommand subCommand = (ICommand) element; findNestedCreateCommands(subCommand, createCommands); } else { fail("error"); } } - } else if(gmfCommand instanceof CreateCommand) { - createCommands.add((CreateCommand)gmfCommand); - } else if(gmfCommand instanceof CommandProxy) { - final CommandProxy commandProxy = (CommandProxy)gmfCommand; + } else if (gmfCommand instanceof CreateCommand) { + createCommands.add((CreateCommand) gmfCommand); + } else if (gmfCommand instanceof CommandProxy) { + final CommandProxy commandProxy = (CommandProxy) gmfCommand; findNestedCreateCommands(commandProxy.getCommand(), createCommands); } } @@ -257,6 +259,7 @@ public class AbstractInteractionOverviewDiagramTestCase extends TestChildNode { protected void executeOnUIThread(final Command command) { Display.getDefault().syncExec(new Runnable() { + @Override public void run() { execute(command); } @@ -268,6 +271,7 @@ public class AbstractInteractionOverviewDiagramTestCase extends TestChildNode { protected void undoOnUIThread() { Display.getDefault().syncExec(new Runnable() { + @Override public void run() { undo(); } @@ -279,6 +283,7 @@ public class AbstractInteractionOverviewDiagramTestCase extends TestChildNode { protected void redoOnUIThread() { Display.getDefault().syncExec(new Runnable() { + @Override public void run() { redo(); } @@ -335,7 +340,7 @@ public class AbstractInteractionOverviewDiagramTestCase extends TestChildNode { protected void testHide(final GraphicalEditPart editPart) { final EditPart parent = editPart.getParent(); final int sizeBefore = parent.getChildren().size(); - final EObject semanticElement = ((View)editPart.getModel()).getElement(); + final EObject semanticElement = ((View) editPart.getModel()).getElement(); assertTrue("The semantic element should be in a Model", isInModel(semanticElement)); executeHideCommand(editPart); @@ -355,8 +360,8 @@ public class AbstractInteractionOverviewDiagramTestCase extends TestChildNode { */ protected static boolean isInModel(final EObject semanticElement) { EObject parent = semanticElement.eContainer(); - while(parent != null) { - if(parent instanceof Model) { + while (parent != null) { + if (parent instanceof Model) { return true; } parent = parent.eContainer(); @@ -368,7 +373,7 @@ public class AbstractInteractionOverviewDiagramTestCase extends TestChildNode { * Send the given EditPart a "delete" request (which only deletes the View), and execute the returned command. * * @param editPart - * the EditPart to hide + * the EditPart to hide */ protected void executeHideCommand(final GraphicalEditPart editPart) { final GroupRequest deleteViewRequest = new GroupRequest(RequestConstants.REQ_DELETE); @@ -382,7 +387,7 @@ public class AbstractInteractionOverviewDiagramTestCase extends TestChildNode { protected void testDelete(final GraphicalEditPart editPart) { final EditPart parent = editPart.getParent(); final int sizeBefore = parent.getChildren().size(); - final EObject semanticElement = ((View)editPart.getModel()).getElement(); + final EObject semanticElement = ((View) editPart.getModel()).getElement(); assertTrue("The semantic element should be in a Model", isInModel(semanticElement)); executeDestroyCommand(editPart); @@ -400,7 +405,7 @@ public class AbstractInteractionOverviewDiagramTestCase extends TestChildNode { * Send the given EditPart a {@link DestroyElementRequest}, and execute the returned command. * * @param editPart - * the EditPart to destroy + * the EditPart to destroy */ protected void executeDestroyCommand(final GraphicalEditPart editPart) { final Request destroyElementRequest = new EditCommandRequestWrapper(new DestroyElementRequest(false)); @@ -411,17 +416,17 @@ public class AbstractInteractionOverviewDiagramTestCase extends TestChildNode { /** * @param targetEditPart - * the EditPart on top of which the drop will happen. This will determine the coordinates of the drop. + * the EditPart on top of which the drop will happen. This will determine the coordinates of the drop. * @param parentEditPart - * the EditPart in which the element will really be added. Often the same EditPart as targetEditPart, - * unless dropping on top of the first EditPart puts the element in another edit part. + * the EditPart in which the element will really be added. Often the same EditPart as targetEditPart, + * unless dropping on top of the first EditPart puts the element in another edit part. * @param droppedElement - * the element to drop + * the element to drop */ public void testDrop(final GraphicalEditPart targetEditPart, final GraphicalEditPart parentEditPart, final EObject droppedElement) { final int sizeBefore = parentEditPart.getChildren().size(); final DropObjectsRequest dropObjectsRequest = new DropObjectsRequest(); - final ArrayList<EObject> list = new ArrayList<EObject>(); + final ArrayList<EObject> list = new ArrayList<>(); list.add(droppedElement); dropObjectsRequest.setObjects(list); dropObjectsRequest.setLocation(new Point(1, 1)); @@ -466,6 +471,7 @@ public class AbstractInteractionOverviewDiagramTestCase extends TestChildNode { protected void testSetNameWithDirectEditRequest(final GraphicalEditPart editPart, final NamedElement namedElement) { testSetNameWithDirectEditRequest(editPart, namedElement, new INameProvider<NamedElement>() { + @Override public String getName(final NamedElement element) { return element.getName(); } @@ -478,9 +484,9 @@ public class AbstractInteractionOverviewDiagramTestCase extends TestChildNode { * accept the changes. * * @param editPart - * the edit part on which to perform the DirectEditRequest. + * the edit part on which to perform the DirectEditRequest. * @param newName - * the name to set + * the name to set */ protected void setNameWithDirectEditRequest(final GraphicalEditPart editPart, final String newName) { final IFigure nameFigure = editPart.getFigure(); @@ -505,6 +511,7 @@ public class AbstractInteractionOverviewDiagramTestCase extends TestChildNode { final Text[] result = new Text[1]; Display.getDefault().syncExec(new Runnable() { + @Override public void run() { // note: both operations need to be performed in the same display runnable editPart.performRequest(directEditRequest); @@ -520,8 +527,9 @@ public class AbstractInteractionOverviewDiagramTestCase extends TestChildNode { final Text[] result = new Text[1]; Display.getDefault().syncExec(new Runnable() { + @Override public void run() { - final Composite composite = (Composite)getDiagramEditor().getDiagramGraphicalViewer().getControl(); + final Composite composite = (Composite) getDiagramEditor().getDiagramGraphicalViewer().getControl(); result[0] = findVisibleTextWidget(composite); } }); @@ -531,16 +539,16 @@ public class AbstractInteractionOverviewDiagramTestCase extends TestChildNode { /** Finds a {@link Text} widget inside the given composite, recursively. */ protected Text findVisibleTextWidget(final Composite composite) { final Control[] children = composite.getChildren(); - for(final Control child : children) { - if(child instanceof Text) { - final Text text = (Text)child; - if(text.isVisible()) { + for (final Control child : children) { + if (child instanceof Text) { + final Text text = (Text) child; + if (text.isVisible()) { return text; } - } else if(child instanceof Composite) { - final Composite childComposite = (Composite)child; + } else if (child instanceof Composite) { + final Composite childComposite = (Composite) child; final Text subresult = findVisibleTextWidget(childComposite); - if(subresult != null) { + if (subresult != null) { return subresult; } } @@ -556,6 +564,7 @@ public class AbstractInteractionOverviewDiagramTestCase extends TestChildNode { protected static void setText(final Text textWidget, final String newName) { Display.getDefault().syncExec(new Runnable() { + @Override public void run() { textWidget.setText(newName); // change the focus in order to accept the text @@ -577,7 +586,7 @@ public class AbstractInteractionOverviewDiagramTestCase extends TestChildNode { assertNotNull("The compartment must not be null", compartment); final View view = createView(type, compartment); assertNotNull("The InteractionUse View should be created", view); - return (CustomInteractionUseEditPartCN)findChildEditPartAssociatedToView(compartment, view); + return (CustomInteractionUseEditPartCN) findChildEditPartAssociatedToView(compartment, view); } protected CustomActivityEditPartTN getDefaultActivityEditPart() { @@ -595,10 +604,9 @@ public class AbstractInteractionOverviewDiagramTestCase extends TestChildNode { protected static EditPart findChildEditPartAssociatedToView(final EditPart parentEditPart, final View view) { EditPart result = null; - @SuppressWarnings("unchecked") - final List<EditPart> children = parentEditPart.getChildren(); - for(final EditPart editPart : children) { - if(view == editPart.getModel()) { + final List<? extends EditPart> children = parentEditPart.getChildren(); + for (final EditPart editPart : children) { + if (view == editPart.getModel()) { result = editPart; } } @@ -609,7 +617,7 @@ public class AbstractInteractionOverviewDiagramTestCase extends TestChildNode { @Override protected CreateViewRequest createViewRequestShapeContainer() { - + return null; } } diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.tests/META-INF/MANIFEST.MF index 554922de294..b2850629034 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.tests/META-INF/MANIFEST.MF @@ -25,4 +25,4 @@ Bundle-Name: %Bundle-Name Bundle-ManifestVersion: 2 Bundle-Activator: org.eclipse.papyrus.uml.diagram.paletteconfiguration.tests.Activator Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.paletteconfiguration.tests;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile.tests/.classpath b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile.tests/.classpath index e801ebfb468..81fe078c20c 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile.tests/.classpath +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile.tests/.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/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile.tests/.settings/org.eclipse.jdt.core.prefs b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile.tests/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile.tests/.settings/org.eclipse.jdt.core.prefs +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile.tests/.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/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile.tests/META-INF/MANIFEST.MF index 8604cf23a1f..318307298ba 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile.tests/META-INF/MANIFEST.MF @@ -24,5 +24,5 @@ Bundle-Name: Profile Diagram Tests Bundle-ManifestVersion: 2 Bundle-Activator: org.eclipse.papyrus.uml.diagram.profile.tests.Activator Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.profile.tests;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.uml.diagram.profile.tests diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.properties.tests/.classpath b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.properties.tests/.classpath index a42a828e04a..675a5e2962b 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.properties.tests/.classpath +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.properties.tests/.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"> <attributes> diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.properties.tests/.settings/org.eclipse.jdt.core.prefs b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.properties.tests/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.properties.tests/.settings/org.eclipse.jdt.core.prefs +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.properties.tests/.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/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.properties.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.properties.tests/META-INF/MANIFEST.MF index 5cd5dfb93d7..6057755e954 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.properties.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.properties.tests/META-INF/MANIFEST.MF @@ -26,5 +26,5 @@ Bundle-Name: %pluginName Bundle-Localization: plugin Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.properties.tests;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.uml.diagram.properties.tests diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/.classpath b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/.classpath index e801ebfb468..81fe078c20c 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/.classpath +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/.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/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/.settings/org.eclipse.jdt.core.prefs b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/.settings/org.eclipse.jdt.core.prefs +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/.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/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/META-INF/MANIFEST.MF index a9d4f53a484..77f5df11b06 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/META-INF/MANIFEST.MF @@ -34,5 +34,5 @@ Bundle-Name: %Bundle-Name Bundle-ManifestVersion: 2 Bundle-Activator: org.eclipse.papyrus.uml.diagram.sequence.tests.Activator Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.sequence.tests;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.uml.diagram.sequence.tests diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/canonical/TestSequenceDiagramInsideInteraction.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/canonical/TestSequenceDiagramInsideInteraction.java index ce98612832f..aa63e20a4d2 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/canonical/TestSequenceDiagramInsideInteraction.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/canonical/TestSequenceDiagramInsideInteraction.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 @@ -11,6 +11,7 @@ * * Contributors: * CEA LIST - Initial API and implementation + * Pascal Bannerot (CEA LIST) pascal.bannerot@cea.fr - Bug 582412 * *****************************************************************************/ package org.eclipse.papyrus.uml.diagram.sequence.tests.canonical; @@ -45,12 +46,13 @@ import org.eclipse.uml2.uml.Element; import org.eclipse.uml2.uml.Pseudostate; import org.eclipse.uml2.uml.UMLPackage; import org.junit.Assert; +import org.junit.Ignore; import org.junit.Test; public class TestSequenceDiagramInsideInteraction extends AbstractTestSequenceChildNode { - //this test has been overloaded for combined fragment no name + // this test has been overloaded for combined fragment no name // and interactionUse Ref for the label. @Override protected void testNameLabel(EditPart createdEditPart, String initialName) { @@ -67,12 +69,11 @@ public class TestSequenceDiagramInsideInteraction extends AbstractTestSequenceCh Assert.assertEquals(" the name must contain the name of the metaclass", name, ((ITextAwareEditPart) namedEditPart).getEditText().substring(0, name.length())); //$NON-NLS-1$ } else { - if(createdEditPart instanceof InteractionUseEditPart){ - //this is a particularity of interactionUse + if (createdEditPart instanceof InteractionUseEditPart) { + // this is a particularity of interactionUse Assert.assertEquals(" the name must contain the name of the metaclass", "Ref", ((ITextAwareEditPart) namedEditPart).getEditText()); //$NON-NLS-1$ - } - else{ + } else { // not the same it sure but display the mistake is important Assert.assertEquals(" the name must contain the name of the metaclass", name, ((ITextAwareEditPart) namedEditPart).getEditText()); //$NON-NLS-1$ } @@ -87,6 +88,7 @@ public class TestSequenceDiagramInsideInteraction extends AbstractTestSequenceCh } } } + @Override protected ICreationCommand getDiagramCommandCreation() { return new CreateSequenceDiagramCommand(); @@ -115,44 +117,51 @@ public class TestSequenceDiagramInsideInteraction extends AbstractTestSequenceCh } @Test + @Ignore // Bug 582412 alignment public void testToManageLifeline() { - testToManageNode(UMLElementTypes.Lifeline_Shape, UMLPackage.eINSTANCE.getLifeline(),UMLElementTypes.Interaction_Shape, false); + testToManageNode(UMLElementTypes.Lifeline_Shape, UMLPackage.eINSTANCE.getLifeline(), UMLElementTypes.Interaction_Shape, false); } /** * Test to manage constraint. */ @Test + @Ignore // Bug 582412 alignment public void testToManageConstraint() { - testToManageNode(UMLElementTypes.Constraint_Shape, UMLPackage.eINSTANCE.getConstraint(),UMLElementTypes.Interaction_Shape, false); + testToManageNode(UMLElementTypes.Constraint_Shape, UMLPackage.eINSTANCE.getConstraint(), UMLElementTypes.Interaction_Shape, false); } + /** * Test to manage constraint. */ @Test + @Ignore // Bug 582412 alignment public void testToManageCombinedFragment() { - testToManageNode(UMLElementTypes.CombinedFragment_Shape, UMLPackage.eINSTANCE.getCombinedFragment(),UMLElementTypes.Interaction_Shape, false); + testToManageNode(UMLElementTypes.CombinedFragment_Shape, UMLPackage.eINSTANCE.getCombinedFragment(), UMLElementTypes.Interaction_Shape, false); } /** * Test to manage constraint. */ @Test + @Ignore // Bug 582412 alignment public void testToManageConsiderIgnoreFragment() { - testToManageNode(UMLElementTypes.ConsiderIgnoreFragment_Shape, UMLPackage.eINSTANCE.getConsiderIgnoreFragment(),UMLElementTypes.Interaction_Shape, false); + testToManageNode(UMLElementTypes.ConsiderIgnoreFragment_Shape, UMLPackage.eINSTANCE.getConsiderIgnoreFragment(), UMLElementTypes.Interaction_Shape, false); } /** * Test to manage comment. */ @Test + @Ignore // Bug 582412 alignment public void testToManageComment() { - testToManageNode(UMLElementTypes.Comment_Shape, UMLPackage.eINSTANCE.getComment(),UMLElementTypes.Interaction_Shape, false); + testToManageNode(UMLElementTypes.Comment_Shape, UMLPackage.eINSTANCE.getComment(), UMLElementTypes.Interaction_Shape, false); } @Test + @Ignore // Bug 582412 alignment public void testToManageInteractionUse() { - testToManageNode(UMLElementTypes.InteractionUse_Shape, UMLPackage.eINSTANCE.getInteractionUse(),UMLElementTypes.Interaction_Shape, false); + testToManageNode(UMLElementTypes.InteractionUse_Shape, UMLPackage.eINSTANCE.getInteractionUse(), UMLElementTypes.Interaction_Shape, false); } /** @@ -166,7 +175,7 @@ public class TestSequenceDiagramInsideInteraction extends AbstractTestSequenceCh */ @Override public void testDrop(IElementType type, EClass eClass, int expectedGraphicalChildren, int expectedSemanticChildren, int addedGraphicalChildren) { - if(eClass.equals(UMLPackage.eINSTANCE.getDurationObservation())) { + if (eClass.equals(UMLPackage.eINSTANCE.getDurationObservation())) { // DROP assertEquals(DROP + INITIALIZATION_TEST, expectedGraphicalChildren, getRootView().getChildren().size()); DropObjectsRequest dropObjectsRequest = new DropObjectsRequest(); @@ -191,9 +200,8 @@ public class TestSequenceDiagramInsideInteraction extends AbstractTestSequenceCh // redo the drop redoOnUIThread(); Assert.assertEquals(DROP + TEST_THE_REDO, expectedGraphicalChildren + addedGraphicalChildren, getRootView().getChildren().size()); - } - else { - super.testDrop(type, eClass, expectedGraphicalChildren, expectedSemanticChildren, addedGraphicalChildren); + } else { + super.testDrop(type, eClass, expectedGraphicalChildren, expectedSemanticChildren, addedGraphicalChildren); } } diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine.tests/.classpath b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine.tests/.classpath index e801ebfb468..81fe078c20c 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine.tests/.classpath +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine.tests/.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/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine.tests/.settings/org.eclipse.jdt.core.prefs b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine.tests/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine.tests/.settings/org.eclipse.jdt.core.prefs +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine.tests/.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/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine.tests/META-INF/MANIFEST.MF index 62121e42d63..3919f998cc1 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine.tests/META-INF/MANIFEST.MF @@ -24,5 +24,5 @@ Bundle-Localization: plugin Bundle-ManifestVersion: 2 Bundle-Activator: org.eclipse.papyrus.uml.diagram.statemachine.tests.Activator Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.statemachine.tests;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.uml.diagram.statemachine.tests diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/.classpath b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/.classpath index e801ebfb468..81fe078c20c 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/.classpath +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/.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/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/.settings/org.eclipse.jdt.core.prefs b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/.settings/org.eclipse.jdt.core.prefs +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/.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/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/META-INF/MANIFEST.MF index 5614e6a6ae0..a15fe1c3681 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/META-INF/MANIFEST.MF @@ -30,5 +30,5 @@ Bundle-Localization: plugin Bundle-ManifestVersion: 2 Bundle-Activator: org.eclipse.papyrus.uml.diagram.stereotypeproperty.Activator Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.suite.tests/.classpath b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.suite.tests/.classpath index 8f8662d1d43..76c5ab8d8d8 100755 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.suite.tests/.classpath +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.suite.tests/.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="test"> <attributes> diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.suite.tests/.settings/org.eclipse.jdt.core.prefs b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.suite.tests/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.suite.tests/.settings/org.eclipse.jdt.core.prefs +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.suite.tests/.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/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.suite.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.suite.tests/META-INF/MANIFEST.MF index 5b0ef224a52..732ef704569 100755 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.suite.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.suite.tests/META-INF/MANIFEST.MF @@ -7,7 +7,7 @@ Bundle-Localization: plugin Bundle-ManifestVersion: 2 Bundle-Activator: org.eclipse.papyrus.uml.diagram.suite.tests.Activator Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.suite.tests;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Require-Bundle: org.eclipse.gmf.runtime.diagram.ui.properties;bundle-version="[1.8.0,2.0.0)", org.eclipse.papyrus.junit.framework;bundle-version="[2.0.0,3.0.0)", org.eclipse.papyrus.junit.utils;bundle-version="[3.0.0,4.0.0)", diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.tests/.classpath b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.tests/.classpath index e801ebfb468..81fe078c20c 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.tests/.classpath +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.tests/.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/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.tests/.settings/org.eclipse.jdt.core.prefs b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.tests/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.tests/.settings/org.eclipse.jdt.core.prefs +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.tests/.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/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.tests/META-INF/MANIFEST.MF index 7be71150ba1..0a51aac8b43 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.tests/META-INF/MANIFEST.MF @@ -49,5 +49,5 @@ Bundle-Localization: plugin Bundle-ManifestVersion: 2 Bundle-Activator: org.eclipse.papyrus.uml.diagram.tests.Activator Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.tests;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.uml.diagram.tests diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing.tests/.classpath b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing.tests/.classpath index e801ebfb468..81fe078c20c 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing.tests/.classpath +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing.tests/.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/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing.tests/.settings/org.eclipse.jdt.core.prefs b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing.tests/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing.tests/.settings/org.eclipse.jdt.core.prefs +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing.tests/.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/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing.tests/META-INF/MANIFEST.MF index a6c59981e37..0f07b4975d9 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing.tests/META-INF/MANIFEST.MF @@ -22,10 +22,10 @@ Export-Package: org.eclipse.papyrus.uml.diagram.timing.tests, org.eclipse.papyrus.uml.diagram.timing.tests.generic Bundle-Vendor: Eclipse Modeling Project Bundle-ActivationPolicy: lazy -Bundle-Version: 2.0.0.qualifier +Bundle-Version: 2.0.100.qualifier Bundle-Name: Papyrus Timing Diagram Tests Bundle-ManifestVersion: 2 Bundle-Activator: org.eclipse.papyrus.uml.diagram.timing.tests.Activator Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.timing.tests;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.uml.diagram.timing.tests diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing.tests/pom.xml b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing.tests/pom.xml index 9bc7cb5099f..1b6afd1b47c 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing.tests/pom.xml +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing.tests/pom.xml @@ -10,7 +10,7 @@ </parent> <groupId>org.eclipse.papyrus.tests</groupId> <artifactId>org.eclipse.papyrus.uml.diagram.timing.tests</artifactId> - <version>2.0.0-SNAPSHOT</version> + <version>2.0.100-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> <properties> diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing.tests/src/org/eclipse/papyrus/uml/diagram/timing/tests/canonical/AbstractTimingDiagramTestCase.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing.tests/src/org/eclipse/papyrus/uml/diagram/timing/tests/canonical/AbstractTimingDiagramTestCase.java index e4d3a665f7d..a59575c8b26 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing.tests/src/org/eclipse/papyrus/uml/diagram/timing/tests/canonical/AbstractTimingDiagramTestCase.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing.tests/src/org/eclipse/papyrus/uml/diagram/timing/tests/canonical/AbstractTimingDiagramTestCase.java @@ -77,7 +77,7 @@ public class AbstractTimingDiagramTestCase extends AbstractPapyrusTestCase { /** Creates the default Interaction (use this when only one Interaction will be used in a test) */ protected void createDefaultInteraction(final Point position, final Dimension size) { this.interactionEditPart = createInteraction(position, size); - this.interactionCompartment = (InteractionCompartmentEditPartTN)EditPartUtils.findFirstChildEditPartWithId(this.interactionEditPart, InteractionCompartmentEditPartTN.VISUAL_ID); + this.interactionCompartment = (InteractionCompartmentEditPartTN) EditPartUtils.findFirstChildEditPartWithId(this.interactionEditPart, InteractionCompartmentEditPartTN.VISUAL_ID); assertNotNull("The interaction compartment was not found", this.interactionCompartment); } @@ -92,9 +92,9 @@ public class AbstractTimingDiagramTestCase extends AbstractPapyrusTestCase { */ protected void createDefaultFullLifeline() { this.fullLifelineEditPart = createFullLifeline(getDefaultInteractionEditPart()); - this.stateDefinitionCompartment = (FullLifelineStateDefinitionCompartmentEditPartCN)EditPartUtils.findFirstChildEditPartWithId(this.fullLifelineEditPart, FullLifelineStateDefinitionCompartmentEditPartCN.VISUAL_ID); + this.stateDefinitionCompartment = (FullLifelineStateDefinitionCompartmentEditPartCN) EditPartUtils.findFirstChildEditPartWithId(this.fullLifelineEditPart, FullLifelineStateDefinitionCompartmentEditPartCN.VISUAL_ID); assertNotNull("The StateDefinition compartment must exist", this.stateDefinitionCompartment); - this.fullLifelineTimelineCompartment = (FullLifelineTimelineCompartmentEditPartCN)EditPartUtils.findFirstChildEditPartWithId(this.fullLifelineEditPart, FullLifelineTimelineCompartmentEditPartCN.VISUAL_ID); + this.fullLifelineTimelineCompartment = (FullLifelineTimelineCompartmentEditPartCN) EditPartUtils.findFirstChildEditPartWithId(this.fullLifelineEditPart, FullLifelineTimelineCompartmentEditPartCN.VISUAL_ID); assertNotNull("The timeline compartment must exist", this.fullLifelineTimelineCompartment); } @@ -104,7 +104,7 @@ public class AbstractTimingDiagramTestCase extends AbstractPapyrusTestCase { */ protected void createDefaultCompactLifeline() { this.compactLifelineEditPart = createCompactLifeline(getDefaultInteractionEditPart()); - this.compactLifelineTimelineCompartment = (CompactLifelineCompartmentEditPartCN)EditPartUtils.findFirstChildEditPartWithId(this.compactLifelineEditPart, CompactLifelineCompartmentEditPartCN.VISUAL_ID); + this.compactLifelineTimelineCompartment = (CompactLifelineCompartmentEditPartCN) EditPartUtils.findFirstChildEditPartWithId(this.compactLifelineEditPart, CompactLifelineCompartmentEditPartCN.VISUAL_ID); assertNotNull("The timeline compartment must exist", this.compactLifelineTimelineCompartment); } @@ -117,7 +117,7 @@ public class AbstractTimingDiagramTestCase extends AbstractPapyrusTestCase { /** * Creates a new StateDefinition in the default Lifeline using a Request. - * + * * @return the created StateDefinition's EditPart */ protected StateDefinitionEditPart createStateDefinitionInDefaultFullLifeline() { @@ -126,19 +126,19 @@ public class AbstractTimingDiagramTestCase extends AbstractPapyrusTestCase { /** * Creates a new StateDefinition in the given Lifeline using a Request. - * + * * @return the created StateDefinition's EditPart */ protected StateDefinitionEditPart createStateDefinition(final FullLifelineEditPartCN parentLifelineEditPart) { - final FullLifelineStateDefinitionCompartmentEditPartCN compartment = (FullLifelineStateDefinitionCompartmentEditPartCN)EditPartUtils.findFirstChildEditPartWithId(parentLifelineEditPart, FullLifelineStateDefinitionCompartmentEditPartCN.VISUAL_ID); + final FullLifelineStateDefinitionCompartmentEditPartCN compartment = (FullLifelineStateDefinitionCompartmentEditPartCN) EditPartUtils.findFirstChildEditPartWithId(parentLifelineEditPart, FullLifelineStateDefinitionCompartmentEditPartCN.VISUAL_ID); final View stateDefinitionView = createView(UMLElementTypes.Node_StateDefinitionShape, compartment); assertNotNull("The StateDefinition View should be created", stateDefinitionView); - return (StateDefinitionEditPart)findChildEditPartAssociatedToView(compartment, stateDefinitionView); + return (StateDefinitionEditPart) findChildEditPartAssociatedToView(compartment, stateDefinitionView); } /** * Create a new full Lifeline in the default Interaction using a Request. - * + * * @return the created full Lifeline's EditPart */ protected FullLifelineEditPartCN createFullLifelineInDefaultInteraction() { @@ -147,7 +147,7 @@ public class AbstractTimingDiagramTestCase extends AbstractPapyrusTestCase { /** * Create a new full Lifeline in the given Interaction using a Request. - * + * * @return the created full Lifeline's EditPart */ protected FullLifelineEditPartCN createFullLifeline(final InteractionEditPartTN parentInteractionEditPart) { @@ -155,12 +155,12 @@ public class AbstractTimingDiagramTestCase extends AbstractPapyrusTestCase { assertNotNull("The compartment must not be null", compartment); final View view = createView(UMLElementTypes.Lifeline_FullShape, compartment); assertNotNull("The FullLifeline View should be created", view); - return (FullLifelineEditPartCN)findChildEditPartAssociatedToView(compartment, view); + return (FullLifelineEditPartCN) findChildEditPartAssociatedToView(compartment, view); } /** * Create a new compact Lifeline in the default Interaction using a Request. - * + * * @return the created compact Lifeline's EditPart */ protected CompactLifelineEditPartCN createCompactLifelineInDefaultInteraction() { @@ -169,7 +169,7 @@ public class AbstractTimingDiagramTestCase extends AbstractPapyrusTestCase { /** * Create a new compact Lifeline in the given Interaction using a Request. - * + * * @return the created compact Lifeline's EditPart */ protected CompactLifelineEditPartCN createCompactLifeline(final InteractionEditPartTN parentInteractionEditPart) { @@ -177,30 +177,30 @@ public class AbstractTimingDiagramTestCase extends AbstractPapyrusTestCase { assertNotNull("The compartment must not be null", compartment); final View view = createView(UMLElementTypes.Lifeline_CompactShape, compartment); assertNotNull("The CompactLifeline View should be created", view); - return (CompactLifelineEditPartCN)findChildEditPartAssociatedToView(compartment, view); + return (CompactLifelineEditPartCN) findChildEditPartAssociatedToView(compartment, view); } /** * Create a new Interaction in the default diagram using a Request. - * + * * @param location - * the position for the new Interaction + * the position for the new Interaction * @param dimension - * the size of the new Interaction + * the size of the new Interaction * @return the created Interaction's EditPart */ protected InteractionEditPartTN createInteraction(final Point location, final Dimension dimension) { createView(UMLElementTypes.Interaction_Shape, location, dimension, getDiagramEditPart()); - final InteractionEditPartTN interactionEditPart = (InteractionEditPartTN)EditPartUtils.findFirstChildEditPartWithId(getDiagramEditPart(), InteractionEditPartTN.VISUAL_ID); + final InteractionEditPartTN interactionEditPart = (InteractionEditPartTN) EditPartUtils.findFirstChildEditPartWithId(getDiagramEditPart(), InteractionEditPartTN.VISUAL_ID); assertNotNull("The interaction EditPart was not found under the diagram EditPart", interactionEditPart); - final InteractionCompartmentEditPartTN interactionCompartment = (InteractionCompartmentEditPartTN)EditPartUtils.findFirstChildEditPartWithId(interactionEditPart, InteractionCompartmentEditPartTN.VISUAL_ID); + final InteractionCompartmentEditPartTN interactionCompartment = (InteractionCompartmentEditPartTN) EditPartUtils.findFirstChildEditPartWithId(interactionEditPart, InteractionCompartmentEditPartTN.VISUAL_ID); assertNotNull("The interaction compartment was not found", interactionCompartment); return interactionEditPart; } /** * Create a new Interaction with a default size in the default diagram using a Request. - * + * * @return the created Interaction's EditPart */ protected InteractionEditPartTN createInteraction() { @@ -215,7 +215,7 @@ public class AbstractTimingDiagramTestCase extends AbstractPapyrusTestCase { * <li>click at 1/2 on the just created second StateInvariant (that takes 1/2 of the width) * <li>this results in three regularly spaced occurrence specifications * <ul> - * + * */ protected void createThreeOccurrenceSpecificationsInDefaultFullLifeline() { createOccurrenceSpecificationInLastFullStateInvariantWithRatio(1, 1.0 / 4.0); @@ -231,7 +231,7 @@ public class AbstractTimingDiagramTestCase extends AbstractPapyrusTestCase { * <li>click at 1/2 on the just created second StateInvariant (that takes 1/2 of the width) * <li>this results in three regularly spaced occurrence specifications * <ul> - * + * */ protected void createThreeOccurrenceSpecificationsInDefaultCompactLifeline() { createOccurrenceSpecificationInLastCompactStateInvariantWithRatio(1, 1.0 / 4.0); @@ -241,11 +241,11 @@ public class AbstractTimingDiagramTestCase extends AbstractPapyrusTestCase { /** * Create an OccurrenceSpecification on the last StateInvariant in the timeline of the default Lifeline - * + * * @param expectedNumberOfStateInvariants - * the number of state invariants that is expected (for checking) + * the number of state invariants that is expected (for checking) * @param xPos - * the position starting from the left of the StateInvariant + * the position starting from the left of the StateInvariant */ protected void createOccurrenceSpecificationInLastFullStateInvariantAtAbsolutePos(final int expectedNumberOfStateInvariants, final int xPos) { // we need to wait for GMF to do its layout in order to have correct coordinates @@ -259,11 +259,11 @@ public class AbstractTimingDiagramTestCase extends AbstractPapyrusTestCase { /** * Create an OccurrenceSpecification on the last StateInvariant in the timeline of the default Lifeline - * + * * @param expectedNumberOfStateInvariants - * the number of state invariants that is expected (for checking) + * the number of state invariants that is expected (for checking) * @param xPos - * the position starting from the left of the StateInvariant + * the position starting from the left of the StateInvariant */ protected void createOccurrenceSpecificationInLastCompactStateInvariantAtAbsolutePos(final int expectedNumberOfStateInvariants, final int xPos) { // we need to wait for GMF to do its layout in order to have correct coordinates @@ -276,11 +276,11 @@ public class AbstractTimingDiagramTestCase extends AbstractPapyrusTestCase { /** * Create an OccurrenceSpecification on the last StateInvariant in the timeline of the default full Lifeline - * + * * @param expectedNumberOfStateInvariants - * the number of state invariants that is expected (for checking) + * the number of state invariants that is expected (for checking) * @param ratio - * where to click in the StateInvariant (0.0 = beginning; 1.0 = end) + * where to click in the StateInvariant (0.0 = beginning; 1.0 = end) */ protected void createOccurrenceSpecificationInLastFullStateInvariantWithRatio(final int expectedNumberOfStateInvariants, final double ratio) { assertTrue("invalid ratio", ratio >= 0.0 && ratio <= 1.0); @@ -288,16 +288,16 @@ public class AbstractTimingDiagramTestCase extends AbstractPapyrusTestCase { flushEventLoop(); final FullStateInvariantEditPartCN lastStateInvariant = getAndAssertLastFullStateInvariant(expectedNumberOfStateInvariants); final Rectangle bounds = getAbsoluteBounds(lastStateInvariant); - sendOpenSelectionRequest(lastStateInvariant, new Point(bounds.x + (int)(bounds.width * ratio), bounds.y)); + sendOpenSelectionRequest(lastStateInvariant, new Point(bounds.x + (int) (bounds.width * ratio), bounds.y)); } /** * Create an OccurrenceSpecification on the last StateInvariant in the timeline of the default compact Lifeline - * + * * @param expectedNumberOfStateInvariants - * the number of state invariants that is expected (for checking) + * the number of state invariants that is expected (for checking) * @param ratio - * where to click in the StateInvariant (0.0 = beginning; 1.0 = end) + * where to click in the StateInvariant (0.0 = beginning; 1.0 = end) */ protected void createOccurrenceSpecificationInLastCompactStateInvariantWithRatio(final int expectedNumberOfStateInvariants, final double ratio) { assertTrue("invalid ratio", ratio >= 0.0 && ratio <= 1.0); @@ -305,7 +305,7 @@ public class AbstractTimingDiagramTestCase extends AbstractPapyrusTestCase { flushEventLoop(); final CompactStateInvariantEditPartCN lastStateInvariant = getAndAssertLastCompactStateInvariant(expectedNumberOfStateInvariants); final Rectangle bounds = getAbsoluteBounds(lastStateInvariant); - sendOpenSelectionRequest(lastStateInvariant, new Point(bounds.x + (int)(bounds.width * ratio), bounds.y)); + sendOpenSelectionRequest(lastStateInvariant, new Point(bounds.x + (int) (bounds.width * ratio), bounds.y)); } private FullStateInvariantEditPartCN getAndAssertLastFullStateInvariant(final int expectedNumberOfStateInvariants) { @@ -325,38 +325,38 @@ public class AbstractTimingDiagramTestCase extends AbstractPapyrusTestCase { /** @return all OccurrenceSpecification EditParts found in the default Lifeline */ @SuppressWarnings("unchecked") protected List<OccurrenceSpecificationEditPartCN> findOccurrenceSpecificationsInDefaultFullLifeline() { - return (List<OccurrenceSpecificationEditPartCN>)EditPartUtils.findChildEditPartsWithId(getDefaultFullLifelineEditPart(), OccurrenceSpecificationEditPartCN.VISUAL_ID); + return (List<OccurrenceSpecificationEditPartCN>) EditPartUtils.findChildEditPartsWithId(getDefaultFullLifelineEditPart(), OccurrenceSpecificationEditPartCN.VISUAL_ID); } /** @return all OccurrenceSpecification EditParts found in the default Lifeline */ @SuppressWarnings("unchecked") protected List<OccurrenceSpecificationEditPartCN> findOccurrenceSpecificationsInDefaultCompactLifeline() { - return (List<OccurrenceSpecificationEditPartCN>)EditPartUtils.findChildEditPartsWithId(getDefaultCompactLifelineEditPart(), OccurrenceSpecificationEditPartCN.VISUAL_ID); + return (List<OccurrenceSpecificationEditPartCN>) EditPartUtils.findChildEditPartsWithId(getDefaultCompactLifelineEditPart(), OccurrenceSpecificationEditPartCN.VISUAL_ID); } /** @return all StateInvariant EditParts found in the default Lifeline */ @SuppressWarnings("unchecked") protected List<FullStateInvariantEditPartCN> findStateInvariantsInDefaultFullLifeline() { - return (List<FullStateInvariantEditPartCN>)EditPartUtils.findChildEditPartsWithId(getDefaultFullLifelineEditPart(), FullStateInvariantEditPartCN.VISUAL_ID); + return (List<FullStateInvariantEditPartCN>) EditPartUtils.findChildEditPartsWithId(getDefaultFullLifelineEditPart(), FullStateInvariantEditPartCN.VISUAL_ID); } /** @return all StateInvariant EditParts found in the default Lifeline */ @SuppressWarnings("unchecked") protected List<CompactStateInvariantEditPartCN> findStateInvariantsInDefaultCompactLifeline() { - return (List<CompactStateInvariantEditPartCN>)EditPartUtils.findChildEditPartsWithId(getDefaultCompactLifelineEditPart(), CompactStateInvariantEditPartCN.VISUAL_ID); + return (List<CompactStateInvariantEditPartCN>) EditPartUtils.findChildEditPartsWithId(getDefaultCompactLifelineEditPart(), CompactStateInvariantEditPartCN.VISUAL_ID); } /** @return all StateDefinition EditParts found in the default Lifeline */ @SuppressWarnings("unchecked") protected List<StateDefinitionEditPart> findStateDefinitions() { - return (List<StateDefinitionEditPart>)EditPartUtils.findChildEditPartsWithId(getDefaultFullLifelineEditPart(), StateDefinitionEditPart.VISUAL_ID); + return (List<StateDefinitionEditPart>) EditPartUtils.findChildEditPartsWithId(getDefaultFullLifelineEditPart(), StateDefinitionEditPart.VISUAL_ID); } /** * Check that the fragments in the default interaction are ordered following the given pattern. - * + * * @param pattern - * the pattern, where "o" means OccurrenceSpecification, and "-" means StateInvariant + * the pattern, where "o" means OccurrenceSpecification, and "-" means StateInvariant */ protected void checkInteractionFragmentsWithPattern(final String expectedPattern) { final String fragmentsStringPattern = computeInteractionFragmentsStringPattern(); @@ -365,16 +365,16 @@ public class AbstractTimingDiagramTestCase extends AbstractPapyrusTestCase { protected String computeInteractionFragmentsStringPattern() { final StringBuilder pattern = new StringBuilder(); - final Interaction interaction = (Interaction)((View)getDefaultInteractionEditPart().getModel()).getElement(); + final Interaction interaction = (Interaction) ((View) getDefaultInteractionEditPart().getModel()).getElement(); final EList<InteractionFragment> fragments = interaction.getFragments(); - for(final InteractionFragment fragment : fragments) { - if(fragment instanceof StateInvariant) { + for (final InteractionFragment fragment : fragments) { + if (fragment instanceof StateInvariant) { pattern.append("-"); - } else if(fragment instanceof DestructionOccurrenceSpecification) { + } else if (fragment instanceof DestructionOccurrenceSpecification) { pattern.append("x"); - } else if(fragment instanceof MessageOccurrenceSpecification) { + } else if (fragment instanceof MessageOccurrenceSpecification) { pattern.append("m"); - } else if(fragment instanceof OccurrenceSpecification) { + } else if (fragment instanceof OccurrenceSpecification) { pattern.append("o"); } } @@ -412,11 +412,11 @@ public class AbstractTimingDiagramTestCase extends AbstractPapyrusTestCase { /** * Click in the middle of the given compact StateInvariant with the OccurrenceSpecification tool in order to create * an OccurrenceSpecification over it. - * + * * @param compactStateInvariant - * the StateInvariant on which to create an OccurrenceSpecification + * the StateInvariant on which to create an OccurrenceSpecification * @param bottom - * whether to click at the bottom of the StateInvariant, instead of at the top + * whether to click at the bottom of the StateInvariant, instead of at the top */ protected void createOccurrenceSpecificationOverCompactStateInvariant(final CompactStateInvariantEditPartCN compactStateInvariant, final boolean bottom) { final Rectangle bounds = getBounds(compactStateInvariant); @@ -435,13 +435,13 @@ public class AbstractTimingDiagramTestCase extends AbstractPapyrusTestCase { final StringBuilder pattern = new StringBuilder(); final FullLifelineTimelineCompartmentEditPartCN timelineCompartment = getDefaultFullLifelineTimelineCompartment(); @SuppressWarnings("unchecked") - final List<EditPart> children = timelineCompartment.getChildren(); - for(final EditPart editPart : children) { - if(editPart instanceof FullStateInvariantEditPartCN) { - outputFullStateInvariantPattern((FullStateInvariantEditPartCN)editPart, pattern); - } else if(editPart instanceof OccurrenceSpecificationEditPartCN) { - outputFullOccurrenceSpecificationPattern((OccurrenceSpecificationEditPartCN)editPart, pattern); - } else if(editPart instanceof FullStateInvariantVerticalLineEditPart) { + final List<? extends EditPart> children = timelineCompartment.getChildren(); + for (final EditPart editPart : children) { + if (editPart instanceof FullStateInvariantEditPartCN) { + outputFullStateInvariantPattern((FullStateInvariantEditPartCN) editPart, pattern); + } else if (editPart instanceof OccurrenceSpecificationEditPartCN) { + outputFullOccurrenceSpecificationPattern((OccurrenceSpecificationEditPartCN) editPart, pattern); + } else if (editPart instanceof FullStateInvariantVerticalLineEditPart) { pattern.append("VerticalLine;"); } else { fail("unexpected element"); @@ -451,25 +451,25 @@ public class AbstractTimingDiagramTestCase extends AbstractPapyrusTestCase { } private static void outputFullStateInvariantPattern(final FullStateInvariantEditPartCN editPart, final StringBuilder pattern) { - final View view = (View)editPart.getModel(); + final View view = (View) editPart.getModel(); assertNotNull("The EditPart must have a View", view); - final StateInvariant stateInvariant = (StateInvariant)view.getElement(); + final StateInvariant stateInvariant = (StateInvariant) view.getElement(); assertNotNull("The View must have a semantic element", view); final Constraint constraint = stateInvariant.getInvariant(); assertNotNull("The StateInvariant must have a Constraint", constraint); final ValueSpecification specification = constraint.getSpecification(); assertNotNull("The Constraint must have a ValueSpecification", specification); assertTrue("The ValueSpecification must be an OpaqueExpression", specification instanceof OpaqueExpression); - final OpaqueExpression opaqueExpression = (OpaqueExpression)specification; + final OpaqueExpression opaqueExpression = (OpaqueExpression) specification; assertNotNull("The OpaqueExpression must not have a null list of bodies", opaqueExpression.getBodies()); assertEquals("The OpaqueExpression must have one Body", 1, opaqueExpression.getBodies().size()); pattern.append("StateInvariant(").append(opaqueExpression.getBodies().get(0)).append(");"); } private static void outputFullOccurrenceSpecificationPattern(final OccurrenceSpecificationEditPartCN editPart, final StringBuilder pattern) { - final View view = (View)editPart.getModel(); + final View view = (View) editPart.getModel(); assertNotNull("The EditPart must have a View", view); - final OccurrenceSpecification occurrenceSpecification = (OccurrenceSpecification)view.getElement(); + final OccurrenceSpecification occurrenceSpecification = (OccurrenceSpecification) view.getElement(); assertNotNull("The View must have a semantic element", occurrenceSpecification); final String name = occurrenceSpecification.getName(); pattern.append("OccurrenceSpecification(").append(name).append(");"); @@ -485,12 +485,12 @@ public class AbstractTimingDiagramTestCase extends AbstractPapyrusTestCase { final StringBuilder pattern = new StringBuilder(); final CompactLifelineCompartmentEditPartCN timelineCompartment = getDefaultCompactLifelineTimelineCompartment(); @SuppressWarnings("unchecked") - final List<EditPart> children = timelineCompartment.getChildren(); - for(final EditPart editPart : children) { - if(editPart instanceof CompactStateInvariantEditPartCN) { - outputCompactStateInvariantPattern((CompactStateInvariantEditPartCN)editPart, pattern); - } else if(editPart instanceof OccurrenceSpecificationEditPartCN) { - outputCompactOccurrenceSpecificationPattern((OccurrenceSpecificationEditPartCN)editPart, pattern); + final List<? extends EditPart> children = timelineCompartment.getChildren(); + for (final EditPart editPart : children) { + if (editPart instanceof CompactStateInvariantEditPartCN) { + outputCompactStateInvariantPattern((CompactStateInvariantEditPartCN) editPart, pattern); + } else if (editPart instanceof OccurrenceSpecificationEditPartCN) { + outputCompactOccurrenceSpecificationPattern((OccurrenceSpecificationEditPartCN) editPart, pattern); } else { fail("unexpected element"); } @@ -499,18 +499,18 @@ public class AbstractTimingDiagramTestCase extends AbstractPapyrusTestCase { } private static void outputCompactStateInvariantPattern(final CompactStateInvariantEditPartCN editPart, final StringBuilder pattern) { - final View view = (View)editPart.getModel(); + final View view = (View) editPart.getModel(); assertNotNull("The EditPart must have a View", view); - final StateInvariant stateInvariant = (StateInvariant)view.getElement(); + final StateInvariant stateInvariant = (StateInvariant) view.getElement(); assertNotNull("The View must have a semantic element", view); final Constraint constraint = stateInvariant.getInvariant(); assertNotNull("The StateInvariant must have a Constraint", constraint); final ValueSpecification specification = constraint.getSpecification(); assertNotNull("The Constraint must have a ValueSpecification", specification); assertTrue("The ValueSpecification must be an OpaqueExpression", specification instanceof OpaqueExpression); - final OpaqueExpression opaqueExpression = (OpaqueExpression)specification; + final OpaqueExpression opaqueExpression = (OpaqueExpression) specification; assertNotNull("The OpaqueExpression must not have a null list of bodies", opaqueExpression.getBodies()); - if(opaqueExpression.getBodies().isEmpty()) { + if (opaqueExpression.getBodies().isEmpty()) { pattern.append("StateInvariant(unnamed);"); } else { pattern.append("StateInvariant(").append(opaqueExpression.getBodies().get(0)).append(");"); @@ -518,9 +518,9 @@ public class AbstractTimingDiagramTestCase extends AbstractPapyrusTestCase { } private static void outputCompactOccurrenceSpecificationPattern(final OccurrenceSpecificationEditPartCN editPart, final StringBuilder pattern) { - final View view = (View)editPart.getModel(); + final View view = (View) editPart.getModel(); assertNotNull("The EditPart must have a View", view); - final OccurrenceSpecification occurrenceSpecification = (OccurrenceSpecification)view.getElement(); + final OccurrenceSpecification occurrenceSpecification = (OccurrenceSpecification) view.getElement(); assertNotNull("The View must have a semantic element", occurrenceSpecification); final String name = occurrenceSpecification.getName(); pattern.append("OccurrenceSpecification(").append(name).append(");"); @@ -535,18 +535,17 @@ public class AbstractTimingDiagramTestCase extends AbstractPapyrusTestCase { flushEventLoop(); final StringBuilder pattern = new StringBuilder(); final FullLifelineTimelineCompartmentEditPartCN timelineCompartment = getDefaultFullLifelineTimelineCompartment(); - @SuppressWarnings("unchecked") - final List<EditPart> children = timelineCompartment.getChildren(); - for(final EditPart editPart : children) { - if(editPart instanceof FullStateInvariantEditPartCN) { + final List<? extends EditPart> children = timelineCompartment.getChildren(); + for (final EditPart editPart : children) { + if (editPart instanceof FullStateInvariantEditPartCN) { pattern.append("-"); - } else if(editPart instanceof OccurrenceSpecificationEditPartCN) { + } else if (editPart instanceof OccurrenceSpecificationEditPartCN) { pattern.append("o"); - } else if(editPart instanceof MessageOccurrenceSpecificationEditPartCN) { + } else if (editPart instanceof MessageOccurrenceSpecificationEditPartCN) { pattern.append("m"); - } else if(editPart instanceof DestructionOccurrenceSpecificationEditPartCN) { + } else if (editPart instanceof DestructionOccurrenceSpecificationEditPartCN) { pattern.append("x"); - } else if(editPart instanceof FullStateInvariantVerticalLineEditPart) { + } else if (editPart instanceof FullStateInvariantVerticalLineEditPart) { pattern.append("|"); } else { fail("unexpected element"); @@ -557,13 +556,13 @@ public class AbstractTimingDiagramTestCase extends AbstractPapyrusTestCase { /** * Check that the timeline contains the expected elements in the expected order. - * + * * @param expectedPattern - * a pattern where - * <ul> - * <li>"o" represents an OccurrenceSpecification - * <li>"-" represents a StateInvariant - * </ul> + * a pattern where + * <ul> + * <li>"o" represents an OccurrenceSpecification + * <li>"-" represents a StateInvariant + * </ul> */ protected void checkSimpleCompactTimelinePattern(final String expectedPattern) { final String timelineStringPattern = computeSimpleCompactTimelineStringPattern(); @@ -575,15 +574,15 @@ public class AbstractTimingDiagramTestCase extends AbstractPapyrusTestCase { final StringBuilder pattern = new StringBuilder(); final CompactLifelineCompartmentEditPartCN timelineCompartment = getDefaultCompactLifelineTimelineCompartment(); @SuppressWarnings("unchecked") - final List<EditPart> children = timelineCompartment.getChildren(); - for(final EditPart editPart : children) { - if(editPart instanceof CompactStateInvariantEditPartCN) { + final List<? extends EditPart> children = timelineCompartment.getChildren(); + for (final EditPart editPart : children) { + if (editPart instanceof CompactStateInvariantEditPartCN) { pattern.append("-"); - } else if(editPart instanceof OccurrenceSpecificationEditPartCN) { + } else if (editPart instanceof OccurrenceSpecificationEditPartCN) { pattern.append("o"); - } else if(editPart instanceof MessageOccurrenceSpecificationEditPartCN) { + } else if (editPart instanceof MessageOccurrenceSpecificationEditPartCN) { pattern.append("m"); - } else if(editPart instanceof DestructionOccurrenceSpecificationEditPartCN) { + } else if (editPart instanceof DestructionOccurrenceSpecificationEditPartCN) { pattern.append("x"); } else { fail("unexpected element"); @@ -595,22 +594,22 @@ public class AbstractTimingDiagramTestCase extends AbstractPapyrusTestCase { /** * Test that the modifications can all be undone and redone, and that the dirty state is consistent throughout the * undo/redo operations. - * + * * @param nElementsToUndo - * the number of elements that should be undoable before reaching the non-dirty state + * the number of elements that should be undoable before reaching the non-dirty state */ protected void testDirtyStateForFullUndoRedo(final int nElementsToUndo) { assertTrue("The editor should be dirty after all the modifications", this.diagramEditor.isDirty()); - for(int i = 0; i < nElementsToUndo; i++) { + for (int i = 0; i < nElementsToUndo; i++) { undoOnUIThread(); // editor should be dirty for all states except the initial state - if(i == nElementsToUndo - 1) { + if (i == nElementsToUndo - 1) { assertFalse("The editor should not be dirty after we undid all previous modifications", this.diagramEditor.isDirty()); } else { assertTrue("The editor should be dirty until we undo all previous modifications", this.diagramEditor.isDirty()); } } - for(int i = 0; i < nElementsToUndo; i++) { + for (int i = 0; i < nElementsToUndo; i++) { redoOnUIThread(); assertTrue("The editor should be dirty after we redo", this.diagramEditor.isDirty()); } diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing.tests/src/org/eclipse/papyrus/uml/diagram/timing/tests/generic/AbstractPapyrusTestCase.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing.tests/src/org/eclipse/papyrus/uml/diagram/timing/tests/generic/AbstractPapyrusTestCase.java index ad894843785..d4594c8dc0b 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing.tests/src/org/eclipse/papyrus/uml/diagram/timing/tests/generic/AbstractPapyrusTestCase.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing.tests/src/org/eclipse/papyrus/uml/diagram/timing/tests/generic/AbstractPapyrusTestCase.java @@ -331,13 +331,13 @@ public abstract class AbstractPapyrusTestCase extends AbstractPapyrusTest { } protected static View getCreatedViewFromCommand(final Command command) { - final List<CreateCommand> createCommands = new ArrayList<CreateCommand>(); + final List<CreateCommand> createCommands = new ArrayList<>(); findNestedCreateCommands(command, createCommands); assertEquals("There should be one CreateCommand inside the command", 1, createCommands.size()); final Object returnValue = createCommands.get(0).getCommandResult().getReturnValue(); if (returnValue instanceof IAdaptable) { final IAdaptable adaptableResult = (IAdaptable) returnValue; - final View view = (View) adaptableResult.getAdapter(View.class); + final View view = adaptableResult.getAdapter(View.class); if (view != null) { return view; } @@ -349,8 +349,7 @@ public abstract class AbstractPapyrusTestCase extends AbstractPapyrusTest { private static void findNestedCreateCommands(final Command gefCommand, final List<CreateCommand> createCommands) { if (gefCommand instanceof CompoundCommand) { final CompoundCommand compoundCommand = (CompoundCommand) gefCommand; - @SuppressWarnings("unchecked") - final List<Command> commands = compoundCommand.getCommands(); + final List<? extends Command> commands = compoundCommand.getCommands(); for (final Command childCommand : commands) { findNestedCreateCommands(childCommand, createCommands); } @@ -460,7 +459,7 @@ public abstract class AbstractPapyrusTestCase extends AbstractPapyrusTest { public void testDrop(final GraphicalEditPart targetEditPart, final GraphicalEditPart parentEditPart, final EObject droppedElement) { final int sizeBefore = parentEditPart.getChildren().size(); final DropObjectsRequest dropObjectsRequest = new DropObjectsRequest(); - final ArrayList<EObject> list = new ArrayList<EObject>(); + final ArrayList<EObject> list = new ArrayList<>(); list.add(droppedElement); dropObjectsRequest.setObjects(list); dropObjectsRequest.setLocation(new Point(1, 1)); @@ -1091,8 +1090,7 @@ public abstract class AbstractPapyrusTestCase extends AbstractPapyrusTest { */ protected static EditPart findChildEditPartAssociatedToView(final EditPart parentEditPart, final View view) { EditPart result = null; - @SuppressWarnings("unchecked") - final List<EditPart> children = parentEditPart.getChildren(); + final List<? extends EditPart> children = parentEditPart.getChildren(); for (final EditPart editPart : children) { if (view == editPart.getModel()) { result = editPart; diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase.tests/.classpath b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase.tests/.classpath index 33c0ec8973d..95534aae255 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase.tests/.classpath +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase.tests/.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="org/eclipse/papyrus/uml/diagram/usecase/**"/> diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase.tests/.settings/org.eclipse.jdt.core.prefs b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase.tests/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase.tests/.settings/org.eclipse.jdt.core.prefs +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase.tests/.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/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase.tests/META-INF/MANIFEST.MF index fc4835c90cc..8163cac76af 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase.tests/META-INF/MANIFEST.MF @@ -27,5 +27,5 @@ Bundle-Localization: plugin Bundle-ManifestVersion: 2 Bundle-Activator: org.eclipse.papyrus.uml.diagram.usecase.tests.Activator Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.usecase.tests;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.uml.diagram.usecase.tests diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards.tests/.classpath b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards.tests/.classpath index 9cb19c81c76..c0255c320e6 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards.tests/.classpath +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards.tests/.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="test"/> <classpathentry kind="output" path="bin"/> diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards.tests/.settings/org.eclipse.jdt.core.prefs b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards.tests/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards.tests/.settings/org.eclipse.jdt.core.prefs +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards.tests/.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/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards.tests/META-INF/MANIFEST.MF index d6e1ee7e5c6..9812a0094b2 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards.tests/META-INF/MANIFEST.MF @@ -16,7 +16,8 @@ Bundle-Name: %pluginName Bundle-Localization: plugin Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.wizards.tests;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="[32.0.0, 33.0.0)", + com.google.common.collect;version="[32.0.0, 33.0.0)" Automatic-Module-Name: org.eclipse.papyrus.uml.diagram.wizards.tests +Bundle-ActivationPolicy: lazy diff --git a/tests/junit/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.tests/.classpath b/tests/junit/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.tests/.classpath index e801ebfb468..81fe078c20c 100755 --- a/tests/junit/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.tests/.classpath +++ b/tests/junit/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.tests/.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/tests/junit/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.tests/.settings/org.eclipse.jdt.core.prefs b/tests/junit/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.tests/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/tests/junit/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.tests/.settings/org.eclipse.jdt.core.prefs +++ b/tests/junit/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.tests/.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/tests/junit/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.tests/META-INF/MANIFEST.MF index 12e9f3cf57c..ef7d4a62c68 100755 --- a/tests/junit/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.tests/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.papyrus.uml.expressions.tests Bundle-Version: 2.0.0.qualifier Bundle-Vendor: %Bundle-Vendor -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Require-Bundle: org.eclipse.emf.databinding;bundle-version="[1.5.0,2.0.0)", org.eclipse.gmf.runtime.diagram.ui.properties;bundle-version="[1.8.0,2.0.0)", org.eclipse.m2m.qvt.oml;bundle-version="[3.10.0,4.0.0)", diff --git a/tests/junit/plugins/uml/internationalization/org.eclipse.papyrus.uml.internationalization.controlmode.tests/.classpath b/tests/junit/plugins/uml/internationalization/org.eclipse.papyrus.uml.internationalization.controlmode.tests/.classpath index bc8930b98f9..bb5a8a4c914 100644 --- a/tests/junit/plugins/uml/internationalization/org.eclipse.papyrus.uml.internationalization.controlmode.tests/.classpath +++ b/tests/junit/plugins/uml/internationalization/org.eclipse.papyrus.uml.internationalization.controlmode.tests/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry exported="true" kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/> + <classpathentry exported="true" 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/tests/junit/plugins/uml/internationalization/org.eclipse.papyrus.uml.internationalization.controlmode.tests/.settings/org.eclipse.jdt.core.prefs b/tests/junit/plugins/uml/internationalization/org.eclipse.papyrus.uml.internationalization.controlmode.tests/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/tests/junit/plugins/uml/internationalization/org.eclipse.papyrus.uml.internationalization.controlmode.tests/.settings/org.eclipse.jdt.core.prefs +++ b/tests/junit/plugins/uml/internationalization/org.eclipse.papyrus.uml.internationalization.controlmode.tests/.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/tests/junit/plugins/uml/internationalization/org.eclipse.papyrus.uml.internationalization.controlmode.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/internationalization/org.eclipse.papyrus.uml.internationalization.controlmode.tests/META-INF/MANIFEST.MF index 62e3febc3c9..4e650c1b19d 100644 --- a/tests/junit/plugins/uml/internationalization/org.eclipse.papyrus.uml.internationalization.controlmode.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/uml/internationalization/org.eclipse.papyrus.uml.internationalization.controlmode.tests/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.uml.internationalization.controlmode.tests, org.eclipse.papyrus.uml.internationalization.controlmode.tests.tests Require-Bundle: org.eclipse.emf.databinding;bundle-version="[1.5.0,2.0.0)", @@ -28,5 +28,5 @@ Require-Bundle: org.eclipse.emf.databinding;bundle-version="[1.5.0,2.0.0)", org.junit;bundle-version="[4.13.0,5.0.0)" Bundle-ActivationPolicy: lazy Bundle-Activator: org.eclipse.papyrus.uml.internationalization.controlmode.tests.Activator -Import-Package: com.google.common.collect;version="[30.1.0, 31.0.0)" +Import-Package: com.google.common.collect;version="[32.0.0, 33.0.0)" Automatic-Module-Name: org.eclipse.papyrus.uml.internationalization.controlmode.tests diff --git a/tests/junit/plugins/uml/internationalization/org.eclipse.papyrus.uml.internationalization.tests/.classpath b/tests/junit/plugins/uml/internationalization/org.eclipse.papyrus.uml.internationalization.tests/.classpath index bc8930b98f9..bb5a8a4c914 100644 --- a/tests/junit/plugins/uml/internationalization/org.eclipse.papyrus.uml.internationalization.tests/.classpath +++ b/tests/junit/plugins/uml/internationalization/org.eclipse.papyrus.uml.internationalization.tests/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry exported="true" kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/> + <classpathentry exported="true" 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/tests/junit/plugins/uml/internationalization/org.eclipse.papyrus.uml.internationalization.tests/.settings/org.eclipse.jdt.core.prefs b/tests/junit/plugins/uml/internationalization/org.eclipse.papyrus.uml.internationalization.tests/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/tests/junit/plugins/uml/internationalization/org.eclipse.papyrus.uml.internationalization.tests/.settings/org.eclipse.jdt.core.prefs +++ b/tests/junit/plugins/uml/internationalization/org.eclipse.papyrus.uml.internationalization.tests/.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/tests/junit/plugins/uml/internationalization/org.eclipse.papyrus.uml.internationalization.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/internationalization/org.eclipse.papyrus.uml.internationalization.tests/META-INF/MANIFEST.MF index fc183ebbe58..42ed0791515 100644 --- a/tests/junit/plugins/uml/internationalization/org.eclipse.papyrus.uml.internationalization.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/uml/internationalization/org.eclipse.papyrus.uml.internationalization.tests/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.uml.internationalization.tests, org.eclipse.papyrus.uml.internationalization.tests.tests Require-Bundle: org.eclipse.emf.databinding;bundle-version="[1.5.0,2.0.0)", diff --git a/tests/junit/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer.tests/.classpath b/tests/junit/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer.tests/.classpath index e801ebfb468..81fe078c20c 100644 --- a/tests/junit/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer.tests/.classpath +++ b/tests/junit/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer.tests/.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/tests/junit/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer.tests/.settings/org.eclipse.jdt.core.prefs b/tests/junit/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer.tests/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/tests/junit/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer.tests/.settings/org.eclipse.jdt.core.prefs +++ b/tests/junit/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer.tests/.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/tests/junit/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer.tests/META-INF/MANIFEST.MF index 6bd959a0a9c..165a2b4998e 100644 --- a/tests/junit/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer.tests/META-INF/MANIFEST.MF @@ -34,5 +34,5 @@ Bundle-ManifestVersion: 2 Bundle-Activator: org.eclipse.papyrus.uml.modelexplorer.tests.Activator Bundle-Description: %pluginDescription Bundle-SymbolicName: org.eclipse.papyrus.uml.modelexplorer.tests;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.uml.modelexplorer.tests diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/.classpath b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/.classpath index e801ebfb468..81fe078c20c 100644 --- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/.classpath +++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/.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/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/.settings/org.eclipse.jdt.core.prefs b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/.settings/org.eclipse.jdt.core.prefs +++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/.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/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/META-INF/MANIFEST.MF index 3550a27dbe5..712d358b2fc 100644 --- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/META-INF/MANIFEST.MF @@ -42,5 +42,5 @@ Bundle-Activator: org.eclipse.papyrus.uml.nattable.clazz.config.tests.Activator Bundle-ManifestVersion: 2 Bundle-Description: %Bundle-Description Bundle-SymbolicName: org.eclipse.papyrus.uml.nattable.clazz.config.tests;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.uml.nattable.clazz.config.tests diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/.classpath b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/.classpath index e801ebfb468..81fe078c20c 100755 --- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/.classpath +++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/.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/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/.settings/org.eclipse.jdt.core.prefs b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/.settings/org.eclipse.jdt.core.prefs +++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/.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/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/META-INF/MANIFEST.MF index 9375e579726..a42b2e6bbd1 100755 --- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/META-INF/MANIFEST.MF @@ -34,5 +34,5 @@ Bundle-ManifestVersion: 2 Bundle-Activator: org.eclipse.papyrus.uml.nattable.generic.tests.Activator Bundle-Description: %Bundle-Description Bundle-SymbolicName: org.eclipse.papyrus.uml.nattable.generic.tests;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.uml.nattable.generic.tests diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.matrix.tests/.classpath b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.matrix.tests/.classpath index e801ebfb468..81fe078c20c 100755 --- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.matrix.tests/.classpath +++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.matrix.tests/.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/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.matrix.tests/.settings/org.eclipse.jdt.core.prefs b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.matrix.tests/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.matrix.tests/.settings/org.eclipse.jdt.core.prefs +++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.matrix.tests/.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/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.matrix.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.matrix.tests/META-INF/MANIFEST.MF index a285b42a308..f870f6dd5f2 100755 --- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.matrix.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.matrix.tests/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.papyrus.uml.nattable.matrix.tests Bundle-Version: 2.0.0.qualifier Bundle-Vendor: %Bundle-Vendor -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Require-Bundle: ca.odell.glazedlists, org.eclipse.emf.databinding;bundle-version="[1.5.0,2.0.0)", org.eclipse.gmf.runtime.diagram.ui.properties;bundle-version="[1.8.0,2.0.0)", diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotype.display.tests/.classpath b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotype.display.tests/.classpath index c8590e5cef6..1ed94f75bf9 100644 --- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotype.display.tests/.classpath +++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotype.display.tests/.classpath @@ -2,6 +2,6 @@ <classpath> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <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="output" path="bin"/> </classpath> diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotype.display.tests/.settings/org.eclipse.jdt.core.prefs b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotype.display.tests/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotype.display.tests/.settings/org.eclipse.jdt.core.prefs +++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotype.display.tests/.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/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotype.display.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotype.display.tests/META-INF/MANIFEST.MF index 04bbcd9d2e5..ab1c35c98ea 100644 --- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotype.display.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotype.display.tests/META-INF/MANIFEST.MF @@ -27,5 +27,5 @@ Bundle-ManifestVersion: 2 Bundle-Activator: org.eclipse.papyrus.uml.nattable.stereotype.display.tests.Activator Bundle-Description: %Bundle-Description Bundle-SymbolicName: org.eclipse.papyrus.uml.nattable.stereotype.display.tests;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.uml.nattable.stereotype.display.tests diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/.classpath b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/.classpath index e801ebfb468..81fe078c20c 100644 --- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/.classpath +++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/.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/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/.settings/org.eclipse.jdt.core.prefs b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/.settings/org.eclipse.jdt.core.prefs +++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/.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/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/META-INF/MANIFEST.MF index cade26d3f41..7bc409c762a 100644 --- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/META-INF/MANIFEST.MF @@ -35,6 +35,6 @@ Bundle-ManifestVersion: 2 Bundle-Activator: org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests.Activator Bundle-Description: %pluginDescription Bundle-SymbolicName: org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-ActivationPolicy: lazy Automatic-Module-Name: org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.suite.tests/.classpath b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.suite.tests/.classpath index 9cb19c81c76..c0255c320e6 100755 --- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.suite.tests/.classpath +++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.suite.tests/.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="test"/> <classpathentry kind="output" path="bin"/> diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.suite.tests/.settings/org.eclipse.jdt.core.prefs b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.suite.tests/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.suite.tests/.settings/org.eclipse.jdt.core.prefs +++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.suite.tests/.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/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.suite.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.suite.tests/META-INF/MANIFEST.MF index 4fe8c88fa79..7349f96a579 100755 --- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.suite.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.suite.tests/META-INF/MANIFEST.MF @@ -7,7 +7,7 @@ Bundle-Localization: plugin Bundle-ManifestVersion: 2 Bundle-Activator: org.eclipse.papyrus.uml.nattable.suite.tests.Activator Bundle-SymbolicName: org.eclipse.papyrus.uml.nattable.suite.tests;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Require-Bundle: org.eclipse.gmf.runtime.diagram.ui.properties;bundle-version="[1.8.0,2.0.0)", org.eclipse.papyrus.junit.framework;bundle-version="[2.0.0,3.0.0)", org.eclipse.papyrus.junit.utils;bundle-version="[3.0.0,4.0.0)", diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.tests/.classpath b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.tests/.classpath index e801ebfb468..81fe078c20c 100644 --- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.tests/.classpath +++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.tests/.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/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.tests/.settings/org.eclipse.jdt.core.prefs b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.tests/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.tests/.settings/org.eclipse.jdt.core.prefs +++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.tests/.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/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.tests/META-INF/MANIFEST.MF index 22cfdb8e09f..f102bb7cdb9 100644 --- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.tests/META-INF/MANIFEST.MF @@ -28,5 +28,5 @@ Bundle-ManifestVersion: 2 Bundle-Activator: org.eclipse.papyrus.uml.nattable.tests.Activator Bundle-Description: %pluginDescription Bundle-SymbolicName: org.eclipse.papyrus.uml.nattable.tests;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.uml.nattable.tests diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.architecture.tests/.classpath b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.architecture.tests/.classpath index 8f8662d1d43..76c5ab8d8d8 100644 --- a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.architecture.tests/.classpath +++ b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.architecture.tests/.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="test"> <attributes> diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.architecture.tests/.settings/org.eclipse.jdt.core.prefs b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.architecture.tests/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.architecture.tests/.settings/org.eclipse.jdt.core.prefs +++ b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.architecture.tests/.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/tests/junit/plugins/uml/org.eclipse.papyrus.uml.architecture.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.architecture.tests/META-INF/MANIFEST.MF index d32548bdda2..902f38563cc 100644 --- a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.architecture.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.architecture.tests/META-INF/MANIFEST.MF @@ -6,7 +6,7 @@ Bundle-Localization: plugin Bundle-Name: %pluginName Bundle-Vendor: %providerName Automatic-Module-Name: org.eclipse.papyrus.uml.architecture.tests -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Require-Bundle: org.eclipse.emf.ecore;bundle-version="[2.22.0,3.0.0)", org.eclipse.papyrus.junit.framework;bundle-version="[2.0.0,3.0.0)", org.junit;bundle-version="[4.13.0,5.0.0)" diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.dynamic.profile.tests/.classpath b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.dynamic.profile.tests/.classpath index c3ba59e4c3a..1a821310bdc 100644 --- a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.dynamic.profile.tests/.classpath +++ b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.dynamic.profile.tests/.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/tests/junit/plugins/uml/org.eclipse.papyrus.uml.dynamic.profile.tests/.settings/org.eclipse.jdt.core.prefs b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.dynamic.profile.tests/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.dynamic.profile.tests/.settings/org.eclipse.jdt.core.prefs +++ b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.dynamic.profile.tests/.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/tests/junit/plugins/uml/org.eclipse.papyrus.uml.dynamic.profile.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.dynamic.profile.tests/META-INF/MANIFEST.MF index d2b722f95c0..f66cc6f5656 100644 --- a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.dynamic.profile.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.dynamic.profile.tests/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.papyrus.uml.dynamic.profile.tests;singleton:=true Bundle-Version: 2.0.0.qualifier Bundle-Vendor: %Bundle-Vendor -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-ActivationPolicy: lazy Bundle-Description: %Bundle-Description Automatic-Module-Name: org.eclipse.papyrus.uml.dynamic.profile.tests diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.filters.tests/.classpath b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.filters.tests/.classpath index bb642933501..f574c0cbd4d 100644 --- a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.filters.tests/.classpath +++ b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.filters.tests/.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/tests/junit/plugins/uml/org.eclipse.papyrus.uml.filters.tests/.settings/org.eclipse.jdt.core.prefs b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.filters.tests/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.filters.tests/.settings/org.eclipse.jdt.core.prefs +++ b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.filters.tests/.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/tests/junit/plugins/uml/org.eclipse.papyrus.uml.filters.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.filters.tests/META-INF/MANIFEST.MF index 17484c58515..989d0b760b9 100644 --- a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.filters.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.filters.tests/META-INF/MANIFEST.MF @@ -18,5 +18,5 @@ Bundle-Localization: plugin Bundle-ManifestVersion: 2 Bundle-Description: %pluginDescription Bundle-SymbolicName: org.eclipse.papyrus.uml.filters.tests;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.uml.filters.tests diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.modelrepair.tests/.classpath b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.modelrepair.tests/.classpath index a1a9452e4e5..630221fdff6 100644 --- a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.modelrepair.tests/.classpath +++ b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.modelrepair.tests/.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="org/eclipse/papyrus/uml/modelrepair/**"/> diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.modelrepair.tests/.settings/org.eclipse.jdt.core.prefs b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.modelrepair.tests/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.modelrepair.tests/.settings/org.eclipse.jdt.core.prefs +++ b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.modelrepair.tests/.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/tests/junit/plugins/uml/org.eclipse.papyrus.uml.modelrepair.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.modelrepair.tests/META-INF/MANIFEST.MF index a520a3f572f..c197a493eb1 100644 --- a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.modelrepair.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.modelrepair.tests/META-INF/MANIFEST.MF @@ -20,7 +20,7 @@ Bundle-Name: %pluginName Bundle-Localization: plugin Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.uml.modelrepair.tests;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="[32.0.0, 33.0.0)", + com.google.common.collect;version="[32.0.0, 33.0.0)" Automatic-Module-Name: org.eclipse.papyrus.uml.modelrepair.tests diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.properties.tests/.classpath b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.properties.tests/.classpath index a42a828e04a..675a5e2962b 100644 --- a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.properties.tests/.classpath +++ b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.properties.tests/.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"> <attributes> diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.properties.tests/.settings/org.eclipse.jdt.core.prefs b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.properties.tests/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.properties.tests/.settings/org.eclipse.jdt.core.prefs +++ b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.properties.tests/.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/tests/junit/plugins/uml/org.eclipse.papyrus.uml.properties.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.properties.tests/META-INF/MANIFEST.MF index 14eb6e1b24c..6d7815b1aae 100644 --- a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.properties.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.properties.tests/META-INF/MANIFEST.MF @@ -29,6 +29,6 @@ Bundle-Name: %pluginName Bundle-Localization: plugin Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.uml.properties.tests;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="[32.0.0, 33.0.0)" Automatic-Module-Name: org.eclipse.papyrus.uml.properties.tests diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.tests/.classpath b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.tests/.classpath index e801ebfb468..81fe078c20c 100644 --- a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.tests/.classpath +++ b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.tests/.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/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.tests/.settings/org.eclipse.jdt.core.prefs b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.tests/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.tests/.settings/org.eclipse.jdt.core.prefs +++ b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.tests/.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/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.tests/META-INF/MANIFEST.MF index b742f958064..40db00a32fd 100644 --- a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.tests/META-INF/MANIFEST.MF @@ -31,6 +31,6 @@ Bundle-Name: %pluginName Bundle-Localization: plugin Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.uml.service.types.tests;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="[32.0.0, 33.0.0)" Automatic-Module-Name: org.eclipse.papyrus.uml.service.types.tests diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.ui.tests/.classpath b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.ui.tests/.classpath index e801ebfb468..81fe078c20c 100644 --- a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.ui.tests/.classpath +++ b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.ui.tests/.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/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.ui.tests/.settings/org.eclipse.jdt.core.prefs b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.ui.tests/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.ui.tests/.settings/org.eclipse.jdt.core.prefs +++ b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.ui.tests/.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/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.ui.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.ui.tests/META-INF/MANIFEST.MF index d62d654e3e5..9b6b85c8047 100644 --- a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.ui.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.ui.tests/META-INF/MANIFEST.MF @@ -25,5 +25,5 @@ Bundle-Name: %pluginName Bundle-Localization: plugin Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.uml.service.types.ui.tests;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.uml.service.types.ui.tests diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.suite.tests/.classpath b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.suite.tests/.classpath index 8f8662d1d43..76c5ab8d8d8 100755 --- a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.suite.tests/.classpath +++ b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.suite.tests/.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="test"> <attributes> diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.suite.tests/.settings/org.eclipse.jdt.core.prefs b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.suite.tests/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.suite.tests/.settings/org.eclipse.jdt.core.prefs +++ b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.suite.tests/.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/tests/junit/plugins/uml/org.eclipse.papyrus.uml.suite.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.suite.tests/META-INF/MANIFEST.MF index 670a2878d94..4372c34988a 100755 --- a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.suite.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.suite.tests/META-INF/MANIFEST.MF @@ -7,7 +7,7 @@ Bundle-Localization: plugin Bundle-ManifestVersion: 2 Bundle-Activator: org.eclipse.papyrus.uml.suite.tests.Activator Bundle-SymbolicName: org.eclipse.papyrus.uml.suite.tests;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Require-Bundle: org.eclipse.gmf.runtime.diagram.ui.properties;bundle-version="[1.8.0,2.0.0)", org.eclipse.papyrus.junit.framework;bundle-version="[2.0.0,3.0.0)", org.eclipse.papyrus.junit.utils;bundle-version="[3.0.0,4.0.0)", diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.types.core.tests/.classpath b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.types.core.tests/.classpath index a42a828e04a..675a5e2962b 100644 --- a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.types.core.tests/.classpath +++ b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.types.core.tests/.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"> <attributes> diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.types.core.tests/.settings/org.eclipse.jdt.core.prefs b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.types.core.tests/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100644 --- a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.types.core.tests/.settings/org.eclipse.jdt.core.prefs +++ b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.types.core.tests/.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/tests/junit/plugins/uml/org.eclipse.papyrus.uml.types.core.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.types.core.tests/META-INF/MANIFEST.MF index f87a703245d..1deb5b3913e 100644 --- a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.types.core.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.types.core.tests/META-INF/MANIFEST.MF @@ -14,6 +14,6 @@ Bundle-Name: %pluginName Bundle-Localization: plugin Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.uml.types.core.tests;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="[32.0.0, 33.0.0)" Automatic-Module-Name: org.eclipse.papyrus.uml.types.core.tests diff --git a/tests/junit/plugins/uml/profile/org.eclipse.papyrus.uml.profile.drafter.tests/.classpath b/tests/junit/plugins/uml/profile/org.eclipse.papyrus.uml.profile.drafter.tests/.classpath index 73c2c85911b..d578ec70b68 100644 --- a/tests/junit/plugins/uml/profile/org.eclipse.papyrus.uml.profile.drafter.tests/.classpath +++ b/tests/junit/plugins/uml/profile/org.eclipse.papyrus.uml.profile.drafter.tests/.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="test"/> <classpathentry kind="src" path="src"/> diff --git a/tests/junit/plugins/uml/profile/org.eclipse.papyrus.uml.profile.drafter.tests/.settings/org.eclipse.jdt.core.prefs b/tests/junit/plugins/uml/profile/org.eclipse.papyrus.uml.profile.drafter.tests/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/tests/junit/plugins/uml/profile/org.eclipse.papyrus.uml.profile.drafter.tests/.settings/org.eclipse.jdt.core.prefs +++ b/tests/junit/plugins/uml/profile/org.eclipse.papyrus.uml.profile.drafter.tests/.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/tests/junit/plugins/uml/profile/org.eclipse.papyrus.uml.profile.drafter.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/profile/org.eclipse.papyrus.uml.profile.drafter.tests/META-INF/MANIFEST.MF index a4d80105749..3168ea42a1a 100644 --- a/tests/junit/plugins/uml/profile/org.eclipse.papyrus.uml.profile.drafter.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/uml/profile/org.eclipse.papyrus.uml.profile.drafter.tests/META-INF/MANIFEST.MF @@ -2,9 +2,9 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.papyrus.uml.profile.drafter.tests;singleton:=true -Bundle-Version: 2.1.0.qualifier +Bundle-Version: 2.2.0.qualifier Bundle-Activator: org.eclipse.papyrus.uml.profile.drafter.tests.Activator -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 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)", org.eclipse.gmf.runtime.diagram.ui;bundle-version="[1.9.0,2.0.0)", @@ -23,5 +23,5 @@ Export-Package: org.eclipse.papyrus.uml.profile.drafter.tests, Bundle-Vendor: %providerName Bundle-Localization: plugin Bundle-ActivationPolicy: lazy -Import-Package: com.google.common.collect;version="[30.1.0, 31.0.0)" +Import-Package: com.google.common.collect;version="[32.0.0, 33.0.0)" Automatic-Module-Name: org.eclipse.papyrus.uml.profile.drafter.tests diff --git a/tests/junit/plugins/uml/profile/org.eclipse.papyrus.uml.profile.drafter.tests/pom.xml b/tests/junit/plugins/uml/profile/org.eclipse.papyrus.uml.profile.drafter.tests/pom.xml index a3c21fbb3dc..4fddb10b5c0 100644 --- a/tests/junit/plugins/uml/profile/org.eclipse.papyrus.uml.profile.drafter.tests/pom.xml +++ b/tests/junit/plugins/uml/profile/org.eclipse.papyrus.uml.profile.drafter.tests/pom.xml @@ -10,6 +10,6 @@ </parent> <groupId>org.eclipse.papyrus.tests</groupId> <artifactId>org.eclipse.papyrus.uml.profile.drafter.tests</artifactId> - <version>2.1.0-SNAPSHOT</version> + <version>2.2.0-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> </project>
\ No newline at end of file diff --git a/tests/junit/plugins/uml/profile/org.eclipse.papyrus.uml.profile.drafter.tests/test/org/eclipse/papyrus/uml/profile/drafter/tests/ui/propertyviewer/TableViewerExample.java b/tests/junit/plugins/uml/profile/org.eclipse.papyrus.uml.profile.drafter.tests/test/org/eclipse/papyrus/uml/profile/drafter/tests/ui/propertyviewer/TableViewerExample.java index 23d18b3dd1e..d9b23b3ca37 100644 --- a/tests/junit/plugins/uml/profile/org.eclipse.papyrus.uml.profile.drafter.tests/test/org/eclipse/papyrus/uml/profile/drafter/tests/ui/propertyviewer/TableViewerExample.java +++ b/tests/junit/plugins/uml/profile/org.eclipse.papyrus.uml.profile.drafter.tests/test/org/eclipse/papyrus/uml/profile/drafter/tests/ui/propertyviewer/TableViewerExample.java @@ -3,7 +3,7 @@ package org.eclipse.papyrus.uml.profile.drafter.tests.ui.propertyviewer; import java.util.List; import org.eclipse.core.databinding.observable.Realm; -import org.eclipse.jface.databinding.swt.SWTObservables; +import org.eclipse.jface.databinding.swt.DisplayRealm; import org.eclipse.jface.viewers.ArrayContentProvider; import org.eclipse.jface.viewers.CellEditor; import org.eclipse.jface.viewers.ComboBoxViewerCellEditor; @@ -27,185 +27,182 @@ import org.eclipse.swt.widgets.TableItem; /** * Example of a Table with editable cells. * To be run as Java code - * + * * @author cedric dumoulin * */ public class TableViewerExample { - static String[] COLUMN_NAMES = new String[] { "names", "types", "types2", "owner" }; - static int[] COLUMN_WIDTHS = new int[] { 300, 200, 200, 100 }; - static String[] COLUMNS_PROPERTIES = new String[] { "names_prop", "types_prop", "types2_prop", "owner_prop" }; - - static class ModelContentProvider implements IStructuredContentProvider { - - @SuppressWarnings("unchecked") - @Override - public Object[] getElements(Object inputElement) { - // The inputElement comes from view.setInput() - if (inputElement instanceof List) { - List models = (List) inputElement; - return models.toArray(); - } - return new Object[0]; - } - - @Override - public void dispose() { - } - - @Override - public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { - } - - } - - static class ModelLabelProvider extends LabelProvider implements ITableLabelProvider { - - @Override - public Image getColumnImage(Object element, int columnIndex) { - // no image to show - return null; - } - - @Override - public String getColumnText(Object element, int columnIndex) { - // each element comes from the ContentProvider.getElements(Object) - if (!(element instanceof PropertyModel)) { - return ""; - } - PropertyModel model = (PropertyModel) element; - switch (columnIndex) { - case 0: - return model.getName(); - case 1: - return model.getType().getName(); - case 2: - return model.getType().getName(); - case 3: - return model.getOwnerKind().toString(); - default: - break; - } - return ""; - } - } - - static class ModelCellModifier implements ICellModifier { - TableViewer viewer; - - public ModelCellModifier(TableViewer viewer) { - this.viewer = viewer; - } - - @Override - public boolean canModify(Object element, String property) { - // property is defined by viewer.setColumnProperties() - // allow the FOO column can be modified. - return ("names_prop".equals(property) - || "types_prop".equals(property) - || "types2_prop".equals(property) - ); - - } - - @Override - public Object getValue(Object element, String property) { - if ("names_prop".equals(property)) { - return ((PropertyModel) element).getName(); - } - if ("types_prop".equals(property)) { - return ((PropertyModel) element).getType(); - } - if ("types2_prop".equals(property)) { - return ((PropertyModel) element).getType(); - } - return ""; - } - - @Override - public void modify(Object element, String property, Object value) { - if ("names_prop".equals(property)) { - TableItem item = (TableItem) element; - ((PropertyModel) item.getData()).setName("" + value); - - // refresh the viewer to show the changes to our user. - viewer.refresh(); - } - else if ("types_prop".equals(property)) { - TableItem item = (TableItem) element; - System.out.println("modify.type(" + value + ")"); - if( value instanceof Type) { - ((PropertyModel) item.getData()).setType((Type)value); - } - // refresh the viewer to show the changes to our user. - viewer.refresh(); - } - else if ("types2_prop".equals(property)) { - TableItem item = (TableItem) element; - System.out.println("modify.type2(" + value + ")"); - if( value instanceof Type) { - ((PropertyModel) item.getData()).setType((Type)value); - } - // refresh the viewer to show the changes to our user. - viewer.refresh(); - } - } - } - - public static void main(String[] args) { - - final TypeLibrary typeLibrary = new TypeLibrary(); - final PropertyCatalog propertyCatalog = new PropertyCatalog(typeLibrary); - final TypeLabelProvider typeLabelProvider = new TypeLabelProvider(); - - - final ApplicationWindow app = new ApplicationWindow(null) { - @Override - protected Control createContents(Composite parent) { - TableViewer tableViewer = new TableViewer(parent, SWT.SINGLE | SWT.FULL_SELECTION); - Table table = tableViewer.getTable(); - table.setHeaderVisible(true); - table.setLinesVisible(true); - - for (int i = 0; i < COLUMN_NAMES.length; i++) { - TableColumn tableColumn = new TableColumn(table, SWT.LEFT); - tableColumn.setText(COLUMN_NAMES[i]); - tableColumn.setWidth(COLUMN_WIDTHS[i]); - } - - tableViewer.setContentProvider(new ModelContentProvider()); - tableViewer.setLabelProvider(new ModelLabelProvider()); - - // Create a ComboBoxViewerCellEditor for types - // - ComboBoxViewerCellEditor comboBoxViewerCellEditor = new ComboBoxViewerCellEditor(table); - comboBoxViewerCellEditor.setContentProvider(ArrayContentProvider.getInstance()); - comboBoxViewerCellEditor.setLabelProvider(typeLabelProvider); - comboBoxViewerCellEditor.setInput(typeLibrary.getTypes()); - // Create editor support - tableViewer.setColumnProperties(COLUMNS_PROPERTIES); - tableViewer.setCellEditors(new CellEditor[] { - new TextCellEditor(table), - new TypeSelectorCellEditor(table, typeLibrary, typeLabelProvider), - comboBoxViewerCellEditor - }); - tableViewer.setCellModifier(new ModelCellModifier(tableViewer)); - - tableViewer.setInput(propertyCatalog.getProperties()); - return parent; - } - }; - - Realm.runWithDefault(SWTObservables.getRealm(Display.getDefault()), - new Runnable() { - @Override - public void run() { - app.setBlockOnOpen(true); - app.open(); - Display.getDefault().dispose(); - } - }); - - } + static String[] COLUMN_NAMES = new String[] { "names", "types", "types2", "owner" }; + static int[] COLUMN_WIDTHS = new int[] { 300, 200, 200, 100 }; + static String[] COLUMNS_PROPERTIES = new String[] { "names_prop", "types_prop", "types2_prop", "owner_prop" }; + + static class ModelContentProvider implements IStructuredContentProvider { + + @SuppressWarnings("unchecked") + @Override + public Object[] getElements(Object inputElement) { + // The inputElement comes from view.setInput() + if (inputElement instanceof List) { + List models = (List) inputElement; + return models.toArray(); + } + return new Object[0]; + } + + @Override + public void dispose() { + } + + @Override + public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { + } + + } + + static class ModelLabelProvider extends LabelProvider implements ITableLabelProvider { + + @Override + public Image getColumnImage(Object element, int columnIndex) { + // no image to show + return null; + } + + @Override + public String getColumnText(Object element, int columnIndex) { + // each element comes from the ContentProvider.getElements(Object) + if (!(element instanceof PropertyModel)) { + return ""; + } + PropertyModel model = (PropertyModel) element; + switch (columnIndex) { + case 0: + return model.getName(); + case 1: + return model.getType().getName(); + case 2: + return model.getType().getName(); + case 3: + return model.getOwnerKind().toString(); + default: + break; + } + return ""; + } + } + + static class ModelCellModifier implements ICellModifier { + TableViewer viewer; + + public ModelCellModifier(TableViewer viewer) { + this.viewer = viewer; + } + + @Override + public boolean canModify(Object element, String property) { + // property is defined by viewer.setColumnProperties() + // allow the FOO column can be modified. + return ("names_prop".equals(property) + || "types_prop".equals(property) + || "types2_prop".equals(property)); + + } + + @Override + public Object getValue(Object element, String property) { + if ("names_prop".equals(property)) { + return ((PropertyModel) element).getName(); + } + if ("types_prop".equals(property)) { + return ((PropertyModel) element).getType(); + } + if ("types2_prop".equals(property)) { + return ((PropertyModel) element).getType(); + } + return ""; + } + + @Override + public void modify(Object element, String property, Object value) { + if ("names_prop".equals(property)) { + TableItem item = (TableItem) element; + ((PropertyModel) item.getData()).setName("" + value); + + // refresh the viewer to show the changes to our user. + viewer.refresh(); + } else if ("types_prop".equals(property)) { + TableItem item = (TableItem) element; + System.out.println("modify.type(" + value + ")"); + if (value instanceof Type) { + ((PropertyModel) item.getData()).setType((Type) value); + } + // refresh the viewer to show the changes to our user. + viewer.refresh(); + } else if ("types2_prop".equals(property)) { + TableItem item = (TableItem) element; + System.out.println("modify.type2(" + value + ")"); + if (value instanceof Type) { + ((PropertyModel) item.getData()).setType((Type) value); + } + // refresh the viewer to show the changes to our user. + viewer.refresh(); + } + } + } + + public static void main(String[] args) { + + final TypeLibrary typeLibrary = new TypeLibrary(); + final PropertyCatalog propertyCatalog = new PropertyCatalog(typeLibrary); + final TypeLabelProvider typeLabelProvider = new TypeLabelProvider(); + + + final ApplicationWindow app = new ApplicationWindow(null) { + @Override + protected Control createContents(Composite parent) { + TableViewer tableViewer = new TableViewer(parent, SWT.SINGLE | SWT.FULL_SELECTION); + Table table = tableViewer.getTable(); + table.setHeaderVisible(true); + table.setLinesVisible(true); + + for (int i = 0; i < COLUMN_NAMES.length; i++) { + TableColumn tableColumn = new TableColumn(table, SWT.LEFT); + tableColumn.setText(COLUMN_NAMES[i]); + tableColumn.setWidth(COLUMN_WIDTHS[i]); + } + + tableViewer.setContentProvider(new ModelContentProvider()); + tableViewer.setLabelProvider(new ModelLabelProvider()); + + // Create a ComboBoxViewerCellEditor for types + // + ComboBoxViewerCellEditor comboBoxViewerCellEditor = new ComboBoxViewerCellEditor(table); + comboBoxViewerCellEditor.setContentProvider(ArrayContentProvider.getInstance()); + comboBoxViewerCellEditor.setLabelProvider(typeLabelProvider); + comboBoxViewerCellEditor.setInput(typeLibrary.getTypes()); + // Create editor support + tableViewer.setColumnProperties(COLUMNS_PROPERTIES); + tableViewer.setCellEditors(new CellEditor[] { + new TextCellEditor(table), + new TypeSelectorCellEditor(table, typeLibrary, typeLabelProvider), + comboBoxViewerCellEditor + }); + tableViewer.setCellModifier(new ModelCellModifier(tableViewer)); + + tableViewer.setInput(propertyCatalog.getProperties()); + return parent; + } + }; + + Realm.runWithDefault(DisplayRealm.getRealm(Display.getDefault()), + new Runnable() { + @Override + public void run() { + app.setBlockOnOpen(true); + app.open(); + Display.getDefault().dispose(); + } + }); + + } } diff --git a/tests/junit/plugins/uml/profile/org.eclipse.papyrus.uml.profile.tests/.classpath b/tests/junit/plugins/uml/profile/org.eclipse.papyrus.uml.profile.tests/.classpath index 04e1533f006..184b6fc5bce 100644 --- a/tests/junit/plugins/uml/profile/org.eclipse.papyrus.uml.profile.tests/.classpath +++ b/tests/junit/plugins/uml/profile/org.eclipse.papyrus.uml.profile.tests/.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="org/eclipse/papyrus/uml/profile/**"/> diff --git a/tests/junit/plugins/uml/profile/org.eclipse.papyrus.uml.profile.tests/.settings/org.eclipse.jdt.core.prefs b/tests/junit/plugins/uml/profile/org.eclipse.papyrus.uml.profile.tests/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/tests/junit/plugins/uml/profile/org.eclipse.papyrus.uml.profile.tests/.settings/org.eclipse.jdt.core.prefs +++ b/tests/junit/plugins/uml/profile/org.eclipse.papyrus.uml.profile.tests/.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/tests/junit/plugins/uml/profile/org.eclipse.papyrus.uml.profile.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/profile/org.eclipse.papyrus.uml.profile.tests/META-INF/MANIFEST.MF index 8d1cb34141b..31fafe09d67 100644 --- a/tests/junit/plugins/uml/profile/org.eclipse.papyrus.uml.profile.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/uml/profile/org.eclipse.papyrus.uml.profile.tests/META-INF/MANIFEST.MF @@ -16,5 +16,5 @@ Bundle-Name: %pluginName Bundle-Localization: plugin Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.uml.profile.tests;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.uml.profile.tests diff --git a/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.parameter.tests/.classpath b/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.parameter.tests/.classpath index e801ebfb468..81fe078c20c 100644 --- a/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.parameter.tests/.classpath +++ b/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.parameter.tests/.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/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.parameter.tests/.settings/org.eclipse.jdt.core.prefs b/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.parameter.tests/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.parameter.tests/.settings/org.eclipse.jdt.core.prefs +++ b/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.parameter.tests/.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/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.parameter.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.parameter.tests/META-INF/MANIFEST.MF index 7700b3750cd..4f959f767be 100644 --- a/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.parameter.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.parameter.tests/META-INF/MANIFEST.MF @@ -17,5 +17,5 @@ Bundle-Name: UML Textedit Parameter Tests Bundle-ManifestVersion: 2 Bundle-Activator: org.eclipse.papyrus.uml.textedit.parameter.tests.Activator Bundle-SymbolicName: org.eclipse.papyrus.uml.textedit.parameter.tests;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.uml.textedit.parameter.tests diff --git a/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.tests/.classpath b/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.tests/.classpath index e801ebfb468..81fe078c20c 100644 --- a/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.tests/.classpath +++ b/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.tests/.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/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.tests/.settings/org.eclipse.jdt.core.prefs b/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.tests/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.tests/.settings/org.eclipse.jdt.core.prefs +++ b/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.tests/.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/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.tests/META-INF/MANIFEST.MF index b3e89033273..6cd7649822b 100644 --- a/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.port.tests/META-INF/MANIFEST.MF @@ -15,5 +15,5 @@ Bundle-Name: XText Port Editor Tests Bundle-ManifestVersion: 2 Bundle-Activator: org.eclipse.papyrus.uml.textedit.port.tests.Activator Bundle-SymbolicName: org.eclipse.papyrus.uml.textedit.port.tests;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.uml.textedit.port.tests diff --git a/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.tests/.classpath b/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.tests/.classpath index e801ebfb468..81fe078c20c 100644 --- a/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.tests/.classpath +++ b/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.tests/.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/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.tests/.settings/org.eclipse.jdt.core.prefs b/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.tests/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.tests/.settings/org.eclipse.jdt.core.prefs +++ b/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.tests/.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/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.tests/META-INF/MANIFEST.MF index 7b4e05a66fa..db2b6a47ab8 100644 --- a/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.tests/META-INF/MANIFEST.MF @@ -15,5 +15,5 @@ Bundle-Name: XText Property editor Tests Bundle-ManifestVersion: 2 Bundle-Activator: org.eclipse.papyrus.uml.textedit.property.tests.Activator Bundle-SymbolicName: org.eclipse.papyrus.uml.textedit.property.tests;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.uml.textedit.property.tests diff --git a/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.suite.tests/.classpath b/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.suite.tests/.classpath index 9cb19c81c76..c0255c320e6 100755 --- a/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.suite.tests/.classpath +++ b/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.suite.tests/.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="test"/> <classpathentry kind="output" path="bin"/> diff --git a/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.suite.tests/.settings/org.eclipse.jdt.core.prefs b/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.suite.tests/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.suite.tests/.settings/org.eclipse.jdt.core.prefs +++ b/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.suite.tests/.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/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.suite.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.suite.tests/META-INF/MANIFEST.MF index dae0542b31a..ae540cbbe26 100755 --- a/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.suite.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.suite.tests/META-INF/MANIFEST.MF @@ -7,7 +7,7 @@ Bundle-Localization: plugin Bundle-ManifestVersion: 2 Bundle-Activator: org.eclipse.papyrus.uml.textedit.suite.tests.Activator Bundle-SymbolicName: org.eclipse.papyrus.uml.textedit.suite.tests;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Require-Bundle: org.eclipse.gmf.runtime.diagram.ui;bundle-version="[1.9.0,2.0.0)", org.eclipse.papyrus.junit.framework;bundle-version="[2.0.0,3.0.0)", org.eclipse.papyrus.junit.utils;bundle-version="[3.0.0,4.0.0)", diff --git a/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.tests/.classpath b/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.tests/.classpath index e801ebfb468..81fe078c20c 100644 --- a/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.tests/.classpath +++ b/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.tests/.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/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.tests/.settings/org.eclipse.jdt.core.prefs b/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.tests/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.tests/.settings/org.eclipse.jdt.core.prefs +++ b/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.tests/.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/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.tests/META-INF/MANIFEST.MF index 07b6a1a35c1..b10414b129f 100644 --- a/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.tests/META-INF/MANIFEST.MF @@ -17,5 +17,5 @@ Bundle-Name: Textedit Tests Bundle-ManifestVersion: 2 Bundle-Activator: org.eclipse.papyrus.uml.textedit.tests.Activator Bundle-SymbolicName: org.eclipse.papyrus.uml.textedit.tests;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.uml.textedit.tests diff --git a/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.tests/.classpath b/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.tests/.classpath index e801ebfb468..81fe078c20c 100644 --- a/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.tests/.classpath +++ b/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.tests/.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/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.tests/.settings/org.eclipse.jdt.core.prefs b/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.tests/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.tests/.settings/org.eclipse.jdt.core.prefs +++ b/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.tests/.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/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.tests/META-INF/MANIFEST.MF index c2bd0050290..1d82c3b04e4 100644 --- a/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.tests/META-INF/MANIFEST.MF @@ -18,5 +18,5 @@ Bundle-Activator: org.eclipse.papyrus.uml.textedit.valuespecification.tests.Acti Bundle-ManifestVersion: 2 Bundle-Description: %pluginDescription Bundle-SymbolicName: org.eclipse.papyrus.uml.textedit.valuespecification.tests;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.uml.textedit.valuespecification.tests diff --git a/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/.classpath b/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/.classpath index e801ebfb468..81fe078c20c 100644 --- a/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/.classpath +++ b/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/.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/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/.settings/org.eclipse.jdt.core.prefs b/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/.settings/org.eclipse.jdt.core.prefs +++ b/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/.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/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/META-INF/MANIFEST.MF index 45dbc4d4e40..3100484d512 100644 --- a/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/META-INF/MANIFEST.MF @@ -27,7 +27,7 @@ Bundle-Name: UML Tools Tests Bundle-ManifestVersion: 2 Bundle-Activator: org.eclipse.papyrus.uml.tools.tests.Activator Bundle-SymbolicName: org.eclipse.papyrus.uml.tools.tests;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="[32.0.0, 33.0.0)", + com.google.common.collect;version="[32.0.0, 33.0.0)" Automatic-Module-Name: org.eclipse.papyrus.uml.tools.tests diff --git a/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.utils.tests/.classpath b/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.utils.tests/.classpath index e801ebfb468..81fe078c20c 100644 --- a/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.utils.tests/.classpath +++ b/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.utils.tests/.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/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.utils.tests/.settings/org.eclipse.jdt.core.prefs b/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.utils.tests/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.utils.tests/.settings/org.eclipse.jdt.core.prefs +++ b/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.utils.tests/.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/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.utils.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.utils.tests/META-INF/MANIFEST.MF index 5dde0c36360..7c72b0f1bd9 100644 --- a/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.utils.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.utils.tests/META-INF/MANIFEST.MF @@ -17,6 +17,6 @@ Bundle-Name: %pluginName Bundle-Localization: plugin Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.uml.tools.utils.tests;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.uml.tools.utils.tests Bundle-Activator: org.eclipse.papyrus.uml.tools.utils.tests.tests.Activator diff --git a/tests/junit/plugins/uml/validation/org.eclipse.papyrus.uml.validation.tests.genvalidation/.classpath b/tests/junit/plugins/uml/validation/org.eclipse.papyrus.uml.validation.tests.genvalidation/.classpath index ad5e13cce77..946fb3d346f 100644 --- a/tests/junit/plugins/uml/validation/org.eclipse.papyrus.uml.validation.tests.genvalidation/.classpath +++ b/tests/junit/plugins/uml/validation/org.eclipse.papyrus.uml.validation.tests.genvalidation/.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/tests/junit/plugins/uml/validation/org.eclipse.papyrus.uml.validation.tests.genvalidation/.settings/org.eclipse.jdt.core.prefs b/tests/junit/plugins/uml/validation/org.eclipse.papyrus.uml.validation.tests.genvalidation/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/tests/junit/plugins/uml/validation/org.eclipse.papyrus.uml.validation.tests.genvalidation/.settings/org.eclipse.jdt.core.prefs +++ b/tests/junit/plugins/uml/validation/org.eclipse.papyrus.uml.validation.tests.genvalidation/.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/tests/junit/plugins/uml/validation/org.eclipse.papyrus.uml.validation.tests.genvalidation/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/validation/org.eclipse.papyrus.uml.validation.tests.genvalidation/META-INF/MANIFEST.MF index e66b91179b0..c5e98fbde5c 100644 --- a/tests/junit/plugins/uml/validation/org.eclipse.papyrus.uml.validation.tests.genvalidation/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/uml/validation/org.eclipse.papyrus.uml.validation.tests.genvalidation/META-INF/MANIFEST.MF @@ -9,7 +9,7 @@ Require-Bundle: org.eclipse.emf.edit.ui;bundle-version="[2.18.0,3.0.0)", org.eclipse.uml2.uml;bundle-version="[5.5.0,6.0.0)" Bundle-ManifestVersion: 2 Bundle-Activator: org.eclipse.papyrus.uml.validation.tests.genvalidation.Activator -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-ActivationPolicy: lazy Bundle-Vendor: %providerName Bundle-Localization: plugin diff --git a/tests/junit/plugins/uml/validation/org.eclipse.papyrus.uml.validation.tests.staticprofile/.classpath b/tests/junit/plugins/uml/validation/org.eclipse.papyrus.uml.validation.tests.staticprofile/.classpath index ad5e13cce77..946fb3d346f 100644 --- a/tests/junit/plugins/uml/validation/org.eclipse.papyrus.uml.validation.tests.staticprofile/.classpath +++ b/tests/junit/plugins/uml/validation/org.eclipse.papyrus.uml.validation.tests.staticprofile/.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/tests/junit/plugins/uml/validation/org.eclipse.papyrus.uml.validation.tests.staticprofile/.settings/org.eclipse.jdt.core.prefs b/tests/junit/plugins/uml/validation/org.eclipse.papyrus.uml.validation.tests.staticprofile/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/tests/junit/plugins/uml/validation/org.eclipse.papyrus.uml.validation.tests.staticprofile/.settings/org.eclipse.jdt.core.prefs +++ b/tests/junit/plugins/uml/validation/org.eclipse.papyrus.uml.validation.tests.staticprofile/.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/tests/junit/plugins/uml/validation/org.eclipse.papyrus.uml.validation.tests.staticprofile/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/validation/org.eclipse.papyrus.uml.validation.tests.staticprofile/META-INF/MANIFEST.MF index 3c0034a6a6a..a54810d6c44 100644 --- a/tests/junit/plugins/uml/validation/org.eclipse.papyrus.uml.validation.tests.staticprofile/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/uml/validation/org.eclipse.papyrus.uml.validation.tests.staticprofile/META-INF/MANIFEST.MF @@ -12,7 +12,7 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.18.0,4.0.0)", org.eclipse.uml2.uml;bundle-version="[5.5.0,6.0.0)" Bundle-ManifestVersion: 2 Bundle-Activator: org.eclipse.papyrus.uml.validation.tests.staticprofile.Activator -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-ActivationPolicy: lazy Bundle-Vendor: %providerName Bundle-Localization: plugin diff --git a/tests/junit/plugins/uml/validation/org.eclipse.papyrus.uml.validation.tests/.classpath b/tests/junit/plugins/uml/validation/org.eclipse.papyrus.uml.validation.tests/.classpath index e801ebfb468..81fe078c20c 100644 --- a/tests/junit/plugins/uml/validation/org.eclipse.papyrus.uml.validation.tests/.classpath +++ b/tests/junit/plugins/uml/validation/org.eclipse.papyrus.uml.validation.tests/.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/tests/junit/plugins/uml/validation/org.eclipse.papyrus.uml.validation.tests/.settings/org.eclipse.jdt.core.prefs b/tests/junit/plugins/uml/validation/org.eclipse.papyrus.uml.validation.tests/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/tests/junit/plugins/uml/validation/org.eclipse.papyrus.uml.validation.tests/.settings/org.eclipse.jdt.core.prefs +++ b/tests/junit/plugins/uml/validation/org.eclipse.papyrus.uml.validation.tests/.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/tests/junit/plugins/uml/validation/org.eclipse.papyrus.uml.validation.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/validation/org.eclipse.papyrus.uml.validation.tests/META-INF/MANIFEST.MF index 7614c03882b..fc0ddb3f424 100644 --- a/tests/junit/plugins/uml/validation/org.eclipse.papyrus.uml.validation.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/uml/validation/org.eclipse.papyrus.uml.validation.tests/META-INF/MANIFEST.MF @@ -24,7 +24,7 @@ Require-Bundle: org.eclipse.emf.databinding;bundle-version="[1.5.0,2.0.0)", Bundle-ActivationPolicy: lazy Bundle-ManifestVersion: 2 Bundle-Activator: org.eclipse.papyrus.uml.validation.tests.Activator -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-Vendor: %providerName Bundle-Localization: plugin Export-Package: org.eclipse.papyrus.uml.validation.tests, diff --git a/tests/junit/plugins/views/documentation/org.eclipse.papyrus.views.documentation.tests/.classpath b/tests/junit/plugins/views/documentation/org.eclipse.papyrus.views.documentation.tests/.classpath index e801ebfb468..81fe078c20c 100644 --- a/tests/junit/plugins/views/documentation/org.eclipse.papyrus.views.documentation.tests/.classpath +++ b/tests/junit/plugins/views/documentation/org.eclipse.papyrus.views.documentation.tests/.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/tests/junit/plugins/views/documentation/org.eclipse.papyrus.views.documentation.tests/.settings/org.eclipse.jdt.core.prefs b/tests/junit/plugins/views/documentation/org.eclipse.papyrus.views.documentation.tests/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/tests/junit/plugins/views/documentation/org.eclipse.papyrus.views.documentation.tests/.settings/org.eclipse.jdt.core.prefs +++ b/tests/junit/plugins/views/documentation/org.eclipse.papyrus.views.documentation.tests/.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/tests/junit/plugins/views/documentation/org.eclipse.papyrus.views.documentation.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/views/documentation/org.eclipse.papyrus.views.documentation.tests/META-INF/MANIFEST.MF index f9123959e53..3ddc4b889b2 100644 --- a/tests/junit/plugins/views/documentation/org.eclipse.papyrus.views.documentation.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/views/documentation/org.eclipse.papyrus.views.documentation.tests/META-INF/MANIFEST.MF @@ -9,7 +9,7 @@ Bundle-ManifestVersion: 2 Bundle-Activator: org.eclipse.papyrus.views.documentation.tests.Activator Bundle-Description: %pluginDescription Bundle-SymbolicName: org.eclipse.papyrus.views.documentation.tests -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Require-Bundle: org.eclipse.gmf.runtime.diagram.ui;bundle-version="[1.9.0,2.0.0)", org.eclipse.papyrus.infra.ui;bundle-version="[3.0.0,4.0.0)", org.eclipse.papyrus.junit.framework;bundle-version="[2.0.0,3.0.0)", diff --git a/tests/junit/plugins/views/org.eclipse.papyrus.views.modelexplorer.tests/.classpath b/tests/junit/plugins/views/org.eclipse.papyrus.views.modelexplorer.tests/.classpath index e801ebfb468..81fe078c20c 100644 --- a/tests/junit/plugins/views/org.eclipse.papyrus.views.modelexplorer.tests/.classpath +++ b/tests/junit/plugins/views/org.eclipse.papyrus.views.modelexplorer.tests/.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/tests/junit/plugins/views/org.eclipse.papyrus.views.modelexplorer.tests/.settings/org.eclipse.jdt.core.prefs b/tests/junit/plugins/views/org.eclipse.papyrus.views.modelexplorer.tests/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/tests/junit/plugins/views/org.eclipse.papyrus.views.modelexplorer.tests/.settings/org.eclipse.jdt.core.prefs +++ b/tests/junit/plugins/views/org.eclipse.papyrus.views.modelexplorer.tests/.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/tests/junit/plugins/views/org.eclipse.papyrus.views.modelexplorer.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/views/org.eclipse.papyrus.views.modelexplorer.tests/META-INF/MANIFEST.MF index 3a009f561db..5794cd3b04c 100644 --- a/tests/junit/plugins/views/org.eclipse.papyrus.views.modelexplorer.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/views/org.eclipse.papyrus.views.modelexplorer.tests/META-INF/MANIFEST.MF @@ -29,5 +29,5 @@ Bundle-ManifestVersion: 2 Bundle-Activator: org.eclipse.papyrus.views.modelexplorer.tests.Activator Bundle-Description: %pluginDescription Bundle-SymbolicName: org.eclipse.papyrus.views.modelexplorer.tests;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.views.modelexplorer.tests diff --git a/tests/junit/plugins/views/org.eclipse.papyrus.views.properties.toolsmiths.tests/.classpath b/tests/junit/plugins/views/org.eclipse.papyrus.views.properties.toolsmiths.tests/.classpath index 7b137d9ab4b..f192ed9b8a7 100644 --- a/tests/junit/plugins/views/org.eclipse.papyrus.views.properties.toolsmiths.tests/.classpath +++ b/tests/junit/plugins/views/org.eclipse.papyrus.views.properties.toolsmiths.tests/.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/tests/junit/plugins/views/org.eclipse.papyrus.views.properties.toolsmiths.tests/.settings/org.eclipse.jdt.core.prefs b/tests/junit/plugins/views/org.eclipse.papyrus.views.properties.toolsmiths.tests/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/tests/junit/plugins/views/org.eclipse.papyrus.views.properties.toolsmiths.tests/.settings/org.eclipse.jdt.core.prefs +++ b/tests/junit/plugins/views/org.eclipse.papyrus.views.properties.toolsmiths.tests/.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/tests/junit/plugins/views/org.eclipse.papyrus.views.properties.toolsmiths.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/views/org.eclipse.papyrus.views.properties.toolsmiths.tests/META-INF/MANIFEST.MF index 53aa7d09b9e..11a36186c73 100644 --- a/tests/junit/plugins/views/org.eclipse.papyrus.views.properties.toolsmiths.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/views/org.eclipse.papyrus.views.properties.toolsmiths.tests/META-INF/MANIFEST.MF @@ -21,5 +21,5 @@ Bundle-Name: Properties view customization Tests Bundle-ManifestVersion: 2 Bundle-Activator: org.eclipse.papyrus.views.properties.toolsmiths.tests.Activator Bundle-SymbolicName: org.eclipse.papyrus.views.properties.toolsmiths.tests;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.views.properties.toolsmiths.tests diff --git a/tests/junit/plugins/views/org.eclipse.papyrus.views.suite.tests/.classpath b/tests/junit/plugins/views/org.eclipse.papyrus.views.suite.tests/.classpath index e801ebfb468..81fe078c20c 100755 --- a/tests/junit/plugins/views/org.eclipse.papyrus.views.suite.tests/.classpath +++ b/tests/junit/plugins/views/org.eclipse.papyrus.views.suite.tests/.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/tests/junit/plugins/views/org.eclipse.papyrus.views.suite.tests/.settings/org.eclipse.jdt.core.prefs b/tests/junit/plugins/views/org.eclipse.papyrus.views.suite.tests/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/tests/junit/plugins/views/org.eclipse.papyrus.views.suite.tests/.settings/org.eclipse.jdt.core.prefs +++ b/tests/junit/plugins/views/org.eclipse.papyrus.views.suite.tests/.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/tests/junit/plugins/views/org.eclipse.papyrus.views.suite.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/views/org.eclipse.papyrus.views.suite.tests/META-INF/MANIFEST.MF index ddb35ff6525..d897dd9023b 100755 --- a/tests/junit/plugins/views/org.eclipse.papyrus.views.suite.tests/META-INF/MANIFEST.MF +++ b/tests/junit/plugins/views/org.eclipse.papyrus.views.suite.tests/META-INF/MANIFEST.MF @@ -6,7 +6,7 @@ Bundle-Localization: plugin Bundle-ManifestVersion: 2 Bundle-Activator: org.eclipse.papyrus.views.suite.tests.Activator Bundle-SymbolicName: org.eclipse.papyrus.views.suite.tests;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Manifest-Version: 1.0 Require-Bundle: org.eclipse.emf.ecore.editor;bundle-version="[2.17.0,3.0.0)", org.eclipse.gmf.runtime.diagram.ui.properties;bundle-version="[1.8.0,2.0.0)", |
