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 'bug/JAL-2592userDefinedScheme' into develop
[jalview.git]
/
src
/
jalview
/
gui
/
WsParamSetManager.java
diff --git
a/src/jalview/gui/WsParamSetManager.java
b/src/jalview/gui/WsParamSetManager.java
index
b6a7672
..
1aa0803
100644
(file)
--- a/
src/jalview/gui/WsParamSetManager.java
+++ b/
src/jalview/gui/WsParamSetManager.java
@@
-22,6
+22,7
@@
package jalview.gui;
import jalview.bin.Cache;
import jalview.io.JalviewFileChooser;
import jalview.bin.Cache;
import jalview.io.JalviewFileChooser;
+import jalview.io.JalviewFileView;
import jalview.util.MessageManager;
import jalview.ws.params.ParamDatastoreI;
import jalview.ws.params.ParamManager;
import jalview.util.MessageManager;
import jalview.ws.params.ParamDatastoreI;
import jalview.ws.params.ParamManager;
@@
-38,8
+39,6
@@
import java.util.Hashtable;
import java.util.List;
import java.util.StringTokenizer;
import java.util.List;
import java.util.StringTokenizer;
-import javax.swing.JOptionPane;
-
/**
* store and retrieve web service parameter sets.
*
/**
* store and retrieve web service parameter sets.
*
@@
-184,12
+183,9
@@
public class WsParamSetManager implements ParamManager
}
if (filename == null)
{
}
if (filename == null)
{
- JalviewFileChooser chooser = new JalviewFileChooser(
- jalview.bin.Cache.getProperty("LAST_DIRECTORY"), new String[]
- { "wsparams" },
- new String[] { "Web Service Parameter File" },
+ JalviewFileChooser chooser = new JalviewFileChooser("wsparams",
"Web Service Parameter File");
"Web Service Parameter File");
- chooser.setFileView(new jalview.io.JalviewFileView());
+ chooser.setFileView(new JalviewFileView());
chooser.setDialogTitle(MessageManager
.getString("label.choose_filename_for_param_file"));
chooser.setToolTipText(MessageManager.getString("action.save"));
chooser.setDialogTitle(MessageManager
.getString("label.choose_filename_for_param_file"));
chooser.setToolTipText(MessageManager.getString("action.save"));
@@
-294,9
+290,9
@@
public class WsParamSetManager implements ParamManager
File pfile = new File(filename);
if (pfile.exists() && pfile.canWrite())
{
File pfile = new File(filename);
if (pfile.exists() && pfile.canWrite())
{
- if (JOptionPane.showConfirmDialog(Desktop.instance,
+ if (JvOptionPane.showConfirmDialog(Desktop.instance,
"Delete the preset's file, too ?", "Delete User Preset ?",
"Delete the preset's file, too ?", "Delete User Preset ?",
- JOptionPane.OK_CANCEL_OPTION) == JOptionPane.OK_OPTION)
+ JvOptionPane.OK_CANCEL_OPTION) == JvOptionPane.OK_OPTION)
{
pfile.delete();
}
{
pfile.delete();
}