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 'develop' into features/JAL-4134_use_annotation_row_for_colours_and_groups
[jalview.git]
/
src
/
jalview
/
ext
/
jmol
/
JmolParser.java
diff --git
a/src/jalview/ext/jmol/JmolParser.java
b/src/jalview/ext/jmol/JmolParser.java
index
b7c83c6
..
c64dac1
100644
(file)
--- a/
src/jalview/ext/jmol/JmolParser.java
+++ b/
src/jalview/ext/jmol/JmolParser.java
@@
-92,7
+92,6
@@
public class JmolParser extends StructureFile implements JmolStatusListener
{
super(fp, doXferSettings);
}
{
super(fp, doXferSettings);
}
-
public JmolParser(FileParse fp) throws IOException
{
super(fp);
public JmolParser(FileParse fp) throws IOException
{
super(fp);
@@
-315,16
+314,26
@@
public class JmolParser extends StructureFile implements JmolStatusListener
// add a PAEMatrix if set (either by above or otherwise)
if (hasPAEMatrix())
{
// add a PAEMatrix if set (either by above or otherwise)
if (hasPAEMatrix())
{
- Alignment al = new Alignment(prot.toArray(new SequenceI[0]));
- EBIAlfaFold.addAlphaFoldPAE(al, new File(this.getPAEMatrix()), 0,
- null, false, false, null);
-
- if (al.getAlignmentAnnotation() != null)
+ try
{
{
- for (AlignmentAnnotation alann : al.getAlignmentAnnotation())
+ Alignment al = new Alignment(prot.toArray(new SequenceI[0]));
+ EBIAlfaFold.addAlphaFoldPAE(al, new File(this.getPAEMatrix()), 0,
+ null, false, false, null);
+
+ if (al.getAlignmentAnnotation() != null)
{
{
- annotations.add(alann);
+ for (AlignmentAnnotation alann : al.getAlignmentAnnotation())
+ {
+ annotations.add(alann);
+ }
}
}
+ } catch (Throwable ff)
+ {
+ Console.error("Couldn't import PAE Matrix from " + getPAEMatrix(),
+ ff);
+ warningMessage += "Couldn't import PAE Matrix"
+ + getNewlineString() + ff.getLocalizedMessage()
+ + getNewlineString();
}
}
} catch (OutOfMemoryError er)
}
}
} catch (OutOfMemoryError er)