j2sNative clean-up. Fixes problem with second try of sequence fetching

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

diff --git a/src/jalview/gui/UserDefinedColours.java b/src/jalview/gui/UserDefinedColours.java
index 8720341..621f49d 100755 (executable)
--- a/src/jalview/gui/UserDefinedColours.java
+++ b/src/jalview/gui/UserDefinedColours.java
@@ -748,17 +748,24 @@ public class UserDefinedColours extends GUserDefinedColours
               JvOptionPane.WARNING_MESSAGE);
     }
 
-    if (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)
+    if (!Platform.isJS() && ColourSchemes.getInstance().nameExists(name))
+    {
+      /**
+       * java only
+       * 
+       * @j2sNative
+       */
       {
+        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 +778,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();
+      }
     }
   }