yetangitu/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2025-10-06 03:50:02 +02:00
Code Issues Releases Wiki Activity

removed accidentally added update

Browse source
This commit is contained in:
dragonmacher 2022-08-16 12:04:37 -04:00
parent d575924eb9
commit c39797e841
2 changed files with 21 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/platform/DebuggerSelectPlatformOfferDialog.java
View file

@ -17,7 +17,8 @@ package ghidra.app.plugin.core.debug.gui.platform;
import java.awt.BorderLayout;
import java.awt.Dimension;
import java.util.*;
import java.util.Collection;
import java.util.List;
import java.util.function.Function;
import javax.swing.*;
@ -52,7 +53,9 @@ public class DebuggerSelectPlatformOfferDialog extends DialogComponentProvider {
return "Unspecified";
}
try {
return LANG_SERV.getLanguageDescription(offer.getLanguageID()).getProcessor().toString();
return LANG_SERV.getLanguageDescription(offer.getLanguageID())
.getProcessor()
.toString();
}
catch (LanguageNotFoundException e) {
return "Not Found";
@ -265,7 +268,7 @@ public class DebuggerSelectPlatformOfferDialog extends DialogComponentProvider {
private boolean isCancelled = false;
protected DebuggerSelectPlatformOfferDialog() {
super(DebuggerResources.NAME_CHOOSE_PLATFORM, Set.of(Opt.MODAL, Opt.INCLUDE_BUTTONS));
super(DebuggerResources.NAME_CHOOSE_PLATFORM, true, false, true, false);
populateComponents();
}

29
Ghidra/Framework/Docking/src/main/java/docking/DialogComponentProvider.java
View file

@ -45,10 +45,6 @@ import utility.function.Callback;
public class DialogComponentProvider
implements ActionContextProvider, StatusListener, TaskListener {
protected enum Opt {
MODAL, INCLUDE_STATUS, INCLUDE_BUTTONS, CAN_RUN_TASKS;
}
private static final Color WARNING_COLOR = new Color(0xff9900);
private final static int DEFAULT_DELAY = 750;
@ -104,18 +100,7 @@ public class DialogComponentProvider
private Dimension defaultSize;
/**
* Constructor for GhidraDialogComponent using option set instead of booleans
* @param title the dialog title
* @param options the options. See {@link Option} and
* {{@link #DialogComponentProvider(String, boolean, boolean, boolean, boolean)}
*/
protected DialogComponentProvider(String title, Set<Opt> options) {
this(title, options.contains(Opt.MODAL), options.contains(Opt.INCLUDE_STATUS),
options.contains(Opt.INCLUDE_BUTTONS), options.contains(Opt.CAN_RUN_TASKS));
}
/**
* Constructor for a GhidraDialogComponent that will be modal and will include a status line and
* Constructor for a DialogComponentProvider that will be modal and will include a status line and
* a button panel. Its title will be the same as its name.
* @param title the dialog title.
*/
@ -124,7 +109,7 @@ public class DialogComponentProvider
}
/**
* Constructor for a GhidraDialogComponent that will include a status line and a button panel.
* Constructor for a DialogComponentProvider that will include a status line and a button panel.
* @param title the title for this dialog.
* @param modal true if this dialog should be modal.
*/
@ -133,7 +118,7 @@ public class DialogComponentProvider
}
/**
* Constructs a new GhidraDialogComponent.
* Constructs a new DialogComponentProvider.
* @param title the title for this dialog.
* @param modal true if this dialog should be modal.
* @param includeStatus true if this dialog should include a status line.
@ -651,8 +636,8 @@ public class DialogComponentProvider
private void doSetStatusText(String text, MessageType type, boolean alert) {
SystemUtilities.assertThisIsTheSwingThread(
"Setting text must be performed on the Swing thread");
SystemUtilities
.assertThisIsTheSwingThread("Setting text must be performed on the Swing thread");
statusLabel.setText(text);
statusLabel.setForeground(getStatusColor(type));
@ -686,8 +671,8 @@ public class DialogComponentProvider
private void doAlertMessage(Callback alertFinishedCallback) {
// must be on Swing; this allows us to synchronize the 'alerting' flag
SystemUtilities.assertThisIsTheSwingThread(
"Alerting must be performed on the Swing thread");
SystemUtilities
.assertThisIsTheSwingThread("Alerting must be performed on the Swing thread");
if (isAlerting) {
return;