X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fdatamodel%2FSequenceGroup.java;h=272d81de257978e7dc9a3f4d56208bb37dc2ad5a;hb=89a0b775abfaa90242a171ca8133784a424a3d7b;hp=19e0da08cfeaab82c873fd3715209010ae5ebeb3;hpb=79cc40807a44006b6510d6533e57be05a66b760c;p=jalview.git

diff --git a/src/jalview/datamodel/SequenceGroup.java b/src/jalview/datamodel/SequenceGroup.java
index 19e0da0..272d81d 100755
--- a/src/jalview/datamodel/SequenceGroup.java
+++ b/src/jalview/datamodel/SequenceGroup.java
@@ -155,7 +155,7 @@ public class SequenceGroup
       seqs[i].setDescription(seq.getDescription());
       seqs[i].setDBRef(seq.getDBRef());
       seqs[i].setSequenceFeatures(seq.getSequenceFeatures());
-      if (seqs[i].getDatasetSequence() != null)
+      if (seq.getDatasetSequence() != null)
         seqs[i].setDatasetSequence(seq.getDatasetSequence());
 
       if(seq.getAnnotation()!=null)
@@ -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);
+        }
+
     }
 
     /**