Merge remote-tracking branch 'origin/GP-4154-dragonmacher-theme-font-updates--SQUASHED'

Author: ryanmkurtz

Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/pcode/DebuggerPcodeStepperProvider.java

@@ -26,7 +26,8 @@
 import java.util.stream.Collectors;
 
 import javax.swing.*;
-import javax.swing.table.*;
+import javax.swing.table.TableColumn;
+import javax.swing.table.TableColumnModel;
 
 import db.Transaction;
 import docking.action.DockingAction;
@@ -265,8 +266,8 @@ class PcodeCellRenderer extends CounterBackgroundCellRenderer {
 		}
 
 		@Override
-		protected void configureFont(JTable table, TableModel model, int column) {
-			setFont(fixedWidthFont);
+		protected Font getDefaultFont() {
+			return fixedWidthFont;
 		}
 
 		@Override

Ghidra/Debug/ProposedUtils/src/main/java/docking/widgets/table/CustomToStringCellRenderer.java

@@ -25,7 +25,6 @@
 
 import javax.swing.*;
 import javax.swing.plaf.basic.BasicHTML;
-import javax.swing.table.TableModel;
 import javax.swing.text.View;
 
 import ghidra.docking.settings.Settings;
@@ -92,11 +91,7 @@ public CustomToStringCellRenderer(CustomFont font, Class<T> cls,
 	}
 
 	@Override
-	protected void configureFont(JTable table, TableModel model, int column) {
-		setFont(getCustomFont());
-	}
-
-	protected Font getCustomFont() {
+	protected Font getDefaultFont() {
 		switch (customFont) {
 			default:
 			case DEFAULT:

Ghidra/Extensions/MachineLearning/src/main/java/ghidra/machinelearning/functionfinding/SimilarStartsTableModel.java

@@ -15,11 +15,9 @@
  */
 package ghidra.machinelearning.functionfinding;
 
+import java.awt.Font;
 import java.util.List;
 
-import javax.swing.JTable;
-import javax.swing.table.TableModel;
-
 import docking.widgets.table.AbstractDynamicTableColumn;
 import docking.widgets.table.TableColumnDescriptor;
 import ghidra.docking.settings.Settings;
@@ -48,7 +46,7 @@ public class SimilarStartsTableModel extends AddressBasedTableModel<SimilarStart
 	 * Construct a table model for a table to display the closest function starts to
 	 * a potential function start
 	 * @param plugin owning program
-	 * @param program program 
+	 * @param program program
 	 * @param rows similar function starts
 	 * @param randomForestRow model and params
 	 */
@@ -123,9 +121,10 @@ public String getColumnName() {
 		@Override
 		public GColumnRenderer<String> getColumnRenderer() {
 			final GColumnRenderer<String> monospacedRenderer = new AbstractGColumnRenderer<>() {
+
 				@Override
-				protected void configureFont(JTable table, TableModel model, int column) {
-					setFont(getFixedWidthFont());
+				protected Font getDefaultFont() {
+					return fixedWidthFont;
 				}
 
 				@Override

Ghidra/Extensions/sample/src/main/java/ghidra/examples/HelloWorldComponentProvider.java

@@ -15,7 +15,8 @@
  */
 package ghidra.examples;
 
-import java.awt.*;
+import java.awt.BorderLayout;
+import java.awt.FlowLayout;
 import java.awt.event.*;
 
 import javax.swing.*;
@@ -30,8 +31,8 @@
 import ghidra.util.Msg;
 
 public class HelloWorldComponentProvider extends ComponentProviderAdapter {
-	private final static HelpLocation HELP = new HelpLocation("SampleHelpTopic",
-		"SampleHelpTopic_Anchor_Name");
+	private final static HelpLocation HELP =
+		new HelpLocation("SampleHelpTopic", "SampleHelpTopic_Anchor_Name");
 	private MyButton activeButtonObj;
 	private JPanel mainPanel;
 	private DockingAction action;
@@ -64,8 +65,8 @@ public void actionPerformed(ActionContext context) {
 		// the menu item will appear on the local toolbar drop down.
 		Icon icon = new GIcon("icon.sample.action.hello.world");
 		action.setMenuBarData(new MenuData(new String[] { "Misc", "Hello World" }, icon));
-		action.setKeyBindingData(new KeyBindingData(KeyStroke.getKeyStroke(KeyEvent.VK_W,
-			InputEvent.CTRL_MASK)));
+		action.setKeyBindingData(
+			new KeyBindingData(KeyStroke.getKeyStroke(KeyEvent.VK_W, InputEvent.CTRL_MASK)));
 
 		// puts the action on the local toolbar.
 		action.setToolBarData(new ToolBarData(icon));
@@ -81,11 +82,11 @@ public void actionPerformed(ActionContext context) {
 			public void actionPerformed(ActionContext context) {
 				announce("Hello World");
 
-				// To get the context object,				
+				// To get the context object,
 				Object contextObject = context.getContextObject();
 
 				// ...now we can cast activeObj to be a object of MyButton
-				// if that is necessary, as the overridden isAddToPopup() method below 
+				// if that is necessary, as the overridden isAddToPopup() method below
 				// will not add the popup action if the context object is not our button
 
 				@SuppressWarnings("unused")
@@ -120,8 +121,6 @@ private void buildMainPanel() {
 		JPanel panel = new JPanel(new FlowLayout(FlowLayout.CENTER));
 		panel.setBorder(BorderFactory.createTitledBorder("Example of a Component"));
 		activeButtonObj = new MyButton("Hello World");
-		Font f = activeButtonObj.getFont();
-		activeButtonObj.setFont(f.deriveFont(Font.BOLD, 14));
 		panel.add(activeButtonObj);
 		mainPanel.add(panel, BorderLayout.CENTER);
 	}

Ghidra/Features/BSim/src/main/java/ghidra/features/bsim/gui/overview/BSimOverviewModel.java

@@ -16,12 +16,11 @@
 package ghidra.features.bsim.gui.overview;
 
 import java.awt.Component;
+import java.awt.Font;
 import java.util.ArrayList;
 import java.util.List;
 
 import javax.swing.JLabel;
-import javax.swing.JTable;
-import javax.swing.table.TableModel;
 
 import docking.widgets.table.*;
 import generic.lsh.vector.LSHVectorFactory;
@@ -233,8 +232,8 @@ public Component getTableCellRendererComponent(GTableCellRenderingData data) {
 		}
 
 		@Override
-		protected void configureFont(JTable table, TableModel model, int column) {
-			setFont(fixedWidthFont);
+		protected Font getDefaultFont() {
+			return fixedWidthFont;
 		}
 
 		@Override

Ghidra/Features/BSim/src/main/java/ghidra/features/bsim/gui/search/dialog/AbstractBSimSearchDialog.java

@@ -28,6 +28,7 @@
 import docking.widgets.EmptyBorderButton;
 import docking.widgets.combobox.GComboBox;
 import docking.widgets.textfield.FloatingPointTextField;
+import generic.theme.Gui;
 import ghidra.features.bsim.query.BSimServerInfo;
 import ghidra.features.bsim.query.description.DatabaseInformation;
 import ghidra.features.bsim.query.facade.QueryDatabaseException;
@@ -243,7 +244,7 @@ protected JPanel createTitledPanel(String name, JComponent comp, boolean fullWid
 		contentPanel.add(comp, fullWidth ? BorderLayout.CENTER : BorderLayout.WEST);
 
 		JLabel label = new JLabel(name);
-		label.setFont(label.getFont().deriveFont(Font.BOLD));
+		Gui.registerFont(label, Font.BOLD);
 		titlePanel.add(label, BorderLayout.NORTH);
 
 		return panel;
@@ -260,7 +261,7 @@ private void managerServers() {
 
 //==================================================================================================
 // test methods
-//==================================================================================================	
+//==================================================================================================
 	protected void setServer(BSimServerInfo info) {
 		initializeConnection(info);
 	}
@@ -271,7 +272,7 @@ protected BSimServerInfo getServer() {
 
 //==================================================================================================
 // Inner Classes
-//==================================================================================================	
+//==================================================================================================
 	protected abstract class BSimQueryTask extends Task {
 		protected Exception errorException;