git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'Jalview-BH/JAL-3026-JAL-3063-JAXB' of https://source.jalview.org/git...
[jalview.git]
/
src
/
jalview
/
io
/
JalviewFileFilter.java
diff --git
a/src/jalview/io/JalviewFileFilter.java
b/src/jalview/io/JalviewFileFilter.java
index
d59e88a
..
21f5b0f
100755
(executable)
--- a/
src/jalview/io/JalviewFileFilter.java
+++ b/
src/jalview/io/JalviewFileFilter.java
@@
-21,8
+21,10
@@
package jalview.io;
import java.io.File;
package jalview.io;
import java.io.File;
-import java.util.Enumeration;
import java.util.Hashtable;
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;
import java.util.StringTokenizer;
import javax.swing.filechooser.FileFilter;
@@
-31,7
+33,7
@@
public class JalviewFileFilter extends FileFilter
{
public static Hashtable suffixHash = new Hashtable();
{
public static Hashtable suffixHash = new Hashtable();
- private Hashtable filters = null;
+ private Map<String, JalviewFileFilter> filters = null;
private String description = "no description";
private String description = "no description";
@@
-72,10
+74,11
@@
public class JalviewFileFilter extends FileFilter
public String getAcceptableExtension()
{
public String getAcceptableExtension()
{
- return filters.keys().nextElement().toString();
+ return filters.keySet().iterator().next().toString();
}
// takes account of the fact that database is a directory
}
// takes account of the fact that database is a directory
+ @Override
public boolean accept(File f)
{
if (f != null)
public boolean accept(File f)
{
if (f != null)
@@
-87,7
+90,7
@@
public class JalviewFileFilter extends FileFilter
return true;
}
return true;
}
- if ((extension != null) && (filters.get(getExtension(f)) != null))
+ if ((extension != null) && (filters.get(extension) != null))
{
return true;
}
{
return true;
}
@@
-118,13
+121,14
@@
public class JalviewFileFilter extends FileFilter
{
if (filters == null)
{
{
if (filters == null)
{
- filters = new Hashtable(5);
+ filters = new LinkedHashMap<>(5);
}
filters.put(extension.toLowerCase(), this);
fullDescription = null;
}
}
filters.put(extension.toLowerCase(), this);
fullDescription = null;
}
+ @Override
public String getDescription()
{
if (fullDescription == null)
public String getDescription()
{
if (fullDescription == null)
@@
-135,15
+139,15
@@
public class JalviewFileFilter extends FileFilter
: (description + " (");
// build the description from the extension list
: (description + " (");
// build the description from the extension list
- Enumeration extensions = filters.keys();
+ Iterator<String> extensions = filters.keySet().iterator();
if (extensions != null)
{
if (extensions != null)
{
- fullDescription += ("." + (String) extensions.nextElement());
+ fullDescription += ("." + extensions.next());
- while (extensions.hasMoreElements())
+ while (extensions.hasNext())
{
{
- fullDescription += (", " + (String) extensions.nextElement());
+ fullDescription += (", " + extensions.next());
}
}
}
}