Merge remote-tracking branch 'origin/GP-0-dragonmacher-test-fixes-2-24-24'

ryanmkurtz · ryanmkurtz · commit 994e2af9a3dd · 2024-02-26T09:02:08.000-05:00
diff --git a/Ghidra/Framework/Docking/src/main/java/docking/widgets/filechooser/DirectoryList.java b/Ghidra/Framework/Docking/src/main/java/docking/widgets/filechooser/DirectoryList.java
@@ -72,8 +72,8 @@ private void updateCellDimensions(Font font) {
 			return; // UI is being updated
 		}
 
-		FileListCellRenderer cellRenderer = (FileListCellRenderer) getCellRenderer();
-		if (cellRenderer == null) {
+		ListCellRenderer<? super File> renderer = getCellRenderer();
+		if (!(renderer instanceof FileListCellRenderer cellRenderer)) {
 			return; // initializing
 		}
 

Original file line number	Diff line number	Diff line change
`@@ -72,8 +72,8 @@ private void updateCellDimensions(Font font) {`
`72`	`72`	`return; // UI is being updated`
`73`	`73`	`}`
`74`	`74`
`75`		`- FileListCellRenderer cellRenderer = (FileListCellRenderer) getCellRenderer();`
`76`		`- if (cellRenderer == null) {`
	`75`	`+ ListCellRenderer<? super File> renderer = getCellRenderer();`
	`76`	`+ if (!(renderer instanceof FileListCellRenderer cellRenderer)) {`
`77`	`77`	`return; // initializing`
`78`	`78`	`}`
`79`	`79`