Jalview 2.6 source licence

[jalview.git] / src / jalview / jbgui / GAlignFrame.java

diff --git a/src/jalview/jbgui/GAlignFrame.java b/src/jalview/jbgui/GAlignFrame.java
index 2a9e211..af7766a 100755 (executable)
--- a/src/jalview/jbgui/GAlignFrame.java
+++ b/src/jalview/jbgui/GAlignFrame.java
@@ -1,5 +1,5 @@
 /*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.5)
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.6)
  * Copyright (C) 2010 J Procter, AM Waterhouse, G Barton, M Clamp, S Searle
  * 
  * This file is part of Jalview.
@@ -121,7 +121,7 @@ public class GAlignFrame extends JInternalFrame
 
   public JCheckBoxMenuItem colourTextMenuItem = new JCheckBoxMenuItem();
 
-  public JCheckBoxMenuItem showUnconservedMenuItem = new JCheckBoxMenuItem();
+  public JCheckBoxMenuItem showNonconservedMenuItem = new JCheckBoxMenuItem();
 
   JMenuItem htmlMenuItem = new JMenuItem();
 
@@ -430,9 +430,6 @@ public class GAlignFrame extends JInternalFrame
 
       switch (index)
       {
-      case ColourSchemeProperty.NONE:
-        noColourmenuItem.setSelected(true);
-        break;
       case ColourSchemeProperty.CLUSTAL:
         clustalColour.setSelected(true);
 
@@ -491,6 +488,11 @@ public class GAlignFrame extends JInternalFrame
         userDefinedColour.setSelected(true);
 
         break;
+      case ColourSchemeProperty.NONE:
+      default:
+        noColourmenuItem.setSelected(true);
+        break;
+        
       }
     }
 
@@ -656,9 +658,9 @@ public class GAlignFrame extends JInternalFrame
         viewTextMenuItem_actionPerformed(e);
       }
     });
-    showUnconservedMenuItem.setText("Show Unconserved");
-    showUnconservedMenuItem.setState(false);
-    showUnconservedMenuItem
+    showNonconservedMenuItem.setText("Show nonconserved");
+    showNonconservedMenuItem.setState(false);
+    showNonconservedMenuItem
             .addActionListener(new java.awt.event.ActionListener()
             {
               public void actionPerformed(ActionEvent e)
@@ -1491,7 +1493,7 @@ public class GAlignFrame extends JInternalFrame
       }
     });
     // TODO: should be hidden if no selection exists.
-    hideAllButSelection.setText("All but Selected Rregion (Shift+Ctrl+H)");
+    hideAllButSelection.setText("All but Selected Region (Shift+Ctrl+H)");
     hideAllButSelection.addActionListener(new ActionListener()
     {
       public void actionPerformed(ActionEvent e)
@@ -1794,7 +1796,7 @@ public class GAlignFrame extends JInternalFrame
     formatMenu.add(colourTextMenuItem);
     formatMenu.add(renderGapsMenuItem);
     formatMenu.add(centreColumnLabelsMenuItem);
-    formatMenu.add(showUnconservedMenuItem);
+    formatMenu.add(showNonconservedMenuItem);
     selectMenu.add(findMenuItem);
     selectMenu.addSeparator();
     selectMenu.add(selectAllSequenceMenuItem);