JAL-3048 wip externalise trigger from RunResponse

[jalview.git] / src / jalview / gui / UserDefinedColours.java

diff --git a/src/jalview/gui/UserDefinedColours.java b/src/jalview/gui/UserDefinedColours.java
index f1ff128..9e928d8 100755 (executable)
--- a/src/jalview/gui/UserDefinedColours.java
+++ b/src/jalview/gui/UserDefinedColours.java
@@ -645,43 +645,46 @@ public class UserDefinedColours extends GUserDefinedColours
     chooser.setDialogTitle(
             MessageManager.getString("label.load_colour_scheme"));
     chooser.setToolTipText(MessageManager.getString("action.load"));
-    chooser.addResponse(new RunResponse(JalviewFileChooser.APPROVE_OPTION) {
-               @Override
-               public void run() {
-                   File choice = chooser.getSelectedFile();
-                   Cache.setProperty(LAST_DIRECTORY, choice.getParent());
-
-                   UserColourScheme ucs = ColourSchemeLoader
-                           .loadColourScheme(choice.getAbsolutePath());
-                   Color[] colors = ucs.getColours();
-                   schemeName.setText(ucs.getSchemeName());
-
-                   if (ucs.getLowerCaseColours() != null)
-                   {
-                     caseSensitive.setSelected(true);
-                     lcaseColour.setEnabled(true);
-                     resetButtonPanel(true);
-                     for (int i = 0; i < lowerCaseButtons.size(); i++)
-                     {
-                       JButton button = lowerCaseButtons.get(i);
-                       button.setBackground(ucs.getLowerCaseColours()[i]);
-                     }
-                   }
-                   else
-                   {
-                     caseSensitive.setSelected(false);
-                     lcaseColour.setEnabled(false);
-                     resetButtonPanel(false);
-                   }
-
-                   for (int i = 0; i < upperCaseButtons.size(); i++)
-                   {
-                     JButton button = upperCaseButtons.get(i);
-                     button.setBackground(colors[i]);
-                   }
-
-                   addNewColourScheme(choice.getPath());
-               }});
+    chooser.addResponse(0, new RunResponse(JalviewFileChooser.APPROVE_OPTION) 
+    {
+         @Override
+         public void run() 
+         {
+           File choice = chooser.getSelectedFile();
+           Cache.setProperty(LAST_DIRECTORY, choice.getParent());
+
+           UserColourScheme ucs = ColourSchemeLoader
+                   .loadColourScheme(choice.getAbsolutePath());
+           Color[] colors = ucs.getColours();
+           schemeName.setText(ucs.getSchemeName());
+
+           if (ucs.getLowerCaseColours() != null)
+               {
+                  caseSensitive.setSelected(true);
+                  lcaseColour.setEnabled(true);
+                  resetButtonPanel(true);
+                  for (int i = 0; i < lowerCaseButtons.size(); i++)
+                  {
+                    JButton button = lowerCaseButtons.get(i);
+                    button.setBackground(ucs.getLowerCaseColours()[i]);
+                  }
+                }
+                else
+                {
+                  caseSensitive.setSelected(false);
+                  lcaseColour.setEnabled(false);
+                  resetButtonPanel(false);
+                }
+
+                for (int i = 0; i < upperCaseButtons.size(); i++)
+                {
+                  JButton button = upperCaseButtons.get(i);
+                  button.setBackground(colors[i]);
+                }
+
+                addNewColourScheme(choice.getPath());
+          }
+       });
     
     chooser.showOpenDialog(this);
   }