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 'update/JAL-3949_jalview_bin_Console_to_cure_sanity_even_more' of https...
[jalview.git]
/
src
/
jalview
/
gui
/
WsParamSetManager.java
diff --git
a/src/jalview/gui/WsParamSetManager.java
b/src/jalview/gui/WsParamSetManager.java
index
4c76714
..
de1be5d
100644
(file)
--- a/
src/jalview/gui/WsParamSetManager.java
+++ b/
src/jalview/gui/WsParamSetManager.java
@@
-21,6
+21,7
@@
package jalview.gui;
import jalview.bin.Cache;
package jalview.gui;
import jalview.bin.Cache;
+import jalview.bin.Console;
import jalview.io.JalviewFileChooser;
import jalview.io.JalviewFileView;
import jalview.util.MessageManager;
import jalview.io.JalviewFileChooser;
import jalview.io.JalviewFileView;
import jalview.util.MessageManager;
@@
-106,7
+107,7
@@
public class WsParamSetManager implements ParamManager
}
} catch (IOException e)
{
}
} 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);
}
+ " (Check that all JALVIEW_WSPARAMFILES entries are valid!)",
e);
}
@@
-171,7
+172,7
@@
public class WsParamSetManager implements ParamManager
{
if (filename != null && !((outfile = new File(filename)).canWrite()))
{
{
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;
}
+ " - Prompting for new file to write to.");
filename = null;
}
@@
-255,7
+256,7
@@
public class WsParamSetManager implements ParamManager
parameterSet.setSourceFile(filename);
} catch (Exception e)
{
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);
}
}
}
}
}
}
@@
-320,7
+321,7
@@
public class WsParamSetManager implements ParamManager
}
} catch (Exception e)
{
}
} catch (Exception e)
{
- Cache.error(
+ Console.error(
"Exception when trying to delete webservice user preset: ",
e);
}
"Exception when trying to delete webservice user preset: ",
e);
}