X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fappletgui%2FAPopupMenu.java;h=8f6e49f44740cad34fa0f08a384677204afa3b56;hb=e13e34f4fce46de357b79344076ebfa7413ad86f;hp=ebf27bb0b6c6bfba01dc6ab0ce7d0c8c0ce50ccf;hpb=52fd681e0f239e20df19fd7560d4b999104ba222;p=jalview.git

diff --git a/src/jalview/appletgui/APopupMenu.java b/src/jalview/appletgui/APopupMenu.java
index ebf27bb..8f6e49f 100755
--- a/src/jalview/appletgui/APopupMenu.java
+++ b/src/jalview/appletgui/APopupMenu.java
@@ -58,6 +58,7 @@ public class APopupMenu
   MenuItem cut = new MenuItem("Cut (Jalview Only)");
   MenuItem toUpper = new MenuItem("To Upper Case");
   MenuItem toLower = new MenuItem("To Lower Case");
+  MenuItem toggleCase = new MenuItem("Toggle Case");
 
   public APopupMenu(AlignmentPanel apanel, final Sequence seq, Vector links)
   {
@@ -193,28 +194,18 @@ public class APopupMenu
       ap.alignFrame.copy_actionPerformed();
     else if(source==cut)
       ap.alignFrame.cut_actionPerformed();
-    else if(source==toUpper)
+    else if(source==toUpper || source==toLower || source==toggleCase)
     {
       SequenceGroup sg = ap.av.getSelectionGroup();
       if (sg != null)
       {
         for (int g = 0; g < sg.getSize(); g++)
         {
-          sg.getSequenceAt(g).changeCase(true, sg.getStartRes(),
-                                         sg.getEndRes() + 1);
-        }
-        ap.seqPanel.seqCanvas.repaint();
-      }
-    }
-    else if(source==toLower)
-    {
-      SequenceGroup sg = ap.av.getSelectionGroup();
-      if (sg != null)
-      {
-        for (int g = 0; g < sg.getSize(); g++)
-        {
-          sg.getSequenceAt(g).changeCase(false, sg.getStartRes(),
-                                         sg.getEndRes() + 1);
+          if (source == toggleCase)
+            sg.getSequenceAt(g).toggleCase(sg.getStartRes(), sg.getEndRes() + 1);
+          else
+            sg.getSequenceAt(g).changeCase(source == toUpper, sg.getStartRes(),
+                                           sg.getEndRes() + 1);
         }
         ap.seqPanel.seqCanvas.repaint();
       }
@@ -317,6 +308,8 @@ public class APopupMenu
     toUpper.addActionListener(this);
     editMenu.add(toLower);
     toLower.addActionListener(this);
+    editMenu.add(toggleCase);
+    toggleCase.addActionListener(this);
 
   }