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 'improvement/JAL-3848_slivka_0.8' into alpha/JAL-3066_Jalview_212_slivka...
[jalview.git]
/
src
/
jalview
/
analysis
/
SeqsetUtils.java
diff --git
a/src/jalview/analysis/SeqsetUtils.java
b/src/jalview/analysis/SeqsetUtils.java
index
61fc747
..
4118124
100755
(executable)
--- a/
src/jalview/analysis/SeqsetUtils.java
+++ b/
src/jalview/analysis/SeqsetUtils.java
@@
-260,8
+260,7
@@
public class SeqsetUtils
while (keys.hasMoreElements())
{
Object key = keys.nextElement();
while (keys.hasMoreElements())
{
Object key = keys.nextElement();
- if (key instanceof String)
- {
+ try {
if ((msq = matcher.findIdMatch((String) key)) != null)
{
Hashtable sqinfo = (Hashtable) map.get(key);
if ((msq = matcher.findIdMatch((String) key)) != null)
{
Hashtable sqinfo = (Hashtable) map.get(key);
@@
-276,6
+275,11
@@
public class SeqsetUtils
+ "' in uniquified alignment");
}
}
+ "' in uniquified alignment");
}
}
+ } catch (ClassCastException ccastex) {
+ if (!quiet)
+ {
+ System.err.println("Unexpected object in SeqSet map : "+key.getClass());
+ }
}
}
if (unmatched.size() > 0 && !quiet)
}
}
if (unmatched.size() > 0 && !quiet)