yetangitu/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2025-10-04 10:19:23 +02:00
Code Issues 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/Framework/SoftwareModeling/src/main/java/ghidra/program/database/data/DataTypeArchiveTransformer.java
View file

@ -26,8 +26,8 @@ import javax.swing.*;
import org.apache.commons.lang3.StringUtils;
import docking.DockingUtils;
import docking.framework.DockingApplicationConfiguration;
import docking.widgets.label.GDLabel;
import ghidra.GhidraApplicationLayout;
import ghidra.GhidraLaunchable;
import ghidra.app.plugin.core.datamgr.archive.SourceArchive;
@ -789,7 +789,7 @@ public class DataTypeArchiveTransformer implements GhidraLaunchable {
monitorComponent.setVisible(true);
statusPanel.add(monitorComponent, BorderLayout.EAST);
// Add the status message to the status area.
JLabel statusLabel = DockingUtils.createNonHtmlLabel(" ");
JLabel statusLabel = new GDLabel(" ");
statusPanel.add(statusLabel, BorderLayout.CENTER);
Dimension preferredSize = statusLabel.getPreferredSize();
preferredSize.height = monitorComponent.getPreferredSize().height;

16
Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/data/DataTypeArchiveTransformerPanel.java
View file

@ -23,8 +23,9 @@ import java.io.IOException;
import javax.swing.*;
import docking.DockingUtils;
import docking.widgets.filechooser.GhidraFileChooser;
import docking.widgets.label.GHtmlLabel;
import docking.widgets.label.GLabel;
import ghidra.framework.preferences.Preferences;
import ghidra.util.exception.*;
import ghidra.util.task.TaskMonitor;
@ -59,11 +60,10 @@ public class DataTypeArchiveTransformerPanel extends JPanel {
}
private void setupDescription() {
String description =
"<HTML>" + "Specify the files for converting a new data type archive (.gdt)<BR>" +
JLabel label = new GHtmlLabel(
"<HTML>Specify the files for converting a new data type archive (.gdt)<BR>" +
"to match the IDs of data types in an old data type archive.<BR>" +
"The result will be saved to the destination archive." + "</HTML>";
JLabel label = DockingUtils.createHtmlLabel(description);
"The result will be saved to the destination archive.</HTML>");
label.setBorder(BorderFactory.createEmptyBorder(0, 0, 8, 0));
label.setHorizontalAlignment(SwingConstants.CENTER);
add(label, BorderLayout.NORTH);
@ -76,7 +76,7 @@ public class DataTypeArchiveTransformerPanel extends JPanel {
gbc.gridy = 0;
gbc.gridx = 0;
gbc.gridwidth = 1;
filePanel.add(DockingUtils.createNonHtmlLabel("Old file name "), gbc);
filePanel.add(new GLabel("Old file name "), gbc);
gbc.gridx = 1;
gbc.gridwidth = 1;
@ -114,7 +114,7 @@ public class DataTypeArchiveTransformerPanel extends JPanel {
gbc.gridy = 1;
gbc.gridx = 0;
gbc.gridwidth = 1;
filePanel.add(DockingUtils.createNonHtmlLabel("New file name "), gbc);
filePanel.add(new GLabel("New file name "), gbc);
gbc.gridx = 1;
gbc.gridwidth = 1;
@ -147,7 +147,7 @@ public class DataTypeArchiveTransformerPanel extends JPanel {
gbc.gridy = 2;
gbc.gridx = 0;
gbc.gridwidth = 1;
filePanel.add(DockingUtils.createNonHtmlLabel("Destination file name "), gbc);
filePanel.add(new GLabel("Destination file name "), gbc);
gbc.gridx = 1;
gbc.gridwidth = 1;