Fixed hidden files and directories not appearing when finding resources

This commit is contained in:
Vhati 2013-12-16 23:37:04 -05:00
parent 35e77241ed
commit 9d4a12ed47
5 changed files with 10 additions and 13 deletions

View file

@ -3,6 +3,7 @@ Changelog
1.5: 1.5:
- Added 'no info... yet' message when mods/ scan is still in-progress - 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 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 - 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 FTLDat to allow opening dats in read-only mode
- Changed modman.exe to fail rather than use VirtualStore - Changed modman.exe to fail rather than use VirtualStore

View file

@ -166,7 +166,7 @@ Advanced XML
tags will be ignored. tags will be ignored.
The following commands that can occur inside a <find...>. The following commands can occur inside a <find...>.
<mod:find...> <mod:find...>
Searches the context tag's children and acts on them with its own Searches the context tag's children and acts on them with its own

View file

@ -80,6 +80,7 @@ public class FTLUtilities {
final JFileChooser fc = new JFileChooser(); final JFileChooser fc = new JFileChooser();
fc.setDialogTitle( "Find data.dat or FTL.app" ); fc.setDialogTitle( "Find data.dat or FTL.app" );
fc.setFileHidingEnabled( false );
fc.addChoosableFileFilter(new FileFilter() { fc.addChoosableFileFilter(new FileFilter() {
@Override @Override
public String getDescription() { public String getDescription() {

View file

@ -488,7 +488,7 @@ public class XMLPatcher {
* Attribute values in the map must not be null. * Attribute values in the map must not be null.
*/ */
protected static class LikeFilter extends AbstractFilter<Element> { protected static class LikeFilter extends AbstractFilter<Element> {
private String type = null;; private String type = null;
private Map<String,String> attrMap = null; private Map<String,String> attrMap = null;
private String value = null; private String value = null;

View file

@ -480,9 +480,9 @@ public class ManagerFrame extends JFrame implements ActionListener, ModsScanObse
public void rescanMods( ListState<ModFileInfo> tableState ) { public void rescanMods( ListState<ModFileInfo> tableState ) {
managerLock.lock(); managerLock.lock();
try { try {
if ( scanning ) return;
scanning = true; scanning = true;
if ( rescanMenuItem.isEnabled() == false ) return; rescanMenuItem.setEnabled( !scanning );
rescanMenuItem.setEnabled( false );
} }
finally { finally {
managerLock.unlock(); 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() ); infoArea.setDescription( modInfo.getTitle(), modInfo.getAuthor(), modInfo.getVersion(), modInfo.getURL(), modInfo.getDescription() );
} }
else { else {
boolean notYetReady = false; boolean notYetReady = isScanning();
managerLock.lock();
try {
notYetReady = scanning;
}
finally {
managerLock.unlock();
}
if ( notYetReady ) { if ( notYetReady ) {
String body = ""; String body = "";
body += "No info is currently available for the selected mod.\n\n"; 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( "" ); setStatusText( "" );
JFileChooser extractChooser = new JFileChooser(); JFileChooser extractChooser = new JFileChooser();
extractChooser.setDialogTitle("Choose a dir to extract into"); extractChooser.setDialogTitle("Choose a dir to extract into");
extractChooser.setFileHidingEnabled( false );
extractChooser.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY); extractChooser.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY);
extractChooser.setMultiSelectionEnabled(false); extractChooser.setMultiSelectionEnabled(false);
@ -824,8 +819,8 @@ public class ManagerFrame extends JFrame implements ActionListener, ModsScanObse
public void run() { public void run() {
managerLock.lock(); managerLock.lock();
try { try {
rescanMenuItem.setEnabled( true );
scanning = false; scanning = false;
rescanMenuItem.setEnabled( !scanning );
scanEndedCond.signalAll(); scanEndedCond.signalAll();
} }
finally { finally {