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

r3559 - trunk
by echatellier＠users.forge.codelutin.com Dec. 2, 2011

Dec. 2, 2011

Author: echatellier Date: 2011-12-02 19:31:00 +0100 (Fri, 02 Dec 2011) New Revision: 3559 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3559 Log: [maven-release-plugin] prepare release isis-fish-4.0.0.0 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-12-02 17:25:28 UTC (rev 3558) +++ trunk/pom.xml 2011-12-02 18:31:00 UTC (rev 3559) @@ -11,7 +11,7 @@ <groupId>fr.ifremer</groupId> <artifactId>isis-fish</artifactId> - <version>4.0.0.0-SNAPSHOT</version> + <version>4.0.0.0</version>  <dependencies> @@ -715,9 +715,9 @@   <scm> - <connection>scm:svn:http://svn.forge.codelutin.com/svn/isis-fish/trunk</connection> - <developerConnection>scm:svn:http://svn.forge.codelutin.com/svn/isis-fish/trunk</developerConnection> - <url>http://svn.forge.codelutin.com/svn/isis-fish/trunk</url> + <connection>scm:svn:http://svn.forge.codelutin.com/svn/isis-fish/tags/isis-fish-4.0.0.0</connection> + <developerConnection>scm:svn:http://svn.forge.codelutin.com/svn/isis-fish/tags/isis-fish-4.0.0.0</developerConnection> + <url>http://svn.forge.codelutin.com/svn/isis-fish/tags/isis-fish-4.0.0.0</url> </scm> <repositories>

1 0

r3558 - trunk
by echatellier＠users.forge.codelutin.com Dec. 2, 2011

Dec. 2, 2011

Author: echatellier Date: 2011-12-02 18:25:28 +0100 (Fri, 02 Dec 2011) New Revision: 3558 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3558 Log: Update to nuiton-matrix 2.2.2 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-12-02 09:48:32 UTC (rev 3557) +++ trunk/pom.xml 2011-12-02 17:25:28 UTC (rev 3558) @@ -62,14 +62,14 @@ <dependency> <groupId>org.nuiton.matrix</groupId> <artifactId>nuiton-matrix</artifactId> - <version>2.2.2-SNAPSHOT</version> + <version>2.2.2</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.nuiton.matrix</groupId> <artifactId>nuiton-matrix-gui</artifactId> - <version>2.2.2-SNAPSHOT</version> + <version>2.2.2</version> <scope>compile</scope> <exclusions> <exclusion>

1 0

r3557 - trunk
by echatellier＠users.forge.codelutin.com Dec. 2, 2011

Dec. 2, 2011

Author: echatellier Date: 2011-12-02 10:48:32 +0100 (Fri, 02 Dec 2011) New Revision: 3557 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3557 Log: Use nuiton-matrix snapshot for import csv bug Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-12-01 17:24:28 UTC (rev 3556) +++ trunk/pom.xml 2011-12-02 09:48:32 UTC (rev 3557) @@ -62,14 +62,14 @@ <dependency> <groupId>org.nuiton.matrix</groupId> <artifactId>nuiton-matrix</artifactId> - <version>2.2</version> + <version>2.2.2-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.nuiton.matrix</groupId> <artifactId>nuiton-matrix-gui</artifactId> - <version>2.2</version> + <version>2.2.2-SNAPSHOT</version> <scope>compile</scope> <exclusions> <exclusion>

1 0

r3556 - trunk/src/main/java/fr/ifremer/isisfish/mexico
by echatellier＠users.forge.codelutin.com Dec. 1, 2011

Dec. 1, 2011

Author: echatellier Date: 2011-12-01 18:24:28 +0100 (Thu, 01 Dec 2011) New Revision: 3556 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3556 Log: Fix defaut system encoding Modified: trunk/src/main/java/fr/ifremer/isisfish/mexico/MexicoHelper.java Modified: trunk/src/main/java/fr/ifremer/isisfish/mexico/MexicoHelper.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/mexico/MexicoHelper.java 2011-12-01 16:54:16 UTC (rev 3555) +++ trunk/src/main/java/fr/ifremer/isisfish/mexico/MexicoHelper.java 2011-12-01 17:24:28 UTC (rev 3556) @@ -152,7 +152,7 @@ Transformer serializer= SAXTransformerFactory.newInstance().newTransformer(); serializer.setOutputProperty(OutputKeys.INDENT, "yes"); serializer.setOutputProperty("{http://xml.apache.org/xslt}indent-amount", "2"); - Source xmlSource=new SAXSource(new InputSource(new ByteArrayInputStream(unformattedXml.getBytes()))); + Source xmlSource=new SAXSource(new InputSource(new ByteArrayInputStream(unformattedXml.getBytes("UTF-8")))); StreamResult res = new StreamResult(new ByteArrayOutputStream()); serializer.transform(xmlSource, res); return new String(((ByteArrayOutputStream)res.getOutputStream()).toByteArray());

1 0

r3555 - trunk/src/main/resources/i18n
by echatellier＠users.forge.codelutin.com Dec. 1, 2011

Dec. 1, 2011

Author: echatellier Date: 2011-12-01 17:54:16 +0100 (Thu, 01 Dec 2011) New Revision: 3555 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3555 Log: remove accent Modified: trunk/src/main/resources/i18n/isis-fish_fr_FR.properties Modified: trunk/src/main/resources/i18n/isis-fish_fr_FR.properties =================================================================== --- trunk/src/main/resources/i18n/isis-fish_fr_FR.properties 2011-12-01 16:50:34 UTC (rev 3554) +++ trunk/src/main/resources/i18n/isis-fish_fr_FR.properties 2011-12-01 16:54:16 UTC (rev 3555) @@ -865,7 +865,7 @@ isisfish.sensitivity.newfactorname=Nom du groupe de facteurs isisfish.sensitivity.populationfactorname=Population %s isisfish.sensitivity.referencevalue=Valeur de référence -isisfish.sensitivity.ruleparameterfactorname=Param règle %s.%s +isisfish.sensitivity.ruleparameterfactorname=Param regle %s.%s isisfish.sensitivity.rulesfactorname=Ensemble de règles isisfish.sensitivity.secondpass=Analyse des résultats isisfish.sensitivity.secondpass.title=Analyse des résultats

1 0

r3554 - trunk/src/main/resources
by echatellier＠users.forge.codelutin.com Dec. 1, 2011

Dec. 1, 2011

Author: echatellier Date: 2011-12-01 17:50:34 +0100 (Thu, 01 Dec 2011) New Revision: 3554 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3554 Log: Remove debug log level for R Modified: trunk/src/main/resources/log4j.properties Modified: trunk/src/main/resources/log4j.properties =================================================================== --- trunk/src/main/resources/log4j.properties 2011-12-01 16:09:47 UTC (rev 3553) +++ trunk/src/main/resources/log4j.properties 2011-12-01 16:50:34 UTC (rev 3554) @@ -32,7 +32,6 @@ # package level log4j.logger.fr.ifremer.isisfish=INFO -log4j.logger.org.nuiton.j2r=DEBUG log4j.logger.org.nuiton=WARN log4j.logger.exports=INFO log4j.logger.formules=INFO

1 0

r3553 - trunk
by echatellier＠users.forge.codelutin.com Dec. 1, 2011

Dec. 1, 2011

Author: echatellier Date: 2011-12-01 17:09:47 +0100 (Thu, 01 Dec 2011) New Revision: 3553 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3553 Log: Revert back to 2.2 (2.2.1 is buggy with jfreechart) Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-12-01 15:41:13 UTC (rev 3552) +++ trunk/pom.xml 2011-12-01 16:09:47 UTC (rev 3553) @@ -62,14 +62,14 @@ <dependency> <groupId>org.nuiton.matrix</groupId> <artifactId>nuiton-matrix</artifactId> - <version>2.2.1</version> + <version>2.2</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.nuiton.matrix</groupId> <artifactId>nuiton-matrix-gui</artifactId> - <version>2.2.1</version> + <version>2.2</version> <scope>compile</scope> <exclusions> <exclusion>

1 0

r3552 - trunk/src/main/java/fr/ifremer/isisfish/ui/input
by echatellier＠users.forge.codelutin.com Dec. 1, 2011

Dec. 1, 2011

Author: echatellier Date: 2011-12-01 16:41:13 +0100 (Thu, 01 Dec 2011) New Revision: 3552 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3552 Log: Fix change model not reset on node swicth Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescriptionParametersUI.jaxx trunk/src/main/java/fr/ifremer/isisfish/ui/input/GearUI.jaxx trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.jaxx trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputSaveVerifier.java trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesUI.jaxx trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoZoneUI.jaxx trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierUI.jaxx trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationGroupUI.jaxx trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationUI.jaxx trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonsUI.jaxx trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationUI.jaxx trunk/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityUI.jaxx trunk/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsUI.jaxx trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyMonthInfoUI.jaxx trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyUI.jaxx Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescriptionParametersUI.jaxx =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescriptionParametersUI.jaxx 2011-12-01 15:22:24 UTC (rev 3551) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescriptionParametersUI.jaxx 2011-12-01 15:41:13 UTC (rev 3552) @@ -96,6 +96,11 @@ }); } +@Override +public void resetChangeModel() { + changeModel.setStayChanged(false); +} + /*public void refresh() { SetOfVessels setOfVessels = getSaveVerifier().getEntity(SetOfVessels.class); Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/GearUI.jaxx =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/GearUI.jaxx 2011-12-01 15:22:24 UTC (rev 3551) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/GearUI.jaxx 2011-12-01 15:41:13 UTC (rev 3552) @@ -63,6 +63,12 @@ gearTabUI.setLayer(active); selectivityUI.setLayer(active); } + +@Override +public void resetChangeModel() { + gearTabUI.resetChangeModel(); + selectivityUI.resetChangeModel(); +} ]]></script> <JPanel id="body"> <JTabbedPane constraints='BorderLayout.CENTER' id="gearTab"> Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.jaxx =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.jaxx 2011-12-01 15:22:24 UTC (rev 3551) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.jaxx 2011-12-01 15:41:13 UTC (rev 3552) @@ -83,6 +83,16 @@ public abstract B getBean(); +/** + * Pas très safe, le bean doit s'appeler changeModel dans l'heritage "FORCEMENT" + * + * FIXME echatellier 20111201 small fix because save + * button has to reset internal ui change model state + */ +public void resetChangeModel() { + +} + public InputAction getAction() { return getContextValue(InputAction.class); } Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputSaveVerifier.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputSaveVerifier.java 2011-12-01 15:22:24 UTC (rev 3551) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputSaveVerifier.java 2011-12-01 15:41:13 UTC (rev 3552) @@ -249,6 +249,10 @@ InputUI inputUI = inputContentUI.getParentContainer(InputUI.class); inputUI.getHandler().updateTreeNode(inputUI, topiaEntity.getTopiaId()); + // FIXME echatellier 20111201 small fix because save + // button has to reset internal ui change model state + inputContentUI.resetChangeModel(); + noModif(); //rootUI.setStatusMessage(_("isisfish.message.save.finished")); Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesUI.jaxx =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesUI.jaxx 2011-12-01 15:22:24 UTC (rev 3551) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesUI.jaxx 2011-12-01 15:41:13 UTC (rev 3552) @@ -75,6 +75,11 @@ }); } +@Override +public void resetChangeModel() { + changeModel.setStayChanged(false); +} + protected void setSeasonModel() { java.util.List<MetierSeasonInfo> metierSeasonInfo = getBean().getMetierSeasonInfo(); MetierSeasonInfoComboModel seasonModel = new MetierSeasonInfoComboModel(metierSeasonInfo); Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoZoneUI.jaxx =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoZoneUI.jaxx 2011-12-01 15:22:24 UTC (rev 3551) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoZoneUI.jaxx 2011-12-01 15:41:13 UTC (rev 3552) @@ -97,6 +97,11 @@ }); } + @Override + public void resetChangeModel() { + changeModel.setStayChanged(false); + } + protected void save() { getSaveVerifier().save(); setMetierSeasonInfoCombo(); Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierUI.jaxx =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierUI.jaxx 2011-12-01 15:22:24 UTC (rev 3551) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierUI.jaxx 2011-12-01 15:41:13 UTC (rev 3552) @@ -56,6 +56,13 @@ metierSeasonInfoUI.setLayer(active); metierSeasonSpeciesUI.setLayer(active); } + +@Override +public void resetChangeModel() { + metierTabUI.resetChangeModel(); + metierSeasonInfoUI.resetChangeModel(); + metierSeasonSpeciesUI.resetChangeModel(); +} ]]></script> <JPanel id="body"> <JTabbedPane id="metierTab" constraints='BorderLayout.CENTER'> Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationGroupUI.jaxx =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationGroupUI.jaxx 2011-12-01 15:22:24 UTC (rev 3551) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationGroupUI.jaxx 2011-12-01 15:41:13 UTC (rev 3552) @@ -95,6 +95,11 @@ }); } +@Override +public void resetChangeModel() { + changeModel.setStayChanged(false); +} + /*public void refresh() { //if (!isActive()) { setPopGroupNotNull(false); Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationUI.jaxx =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationUI.jaxx 2011-12-01 15:22:24 UTC (rev 3551) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationUI.jaxx 2011-12-01 15:41:13 UTC (rev 3552) @@ -67,6 +67,11 @@ }); } +@Override +public void resetChangeModel() { + changeModel.setStayChanged(false); +} + public void refresh() { Population population = getSaveVerifier().getEntity(Population.class); Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonsUI.jaxx =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonsUI.jaxx 2011-12-01 15:22:24 UTC (rev 3551) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonsUI.jaxx 2011-12-01 15:41:13 UTC (rev 3552) @@ -99,6 +99,11 @@ }); } +@Override +public void resetChangeModel() { + changeModel.setStayChanged(false); +} + protected void create() { PopulationSeasonInfo seasonNew = getContextValue(InputAction.class).createPopulationSeasonInfo(getBean()); setPopulationSeasonInfo(seasonNew); Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationUI.jaxx =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationUI.jaxx 2011-12-01 15:22:24 UTC (rev 3551) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationUI.jaxx 2011-12-01 15:41:13 UTC (rev 3552) @@ -60,6 +60,19 @@ populationMigrationUI.setLayer(active); populationPriceUI.setLayer(active); } + +@Override +public void resetChangeModel() { + populationBasicsUI.resetChangeModel(); + populationZoneUI.resetChangeModel(); + populationSeasonsUI.resetChangeModel(); + populationEquationUI.resetChangeModel(); + populationRecruitementUI.resetChangeModel(); + populationGroupUI.resetChangeModel(); + populationCapturabilityUI.resetChangeModel(); + populationMigrationUI.resetChangeModel(); + populationPriceUI.resetChangeModel(); +} ]]> </script> <JPanel id='body'> Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityUI.jaxx =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityUI.jaxx 2011-12-01 15:22:24 UTC (rev 3551) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityUI.jaxx 2011-12-01 15:41:13 UTC (rev 3552) @@ -67,6 +67,11 @@ }); } +@Override +public void resetChangeModel() { + changeModel.setStayChanged(false); +} + public void refresh() { Gear gear = (Gear)getSaveVerifier().getEntity(Gear.class); Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsUI.jaxx =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsUI.jaxx 2011-12-01 15:22:24 UTC (rev 3551) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsUI.jaxx 2011-12-01 15:41:13 UTC (rev 3552) @@ -51,6 +51,13 @@ effortDescriptionUI.setLayer(active); effortParametersUI.setLayer(active); } + +@Override +public void resetChangeModel() { + setOfVesselsBasicsUI.resetChangeModel(); + effortDescriptionUI.resetChangeModel(); + effortParametersUI.resetChangeModel(); +} ]]></script> <JPanel id="body"> <JTabbedPane id="setOfVesselsTab"> Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyMonthInfoUI.jaxx =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyMonthInfoUI.jaxx 2011-12-01 15:22:24 UTC (rev 3551) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyMonthInfoUI.jaxx 2011-12-01 15:41:13 UTC (rev 3552) @@ -143,6 +143,11 @@ }); } +@Override +public void resetChangeModel() { + changeModel.setStayChanged(false); +} + /*@Override public void refresh() { //getSaveVerifier().addCurrentPanel(strategyJanuary, strategyFebuary, strategyMarch, Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyUI.jaxx =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyUI.jaxx 2011-12-01 15:22:24 UTC (rev 3551) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyUI.jaxx 2011-12-01 15:41:13 UTC (rev 3552) @@ -43,6 +43,12 @@ strategyTabUI.setLayer(active); strategyMonthInfoUI.setLayer(active); } + +@Override +public void resetChangeModel() { + strategyTabUI.resetChangeModel(); + strategyMonthInfoUI.resetChangeModel(); +} ]]></script> <JPanel id="body"> <JTabbedPane id="strategyTab">

1 0

r3551 - trunk/src/main/resources/i18n
by echatellier＠users.forge.codelutin.com Dec. 1, 2011

Dec. 1, 2011

Author: echatellier Date: 2011-12-01 16:22:24 +0100 (Thu, 01 Dec 2011) New Revision: 3551 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3551 Log: ISIS fish typo Modified: trunk/src/main/resources/i18n/isis-fish_en_GB.properties trunk/src/main/resources/i18n/isis-fish_fr_FR.properties Modified: trunk/src/main/resources/i18n/isis-fish_en_GB.properties =================================================================== --- trunk/src/main/resources/i18n/isis-fish_en_GB.properties 2011-12-01 14:43:36 UTC (rev 3550) +++ trunk/src/main/resources/i18n/isis-fish_en_GB.properties 2011-12-01 15:22:24 UTC (rev 3551) @@ -64,9 +64,9 @@ destination\ already\ exists\ %s\ use\ 'force'\ argument\ to\ force\ overwrite= destination\ already\ exists\ %s\ use\ \\'force\\'\ argument\ to\ force\ overwrite= filter\ loaded\ in\ %1$s\ ms\ \:\ found\ %2$s\ lines.=filter loaded in %1$s ms \: found %2$s lines. -isisfish.about.abouthtmltext=<html>Isis-Fish (%s) Copyright IFREMER-MAERHA 2000-2011. <a href\="http\://isis-fish.labs.libre-entreprise.org">http\://isis-fish.labs.libre-entreprise.org</a> Please, report any bug you can found.<html> -isisfish.about.licensetext=You can modify and redistribute the program under the conditions of the GNU General Public License (version 2 or later). A copy of the GPL is in the file "LICENSE.txt" provided with Isis-Fish. All rights reserved. No guarantees are provided for use of this program. -isisfish.about.title=About Isis-Fish... +isisfish.about.abouthtmltext=<html>ISIS-Fish (%s) Copyright IFREMER-MAERHA 2000-2011. <a href\="http\://www.isis-fish.org">http\://www.isis-fish.org</a> Please, report any bug you can found.<html> +isisfish.about.licensetext=You can modify and redistribute the program under the conditions of the GNU General Public License (version 2 or later). A copy of the GPL is in the file "LICENSE.txt" provided with ISIS-Fish. All rights reserved. No guarantees are provided for use of this program. +isisfish.about.title=About ISIS-Fish... isisfish.advancedParameters.title=Advanced parameters isisfish.advancedParams.freeParameters=Free parameters isisfish.advancedParams.libLevelLogger=Library log level @@ -168,10 +168,10 @@ isisfish.config.main.script.autoconfig.description=Display a dialog to force script configuration isisfish.config.main.simulation.ssh.control.check.interval=Control check interval (seconds) isisfish.config.main.simulation.ssh.control.check.interval.description=Control check interval (seconds) -isisfish.config.main.simulation.ssh.datapath=Isis-Fish database -isisfish.config.main.simulation.ssh.datapath.description=Isis-Fish database path -isisfish.config.main.simulation.ssh.isis.home=Isis-Fish home -isisfish.config.main.simulation.ssh.isis.home.description=Isis-Fish installation directory +isisfish.config.main.simulation.ssh.datapath=ISIS-Fish database +isisfish.config.main.simulation.ssh.datapath.description=ISIS-Fish database path +isisfish.config.main.simulation.ssh.isis.home=ISIS-Fish home +isisfish.config.main.simulation.ssh.isis.home.description=ISIS-Fish installation directory isisfish.config.main.simulation.ssh.javapath=Java path isisfish.config.main.simulation.ssh.javapath.description=Java location on remote server (full path or relative to $PATH, by default value is caparmor configuration) isisfish.config.main.simulation.ssh.max.threads=SSH threads count @@ -295,7 +295,7 @@ isisfish.error.invalid.range=La gamme possible n'a pas de valeur acceptable isisfish.error.invalid.values.params=Parametre controlable hors valeurs possibles isisfish.error.invoke.method=Can't invoke method '%1$s' for class %2$s -isisfish.error.linkageerror.message=Isis-Fish has detected a script use error.\nCompilation directory has been deleted to force recompilation.\n\nPlease, restart Isis-Fish. +isisfish.error.linkageerror.message=ISIS-Fish has detected a script use error.\nCompilation directory has been deleted to force recompilation.\n\nPlease, restart ISIS-Fish. isisfish.error.load.class=Can't load class\: %1$s isisfish.error.load.classloader=Can't create ClassLoader for script, bad directory\: %1$s for reason %2$s isisfish.error.load.file=could not load file %1$s @@ -957,9 +957,9 @@ isisfish.strategyMonthInfo.toString=%1$s %2$s isisfish.timeUnit.day=Day isisfish.timeUnit.hours=Hours -isisfish.tray.simulation=Isis-fish - %1$s \: %2$s/%3$s -isisfish.tray.simulation.multi=Isis-fish - %s / %s -isisfish.tray.simulation.no=Isis-fish - No simulation +isisfish.tray.simulation=ISIS-fish - %1$s \: %2$s/%3$s +isisfish.tray.simulation.multi=ISIS-fish - %s / %s +isisfish.tray.simulation.no=ISIS-fish - No simulation isisfish.tripType.comments=Comments isisfish.tripType.duration=Duration isisfish.tripType.minTime=Minimum time between trips @@ -1056,8 +1056,8 @@ isisfish.welcome.menu.file=File isisfish.welcome.menu.frame=Window isisfish.welcome.menu.help=Help -isisfish.welcome.menu.help.isisfish=Isis-Fish Website -isisfish.welcome.menu.help.isisfishapi=Isis-Fish API +isisfish.welcome.menu.help.isisfish=ISIS-Fish Website +isisfish.welcome.menu.help.isisfishapi=ISIS-Fish API isisfish.welcome.menu.help.javaapi=Java API isisfish.welcome.menu.help.matrixapi=NuitonMatrix API isisfish.welcome.menu.help.topiaapi=ToPIA API Modified: trunk/src/main/resources/i18n/isis-fish_fr_FR.properties =================================================================== --- trunk/src/main/resources/i18n/isis-fish_fr_FR.properties 2011-12-01 14:43:36 UTC (rev 3550) +++ trunk/src/main/resources/i18n/isis-fish_fr_FR.properties 2011-12-01 15:22:24 UTC (rev 3551) @@ -64,9 +64,9 @@ destination\ already\ exists\ %s\ use\ 'force'\ argument\ to\ force\ overwrite= destination\ already\ exists\ %s\ use\ \\'force\\'\ argument\ to\ force\ overwrite= filter\ loaded\ in\ %1$s\ ms\ \:\ found\ %2$s\ lines.=filter loaded in %1$s ms \: found %2$s lines. -isisfish.about.abouthtmltext=<html>Isis-Fish (%s) Copyright IFREMER-MAERHA 2000-2011. <a href\="http\://isis-fish.labs.libre-entreprise.org">http\://isis-fish.labs.libre-entreprise.org</a> Merci de rapporter les bugs.<html> -isisfish.about.licensetext=Vous pouvez modifier et redistribuer ce programme sous les conditions énoncées par la licence GNU GPL (version 2 ou ultérieure). Une copie de la licence GPL est dans le fichier « LICENSE.txt » fourni avec Isis-Fish. Tous droits réservés. Aucune garantie n'est fournie pour l'utilisation de ce programme. -isisfish.about.title=À propos de Isis-Fish... +isisfish.about.abouthtmltext=<html>ISIS-Fish (%s) Copyright IFREMER-MAERHA 2000-2011. <a href\="http\://www.isis-fish.org">http\://www.isis-fish.org</a> Merci de rapporter les bugs.<html> +isisfish.about.licensetext=Vous pouvez modifier et redistribuer ce programme sous les conditions énoncées par la licence GNU GPL (version 2 ou ultérieure). Une copie de la licence GPL est dans le fichier « LICENSE.txt » fourni avec ISIS-Fish. Tous droits réservés. Aucune garantie n'est fournie pour l'utilisation de ce programme. +isisfish.about.title=À propos de ISIS-Fish... isisfish.advancedParameters.title=Paramètres avancés isisfish.advancedParams.freeParameters=Paramètres libres isisfish.advancedParams.libLevelLogger=Niveau de tracage des librairies @@ -170,8 +170,8 @@ isisfish.config.main.simulation.ssh.control.check.interval.description=Temps d'attente en secondes entre deux vérifications de progression isisfish.config.main.simulation.ssh.datapath=Base de données isisfish.config.main.simulation.ssh.datapath.description=Emplacement de la base de données (isis-database) -isisfish.config.main.simulation.ssh.isis.home=Installation d'Isis-Fish -isisfish.config.main.simulation.ssh.isis.home.description=Emplacement d'installation d'Isis-Fish sur le serveur +isisfish.config.main.simulation.ssh.isis.home=Installation d'ISIS-Fish +isisfish.config.main.simulation.ssh.isis.home.description=Emplacement d'installation d'ISIS-Fish sur le serveur isisfish.config.main.simulation.ssh.javapath=Emplacement de java isisfish.config.main.simulation.ssh.javapath.description=Emplacement de java sur le serveur (chemin total, ou relatif au $PATH, par défaut la valeur est celle de caparmor) isisfish.config.main.simulation.ssh.max.threads=Nombre de thread SSH @@ -295,7 +295,7 @@ isisfish.error.invalid.range=La gamme possible n'a pas de valeur acceptable isisfish.error.invalid.values.params=Paramètre controlable hors valeurs possibles isisfish.error.invoke.method=Can't invoke method '%1$s' for class %2$s -isisfish.error.linkageerror.message=Isis-Fish a détecté une erreur d'utilisation des scripts.\nLe dossier de compilation a été supprimé pour forcer leur recompilation.\n\nMerci de relancer Isis-Fish. +isisfish.error.linkageerror.message=ISIS-Fish a détecté une erreur d'utilisation des scripts.\nLe dossier de compilation a été supprimé pour forcer leur recompilation.\n\nMerci de relancer ISIS-Fish. isisfish.error.load.class=Can't load class\: %1$s isisfish.error.load.classloader=Can't create ClassLoader for script, bad directory\: %1$s for reason %2$s isisfish.error.load.file=could not load file %1$s @@ -550,7 +550,7 @@ isisfish.message.import.equation.convert=Conversion manuelle de l'équation isisfish.message.import.finished=Import terminé isisfish.message.import.region.name=Entre le nom de la réegion à importer -isisfish.message.import.region.xml=Région XML (Isis-Fish V2.x) +isisfish.message.import.region.xml=Région XML (ISIS-Fish V2.x) isisfish.message.import.region.zipped=Zipped Region isisfish.message.import.scripts.file=Importer des scripts depuis une archive zip isisfish.message.import.scripts.file.cancelled=Importation des scripts annulé @@ -957,9 +957,9 @@ isisfish.strategyMonthInfo.toString=%1$s %2$s isisfish.timeUnit.day=Jour isisfish.timeUnit.hours=Heures -isisfish.tray.simulation=Isis-fish - %1$s \: %2$s/%3$s -isisfish.tray.simulation.multi=Isis-fish - %s / %s -isisfish.tray.simulation.no=Isis-fish - Pas de simulation +isisfish.tray.simulation=ISIS-fish - %1$s \: %2$s/%3$s +isisfish.tray.simulation.multi=ISIS-fish - %s / %s +isisfish.tray.simulation.no=ISIS-fish - Pas de simulation isisfish.tripType.comments=Commentaires isisfish.tripType.duration=Durée isisfish.tripType.minTime=Temps minimal entre deux voyages @@ -974,12 +974,12 @@ isisfish.vcs.commit.ok=confirmer isisfish.vcs.factory.cantinstanciate=Can't instanciate wanted VCS (%s), use default isisfish.vcs.howto.save.key=Comment enregister sa clef publique ssh auprès du labs -isisfish.vcs.init.notfoundcantdownload=La base de données pour la version %s n'a ni pu être trouvée, ni téléchargée.\nVous devez la télécharger manullement à partir du site d'Isis-Fish. +isisfish.vcs.init.notfoundcantdownload=La base de données pour la version %s n'a ni pu être trouvée, ni téléchargée.\nVous devez la télécharger manullement à partir du site d'ISIS-Fish. isisfish.vcs.init.wrongprotocol=Votre base de données locale \: %s n'utilise pas un protocole correct.\nVoulez-vous faire une sauvegarde de cette base et récupérer une meilleure version ? isisfish.vcs.save.key=Accéder au labs pour enregister votre clef publique ssh isisfish.vcs.switchprotocol.confirm=Le protocole d'accès au dépôt des scripts a changé.\nVoulez-vous changer vers le nouveau dépôt ? isisfish.vcs.switchtag.warningconflict=Votre base de données a été mise à jour mais les fichiers suivants sont en conflit, merci de les vérifier \: -isisfish.vcs.switchversion.confirm=Vous n'utilisez pas le dépôt correct pour votre version d'Isis-Fish \: %s.\nVoulez-vous changer de dépôt ? +isisfish.vcs.switchversion.confirm=Vous n'utilisez pas le dépôt correct pour votre version d'ISIS-Fish \: %s.\nVoulez-vous changer de dépôt ? isisfish.vcs.update=Résultats de la synchronisation avec le serveur isisfish.vcs.update.cancel=annuler isisfish.vcs.update.checkAll=(de)-select tout @@ -1056,8 +1056,8 @@ isisfish.welcome.menu.file=Fichier isisfish.welcome.menu.frame=Fenêtre isisfish.welcome.menu.help=Aide -isisfish.welcome.menu.help.isisfish=Site d'Isis-Fish -isisfish.welcome.menu.help.isisfishapi=API Isis-Fish +isisfish.welcome.menu.help.isisfish=Site d'ISIS-Fish +isisfish.welcome.menu.help.isisfishapi=API ISIS-Fish isisfish.welcome.menu.help.javaapi=API Java isisfish.welcome.menu.help.matrixapi=API NuitonMatrix isisfish.welcome.menu.help.topiaapi=API ToPIA

1 0

r3550 - trunk/src/main/java/fr/ifremer/isisfish/datastore/migration
by echatellier＠users.forge.codelutin.com Dec. 1, 2011

Dec. 1, 2011

Author: echatellier Date: 2011-12-01 15:43:36 +0100 (Thu, 01 Dec 2011) New Revision: 3550 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3550 Log: Migration automatique des ogive de maturit?\195?\169 et du taux de reproduction 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-12-01 13:19:20 UTC (rev 3549) +++ trunk/src/main/java/fr/ifremer/isisfish/datastore/migration/MigrationV33V40.java 2011-12-01 14:43:36 UTC (rev 3550) @@ -27,11 +27,14 @@ import static org.nuiton.i18n.I18n._; +import java.math.BigInteger; import java.util.List; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.hibernate.SQLQuery; +import org.hibernate.Session; import org.nuiton.topia.TopiaException; import org.nuiton.topia.framework.TopiaContextImplementor; import org.nuiton.topia.migration.TopiaMigrationCallbackByClass; @@ -40,6 +43,8 @@ import fr.ifremer.isisfish.IsisFish; import fr.ifremer.isisfish.entities.Equation; +import fr.ifremer.isisfish.entities.Population; +import fr.ifremer.isisfish.entities.PopulationImpl; import fr.ifremer.isisfish.ui.input.EquationEditorPaneUI; import fr.ifremer.isisfish.util.EvaluatorHelper; @@ -73,24 +78,57 @@ protected void prepareMigrationScript(TopiaContextImplementor tx, List<String> queries, boolean showSql, boolean showProgression) throws TopiaException { + + Session session = tx.getHibernate(); + + // get capturability value + SQLQuery query = session.createSQLQuery("SELECT p.topiaid as pop, g.topiaid as popgroup, g.id, (select count(*) FROM POPULATIONGROUP WHERE population = p.topiaid) as c FROM POPULATION p, POPULATIONGROUP g WHERE p.MATURITYGROUP = g.TOPIAID"); + List<Object[]> maturityGroupResult = query.list(); + + // get reproduction rate value + query = session.createSQLQuery("SELECT population, id, REPRODUCTIONRATE FROM POPULATIONGROUP"); + List<Object[]> reproductionResults = query.list(); + // remove maturity group - queries.add("alter table POPULATIONGROUP drop column REPRODUCTIONRATE;"); - queries.add("alter table POPULATION drop column MATURITYGROUP;"); + tx.executeSQL("alter table POPULATIONGROUP drop column REPRODUCTIONRATE;"); + tx.executeSQL("alter table POPULATION drop column MATURITYGROUP;"); // new equation - queries.add("alter table POPULATION add column MATURITYOGIVEEQUATION VARCHAR(255);"); - queries.add("alter table POPULATION add column REPRODUCTIONRATEEQUATION VARCHAR(255);"); + tx.executeSQL("alter table POPULATION add column MATURITYOGIVEEQUATION VARCHAR(255);"); + tx.executeSQL("alter table POPULATION add column REPRODUCTIONRATEEQUATION VARCHAR(255);"); // date > step - queries.add("alter table Result ALTER COLUMN resultdate RENAME TO resultstep;"); - queries.add("alter table ActiveRule ALTER COLUMN activeruledate RENAME TO activerulestep;"); + tx.executeSQL("alter table Result ALTER COLUMN resultdate RENAME TO resultstep;"); + tx.executeSQL("alter table ActiveRule ALTER COLUMN activeruledate RENAME TO activerulestep;"); // capturability equation - queries.add("alter table POPULATION add column CAPTURABILITYEQUATION VARCHAR(255);"); - queries.add("alter table POPULATION add column CAPTURABILITYEQUATIONUSED BIT default false;"); + tx.executeSQL("alter table POPULATION add column CAPTURABILITYEQUATION VARCHAR(255);"); + tx.executeSQL("alter table POPULATION add column CAPTURABILITYEQUATIONUSED BIT default false;"); + // build new equation for maturity group + for (Object[] maturityRow : maturityGroupResult) { + String population = (String)maturityRow[0]; + String populationgroup = (String)maturityRow[1]; + int groupId = (Integer)maturityRow[2]; + int groupCount = ((BigInteger)maturityRow[3]).intValue(); + if (populationgroup != null) { + Population pop = (Population)tx.findByTopiaId(population); + String content = getMaturityEquationContent(groupId, groupCount); + ((PopulationImpl)pop).setMaturityOgiveEquationContent(content); + pop.update(); + } + } + + // build new equation for maturity group and reproduction rate + List<Population> pops = tx.find("from " + Population.class.getName()); + for (Population pop : pops) { + String content = getReproductionRateContent(pop, reproductionResults); + ((PopulationImpl)pop).setReproductionRateEquationContent(content); + pop.update(); + } + + // start equation migration if (IsisFish.config.isLaunchUI()) { - // start equation migration List<Equation> equations = tx.find("from " + Equation.class.getName()); for (Equation equation : equations) { @@ -105,6 +143,7 @@ if (ok != 0) { content = StringUtils.replace(content, "Date ", "TimeStep "); content = StringUtils.replace(content, ".getDate()", ".getStep()"); + content = StringUtils.replace(content, "new Date(", "new TimeStep("); // second compilation ok = EvaluatorHelper.check(equation.getJavaInterface(), content, null); if (ok == 0) { @@ -133,4 +172,57 @@ } } } + + /** + * Return reproduction rate equation content generated from previous group + * reproduction rate fields (v3). + * + * @param pop pop + * @param reproductionResults v3 reproduction rate (gtopiaid, rate); + * @return equation content + */ + protected String getReproductionRateContent(Population pop, List<Object[]> reproductionResults) { + + StringBuffer b = new StringBuffer(); + b.append("if (group == null) return 0;\n"); + b.append("switch (group.getId()) {\n"); + for (Object[] reproContent : reproductionResults) { + String popid = (String)reproContent[0]; + int gid = (Integer)reproContent[1]; + double rate = (Double)reproContent[2]; + if (pop.getTopiaId().equals(popid)) { // take care of current pop only + b.append(" case " + gid + ": return " + rate + ";\n"); + } + } + b.append(" default: return 0;\n"); + b.append("}\n"); + + return b.toString(); + } + + /** + * Return maturity equation content generated from previous + * maturity group (v3) value. + * + * @param groupId previous group id + * @param groupCount population group count + * @return equation content + */ + protected String getMaturityEquationContent(int groupId, int groupCount) { + + StringBuffer b = new StringBuffer(); + b.append("if (group == null) return 0;\n"); + b.append("switch (group.getId()) {\n"); + for (int i = 0 ; i < groupCount; ++i) { + if (i > groupId) { + b.append(" case " + i + ": return 0;\n"); + } else { + b.append(" case " + i + ": return 1;\n"); + } + } + b.append(" default: return 0;\n"); + b.append("}\n"); + + return b.toString(); + } }

1 0