From: jprocter Date: Fri, 3 Aug 2012 16:24:02 +0000 (+0100) Subject: JAL-1136 store ws-parameter list as XML element content after first escaping newlines... X-Git-Tag: Jalview_2_9~407 X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;ds=sidebyside;h=4be05f596362591c5758f2f7a6552956f692ca3b;p=jalview.git JAL-1136 store ws-parameter list as XML element content after first escaping newlines. TODO: consider revising --- diff --git a/src/jalview/gui/Jalview2XML.java b/src/jalview/gui/Jalview2XML.java index d9aca36..08deba4 100644 --- a/src/jalview/gui/Jalview2XML.java +++ b/src/jalview/gui/Jalview2XML.java @@ -1306,7 +1306,7 @@ public class Jalview2XML // recreate settings from preset 3) predefined settings provided by // service - or settings that can be transferred (or discarded) vCalcIdParam.setParameters(settings - .getWsParamFile()); + .getWsParamFile().replace("\n", "|\\n|")); vCalcIdParam.setAutoUpdate(settings.isAutoUpdate()); // todo - decide if updateImmediately is needed for any projects. @@ -1325,7 +1325,7 @@ public class Jalview2XML { WsParamSetI parmSet=null; try { - service.getParamStore().parseServiceParameterFile(calcIdParam.getName(), calcIdParam.getDescription(), calcIdParam.getServiceURL(), calcIdParam.getParameters()); + parmSet = service.getParamStore().parseServiceParameterFile(calcIdParam.getName(), calcIdParam.getDescription(), calcIdParam.getServiceURL(), calcIdParam.getParameters().replace("|\\n|", "\n")); } catch (IOException x) { warn("Couldn't parse parameter data for "+calcIdParam.getCalcId(), x);