package jalview.gui;
import jalview.bin.Cache;
+import jalview.bin.Console;
import jalview.io.JalviewFileChooser;
import jalview.io.JalviewFileView;
import jalview.util.MessageManager;
}
} catch (IOException e)
{
- Cache.log.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 (parser != null)
{
WsParamSetI pset = parser.parseServiceParameterFile(
- wspset.getName(), wspset.getDescription(),
- urlArray, wspset.getParameters());
+ wspset.getName(), wspset.getDescription(), urlArray,
+ wspset.getParameters());
if (pset != null)
{
pset.setSourceFile(filename);
{
if (filename != null && !((outfile = new File(filename)).canWrite()))
{
- Cache.log.warn("Can't write to " + filename
+ Console.warn("Can't write to " + filename
+ " - Prompting for new file to write to.");
filename = null;
}
}
if (filename == null)
{
+ // TODO: JAL-3048 webservice - not required for Jalview-JS
+
JalviewFileChooser chooser = new JalviewFileChooser("wsparams",
"Web Service Parameter File");
chooser.setFileView(new JalviewFileView());
}
if (outfile != null)
{
- String paramFiles = jalview.bin.Cache.getDefault("WS_PARAM_FILES",
- filename);
+ String paramFiles = Cache.getDefault("WS_PARAM_FILES", filename);
if (paramFiles.indexOf(filename) == -1)
{
if (paramFiles.length() > 0)
parameterSet.setSourceFile(filename);
} catch (Exception e)
{
- Cache.log.error("Couldn't write parameter file to " + outfile, e);
+ Console.error("Couldn't write parameter file to " + outfile, e);
}
}
}
/*
*
- * JalviewFileChooser chooser = new JalviewFileChooser(jalview.bin.Cache
+ * JalviewFileChooser chooser = new JalviewFileChooser(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(); jalview.bin.Cache.setProperty("LAST_DIRECTORY",
- * choice.getParent()); String defaultColours = jalview.bin.Cache.getDefault(
+ * chooser.getSelectedFile(); Cache.setProperty("LAST_DIRECTORY",
+ * choice.getParent()); String defaultColours = Cache.getDefault(
* "USER_DEFINED_COLOURS", choice.getPath()); if
* (defaultColours.indexOf(choice.getPath()) == -1) { defaultColours =
* defaultColours.concat("|") .concat(choice.getPath()); } (non-Javadoc)
{
return;
}
- String paramFiles = jalview.bin.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);
}
}
- jalview.bin.Cache.setProperty("WS_PARAM_FILES", nparamFiles);
+ Cache.setProperty("WS_PARAM_FILES", nparamFiles);
}
try
}
} catch (Exception e)
{
- Cache.log.error(
+ Console.error(
"Exception when trying to delete webservice user preset: ",
e);
}