mirror/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-07-30 07:18:37 -09:00
Code Issues Packages Projects Releases Wiki Activity

GP-0 Corrected bad behavior in repository selection dialog.

Browse Source
This commit is contained in:
ghidra1
2026-05-08 11:00:43 -04:00
parent 2636d3003a
commit cac61167fe
2 changed files with 32 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Ghidra/Framework/Project/src/main/java/ghidra/framework/main/ProjectActionManager.java
View File

@@ -570,7 +570,7 @@ class ProjectActionManager {
ProjectManager projectManager = tool.getProjectManager(); ProjectManager projectManager = tool.getProjectManager();
projectManager.forgetViewedProject(view); projectManager.forgetViewedProject(view);
Msg.showError(getClass(), tool.getToolFrame(), "Error Adding View", Msg.showError(getClass(), tool.getToolFrame(), "Error Adding View",
"Failed to view project/repository: " + e.getMessage(), e); "Failed to view project/repository: " + e.getMessage());
} }
} }

35
Ghidra/Framework/Project/src/main/java/ghidra/framework/main/RepositoryChooser.java
View File

@@ -23,7 +23,7 @@ import java.io.IOException;
import java.net.URL; import java.net.URL;
import javax.swing.*; import javax.swing.*;
import javax.swing.event.MouseInputAdapter; import javax.swing.event.*;
import docking.ReusableDialogComponentProvider; import docking.ReusableDialogComponentProvider;
import docking.widgets.button.GButton; import docking.widgets.button.GButton;
@@ -131,6 +131,23 @@ class RepositoryChooser extends ReusableDialogComponentProvider {
urlTextField = new JTextField("ghidra:"); urlTextField = new JTextField("ghidra:");
urlTextField.getAccessibleContext().setAccessibleName("URL"); urlTextField.getAccessibleContext().setAccessibleName("URL");
urlTextField.getDocument().addDocumentListener(new DocumentListener() {
@Override
public void removeUpdate(DocumentEvent e) {
choiceChanged();
}
@Override
public void insertUpdate(DocumentEvent e) {
choiceChanged();
}
@Override
public void changedUpdate(DocumentEvent e) {
choiceChanged();
}
});
JPanel panel = new JPanel(new PairLayout()); JPanel panel = new JPanel(new PairLayout());
panel.add(new GLabel("URL:")); panel.add(new GLabel("URL:"));
@@ -255,13 +272,23 @@ class RepositoryChooser extends ReusableDialogComponentProvider {
try { try {
String urlText = urlTextField.getText(); String urlText = urlTextField.getText();
if (!GhidraURL.isGhidraURL(urlText)) { if (!GhidraURL.isGhidraURL(urlText)) {
setStatusText("URL must specify 'ghidra:' protocol", MessageType.ERROR); setStatusText("URL must specify 'ghidra:' protocol", MessageType.ERROR);
setOkEnabled(false);
return;
} }
else {
GhidraURL.toURL(urlText); // check ability to form URL instance URL url = GhidraURL.toURL(urlText); // check ability to form URL instance
setOkEnabled(true);
if (!GhidraURL.isLocalURL(url) && !GhidraURL.isServerRepositoryURL(url)) {
setStatusText("URL must specify server repository or local project",
MessageType.ERROR);
setOkEnabled(false);
return;
} }
setOkEnabled(true);
} }
catch (IllegalArgumentException e) { catch (IllegalArgumentException e) {
setStatusText(e.getMessage(), MessageType.ERROR); setStatusText(e.getMessage(), MessageType.ERROR);