JAL-2360 ColourSchemes holds configured schemes, AlignFrame colour menu

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

diff --git a/src/jalview/jbgui/GStructureViewer.java b/src/jalview/jbgui/GStructureViewer.java
index daba592..52f745d 100644 (file)
--- a/src/jalview/jbgui/GStructureViewer.java
+++ b/src/jalview/jbgui/GStructureViewer.java
@@ -281,7 +281,8 @@ public abstract class GStructureViewer extends JInternalFrame implements
       }
     });
     zappoColour = new JRadioButtonMenuItem();
-    zappoColour.setText(MessageManager.getString("label.zappo"));
+    zappoColour.setText(MessageManager
+            .getString("label.colourScheme_zappo"));
     zappoColour.addActionListener(new ActionListener()
     {
       @Override
@@ -291,7 +292,8 @@ public abstract class GStructureViewer extends JInternalFrame implements
       }
     });
     taylorColour = new JRadioButtonMenuItem();
-    taylorColour.setText(MessageManager.getString("label.taylor"));
+    taylorColour.setText(MessageManager
+            .getString("label.colourScheme_taylor"));
     taylorColour.addActionListener(new ActionListener()
     {
       @Override
@@ -301,7 +303,8 @@ public abstract class GStructureViewer extends JInternalFrame implements
       }
     });
     hydroColour = new JRadioButtonMenuItem();
-    hydroColour.setText(MessageManager.getString("label.hydrophobicity"));
+    hydroColour.setText(MessageManager
+            .getString("label.colourScheme_hydrophobic"));
     hydroColour.addActionListener(new ActionListener()
     {
       @Override
@@ -312,7 +315,7 @@ public abstract class GStructureViewer extends JInternalFrame implements
     });
     strandColour = new JRadioButtonMenuItem();
     strandColour.setText(MessageManager
-            .getString("label.strand_propensity"));
+            .getString("label.colourScheme_strand_propensity"));
     strandColour.addActionListener(new ActionListener()
     {
       @Override
@@ -322,7 +325,8 @@ public abstract class GStructureViewer extends JInternalFrame implements
       }
     });
     helixColour = new JRadioButtonMenuItem();
-    helixColour.setText(MessageManager.getString("label.helix_propensity"));
+    helixColour.setText(MessageManager
+            .getString("label.colourScheme_helix_propensity"));
     helixColour.addActionListener(new ActionListener()
     {
       @Override
@@ -332,7 +336,8 @@ public abstract class GStructureViewer extends JInternalFrame implements
       }
     });
     turnColour = new JRadioButtonMenuItem();
-    turnColour.setText(MessageManager.getString("label.turn_propensity"));
+    turnColour.setText(MessageManager
+            .getString("label.colourScheme_turn_propensity"));
     turnColour.addActionListener(new ActionListener()
     {
       @Override
@@ -342,7 +347,8 @@ public abstract class GStructureViewer extends JInternalFrame implements
       }
     });
     buriedColour = new JRadioButtonMenuItem();
-    buriedColour.setText(MessageManager.getString("label.buried_index"));
+    buriedColour.setText(MessageManager
+            .getString("label.colourScheme_buried_index"));
     buriedColour.addActionListener(new ActionListener()
     {
       @Override
@@ -352,7 +358,8 @@ public abstract class GStructureViewer extends JInternalFrame implements
       }
     });
     nucleotideColour = new JRadioButtonMenuItem();
-    nucleotideColour.setText(MessageManager.getString("label.nucleotide"));
+    nucleotideColour.setText(MessageManager
+            .getString("label.colourScheme_nucleotide"));
     nucleotideColour.addActionListener(new ActionListener()
     {
       @Override
@@ -363,7 +370,7 @@ public abstract class GStructureViewer extends JInternalFrame implements
     });
     purinePyrimidineColour = new JRadioButtonMenuItem();
     purinePyrimidineColour.setText(MessageManager
-            .getString("label.purine_pyrimidine"));
+            .getString("label.colourScheme_purine/pyrimidine"));
     purinePyrimidineColour.addActionListener(new ActionListener()
     {
       @Override