Merge branch 'develop' into features/JAL-250_hideredundantseqs

[jalview.git] / src / MCview / AppletPDBViewer.java

diff --git a/src/MCview/AppletPDBViewer.java b/src/MCview/AppletPDBViewer.java
index 76ee4b0..adf833f 100644 (file)
--- a/src/MCview/AppletPDBViewer.java
+++ b/src/MCview/AppletPDBViewer.java
@@ -46,8 +46,8 @@ import java.awt.event.ActionListener;
 import java.awt.event.ItemEvent;
 import java.awt.event.ItemListener;
 
-public class AppletPDBViewer extends EmbmenuFrame implements
-        ActionListener, ItemListener
+public class AppletPDBViewer extends EmbmenuFrame
+        implements ActionListener, ItemListener
 {
   AppletPDBCanvas pdbcanvas;
 
@@ -67,8 +67,8 @@ public class AppletPDBViewer extends EmbmenuFrame implements
     embedMenuIfNeeded(pdbcanvas);
     add(pdbcanvas, BorderLayout.CENTER);
 
-    StringBuffer title = new StringBuffer(seq[0].getName() + ":"
-            + pdbcanvas.pdbentry.getFile());
+    StringBuffer title = new StringBuffer(
+            seq[0].getName() + ":" + pdbcanvas.pdbentry.getFile());
 
     jalview.bin.JalviewLite.addFrame(this, title.toString(), 400, 400);
 
@@ -185,7 +185,8 @@ public class AppletPDBViewer extends EmbmenuFrame implements
     zbuffer.addItemListener(this);
     charge.setLabel(MessageManager.getString("label.charge_cysteine"));
     charge.addActionListener(this);
-    hydro.setLabel(MessageManager.getString("label.hydrophobicity"));
+    hydro.setLabel(
+            MessageManager.getString("label.colourScheme_hydrophobic"));
     hydro.addActionListener(this);
     chain.setLabel(MessageManager.getString("action.by_chain"));
     chain.addActionListener(this);
@@ -195,17 +196,21 @@ public class AppletPDBViewer extends EmbmenuFrame implements
             .setLabel(MessageManager.getString("label.all_chains_visible"));
     allchains.addItemListener(this);
     viewMenu.setLabel(MessageManager.getString("action.view"));
-    zappo.setLabel(MessageManager.getString("label.zappo"));
+    zappo.setLabel(MessageManager.getString("label.colourScheme_zappo"));
     zappo.addActionListener(this);
-    taylor.setLabel(MessageManager.getString("label.taylor"));
+    taylor.setLabel(MessageManager.getString("label.colourScheme_taylor"));
     taylor.addActionListener(this);
-    helix.setLabel(MessageManager.getString("label.helix_propensity"));
+    helix.setLabel(MessageManager
+            .getString("label.colourScheme_helix_propensity"));
     helix.addActionListener(this);
-    strand.setLabel(MessageManager.getString("label.strand_propensity"));
+    strand.setLabel(MessageManager
+            .getString("label.colourScheme_strand_propensity"));
     strand.addActionListener(this);
-    turn.setLabel(MessageManager.getString("label.turn_propensity"));
+    turn.setLabel(
+            MessageManager.getString("label.colourScheme_turn_propensity"));
     turn.addActionListener(this);
-    buried.setLabel(MessageManager.getString("label.buried_index"));
+    buried.setLabel(
+            MessageManager.getString("label.colourScheme_buried_index"));
     buried.addActionListener(this);
     user.setLabel(MessageManager.getString("action.user_defined"));
     user.addActionListener(this);