From 113b057143332858b749614e97fdd501a180fd3e Mon Sep 17 00:00:00 2001 From: dragonmacher <48328597+dragonmacher@users.noreply.github.com> Date: Wed, 10 Dec 2025 12:10:51 -0500 Subject: [PATCH] GP-6200 - Fixed help NPE --- .../java/docking/help/CalloutRequest.java | 24 +++++-------------- 1 file changed, 6 insertions(+), 18 deletions(-) diff --git a/Ghidra/Framework/Docking/src/main/java/docking/help/CalloutRequest.java b/Ghidra/Framework/Docking/src/main/java/docking/help/CalloutRequest.java index 5785aeda35..62ad41f685 100644 --- a/Ghidra/Framework/Docking/src/main/java/docking/help/CalloutRequest.java +++ b/Ghidra/Framework/Docking/src/main/java/docking/help/CalloutRequest.java @@ -19,9 +19,7 @@ import java.awt.*; import java.awt.geom.*; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; -import java.net.*; -import java.nio.file.Path; -import java.nio.file.Paths; +import java.net.URL; import javax.help.WindowPresentation; import javax.swing.*; @@ -88,24 +86,14 @@ class CalloutRequest { } private void savePageInfo() { - URI uri; - try { - uri = requestUrl.toURI(); - } - catch (URISyntaxException e) { - // shouldn't happen - pageInfo = requestUrl.toString(); + pageInfo = requestUrl.toString(); + + int lastSlash = pageInfo.lastIndexOf('/'); + if (lastSlash < 0) { return; } - String uriPathString = uri.getPath(); - Path path = Paths.get(uriPathString); - Path fileName = path.getFileName(); - pageInfo = fileName.toString(); - String ref = requestUrl.getRef(); - if (ref != null) { - pageInfo = "#" + ref; - } + pageInfo = pageInfo.substring(lastSlash + 1, pageInfo.length()); } public void runLater() {