/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.6)
- * Copyright (C) 2010 J Procter, AM Waterhouse, G Barton, M Clamp, S Searle
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.7)
+ * Copyright (C) 2011 J Procter, AM Waterhouse, G Barton, M Clamp, S Searle
*
* This file is part of Jalview.
*
ex.printStackTrace();
return null;
}
-
+
String targetChain;
for (int s = 0; s < sequence.length; s++)
{
+ boolean infChain = true;
if (targetChains != null && targetChains[s] != null)
+ {
+ infChain = false;
targetChain = targetChains[s];
+ }
else if (sequence[s].getName().indexOf("|") > -1)
{
targetChain = sequence[s].getName().substring(
sequence[s].getName().lastIndexOf("|") + 1);
+ if (targetChain.length() > 1)
+ {
+ if (targetChain.trim().length() == 0)
+ {
+ targetChain = " ";
+ }
+ else
+ {
+ // not a valid chain identifier
+ targetChain = "";
+ }
+ }
}
else
targetChain = "";
boolean first = true;
for (int i = 0; i < pdb.chains.size(); i++)
{
- // TODO: re http://issues.jalview.org/browse/JAL-583 : this patch may
- // need to be revoked
PDBChain chain = ((PDBChain) pdb.chains.elementAt(i));
- if (targetChain.length() > 0 && !targetChain.equals(chain.id))
+ if (targetChain.length() > 0 && !targetChain.equals(chain.id) && !infChain)
{
continue; // don't try to map chains don't match.
}
- // end of patch for limiting computed mappings
// TODO: correctly determine sequence type for mixed na/peptide
// structures
AlignSeq as = new AlignSeq(sequence[s],
public void mouseOverStructure(int pdbResNum, String chain, String pdbfile)
{
+ if (listeners==null)
+ {
+ // old or prematurely sent event
+ return;
+ }
boolean hasSequenceListeners = handlingVamsasMo || seqmappings != null;
SearchResults results = null;
SequenceI lastseq = null;
((VamsasListener) listeners.elementAt(i)).mouseOver(seq,
indexpos, source);
}
+ else if(listeners.elementAt(i) instanceof SecondaryStructureListener){
+ ((SecondaryStructureListener) listeners.elementAt(i)).mouseOverSequence(seq,indexpos);
+ }
}
}
}
*/
public static void release(StructureSelectionManagerProvider jalviewLite)
{
- StructureSelectionManager mnger=(instances.get(jalviewLite));
- if (mnger!=null)
+// synchronized (instances)
{
- instances.remove(jalviewLite);
- try {
- mnger.finalize();
- } catch (Throwable x){};
+ if (instances == null)
+ {
+ return;
+ }
+ StructureSelectionManager mnger = (instances.get(jalviewLite));
+ if (mnger != null)
+ {
+ instances.remove(jalviewLite);
+ try
+ {
+ mnger.finalize();
+ } catch (Throwable x)
+ {
+ }
+ ;
+ }
}
}