X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FUserDefinedColours.java;h=1836e33b3d35d70ee0f1b783ba785f840bb4603d;hb=57738a1f3c19b1c3a00bd3ac5108f8cd0af32f99;hp=87203417c20c7c957461ea5c44c3df7173cf688d;hpb=d9f0a24d9662a0b530fd79b51108dd074d03d6e0;p=jalview.git

diff --git a/src/jalview/gui/UserDefinedColours.java b/src/jalview/gui/UserDefinedColours.java
index 8720341..1836e33 100755
--- a/src/jalview/gui/UserDefinedColours.java
+++ b/src/jalview/gui/UserDefinedColours.java
@@ -20,6 +20,8 @@
  */
 package jalview.gui;
 
+import java.util.Locale;
+
 import jalview.bin.Cache;
 import jalview.io.JalviewFileChooser;
 import jalview.io.JalviewFileView;
@@ -205,8 +207,10 @@ public class UserDefinedColours extends GUserDefinedColours
       {
         int row = i / cols + 1;
         int index = (row * cols) + i;
-        JButton button = makeButton(ResidueProperties.aa[i].toLowerCase(),
-                ResidueProperties.aa[i].toLowerCase(), lowerCaseButtons, i);
+        JButton button = makeButton(
+                ResidueProperties.aa[i].toLowerCase(Locale.ROOT),
+                ResidueProperties.aa[i].toLowerCase(Locale.ROOT),
+                lowerCaseButtons, i);
 
         buttonPanel.add(button, index);
       }
@@ -490,7 +494,7 @@ public class UserDefinedColours extends GUserDefinedColours
     /**
      * Java only
      * 
-     * @j2sNative
+     * @j2sIgnore
      */
     {
       String name = schemeName.getText().trim();
@@ -648,47 +652,47 @@ public class UserDefinedColours extends GUserDefinedColours
     chooser.setDialogTitle(
             MessageManager.getString("label.load_colour_scheme"));
     chooser.setToolTipText(MessageManager.getString("action.load"));
-    chooser.setResponseHandler(0, new Runnable() 
-    {
-	  @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.setResponseHandler(0, new Runnable()
+    {
+      @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);
   }
 
@@ -748,17 +752,24 @@ public class UserDefinedColours extends GUserDefinedColours
               JvOptionPane.WARNING_MESSAGE);
     }
 
-    if (ColourSchemes.getInstance().nameExists(name))
+    if (!Platform.isJS() && ColourSchemes.getInstance().nameExists(name))
     {
-      // BH 2018 SwingJS bypasses this question with YES_OPTION
-      int reply = /** @j2sNative  0 &&  */ JvOptionPane.showInternalConfirmDialog(Desktop.desktop,
-              MessageManager.formatMessage(
-                      "label.colour_scheme_exists_overwrite", new Object[]
-                      { name, name }),
-              MessageManager.getString("label.duplicate_scheme_name"),
-              JvOptionPane.YES_NO_OPTION);
-      if (reply != JvOptionPane.YES_OPTION)
+      /**
+       * java only
+       * 
+       * @j2sIgnore
+       */
       {
+        int reply = JvOptionPane.showInternalConfirmDialog(Desktop.desktop,
+                MessageManager.formatMessage(
+                        "label.colour_scheme_exists_overwrite", new Object[]
+                        { name, name }),
+                MessageManager.getString("label.duplicate_scheme_name"),
+                JvOptionPane.YES_NO_OPTION);
+        if (reply != JvOptionPane.YES_OPTION)
+        {
+          return;
+        }
       }
     }
 
@@ -771,24 +782,24 @@ public class UserDefinedColours extends GUserDefinedColours
             MessageManager.getString("label.save_colour_scheme"));
     chooser.setToolTipText(MessageManager.getString("action.save"));
     int option = chooser.showSaveDialog(this);
-    if (option == JalviewFileChooser.APPROVE_OPTION) 
-    {
-	  File file = chooser.getSelectedFile();
-	  UserColourScheme updatedScheme = addNewColourScheme(file.getPath());
-	  saveToFile(file);
-	  changedButNotSaved = false;
-
-	  /*
-	   * changes saved - apply to alignment if we are changing 
-	   * the currently selected colour scheme; also make the updated
-	   * colours the 'backout' scheme on Cancel
-	   */
-	  if (oldColourScheme != null
-	          && name.equals(oldColourScheme.getSchemeName()))
-	  {
-	    oldColourScheme = updatedScheme;
-	    applyButton_actionPerformed();
-	  }
+    if (option == JalviewFileChooser.APPROVE_OPTION)
+    {
+      File file = chooser.getSelectedFile();
+      UserColourScheme updatedScheme = addNewColourScheme(file.getPath());
+      saveToFile(file);
+      changedButNotSaved = false;
+
+      /*
+       * changes saved - apply to alignment if we are changing 
+       * the currently selected colour scheme; also make the updated
+       * colours the 'backout' scheme on Cancel
+       */
+      if (oldColourScheme != null
+              && name.equals(oldColourScheme.getSchemeName()))
+      {
+        oldColourScheme = updatedScheme;
+        applyButton_actionPerformed();
+      }
     }
   }