X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FUserDefinedColours.java;h=704cfeafd064607c57fca63c51e545625a746e5b;hb=4313fc0bf442a0668d74224f78080b1182acb20d;hp=329050090760b5518227f879f35a9fafcd2f52b7;hpb=a57976ba40e1abe6d7c1940386e1a25419ef9c9d;p=jalview.git

diff --git a/src/jalview/gui/UserDefinedColours.java b/src/jalview/gui/UserDefinedColours.java
index 3290500..704cfea 100755
--- a/src/jalview/gui/UserDefinedColours.java
+++ b/src/jalview/gui/UserDefinedColours.java
@@ -480,7 +480,9 @@ public class UserDefinedColours extends GUserDefinedColours
    */
   protected void warnIfUnsavedChanges()
   {
-    if (!changed)
+    // BH 2018 no warning in JavaScript TODO
+    
+    if (/** @j2sNative true || */ !changed)
     {
       return;
     }
@@ -633,7 +635,7 @@ public class UserDefinedColours extends GUserDefinedColours
   {
     upperCaseButtons = new ArrayList<>();
     lowerCaseButtons = new ArrayList<>();
-
+    // TODO: JAL-3048 requires Castor dependency for Jalview-JS
     JalviewFileChooser chooser = new JalviewFileChooser("jc",
             "Jalview User Colours");
     chooser.setFileView(new JalviewFileView());
@@ -743,7 +745,8 @@ public class UserDefinedColours extends GUserDefinedColours
 
     if (ColourSchemes.getInstance().nameExists(name))
     {
-      int reply = JvOptionPane.showInternalConfirmDialog(Desktop.desktop,
+      // 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 }),
@@ -754,6 +757,8 @@ public class UserDefinedColours extends GUserDefinedColours
         return false;
       }
     }
+    // TODO: JAL-3048 saveas, also requires Castor dependency for Jalview-JS
+
     JalviewFileChooser chooser = new JalviewFileChooser("jc",
             "Jalview User Colours");