X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fws%2Fjws2%2Fjabaws2%2FJws2Instance.java;h=2f3c2988feaf039185c224d9351e9109673fab5c;hb=aad3640b07f836362df7ea025fa09127a0a06145;hp=46362fc6a9dccc5ae819622e3a9798059daf82a6;hpb=47168f025aefdaa044802bd5f8f510ffe43a4808;p=jalview.git

diff --git a/src/jalview/ws/jws2/jabaws2/Jws2Instance.java b/src/jalview/ws/jws2/jabaws2/Jws2Instance.java
index 46362fc..2f3c298 100644
--- a/src/jalview/ws/jws2/jabaws2/Jws2Instance.java
+++ b/src/jalview/ws/jws2/jabaws2/Jws2Instance.java
@@ -1,6 +1,6 @@
 /*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2)
- * Copyright (C) 2014 The Jalview Authors
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
  * 
  * This file is part of Jalview.
  * 
@@ -22,6 +22,7 @@ package jalview.ws.jws2.jabaws2;
 
 import jalview.gui.AlignFrame;
 import jalview.gui.Desktop;
+import jalview.util.MessageManager;
 import jalview.ws.jws2.JabaParamStore;
 import jalview.ws.jws2.MsaWSClient;
 import jalview.ws.jws2.SequenceAnnotationWSClient;
@@ -53,11 +54,17 @@ public class Jws2Instance
 
   /**
    * 
-   * @param hosturl Service endpoint
-   * @param serviceType Category for this service's analysis
-   * @param action text describing their action that service performs (eg 'aligning', 'analysing')
-   * @param description Description from JABAWS registry
-   * @param service JABAWS registry ID for service
+   * @param hosturl
+   *          Service endpoint
+   * @param serviceType
+   *          Category for this service's analysis
+   * @param action
+   *          text describing their action that service performs (eg 'aligning',
+   *          'analysing')
+   * @param description
+   *          Description from JABAWS registry
+   * @param service
+   *          JABAWS registry ID for service
    */
   public Jws2Instance(String hosturl, String serviceType, String action,
           String description, JABAService service)
@@ -150,9 +157,10 @@ public class Jws2Instance
     {
       return ((SequenceAnnotation) service).getRunnerOptions();
     }
-    throw new Error(
-            "Implementation Error: Runner Config not available for a JABAWS service of type "
-                    + serviceType + " (" + service.getClass() + ")");
+    throw new Error(MessageManager.formatMessage(
+            "error.implementation_error_runner_config_not_available",
+            new String[]
+            { serviceType, service.getClass().toString() }));
   }
 
   @Override
@@ -162,13 +170,11 @@ public class Jws2Instance
     {
       try
       {
-        Closeable svc = (Closeable) service;
-        service = null;
-        svc.close();
-      } catch (Exception e)
+        ((Closeable) service).close();
+      } catch (Throwable t)
       {
+        // ignore
       }
-      ;
     }
     super.finalize();
   }
@@ -197,7 +203,8 @@ public class Jws2Instance
     // this is only valid for Jaba 1.0 - this formula might have to change!
     return hosturl
             + (hosturl.lastIndexOf("/") == (hosturl.length() - 1) ? ""
-                    : "/") + serviceType;
+                    : "/")
+            + serviceType;
   }
 
   private boolean hasParams = false, lookedForParams = false;
@@ -235,7 +242,9 @@ public class Jws2Instance
   {
     return "java:" + serviceType;
   }
+
   jalview.ws.uimodel.AlignAnalysisUIText aaui;
+
   public jalview.ws.uimodel.AlignAnalysisUIText getAlignAnalysisUI()
   {
     return aaui;