X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FWsParamSetManager.java;h=c46fd3a1edd5a041edb619a16db1c3f5ae22a552;hb=c794c5033adeee182b03a5ea92c0a7495a29661f;hp=bb5d9967908fe0d66f6e99041970873057e2d503;hpb=e1dbbc5edc07f65706eeb1dda9f4c9bcdee9d3a5;p=jalview.git diff --git a/src/jalview/gui/WsParamSetManager.java b/src/jalview/gui/WsParamSetManager.java index bb5d996..c46fd3a 100644 --- a/src/jalview/gui/WsParamSetManager.java +++ b/src/jalview/gui/WsParamSetManager.java @@ -56,13 +56,14 @@ import javax.xml.stream.XMLStreamReader; */ public class WsParamSetManager implements ParamManager { + private static final String WS_PARAM_FILES = "WS_PARAM_FILES"; Hashtable paramparsers = new Hashtable<>(); @Override public WsParamSetI[] getParameterSet(String name, String serviceUrl, boolean modifiable, boolean unmodifiable) { - String files = Cache.getProperty("WS_PARAM_FILES"); + String files = Cache.getProperty(WS_PARAM_FILES); if (files == null) { return null; @@ -107,7 +108,8 @@ public class WsParamSetManager implements ParamManager } catch (IOException e) { Cache.log.info("Failed to parse parameter file " + pfile - + " (Check that all JALVIEW_WSPARAMFILES entries are valid!)", + + " (Check that all " + WS_PARAM_FILES + + " entries are valid!)", e); } } @@ -218,7 +220,7 @@ public class WsParamSetManager implements ParamManager } if (outfile != null) { - String paramFiles = jalview.bin.Cache.getDefault("WS_PARAM_FILES", + String paramFiles = jalview.bin.Cache.getDefault(WS_PARAM_FILES, filename); if (paramFiles.indexOf(filename) == -1) { @@ -228,7 +230,8 @@ public class WsParamSetManager implements ParamManager } paramFiles = paramFiles.concat(filename); } - Cache.setProperty("WS_PARAM_FILES", paramFiles); + + Cache.setProperty(WS_PARAM_FILES, paramFiles); WebServiceParameterSet paramxml = new WebServiceParameterSet(); @@ -290,7 +293,7 @@ public class WsParamSetManager implements ParamManager { return; } - String paramFiles = jalview.bin.Cache.getDefault("WS_PARAM_FILES", ""); + String paramFiles = jalview.bin.Cache.getDefault(WS_PARAM_FILES, ""); if (paramFiles.indexOf(filename) > -1) { String nparamFiles = new String(); @@ -303,7 +306,7 @@ public class WsParamSetManager implements ParamManager nparamFiles = nparamFiles.concat("|").concat(fl); } } - jalview.bin.Cache.setProperty("WS_PARAM_FILES", nparamFiles); + jalview.bin.Cache.setProperty(WS_PARAM_FILES, nparamFiles); } try