X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fdatamodel%2FSequenceGroup.java;h=272d81de257978e7dc9a3f4d56208bb37dc2ad5a;hb=eb7824b3ecfdef2aa8c83e4a8520cb866f364d88;hp=161c0108823e6ce78bf184be77e32d031a55083a;hpb=3045b37e365018c7fe5a97fec36994eb22c379a4;p=jalview.git diff --git a/src/jalview/datamodel/SequenceGroup.java b/src/jalview/datamodel/SequenceGroup.java index 161c010..272d81d 100755 --- a/src/jalview/datamodel/SequenceGroup.java +++ b/src/jalview/datamodel/SequenceGroup.java @@ -319,31 +319,37 @@ public class SequenceGroup if(cs == null) return; - cs.setConsensus(AAFrequency.calculate(sequences, 0, getWidth())); - - - if (cs instanceof ClustalxColourScheme) + try { - ((ClustalxColourScheme) cs).resetClustalX(sequences, getWidth()); - } + cs.setConsensus(AAFrequency.calculate(sequences, 0, getWidth())); + if (cs instanceof ClustalxColourScheme) + { + ( (ClustalxColourScheme) cs).resetClustalX(sequences, getWidth()); + } - if (cs.conservationApplied()) - { + if (cs.conservationApplied()) + { Conservation c = new Conservation(groupName, - ResidueProperties.propHash, 3, sequences, 0, getWidth()); + ResidueProperties.propHash, 3, sequences, + 0, getWidth()); c.calculate(); c.verdict(false, 25); - cs.setConservation(c); if (cs instanceof ClustalxColourScheme) { - ((ClustalxColourScheme) cs).resetClustalX(sequences, - getWidth()); + ( (ClustalxColourScheme) cs).resetClustalX(sequences, + getWidth()); } + } } + catch (java.lang.OutOfMemoryError err) + { + System.out.println("Out of memory loading groups: " + err); + } + } /**