Merge branch 'develop' into merged_2_11_2_0_to_2_12

[jalview.git] / src / jalview / gui / WsParamSetManager.java

diff --git a/src/jalview/gui/WsParamSetManager.java b/src/jalview/gui/WsParamSetManager.java
index 272e05b..6e37cf7 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;
+import jalview.bin.Console;
 import jalview.io.JalviewFileChooser;
 import jalview.io.JalviewFileView;
 import jalview.util.MessageManager;
@@ -107,9 +108,8 @@ public class WsParamSetManager implements ParamManager
         }
       } catch (IOException e)
       {
-        Cache.log.info("Failed to parse parameter file " + pfile
-                + " (Check that all " + WS_PARAM_FILES
-                + " entries are valid!)",
+        Console.info("Failed to parse parameter file " + pfile
+                + " (Check that all JALVIEW_WSPARAMFILES entries are valid!)",
                 e);
       }
     }
@@ -173,7 +173,7 @@ public class WsParamSetManager implements ParamManager
     {
       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;
       }
@@ -220,8 +220,7 @@ public class WsParamSetManager implements ParamManager
     }
     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)
@@ -230,7 +229,6 @@ public class WsParamSetManager implements ParamManager
         }
         paramFiles = paramFiles.concat(filename);
       }
-
       Cache.setProperty(WS_PARAM_FILES, paramFiles);
 
       WebServiceParameterSet paramxml = new WebServiceParameterSet();
@@ -258,7 +256,7 @@ public class WsParamSetManager implements ParamManager
         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);
       }
     }
   }
@@ -293,7 +291,7 @@ public class WsParamSetManager implements ParamManager
     {
       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();
@@ -306,7 +304,7 @@ public class WsParamSetManager implements ParamManager
           nparamFiles = nparamFiles.concat("|").concat(fl);
         }
       }
-      jalview.bin.Cache.setProperty(WS_PARAM_FILES, nparamFiles);
+      Cache.setProperty(WS_PARAM_FILES, nparamFiles);
     }
 
     try
@@ -323,7 +321,7 @@ public class WsParamSetManager implements ParamManager
       }
     } catch (Exception e)
     {
-      Cache.log.error(
+      Console.error(
               "Exception when trying to delete webservice user preset: ",
               e);
     }