Author: echatellier Date: 2011-11-07 12:14:50 +0100 (Mon, 07 Nov 2011) New Revision: 3516 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3516 Log: Fix la conversion des "" qui ne doit ?\195?\170tre faite que pour les equations finalement. Dans le cas de matrices (ou autre) ca case tout. Modified: trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java Modified: trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java 2011-11-04 14:19:23 UTC (rev 3515) +++ trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java 2011-11-07 11:14:50 UTC (rev 3516) @@ -673,16 +673,21 @@ else { Object value = factor.getValue(); String stringValue = beanUtils.convert(value); + String escValue = stringValue; + if (factor.getDomain() instanceof EquationDiscreteDomain) { + // echatellier: equation can contains quotes that break + // prescript, only quote, not all java replacements + // a ne pas faire pour le reste, pour les + // matrice par exemple, ca passe mal + escValue = StringUtils.replace(escValue, "\n", ""); + escValue = StringUtils.replace(escValue, "\"", "\\\""); + } String path = factor.getPath(); String topiaId = path.substring(0, path.lastIndexOf('#')); String property = path.substring(path.lastIndexOf('#') + 1); // Double value123 = beanUtils.convert("mystringvalue", Double.class); buffer.append(value.getClass().getName()).append(" value"); buffer.append(factorIndex).append(" = beanUtils.convert(\""); - // echatellier: equation can contains quotes that break - // prescript, only quote, not all java replacements - String escValue = StringUtils.replace(stringValue, "\n", ""); - escValue = StringUtils.replace(escValue, "\"", "\\\""); buffer.append(escValue).append("\", ").append(value.getClass().getName()); buffer.append(".class);\n"); // TopiaEntity entity123 = db.findByTopiaId(topiaId);