mirror/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-09-28 17:11:11 -09:00
Code Issues Packages Projects Releases Wiki Activity

GT-2698 refactor JLabel -> GLabel, JComboBox -> GComboBox, renderers.

Browse Source
This commit is contained in:
dev747368
2019-04-15 15:29:00 -04:00
parent e0c25b0590
commit 6448f0da8f
280 changed files with 2277 additions and 1531 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Ghidra/Features/FunctionID/src/main/java/ghidra/feature/fid/debug/FidFunctionDebugPanel.java
View File

@@ -20,7 +20,7 @@ import java.awt.event.ActionListener;
import javax.swing.*;
import docking.DockingUtils;
import docking.widgets.label.GDLabel;
import ghidra.feature.fid.db.*;
import ghidra.feature.fid.service.FidService;
import ghidra.program.model.lang.LanguageID;
@@ -64,7 +64,7 @@ public class FidFunctionDebugPanel extends JPanel {
* @param text the text of the label
*/
private void addLabel(String text) {
JLabel label = DockingUtils.createNonHtmlLabel(text);
JLabel label = new GDLabel(text);
label.setHorizontalAlignment(SwingConstants.LEFT);
label.setFont(FidDebugUtils.MONOSPACED_FONT);
add(label);

4
Ghidra/Features/FunctionID/src/main/java/ghidra/feature/fid/debug/FidSearchDebugDialog.java
View File

@@ -20,7 +20,7 @@ import java.io.IOException;
import javax.swing.*;
import docking.DialogComponentProvider;
import docking.DockingUtils;
import docking.widgets.label.GDLabel;
import ghidra.feature.fid.db.FidFileManager;
import ghidra.feature.fid.db.FidQueryService;
import ghidra.feature.fid.plugin.FidPlugin;
@@ -74,7 +74,7 @@ public class FidSearchDebugDialog extends DialogComponentProvider {
}
private JLabel getPreparedLabel(String text) {
JLabel label = DockingUtils.createNonHtmlLabel(text, SwingConstants.RIGHT);
JLabel label = new GDLabel(text, SwingConstants.RIGHT);
label.setFont(FidDebugUtils.MONOSPACED_FONT);
return label;
}

25
Ghidra/Features/FunctionID/src/main/java/ghidra/feature/fid/plugin/PopulateFidDialog.java
View File

@@ -24,9 +24,11 @@ import java.util.List;
import javax.swing.*;
import docking.DialogComponentProvider;
import docking.DockingUtils;
import docking.options.editor.ButtonPanelFactory;
import docking.widgets.combobox.GComboBox;
import docking.widgets.filechooser.GhidraFileChooser;
import docking.widgets.label.GDLabel;
import docking.widgets.label.GLabel;
import ghidra.app.script.SelectLanguageDialog;
import ghidra.feature.fid.db.*;
import ghidra.feature.fid.service.DefaultFidPopulateResultReporter;
@@ -106,36 +108,36 @@ public class PopulateFidDialog extends DialogComponentProvider {
private JComponent buildMainPanel() {
JPanel panel = new JPanel(new PairLayout());
panel.setBorder(BorderFactory.createEmptyBorder(10, 10, 10, 10));
JLabel jLabel = DockingUtils.createNonHtmlLabel("Fid Database: ", SwingConstants.RIGHT);
JLabel jLabel = new GDLabel("Fid Database: ", SwingConstants.RIGHT);
jLabel.setToolTipText("Choose the Fid Database to populate");
panel.add(jLabel);
panel.add(buildFidCombo());
panel.add(DockingUtils.createNonHtmlLabel("Library Family Name: ", SwingConstants.RIGHT));
panel.add(new GLabel("Library Family Name: ", SwingConstants.RIGHT));
libraryFamilyNameTextField = new JTextField(20);
libraryFamilyNameTextField.getDocument().addUndoableEditListener(e -> updateOkEnablement());
panel.add(libraryFamilyNameTextField);
panel.add(DockingUtils.createNonHtmlLabel("Library Version: ", SwingConstants.RIGHT));
panel.add(new GLabel("Library Version: ", SwingConstants.RIGHT));
versionTextField = new JTextField();
versionTextField.getDocument().addUndoableEditListener(e -> updateOkEnablement());
panel.add(versionTextField);
panel.add(DockingUtils.createNonHtmlLabel("Library Variant: ", SwingConstants.RIGHT));
panel.add(new GLabel("Library Variant: ", SwingConstants.RIGHT));
variantTextField = new JTextField();
variantTextField.getDocument().addUndoableEditListener(e -> updateOkEnablement());
panel.add(variantTextField);
panel.add(DockingUtils.createNonHtmlLabel("Base Library: ", SwingConstants.RIGHT));
panel.add(new GLabel("Base Library: ", SwingConstants.RIGHT));
panel.add(buildLibraryCombo());
panel.add(DockingUtils.createNonHtmlLabel("Root Folder: ", SwingConstants.RIGHT));
panel.add(new GLabel("Root Folder: ", SwingConstants.RIGHT));
panel.add(buildDomainFolderChooserField());
panel.add(DockingUtils.createNonHtmlLabel("Language: ", SwingConstants.RIGHT));
panel.add(new GLabel("Language: ", SwingConstants.RIGHT));
panel.add(buildLanguageField());
panel.add(DockingUtils.createNonHtmlLabel("Common Symbols File: ", SwingConstants.RIGHT));
panel.add(new GLabel("Common Symbols File: ", SwingConstants.RIGHT));
panel.add(buildSymbolsFileField(), jLabel);
return panel;
@@ -182,8 +184,7 @@ public class PopulateFidDialog extends DialogComponentProvider {
private Component buildLibraryCombo() {
LibraryChoice[] choices = getChoicesForLibraryCombo();
libraryComboBox = new JComboBox<>(choices);
DockingUtils.turnOffHTMLRendering(libraryComboBox);
libraryComboBox = new GComboBox<>(choices);
return libraryComboBox;
}
@@ -235,7 +236,7 @@ public class PopulateFidDialog extends DialogComponentProvider {
private Component buildFidCombo() {
List<FidFile> fidFileList = FidFileManager.getInstance().getUserAddedFiles();
FidFile[] files = fidFileList.toArray(new FidFile[fidFileList.size()]);
fidFileComboBox = new JComboBox<>(files);
fidFileComboBox = new GComboBox<>(files);
fidFileComboBox.addActionListener(e -> updateLibraryChoices());
return fidFileComboBox;
}