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

r3349 - isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/launcher
by chatellier＠users.labs.libre-entreprise.org June 6, 2011

June 6, 2011

Author: chatellier Date: 2011-06-06 14:14:32 +0000 (Mon, 06 Jun 2011) New Revision: 3349 Log: Fill factor nominal values before calling sensitivity calculator. Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java 2011-06-05 14:34:08 UTC (rev 3348) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java 2011-06-06 14:14:32 UTC (rev 3349) @@ -47,6 +47,7 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; +import org.apache.commons.beanutils.BeanUtils; import org.apache.commons.beanutils.ConvertUtilsBean; import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.mutable.MutableInt; @@ -56,6 +57,7 @@ import org.nuiton.math.matrix.MatrixND; import org.nuiton.topia.TopiaContext; import org.nuiton.topia.TopiaException; +import org.nuiton.topia.persistence.TopiaEntity; import org.nuiton.util.FileUtil; import org.nuiton.util.ListenerSet; import org.nuiton.util.ObjectUtil; @@ -436,7 +438,7 @@ // to get original database value (Nominal value) RegionStorage regionStorage = RegionStorage.getRegion(param.getRegionName()); TopiaContext context = regionStorage.getStorage().beginTransaction(); - sensitivitycalculator.setTopiaContext(context); + fillDesignPlanNominalValue(context, designPlan); // Sensitivity scenario returned contains same factor references // as input design plan. Factor group are still present @@ -510,6 +512,34 @@ } } + /** + * Explore design plan factor tree, and set factor nominal value + * for each factor. + * + * @param context opened database context + * @param designPlan design plan + */ + protected void fillDesignPlanNominalValue(TopiaContext context, DesignPlan designPlan) { + // take care only on first level of factor tree + for (Factor factor : designPlan.getFactors()) { + // get nominal value + String path = factor.getPath(); + if (StringUtils.contains(path, "#")) { + String topiaId = path.substring(0, path.lastIndexOf("#")); + String propertyName=path.substring(path.lastIndexOf("#") + 1); + try { + TopiaEntity entity = context.findByTopiaId(topiaId); + Object result = BeanUtils.getProperty(entity, propertyName); + factor.setNominalValue(result); + } catch (Exception ex) { + if (log.isErrorEnabled()) { + log.error("An error occurred while trying to get nominal value", ex); + } + } + } + } + } + /** Permet de manipuler un int entre plusieurs appele de methodes recursive. */ public static class Counter { protected int counter = 0;

1 0

r3348 - in isis-fish/branches/3.3.1: . src/license src/main/assembly src/main/java/fr/ifremer/isisfish/ui/input src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors src/main/java/fr/ifremer/isisfish/ui/sensitivity src/main/java/fr/ifremer/isisfish/ui/sensitivity/equation src/test/resources/mexico
by chatellier＠users.labs.libre-entreprise.org June 5, 2011

June 5, 2011

Author: chatellier Date: 2011-06-05 14:34:08 +0000 (Sun, 05 Jun 2011) New Revision: 3348 Log: Fix dependencies, licences, header. Modified: isis-fish/branches/3.3.1/pom.xml isis-fish/branches/3.3.1/src/license/THIRD-PARTY.properties isis-fish/branches/3.3.1/src/main/assembly/isisfish-log4j.properties isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/ChangeModel.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/FisheryTreeNodeLoador.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivitySaveVerifier.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/equation/EquationDomainRenderer.java isis-fish/branches/3.3.1/src/test/resources/mexico/mexicohelper_designplanV2.xml Modified: isis-fish/branches/3.3.1/pom.xml =================================================================== --- isis-fish/branches/3.3.1/pom.xml 2011-06-01 12:32:08 UTC (rev 3347) +++ isis-fish/branches/3.3.1/pom.xml 2011-06-05 14:34:08 UTC (rev 3348) @@ -25,6 +25,21 @@ </dependency> <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-validator</artifactId> + <version>${nuitonUtilsVersion}</version> + <scope>compile</scope> + </dependency> + +  + <dependency> + <groupId>org.apache.struts.xwork</groupId> + <artifactId>xwork-core</artifactId> + <version>2.2.1.1</version> + <scope>compile</scope> + </dependency> + + <dependency> <groupId>org.nuiton.i18n</groupId> <artifactId>nuiton-i18n</artifactId> <version>${nuitonI18nVersion}</version> @@ -45,12 +60,12 @@ <scope>compile</scope> </dependency> -  + </dependency> <dependency> <groupId>org.nuiton.matrix</groupId> @@ -187,15 +202,14 @@ <artifactId>dom4j</artifactId> <version>1.6.1</version> <scope>compile</scope> + <exclusions> + <exclusion> + <artifactId>xml-apis</artifactId> + <groupId>xml-apis</groupId> + </exclusion> + </exclusions> </dependency> - <dependency> - <groupId>jfree</groupId> - <artifactId>jfreechart</artifactId> - <version>1.0.12</version> - <scope>compile</scope> - </dependency> -  <dependency> <groupId>org.beanshell</groupId> @@ -211,7 +225,7 @@ <scope>compile</scope> </dependency> - <dependency> +  <dependency> <groupId>com.jcraft</groupId> @@ -237,12 +251,12 @@ <scope>compile</scope> </dependency> - <dependency> +   <dependency> @@ -250,6 +264,16 @@ <artifactId>jaxen</artifactId> <version>1.1.1</version> <scope>runtime</scope> + <exclusions> + <exclusion> + <artifactId>xml-apis</artifactId> + <groupId>xml-apis</groupId> + </exclusion> + <exclusion> + <artifactId>xmlParserAPIs</artifactId> + <groupId>xerces</groupId> + </exclusion> + </exclusions> </dependency>  @@ -502,7 +526,7 @@  <jaxxVersion>2.4.2</jaxxVersion> <eugeneVersion>2.3.4</eugeneVersion> - <topiaVersion>2.5.4-SNAPSHOT</topiaVersion> + <topiaVersion>2.6-SNAPSHOT</topiaVersion> <nuitonUtilsVersion>2.2</nuitonUtilsVersion> <nuitonI18nVersion>2.4</nuitonI18nVersion> <nuitonWidgetsVersion>1.1.2-SNAPSHOT</nuitonWidgetsVersion> Modified: isis-fish/branches/3.3.1/src/license/THIRD-PARTY.properties =================================================================== --- isis-fish/branches/3.3.1/src/license/THIRD-PARTY.properties 2011-06-01 12:32:08 UTC (rev 3347) +++ isis-fish/branches/3.3.1/src/license/THIRD-PARTY.properties 2011-06-05 14:34:08 UTC (rev 3348) @@ -24,6 +24,7 @@ # - Java Transaction API (JTA) License # - Jaxen license # - LGPL +# - Lesser General Public License (LGPL v. 2.1) # - Lesser General Public License (LGPL) # - Lesser General Public License (LGPL) v 3.0 # - License Agreement for JavaMail(TM) API @@ -32,14 +33,16 @@ # - Sun's Binary Code License # - The Apache Software License, Version 2.0 # - The H2 License, Version 1.0 +# - The OpenSymphony Software License, Version 1.1 # - http://sqljet.com/ # - http://svnkit.com/license.html # - http://www.trilead.com/Products/Trilead_SSH_for_Java/License/ +# - license.txt #------------------------------------------------------------------------------- # Please fill the missing licenses for dependencies : # # -#Tue Mar 22 15:45:15 CET 2011 +#Sun Jun 05 16:28:53 CEST 2011 antlr--antlr--2.7.6--jar=BSD License aspectwerkz--aspectwerkz--2.0--jar=GNU Lesser General Public License aspectwerkz--aspectwerkz-core--2.0--jar=GNU Lesser General Public License @@ -49,7 +52,7 @@ commons-jxpath--commons-jxpath--1.3--jar=The Apache Software License, Version 2.0 commons-primitives--commons-primitives--1.0--jar=The Apache Software License, Version 2.0 dom4j--dom4j--1.6.1--jar=BSD License -javassist--javassist--3.8.0.GA--jar=GNU Lesser General Public License +javassist--javassist--3.8.0.GA--jar=Lesser General Public License (LGPL v. 2.1) javax.activation--activation--1.1.1--jar=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 javax.mail--mail--1.4.1--jar=License Agreement for JavaMail(TM) API javax.transaction--jta--1.1--jar=Java Transaction API (JTA) License @@ -68,4 +71,4 @@ qdox--qdox--1.4--jar=Apache Software License, Version 2.0 trove--trove--1.0.2--jar=Lesser General Public License (LGPL) xalan--xalan--2.6.0--jar=Apache Software License Version 2.0 -xerces--xmlParserAPIs--2.6.2--jar=Apache Software License, Version 1.1 +xerces--xercesImpl--2.6.2--jar=Apache Software License, Version 1.1 Modified: isis-fish/branches/3.3.1/src/main/assembly/isisfish-log4j.properties =================================================================== --- isis-fish/branches/3.3.1/src/main/assembly/isisfish-log4j.properties 2011-06-01 12:32:08 UTC (rev 3347) +++ isis-fish/branches/3.3.1/src/main/assembly/isisfish-log4j.properties 2011-06-05 14:34:08 UTC (rev 3348) @@ -1,3 +1,27 @@ +### +# #%L +# IsisFish +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2011 CodeLutin, Chatellier Eric +# %% +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as +# published by the Free Software Foundation, either version 2 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public +# License along with this program. If not, see +# <http://www.gnu.org/licenses/gpl-2.0.html>. +# #L% +### # Global logging configuration log4j.rootLogger=ERROR, stdout Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/ChangeModel.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/ChangeModel.java 2011-06-01 12:32:08 UTC (rev 3347) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/ChangeModel.java 2011-06-05 14:34:08 UTC (rev 3348) @@ -1,25 +1,23 @@ /* * #%L - * - * * $Id$ * $HeadURL$ * %% * Copyright (C) 2011 Ifremer, Codelutin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 2 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Lesser Public License for more details. + * GNU General Public License for more details. * - * You should have received a copy of the GNU General Lesser Public + * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * <http://www.gnu.org/licenses/gpl-2.0.html>. * #L% */ Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/FisheryTreeNodeLoador.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/FisheryTreeNodeLoador.java 2011-06-01 12:32:08 UTC (rev 3347) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/FisheryTreeNodeLoador.java 2011-06-05 14:34:08 UTC (rev 3348) @@ -1,25 +1,23 @@ /* * #%L - * - * * $Id$ * $HeadURL$ * %% * Copyright (C) 2011 Ifremer, Codelutin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 2 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Lesser Public License for more details. + * GNU General Public License for more details. * - * You should have received a copy of the GNU General Lesser Public + * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * <http://www.gnu.org/licenses/gpl-2.0.html>. * #L% */ Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivitySaveVerifier.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivitySaveVerifier.java 2011-06-01 12:32:08 UTC (rev 3347) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivitySaveVerifier.java 2011-06-05 14:34:08 UTC (rev 3348) @@ -1,25 +1,23 @@ /* * #%L - * - * * $Id$ * $HeadURL$ * %% * Copyright (C) 2011 Codelutin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 2 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Lesser Public License for more details. + * GNU General Public License for more details. * - * You should have received a copy of the GNU General Lesser Public + * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * <http://www.gnu.org/licenses/gpl-2.0.html>. * #L% */ Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/equation/EquationDomainRenderer.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/equation/EquationDomainRenderer.java 2011-06-01 12:32:08 UTC (rev 3347) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/equation/EquationDomainRenderer.java 2011-06-05 14:34:08 UTC (rev 3348) @@ -1,25 +1,23 @@ /* * #%L - * - * * $Id$ * $HeadURL$ * %% * Copyright (C) 2011 Codelutin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 2 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Lesser Public License for more details. + * GNU General Public License for more details. * - * You should have received a copy of the GNU General Lesser Public + * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * <http://www.gnu.org/licenses/gpl-2.0.html>. * #L% */ Modified: isis-fish/branches/3.3.1/src/test/resources/mexico/mexicohelper_designplanV2.xml =================================================================== --- isis-fish/branches/3.3.1/src/test/resources/mexico/mexicohelper_designplanV2.xml 2011-06-01 12:32:08 UTC (rev 3347) +++ isis-fish/branches/3.3.1/src/test/resources/mexico/mexicohelper_designplanV2.xml 2011-06-05 14:34:08 UTC (rev 3348) @@ -1,4 +1,29 @@ <?xml version="1.0" encoding="UTF-8"?> + + <experimentalDesign version="2"> <factors> <factor name="factor 1 (double continuous)" property="continuous" type="real">

1 0

r3347 - in isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui: input sensitivity
by chatellier＠users.labs.libre-entreprise.org June 1, 2011

June 1, 2011

Author: chatellier Date: 2011-06-01 12:32:08 +0000 (Wed, 01 Jun 2011) New Revision: 3347 Log: Add support for discrete equation domain Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/InputOneEquationUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EquationContinuousPanelUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityInputHandler.java Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/InputOneEquationUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/InputOneEquationUI.jaxx 2011-06-01 08:58:32 UTC (rev 3346) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/InputOneEquationUI.jaxx 2011-06-01 12:32:08 UTC (rev 3347) @@ -40,6 +40,8 @@  <fr.ifremer.isisfish.entities.Equation id='selectedEquation' javaBean='null'/> + <Boolean id="autoSaveModification" javaBean="true" /> + <import> java.lang.reflect.Method; java.io.File; @@ -172,7 +174,13 @@ setFormule((Formule)formuleComboBox.getSelectedItem()); setEditorText(); } - editor.getCurrentEditor().addDocumentListener(listener); + + // utilisee lors de l'edition des equations dans l'interface de sensibilité + // le contenu de l'equation ne doit pas automatiquement + // etre sauvé dans l'entité (pas de sens pour un facteur discret de type equation) + if (autoSaveModification) { + editor.getCurrentEditor().addDocumentListener(listener); + } } protected void setComboModel() { Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EquationContinuousPanelUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EquationContinuousPanelUI.jaxx 2011-06-01 08:58:32 UTC (rev 3346) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EquationContinuousPanelUI.jaxx 2011-06-01 12:32:08 UTC (rev 3347) @@ -185,7 +185,8 @@ } ]]></script> <JPanel id='content'> - <Table constraints='BorderLayout.CENTER'> + <JScrollPane constraints='BorderLayout.CENTER'> + <Table> <row> <cell fill='both' weightx='1' weighty='1'> <JScrollPane preferredSize="{new Dimension(200, 150)}"> @@ -297,12 +298,14 @@ </row> <row> <cell fill='both' columns='2' weightx='1' weighty='1'> - <fr.ifremer.isisfish.ui.input.InputOneEquationUI id='editor' formule='{getFormule()}' text='{getText()}' - constructorParams='this' bean='{getBean()}' clazz='{getClazz()}' beanProperty='{getBeanProperty()}' active='{isContinueSelected()}' + <fr.ifremer.isisfish.ui.input.InputOneEquationUI id='editor' constructorParams='this' + autoSaveModification="false" formule='{getFormule()}' text='{getText()}' + bean='{getBean()}' clazz='{getClazz()}' beanProperty='{getBeanProperty()}' active='{isContinueSelected()}' formuleCategory='{getFormuleCategory()}' selectedEquation='{getSelectedEquation()}' visible='{isContinuePossible()}' enabled='{isContinueSelected()}'/> </cell> </row> </Table> + </JScrollPane> </JPanel> </ContinuousPanelContainerUI> Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityInputHandler.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityInputHandler.java 2011-06-01 08:58:32 UTC (rev 3346) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityInputHandler.java 2011-06-01 12:32:08 UTC (rev 3347) @@ -67,6 +67,7 @@ import fr.ifremer.isisfish.simulator.sensitivity.domain.ContinuousDomain; import fr.ifremer.isisfish.simulator.sensitivity.domain.DiscreteDomain; import fr.ifremer.isisfish.simulator.sensitivity.domain.EquationContinuousDomain; +import fr.ifremer.isisfish.simulator.sensitivity.domain.EquationDiscreteDomain; import fr.ifremer.isisfish.simulator.sensitivity.domain.MatrixContinuousDomain; import fr.ifremer.isisfish.simulator.sensitivity.domain.RuleDiscreteDomain; import fr.ifremer.isisfish.types.RangeOfValues; @@ -74,6 +75,7 @@ import fr.ifremer.isisfish.ui.input.InputAction; import fr.ifremer.isisfish.ui.input.InputContentUI; import fr.ifremer.isisfish.ui.input.InputHandler; +import fr.ifremer.isisfish.ui.input.InputOneEquationUI; import fr.ifremer.isisfish.ui.input.tree.FisheryDataProvider; import fr.ifremer.isisfish.ui.input.tree.FisheryTreeHelper; import fr.ifremer.isisfish.ui.input.tree.FisheryTreeNode; @@ -432,7 +434,7 @@ i++; JComponent c = null; if (o != null) { - c = getEditorWithValue(factorWizardUI, dDomain, o); + c = getEditorWithValue(factorWizardUI, factor, dDomain, o); } else { if (log.isWarnEnabled()) { @@ -557,7 +559,7 @@ * * Il serait plus interessant de le faire sur les types et non sur les * valeur mais pour {@link RangeOfValues} par exemple, seule la valeur - * a un typ Float... donc pas evident. + * a un type Float... donc pas evident. * * @param value value * @return continuous enabled @@ -707,7 +709,7 @@ result = ui; } catch (Exception ex) { - throw new IsisFishRuntimeException("Can't restore intial factor database property", ex); + throw new IsisFishRuntimeException("Can't restore initial factor database property", ex); } } // TODO path with no # (normalement pas possible pour les equations) @@ -771,7 +773,7 @@ * @param context for equation * @return component */ - protected JComponent getEditorWithValue(FactorWizardUI factorWizardUI, Domain domain, Object value) { + protected JComponent getEditorWithValue(FactorWizardUI factorWizardUI, Factor factor, Domain domain, Object value) { JComponent result = null; @@ -791,6 +793,39 @@ result = new RuleChooser(factorWizardUI); ((RuleChooser)result).setRulesList((List<Rule>)value); } + else if (domain instanceof EquationDiscreteDomain) { + String factorPath = factor.getPath(); + if (factor.getPath().indexOf('#') != -1) { + String topiaId = factorPath.substring(0, factorPath.lastIndexOf('#')); + String property = factorPath.substring(factorPath.lastIndexOf('#') + 1); + + // get bean in database + try { + TopiaContext topiaContext = factorWizardUI.getContextValue(TopiaContext.class); + TopiaEntityContextable entity = (TopiaEntityContextable)topiaContext.findByTopiaId(topiaId); + + String getter = "get" + StringUtils.capitalize(property); + Method m = entity.getClass().getMethod(getter); + Equation equation = (Equation)m.invoke(entity); + + // fill component + InputOneEquationUI ui = new InputOneEquationUI(factorWizardUI); + ui.setAutoSaveModification(false); + ui.setFormuleCategory(equation.getCategory()); + ui.setText(_("isisfish.common.equation")); // can't get real name + ui.setClazz(value.getClass()); + ui.setBeanProperty(property); + ui.setBean(entity); // set bean fire content modification event + ui.getEditor().setText((String)value); + ui.setActive(true); + + result = ui; + } catch (Exception ex) { + throw new IsisFishRuntimeException("Can't restore initial factor database property", ex); + } + } + // TODO path with no # (normalement pas possible pour les equations) + } else if (value instanceof String) { // valeur nom typées ??? result = new JTextField(); @@ -812,7 +847,7 @@ * @return component copy */ public JComponent getNewDiscreteComponent(FactorWizardUI factorWizardUI) { - + JComponent result = null; String factorPath = factorWizardUI.getFactorPath(); @@ -821,7 +856,6 @@ String property = factorPath.substring(factorPath.lastIndexOf('#') + 1); TopiaContext topiaContext = factorWizardUI.getContextValue(TopiaContext.class); - try { // get bean in database TopiaEntityContextable entity = (TopiaEntityContextable)topiaContext.findByTopiaId(topiaId); @@ -839,7 +873,21 @@ } else if (value instanceof RangeOfValues) { RangeOfValues rangeOfValues = (RangeOfValues)value; result = new JTextField(rangeOfValues.getValues()); + } else if (value instanceof Equation) { + Equation equation = (Equation)value; + // fill component + InputOneEquationUI ui = new InputOneEquationUI(factorWizardUI); + ui.setAutoSaveModification(false); + ui.setText(equation.getContent()); + ui.setFormuleCategory(equation.getCategory()); + ui.setText(_("isisfish.common.equation")); // can't get real name + ui.setClazz(value.getClass()); + ui.setBeanProperty(property); + ui.setBean(entity); + ui.setActive(true); + result = ui; } + } catch (Exception ex) { throw new IsisFishRuntimeException("Can't restore intial factor database property", ex); } @@ -866,7 +914,11 @@ } } } - + + if (log.isDebugEnabled()) { + log.debug("Component for path " + factorPath + " is " + result); + } + return result; } @@ -910,12 +962,12 @@ /** * Save a continous factor. * - * @param name - * @param comment - * @param path - * @param panel - * @param action - * @param exist + * @param name factor name + * @param comment comment + * @param path factor path + * @param panel panel + * @param action action + * @param exist exist */ protected void saveContinue(String name, String comment, String path, ContinuousPanelContainerUI panel, @@ -992,14 +1044,40 @@ String comment, String path, List<JComponent> components, SimulAction action, boolean exist) { List<Object> values = new ArrayList<Object>(); - for (JComponent c : components) { - values.add(getComponentValue(c)); + + boolean ruleFactor = false; + boolean equationFactor = false; + for (JComponent component : components) { + + // get internat component value + Object result = null; + if (component instanceof JTextComponent) { + result = ((JTextComponent) component).getText(); + } else if (component instanceof MatrixPanelEditor) { + result = ((MatrixPanelEditor) component).getMatrix(); + } else if (component instanceof InputOneEquationUI) { + result = ((InputOneEquationUI) component).getEditor().getText(); + equationFactor = true; + } else if (component instanceof RuleChooser) { + result = ((RuleChooser)component).getRulesList(); + ruleFactor = true; + } + + values.add(result); } - action.addDiscreteFactor(name, comment, path, values, exist); + + if (ruleFactor) { + action.addDiscreteRuleFactor(name, comment, path, values, exist); + } else if (equationFactor) { + action.addDiscreteEquationFactor(name, comment, path, values, exist); + } else { + action.addDiscreteFactor(name, comment, path, values, exist); + } } /** - * Return value in swing component that could be next used into factor. + * Return value in swing component that could be next used into factor + * for discrete factor values. * * @param component component * @return factor value @@ -1010,9 +1088,9 @@ result = ((JTextComponent) component).getText(); } else if (component instanceof MatrixPanelEditor) { result = ((MatrixPanelEditor) component).getMatrix(); - } /*else if (component instanceof InputOneEquationUI) { - result = ((InputOneEquationUI) component).getEditor().getText();*/ - else if (component instanceof RuleChooser) { + } else if (component instanceof InputOneEquationUI) { + result = ((InputOneEquationUI) component).getEditor().getText(); + } else if (component instanceof RuleChooser) { result = ((RuleChooser)component).getRulesList(); } if (log.isDebugEnabled()) {

1 0

r3346 - in isis-fish/branches/3.3.1/src: main/java/fr/ifremer/isisfish/mexico/xml main/java/fr/ifremer/isisfish/simulator/sensitivity/domain main/java/fr/ifremer/isisfish/ui/simulator test/java/fr/ifremer/isisfish/mexico
by chatellier＠users.labs.libre-entreprise.org June 1, 2011

June 1, 2011

Author: chatellier Date: 2011-06-01 08:58:32 +0000 (Wed, 01 Jun 2011) New Revision: 3346 Log: Add support for discrete equation domain Added: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/xml/EquationDiscreteDomainXMLVisitor.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/EquationDiscreteDomain.java Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/xml/DomXMLParser.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/xml/FactorXMLVisitor.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/mexico/MexicoHelperTest.java Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/xml/DomXMLParser.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/xml/DomXMLParser.java 2011-05-31 15:54:57 UTC (rev 3345) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/xml/DomXMLParser.java 2011-06-01 08:58:32 UTC (rev 3346) @@ -27,6 +27,7 @@ import java.util.List; +import org.apache.commons.lang.StringEscapeUtils; import org.dom4j.Element; import org.nuiton.math.matrix.MatrixND; import org.nuiton.topia.TopiaContext; @@ -39,6 +40,7 @@ import fr.ifremer.isisfish.simulator.sensitivity.domain.ContinuousDomain; import fr.ifremer.isisfish.simulator.sensitivity.domain.DiscreteDomain; import fr.ifremer.isisfish.simulator.sensitivity.domain.EquationContinuousDomain; +import fr.ifremer.isisfish.simulator.sensitivity.domain.EquationDiscreteDomain; import fr.ifremer.isisfish.simulator.sensitivity.domain.MatrixContinuousDomain; import fr.ifremer.isisfish.simulator.sensitivity.domain.RuleDiscreteDomain; @@ -505,6 +507,22 @@ factor.setDomain(domain); } factorGroup.addFactor(factor); + } else if ("equation".equals(type)) { + Factor factor = new Factor(name); + factor.setPath(path); + Element fixedElement = factorElement.element("domain").element("fixed"); + if ("discrete".equals(property)) { + EquationDiscreteDomain domain = new EquationDiscreteDomain(); + List<Element> valueElements = fixedElement.element("enumeration").elements("value"); + int label = 0; + for (Element valueElement : valueElements) { + String content = StringEscapeUtils.unescapeXml(valueElement.getText()); + domain.getValues().put(Integer.valueOf(label), content); + ++label; + } + factor.setDomain(domain); + } + factorGroup.addFactor(factor); } } Added: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/xml/EquationDiscreteDomainXMLVisitor.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/xml/EquationDiscreteDomainXMLVisitor.java (rev 0) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/xml/EquationDiscreteDomainXMLVisitor.java 2011-06-01 08:58:32 UTC (rev 3346) @@ -0,0 +1,53 @@ +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2011 Ifremer, CodeLutin, Chatellier Eric + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 2 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-2.0.html>. + * #L% + */ + +package fr.ifremer.isisfish.mexico.xml; + +import org.apache.commons.lang.StringEscapeUtils; + +import fr.ifremer.isisfish.simulator.sensitivity.Domain; + +/** + * XML equation discrete domain visitor. + * + * @author chatellier + * @version $Revision$ + * + * Last update : $Date$ + * By : $Author$ + */ +public class EquationDiscreteDomainXMLVisitor extends DiscreteDomainXMLVisitor { + + /** + * {@inheritDoc} + */ + @Override + public void visit(Domain domain, Object label, Object value) { + String content = (String)value; + xmlBuffer.append("<value>"); + xmlBuffer.append(StringEscapeUtils.escapeXml(content)); + xmlBuffer.append("</value>"); + } +} Property changes on: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/xml/EquationDiscreteDomainXMLVisitor.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/xml/FactorXMLVisitor.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/xml/FactorXMLVisitor.java 2011-05-31 15:54:57 UTC (rev 3345) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/xml/FactorXMLVisitor.java 2011-06-01 08:58:32 UTC (rev 3346) @@ -32,6 +32,7 @@ import fr.ifremer.isisfish.simulator.sensitivity.domain.ContinuousDomain; import fr.ifremer.isisfish.simulator.sensitivity.domain.DiscreteDomain; import fr.ifremer.isisfish.simulator.sensitivity.domain.EquationContinuousDomain; +import fr.ifremer.isisfish.simulator.sensitivity.domain.EquationDiscreteDomain; import fr.ifremer.isisfish.simulator.sensitivity.domain.MatrixContinuousDomain; import fr.ifremer.isisfish.simulator.sensitivity.domain.RuleDiscreteDomain; import fr.ifremer.isisfish.simulator.sensitivity.visitor.FactorVisitor; @@ -93,6 +94,9 @@ else if (factor.getDomain() instanceof RuleDiscreteDomain) { xmlBuffer.append(" type=\"rule\""); } + else if (factor.getDomain() instanceof EquationDiscreteDomain) { + xmlBuffer.append(" type=\"equation\""); + } xmlBuffer.append(">"); // target element xmlBuffer.append("<target>" + factor.getPath() + "</target>"); @@ -112,17 +116,15 @@ DomainXMLVisitor visitor = null; if (factor.getDomain() instanceof MatrixContinuousDomain) { visitor = new MatrixContinuousDomainXMLVisitor(); - } - else if (factor.getDomain() instanceof EquationContinuousDomain) { + } else if (factor.getDomain() instanceof EquationContinuousDomain) { visitor = new EquationContinuousDomainXMLVisitor(); - } - else if (factor.getDomain() instanceof ContinuousDomain) { + } else if (factor.getDomain() instanceof ContinuousDomain) { visitor = new ContinuousDomainXMLVisitor(); - } - else if (factor.getDomain() instanceof RuleDiscreteDomain) { + } else if (factor.getDomain() instanceof RuleDiscreteDomain) { visitor = new RuleDiscreteDomainXMLVisitor(); - } - else if (factor.getDomain() instanceof DiscreteDomain) { + } else if (factor.getDomain() instanceof EquationDiscreteDomain) { + visitor = new EquationDiscreteDomainXMLVisitor(); + } else if (factor.getDomain() instanceof DiscreteDomain) { visitor = new DiscreteDomainXMLVisitor(); } domain.accept(visitor); Added: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/EquationDiscreteDomain.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/EquationDiscreteDomain.java (rev 0) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/EquationDiscreteDomain.java 2011-06-01 08:58:32 UTC (rev 3346) @@ -0,0 +1,46 @@ +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2011 Ifremer, CodeLutin, Chatellier Eric + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 2 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-2.0.html>. + * #L% + */ + +package fr.ifremer.isisfish.simulator.sensitivity.domain; + +import fr.ifremer.isisfish.entities.Equation; + +/** + * Factor domain for {@link Equation}s. + * + * @author chatellier + * @version $Revision$ + * + * @since 3.4.0.0 + * + * Last update : $Date$ + * By : $Author$ + */ +public class EquationDiscreteDomain extends DiscreteDomain { + + /** serialVersionUID. */ + private static final long serialVersionUID = -5611785362638191719L; + +} Property changes on: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/EquationDiscreteDomain.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java 2011-05-31 15:54:57 UTC (rev 3345) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java 2011-06-01 08:58:32 UTC (rev 3346) @@ -92,6 +92,7 @@ import fr.ifremer.isisfish.simulator.sensitivity.domain.ContinuousDomain; import fr.ifremer.isisfish.simulator.sensitivity.domain.DiscreteDomain; import fr.ifremer.isisfish.simulator.sensitivity.domain.EquationContinuousDomain; +import fr.ifremer.isisfish.simulator.sensitivity.domain.EquationDiscreteDomain; import fr.ifremer.isisfish.simulator.sensitivity.domain.MatrixContinuousDomain; import fr.ifremer.isisfish.simulator.sensitivity.domain.RuleDiscreteDomain; import fr.ifremer.isisfish.ui.SimulationUI; @@ -942,16 +943,22 @@ public void addDiscreteFactor(String name, String comment, String path, List<Object> values, boolean exist) { + addDiscreteFactor(new DiscreteDomain(), name, comment, path, values, exist); + } + + public void addDiscreteRuleFactor(String name, String comment, String path, + List<Object> values, boolean exist) { + addDiscreteFactor(new RuleDiscreteDomain(), name, comment, path, values, exist); + } + + public void addDiscreteEquationFactor(String name, String comment, String path, + List<Object> values, boolean exist) { + addDiscreteFactor(new EquationDiscreteDomain(), name, comment, path, values, exist); + } + + protected void addDiscreteFactor(DiscreteDomain domain, String name, String comment, String path, + List<Object> values, boolean exist) { Factor f = new Factor(name); - DiscreteDomain domain = null; - // FIXME echatellier gere le path mieux que ca - if ("parameters.rules".equals(path)) { - domain = new RuleDiscreteDomain(); - } - else { - domain = new DiscreteDomain(); - } - SortedMap<Object, Object> domainValues = new TreeMap<Object, Object>(); int label = 0; for (Object value : values) { Modified: isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/mexico/MexicoHelperTest.java =================================================================== --- isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/mexico/MexicoHelperTest.java 2011-05-31 15:54:57 UTC (rev 3345) +++ isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/mexico/MexicoHelperTest.java 2011-06-01 08:58:32 UTC (rev 3346) @@ -56,6 +56,7 @@ import fr.ifremer.isisfish.simulator.sensitivity.domain.ContinuousDomain; import fr.ifremer.isisfish.simulator.sensitivity.domain.DiscreteDomain; import fr.ifremer.isisfish.simulator.sensitivity.domain.EquationContinuousDomain; +import fr.ifremer.isisfish.simulator.sensitivity.domain.EquationDiscreteDomain; import fr.ifremer.isisfish.simulator.sensitivity.domain.MatrixContinuousDomain; import fr.ifremer.isisfish.simulator.sensitivity.domain.RuleDiscreteDomain; @@ -417,6 +418,43 @@ } /** + * Test l'ajout des nouveaux type de facteurs equation discrete. + * + * @throws IOException + * @throws IsisFishException + */ + @Test + public void testDiscreteEquationFactor() throws IOException, IsisFishException { + + // get test plan and add some STRANGES factors + DesignPlan testDesignPlan = getTestDesignPlan(false); + + // factor x6 + Factor factorEquationDiscrete = new Factor("factor x6"); + EquationDiscreteDomain domain6 = new EquationDiscreteDomain(); + domain6.getValues().put("1", "if ( context.getValue() < 1.0) {\n\treturn 1.0;\n} else {\treturn context.getValue();\n}"); + domain6.getValues().put("2", "if ( context.getValue() < 1.666) {\n\treturn 1.666;\n} else {\treturn context.getValue();\n}"); + factorEquationDiscrete.setDomain(domain6); + factorEquationDiscrete.setPath("fr.ifremer.isisfish.entities.PopulationGroup#1156461521076#0.6526656643346673#maxLength"); + + testDesignPlan.addFactor(factorEquationDiscrete); + + // test write + String content = MexicoHelper.getDesignPlanAsXML(testDesignPlan); + Assert.assertTrue(content.contains("context.getValue() < 1.0")); + + File tempFile = File.createTempFile("testdesignplan", ".xml"); + tempFile.deleteOnExit(); + FileUtils.writeStringToFile(tempFile, content); + + // test to read it and get content + DesignPlan plan = MexicoHelper.getDesignPlanFromXML(tempFile, null); + String reReadContent = MexicoHelper.getDesignPlanAsXML(plan); + + Assert.assertEquals(content, reReadContent); + } + + /** * Test que l'export XML de l'import XML produise le meme xml. * Pareil, mais pour une version v2 du schema xml. *

1 0

r3345 - in isis-fish/branches/3.3.1/src/main/assembly: x64 x86
by chatellier＠users.labs.libre-entreprise.org May 31, 2011

May 31, 2011

Author: chatellier Date: 2011-05-31 15:54:57 +0000 (Tue, 31 May 2011) New Revision: 3345 Log: Update jri to be compliant with R 2.13 Modified: isis-fish/branches/3.3.1/src/main/assembly/x64/jri.dll isis-fish/branches/3.3.1/src/main/assembly/x64/libjri.so isis-fish/branches/3.3.1/src/main/assembly/x86/jri.dll isis-fish/branches/3.3.1/src/main/assembly/x86/libjri.so Modified: isis-fish/branches/3.3.1/src/main/assembly/x64/jri.dll =================================================================== (Binary files differ) Modified: isis-fish/branches/3.3.1/src/main/assembly/x64/libjri.so =================================================================== (Binary files differ) Modified: isis-fish/branches/3.3.1/src/main/assembly/x86/jri.dll =================================================================== (Binary files differ) Modified: isis-fish/branches/3.3.1/src/main/assembly/x86/libjri.so =================================================================== (Binary files differ)

1 0

r3344 - isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/xml
by chatellier＠users.labs.libre-entreprise.org May 31, 2011

May 31, 2011

Author: chatellier Date: 2011-05-31 14:16:54 +0000 (Tue, 31 May 2011) New Revision: 3344 Log: Rename RuleDomain to RuleDiscreteDomain Added: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/xml/RuleDiscreteDomainXMLVisitor.java Removed: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/xml/RuleDomainXMLVisitor.java Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/xml/FactorXMLVisitor.java Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/xml/FactorXMLVisitor.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/xml/FactorXMLVisitor.java 2011-05-31 09:31:19 UTC (rev 3343) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/xml/FactorXMLVisitor.java 2011-05-31 14:16:54 UTC (rev 3344) @@ -25,11 +25,8 @@ package fr.ifremer.isisfish.mexico.xml; -import java.io.Serializable; - import org.nuiton.math.matrix.MatrixND; -import fr.ifremer.isisfish.rule.Rule; import fr.ifremer.isisfish.simulator.sensitivity.Domain; import fr.ifremer.isisfish.simulator.sensitivity.Factor; import fr.ifremer.isisfish.simulator.sensitivity.domain.ContinuousDomain; @@ -123,7 +120,7 @@ visitor = new ContinuousDomainXMLVisitor(); } else if (factor.getDomain() instanceof RuleDiscreteDomain) { - visitor = new RuleDomainXMLVisitor(); + visitor = new RuleDiscreteDomainXMLVisitor(); } else if (factor.getDomain() instanceof DiscreteDomain) { visitor = new DiscreteDomainXMLVisitor(); Copied: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/xml/RuleDiscreteDomainXMLVisitor.java (from rev 3334, isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/xml/RuleDomainXMLVisitor.java) =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/xml/RuleDiscreteDomainXMLVisitor.java (rev 0) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/xml/RuleDiscreteDomainXMLVisitor.java 2011-05-31 14:16:54 UTC (rev 3344) @@ -0,0 +1,57 @@ +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2011 Ifremer, CodeLutin, Chatellier Eric + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 2 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-2.0.html>. + * #L% + */ + +package fr.ifremer.isisfish.mexico.xml; + +import java.util.List; + +import fr.ifremer.isisfish.mexico.MexicoHelper; +import fr.ifremer.isisfish.rule.Rule; +import fr.ifremer.isisfish.simulator.sensitivity.Domain; + +/** + * XML rule domain visitor. + * + * @author chatellier + * @version $Revision$ + * + * Last update : $Date$ + * By : $Author$ + */ +public class RuleDiscreteDomainXMLVisitor extends DiscreteDomainXMLVisitor { + + /** + * {@inheritDoc} + */ + @Override + public void visit(Domain domain, Object label, Object value) { + List<Rule> rulesList = (List<Rule>)value; + String rulesAsXml = MexicoHelper.getRulesAsXml(rulesList); + + xmlBuffer.append("<value>"); + xmlBuffer.append(rulesAsXml); + xmlBuffer.append("</value>"); + } +} Deleted: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/xml/RuleDomainXMLVisitor.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/xml/RuleDomainXMLVisitor.java 2011-05-31 09:31:19 UTC (rev 3343) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/xml/RuleDomainXMLVisitor.java 2011-05-31 14:16:54 UTC (rev 3344) @@ -1,57 +0,0 @@ -/* - * #%L - * IsisFish - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2011 Ifremer, CodeLutin, Chatellier Eric - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. - * #L% - */ - -package fr.ifremer.isisfish.mexico.xml; - -import java.util.List; - -import fr.ifremer.isisfish.mexico.MexicoHelper; -import fr.ifremer.isisfish.rule.Rule; -import fr.ifremer.isisfish.simulator.sensitivity.Domain; - -/** - * XML rule domain visitor. - * - * @author chatellier - * @version $Revision$ - * - * Last update : $Date$ - * By : $Author$ - */ -public class RuleDomainXMLVisitor extends DiscreteDomainXMLVisitor { - - /** - * {@inheritDoc} - */ - @Override - public void visit(Domain domain, Object label, Object value) { - List<Rule> rulesList = (List<Rule>)value; - String rulesAsXml = MexicoHelper.getRulesAsXml(rulesList); - - xmlBuffer.append("<value>"); - xmlBuffer.append(rulesAsXml); - xmlBuffer.append("</value>"); - } -}

1 0

r3343 - in isis-fish/branches/3.3.1/src: main/java/fr/ifremer/isisfish/mexico/xml main/java/fr/ifremer/isisfish/simulator/sensitivity/domain main/java/fr/ifremer/isisfish/ui/sensitivity main/java/fr/ifremer/isisfish/ui/simulator main/java/fr/ifremer/isisfish/ui/util test/java/fr/ifremer/isisfish/mexico test/java/fr/ifremer/isisfish/simulator/launcher test/java/fr/ifremer/isisfish/simulator/sensitivity
by chatellier＠users.labs.libre-entreprise.org May 31, 2011

May 31, 2011

Author: chatellier Date: 2011-05-31 09:31:19 +0000 (Tue, 31 May 2011) New Revision: 3343 Log: Rename RuleDomain to RuleDiscreteDomain Added: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/RuleDiscreteDomain.java Removed: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/RuleDomain.java Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/xml/DomXMLParser.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/xml/FactorXMLVisitor.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityInputHandler.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/util/ErrorHelper.java isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/mexico/MexicoHelperTest.java isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceTest.java isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/FactorTest.java Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/xml/DomXMLParser.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/xml/DomXMLParser.java 2011-05-27 12:59:37 UTC (rev 3342) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/xml/DomXMLParser.java 2011-05-31 09:31:19 UTC (rev 3343) @@ -40,7 +40,7 @@ import fr.ifremer.isisfish.simulator.sensitivity.domain.DiscreteDomain; import fr.ifremer.isisfish.simulator.sensitivity.domain.EquationContinuousDomain; import fr.ifremer.isisfish.simulator.sensitivity.domain.MatrixContinuousDomain; -import fr.ifremer.isisfish.simulator.sensitivity.domain.RuleDomain; +import fr.ifremer.isisfish.simulator.sensitivity.domain.RuleDiscreteDomain; /** * Parse xml using dom. @@ -262,7 +262,7 @@ factor.setPath(path); Element fixedElement = factorElement.element("domain").element("fixed"); if ("discrete".equals(property)) { - RuleDomain domain = new RuleDomain(); + RuleDiscreteDomain domain = new RuleDiscreteDomain(); List<Element> valueElements = fixedElement.element("enumeration").elements("value"); int label = 0; for (Element valueElement : valueElements) { @@ -493,7 +493,7 @@ factor.setPath(path); Element fixedElement = factorElement.element("domain").element("fixed"); if ("discrete".equals(property)) { - RuleDomain domain = new RuleDomain(); + RuleDiscreteDomain domain = new RuleDiscreteDomain(); List<Element> valueElements = fixedElement.element("enumeration").elements("value"); int label = 0; for (Element valueElement : valueElements) { Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/xml/FactorXMLVisitor.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/xml/FactorXMLVisitor.java 2011-05-27 12:59:37 UTC (rev 3342) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/xml/FactorXMLVisitor.java 2011-05-31 09:31:19 UTC (rev 3343) @@ -36,7 +36,7 @@ import fr.ifremer.isisfish.simulator.sensitivity.domain.DiscreteDomain; import fr.ifremer.isisfish.simulator.sensitivity.domain.EquationContinuousDomain; import fr.ifremer.isisfish.simulator.sensitivity.domain.MatrixContinuousDomain; -import fr.ifremer.isisfish.simulator.sensitivity.domain.RuleDomain; +import fr.ifremer.isisfish.simulator.sensitivity.domain.RuleDiscreteDomain; import fr.ifremer.isisfish.simulator.sensitivity.visitor.FactorVisitor; /** @@ -93,7 +93,7 @@ else if (referenceValueForType instanceof Integer) { xmlBuffer.append(" type=\"integer\""); } - else if (factor.getDomain() instanceof RuleDomain) { + else if (factor.getDomain() instanceof RuleDiscreteDomain) { xmlBuffer.append(" type=\"rule\""); } xmlBuffer.append(">"); @@ -122,7 +122,7 @@ else if (factor.getDomain() instanceof ContinuousDomain) { visitor = new ContinuousDomainXMLVisitor(); } - else if (factor.getDomain() instanceof RuleDomain) { + else if (factor.getDomain() instanceof RuleDiscreteDomain) { visitor = new RuleDomainXMLVisitor(); } else if (factor.getDomain() instanceof DiscreteDomain) { Copied: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/RuleDiscreteDomain.java (from rev 3334, isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/RuleDomain.java) =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/RuleDiscreteDomain.java (rev 0) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/RuleDiscreteDomain.java 2011-05-31 09:31:19 UTC (rev 3343) @@ -0,0 +1,46 @@ +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2011 Ifremer, CodeLutin, Chatellier Eric + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 2 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-2.0.html>. + * #L% + */ + +package fr.ifremer.isisfish.simulator.sensitivity.domain; + +import fr.ifremer.isisfish.rule.Rule; + +/** + * Factor domain for {@link Rule}s. + * + * @author chatellier + * @version $Revision$ + * + * @since 3.4.0.0 + * + * Last update : $Date$ + * By : $Author$ + */ +public class RuleDiscreteDomain extends DiscreteDomain { + + /** serialVersionUID. */ + private static final long serialVersionUID = -5611785362638191719L; + +} Deleted: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/RuleDomain.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/RuleDomain.java 2011-05-27 12:59:37 UTC (rev 3342) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/RuleDomain.java 2011-05-31 09:31:19 UTC (rev 3343) @@ -1,46 +0,0 @@ -/* - * #%L - * IsisFish - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2009 - 2011 Ifremer, CodeLutin, Chatellier Eric - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. - * #L% - */ - -package fr.ifremer.isisfish.simulator.sensitivity.domain; - -import fr.ifremer.isisfish.rule.Rule; - -/** - * Factor domain for {@link Rule}s. - * - * @author chatellier - * @version $Revision$ - * - * @since 3.4.0.0 - * - * Last update : $Date$ - * By : $Author$ - */ -public class RuleDomain extends DiscreteDomain { - - /** serialVersionUID. */ - private static final long serialVersionUID = -5611785362638191719L; - -} Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityInputHandler.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityInputHandler.java 2011-05-27 12:59:37 UTC (rev 3342) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityInputHandler.java 2011-05-31 09:31:19 UTC (rev 3343) @@ -68,7 +68,7 @@ import fr.ifremer.isisfish.simulator.sensitivity.domain.DiscreteDomain; import fr.ifremer.isisfish.simulator.sensitivity.domain.EquationContinuousDomain; import fr.ifremer.isisfish.simulator.sensitivity.domain.MatrixContinuousDomain; -import fr.ifremer.isisfish.simulator.sensitivity.domain.RuleDomain; +import fr.ifremer.isisfish.simulator.sensitivity.domain.RuleDiscreteDomain; import fr.ifremer.isisfish.types.RangeOfValues; import fr.ifremer.isisfish.ui.SimulationUI; import fr.ifremer.isisfish.ui.input.InputAction; @@ -787,7 +787,7 @@ result = new MatrixPanelEditor(); ((MatrixPanelEditor)result).setMatrix((MatrixND)value); } - else if (domain instanceof RuleDomain) { + else if (domain instanceof RuleDiscreteDomain) { result = new RuleChooser(factorWizardUI); ((RuleChooser)result).setRulesList((List<Rule>)value); } Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java 2011-05-27 12:59:37 UTC (rev 3342) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java 2011-05-31 09:31:19 UTC (rev 3343) @@ -93,7 +93,7 @@ import fr.ifremer.isisfish.simulator.sensitivity.domain.DiscreteDomain; import fr.ifremer.isisfish.simulator.sensitivity.domain.EquationContinuousDomain; import fr.ifremer.isisfish.simulator.sensitivity.domain.MatrixContinuousDomain; -import fr.ifremer.isisfish.simulator.sensitivity.domain.RuleDomain; +import fr.ifremer.isisfish.simulator.sensitivity.domain.RuleDiscreteDomain; import fr.ifremer.isisfish.ui.SimulationUI; import fr.ifremer.isisfish.ui.sensitivity.FactorWizardUI; import fr.ifremer.isisfish.ui.sensitivity.SensitivityInputHandler; @@ -946,7 +946,7 @@ DiscreteDomain domain = null; // FIXME echatellier gere le path mieux que ca if ("parameters.rules".equals(path)) { - domain = new RuleDomain(); + domain = new RuleDiscreteDomain(); } else { domain = new DiscreteDomain(); @@ -1283,7 +1283,7 @@ if (selectedFactor == null) { selectedFactor = new Factor(factorName); selectedFactor.setPath(factorName); - selectedFactor.setDomain(new RuleDomain()); + selectedFactor.setDomain(new RuleDiscreteDomain()); } } Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/util/ErrorHelper.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/util/ErrorHelper.java 2011-05-27 12:59:37 UTC (rev 3342) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/util/ErrorHelper.java 2011-05-31 09:31:19 UTC (rev 3343) @@ -72,7 +72,9 @@ _("isisfish.error.errorpane.htmlmessage", message), null, null, cause, null, null); pane.setErrorInfo(info); - pane.setErrorReporter(new ErrorHelper()); + if (cause != null) { + pane.setErrorReporter(new ErrorHelper()); + } JXErrorPane.showDialog(parent, pane); } Modified: isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/mexico/MexicoHelperTest.java =================================================================== --- isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/mexico/MexicoHelperTest.java 2011-05-27 12:59:37 UTC (rev 3342) +++ isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/mexico/MexicoHelperTest.java 2011-05-31 09:31:19 UTC (rev 3343) @@ -57,7 +57,7 @@ import fr.ifremer.isisfish.simulator.sensitivity.domain.DiscreteDomain; import fr.ifremer.isisfish.simulator.sensitivity.domain.EquationContinuousDomain; import fr.ifremer.isisfish.simulator.sensitivity.domain.MatrixContinuousDomain; -import fr.ifremer.isisfish.simulator.sensitivity.domain.RuleDomain; +import fr.ifremer.isisfish.simulator.sensitivity.domain.RuleDiscreteDomain; /** * Test for MexicoHelper class. @@ -174,7 +174,7 @@ // factor 7 : rule factor Factor factorRuleDiscrete = new Factor("factor 7 (RuleDiscrete)"); - RuleDomain domain7 = new RuleDomain(); + RuleDiscreteDomain domain7 = new RuleDiscreteDomain(); SortedMap<Object, Object> rules = new TreeMap<Object, Object>(); rules.put("ruleset1", Arrays.asList(ruleTacPoids, ruleTailleMin)); rules.put("ruleset2", Arrays.asList(ruleTailleMin)); Modified: isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceTest.java =================================================================== --- isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceTest.java 2011-05-27 12:59:37 UTC (rev 3342) +++ isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceTest.java 2011-05-31 09:31:19 UTC (rev 3343) @@ -66,7 +66,7 @@ import fr.ifremer.isisfish.simulator.sensitivity.domain.DiscreteDomain; import fr.ifremer.isisfish.simulator.sensitivity.domain.EquationContinuousDomain; import fr.ifremer.isisfish.simulator.sensitivity.domain.MatrixContinuousDomain; -import fr.ifremer.isisfish.simulator.sensitivity.domain.RuleDomain; +import fr.ifremer.isisfish.simulator.sensitivity.domain.RuleDiscreteDomain; /** * Test for {@link SimulationService}. @@ -388,7 +388,7 @@ props.setProperty("rule.0.parameter.propSurvie", "42"); RuleHelper.populateRule(0, regionContext, ruleTailleMin, props); Factor factorRule = new Factor("myRuleParams"); - factorPop.setDomain(new RuleDomain()); + factorPop.setDomain(new RuleDiscreteDomain()); factorRule.setPath("parameters.rules"); List<Rule> rules = new ArrayList<Rule>(); rules.add(ruleTacPoids); Modified: isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/FactorTest.java =================================================================== --- isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/FactorTest.java 2011-05-27 12:59:37 UTC (rev 3342) +++ isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/FactorTest.java 2011-05-31 09:31:19 UTC (rev 3343) @@ -41,7 +41,7 @@ import fr.ifremer.isisfish.simulator.sensitivity.domain.DiscreteDomain; import fr.ifremer.isisfish.simulator.sensitivity.domain.EquationContinuousDomain; import fr.ifremer.isisfish.simulator.sensitivity.domain.MatrixContinuousDomain; -import fr.ifremer.isisfish.simulator.sensitivity.domain.RuleDomain; +import fr.ifremer.isisfish.simulator.sensitivity.domain.RuleDiscreteDomain; /** * Factors test. @@ -334,7 +334,7 @@ // factor and domain definition Factor factor = new Factor("testrule"); - RuleDomain ruleDomain = new RuleDomain(); + RuleDiscreteDomain ruleDomain = new RuleDiscreteDomain(); ruleDomain.getValues().put("rules1", rules1); ruleDomain.getValues().put("rules2", rules2); ruleDomain.getValues().put("rules3", rules3);

1 0

r3342 - isis-fish/branches/3.3.1
by chatellier＠users.labs.libre-entreprise.org May 27, 2011

May 27, 2011

Author: chatellier Date: 2011-05-27 12:59:37 +0000 (Fri, 27 May 2011) New Revision: 3342 Log: Update h2 Modified: isis-fish/branches/3.3.1/pom.xml Modified: isis-fish/branches/3.3.1/pom.xml =================================================================== --- isis-fish/branches/3.3.1/pom.xml 2011-05-24 16:42:28 UTC (rev 3341) +++ isis-fish/branches/3.3.1/pom.xml 2011-05-27 12:59:37 UTC (rev 3342) @@ -256,7 +256,7 @@ <dependency> <groupId>com.h2database</groupId> <artifactId>h2</artifactId> - <version>1.3.154</version> + <version>1.3.155</version> <scope>compile</scope> </dependency>

1 0

r3341 - in isis-fish/branches/3.3.1: . src/main/java/fr/ifremer/isisfish/types/hibernate
by chatellier＠users.labs.libre-entreprise.org May 24, 2011

May 24, 2011

Author: chatellier Date: 2011-05-24 16:42:28 +0000 (Tue, 24 May 2011) New Revision: 3341 Log: Test update to hibernate 3.6.4 (topia migration fail) Modified: isis-fish/branches/3.3.1/pom.xml isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/types/hibernate/MatrixType.java Modified: isis-fish/branches/3.3.1/pom.xml =================================================================== --- isis-fish/branches/3.3.1/pom.xml 2011-05-24 15:23:41 UTC (rev 3340) +++ isis-fish/branches/3.3.1/pom.xml 2011-05-24 16:42:28 UTC (rev 3341) @@ -45,6 +45,13 @@ <scope>compile</scope> </dependency> +  + <dependency> <groupId>org.nuiton.matrix</groupId> <artifactId>nuiton-matrix</artifactId> Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/types/hibernate/MatrixType.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/types/hibernate/MatrixType.java 2011-05-24 15:23:41 UTC (rev 3340) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/types/hibernate/MatrixType.java 2011-05-24 16:42:28 UTC (rev 3341) @@ -44,7 +44,6 @@ import org.hibernate.Hibernate; import org.hibernate.HibernateException; import org.hibernate.engine.SessionImplementor; -import org.hibernate.lob.ClobImpl; import org.hibernate.type.Type; import org.hibernate.usertype.CompositeUserType; @@ -423,14 +422,17 @@ st.setString(index + 1, null); st.setString(index + 2, null); st.setString(index + 3, null); - st.setClob(index + 4, new ClobImpl("")); + // 3.3.2 : st.setClob(index + 4, new ClobImpl("")); + st.setClob(index + 4, Hibernate.createClob("")); + } else { MatrixND matrix = MatrixFactory.getInstance().create((MatrixND)value); st.setString(index, matrix.getName()); st.setString(index + 1, getDimToString(matrix.getDim())); st.setString(index + 2, getDimNamesToString(matrix.getDimensionNames())); st.setString(index + 3, getSemanticsToString(matrix.getSemantics())); - st.setClob(index + 4, new ClobImpl(matrix.toList().toString())); + // 3.3.2 : st.setClob(index + 4, new ClobImpl()); + st.setClob(index + 4, Hibernate.createClob(matrix.toList().toString())); } }

1 0

r3340 - isis-fish/branches/3.3.1/src/main/resources/i18n
by chatellier＠users.labs.libre-entreprise.org May 24, 2011

May 24, 2011

Author: chatellier Date: 2011-05-24 15:23:41 +0000 (Tue, 24 May 2011) New Revision: 3340 Log: Clean and update i18n file Modified: isis-fish/branches/3.3.1/src/main/resources/i18n/isis-fish_fr_FR.properties Modified: isis-fish/branches/3.3.1/src/main/resources/i18n/isis-fish_fr_FR.properties =================================================================== --- isis-fish/branches/3.3.1/src/main/resources/i18n/isis-fish_fr_FR.properties 2011-05-24 15:22:26 UTC (rev 3339) +++ isis-fish/branches/3.3.1/src/main/resources/i18n/isis-fish_fr_FR.properties 2011-05-24 15:23:41 UTC (rev 3340) @@ -999,7 +999,7 @@ isisfish.vcs.vcssvn.add.error=Impossible d'ajouter un fichier isisfish.vcs.vcssvn.add.errorreadonly=Vous ne pouver pas ajouter de fichier, ce dépôt est en lecture seule \! isisfish.vcs.vcssvn.checkProtocol.error=Impossible d'obtenir l'adresse correspondant au dépôt local -isisfish.vcs.vcssvn.checkProtocol.relocate= +isisfish.vcs.vcssvn.checkProtocol.relocate=Transfert du dépôt %s de %s vers %s isisfish.vcs.vcssvn.checkout.error=Impossible de mettre à jour isisfish.vcs.vcssvn.cleanup.error=Impossible de déverrouiller la copie locale isisfish.vcs.vcssvn.commit.error=Impossible de commiter

1 0