November 2011 - Isis-fish-commits - mailman.cloud.codelutin.com

r3518 - trunk/src/main/java/fr/ifremer/isisfish/datastore/migration
by echatellier＠users.forge.codelutin.com Nov. 7, 2011

Nov. 7, 2011

Author: echatellier Date: 2011-11-07 15:40:25 +0100 (Mon, 07 Nov 2011) New Revision: 3518 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3518 Log: #469 : Afficher une fen?\195?\170tre de correction des equations non compilable apres migration. Modified: trunk/src/main/java/fr/ifremer/isisfish/datastore/migration/MigrationV33V40.java Modified: trunk/src/main/java/fr/ifremer/isisfish/datastore/migration/MigrationV33V40.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/datastore/migration/MigrationV33V40.java 2011-11-07 13:29:00 UTC (rev 3517) +++ trunk/src/main/java/fr/ifremer/isisfish/datastore/migration/MigrationV33V40.java 2011-11-07 14:40:25 UTC (rev 3518) @@ -25,14 +25,23 @@ package fr.ifremer.isisfish.datastore.migration; +import static org.nuiton.i18n.I18n._; + import java.util.List; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.nuiton.topia.TopiaException; import org.nuiton.topia.framework.TopiaContextImplementor; import org.nuiton.topia.migration.TopiaMigrationCallbackByClass; import org.nuiton.topia.migration.TopiaMigrationCallbackByClass.MigrationCallBackForVersion; import org.nuiton.util.Version; +import fr.ifremer.isisfish.datastore.update.ImportFromV2; +import fr.ifremer.isisfish.entities.Equation; +import fr.ifremer.isisfish.ui.input.EquationEditorPaneUI; +import fr.ifremer.isisfish.util.EvaluatorHelper; + /** * Migration between version 3.3 and 4.0. * @@ -44,6 +53,8 @@ */ public class MigrationV33V40 extends MigrationCallBackForVersion { + static private Log log = LogFactory.getLog(MigrationV33V40.class); + /** * Constructor. * @@ -76,5 +87,30 @@ // capturability equation queries.add("alter table POPULATION add column CAPTURABILITYEQUATION VARCHAR(255);"); queries.add("alter table POPULATION add column CAPTURABILITYEQUATIONUSED BIT default false;"); + + // start equation migration + List<Equation> equations = tx.find("from " + Equation.class.getName()); + for (Equation equation : equations) { + int ok = EvaluatorHelper.check(equation.getJavaInterface(), equation.getContent(), null); + if (ok != 0) { + EquationEditorPaneUI frame = new EquationEditorPaneUI(); + frame.setTitle(_("isisfish.message.import.equation.convert")); + + try { + frame.setEquation(equation.getCategory(), equation.getName(), + equation.getJavaInterface(), equation.getContent()); + } catch (Exception ex) { + if (log.isErrorEnabled()) { + log.error("Can't migrate equation", ex); + } + } + + frame.setVisible(true); + if (frame.isResultOk()) { + equation.setContent(frame.getEditor().getText()); + equation.update(); + } + } + } } }

1 0

r3517 - trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher
by echatellier＠users.forge.codelutin.com Nov. 7, 2011

Nov. 7, 2011

Author: echatellier Date: 2011-11-07 14:29:00 +0100 (Mon, 07 Nov 2011) New Revision: 3517 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3517 Log: Also remove \r in equation 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-07 11:14:50 UTC (rev 3516) +++ trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java 2011-11-07 13:29:00 UTC (rev 3517) @@ -680,6 +680,7 @@ // a ne pas faire pour le reste, pour les // matrice par exemple, ca passe mal escValue = StringUtils.replace(escValue, "\n", ""); + escValue = StringUtils.replace(escValue, "\r", ""); escValue = StringUtils.replace(escValue, "\"", "\\\""); } String path = factor.getPath();

1 0

r3516 - trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher
by echatellier＠users.forge.codelutin.com Nov. 7, 2011

Nov. 7, 2011

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);

1 0

r3515 - trunk
by echatellier＠users.forge.codelutin.com Nov. 4, 2011

Nov. 4, 2011

Author: echatellier Date: 2011-11-04 15:19:23 +0100 (Fri, 04 Nov 2011) New Revision: 3515 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3515 Log: Update libs Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-10-28 21:27:38 UTC (rev 3514) +++ trunk/pom.xml 2011-11-04 14:19:23 UTC (rev 3515) @@ -191,14 +191,14 @@ <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> - <version>1.6.3</version> + <version>1.6.4</version> <scope>runtime</scope> </dependency> <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-log4j12</artifactId> - <version>1.6.3</version> + <version>1.6.4</version> <scope>runtime</scope> </dependency> @@ -236,7 +236,7 @@ <dependency> <groupId>com.jcraft</groupId> <artifactId>jsch</artifactId> - <version>0.1.44-1</version> + <version>0.1.45</version> <scope>compile</scope> </dependency>

1 0