From 9d4a12ed47499e3fc5fed13c5f4ac05639b8184c Mon Sep 17 00:00:00 2001
From: Vhati <tvtronix@yahoo.com>
Date: Mon, 16 Dec 2013 23:37:04 -0500
Subject: [PATCH] Fixed hidden files and directories not appearing when finding
 resources

---
 skel_common/readme_changelog.txt                |  1 +
 skel_common/readme_modders.txt                  |  2 +-
 .../net/vhati/modmanager/core/FTLUtilities.java |  1 +
 .../net/vhati/modmanager/core/XMLPatcher.java   |  2 +-
 .../net/vhati/modmanager/ui/ManagerFrame.java   | 17 ++++++-----------
 5 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/skel_common/readme_changelog.txt b/skel_common/readme_changelog.txt
index 8f3aaeb..2f7eef0 100644
--- a/skel_common/readme_changelog.txt
+++ b/skel_common/readme_changelog.txt
@@ -3,6 +3,7 @@ Changelog
 1.5:
 - Added 'no info... yet' message when mods/ scan is still in-progress
 - Fixed advanced find tags not honoring start= when greater than match count
+- Fixed hidden files and directories not appearing when finding resources
 - Updated log4j2 to 2.0-beta9, fixing a hang when run with Java 1.7.0_25
 - Changed FTLDat to allow opening dats in read-only mode
 - Changed modman.exe to fail rather than use VirtualStore
diff --git a/skel_common/readme_modders.txt b/skel_common/readme_modders.txt
index 820fde2..694ad08 100644
--- a/skel_common/readme_modders.txt
+++ b/skel_common/readme_modders.txt
@@ -166,7 +166,7 @@ Advanced XML
       tags will be ignored.
 
 
-  The following commands that can occur inside a <find...>.
+  The following commands can occur inside a <find...>.
 
     <mod:find...>
       Searches the context tag's children and acts on them with its own
diff --git a/src/main/java/net/vhati/modmanager/core/FTLUtilities.java b/src/main/java/net/vhati/modmanager/core/FTLUtilities.java
index ddad8be..8f3bf05 100644
--- a/src/main/java/net/vhati/modmanager/core/FTLUtilities.java
+++ b/src/main/java/net/vhati/modmanager/core/FTLUtilities.java
@@ -80,6 +80,7 @@ public class FTLUtilities {
 
 		final JFileChooser fc = new JFileChooser();
 		fc.setDialogTitle( "Find data.dat or FTL.app" );
+		fc.setFileHidingEnabled( false );
 		fc.addChoosableFileFilter(new FileFilter() {
 			@Override
 			public String getDescription() {
diff --git a/src/main/java/net/vhati/modmanager/core/XMLPatcher.java b/src/main/java/net/vhati/modmanager/core/XMLPatcher.java
index 6660478..9652998 100644
--- a/src/main/java/net/vhati/modmanager/core/XMLPatcher.java
+++ b/src/main/java/net/vhati/modmanager/core/XMLPatcher.java
@@ -488,7 +488,7 @@ public class XMLPatcher {
 	 * Attribute values in the map must not be null.
 	 */
 	protected static class LikeFilter extends AbstractFilter<Element> {
-		private String type = null;;
+		private String type = null;
 		private Map<String,String> attrMap = null;
 		private String value = null;
 
diff --git a/src/main/java/net/vhati/modmanager/ui/ManagerFrame.java b/src/main/java/net/vhati/modmanager/ui/ManagerFrame.java
index 0745f8e..b7fbd0a 100644
--- a/src/main/java/net/vhati/modmanager/ui/ManagerFrame.java
+++ b/src/main/java/net/vhati/modmanager/ui/ManagerFrame.java
@@ -480,9 +480,9 @@ public class ManagerFrame extends JFrame implements ActionListener, ModsScanObse
 	public void rescanMods( ListState<ModFileInfo> tableState ) {
 		managerLock.lock();
 		try {
+			if ( scanning ) return;
 			scanning = true;
-			if ( rescanMenuItem.isEnabled() == false ) return;
-			rescanMenuItem.setEnabled( false );
+			rescanMenuItem.setEnabled( !scanning );
 		}
 		finally {
 			managerLock.unlock();
@@ -590,14 +590,8 @@ public class ManagerFrame extends JFrame implements ActionListener, ModsScanObse
 			infoArea.setDescription( modInfo.getTitle(), modInfo.getAuthor(), modInfo.getVersion(), modInfo.getURL(), modInfo.getDescription() );
 		}
 		else {
-			boolean notYetReady = false;
-			managerLock.lock();
-			try {
-				notYetReady = scanning;
-			}
-			finally {
-				managerLock.unlock();
-			}
+			boolean notYetReady = isScanning();
+
 			if ( notYetReady ) {
 				String body = "";
 				body += "No info is currently available for the selected mod.\n\n";
@@ -754,6 +748,7 @@ public class ManagerFrame extends JFrame implements ActionListener, ModsScanObse
 			setStatusText( "" );
 			JFileChooser extractChooser = new JFileChooser();
 			extractChooser.setDialogTitle("Choose a dir to extract into");
+			extractChooser.setFileHidingEnabled( false );
 			extractChooser.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY);
 			extractChooser.setMultiSelectionEnabled(false);
 
@@ -824,8 +819,8 @@ public class ManagerFrame extends JFrame implements ActionListener, ModsScanObse
 			public void run() {
 				managerLock.lock();
 				try {
-					rescanMenuItem.setEnabled( true );
 					scanning = false;
+					rescanMenuItem.setEnabled( !scanning );
 					scanEndedCond.signalAll();
 				}
 				finally {