X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=inline;f=src%2Fjalview%2Fws%2Fjws2%2FJws2Discoverer.java;h=99a17269ede8f82eeb1b0cf05d0478bbc5e5c3a4;hb=8364d3900ad4271d460ae15a245add45c66c2e89;hp=119d37b682949878cbeede86a5ddd475203b3585;hpb=86838d2566aadd780bd460bdc1276eec77875e26;p=jalview.git diff --git a/src/jalview/ws/jws2/Jws2Discoverer.java b/src/jalview/ws/jws2/Jws2Discoverer.java index 119d37b..99a1726 100644 --- a/src/jalview/ws/jws2/Jws2Discoverer.java +++ b/src/jalview/ws/jws2/Jws2Discoverer.java @@ -1,13 +1,13 @@ /* - * Jalview - A Sequence Alignment Editor and Viewer (Version 2.7) - * Copyright (C) 2011 J Procter, AM Waterhouse, J Engelhardt, LM Lui, G Barton, M Clamp, S Searle + * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8) + * Copyright (C) 2012 J Procter, AM Waterhouse, LM Lui, J Engelhardt, G Barton, M Clamp, S Searle * * 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. - * + * * 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 @@ -250,7 +250,11 @@ public class Jws2Discoverer implements Runnable, WSMenuEntryProviderI services.add(service); // retrieve the presets and parameter set and cache now - service.getParamStore().getPresets(); + ParamDataStoreI pds = service.getParamStore(); + if (pds != null) + { + pds.getPresets(); + } service.hasParameters(); if (validServiceUrls == null) {