Merge remote-tracking branch 'origin/patch'

Ghidra/Features/Base/certification.manifest

@@ -708,12 +708,14 @@ src/main/resources/images/LocalVariable.gif||GHIDRA||||END|
 src/main/resources/images/MarkSelection.png||GHIDRA||||END|
 src/main/resources/images/Merge.png||GHIDRA||||END|
 src/main/resources/images/MultiDuplicateData.png||GHIDRA||||END|
+src/main/resources/images/Namespace.dark.gif||GHIDRA||||END|
 src/main/resources/images/Namespace.gif||GHIDRA||||END|
 src/main/resources/images/NextHighlightBlock16.gif||GHIDRA||||END|
 src/main/resources/images/NextSelectionBlock16.gif||GHIDRA||||END|
 src/main/resources/images/Parameter.gif||GHIDRA||||END|
 src/main/resources/images/PreviousHighlightBlock16.gif||GHIDRA||||END|
 src/main/resources/images/PreviousSelectionBlock16.gif||GHIDRA||||END|
+src/main/resources/images/ThunkFunction.dark.gif||GHIDRA||||END|
 src/main/resources/images/ThunkFunction.gif||GHIDRA||||END|
 src/main/resources/images/U.gif||GHIDRA||||END|
 src/main/resources/images/Unpackage.gif||GHIDRA||||END|
@@ -748,6 +750,7 @@ src/main/resources/images/closedFolderGroup.png||Modified Nuvola Icons - LGPL 2.
 src/main/resources/images/closedFolderInView.png||Modified Nuvola Icons - LGPL 2.1||||END|
 src/main/resources/images/closedFolderInvalid.png||Modified Nuvola Icons - LGPL 2.1||||END|
 src/main/resources/images/closedFolderLabels.png||Modified Nuvola Icons - LGPL 2.1||||END|
+src/main/resources/images/closedFolderNamespaces.dark.png||GHIDRA||||END|
 src/main/resources/images/closedFolderNamespaces.png||Modified Nuvola Icons - LGPL 2.1||||END|
 src/main/resources/images/cloudbar.jpg||GHIDRA||reviewed||END|
 src/main/resources/images/cloudbarReversed.jpg||GHIDRA||reviewed||END|
@@ -853,6 +856,7 @@ src/main/resources/images/openFolderFunctions.png||Modified Nuvola Icons - LGPL
 src/main/resources/images/openFolderGroup.png||Modified Nuvola Icons - LGPL 2.1||||END|
 src/main/resources/images/openFolderInView.png||Modified Nuvola Icons - LGPL 2.1||||END|
 src/main/resources/images/openFolderLabels.png||Modified Nuvola Icons - LGPL 2.1||||END|
+src/main/resources/images/openFolderNamespaces.dark.png||GHIDRA||||END|
 src/main/resources/images/openFolderNamespaces.png||Modified Nuvola Icons - LGPL 2.1||||END|
 src/main/resources/images/oxygen/16x16/application-pdf.png||Oxygen Icons - LGPL 3.0|||Oxygen icon theme (dual license; LGPL or CC-SA-3.0)|END|
 src/main/resources/images/oxygen/16x16/application-x-bzip.png||Oxygen Icons - LGPL 3.0|||Oxygen icon theme (dual license; LGPL or CC-SA-3.0)|END|

Ghidra/Features/Base/data/base.icons.theme.properties

@@ -399,3 +399,11 @@ icon.base.util.datatree.version.control.archive.dt.checkout.undo = vcUndoCheckOu
 
 
 [Dark Defaults]
+
+
+icon.plugin.symboltree.node.function.thunk = ThunkFunction.dark.gif
+icon.plugin.symboltree.node.namespace = Namespace.dark.gif
+icon.plugin.symboltree.node.category.namespace.closed = closedFolderNamespaces.dark.png
+icon.plugin.symboltree.node.category.namespace.open = openFolderNamespaces.dark.png
+
+

Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/osgi/BundleStatusTableModel.java

@@ -40,7 +40,7 @@ import ghidra.util.table.column.AbstractGColumnRenderer;
 import ghidra.util.table.column.GColumnRenderer;
 
 /**
- * Model for {@link BundleStatus} objects. 
+ * Model for {@link BundleStatus} objects.
  */
 public class BundleStatusTableModel
 		extends GDynamicColumnTableModel<BundleStatus, List<BundleStatus>> {
@@ -50,7 +50,7 @@ public class BundleStatusTableModel
 	private static final Color COLOR_BUNDLE_DISABLED = new GColor("color.fg.table.bundle.disabled");
 	private static final Color COLOR_BUNDLE_BUSY = new GColor("color.fg.table.bundle.busy");
 	private static final Color COLOR_BUNDLE_INACTIVE = new GColor("color.fg.table.bundle.inactive");
-	private static final Color COLOR_BUNDLE_ACTIVE = new GColor("color.fg.table.bundle.active"); 
+	private static final Color COLOR_BUNDLE_ACTIVE = new GColor("color.fg.table.bundle.active");
 	//@formatter:on
 
 	private BundleHost bundleHost;
@@ -226,7 +226,7 @@ public class BundleStatusTableModel
 	}
 
 	/**
-	 * return the row objects corresponding an array of model row indices.  
+	 * return the row objects corresponding an array of model row indices.
 	 * 
 	 * @param modelRowIndices row indices
 	 * @return status objects
@@ -240,7 +240,7 @@ public class BundleStatusTableModel
 	}
 
 	/**
-	 * overridden to avoid generating events when nothing changed 
+	 * overridden to avoid generating events when nothing changed
 	 */
 	@Override
 	protected void sort(List<BundleStatus> data, TableSortingContext<BundleStatus> sortingContext) {
@@ -278,7 +278,7 @@ public class BundleStatusTableModel
 		}
 	}
 
-	/** 
+	/**
 	 * (re)compute cached mapping from bundleloc to bundlepath
 	 * 
 	 * <p>only used in testing
@@ -560,20 +560,24 @@ public class BundleStatusTableModel
 			GhidraBundle bundle = bundleHost.getGhidraBundle(file);
 			if (bundle == null || bundle instanceof GhidraPlaceholderBundle || !file.exists()) {
 				label.setForeground(COLOR_BUNDLE_ERROR);
+				return label;
+			}
+
+			if (data.isSelected()) {
+				return label; // use default selection colors
+			}
+
+			if (status.isBusy()) {
+				label.setForeground(COLOR_BUNDLE_BUSY);
+			}
+			else if (!status.isEnabled()) {
+				label.setForeground(COLOR_BUNDLE_DISABLED);
+			}
+			else if (status.isActive()) {
+				label.setForeground(COLOR_BUNDLE_ACTIVE);
 			}
 			else {
-				if (status.isBusy()) {
-					label.setForeground(COLOR_BUNDLE_BUSY);
-				}
-				else if (!status.isEnabled()) {
-					label.setForeground(COLOR_BUNDLE_DISABLED);
-				}
-				else if (status.isActive()) {
-					label.setForeground(COLOR_BUNDLE_ACTIVE);
-				}
-				else {
-					label.setForeground(COLOR_BUNDLE_INACTIVE);
-				}
+				label.setForeground(COLOR_BUNDLE_INACTIVE);
 			}
 
 			return label;

Ghidra/Features/Decompiler/src/main/java/ghidra/app/plugin/core/decompile/actions/PCodeCfgGraphTask.java

@@ -40,7 +40,7 @@ import ghidra.util.task.TaskMonitor;
  * Task to create a PCode control flow graph based on decompiler output
  */
 public class PCodeCfgGraphTask extends Task {
-	enum PcodeGraphSubType {
+	public enum PcodeGraphSubType {
 		CONTROL_FLOW_GRAPH("AST Control Flow"), DATA_FLOW_GRAPH("AST Data Flow");
 
 		private String name;
@@ -95,8 +95,7 @@ public class PCodeCfgGraphTask extends Task {
 				createControlFlowGraph(graph, monitor);
 			}
 
-			GraphDisplay display =
-				graphService.getDefaultGraphDisplay(!newGraph, monitor);
+			GraphDisplay display = graphService.getDefaultGraphDisplay(!newGraph, monitor);
 
 			PCodeCfgDisplayListener displayListener =
 				new PCodeCfgDisplayListener(tool, display, hfunction, pcodeGraphType);
@@ -270,10 +269,9 @@ public class PCodeCfgGraphTask extends Task {
 
 	protected void createControlFlowGraph(AttributedGraph graph, TaskMonitor monitor)
 			throws CancelledException {
-		Iterator<PcodeBlockBasic> pblockIter = hfunction.getBasicBlocks().iterator();
-		while (pblockIter.hasNext()) {
+		for (PcodeBlockBasic element : hfunction.getBasicBlocks()) {
 			monitor.checkCancelled();
-			graphPcodeBlock(graph, pblockIter.next(), monitor);
+			graphPcodeBlock(graph, element, monitor);
 		}
 	}
 

Ghidra/Framework/Project/src/main/java/ghidra/app/plugin/gui/ThemeChooserDialog.java

@@ -66,6 +66,7 @@ public class ThemeChooserDialog extends DialogComponentProvider {
 		}
 	}
 
+	@Override
 	protected void cancelCallback() {
 		close();
 	}