From 29f215348aa9a1fa86dff6e51a35bf4c41c20837 Mon Sep 17 00:00:00 2001
From: Ryan Kurtz <ryanmkurtz@users.noreply.github.com>
Date: Mon, 13 May 2024 07:15:25 -0400
Subject: [PATCH] GP-4594: Fixing regression with library search paths not
 getting saved

---
 .../tracermi/launcher/ScriptPathsPropertyEditor.java   | 10 +++++-----
 .../ghidra/app/util/opinion/LibraryPathsDialog.java    |  8 ++++----
 .../widgets/pathmanager/AbstractPathsDialog.java       |  9 +--------
 3 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/Ghidra/Debug/Debugger-rmi-trace/src/main/java/ghidra/app/plugin/core/debug/gui/tracermi/launcher/ScriptPathsPropertyEditor.java b/Ghidra/Debug/Debugger-rmi-trace/src/main/java/ghidra/app/plugin/core/debug/gui/tracermi/launcher/ScriptPathsPropertyEditor.java
index fe12aae268..fa2a3c21fc 100644
--- a/Ghidra/Debug/Debugger-rmi-trace/src/main/java/ghidra/app/plugin/core/debug/gui/tracermi/launcher/ScriptPathsPropertyEditor.java
+++ b/Ghidra/Debug/Debugger-rmi-trace/src/main/java/ghidra/app/plugin/core/debug/gui/tracermi/launcher/ScriptPathsPropertyEditor.java
@@ -79,17 +79,17 @@ public class ScriptPathsPropertyEditor extends AbstractTypedPropertyEditor<Strin
 
 		@Override
 		protected PathnameTablePanel newPathnameTablePanel() {
-			PathnameTablePanel tablePanel = new ScriptPathsPanel(this::reset);
-			tablePanel.setFileChooserProperties(getTitle(), "DebuggerLaunchScriptDirectory",
+			PathnameTablePanel panel = new ScriptPathsPanel(loadPaths(), this::reset);
+			panel.setFileChooserProperties(getTitle(), "DebuggerLaunchScriptDirectory",
 				GhidraFileChooserMode.DIRECTORIES_ONLY, true, null);
-			return tablePanel;
+			return panel;
 		}
 	}
 
 	protected class ScriptPathsPanel extends PathnameTablePanel {
-		public ScriptPathsPanel(Callback resetCallback) {
+		public ScriptPathsPanel(String[] paths, Callback resetCallback) {
 			// disable edits, top/bottom irrelevant, unordered
-			super(null, resetCallback, false, false, false);
+			super(paths, resetCallback, false, false, false);
 		}
 
 		@Override
diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/opinion/LibraryPathsDialog.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/opinion/LibraryPathsDialog.java
index c879612201..b9c713fe3f 100644
--- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/opinion/LibraryPathsDialog.java
+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/opinion/LibraryPathsDialog.java
@@ -43,11 +43,11 @@ public class LibraryPathsDialog extends AbstractPathsDialog {
 	@Override
 	protected PathnameTablePanel newPathnameTablePanel() {
 		// disable edits, add to top, ordered
-		PathnameTablePanel tablePanel =
-			new PathnameTablePanel(null, this::reset, false, true, true);
-		tablePanel.setFileChooserProperties("Select Directory or Filesystem",
+		PathnameTablePanel panel =
+			new PathnameTablePanel(loadPaths(), this::reset, false, true, true);
+		panel.setFileChooserProperties("Select Directory or Filesystem",
 			"LibrarySearchDirectory", GhidraFileChooserMode.FILES_AND_DIRECTORIES, false, null);
-		return tablePanel;
+		return panel;
 	}
 
 	@Override
diff --git a/Ghidra/Framework/Docking/src/main/java/docking/widgets/pathmanager/AbstractPathsDialog.java b/Ghidra/Framework/Docking/src/main/java/docking/widgets/pathmanager/AbstractPathsDialog.java
index e84f294cd2..78780035d1 100644
--- a/Ghidra/Framework/Docking/src/main/java/docking/widgets/pathmanager/AbstractPathsDialog.java
+++ b/Ghidra/Framework/Docking/src/main/java/docking/widgets/pathmanager/AbstractPathsDialog.java
@@ -15,8 +15,6 @@
  */
 package docking.widgets.pathmanager;
 
-import javax.swing.JComponent;
-
 import docking.DialogComponentProvider;
 
 public abstract class AbstractPathsDialog extends DialogComponentProvider {
@@ -26,7 +24,7 @@ public abstract class AbstractPathsDialog extends DialogComponentProvider {
 	protected AbstractPathsDialog(String title) {
 		super(title);
 		tablePanel = newPathnameTablePanel();
-		addWorkPanel(buildWorkPanel());
+		addWorkPanel(tablePanel);
 		addOKButton();
 		addCancelButton();
 		setPreferredSize(600, 400);
@@ -44,11 +42,6 @@ public abstract class AbstractPathsDialog extends DialogComponentProvider {
 		tablePanel.setPaths(paths);
 	}
 
-	protected JComponent buildWorkPanel() {
-		reset();
-		return tablePanel;
-	}
-
 	@Override
 	protected void okCallback() {
 		String[] paths = tablePanel.getPaths();