catch control down before editing null pointer
authoramwaterhouse <Andrew Waterhouse>
Fri, 2 Feb 2007 17:17:10 +0000 (17:17 +0000)
committeramwaterhouse <Andrew Waterhouse>
Fri, 2 Feb 2007 17:17:10 +0000 (17:17 +0000)
src/jalview/appletgui/SeqPanel.java
src/jalview/gui/SeqPanel.java

index 8b9b5cb..6c1a619 100755 (executable)
@@ -791,6 +791,13 @@ public class SeqPanel
         //but the sequence represents a group\r
         if (sg == null)\r
         {\r
+          if (av.hiddenRepSequences == null\r
+              || !av.hiddenRepSequences.containsKey(seq))\r
+          {\r
+            endEditing();\r
+            return;\r
+          }\r
+\r
           sg = (SequenceGroup) av.hiddenRepSequences.get(seq);\r
         }\r
 \r
index 57a30bf..08bf7df 100755 (executable)
@@ -874,6 +874,12 @@ public class SeqPanel extends JPanel implements MouseListener,
           //but the sequence represents a group\r
           if (sg == null)\r
           {\r
+            if(av.hiddenRepSequences==null\r
+               || !av.hiddenRepSequences.containsKey(seq))\r
+            {\r
+              endEditing();\r
+              return;\r
+            }\r
             sg = (SequenceGroup) av.hiddenRepSequences.get(seq);\r
           }\r
 \r