package jalview.gui;
import jalview.bin.Cache;
+import jalview.bin.Console;
import jalview.io.JalviewFileChooser;
import jalview.io.JalviewFileView;
import jalview.util.MessageManager;
*/
public class WsParamSetManager implements ParamManager
{
+ private static final String WS_PARAM_FILES = "WS_PARAM_FILES";
Hashtable<String, ParamDatastoreI> paramparsers = new Hashtable<>();
@Override
public WsParamSetI[] getParameterSet(String name, String serviceUrl,
boolean modifiable, boolean unmodifiable)
{
- String files = Cache.getProperty("WS_PARAM_FILES");
+ String files = Cache.getProperty(WS_PARAM_FILES);
if (files == null)
{
return null;
}
} catch (IOException e)
{
- Cache.info("Failed to parse parameter file " + pfile
+ Console.info("Failed to parse parameter file " + pfile
+ " (Check that all JALVIEW_WSPARAMFILES entries are valid!)",
e);
}
{
if (filename != null && !((outfile = new File(filename)).canWrite()))
{
- Cache.warn("Can't write to " + filename
+ Console.warn("Can't write to " + filename
+ " - Prompting for new file to write to.");
filename = null;
}
chooser.setDialogTitle(MessageManager
.getString("label.choose_filename_for_param_file"));
chooser.setToolTipText(MessageManager.getString("action.save"));
- int value = chooser.showSaveDialog(Desktop.instance);
+ int value = chooser.showSaveDialog(Desktop.getInstance());
if (value == JalviewFileChooser.APPROVE_OPTION)
{
outfile = chooser.getSelectedFile();
}
if (outfile != null)
{
- String paramFiles = Cache.getDefault("WS_PARAM_FILES",
- filename);
+ String paramFiles = Cache.getDefault("WS_PARAM_FILES", filename);
if (paramFiles.indexOf(filename) == -1)
{
if (paramFiles.length() > 0)
}
paramFiles = paramFiles.concat(filename);
}
- Cache.setProperty("WS_PARAM_FILES", paramFiles);
+ Cache.setProperty(WS_PARAM_FILES, paramFiles);
WebServiceParameterSet paramxml = new WebServiceParameterSet();
parameterSet.setSourceFile(filename);
} catch (Exception e)
{
- Cache.error("Couldn't write parameter file to " + outfile, e);
+ Console.error("Couldn't write parameter file to " + outfile, e);
}
}
}
/*
*
- * JalviewFileChooser chooser = new JalviewFileChooser(Cache
+ * JalviewFileChooser chooser = new JalviewFileChooser(jalview.bin.Cache
* .getProperty("LAST_DIRECTORY"), new String[] { "jc" }, new String[] {
* "Jalview User Colours" }, "Jalview User Colours"); chooser.setFileView(new
* jalview.io.JalviewFileView());
* int value = chooser.showOpenDialog(this);
*
* if (value == JalviewFileChooser.APPROVE_OPTION) { File choice =
- * chooser.getSelectedFile(); Cache.setProperty("LAST_DIRECTORY",
- * choice.getParent()); String defaultColours = Cache.getDefault(
+ * chooser.getSelectedFile(); jalview.bin.Cache.setProperty("LAST_DIRECTORY",
+ * choice.getParent()); String defaultColours = jalview.bin.Cache.getDefault(
* "USER_DEFINED_COLOURS", choice.getPath()); if
* (defaultColours.indexOf(choice.getPath()) == -1) { defaultColours =
* defaultColours.concat("|") .concat(choice.getPath()); } (non-Javadoc)
{
return;
}
- String paramFiles = Cache.getDefault("WS_PARAM_FILES", "");
+ String paramFiles = Cache.getDefault(WS_PARAM_FILES, "");
if (paramFiles.indexOf(filename) > -1)
{
String nparamFiles = new String();
nparamFiles = nparamFiles.concat("|").concat(fl);
}
}
- Cache.setProperty("WS_PARAM_FILES", nparamFiles);
+ Cache.setProperty(WS_PARAM_FILES, nparamFiles);
}
try
File pfile = new File(filename);
if (pfile.exists() && pfile.canWrite())
{
- if (JvOptionPane.showConfirmDialog(Desktop.instance,
+ if (JvOptionPane.showConfirmDialog(Desktop.getInstance(),
"Delete the preset's file, too ?", "Delete User Preset ?",
JvOptionPane.OK_CANCEL_OPTION) == JvOptionPane.OK_OPTION)
{
}
} catch (Exception e)
{
- Cache.error(
+ Console.error(
"Exception when trying to delete webservice user preset: ",
e);
}