correct conservation errors after edit

diff --git a/src/jalview/appletgui/SeqPanel.java b/src/jalview/appletgui/SeqPanel.java
index 889533e..6e4a34f 100755 (executable)
--- a/src/jalview/appletgui/SeqPanel.java
+++ b/src/jalview/appletgui/SeqPanel.java
@@ -354,16 +354,17 @@ public class SeqPanel extends Panel
 \r
   void updateConservation(int i)\r
   {\r
-    if (av.getGlobalColourScheme() instanceof jalview.schemes.\r
-        ClustalxColourScheme)\r
-    {\r
-      av.setGlobalColourScheme(\r
-          new jalview.schemes.ClustalxColourScheme(av.alignment.getSequences(),\r
-                                                   av.alignment.getWidth()));\r
-    }\r
-\r
     av.updateConservation();\r
     av.updateConsensus();\r
+\r
+    ColourSchemeI cs = av.getGlobalColourScheme();\r
+    if(cs instanceof ConservationColourScheme)\r
+      cs = ( (ConservationColourScheme) cs).cs;\r
+\r
+    if(cs instanceof ClustalxColourScheme)\r
+      cs = new ClustalxColourScheme(av.alignment.getSequences(), av.alignment.getWidth());\r
+\r
+    ap.alignFrame.changeColour(cs);\r
   }\r
 \r
 //////////////////////////////////////////\r

diff --git a/src/jalview/gui/SeqPanel.java b/src/jalview/gui/SeqPanel.java
index fc93fbc..ddbd97c 100755 (executable)
--- a/src/jalview/gui/SeqPanel.java
+++ b/src/jalview/gui/SeqPanel.java
@@ -357,13 +357,18 @@ public class SeqPanel extends JPanel
 \r
   void updateConservation(int i)\r
   {\r
-    if(av.getGlobalColourScheme() instanceof jalview.schemes.ClustalxColourScheme)\r
-    {\r
-      av.setGlobalColourScheme(\r
-          new jalview.schemes.ClustalxColourScheme(av.alignment.getSequences(),av.alignment.getWidth() ));\r
-    }\r
     av.updateConservation();\r
     av.updateConsensus();\r
+\r
+    ColourSchemeI cs = av.getGlobalColourScheme();\r
+    if(cs instanceof ConservationColourScheme)\r
+      cs = ( (ConservationColourScheme) cs).cs;\r
+\r
+    if(cs instanceof ClustalxColourScheme)\r
+      cs = new ClustalxColourScheme(av.alignment.getSequences(), av.alignment.getWidth());\r
+\r
+    ap.alignFrame.changeColour(cs);\r
+\r
   }\r
 \r
 //////////////////////////////////////////\r