yetangitu/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2025-10-05 19:42:36 +02:00
Code Issues Releases Wiki Activity

GT-3021 Fix HTML text warnings.

Browse source 
Change some G?Labels to G?HtmlLabels
This commit is contained in:
dev747368 2019-07-19 17:29:04 -04:00
parent c7f934c9d1
commit 9274e27f8e
3 changed files with 51 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

22
Ghidra/Features/Base/src/main/java/ghidra/app/merge/listing/VariousChoicesPanel.java
View file

@ -15,19 +15,29 @@
*/
package ghidra.app.merge.listing;
import java.awt.*;
import java.awt.event.*;
import java.awt.BorderLayout;
import java.awt.Color;
import java.awt.Font;
import java.awt.FontMetrics;
import java.awt.event.ComponentEvent;
import java.awt.event.ComponentListener;
import java.awt.event.ItemEvent;
import java.awt.event.ItemListener;
import java.util.ArrayList;
import java.util.Iterator;
import javax.swing.*;
import javax.swing.BorderFactory;
import javax.swing.ButtonGroup;
import javax.swing.JComponent;
import javax.swing.JPanel;
import javax.swing.SwingConstants;
import javax.swing.border.Border;
import javax.swing.border.TitledBorder;
import javax.swing.event.ChangeListener;
import docking.widgets.button.GRadioButton;
import docking.widgets.checkbox.GCheckBox;
import docking.widgets.label.GDLabel;
import docking.widgets.label.GDHtmlLabel;
import docking.widgets.label.GLabel;
import ghidra.app.merge.util.ConflictUtility;
import ghidra.util.HTMLUtilities;
@ -48,7 +58,7 @@ public class VariousChoicesPanel extends ConflictPanel {
BorderFactory.createMatteBorder(0, 0, 1, 0, Color.BLACK);
private JPanel rowPanel;
private JLabel headerLabel;
private GDHtmlLabel headerLabel;
private ArrayList<ChoiceRow> rows;
private Border radioButtonBorder;
private Border checkBoxBorder;
@ -80,7 +90,7 @@ public class VariousChoicesPanel extends ConflictPanel {
rowPanel = new JPanel(layout);
rowPanel.setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5));
setLayout(new BorderLayout());
headerLabel = new GDLabel(" ");
headerLabel = new GDHtmlLabel(" ");
headerLabel.setHorizontalAlignment(SwingConstants.CENTER);
add(headerLabel, BorderLayout.NORTH);
setHeader(null);

36
Ghidra/Features/Base/src/main/java/ghidra/app/merge/listing/VerticalChoicesPanel.java
View file

@ -15,19 +15,35 @@
*/
package ghidra.app.merge.listing;
import java.awt.*;
import java.awt.event.*;
import java.util.*;
import java.awt.BorderLayout;
import java.awt.Color;
import java.awt.Component;
import java.awt.Font;
import java.awt.FontMetrics;
import java.awt.Insets;
import java.awt.event.ComponentEvent;
import java.awt.event.ComponentListener;
import java.awt.event.ItemEvent;
import java.awt.event.ItemListener;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.ListIterator;
import javax.swing.*;
import javax.swing.BorderFactory;
import javax.swing.ButtonGroup;
import javax.swing.JCheckBox;
import javax.swing.JComponent;
import javax.swing.JPanel;
import javax.swing.JRadioButton;
import javax.swing.SwingConstants;
import javax.swing.border.Border;
import javax.swing.border.TitledBorder;
import javax.swing.event.ChangeListener;
import docking.widgets.button.GRadioButton;
import docking.widgets.checkbox.GCheckBox;
import docking.widgets.label.GDHtmlLabel;
import docking.widgets.label.GDLabel;
import docking.widgets.label.GLabel;
import ghidra.app.merge.util.ConflictUtility;
import ghidra.util.HTMLUtilities;
import ghidra.util.datastruct.LongArrayList;
@ -55,7 +71,7 @@ public class VerticalChoicesPanel extends ConflictPanel {
final static int RADIO_BUTTON = 2;
final static int CHECK_BOX = 3;
private JLabel headerLabel;
private GDHtmlLabel headerLabel;
private JPanel rowPanel;
private ArrayList<ArrayList<JComponent>> rowComps;
private ArrayList<String[]> rows;
@ -92,7 +108,7 @@ public class VerticalChoicesPanel extends ConflictPanel {
setBorder(BorderFactory.createTitledBorder("Resolve Conflict"));
setLayout(new BorderLayout());
headerLabel = new GDLabel(" ");
headerLabel = new GDHtmlLabel(" ");
headerLabel.setHorizontalAlignment(SwingConstants.CENTER);
add(headerLabel, BorderLayout.NORTH);
@ -275,7 +291,7 @@ public class VerticalChoicesPanel extends ConflictPanel {
firstComp.addItemListener(itemListener);
setRowComponent(firstComp, row, 0, defaultInsets);
for (int i = 1; i < items.length; i++) {
JLabel newComp = new MyLabel(items[i]);
MyLabel newComp = new MyLabel(items[i]);
newComp.setName(getComponentName(row, i));
setRowComponent(newComp, row, i, textVsButtonInsets);
}
@ -310,7 +326,7 @@ public class VerticalChoicesPanel extends ConflictPanel {
firstComp.addItemListener(itemListener);
setRowComponent(firstComp, row, 0, defaultInsets);
for (int i = 1; i < items.length; i++) {
JLabel newComp = new MyLabel(items[i]);
MyLabel newComp = new MyLabel(items[i]);
newComp.setName(getComponentName(row, i));
setRowComponent(newComp, row, i, textVsCheckBoxInsets);
}
@ -455,7 +471,7 @@ public class VerticalChoicesPanel extends ConflictPanel {
return allChoicesAreResolved();
}
private class MyLabel extends GLabel {
private class MyLabel extends GDHtmlLabel {
/**
* @param text the text of this label.

12
Ghidra/Features/Base/src/main/java/ghidra/app/util/viewer/util/TitledPanel.java
View file

@ -15,12 +15,18 @@
*/
package ghidra.app.util.viewer.util;
import java.awt.*;
import java.awt.BorderLayout;
import java.awt.Dimension;
import java.awt.FlowLayout;
import java.util.ArrayList;
import java.util.List;
import javax.swing.*;
import javax.swing.BorderFactory;
import javax.swing.JComponent;
import javax.swing.JLabel;
import javax.swing.JPanel;
import docking.widgets.label.GDHtmlLabel;
import docking.widgets.label.GDLabel;
/**
@ -41,7 +47,7 @@ public class TitledPanel extends JPanel {
* @param margin the size of the margin to use
*/
public TitledPanel(String name, JComponent panel, int margin) {
this(new GDLabel(name), panel, margin);
this(new GDHtmlLabel(name), panel, margin);
}
/**