X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fws%2Fjws2%2Fdm%2FJabaOption.java;h=3e9e6bc26bea8a057573d19dce78afacab752aa9;hb=c19d2a91ca05e052e3408bf5852d88eb5d0608f1;hp=5c83122171bc649e2b2ee4fa9deda0ff25d291f0;hpb=865a855a4ca87eadb3e5ff284ed32ed307d9c34b;p=jalview.git diff --git a/src/jalview/ws/jws2/dm/JabaOption.java b/src/jalview/ws/jws2/dm/JabaOption.java index 5c83122..3e9e6bc 100644 --- a/src/jalview/ws/jws2/dm/JabaOption.java +++ b/src/jalview/ws/jws2/dm/JabaOption.java @@ -1,26 +1,30 @@ /* - * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.0b1) - * Copyright (C) 2014 The Jalview Authors + * Jalview - A Sequence Alignment Editor and Viewer (Version 2.9.0b2) + * 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 . + * 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; @@ -50,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 @@ -82,7 +96,8 @@ public class JabaOption implements jalview.ws.params.OptionI { e.printStackTrace(); throw new Error( - "Implementation error: cannot set Jaba Option to a value outside its allowed value range!"); + MessageManager + .getString("error.implementation_error_cannot_set_jaba_option")); } }