X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fws%2Fjws2%2Fdm%2FJabaOption.java;h=5af8a20dedb4c807ea8b6816a2939c7719573f54;hb=ab43013b7e357b84b4abade0dba949668dfb2a0e;hp=be4912b3ab393de114e125c0257d0a90d67d8de6;hpb=8a6fa9ea9900d0f106529c3f6283e7f9d76dd2cb;p=jalview.git diff --git a/src/jalview/ws/jws2/dm/JabaOption.java b/src/jalview/ws/jws2/dm/JabaOption.java index be4912b..5af8a20 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.8.2b1) + * Copyright (C) 2014 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 . + * You should have received a copy of the GNU General Public License + * along with Jalview. If not, see . + * 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,7 +87,7 @@ public class JabaOption implements jalview.ws.params.OptionI } @Override - public void setDefaultValue(String selectedItem) + public void setValue(String selectedItem) { try { @@ -80,8 +95,7 @@ public class JabaOption implements jalview.ws.params.OptionI } 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")); } }