git://source.jalview.org
/
jalview.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
445459c
)
JAL-1136 store ws-parameter list as XML element content after first escaping newlines...
author
jprocter
<jprocter@compbio.dundee.ac.uk>
Fri, 3 Aug 2012 16:24:02 +0000
(17:24 +0100)
committer
jprocter
<jprocter@compbio.dundee.ac.uk>
Fri, 3 Aug 2012 16:24:02 +0000
(17:24 +0100)
src/jalview/gui/Jalview2XML.java
patch
|
blob
|
history
diff --git
a/src/jalview/gui/Jalview2XML.java
b/src/jalview/gui/Jalview2XML.java
index
d9aca36
..
08deba4
100644
(file)
--- 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
// 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.
vCalcIdParam.setAutoUpdate(settings.isAutoUpdate());
// todo - decide if updateImmediately is needed for any projects.
@@
-1325,7
+1325,7
@@
public class Jalview2XML
{
WsParamSetI parmSet=null;
try {
{
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);
} catch (IOException x)
{
warn("Couldn't parse parameter data for "+calcIdParam.getCalcId(), x);