git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'Jalview-BH/JAL-3026' of https://source.jalview.org/git/jalview.git...
[jalview.git]
/
src
/
jalview
/
gui
/
UserDefinedColours.java
diff --git
a/src/jalview/gui/UserDefinedColours.java
b/src/jalview/gui/UserDefinedColours.java
index
89ddf87
..
704cfea
100755
(executable)
--- a/
src/jalview/gui/UserDefinedColours.java
+++ b/
src/jalview/gui/UserDefinedColours.java
@@
-480,7
+480,9
@@
public class UserDefinedColours extends GUserDefinedColours
*/
protected void warnIfUnsavedChanges()
{
*/
protected void warnIfUnsavedChanges()
{
- if (!changed)
+ // BH 2018 no warning in JavaScript TODO
+
+ if (/** @j2sNative true || */ !changed)
{
return;
}
{
return;
}
@@
-743,7
+745,8
@@
public class UserDefinedColours extends GUserDefinedColours
if (ColourSchemes.getInstance().nameExists(name))
{
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 }),
MessageManager.formatMessage(
"label.colour_scheme_exists_overwrite", new Object[]
{ name, name }),