X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fio%2FJalviewFileFilter.java;h=28dd2eb08357082c15289c9ce5863d12994b0982;hb=1c721468246c2aafd86fc52d954512374f576b11;hp=9bfc25a5462db7189e73cc4f640632cdf586d628;hpb=a8f483d04205bb8273ee311c12968b7e86d205fa;p=jalview.git
diff --git a/src/jalview/io/JalviewFileFilter.java b/src/jalview/io/JalviewFileFilter.java
index 9bfc25a..28dd2eb 100755
--- a/src/jalview/io/JalviewFileFilter.java
+++ b/src/jalview/io/JalviewFileFilter.java
@@ -1,25 +1,33 @@
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2)
- * Copyright (C) 2014 The Jalview Authors
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
*
* This file is part of Jalview.
*
* Jalview is free software: you can redistribute it and/or
* modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
+ * as published by the Free Software Foundation, either version 3
+ * of the License, or (at your option) any later version.
*
* Jalview is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty
* of MERCHANTABILITY or FITNESS FOR A PARTICULAR
* PURPOSE. See the GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License along with Jalview. If not, see .
+ * You should have received a copy of the GNU General Public License
+ * along with Jalview. If not, see .
* The Jalview Authors are detailed in the 'AUTHORS' file.
*/
package jalview.io;
-import java.io.*;
-import java.util.*;
+import java.util.Locale;
+
+import java.io.File;
+import java.util.Hashtable;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.StringTokenizer;
import javax.swing.filechooser.FileFilter;
@@ -27,7 +35,7 @@ public class JalviewFileFilter extends FileFilter
{
public static Hashtable suffixHash = new Hashtable();
- private Hashtable filters = null;
+ private Map filters = null;
private String description = "no description";
@@ -35,6 +43,8 @@ public class JalviewFileFilter extends FileFilter
private boolean useExtensionsInDescription = true;
+ private JalviewFileChooser parentJFC = null;
+
public JalviewFileFilter(String extension, String description)
{
StringTokenizer st = new StringTokenizer(extension, ",");
@@ -68,12 +78,14 @@ public class JalviewFileFilter extends FileFilter
public String getAcceptableExtension()
{
- return filters.keys().nextElement().toString();
+ return filters.keySet().iterator().next().toString();
}
// takes account of the fact that database is a directory
+ @Override
public boolean accept(File f)
{
+
if (f != null)
{
String extension = getExtension(f);
@@ -83,12 +95,35 @@ public class JalviewFileFilter extends FileFilter
return true;
}
- if ((extension != null) && (filters.get(getExtension(f)) != null))
+ if ((extension != null) && (filters.get(extension) != null))
{
return true;
}
+
}
+ if (parentJFC != null && parentJFC.includeBackupFiles)
+ {
+ Iterator it = filters.keySet().iterator();
+ EXTENSION: while (it.hasNext())
+ {
+ String ext = it.next();
+
+ // quick negative test
+ if (!f.getName().contains(ext))
+ {
+ continue EXTENSION;
+ }
+
+ BackupFilenameParts bfp = BackupFilenameParts
+ .currentBackupFilenameParts(f.getName(), ext, true);
+ if (bfp.isBackupFile())
+ {
+ return true;
+ }
+ }
+ }
+
return false;
}
@@ -101,7 +136,7 @@ public class JalviewFileFilter extends FileFilter
if ((i > 0) && (i < (filename.length() - 1)))
{
- return filename.substring(i + 1).toLowerCase();
+ return filename.substring(i + 1).toLowerCase(Locale.ROOT);
}
;
@@ -114,13 +149,14 @@ public class JalviewFileFilter extends FileFilter
{
if (filters == null)
{
- filters = new Hashtable(5);
+ filters = new LinkedHashMap<>(5);
}
- filters.put(extension.toLowerCase(), this);
+ filters.put(extension.toLowerCase(Locale.ROOT), this);
fullDescription = null;
}
+ @Override
public String getDescription()
{
if (fullDescription == null)
@@ -131,15 +167,15 @@ public class JalviewFileFilter extends FileFilter
: (description + " (");
// build the description from the extension list
- Enumeration extensions = filters.keys();
+ Iterator extensions = filters.keySet().iterator();
if (extensions != null)
{
- fullDescription += ("." + (String) extensions.nextElement());
+ fullDescription += ("." + extensions.next());
- while (extensions.hasMoreElements())
+ while (extensions.hasNext())
{
- fullDescription += (", " + (String) extensions.nextElement());
+ fullDescription += (", " + extensions.next());
}
}
@@ -170,4 +206,10 @@ public class JalviewFileFilter extends FileFilter
{
return useExtensionsInDescription;
}
+
+ protected void setParentJFC(JalviewFileChooser p)
+ {
+ this.parentJFC = p;
+ }
+
}