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

r3236 - isis-fish/tags
by chatellier＠users.labs.libre-entreprise.org April 5, 2011

April 5, 2011

Author: chatellier Date: 2011-04-05 12:56:08 +0000 (Tue, 05 Apr 2011) New Revision: 3236 Log: [maven-release-plugin] copy for tag isis-fish-3.3.0.8 Added: isis-fish/tags/isis-fish-3.3.0.8/

1 0

r3235 - isis-fish/trunk
by chatellier＠users.labs.libre-entreprise.org April 5, 2011

April 5, 2011

Author: chatellier Date: 2011-04-05 12:56:04 +0000 (Tue, 05 Apr 2011) New Revision: 3235 Log: [maven-release-plugin] prepare release isis-fish-3.3.0.8 Modified: isis-fish/trunk/pom.xml Modified: isis-fish/trunk/pom.xml =================================================================== --- isis-fish/trunk/pom.xml 2011-04-05 12:34:58 UTC (rev 3234) +++ isis-fish/trunk/pom.xml 2011-04-05 12:56:04 UTC (rev 3235) @@ -11,7 +11,7 @@ <groupId>fr.ifremer</groupId> <artifactId>isis-fish</artifactId> - <version>3.3.0.8-SNAPSHOT</version> + <version>3.3.0.8</version>  <dependencies> @@ -685,9 +685,9 @@   <scm> - <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/isis-fish/isis-fish/trunk</connection> - <developerConnection>scm:svn:svn+ssh://chatellier at labs.libre-entreprise.org/svnroot/isis-fish/isis-fish/trunk</developerConnection> - <url>https://labs.libre-entreprise.org/scm/viewvc.php/isis-fish/trunk/?root=isis…</url> + <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/isis-fish/isis-fish/tags/isis-fish-3.3.0.8</connection> + <developerConnection>scm:svn:svn+ssh://chatellier at labs.libre-entreprise.org/svnroot/isis-fish/isis-fish/tags/isis-fish-3.3.0.8</developerConnection> + <url>https://labs.libre-entreprise.org/scm/viewvc.php/isis-fish/tags/isis-fish-3…</url> </scm> <repositories>

1 0

r3234 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities
by chatellier＠users.labs.libre-entreprise.org April 5, 2011

April 5, 2011

Author: chatellier Date: 2011-04-05 12:34:58 +0000 (Tue, 05 Apr 2011) New Revision: 3234 Log: fix npe in test Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/PopulationSeasonInfoImpl.java Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/PopulationSeasonInfoImpl.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/PopulationSeasonInfoImpl.java 2011-04-05 12:11:10 UTC (rev 3233) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/PopulationSeasonInfoImpl.java 2011-04-05 12:34:58 UTC (rev 3234) @@ -250,7 +250,8 @@ public MatrixND getLengthChangeMatrix() { MatrixND matrix = super.getLengthChangeMatrix(); - if (matrix == null) { + // moved here dur to init bug in isis 3.3.0.x + if (matrix == null && getPopulation() != null) { matrix = createNoSpacializedChangeGroupMatrix(); }

1 0

r3233 - isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui
by chatellier＠users.labs.libre-entreprise.org April 5, 2011

April 5, 2011

Author: chatellier Date: 2011-04-05 12:11:10 +0000 (Tue, 05 Apr 2011) New Revision: 3233 Log: Fix compil issue Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/WelcomeTabUI.jaxx Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/WelcomeTabUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/WelcomeTabUI.jaxx 2011-04-05 12:10:36 UTC (rev 3232) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/WelcomeTabUI.jaxx 2011-04-05 12:11:10 UTC (rev 3233) @@ -25,7 +25,6 @@ <JPanel layout='{new BorderLayout()}'> <import> fr.ifremer.isisfish.ui.simulator.SimulAction; - fr.ifremer.isisfish.ui.result.ResultAction; jaxx.runtime.context.JAXXInitialContext; fr.ifremer.isisfish.ui.input.InputAction; fr.ifremer.isisfish.ui.input.InputSaveVerifier;

1 0

r3232 - isis-fish/branches/3.3.1
by chatellier＠users.labs.libre-entreprise.org April 5, 2011

April 5, 2011

Author: chatellier Date: 2011-04-05 12:10:36 +0000 (Tue, 05 Apr 2011) New Revision: 3232 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-04-05 12:09:37 UTC (rev 3231) +++ isis-fish/branches/3.3.1/pom.xml 2011-04-05 12:10:36 UTC (rev 3232) @@ -249,7 +249,7 @@ <dependency> <groupId>com.h2database</groupId> <artifactId>h2</artifactId> - <version>1.3.153</version> + <version>1.3.154</version> <scope>compile</scope> </dependency>

1 0

r3231 - isis-fish/trunk
by chatellier＠users.labs.libre-entreprise.org April 5, 2011

April 5, 2011

Author: chatellier Date: 2011-04-05 12:09:37 +0000 (Tue, 05 Apr 2011) New Revision: 3231 Log: update changelog Modified: isis-fish/trunk/changelog.txt Modified: isis-fish/trunk/changelog.txt =================================================================== --- isis-fish/trunk/changelog.txt 2011-04-05 12:08:55 UTC (rev 3230) +++ isis-fish/trunk/changelog.txt 2011-04-05 12:09:37 UTC (rev 3231) @@ -2,7 +2,7 @@ * Fix NullPointerException with length change matrix - -- jeu. janv. 20 18:10:02 CET 2011 + -- mar. avril 5 14:14:18 CEST 2011 isis-fish (3.3.0.7) stable; urgency=low

1 0

r3230 - isis-fish/trunk
by chatellier＠users.labs.libre-entreprise.org April 5, 2011

April 5, 2011

Author: chatellier Date: 2011-04-05 12:08:55 +0000 (Tue, 05 Apr 2011) New Revision: 3230 Log: update changelog Modified: isis-fish/trunk/changelog.txt Modified: isis-fish/trunk/changelog.txt =================================================================== --- isis-fish/trunk/changelog.txt 2011-04-05 12:04:21 UTC (rev 3229) +++ isis-fish/trunk/changelog.txt 2011-04-05 12:08:55 UTC (rev 3230) @@ -1,3 +1,9 @@ +isis-fish (3.3.0.8) stable; urgency=low + + * Fix NullPointerException with length change matrix + + -- jeu. janv. 20 18:10:02 CET 2011 + isis-fish (3.3.0.7) stable; urgency=low * Add 64bits launch scripts

1 0

r3229 - in isis-fish/trunk/src/main/java/fr/ifremer/isisfish: entities ui/input
by chatellier＠users.labs.libre-entreprise.org April 5, 2011

April 5, 2011

Author: chatellier Date: 2011-04-05 12:04:21 +0000 (Tue, 05 Apr 2011) New Revision: 3229 Log: Fix null pointer exception with lengthchange matrix Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/PopulationSeasonInfoImpl.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputAction.java Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/PopulationSeasonInfoImpl.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/PopulationSeasonInfoImpl.java 2011-04-01 13:32:46 UTC (rev 3228) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/PopulationSeasonInfoImpl.java 2011-04-05 12:04:21 UTC (rev 3229) @@ -66,7 +66,11 @@ /** to use log facility, just put in your code: log.info(\"...\"); */ private static Log log = LogFactory.getLog(PopulationSeasonInfoImpl.class); - + + public PopulationSeasonInfoImpl() { + setSimpleLengthChangeMatrix(true); + } + /* * @see fr.ifremer.isisfish.entities.PopulationSeasonInfoAbstract#getReproductionDistribution() */ @@ -242,6 +246,17 @@ return result; } + @Override + public MatrixND getLengthChangeMatrix() { + MatrixND matrix = super.getLengthChangeMatrix(); + + if (matrix == null) { + matrix = createNoSpacializedChangeGroupMatrix(); + } + + return matrix; + } + /** * Convert spacialized matrix to non spacialized matrix. * Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputAction.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputAction.java 2011-04-01 13:32:46 UTC (rev 3228) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputAction.java 2011-04-05 12:04:21 UTC (rev 3229) @@ -905,10 +905,10 @@ // d'un populationseasoninfo // il a du se perdre au changement d'interface // swiat>jaxx - seasonInfo.setSimpleLengthChangeMatrix(true); - MatrixND matrix = ((PopulationSeasonInfoImpl) seasonInfo) - .createNoSpacializedChangeGroupMatrix(); - seasonInfo.setLengthChangeMatrix(matrix); + // moved to entity + //MatrixND matrix = ((PopulationSeasonInfoImpl) seasonInfo) + // .createNoSpacializedChangeGroupMatrix(); + //seasonInfo.setLengthChangeMatrix(matrix); seasonInfo.update(); pop.update();

1 0

r3228 - isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/result
by chatellier＠users.labs.libre-entreprise.org April 1, 2011

April 1, 2011

Author: chatellier Date: 2011-04-01 13:32:46 +0000 (Fri, 01 Apr 2011) New Revision: 3228 Log: Unused Removed: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/result/ResultAction.java Deleted: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/result/ResultAction.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/result/ResultAction.java 2011-04-01 12:50:18 UTC (rev 3227) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/result/ResultAction.java 2011-04-01 13:32:46 UTC (rev 3228) @@ -1,71 +0,0 @@ -/* - * #%L - * IsisFish - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2005 - 2010 Ifremer, Code Lutin, Cedric Pineau, Benjamin Poussin - * %% - * 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% - */ -/* *##% - * Copyright (C) 2005 - * Ifremer, Code Lutin, Cedric Pineau, Benjamin Poussin - * - * 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, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ - -/* * - * IsisFish.java - * - * Created: 1 aout 2005 18:37:25 CEST - * - * @author Benjamin POUSSIN <poussin at codelutin.com> - * @version $Revision: 1312 $ - * - * Last update: $Date: 2008-08-28 10:21:07 +0200 (jeu, 28 aoû 2008) $ - * by : $Author: sletellier $ - */ - -package fr.ifremer.isisfish.ui.result; - -import fr.ifremer.isisfish.datastore.SimulationStorage; - -public class ResultAction { - SimulationStorage simulation; - public ResultAction(){ - - } - public void open(String name){ - simulation = SimulationStorage.getSimulation(name); - } - public SimulationStorage getSimulationStorage(){ - return simulation; - } -}

1 0

r3227 - isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/config
by chatellier＠users.labs.libre-entreprise.org April 1, 2011

April 1, 2011

Author: chatellier Date: 2011-04-01 12:50:18 +0000 (Fri, 01 Apr 2011) New Revision: 3227 Log: Remove green color Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/config/RConfigHandler.java Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/config/RConfigHandler.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/config/RConfigHandler.java 2011-04-01 10:15:46 UTC (rev 3226) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/config/RConfigHandler.java 2011-04-01 12:50:18 UTC (rev 3227) @@ -71,7 +71,6 @@ String systemPath = System.getenv("PATH"); String rBinPath = rHome + File.separator + "bin"; if (systemPath.contains(rBinPath)) { - rconfigUI.getSystemPathField().setBackground(Color.GREEN.brighter()); rconfigUI.getSystemPathField().setText(_("isisfish.simulator.configuration.r.systempathok", rBinPath)); } else {

1 0