Author: echatellier Date: 2012-09-25 16:50:02 +0200 (Tue, 25 Sep 2012) New Revision: 3788 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3788 Log: Ajout des champs group min/group max dans le mod?\195?\168le isis. Added: trunk/src/main/java/fr/ifremer/isisfish/datastore/migration/MigrationV41V421.java Modified: trunk/pom.xml trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java trunk/src/main/java/fr/ifremer/isisfish/datastore/migration/DatabaseMigrationClass.java trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationBasicsUI.jaxx trunk/src/main/resources/i18n/isis-fish_en_GB.properties trunk/src/main/resources/i18n/isis-fish_fr_FR.properties trunk/src/main/resources/sensitivity.properties trunk/src/main/xmi/isis-fish.zargo Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-09-20 14:59:43 UTC (rev 3787) +++ trunk/pom.xml 2012-09-25 14:50:02 UTC (rev 3788) @@ -11,7 +11,7 @@ <groupId>fr.ifremer</groupId> <artifactId>isis-fish</artifactId> - <version>4.2.0.2-SNAPSHOT</version> + <version>4.2.1.0-SNAPSHOT</version> <!-- POM Relationships : Inheritance : Dependencies --> <dependencies> Modified: trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java 2012-09-20 14:59:43 UTC (rev 3787) +++ trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java 2012-09-25 14:50:02 UTC (rev 3788) @@ -42,8 +42,6 @@ import org.apache.commons.beanutils.ConvertUtils; import org.apache.commons.lang3.time.DurationFormatUtils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.nuiton.util.ApplicationConfig; import org.nuiton.util.StringUtil; import org.nuiton.util.Version; @@ -71,9 +69,6 @@ * by : $Author: bpoussin $ */ public class IsisConfig extends ApplicationConfig { - - /** to use log facility, just put in your code: log.info(\"...\"); */ - private static Log log = LogFactory.getLog(IsisConfig.class); /** * Config step after init. @@ -119,7 +114,7 @@ * migration de donnees demande automatiquement un changement de version * d'application. */ - protected final static Version version = new Version(4, 2, 0, 1); + protected final static Version version = new Version(4, 2, 1, 0); protected final static Version majorVersion = new Version(version.getNumber(0)); protected final static Version databaseVersion = new Version( @@ -159,7 +154,7 @@ return apiVersion; } - static final public String COPYRIGHT_TEXT = "Version " + getVersion() + " IFREMER-MAERHA © 2000-2011"; + static final public String COPYRIGHT_TEXT = "Version " + getVersion() + " IFREMER-MAERHA © 2000-2012"; static final public String CONFIG_FILENAME = "isis-config-" + majorVersion.toString(); /** separateur de liste */ Modified: trunk/src/main/java/fr/ifremer/isisfish/datastore/migration/DatabaseMigrationClass.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/datastore/migration/DatabaseMigrationClass.java 2012-09-20 14:59:43 UTC (rev 3787) +++ trunk/src/main/java/fr/ifremer/isisfish/datastore/migration/DatabaseMigrationClass.java 2012-09-25 14:50:02 UTC (rev 3788) @@ -51,6 +51,7 @@ protected static final Version VERSION_33 = new Version("3.3"); protected static final Version VERSION_40 = new Version("4.0"); protected static final Version VERSION_41 = new Version("4.1"); + protected static final Version VERSION_421 = new Version("4.2.1"); public DatabaseMigrationClass() { super(new MigrationResolver()); @@ -72,6 +73,8 @@ result = MigrationV33V40.class; } else if (version.equals(VERSION_41)) { result = MigrationV40V41.class; + } else if (version.equals(VERSION_421)) { + result = MigrationV41V421.class; } return result; } @@ -83,7 +86,7 @@ */ @Override public Version[] getAvailableVersions() { - Version[] result = new Version[] { VERSION_32, VERSION_33, VERSION_40, VERSION_41 }; + Version[] result = new Version[] { VERSION_32, VERSION_33, VERSION_40, VERSION_41, VERSION_421}; return result; } Added: trunk/src/main/java/fr/ifremer/isisfish/datastore/migration/MigrationV41V421.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/datastore/migration/MigrationV41V421.java (rev 0) +++ trunk/src/main/java/fr/ifremer/isisfish/datastore/migration/MigrationV41V421.java 2012-09-25 14:50:02 UTC (rev 3788) @@ -0,0 +1,68 @@ +/* + * #%L + * + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2012 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.datastore.migration; + +import java.util.List; + +import org.nuiton.topia.TopiaException; +import org.nuiton.topia.framework.TopiaContextImplementor; +import org.nuiton.topia.migration.TopiaMigrationCallbackByClass; +import org.nuiton.topia.migration.TopiaMigrationCallbackByClass.MigrationCallBackForVersion; +import org.nuiton.util.Version; + +/** + * Migration between version 4.0 and 4.1. + * + * @author chatellier + * @version $Revision$ + * + * Last update : $Date$ + * By : $Author$ + */ +public class MigrationV41V421 extends MigrationCallBackForVersion { + + /** + * Constructor. + * + * @param version version + * @param callback callback + */ + public MigrationV41V421(Version version, TopiaMigrationCallbackByClass callback) { + super(version, callback); + } + + /* + * @see org.nuiton.topia.migration.TopiaMigrationCallbackByClass.MigrationCallBackForVersion#prepareMigrationScript(org.nuiton.topia.framework.TopiaContextImplementor, java.util.List, boolean, boolean) + */ + @Override + protected void prepareMigrationScript(TopiaContextImplementor tx, + List<String> queries, boolean showSql, boolean showProgression) + throws TopiaException { + + queries.add("alter table POPULATION add column groupmin integer default 0;"); + queries.add("alter table POPULATION add column groupmax integer default 0;"); + } +} Property changes on: trunk/src/main/java/fr/ifremer/isisfish/datastore/migration/MigrationV41V421.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationBasicsUI.jaxx =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationBasicsUI.jaxx 2012-09-20 14:59:43 UTC (rev 3787) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationBasicsUI.jaxx 2012-09-25 14:50:02 UTC (rev 3788) @@ -5,7 +5,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2009 - 2011 Ifremer, Code Lutin, Chatellier Eric + Copyright (C) 2009 - 2012 Ifremer, Code Lutin, 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 @@ -145,7 +145,7 @@ <cell anchor='east'> <JLabel text="isisfish.populationBasics.name" enabled='{isActive()}'/> </cell> - <cell columns='2' fill='horizontal' weightx='1.0'> + <cell columns='3' fill='horizontal' weightx='1.0'> <JTextField id="fieldPopulationBasicsName" text='{getBean().getName()}' onKeyReleased='getBean().setName(fieldPopulationBasicsName.getText())' enabled='{isActive()}' decorator='boxed'/> @@ -155,7 +155,7 @@ <cell anchor='east'> <JLabel text="isisfish.populationBasics.geographicID" enabled='{isActive()}'/> </cell> - <cell columns='2' fill='horizontal' weightx='1.0'> + <cell columns='3' fill='horizontal' weightx='1.0'> <JTextField id="fieldPopulationBasicsGeographicID" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getGeographicId())}' onKeyReleased='getBean().setGeographicId(fieldPopulationBasicsGeographicID.getText())' @@ -175,9 +175,7 @@ <JButton id="buttonPopulationBasicsCreateClasses" text="isisfish.populationBasics.recreateClasses" onActionPerformed='createGroups()' enabled='{isActive()}' decorator='boxed'/> </cell> - </row> - <row> - <cell fill='horizontal' columns="3"> + <cell fill='horizontal'> <JCheckBox id="fieldPopulationBasicsPlusGroup" text="isisfish.populationBasics.plusGroup" toolTipText="isisfish.populationBasics.plusGroupTip" selected='{getBean().getPlusGroup()}' @@ -186,12 +184,36 @@ </cell> </row> <row> - <cell columns='3' fill='both' weightx='1.0'> + <cell anchor='east' insets="0"> + <JLabel text="isisfish.populationBasics.groupMin" enabled='{isActive()}'/> + </cell> + <cell fill='horizontal' columns='3' insets="0"> + <Table> + <row> + <cell fill='horizontal' weightx='1.0'> + <JTextField id="fieldPopulationGroupMin" text='{String.valueOf(getBean().getGroupMin())}' + onKeyReleased='getBean().setGroupMin(Integer.parseInt(fieldPopulationGroupMin.getText()))' + enabled='{isActive()}' decorator='boxed' _sensitivityBean='{Population.class}' _sensitivityMethod='"MinAge"'/> + </cell> + <cell> + <JLabel text="isisfish.populationBasics.groupMax" enabled='{isActive()}'/> + </cell> + <cell fill='horizontal' weightx='1.0'> + <JTextField id="fieldPopulationGroupMax" text='{String.valueOf(getBean().getGroupMax())}' + onKeyReleased='getBean().setGroupMax(Integer.parseInt(fieldPopulationGroupMax.getText()))' + enabled='{isActive()}' decorator='boxed' _sensitivityBean='{Population.class}' _sensitivityMethod='"MaxAge"'/> + </cell> + </row> + </Table> + </cell> + </row> + <row> + <cell columns='4' fill='both' weightx='1.0'> <JTable id='tableAgeLength' rowHeight='24' enabled='false' decorator='boxed'/> </cell> </row> <row> - <cell columns='3' fill='both' weightx='1.0' weighty='1.0'> + <cell columns='4' fill='both' weightx='1.0' weighty='1.0'> <InputOneEquationUI id='growthEquation' constructorParams='this' text='isisfish.populationBasics.growth' active='{isActive()}' bean='{getBean()}' beanProperty='growth' formuleCategory='Growth' @@ -200,7 +222,7 @@ </cell> </row> <row> - <cell columns='3' fill='both' weightx='1.0' weighty='1.0'> + <cell columns='4' fill='both' weightx='1.0' weighty='1.0'> <InputOneEquationUI id='growthReverseEquation' constructorParams='this' text='isisfish.populationBasics.growthReverse' active='{isActive()}' bean='{getBean()}' formuleCategory='GrowthReverse' beanProperty='GrowthReverse' @@ -212,7 +234,7 @@ <cell anchor='east'> <JLabel text="isisfish.population.comments" enabled='{isActive()}'/> </cell> - <cell columns='2' fill='both' weightx='1.0' weighty='1.0'> + <cell columns='3' fill='both' weightx='1.0' weighty='1.0'> <JScrollPane> <JTextArea id="fieldPopulationBasicsComment" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getComment())}' Modified: trunk/src/main/resources/i18n/isis-fish_en_GB.properties =================================================================== --- trunk/src/main/resources/i18n/isis-fish_en_GB.properties 2012-09-20 14:59:43 UTC (rev 3787) +++ trunk/src/main/resources/i18n/isis-fish_en_GB.properties 2012-09-25 14:50:02 UTC (rev 3788) @@ -668,6 +668,8 @@ isisfish.population.zones=Zones isisfish.populationBasics.confirmCreateGroups=Warning, running groups creation wizard will delete all existing groups and objects which depend on it.\nDo you want to re-create groups ? isisfish.populationBasics.geographicID=Geographic identifier +isisfish.populationBasics.groupMax=Max group +isisfish.populationBasics.groupMin=Min group isisfish.populationBasics.growth=Growth isisfish.populationBasics.growthReverse=Reverse growth isisfish.populationBasics.name=Name Modified: trunk/src/main/resources/i18n/isis-fish_fr_FR.properties =================================================================== --- trunk/src/main/resources/i18n/isis-fish_fr_FR.properties 2012-09-20 14:59:43 UTC (rev 3787) +++ trunk/src/main/resources/i18n/isis-fish_fr_FR.properties 2012-09-25 14:50:02 UTC (rev 3788) @@ -668,6 +668,8 @@ isisfish.population.zones=Zones isisfish.populationBasics.confirmCreateGroups=Attention, la re-création des groupes supprimera les groupes existants et tous les objets qui en dépendent.\nÊtes vous sur de vouloir re-créer les groupes ? isisfish.populationBasics.geographicID=Identifiant géographique +isisfish.populationBasics.groupMax=Group max +isisfish.populationBasics.groupMin=Group min isisfish.populationBasics.growth=Croissance isisfish.populationBasics.growthReverse=Croissance inverse isisfish.populationBasics.name=Nom Modified: trunk/src/main/resources/sensitivity.properties =================================================================== --- trunk/src/main/resources/sensitivity.properties 2012-09-20 14:59:43 UTC (rev 3787) +++ trunk/src/main/resources/sensitivity.properties 2012-09-25 14:50:02 UTC (rev 3788) @@ -41,7 +41,9 @@ Population.growth Population.growthReverse Population.maturityOgiveEquation +Population.maxAge Population.meanWeight +Population.minAge Population.monthGapBetweenReproRecrutement Population.naturalDeathRate Population.price Modified: trunk/src/main/xmi/isis-fish.zargo =================================================================== (Binary files differ)