JAL-1136 fix logic for recovering AACons params

[jalview.git] / src / jalview / gui / Jalview2XML.java

diff --git a/src/jalview/gui/Jalview2XML.java b/src/jalview/gui/Jalview2XML.java
index d9aca36..4c042b3 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
-              .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);
@@ -1345,15 +1345,14 @@ public class Jalview2XML
         }
         AAConsSettings settings = new AAConsSettings(calcIdParam.isAutoUpdate(), service, parmSet, argList);
         av.setCalcIdSettingsFor(calcIdParam.getCalcId(), settings, calcIdParam.isNeedsUpdate());
+        return true;
       } else {
         warn("Cannot resolve a service for the parameters used in this project. Try configuring a JABAWS server.");
         return false;
       }
     }
-    else
-      throw new Error("Unsupported Version for calcIdparam "
-              + calcIdParam.toString());
-    return false;
+    throw new Error("Unsupported Version for calcIdparam "
+            + calcIdParam.toString());
   }
   /**
    * External mapping between jalview objects and objects yielding a valid and