From a89e30d883f84dec5ccc39cd24cd64ac4c1e5d9b Mon Sep 17 00:00:00 2001 From: Eclipse Platform Bot Date: Fri, 6 Jun 2025 04:39:16 +0000 Subject: [PATCH 1/2] Perform clean code of debug/org.eclipse.debug.examples.core --- .../org/eclipse/debug/examples/core/pda/DebugCorePlugin.java | 3 ++- .../debug/examples/core/pda/launcher/PDALaunchDelegate.java | 4 ++-- .../eclipse/debug/examples/core/pda/model/PDAStackFrame.java | 3 +-- .../org/eclipse/debug/examples/core/pda/model/PDAThread.java | 3 +-- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/debug/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/DebugCorePlugin.java b/debug/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/DebugCorePlugin.java index 13a05bcd5b0..9faa61f2869 100644 --- a/debug/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/DebugCorePlugin.java +++ b/debug/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/DebugCorePlugin.java @@ -114,8 +114,9 @@ public static String getResourceString(String key) { */ public ResourceBundle getResourceBundle() { try { - if (resourceBundle == null) + if (resourceBundle == null) { resourceBundle = ResourceBundle.getBundle("org.eclipse.debug.examples.core.pda.DebugCorePluginResources"); //$NON-NLS-1$ + } } catch (MissingResourceException x) { resourceBundle = null; } diff --git a/debug/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/launcher/PDALaunchDelegate.java b/debug/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/launcher/PDALaunchDelegate.java index 3ed2d290523..a38918cbe64 100644 --- a/debug/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/launcher/PDALaunchDelegate.java +++ b/debug/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/launcher/PDALaunchDelegate.java @@ -63,7 +63,7 @@ public void launch(ILaunchConfiguration configuration, String mode, ILaunch laun } File exe = new File(javaVMExec); if (!exe.exists()) { - abort(MessageFormat.format("Specified java VM executable {0} does not exist.", new Object[]{javaVMExec}), null); //$NON-NLS-1$ + abort(MessageFormat.format("Specified java VM executable {0} does not exist.", javaVMExec), null); //$NON-NLS-1$ } commandList.add(javaVMExec); @@ -80,7 +80,7 @@ public void launch(ILaunchConfiguration configuration, String mode, ILaunch laun IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(IPath.fromOSString(program)); if (!file.exists()) { - abort(MessageFormat.format("Perl program {0} does not exist.", new Object[] { file.getFullPath().toString() }), null); //$NON-NLS-1$ + abort(MessageFormat.format("Perl program {0} does not exist.", file.getFullPath().toString()), null); //$NON-NLS-1$ } commandList.add(file.getLocation().toOSString()); diff --git a/debug/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/model/PDAStackFrame.java b/debug/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/model/PDAStackFrame.java index 8326df892f2..4a7de18ac29 100644 --- a/debug/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/model/PDAStackFrame.java +++ b/debug/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/model/PDAStackFrame.java @@ -195,8 +195,7 @@ public String getSourceName() { @Override public boolean equals(Object obj) { - if (obj instanceof PDAStackFrame) { - PDAStackFrame sf = (PDAStackFrame)obj; + if (obj instanceof PDAStackFrame sf) { return sf.getThread().equals(getThread()) && sf.getSourceName().equals(getSourceName()) && sf.fId == fId; diff --git a/debug/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/model/PDAThread.java b/debug/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/model/PDAThread.java index f5d011b066c..6eeef051baf 100644 --- a/debug/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/model/PDAThread.java +++ b/debug/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/model/PDAThread.java @@ -296,8 +296,7 @@ public Object getError() { @Override public void handleEvent(PDAEvent _event) { - if (_event instanceof PDARunControlEvent && fThreadId == ((PDARunControlEvent)_event).fThreadId) { - PDARunControlEvent event = (PDARunControlEvent)_event; + if (_event instanceof PDARunControlEvent event && fThreadId == event.fThreadId) { // clear previous state fBreakpoint = null; setStepping(false); From 176c75ca946ffe2a36a123dbb07a6a82c4d32217 Mon Sep 17 00:00:00 2001 From: Eclipse Platform Bot Date: Fri, 6 Jun 2025 04:44:08 +0000 Subject: [PATCH 2/2] Version bump(s) for 4.37 stream --- debug/org.eclipse.debug.examples.core/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.debug.examples.core/META-INF/MANIFEST.MF b/debug/org.eclipse.debug.examples.core/META-INF/MANIFEST.MF index 7f8b76912a3..dec00e7fece 100644 --- a/debug/org.eclipse.debug.examples.core/META-INF/MANIFEST.MF +++ b/debug/org.eclipse.debug.examples.core/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.debug.examples.core;singleton:=true -Bundle-Version: 1.6.500.qualifier +Bundle-Version: 1.6.600.qualifier Bundle-Activator: org.eclipse.debug.examples.core.pda.DebugCorePlugin Require-Bundle: org.eclipse.core.runtime, org.eclipse.core.resources, 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 @@