Merge branch 'develop' into JAL-3416_different_look_and_feel_on_linux

[jalview.git] / src / jalview / ws / jws2 / dm / JabaOption.java

diff --git a/src/jalview/ws/jws2/dm/JabaOption.java b/src/jalview/ws/jws2/dm/JabaOption.java
index f29b6ed..5a3fb35 100644 (file)
--- a/src/jalview/ws/jws2/dm/JabaOption.java
+++ b/src/jalview/ws/jws2/dm/JabaOption.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.
  * 
@@ -20,14 +20,14 @@
  */
 package jalview.ws.jws2.dm;
 
-import jalview.ws.jws2.ParameterUtils;
-import jalview.ws.params.OptionI;
-
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.List;
 
 import compbio.metadata.Option;
+import jalview.util.MessageManager;
+import jalview.ws.jws2.ParameterUtils;
+import jalview.ws.params.OptionI;
 
 public class JabaOption implements jalview.ws.params.OptionI
 {
@@ -93,9 +93,9 @@ public class JabaOption implements jalview.ws.params.OptionI
       opt.setDefaultValue(selectedItem);
     } catch (Exception e)
     {
-      e.printStackTrace();
-      throw new Error(
-              "Implementation error: cannot set Jaba Option to a value outside its allowed value range!");
+      throw new IllegalArgumentException(MessageManager
+              .formatMessage("error.invalid_value_for_option", new String[]
+              { selectedItem, opt.getName() }));
     }
   }