X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fws%2Fjws2%2Fdm%2FJabaOption.java;h=66b3112aa68c340e24430b770bbeb855c871d52d;hb=57dd16688caa6dacaeaf465bab3ee8b6126e1a51;hp=7090b4386f34984d6f57217c282ea7d28cac6947;hpb=153dd62dc91da13ae732600e6ea55ddbe15eab39;p=jalview.git

diff --git a/src/jalview/ws/jws2/dm/JabaOption.java b/src/jalview/ws/jws2/dm/JabaOption.java
index 7090b43..66b3112 100644
--- a/src/jalview/ws/jws2/dm/JabaOption.java
+++ b/src/jalview/ws/jws2/dm/JabaOption.java
@@ -1,25 +1,30 @@
 /*
- * 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 2.9)
+ * Copyright (C) 2015 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.dm;
 
+import jalview.util.MessageManager;
 import jalview.ws.jws2.ParameterUtils;
 import jalview.ws.params.OptionI;
 
+import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.List;
 
@@ -35,7 +40,7 @@ public class JabaOption implements jalview.ws.params.OptionI
   Option opt;
 
   @Override
-  public String getDefaultValue()
+  public String getValue()
   {
     return opt.getDefaultValue();
   }
@@ -49,7 +54,17 @@ public class JabaOption implements jalview.ws.params.OptionI
   @Override
   public URL getFurtherDetails()
   {
-    return opt.getFurtherDetails();
+    try
+    {
+      return new URL(opt.getBasicURL().toExternalForm() + "/"
+              + opt.getFurtherDetails());
+    } catch (NullPointerException q)
+    {
+    } catch (MalformedURLException q)
+    {
+
+    }
+    return null;
   }
 
   @Override
@@ -72,14 +87,17 @@ public class JabaOption implements jalview.ws.params.OptionI
   }
 
   @Override
-  public void setDefaultValue(String selectedItem)
+  public void setValue(String selectedItem)
   {
-    try {
+    try
+    {
       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 Error(
+              MessageManager
+                      .getString("error.implementation_error_cannot_set_jaba_option"));
     }
   }
 
@@ -90,12 +108,14 @@ public class JabaOption implements jalview.ws.params.OptionI
   }
 
   /**
-   * get the underlying Jaba option or parameter object. Note - use copy first if you want to modify the value of the option.
+   * get the underlying Jaba option or parameter object. Note - use copy first
+   * if you want to modify the value of the option.
+   * 
    * @return
    */
   public Option getOption()
   {
     return opt;
   }
-  
+
 }