From 04db4329a284a78ef1ce201350d987eedb1cbb37 Mon Sep 17 00:00:00 2001 From: Jonah Graham Date: Mon, 1 Dec 2025 12:29:57 -0500 Subject: [PATCH 1/3] Fixup warnings due to deprecated URL constructor (in Examples only) --- .../org/eclipse/swt/examples/launcher/LauncherPlugin.java | 4 +++- .../src/org/eclipse/swt/examples/dnd/DNDExample.java | 7 ++++--- .../eclipse/swt/examples/imageanalyzer/ImageAnalyzer.java | 5 +++-- .../src/org/eclipse/swt/snippets/Snippet317.java | 6 +++--- 4 files changed, 13 insertions(+), 9 deletions(-) diff --git a/examples/org.eclipse.swt.examples.launcher/src/org/eclipse/swt/examples/launcher/LauncherPlugin.java b/examples/org.eclipse.swt.examples.launcher/src/org/eclipse/swt/examples/launcher/LauncherPlugin.java index 8d98dce3474..6c92d8a5f66 100644 --- a/examples/org.eclipse.swt.examples.launcher/src/org/eclipse/swt/examples/launcher/LauncherPlugin.java +++ b/examples/org.eclipse.swt.examples.launcher/src/org/eclipse/swt/examples/launcher/LauncherPlugin.java @@ -16,6 +16,7 @@ import java.io.IOException; import java.io.InputStream; +import java.net.URI; import java.net.URL; import java.text.MessageFormat; import java.util.HashMap; @@ -390,7 +391,8 @@ private static Image getImageFromPlugin(Bundle bundle, String iconPath) { InputStream is = null; try { URL installUrl = bundle.getEntry("/"); - URL url = new URL(installUrl, iconPath); + URI uri = installUrl.toURI().resolve(iconPath); + URL url = uri.toURL(); is = url.openConnection().getInputStream(); ImageData source = new ImageData(is); ImageData mask = source.getTransparencyMask(); diff --git a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/dnd/DNDExample.java b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/dnd/DNDExample.java index d69916d2051..5f3cec56ab3 100644 --- a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/dnd/DNDExample.java +++ b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/dnd/DNDExample.java @@ -18,7 +18,8 @@ import java.io.File; import java.net.MalformedURLException; -import java.net.URL; +import java.net.URI; +import java.net.URISyntaxException; import org.eclipse.swt.SWT; import org.eclipse.swt.SWTError; @@ -423,8 +424,8 @@ public void dragStart(org.eclipse.swt.dnd.DragSourceEvent event) { dragDataHTML = ""+dragDataText+""; dragDataURL = "http://" + dragDataText.replace(' ', '.'); try { - new URL(dragDataURL); - } catch (MalformedURLException e) { + new URI(dragDataURL).toURL(); + } catch (MalformedURLException | URISyntaxException | IllegalArgumentException e) { dragDataURL = null; } } diff --git a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/imageanalyzer/ImageAnalyzer.java b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/imageanalyzer/ImageAnalyzer.java index e59da93191d..1fe40e833f8 100644 --- a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/imageanalyzer/ImageAnalyzer.java +++ b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/imageanalyzer/ImageAnalyzer.java @@ -16,6 +16,7 @@ import static org.eclipse.swt.events.SelectionListener.widgetSelectedAdapter; import java.io.InputStream; +import java.net.URI; import java.net.URL; import java.text.MessageFormat; import java.util.ArrayList; @@ -879,7 +880,7 @@ void menuOpenURL() { imageCanvas.setCursor(waitCursor); ImageLoader oldLoader = loader; try { - URL url = new URL(urlname); + URL url = new URI(urlname).toURL(); try (InputStream stream = url.openStream()) { loader = new ImageLoader(); if (incremental) { @@ -1221,7 +1222,7 @@ void menuReopen() { loader = new ImageLoader(); ImageData[] newImageData; if (fileName == null) { - URL url = new URL(currentName); + URL url = new URI(currentName).toURL(); try (InputStream stream = url.openStream()) { long startTime = System.currentTimeMillis(); newImageData = loader.load(stream); diff --git a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet317.java b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet317.java index a3418c5036e..813b7ad622b 100644 --- a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet317.java +++ b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet317.java @@ -79,14 +79,14 @@ public void changed(LocationEvent event) { browser.addAuthenticationListener(event -> { try { - URL url = new URL(event.location); - if (url.getHost().equals(KNOWN_HOST)) { + URI uri = new URI(event.location); + if (uri.getHost().equals(KNOWN_HOST)) { event.user = KNOWN_USER; event.password = KNOWN_PASSWORD; } else { /* do nothing, let default prompter run */ } - } catch (MalformedURLException e) { + } catch (URISyntaxException e) { /* should not happen, let default prompter run */ } }); From 1ab25a7efbbf6fb8cdd825bfa33ba1eaf85d3265 Mon Sep 17 00:00:00 2001 From: Jonah Graham Date: Mon, 1 Dec 2025 12:44:41 -0500 Subject: [PATCH 2/3] Fixup warning due to deprecated Thread.getId (in Examples only) --- .../src/org/eclipse/swt/snippets/SnippetExplorer.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/SnippetExplorer.java b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/SnippetExplorer.java index b306cc46f52..0c862e839d8 100644 --- a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/SnippetExplorer.java +++ b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/SnippetExplorer.java @@ -1042,7 +1042,7 @@ public void stopSnippets() { if (!launchedSnippets.isEmpty()) { System.err.println("Some Snippets are still running:"); for (Thread t : launchedSnippets) { - System.err.println(" " + t.getName() + " (ThreadId: " + t.getId() + ")"); + System.err.println(" " + t.getName() + " (ThreadId: " + t.threadId() + ")"); final Display d = Display.findDisplay(t); if (d != null && !d.isDisposed()) { d.syncExec(d::dispose); From 1ff5065f098aa4d87793673a37d8a96470eaab4c Mon Sep 17 00:00:00 2001 From: Jonah Graham Date: Mon, 1 Dec 2025 12:45:48 -0500 Subject: [PATCH 3/3] Fixup warning due to deprecated Runtime.exec(String) (in Examples only) --- .../src/org/eclipse/swt/snippets/SnippetExplorer.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/SnippetExplorer.java b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/SnippetExplorer.java index 0c862e839d8..3008b5d2c6b 100644 --- a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/SnippetExplorer.java +++ b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/SnippetExplorer.java @@ -194,7 +194,7 @@ public static void main(String[] args) { */ private static boolean canRunCommand(String command) { try { - final Process p = Runtime.getRuntime().exec(command); + final Process p = Runtime.getRuntime().exec(new String[] {command}); p.waitFor(150, TimeUnit.MILLISECONDS); if (p.isAlive()) { p.destroy();