JAL-629 Change all stdout and stderr output to use Console.outPrintln and Console...

[jalview.git] / src / jalview / ws / jws2 / jabaws2 / Jws2Instance.java

diff --git a/src/jalview/ws/jws2/jabaws2/Jws2Instance.java b/src/jalview/ws/jws2/jabaws2/Jws2Instance.java
index 2f3c298..9e49ce7 100644 (file)
--- a/src/jalview/ws/jws2/jabaws2/Jws2Instance.java
+++ b/src/jalview/ws/jws2/jabaws2/Jws2Instance.java
@@ -38,7 +38,7 @@ import compbio.data.msa.SequenceAnnotation;
 import compbio.metadata.PresetManager;
 import compbio.metadata.RunnerConfig;
 
-public class Jws2Instance
+public class Jws2Instance implements AutoCloseable
 {
   public String hosturl;
 
@@ -114,7 +114,7 @@ public class Jws2Instance
         }
       } catch (Exception ex)
       {
-        System.err.println("Exception when retrieving presets for service "
+        jalview.bin.Console.errPrintln("Exception when retrieving presets for service "
                 + serviceType + " at " + hosturl);
       }
     }
@@ -128,7 +128,7 @@ public class Jws2Instance
      * try { URL serviceurl = new URL(hosturl); if (serviceurl.getPort()!=80) {
      * return serviceurl.getHost()+":"+serviceurl.getPort(); } return
      * serviceurl.getHost(); } catch (Exception e) {
-     * System.err.println("Failed to parse service URL '" + hosturl +
+     * jalview.bin.Console.errPrintln("Failed to parse service URL '" + hosturl +
      * "' as a valid URL!"); } return null;
      */
   }
@@ -164,7 +164,7 @@ public class Jws2Instance
   }
 
   @Override
-  protected void finalize() throws Throwable
+  public void close()
   {
     if (service != null)
     {
@@ -176,7 +176,7 @@ public class Jws2Instance
         // ignore
       }
     }
-    super.finalize();
+    // super.finalize();
   }
 
   public ParamDatastoreI getParamStore()
@@ -190,7 +190,7 @@ public class Jws2Instance
                         : null));
       } catch (Exception ex)
       {
-        System.err.println("Unexpected exception creating JabaParamStore.");
+        jalview.bin.Console.errPrintln("Unexpected exception creating JabaParamStore.");
         ex.printStackTrace();
       }