From fac5b0e13bc7c6217e5d22c1ac6ee567eadad3e4 Mon Sep 17 00:00:00 2001
From: dragonmacher <48328597+dragonmacher@users.noreply.github.com>
Date: Wed, 21 Aug 2019 18:38:18 -0400
Subject: [PATCH] Review Tool - 3.1.1 - updated comments table to use column
 filters; fixed build to not error when building the review tool

---
 .../java/docking/widgets/table/GTableFilterPanel.java     | 8 ++------
 build.gradle                                              | 8 ++++----
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/Ghidra/Framework/Docking/src/main/java/docking/widgets/table/GTableFilterPanel.java b/Ghidra/Framework/Docking/src/main/java/docking/widgets/table/GTableFilterPanel.java
index 9789fe69fd..f3e3454326 100644
--- a/Ghidra/Framework/Docking/src/main/java/docking/widgets/table/GTableFilterPanel.java
+++ b/Ghidra/Framework/Docking/src/main/java/docking/widgets/table/GTableFilterPanel.java
@@ -203,10 +203,10 @@ public class GTableFilterPanel<ROW_OBJECT> extends JPanel {
 
 		transformer = new DefaultRowFilterTransformer<>(tableModel, table.getColumnModel());
 
-		buildPanel(filterLabel);
-
 		textFilterModel = installTableModel(tableModel);
 
+		buildPanel(filterLabel);
+
 		TableColumnModel columnModel = table.getColumnModel();
 		columnModel.addColumnModelListener(columnModelListener);
 
@@ -390,15 +390,11 @@ public class GTableFilterPanel<ROW_OBJECT> extends JPanel {
 	}
 
 	private boolean isTableColumnFilterableModel() {
-
 		return table.getModel() instanceof RowObjectFilterModel;
 	}
 
 	@SuppressWarnings("unchecked")
 	private JComponent buildColumnFilterStateButton() {
-		if (!isTableColumnFilterableModel()) {
-			return null;
-		}
 
 		RowObjectFilterModel<ROW_OBJECT> tableModel =
 			(RowObjectFilterModel<ROW_OBJECT>) table.getModel();
diff --git a/build.gradle b/build.gradle
index bd26cb6378..2f1fce9f24 100644
--- a/build.gradle
+++ b/build.gradle
@@ -53,11 +53,11 @@ if (file("flatRepo").isDirectory()) {
 		}
 	}
 }
-else {
-	File f = new File("ghidra.repos.config");
+else {	
+	File f = file("ghidra.repos.config")
 	if (!f.exists()) {
-		throw new GradleException("\n\nUnable to find the local maven repo." +  
-			"  Ensure you have created the ${f.getName()} file.\n\n");
+		throw new GradleException("\n\n\n\tUnable to find the local maven repo." +  
+			"  Ensure you have created the ${f.getName()} file.\n\n\n");
 	}
 }