fix select group bug

[jalview.git] / src / jalview / gui / SeqPanel.java

diff --git a/src/jalview/gui/SeqPanel.java b/src/jalview/gui/SeqPanel.java
index 255be5d..8e7141b 100755 (executable)
--- a/src/jalview/gui/SeqPanel.java
+++ b/src/jalview/gui/SeqPanel.java
@@ -388,7 +388,8 @@ public class SeqPanel extends JPanel
     oldSeq = seq;\r
 \r
     SequenceI sequence = (Sequence) av.getAlignment().getSequenceAt(seq);\r
-    if(res>sequence.getLength())\r
+\r
+    if(sequence==null || res>sequence.getLength())\r
       return;\r
 \r
     stretchGroup = av.getSelectionGroup();\r
@@ -396,7 +397,10 @@ public class SeqPanel extends JPanel
     if(stretchGroup == null)\r
      {\r
        stretchGroup = av.alignment.findGroup( sequence );\r
-       av.setSelectionGroup( stretchGroup );\r
+       if(res>stretchGroup.getStartRes() && res<stretchGroup.getEndRes())\r
+         av.setSelectionGroup(stretchGroup);\r
+       else\r
+         stretchGroup = null;\r
      }\r
 \r
     else if(!stretchGroup.sequences.contains(sequence)\r
@@ -485,13 +489,6 @@ public class SeqPanel extends JPanel
     {\r
       ConservationColourScheme ccs = (ConservationColourScheme)stretchGroup.cs;\r
 \r
-      Conservation c = new Conservation("Group",\r
-                                        ResidueProperties.propHash, 3, stretchGroup.sequences, 0,\r
-                                        av.alignment.getWidth() );\r
-\r
-       c.calculate();\r
-       c.verdict(false, 100);\r
-       ccs = new ConservationColourScheme(c, ccs.cs);\r
 \r
        stretchGroup.cs = ccs;\r
 \r