JAL-2360 refactoring for JalviewColourScheme enum,

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

diff --git a/src/jalview/jbgui/GAlignFrame.java b/src/jalview/jbgui/GAlignFrame.java
index 088ddfa..b38fab4 100755 (executable)
--- a/src/jalview/jbgui/GAlignFrame.java
+++ b/src/jalview/jbgui/GAlignFrame.java
@@ -29,7 +29,8 @@ import jalview.gui.JvSwingUtils;
 import jalview.gui.Preferences;
 import jalview.gui.UserDefinedColours;
 import jalview.io.FileFormat;
-import jalview.schemes.ColourSchemeProperty;
+import jalview.schemes.JalviewColourScheme;
+import jalview.schemes.ResidueColourScheme;
 import jalview.schemes.UserColourScheme;
 import jalview.util.MessageManager;
 import jalview.util.Platform;
@@ -287,199 +288,71 @@ public class GAlignFrame extends JInternalFrame
       pasteMenu.setMnemonic('P');
       reload.setMnemonic('R');
     }
-
-    // Map<String, UserColourScheme> userColourSchemes = UserDefinedColours
-    // .getUserColourSchemes();
-    // if (userColourSchemes != null)
-    // {
-    // int insertionPoint = findUserDefinedColourPosition();
-    // for (String userColour : userColourSchemes.keySet())
-    // {
-    // final JRadioButtonMenuItem radioItem = new JRadioButtonMenuItem(
-    // userColour);
-    // radioItem.setName(USER_DEFINED_COLOUR_SCHEME);
-    // radioItem.addMouseListener(new MouseAdapter()
-    // {
-    // @Override
-    // public void mousePressed(MouseEvent evt)
-    // {
-    // if (evt.isPopupTrigger()) // Mac
-    // {
-    // offerRemoval();
-    // }
-    // }
-    //
-    // @Override
-    // public void mouseReleased(MouseEvent evt)
-    // {
-    // if (evt.isPopupTrigger()) // Windows
-    // {
-    // offerRemoval();
-    // }
-    // }
-    //
-    // void offerRemoval()
-    // {
-    // radioItem.removeActionListener(radioItem.getActionListeners()[0]);
-    //
-    // int option = JvOptionPane.showInternalConfirmDialog(
-    // Desktop.desktop, MessageManager
-    // .getString("label.remove_from_default_list"),
-    // MessageManager
-    // .getString("label.remove_user_defined_colour"),
-    // JvOptionPane.YES_NO_OPTION);
-    // if (option == JvOptionPane.YES_OPTION)
-    // {
-    // UserDefinedColours.removeColourFromDefaults(radioItem
-    // .getText());
-    // colourMenu.remove(radioItem);
-    // }
-    // else
-    // {
-    // radioItem.addActionListener(new ActionListener()
-    // {
-    // @Override
-    // public void actionPerformed(ActionEvent evt)
-    // {
-    // userDefinedColour_actionPerformed(evt);
-    // }
-    // });
-    // }
-    // }
-    // });
-    // radioItem.addActionListener(new ActionListener()
-    // {
-    // @Override
-    // public void actionPerformed(ActionEvent evt)
-    // {
-    // userDefinedColour_actionPerformed(evt);
-    // }
-    // });
-    // colourMenu.insert(radioItem, insertionPoint);
-    // insertionPoint++;
-    // colours.add(radioItem);
-    // }
-    // }
-    //
-    // /*
-    // * add colours to a ButtonGroup to make their
-    // * selection mutually exclusive
-    // */
-    // colours.add(noColourmenuItem);
-    // colours.add(clustalColour);
-    // colours.add(zappoColour);
-    // colours.add(taylorColour);
-    // colours.add(hydrophobicityColour);
-    // colours.add(helixColour);
-    // colours.add(strandColour);
-    // colours.add(turnColour);
-    // colours.add(buriedColour);
-    // colours.add(userDefinedColour);
-    // colours.add(PIDColour);
-    // colours.add(BLOSUM62Colour);
-    // colours.add(nucleotideColour);
-    // colours.add(purinePyrimidineColour);
-    // // colours.add(covariationColour);
-    // colours.add(tcoffeeColour);
-    // colours.add(RNAInteractionColour);
-    // setColourSelected(Cache.getDefault(Preferences.DEFAULT_COLOUR, "None"));
   }
 
   public void setColourSelected(String defaultColour)
   {
-
-    if (defaultColour != null)
+    JalviewColourScheme scheme = JalviewColourScheme.forName(defaultColour);
+    if (scheme == null)
+    {
+      noColourmenuItem.setSelected(true);
+      return;
+    }
+    switch (scheme)
     {
-      int index = ColourSchemeProperty
-              .getColourIndexFromName(defaultColour);
 
-      switch (index)
-      {
-      case ColourSchemeProperty.CLUSTAL:
+    case Clustal:
         clustalColour.setSelected(true);
-
         break;
-
-      case ColourSchemeProperty.BLOSUM:
+    case Blosum62:
         BLOSUM62Colour.setSelected(true);
-
         break;
-
-      case ColourSchemeProperty.PID:
+    case PID:
         PIDColour.setSelected(true);
-
         break;
-
-      case ColourSchemeProperty.ZAPPO:
+    case Zappo:
         zappoColour.setSelected(true);
-
         break;
-
-      case ColourSchemeProperty.TAYLOR:
+    case Taylor:
         taylorColour.setSelected(true);
         break;
-
-      case ColourSchemeProperty.HYDROPHOBIC:
+    case Hydrophobic:
         hydrophobicityColour.setSelected(true);
-
         break;
-
-      case ColourSchemeProperty.HELIX:
+    case Helix:
         helixColour.setSelected(true);
-
         break;
-
-      case ColourSchemeProperty.STRAND:
+    case Strand:
         strandColour.setSelected(true);
-
         break;
-
-      case ColourSchemeProperty.TURN:
+    case Turn:
         turnColour.setSelected(true);
-
         break;
-
-      case ColourSchemeProperty.BURIED:
+    case Buried:
         buriedColour.setSelected(true);
-
         break;
-
-      case ColourSchemeProperty.NUCLEOTIDE:
+    case Nucleotide:
         nucleotideColour.setSelected(true);
-
         break;
-
-      case ColourSchemeProperty.TCOFFEE:
+    case TCoffee:
         tcoffeeColour.setSelected(true);
         break;
-
-      case ColourSchemeProperty.PURINEPYRIMIDINE:
+    case PurinePyrimidine:
         purinePyrimidineColour.setSelected(true);
-
-        break;
-
-      case ColourSchemeProperty.RNAINTERACTION:
-        RNAInteractionColour.setSelected(true);
-
         break;
-      /*
-       * case ColourSchemeProperty.COVARIATION:
-       * covariationColour.setSelected(true);
-       * 
-       * break;
-       */
-      case ColourSchemeProperty.USER_DEFINED:
+    // case RNAInteraction:
+    // RNAInteractionColour.setSelected(true);
+    // break;
+    case RNAHelices:
+      rnahelicesColour.setSelected(true);
+      break;
+    case UserDefined:
         userDefinedColour.setSelected(true);
-
         break;
-      case ColourSchemeProperty.NONE:
       default:
         noColourmenuItem.setSelected(true);
         break;
-
       }
-    }
-
   }
 
   private void jbInit() throws Exception
@@ -2276,7 +2149,8 @@ public class GAlignFrame extends JInternalFrame
     // colours.add(covariationColour);
     colours.add(tcoffeeColour);
     colours.add(RNAInteractionColour);
-    setColourSelected(Cache.getDefault(Preferences.DEFAULT_COLOUR, "None"));
+    setColourSelected(Cache.getDefault(Preferences.DEFAULT_COLOUR,
+            ResidueColourScheme.NONE));
 
   }