Merge branch 'releases/Release_2_11_3_Branch'

[jalview.git] / src / jalview / ws / jws2 / JabaPreset.java

diff --git a/src/jalview/ws/jws2/JabaPreset.java b/src/jalview/ws/jws2/JabaPreset.java
index c86a790..981b288 100644 (file)
--- a/src/jalview/ws/jws2/JabaPreset.java
+++ b/src/jalview/ws/jws2/JabaPreset.java
@@ -1,23 +1,27 @@
 /*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.6)
- * Copyright (C) 2010 J Procter, AM Waterhouse, G Barton, M Clamp, S Searle
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
  * 
  * This file is part of Jalview.
  * 
  * Jalview is free software: you can redistribute it and/or
  * modify it under the terms of the GNU General Public License 
- * as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
- * 
+ * as published by the Free Software Foundation, either version 3
+ * of the License, or (at your option) any later version.
+ *  
  * Jalview is distributed in the hope that it will be useful, but 
  * WITHOUT ANY WARRANTY; without even the implied warranty 
  * of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
  * PURPOSE.  See the GNU General Public License for more details.
  * 
- * You should have received a copy of the GNU General Public License along with Jalview.  If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the GNU General Public License
+ * along with Jalview.  If not, see <http://www.gnu.org/licenses/>.
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
  */
 package jalview.ws.jws2;
 
-import jalview.ws.jws2.Jws2Discoverer.Jws2Instance;
+import jalview.util.MessageManager;
+import jalview.ws.jws2.jabaws2.Jws2Instance;
 import jalview.ws.params.ArgumentI;
 import jalview.ws.params.WsParamSetI;
 
@@ -52,8 +56,7 @@ public class JabaPreset implements WsParamSetI
   @Override
   public String[] getApplicableUrls()
   {
-    return new String[]
-    { service.getUri() };
+    return new String[] { service.getUri() };
   }
 
   @Override
@@ -71,7 +74,9 @@ public class JabaPreset implements WsParamSetI
   @Override
   public void setSourceFile(String newfile)
   {
-    throw new Error("Cannot set source file for " + getClass());
+    throw new Error(MessageManager
+            .formatMessage("error.cannot_set_source_file_for", new String[]
+            { getClass().toString() }));
   }
 
   @Override
@@ -79,19 +84,20 @@ public class JabaPreset implements WsParamSetI
   {
     try
     {
-      return JabaParamStore.getJwsArgsfromJaba(p.getArguments(service
-              .getRunnerConfig()));
+      return JabaParamStore.getJwsArgsfromJaba(
+              p.getArguments(service.getRunnerConfig()));
     } catch (Exception e)
     {
       e.printStackTrace();
-      throw new Error(
-              "Probable mismatch between service instance and preset!");
+      throw new Error(MessageManager
+              .getString("error.mismatch_service_instance_preset"));
     }
   }
 
   @Override
   public void setArguments(List<ArgumentI> args)
   {
-    throw new Error("Cannot set Parameters for a Jaba Web service's preset");
+    throw new Error(MessageManager
+            .getString("error.cannot_set_params_for_ws_preset"));
   }
 }