X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FPromptUserConfig.java;h=fb90ce7b69d1f059ab33b0ee3d555f26dea7f59c;hb=24680a271861e9309a2241c8884874656ac111b1;hp=89d80e5e7cdf78e6543baca033ca7b0e8c0c3707;hpb=a8f483d04205bb8273ee311c12968b7e86d205fa;p=jalview.git diff --git a/src/jalview/gui/PromptUserConfig.java b/src/jalview/gui/PromptUserConfig.java index 89d80e5..fb90ce7 100644 --- a/src/jalview/gui/PromptUserConfig.java +++ b/src/jalview/gui/PromptUserConfig.java @@ -1,19 +1,21 @@ /* - * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2) - * Copyright (C) 2014 The Jalview Authors + * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$) + * Copyright (C) $$Year-Rel$$ The Jalview Authors * * This file is part of Jalview. * * Jalview is free software: you can redistribute it and/or * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. + * as published by the Free Software Foundation, either version 3 + * of the License, or (at your option) any later version. * * Jalview is distributed in the hope that it will be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty * of MERCHANTABILITY or FITNESS FOR A PARTICULAR * PURPOSE. See the GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License along with Jalview. If not, see . + * You should have received a copy of the GNU General Public License + * along with Jalview. If not, see . * The Jalview Authors are detailed in the 'AUTHORS' file. */ package jalview.gui; @@ -22,7 +24,7 @@ import jalview.bin.Cache; import java.awt.Component; -import javax.swing.*; +import javax.swing.JOptionPane; public class PromptUserConfig implements Runnable { @@ -199,12 +201,12 @@ public class PromptUserConfig implements Runnable } try { - int reply = JOptionPane.showConfirmDialog( + int reply = JvOptionPane.showConfirmDialog( Desktop.desktop, // component, dialogText, dialogTitle, - (allowCancel) ? JOptionPane.YES_NO_CANCEL_OPTION - : JOptionPane.YES_NO_OPTION, - JOptionPane.QUESTION_MESSAGE); + (allowCancel) ? JvOptionPane.YES_NO_CANCEL_OPTION + : JvOptionPane.YES_NO_OPTION, + JvOptionPane.QUESTION_MESSAGE); // now, ask the desktop to relayer any external windows that might have // been obsured if (Desktop.instance != null) @@ -213,11 +215,11 @@ public class PromptUserConfig implements Runnable } // and finish parsing the result jalview.bin.Cache.log.debug("Got response : " + reply); - if (reply == JOptionPane.YES_OPTION) + if (reply == JvOptionPane.YES_OPTION) { jalview.bin.Cache.setProperty(property, "true"); } - else if (reply == JOptionPane.NO_OPTION) + else if (reply == JvOptionPane.NO_OPTION) { if (removeifunset) {