Merge branch 'develop' into update_212_Dec_merge_with_21125_chamges

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

diff --git a/src/jalview/gui/WsParamSetManager.java b/src/jalview/gui/WsParamSetManager.java
index cb98856..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;
@@ -56,13 +57,14 @@ import javax.xml.stream.XMLStreamReader;
  */
 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;
@@ -106,7 +108,7 @@ public class WsParamSetManager implements ParamManager
         }
       } 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);
       }
@@ -171,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;
       }
@@ -195,13 +197,15 @@ public class WsParamSetManager implements ParamManager
     }
     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());
       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();
@@ -216,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)
@@ -226,7 +229,7 @@ public class WsParamSetManager implements ParamManager
         }
         paramFiles = paramFiles.concat(filename);
       }
-      Cache.setProperty("WS_PARAM_FILES", paramFiles);
+      Cache.setProperty(WS_PARAM_FILES, paramFiles);
 
       WebServiceParameterSet paramxml = new WebServiceParameterSet();
 
@@ -253,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);
       }
     }
   }
@@ -288,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();
@@ -301,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
@@ -309,7 +312,7 @@ public class WsParamSetManager implements ParamManager
       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)
         {
@@ -318,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);
     }