From 882cfd7efc8ec6bd680aa7abbf2f6451af655347 Mon Sep 17 00:00:00 2001 From: Eclipse Platform Bot Date: Fri, 6 Jun 2025 04:36:24 +0000 Subject: [PATCH 1/2] Perform clean code of debug/org.eclipse.core.variables --- .../core/internal/variables/ContributedValueVariable.java | 3 +-- .../core/internal/variables/StringVariableManager.java | 6 ++---- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/debug/org.eclipse.core.variables/src/org/eclipse/core/internal/variables/ContributedValueVariable.java b/debug/org.eclipse.core.variables/src/org/eclipse/core/internal/variables/ContributedValueVariable.java index 7f48d0fcfbd..e4af182656d 100644 --- a/debug/org.eclipse.core.variables/src/org/eclipse/core/internal/variables/ContributedValueVariable.java +++ b/debug/org.eclipse.core.variables/src/org/eclipse/core/internal/variables/ContributedValueVariable.java @@ -85,8 +85,7 @@ private void initialize() { if (className != null) { try { Object object = getConfigurationElement().createExecutableExtension("initializerClass"); //$NON-NLS-1$ - if (object instanceof IValueVariableInitializer) { - IValueVariableInitializer initializer = (IValueVariableInitializer)object; + if (object instanceof IValueVariableInitializer initializer) { initializer.initialize(this); } else { VariablesPlugin.logMessage(NLS.bind("Unable to initialize variable {0} - initializer must be an instance of IValueVariableInitializer.", new String[]{getName()}), null); //$NON-NLS-1$ diff --git a/debug/org.eclipse.core.variables/src/org/eclipse/core/internal/variables/StringVariableManager.java b/debug/org.eclipse.core.variables/src/org/eclipse/core/internal/variables/StringVariableManager.java index 862339dd1c4..cdb2220a050 100644 --- a/debug/org.eclipse.core.variables/src/org/eclipse/core/internal/variables/StringVariableManager.java +++ b/debug/org.eclipse.core.variables/src/org/eclipse/core/internal/variables/StringVariableManager.java @@ -232,8 +232,7 @@ private void loadDynamicVariables() { if (old != null) { DynamicVariable oldVariable = (DynamicVariable)old; VariablesPlugin.logMessage(NLS.bind("Dynamic variable extension from bundle ''{0}'' overrides existing extension variable ''{1}'' from bundle ''{2}''", //$NON-NLS-1$ - new String[] {element.getDeclaringExtension().getContributor().getName(),oldVariable.getName(), - oldVariable.getConfigurationElement().getDeclaringExtension().getContributor().getName()}), null); + element.getDeclaringExtension().getContributor().getName(), oldVariable.getName(), oldVariable.getConfigurationElement().getDeclaringExtension().getContributor().getName()), null); } } } @@ -258,8 +257,7 @@ private void loadContributedValueVariables() { if (old != null) { StringVariable oldVariable = (StringVariable)old; VariablesPlugin.logMessage(NLS.bind("Contributed variable extension from bundle ''{0}'' overrides existing extension variable ''{1}'' from bundle ''{2}''", //$NON-NLS-1$ - new String[] {element.getDeclaringExtension().getContributor().getName(),oldVariable.getName(), - oldVariable.getConfigurationElement().getDeclaringExtension().getContributor().getName()}), null); + element.getDeclaringExtension().getContributor().getName(), oldVariable.getName(), oldVariable.getConfigurationElement().getDeclaringExtension().getContributor().getName()), null); } } } From d117f9cd24dde32d5e1ac12fce7fc99649afe4d0 Mon Sep 17 00:00:00 2001 From: Eclipse Platform Bot Date: Fri, 6 Jun 2025 04:41:53 +0000 Subject: [PATCH 2/2] Version bump(s) for 4.37 stream --- debug/org.eclipse.core.variables/META-INF/MANIFEST.MF | 2 +- runtime/features/org.eclipse.core.runtime.feature/feature.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/debug/org.eclipse.core.variables/META-INF/MANIFEST.MF b/debug/org.eclipse.core.variables/META-INF/MANIFEST.MF index 6d627132b89..a106108427f 100644 --- a/debug/org.eclipse.core.variables/META-INF/MANIFEST.MF +++ b/debug/org.eclipse.core.variables/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.core.variables; singleton:=true -Bundle-Version: 3.6.500.qualifier +Bundle-Version: 3.6.600.qualifier Bundle-Activator: org.eclipse.core.variables.VariablesPlugin Bundle-Vendor: %providerName Bundle-Localization: plugin diff --git a/runtime/features/org.eclipse.core.runtime.feature/feature.xml b/runtime/features/org.eclipse.core.runtime.feature/feature.xml index be6874fea08..5e0968005c8 100644 --- a/runtime/features/org.eclipse.core.runtime.feature/feature.xml +++ b/runtime/features/org.eclipse.core.runtime.feature/feature.xml @@ -2,7 +2,7 @@