X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FJalview2XML.java;h=1a9bc033fd659bddd02994af1bf2c047db143630;hb=cd38270d99eb947976778b39f218a4072e9e393b;hp=e63984425888244bcd1e1fe8debdf455a7efeeed;hpb=9e3e20c98eae9498a68bb0a770359564797a12ef;p=jalview.git diff --git a/src/jalview/gui/Jalview2XML.java b/src/jalview/gui/Jalview2XML.java index e639844..1a9bc03 100644 --- a/src/jalview/gui/Jalview2XML.java +++ b/src/jalview/gui/Jalview2XML.java @@ -2602,22 +2602,32 @@ public class Jalview2XML jmoldat[1] = ids[p].getStructureState(s).getContent(); } } - Object[] seqstrmaps = (Object[]) ((Hashtable) jmoldat[2]) - .get(ids[p].getFile()); - if (seqstrmaps == null) + if (ids[p].getFile() != null) { - ((Hashtable) jmoldat[2]).put( - new File(ids[p].getFile()).toString(), - seqstrmaps = new Object[] - { pdbFile, ids[p].getId(), new Vector(), - new Vector() }); + Object[] seqstrmaps = (Object[]) ((Hashtable) jmoldat[2]) + .get(ids[p].getFile()); + if (seqstrmaps == null) + { + ((Hashtable) jmoldat[2]).put( + new File(ids[p].getFile()).toString(), + seqstrmaps = new Object[] + { pdbFile, ids[p].getId(), new Vector(), + new Vector() }); + } + if (!((Vector) seqstrmaps[2]).contains(seq)) + { + ((Vector) seqstrmaps[2]).addElement(seq); + // ((Vector)seqstrmaps[3]).addElement(n) : + // in principle, chains + // should be stored here : do we need to + // TODO: store and recover seq/pdb_id : + // chain mappings + } } - if (!((Vector) seqstrmaps[2]).contains(seq)) + else { - ((Vector) seqstrmaps[2]).addElement(seq); - // ((Vector)seqstrmaps[3]).addElement(n) : in principle, chains - // should be stored here : do we need to - // TODO: store and recover seq/pdb_id : chain mappings + errorMessage=("The Jmol views in the Jalview 2 project may\nnot be correctly bound to sequences in the alignment.\nIn the case of problems, see note at\nhttp://issues.jalview.org/browse/JAL-747"); + warn(errorMessage); } } }