From: gmungoc <g.m.carstairs@dundee.ac.uk>
Date: Fri, 20 Jan 2017 10:55:24 +0000 (+0000)
Subject: JAL-2383 make popup colour menu order and wording consistent
X-Git-Tag: Release_2_10_3b1~365
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=0c608482722344e2be221a1a39405106de55d25e;p=jalview.git

JAL-2383 make popup colour menu order and wording consistent
---

diff --git a/src/jalview/appletgui/APopupMenu.java b/src/jalview/appletgui/APopupMenu.java
index 209ca22..bf985d7 100644
--- a/src/jalview/appletgui/APopupMenu.java
+++ b/src/jalview/appletgui/APopupMenu.java
@@ -978,10 +978,10 @@ public class APopupMenu extends java.awt.PopupMenu implements
     colourMenu.add(nucleotideMenuItem);
     colourMenu.add(userDefinedColour);
     colourMenu.addSeparator();
-    colourMenu.add(abovePIDColour);
-    colourMenu.add(modifyPID);
     colourMenu.add(conservationMenuItem);
     colourMenu.add(modifyConservation);
+    colourMenu.add(abovePIDColour);
+    colourMenu.add(modifyPID);
 
     noColourmenuItem.setLabel(MessageManager.getString("label.none"));
     noColourmenuItem.addActionListener(this);
@@ -1018,7 +1018,7 @@ public class APopupMenu extends java.awt.PopupMenu implements
     BLOSUM62Colour.setLabel("BLOSUM62");
     BLOSUM62Colour.addActionListener(this);
     conservationMenuItem.setLabel(MessageManager
-            .getString("label.conservation"));
+            .getString("action.by_conservation"));
 
     editMenu.add(copy);
     copy.addActionListener(this);
diff --git a/src/jalview/gui/PopupMenu.java b/src/jalview/gui/PopupMenu.java
index 3a99f9e..6a68334 100644
--- a/src/jalview/gui/PopupMenu.java
+++ b/src/jalview/gui/PopupMenu.java
@@ -1386,10 +1386,10 @@ public class PopupMenu extends JPopupMenu
     }
 
     colourMenu.addSeparator();
-    colourMenu.add(abovePIDColour);
-    colourMenu.add(modifyPID);
     colourMenu.add(conservationMenuItem);
     colourMenu.add(modifyConservation);
+    colourMenu.add(abovePIDColour);
+    colourMenu.add(modifyPID);
     editMenu.add(copy);
     editMenu.add(cut);
     editMenu.add(editSequence);