Isis-fish-commits
Threads by month
- ----- 2026 -----
- June
- May
- April
- March
- February
- January
- ----- 2025 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2024 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2010 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2009 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2008 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2007 -----
- December
- November
- 3175 discussions
r3229 - in isis-fish/trunk/src/main/java/fr/ifremer/isisfish: entities ui/input
by chatellier@users.labs.libre-entreprise.org 05 Apr '11
by chatellier@users.labs.libre-entreprise.org 05 Apr '11
05 Apr '11
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 01 Apr '11
by chatellier@users.labs.libre-entreprise.org 01 Apr '11
01 Apr '11
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 01 Apr '11
by chatellier@users.labs.libre-entreprise.org 01 Apr '11
01 Apr '11
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
r3226 - in isis-fish/branches/3.3.1: . src/main/java/fr/ifremer/isisfish/datastore/migration src/main/java/fr/ifremer/isisfish/simulator src/main/java/fr/ifremer/isisfish/simulator/sensitivity src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain src/main/java/fr/ifremer/isisfish/ui/input/tree src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors src/main/java/fr/ifremer/isisfish/ui/models src/main/java/fr/ifremer/isisfish/ui/sensitivity src/test/java/fr/ifremer/isisfish/mexic
by chatellier@users.labs.libre-entreprise.org 01 Apr '11
by chatellier@users.labs.libre-entreprise.org 01 Apr '11
01 Apr '11
Author: chatellier
Date: 2011-04-01 10:15:46 +0000 (Fri, 01 Apr 2011)
New Revision: 3226
Log:
Move next version to 3.4.0.0
Removed:
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/models/simulation/
Modified:
isis-fish/branches/3.3.1/changelog.txt
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/migration/MigrationV33V34.java
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameterImpl.java
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/Domain.java
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/FactorGroup.java
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/ui/input/tree/FisheryDataProvider.java
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/FisheryTreeHelper.java
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/FisheryTreeNode.java
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/FisheryTreeRenderer.java
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/CellsNodeLoador.java
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/GearsNodeLoador.java
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/MetiersNodeLoador.java
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/PopulationsNodeLoador.java
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/PortsNodeLoador.java
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/SetOfVesselsNodeLoador.java
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/SpeciesNodeLoador.java
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/StrategiesNodeLoador.java
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/TripTypesNodeLoador.java
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/VesselTypesNodeLoador.java
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/ZonesNodeLoador.java
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivitySecondPassUI.jaxx
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
Modified: isis-fish/branches/3.3.1/changelog.txt
===================================================================
--- isis-fish/branches/3.3.1/changelog.txt 2011-04-01 10:05:07 UTC (rev 3225)
+++ isis-fish/branches/3.3.1/changelog.txt 2011-04-01 10:15:46 UTC (rev 3226)
@@ -1,5 +1,6 @@
-isis-fish (3.3.1.0-rc1) stable; urgency=low
+isis-fish (3.4.0.0-rc1) stable; urgency=low
+ * Remove maturity group unique constraints
* Add view to test R configuration
* Disable charset converter (need to be retested)
* Add a new button to check all script in one action in script UI
Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/migration/MigrationV33V34.java
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/migration/MigrationV33V34.java 2011-04-01 10:05:07 UTC (rev 3225)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/migration/MigrationV33V34.java 2011-04-01 10:15:46 UTC (rev 3226)
@@ -34,7 +34,7 @@
import org.nuiton.util.Version;
/**
- * Migration between version 3.3 and 3.3.1
+ * Migration between version 3.3 and 3.4.
*
* @author chatellier
* @version $Revision$
Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameterImpl.java
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameterImpl.java 2011-04-01 10:05:07 UTC (rev 3225)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameterImpl.java 2011-04-01 10:15:46 UTC (rev 3226)
@@ -1451,7 +1451,7 @@
*
* @param key key
* @param value value
- * @since 3.3.1.0
+ * @since 3.4.0.0
*/
public void setProperty(String key, String value) {
propertiesParameters.setProperty(key, value);
Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/Domain.java
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/Domain.java 2011-04-01 10:05:07 UTC (rev 3225)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/Domain.java 2011-04-01 10:15:46 UTC (rev 3226)
@@ -65,7 +65,7 @@
*
* @param valueIdentifier
* @return computed value for domain
- * @since 3.3.1.0
+ * @since 3.4.0.0
*/
public Object getComputedValueForIdentifier(Object valueIdentifier);
Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/FactorGroup.java
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/FactorGroup.java 2011-04-01 10:05:07 UTC (rev 3225)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/FactorGroup.java 2011-04-01 10:15:46 UTC (rev 3226)
@@ -46,7 +46,7 @@
* @author chatellier
* @version $Revision$
*
- * @since 3.3.1.0
+ * @since 3.4.0.0
*
* Last update : $Date$
* By : $Author$
Modified: 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-04-01 10:05:07 UTC (rev 3225)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/RuleDomain.java 2011-04-01 10:15:46 UTC (rev 3226)
@@ -33,7 +33,7 @@
* @author chatellier
* @version $Revision$
*
- * @since 3.3.1.0
+ * @since 3.4.0.0
*
* Last update : $Date$
* By : $Author$
Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/FisheryDataProvider.java
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/FisheryDataProvider.java 2011-04-01 10:05:07 UTC (rev 3225)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/FisheryDataProvider.java 2011-04-01 10:15:46 UTC (rev 3226)
@@ -31,6 +31,7 @@
*
* @author chatellier
* @version $Revision$
+ * @since 3.4.0.0
*
* Last update : $Date$
* By : $Author$
Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/FisheryTreeHelper.java
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/FisheryTreeHelper.java 2011-04-01 10:05:07 UTC (rev 3225)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/FisheryTreeHelper.java 2011-04-01 10:15:46 UTC (rev 3226)
@@ -53,7 +53,7 @@
* Fishery region tree helpers.
*
* @author chatellier
- * @since 3.3.1
+ * @since 3.4.0.0
*/
public class FisheryTreeHelper extends NavTreeHelper<FisheryTreeNode> {
Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/FisheryTreeNode.java
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/FisheryTreeNode.java 2011-04-01 10:05:07 UTC (rev 3225)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/FisheryTreeNode.java 2011-04-01 10:15:46 UTC (rev 3226)
@@ -31,6 +31,7 @@
*
* @author chatellier
* @version $Revision$
+ * @since 3.4.0.0
*
* Last update : $Date$
* By : $Author$
Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/FisheryTreeRenderer.java
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/FisheryTreeRenderer.java 2011-04-01 10:05:07 UTC (rev 3225)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/FisheryTreeRenderer.java 2011-04-01 10:15:46 UTC (rev 3226)
@@ -54,6 +54,7 @@
*
* @author chatellier
* @version $Revision$
+ * @since 3.4.0.0
*
* Last update : $Date$
* By : $Author$
Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/CellsNodeLoador.java
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/CellsNodeLoador.java 2011-04-01 10:05:07 UTC (rev 3225)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/CellsNodeLoador.java 2011-04-01 10:15:46 UTC (rev 3226)
@@ -35,7 +35,7 @@
* Cell tree path node loader.
*
* @author chatellier
- * @since 3.3.1
+ * @since 3.4.0.0
*/
public class CellsNodeLoador extends NavTreeNodeChildLoador<Cell, Cell, FisheryTreeNode> {
Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/GearsNodeLoador.java
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/GearsNodeLoador.java 2011-04-01 10:05:07 UTC (rev 3225)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/GearsNodeLoador.java 2011-04-01 10:15:46 UTC (rev 3226)
@@ -35,7 +35,7 @@
* Gear tree path node loader.
*
* @author chatellier
- * @since 3.3.1
+ * @since 3.4.0.0
*/
public class GearsNodeLoador extends NavTreeNodeChildLoador<Gear, Gear, FisheryTreeNode> {
Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/MetiersNodeLoador.java
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/MetiersNodeLoador.java 2011-04-01 10:05:07 UTC (rev 3225)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/MetiersNodeLoador.java 2011-04-01 10:15:46 UTC (rev 3226)
@@ -35,7 +35,7 @@
* Metier tree path node loader.
*
* @author chatellier
- * @since 3.3.1
+ * @since 3.4.0.0
*/
public class MetiersNodeLoador extends NavTreeNodeChildLoador<Metier, Metier, FisheryTreeNode> {
Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/PopulationsNodeLoador.java
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/PopulationsNodeLoador.java 2011-04-01 10:05:07 UTC (rev 3225)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/PopulationsNodeLoador.java 2011-04-01 10:15:46 UTC (rev 3226)
@@ -35,7 +35,7 @@
* SetOfVessels tree path node loader.
*
* @author chatellier
- * @since 3.3.1
+ * @since 3.4.0.0
*/
public class PopulationsNodeLoador extends NavTreeNodeChildLoador<Population, Population, FisheryTreeNode> {
Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/PortsNodeLoador.java
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/PortsNodeLoador.java 2011-04-01 10:05:07 UTC (rev 3225)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/PortsNodeLoador.java 2011-04-01 10:15:46 UTC (rev 3226)
@@ -35,7 +35,7 @@
* Port tree path node loader.
*
* @author chatellier
- * @since 3.3.1
+ * @since 3.4.0.0
*/
public class PortsNodeLoador extends NavTreeNodeChildLoador<Port, Port, FisheryTreeNode> {
Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/SetOfVesselsNodeLoador.java
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/SetOfVesselsNodeLoador.java 2011-04-01 10:05:07 UTC (rev 3225)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/SetOfVesselsNodeLoador.java 2011-04-01 10:15:46 UTC (rev 3226)
@@ -35,7 +35,7 @@
* SetOfVessels tree path node loader.
*
* @author chatellier
- * @since 3.3.1
+ * @since 3.4.0.0
*/
public class SetOfVesselsNodeLoador extends NavTreeNodeChildLoador<SetOfVessels, SetOfVessels, FisheryTreeNode> {
Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/SpeciesNodeLoador.java
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/SpeciesNodeLoador.java 2011-04-01 10:05:07 UTC (rev 3225)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/SpeciesNodeLoador.java 2011-04-01 10:15:46 UTC (rev 3226)
@@ -38,7 +38,7 @@
* Species tree path node loader.
*
* @author chatellier
- * @since 3.3.1
+ * @since 3.4.0.0
*/
public class SpeciesNodeLoador extends NavTreeNodeChildLoador<Species, Species, FisheryTreeNode> {
Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/StrategiesNodeLoador.java
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/StrategiesNodeLoador.java 2011-04-01 10:05:07 UTC (rev 3225)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/StrategiesNodeLoador.java 2011-04-01 10:15:46 UTC (rev 3226)
@@ -35,7 +35,7 @@
* Strategy tree path node loader.
*
* @author chatellier
- * @since 3.3.1
+ * @since 3.4.0.0
*/
public class StrategiesNodeLoador extends NavTreeNodeChildLoador<Strategy, Strategy, FisheryTreeNode> {
Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/TripTypesNodeLoador.java
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/TripTypesNodeLoador.java 2011-04-01 10:05:07 UTC (rev 3225)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/TripTypesNodeLoador.java 2011-04-01 10:15:46 UTC (rev 3226)
@@ -35,7 +35,7 @@
* TripType tree path node loader.
*
* @author chatellier
- * @since 3.3.1
+ * @since 3.4.0.0
*/
public class TripTypesNodeLoador extends NavTreeNodeChildLoador<TripType, TripType, FisheryTreeNode> {
Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/VesselTypesNodeLoador.java
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/VesselTypesNodeLoador.java 2011-04-01 10:05:07 UTC (rev 3225)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/VesselTypesNodeLoador.java 2011-04-01 10:15:46 UTC (rev 3226)
@@ -35,7 +35,7 @@
* VesselType tree path node loader.
*
* @author chatellier
- * @since 3.3.1
+ * @since 3.4.0.0
*/
public class VesselTypesNodeLoador extends NavTreeNodeChildLoador<VesselType, VesselType, FisheryTreeNode> {
Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/ZonesNodeLoador.java
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/ZonesNodeLoador.java 2011-04-01 10:05:07 UTC (rev 3225)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/ZonesNodeLoador.java 2011-04-01 10:15:46 UTC (rev 3226)
@@ -35,7 +35,7 @@
* Zone tree path node loader.
*
* @author chatellier
- * @since 3.3.1
+ * @since 3.4.0.0
*/
public class ZonesNodeLoador extends NavTreeNodeChildLoador<Zone, Zone, FisheryTreeNode> {
Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivitySecondPassUI.jaxx
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivitySecondPassUI.jaxx 2011-04-01 10:05:07 UTC (rev 3225)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivitySecondPassUI.jaxx 2011-04-01 10:15:46 UTC (rev 3226)
@@ -5,7 +5,7 @@
$Id$
$HeadURL$
%%
- Copyright (C) 2009 - 2010 Ifremer, CodeLutin
+ 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
@@ -24,21 +24,20 @@
-->
<Table>
<import>
- java.util.ArrayList;
- java.io.File;
- org.nuiton.util.FileUtil;
- fr.ifremer.isisfish.ui.simulator.SimulAction;
- fr.ifremer.isisfish.datastore.SimulationStorage;
- fr.ifremer.isisfish.simulator.launcher.SimulationService;
- fr.ifremer.isisfish.simulator.launcher.SimulationJob;
- fr.ifremer.isisfish.simulator.launcher.SimulationServiceListener;
- fr.ifremer.isisfish.ui.models.simulation.SimulationNamesComboModel;
- javax.swing.ComboBoxModel
+ java.util.ArrayList
+ java.io.File
java.io.IOException
+ javax.swing.ComboBoxModel
+ org.nuiton.util.FileUtil
+ fr.ifremer.isisfish.datastore.SimulationStorage
+ fr.ifremer.isisfish.simulator.launcher.SimulationService
+ fr.ifremer.isisfish.simulator.launcher.SimulationJob
+ fr.ifremer.isisfish.simulator.launcher.SimulationServiceListener
+ fr.ifremer.isisfish.ui.simulator.SimulAction
+ fr.ifremer.isisfish.ui.models.common.StringListModel
</import>
+
<script><![CDATA[
-
-
// declaration sépérée de la variable d'instance (jaxx)
SimulationServiceListener simulationListener;
@@ -68,7 +67,7 @@
/**
* Model de contenu de la liste des nom de simulations
*/
- public ComboBoxModel getSensitivitySimulationModel() {
+ public StringListModel getSensitivitySimulationModel() {
java.util.List<String> asNames = new ArrayList<String>();
for (String simulationName : SimulationStorage.getSimulationNames()) {
if (simulationName.startsWith("as_")) {
@@ -79,7 +78,7 @@
}
}
- SimulationNamesComboModel model = new SimulationNamesComboModel(asNames);
+ StringListModel model = new StringListModel(asNames);
return model;
}
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-04-01 10:05:07 UTC (rev 3225)
+++ isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/mexico/MexicoHelperTest.java 2011-04-01 10:15:46 UTC (rev 3226)
@@ -168,7 +168,7 @@
domain6.setValues(rules);
factorRuleDiscrete.setDomain(domain6);
- // 3.3.1.0
+ // 3.4.0.0
if (useGroupAndRule) {
FactorGroup group1 = new FactorGroup("discretegrp");
group1.addFactor(factorDiscrete);
@@ -280,7 +280,7 @@
/**
* Test le chargement des groupes de facteurs et des facteurs de type
- * regles depuis isis 3.3.1.0.
+ * regles depuis isis 3.4.0.0.
*
* @throws IOException
* @throws IsisFishException
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-04-01 10:05:07 UTC (rev 3225)
+++ isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceTest.java 2011-04-01 10:15:46 UTC (rev 3226)
@@ -355,7 +355,7 @@
/**
* Test que la generation du prescript avec l'ajout des populations
- * de départ et des regles de IsisFish 3.3.1.0 fonctionne correctement.
+ * de départ et des regles de IsisFish 3.4.0.0 fonctionne correctement.
*
* @throws IsisFishException
*/
@@ -413,7 +413,7 @@
/**
* Test que la generation du prescript avec l'ajout des groupes des facteurs
- * depuis IsisFish 3.3.1.0 fonctionne correctement.
+ * depuis IsisFish 3.4.0.0 fonctionne correctement.
*
* @throws IsisFishException
*/
1
0
r3225 - in isis-fish/branches/3.3.1: . src/main/java/fr/ifremer/isisfish src/main/java/fr/ifremer/isisfish/datastore/migration src/main/xmi
by chatellier@users.labs.libre-entreprise.org 01 Apr '11
by chatellier@users.labs.libre-entreprise.org 01 Apr '11
01 Apr '11
Author: chatellier
Date: 2011-04-01 10:05:07 +0000 (Fri, 01 Apr 2011)
New Revision: 3225
Log:
Move next version to 3.4.0.0
Added:
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/migration/MigrationV33V34.java
Removed:
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/migration/MigrationV33V331.java
Modified:
isis-fish/branches/3.3.1/pom.xml
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/IsisConfig.java
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/migration/DatabaseMigrationClass.java
isis-fish/branches/3.3.1/src/main/xmi/isis-fish.zargo
Modified: isis-fish/branches/3.3.1/pom.xml
===================================================================
--- isis-fish/branches/3.3.1/pom.xml 2011-04-01 09:54:55 UTC (rev 3224)
+++ isis-fish/branches/3.3.1/pom.xml 2011-04-01 10:05:07 UTC (rev 3225)
@@ -11,7 +11,7 @@
<groupId>fr.ifremer</groupId>
<artifactId>isis-fish</artifactId>
- <version>3.3.1.0-SNAPSHOT</version>
+ <version>3.4.0.0-SNAPSHOT</version>
<!-- POM Relationships : Inheritance : Dependencies -->
<dependencies>
Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/IsisConfig.java
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/IsisConfig.java 2011-04-01 09:54:55 UTC (rev 3224)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/IsisConfig.java 2011-04-01 10:05:07 UTC (rev 3225)
@@ -120,7 +120,7 @@
* migration de donnees demande automatiquement un changement de version
* d'application.
*/
- protected final static Version version = new Version(3, 3, 1, 0);
+ protected final static Version version = new Version(3, 4, 0, 0);
protected final static Version databaseVersion = new Version(
version.getNumber(0), version.getNumber(1));
protected final static Version apiVersion = new Version(
Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/migration/DatabaseMigrationClass.java
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/migration/DatabaseMigrationClass.java 2011-04-01 09:54:55 UTC (rev 3224)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/migration/DatabaseMigrationClass.java 2011-04-01 10:05:07 UTC (rev 3225)
@@ -49,7 +49,7 @@
protected static final Version VERSION_32 = new Version("3.2");
protected static final Version VERSION_33 = new Version("3.3");
- protected static final Version VERSION_331 = new Version("3.3.1");
+ protected static final Version VERSION_34 = new Version("3.4");
public DatabaseMigrationClass() {
super(new MigrationResolver());
@@ -69,8 +69,8 @@
else if (version.equals(VERSION_33)) {
result = MigrationV32V33.class;
}
- else if (version.equals(VERSION_331)) {
- result = MigrationV33V331.class;
+ else if (version.equals(VERSION_34)) {
+ result = MigrationV33V34.class;
}
return result;
}
@@ -82,7 +82,7 @@
*/
@Override
public Version[] getAvailableVersions() {
- Version[] result = new Version[] { VERSION_32, VERSION_33, VERSION_331 };
+ Version[] result = new Version[] { VERSION_32, VERSION_33, VERSION_34 };
return result;
}
Deleted: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/migration/MigrationV33V331.java
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/migration/MigrationV33V331.java 2011-04-01 09:54:55 UTC (rev 3224)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/migration/MigrationV33V331.java 2011-04-01 10:05:07 UTC (rev 3225)
@@ -1,70 +0,0 @@
-/*
- * #%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 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 3.3 and 3.3.1
- *
- * @author chatellier
- * @version $Revision$
- *
- * Last update : $Date$
- * By : $Author$
- */
-public class MigrationV33V331 extends MigrationCallBackForVersion {
-
- /**
- * Constructor.
- *
- * @param version version
- * @param callback callback
- */
- public MigrationV33V331(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 {
- // remove maturity group
- // CONSTRAINT_0 est la nom généré de la constainte d'unicité
- // sur les maturityGroup
- // en v3.3, il n'y a qu'une contrainte sur la table population
- queries.add("ALTER TABLE POPULATION DROP CONSTRAINT IF EXISTS CONSTRAINT_0;");
- }
-}
Copied: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/migration/MigrationV33V34.java (from rev 3222, isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/migration/MigrationV33V331.java)
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/migration/MigrationV33V34.java (rev 0)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/migration/MigrationV33V34.java 2011-04-01 10:05:07 UTC (rev 3225)
@@ -0,0 +1,70 @@
+/*
+ * #%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 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 3.3 and 3.3.1
+ *
+ * @author chatellier
+ * @version $Revision$
+ *
+ * Last update : $Date$
+ * By : $Author$
+ */
+public class MigrationV33V34 extends MigrationCallBackForVersion {
+
+ /**
+ * Constructor.
+ *
+ * @param version version
+ * @param callback callback
+ */
+ public MigrationV33V34(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 {
+ // remove maturity group
+ // CONSTRAINT_0 est la nom généré de la constainte d'unicité
+ // sur les maturityGroup
+ // en v3.3, il n'y a qu'une contrainte sur la table population
+ queries.add("ALTER TABLE POPULATION DROP CONSTRAINT IF EXISTS CONSTRAINT_0;");
+ }
+}
Modified: isis-fish/branches/3.3.1/src/main/xmi/isis-fish.zargo
===================================================================
(Binary files differ)
1
0
r3224 - in isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish: datastore simulator ui ui/input ui/models/common ui/models/result ui/models/sensitivityexport ui/sensitivity ui/simulator
by chatellier@users.labs.libre-entreprise.org 01 Apr '11
by chatellier@users.labs.libre-entreprise.org 01 Apr '11
01 Apr '11
Author: chatellier
Date: 2011-04-01 09:54:55 +0000 (Fri, 01 Apr 2011)
New Revision: 3224
Log:
Code style, remove deprecated stuff.
Removed:
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/models/result/ResultListModel.java
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/models/sensitivityexport/SensitivityExportNameListModel.java
Modified:
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/ResultStorage.java
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/PopulationMonitor.java
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/StatusBarUI.jaxx
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/CellUI.jaxx
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescriptionParametersUI.jaxx
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescriptionUI.jaxx
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/FisheryRegionUI.jaxx
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/GearTabUI.jaxx
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/GearUI.jaxx
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.jaxx
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/InputHandler.java
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/InputSaveVerifier.java
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/InputTabbedPaneListener.java
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesEditorUI.jaxx
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesUI.jaxx
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoZoneUI.jaxx
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/MetierTabUI.jaxx
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/MetierUI.jaxx
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationBasicsUI.jaxx
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationCapturabilityUI.jaxx
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationEquationUI.jaxx
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationGroupUI.jaxx
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEmigrationUI.jaxx
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEquationUI.jaxx
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationImmigrationUI.jaxx
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationMigrationUI.jaxx
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationUI.jaxx
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationRecruitmentUI.jaxx
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonSpacializedUI.jaxx
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonsUI.jaxx
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationUI.jaxx
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationZonesEditorUI.jaxx
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationZonesUI.jaxx
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PortUI.jaxx
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/RangeOfValuesUI.jaxx
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityEditorUI.jaxx
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityUI.jaxx
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsBasicsUI.jaxx
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsUI.jaxx
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/SpeciesStructuredUI.jaxx
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/SpeciesUI.jaxx
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/StrategyMonthInfoUI.jaxx
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/StrategyOneMonthInfoUI.jaxx
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/StrategyTabUI.jaxx
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/StrategyUI.jaxx
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/TripTypeUI.jaxx
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/VesselTypeUI.jaxx
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/WizardGroupCreationUI.jaxx
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/models/common/StringListModel.java
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityChooserUI.jaxx
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/SensitivityTabbedPaneListener.java
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/ResultChoiceUI.jaxx
Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/ResultStorage.java
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/ResultStorage.java 2011-03-31 16:06:07 UTC (rev 3223)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/ResultStorage.java 2011-04-01 09:54:55 UTC (rev 3224)
@@ -5,7 +5,7 @@
* $Id$
* $HeadURL$
* %%
- * Copyright (C) 2002 - 2010 Ifremer, Code Lutin, Cédric Pineau, Benjamin Poussin
+ * Copyright (C) 2002 - 2011 Ifremer, Code Lutin, Cédric Pineau, Benjamin Poussin, 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
@@ -93,10 +93,10 @@
transient protected Set<String> enabledResult = null;
/**
- * Les ResultStorage ne doivent pas etre instancier directement, mais
- * recuperer a partir d'un
- * {@link fr.ifremer.isisfish.datastore.SimulationStorage#getResultStorage()}
- */
+ * Les ResultStorage ne doivent pas etre instancier directement, mais
+ * recuperer a partir d'un
+ * {@link fr.ifremer.isisfish.datastore.SimulationStorage#getResultStorage()}
+ */
public ResultStorage(SimulationStorage simulation) {
this.simulation = simulation;
}
@@ -327,9 +327,9 @@
protected void doAddResult(Date date, String name, MatrixND mat, TopiaContext tx) throws IsisFishException{
// si la matrice n'a pas de semantique on refuse
- for (int i=0; i<mat.getNbDim(); i++) {
+ for (int i=0; i<mat.getDimCount(); i++) {
// la semantique n'est pas bonne des qu'il y a un null dedans
- if (mat.getSemantics(i).contains(null)) {
+ if (mat.getSemantic(i).contains(null)) {
throw new SimulationException("Erreur le résultat que vous souhaitez enregistrer n'a pas d'information convenable pour la dimension: " + i + " " + mat.getDimensionName(i) );
}
}
@@ -586,7 +586,7 @@
MatrixND mat = (MatrixND)results.get(0).getMatrix();
// recuperation des noms des dimensions
- String [] dimNames = new String[1 + mat.getNbDim()];
+ String [] dimNames = new String[1 + mat.getDimCount()];
dimNames[0] = _("isisfish.common.date");
for (int i=1; i<dimNames.length; i++) {
dimNames[i] = mat.getDimensionName(i-1);
@@ -594,7 +594,7 @@
// creation de la semantique pour la matrice resultat. +1 pour les dates
- List [] sem = new List[1 + mat.getNbDim()];
+ List[] sem = new List[1 + mat.getDimCount()];
sem[0] = dates;
for (int i=1; i<sem.length; i++) {
@@ -607,8 +607,8 @@
log.trace("Ajout de la semantics: "+ Arrays.asList(mattmp.getSemantics()));
}
- for (int s=0; s<mattmp.getNbDim(); s++) {
- sem[s+1].addAll(mattmp.getSemantics(s));
+ for (int s=0; s<mattmp.getDimCount(); s++) {
+ sem[s+1].addAll(mattmp.getSemantic(s));
}
}
Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/PopulationMonitor.java
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/PopulationMonitor.java 2011-03-31 16:06:07 UTC (rev 3223)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/PopulationMonitor.java 2011-04-01 09:54:55 UTC (rev 3224)
@@ -5,7 +5,7 @@
* $Id$
* $HeadURL$
* %%
- * Copyright (C) 2006 - 2010 Ifremer, Code Lutin, Cédric Pineau, Benjamin Poussin
+ * Copyright (C) 2006 - 2011 Ifremer, Code Lutin, Cédric Pineau, Benjamin Poussin, 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
@@ -159,8 +159,8 @@
if (result != null) {
// change semantics with list from argument to ensure that
// semantics don't used too old context
- result.setSemantics(0, pop.getPopulationGroup());
- result.setSemantics(1, pop.getPopulationZone());
+ result.setSemantic(0, pop.getPopulationGroup());
+ result.setSemantic(1, pop.getPopulationZone());
}
return result;
@@ -173,14 +173,20 @@
/**
* Return reproduction.
*
- * @return the reproduction.
+ * @param date date
+ * @param pop population
+ * @return the reproduction
*/
public MatrixND getReproduction(Date date, Population pop) {
return this.reproductions.get(pop).get(date);
}
/**
- * @param repro The reproduction to set.
+ * Set new reproduction.
+ *
+ * @param date date
+ * @param pop population
+ * @param repro reproduction to set
*/
public void setReproduction(Date date, Population pop, MatrixND repro) {
reproductions.get(pop).put(date, repro);
@@ -260,7 +266,7 @@
MatrixND matRepro = repro.copy();
matRepro = matRepro.mults(coeff);
- matRepro.setSemantics(0, zoneRepros);
+ matRepro.setSemantic(0, zoneRepros);
MatrixND mapping = pop.getMappingZoneReproZoneRecru();
for (Zone zoneRepro : zoneRepros) {
Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/StatusBarUI.jaxx
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/StatusBarUI.jaxx 2011-03-31 16:06:07 UTC (rev 3223)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/StatusBarUI.jaxx 2011-04-01 09:54:55 UTC (rev 3224)
@@ -59,7 +59,7 @@
toolTipText="Stop the process" />
</cell> -->
<cell fill="both">
- <org.nuiton.widget.StatusBar />
+ <jaxx.runtime.swing.StatusMessagePanel />
</cell>
</row>
</Table>
\ No newline at end of file
Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/CellUI.jaxx
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/CellUI.jaxx 2011-03-31 16:06:07 UTC (rev 3223)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/CellUI.jaxx 2011-04-01 09:54:55 UTC (rev 3224)
@@ -61,7 +61,7 @@
for (Cell c : cellMap.getSelectedCells()) {
if (getBean() != null) {
if (!c.getTopiaId().equals(getBean().getTopiaId())) {
- jaxx.runtime.SwingUtil.fillComboBox(fieldCell,getRegion().getCell(), c);
+ jaxx.runtime.SwingUtil.fillComboBox(fieldCell,getFisheryRegion().getCell(), c);
result = true;
}
}
@@ -87,16 +87,15 @@
}
if (evt.getNewValue() != null) {
cellChanged = false;
- jaxx.runtime.SwingUtil.fillComboBox(fieldCell, getRegion().getCell(), getBean());
+ jaxx.runtime.SwingUtil.fillComboBox(fieldCell, getFisheryRegion().getCell(), getBean());
cellChanged = true;
}
}
});
}
- at Override
-public void refresh() {
- Cell cell = getVerifier().getEntity(Cell.class);
+/*public void refresh() {
+ Cell cell = getSaveVerifier().getEntity(Cell.class);
// add null before, for second to be considered as a changed event
// otherwize, setBean has no effect
@@ -105,12 +104,12 @@
// reload region in map
refreshRegionInMap(cellMap);
-}
+}*/
@Override
public void setActionButtons() {
- getVerifier().setSaveButton(save);
- getVerifier().setCancelButton(cancel);
+ getSaveVerifier().setSaveButton(save);
+ getSaveVerifier().setCancelButton(cancel);
}
protected void fieldCellChanged(ItemEvent event) {
@@ -206,7 +205,7 @@
constraints='BorderLayout.NORTH' decorator='boxed' enabled='{getBean() != null}' />
<fr.ifremer.isisfish.map.IsisMapBean id='cellMap' javaBean='new fr.ifremer.isisfish.map.IsisMapBean()'
selectionMode="{fr.ifremer.isisfish.map.CellSelectionLayer.SINGLE_SELECTION}"
- fisheryRegion='{getRegion()}' selectedCells='{getBean()}'
+ fisheryRegion='{getFisheryRegion()}' selectedCells='{getBean()}'
constraints='BorderLayout.CENTER' decorator='boxed' enabled='{getBean() != null}'/>
</JPanel>
</JSplitPane>
Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescriptionParametersUI.jaxx
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescriptionParametersUI.jaxx 2011-03-31 16:06:07 UTC (rev 3223)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescriptionParametersUI.jaxx 2011-04-01 09:54:55 UTC (rev 3224)
@@ -70,19 +70,18 @@
});
}
- at Override
-public void refresh() {
- SetOfVessels setOfVessels = getVerifier().getEntity(SetOfVessels.class);
+/*public void refresh() {
+ SetOfVessels setOfVessels = getSaveVerifier().getEntity(SetOfVessels.class);
// twice event for jaxx bindings detection
setBean(null);
setBean(setOfVessels);
-}
+}*/
@Override
public void setActionButtons() {
- getVerifier().setSaveButton(save);
- getVerifier().setCancelButton(cancel);
+ getSaveVerifier().setSaveButton(save);
+ getSaveVerifier().setCancelButton(cancel);
}
protected void effortDescriptionSelectionChanged() {
@@ -90,7 +89,7 @@
setEffortDescription(selectedEffort);
if (getEffortDescription() != null) {
- getVerifier().addCurrentEntity(getEffortDescription());
+ getSaveVerifier().addCurrentEntity(getEffortDescription());
/* NumberEditor is not working
fieldEffortDescriptionFishingOperation.init();
Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescriptionUI.jaxx
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescriptionUI.jaxx 2011-03-31 16:06:07 UTC (rev 3223)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescriptionUI.jaxx 2011-04-01 09:54:55 UTC (rev 3224)
@@ -56,26 +56,25 @@
metierModel.setMetiers(null);
}
if (evt.getNewValue() != null) {
- metierModel.setMetiers(getRegion().getMetier());
+ metierModel.setMetiers(getFisheryRegion().getMetier());
setEffortDescriptionEffortDescriptionList();
}
}
});
}
- at Override
-public void refresh() {
- SetOfVessels setOfVessels = getVerifier().getEntity(SetOfVessels.class);
+/*public void refresh() {
+ SetOfVessels setOfVessels = getSaveVerifier().getEntity(SetOfVessels.class);
// twice event for jaxx bindings detection
setBean(null);
setBean(setOfVessels);
-}
+}*/
@Override
public void setActionButtons() {
- getVerifier().setSaveButton(save);
- getVerifier().setCancelButton(cancel);
+ getSaveVerifier().setSaveButton(save);
+ getSaveVerifier().setCancelButton(cancel);
}
protected void onFieldEffortDescriptionMetierListValueChanged() {
Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/FisheryRegionUI.jaxx
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/FisheryRegionUI.jaxx 2011-03-31 16:06:07 UTC (rev 3223)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/FisheryRegionUI.jaxx 2011-04-01 09:54:55 UTC (rev 3224)
@@ -28,6 +28,7 @@
<fr.ifremer.isisfish.entities.FisheryRegion id='bean' javaBean='null'/>
<import>
+ static org.nuiton.i18n.I18n.n_
fr.ifremer.isisfish.entities.FisheryRegion;
fr.ifremer.isisfish.map.CopyMapToClipboardListener;
com.bbn.openmap.gui.Tool;
@@ -51,13 +52,11 @@
cellMap.addMapMouseListener(new CopyMapToClipboardListener(cellMap));
setButtonTitle(_("isisfish.input.continueCells"));
- setNextPath("$root/$cells");
+ setNextPath(n_("isisfish.input.tree.cells"));
- addPropertyChangeListener("bean", new PropertyChangeListener() {
+ addPropertyChangeListener(PROPERTY_BEAN, new PropertyChangeListener() {
public void propertyChange(PropertyChangeEvent evt) {
if (evt.getOldValue() != null || evt.getNewValue() == null) {
- // remove previous binding on getBean()
- //jaxx.runtime.SwingUtil.removeDataBinding($InputContentUI0, "cellMap.fisheryRegion");
setFieldMapfilesModel(getBean());
/* numberEditor is not working
fieldLatMin.init();
@@ -68,16 +67,14 @@
fieldCellLengthLongitude.init();*/
}
if (evt.getNewValue() != null) {
- // add binding on getBean()
- //jaxx.runtime.SwingUtil.applyDataBinding($InputContentUI0, "cellMap.fisheryRegion");
+
}
}
});
}
- at Override
public void refresh() {
- FisheryRegion region = getVerifier().getEntity(FisheryRegion.class);
+ FisheryRegion region = getSaveVerifier().getEntity(FisheryRegion.class);
// add null before, for second to be considered as a changed event
// otherwize, setBean has no effect
@@ -87,8 +84,8 @@
@Override
public void setActionButtons() {
- getVerifier().setSaveButton(save, false);
- getVerifier().setCancelButton(cancel);
+ getSaveVerifier().setSaveButton(save, false);
+ getSaveVerifier().setCancelButton(cancel);
}
protected InputAction getInputAction() {
@@ -134,7 +131,7 @@
protected void save() {
setInfoText(_("isisfish.message.checking.cell"));
getInputAction().saveFisheryRegion(getBean());
- getVerifier().setEditable(false);
+ getSaveVerifier().setEditable(false);
// TODO remove getParentContainer reference
// FIXME echatellier 20110306 : use new tree cell api
//getParentContainer(InputUI.class).setTreeModel();
Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/GearTabUI.jaxx
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/GearTabUI.jaxx 2011-03-31 16:06:07 UTC (rev 3223)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/GearTabUI.jaxx 2011-04-01 09:54:55 UTC (rev 3224)
@@ -52,9 +52,8 @@
});
}
- at Override
-public void refresh() {
- Gear gear = getVerifier().getEntity(Gear.class);
+/*public void refresh() {
+ Gear gear = getSaveVerifier().getEntity(Gear.class);
// add null before, for second to be considered as a changed event
// otherwize, setBean has no effect
@@ -63,18 +62,18 @@
getVerifier().addCurrentPanel(rangeOfValues);
- /* chatellier commented since number editor is not working
- if (getBean() != null) {
- fieldGearStandardisationFactor.init();
- }*/
-}
+ // chatellier commented since number editor is not working
+ //if (getBean() != null) {
+ // fieldGearStandardisationFactor.init();
+ //}
+}*/
@Override
public void setActionButtons() {
- getVerifier().setSaveButton(save);
- getVerifier().setCancelButton(cancel);
- getVerifier().setNewButton(create, Gear.class);
- getVerifier().setDeleteButton(remove);
+ getSaveVerifier().setSaveButton(save);
+ getSaveVerifier().setCancelButton(cancel);
+ getSaveVerifier().setNewButton(create, Gear.class);
+ getSaveVerifier().setDeleteButton(remove);
}
]]></script>
<JPanel id="body">
Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/GearUI.jaxx
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/GearUI.jaxx 2011-03-31 16:06:07 UTC (rev 3223)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/GearUI.jaxx 2011-04-01 09:54:55 UTC (rev 3224)
@@ -53,11 +53,9 @@
installChangeListener(gearTab);
}
- at Override
-public void refresh() {
-
+/*public void refresh() {
//getVerifier().addCurrentPanel(gearTabUI, selectivityUI);
-}
+}*/
@Override
public void setActionButtons() {
Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.jaxx
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.jaxx 2011-03-31 16:06:07 UTC (rev 3223)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.jaxx 2011-04-01 09:54:55 UTC (rev 3224)
@@ -57,24 +57,23 @@
<fr.ifremer.isisfish.ui.sensitivity.TableBlockingLayerUI id="tableLayerUI" constructorParams='this' />
<import>
- javax.swing.JComponent;
- javax.swing.event.ChangeListener;
- fr.ifremer.isisfish.entities.FisheryRegion;
- fr.ifremer.isisfish.ui.sensitivity.SensitivityUtils;
- fr.ifremer.isisfish.ui.sensitivity.FactorWizardUI;
- fr.ifremer.isisfish.ui.sensitivity.SensitivityTabbedPaneListener;
- fr.ifremer.isisfish.ui.WelcomePanelUI;
- org.nuiton.topia.persistence.TopiaEntityContextable;
- org.nuiton.topia.TopiaContext;
- org.apache.commons.lang.StringUtils;
+ javax.swing.JComponent
+ javax.swing.event.ChangeListener
+ fr.ifremer.isisfish.entities.FisheryRegion
+ fr.ifremer.isisfish.ui.sensitivity.SensitivityUtils
+ fr.ifremer.isisfish.ui.sensitivity.FactorWizardUI
+ fr.ifremer.isisfish.ui.sensitivity.SensitivityTabbedPaneListener
+ fr.ifremer.isisfish.ui.WelcomePanelUI
+ org.nuiton.topia.persistence.TopiaEntityContextable
+ org.nuiton.topia.TopiaContext
+ org.apache.commons.lang.StringUtils
java.awt.Color
javax.swing.AbstractAction
javax.swing.JTable
javax.swing.JTabbedPane
</import>
- <script><![CDATA[
-
+ <script><![CDATA[
protected ChangeListener tabbedPaneChangeListener;
/**
@@ -85,15 +84,6 @@
public abstract B getBean();
/**
- * This method is UI entry point.
- *
- * It's called :
- * - by input tree to first display UI
- * - by input verifier on cancel action
- */
-public abstract void refresh();
-
-/**
* This is a hack for tabbed UI.
*
* In this case of UI, they have multiples save/cancel
@@ -105,17 +95,9 @@
public InputAction getAction() {
return getContextValue(InputAction.class);
}
- at Deprecated
-public InputSaveVerifier getVerifier() {
- return getInputSaveVerifier();
-}
-public InputSaveVerifier getInputSaveVerifier() {
+public InputSaveVerifier getSaveVerifier() {
return getContextValue(InputSaveVerifier.class);
}
- at Deprecated
-public FisheryRegion getRegion() {
- return getFisheryRegion();
-}
public FisheryRegion getFisheryRegion() {
return getContextValue(FisheryRegion.class);
}
@@ -144,7 +126,7 @@
*/
protected void refreshRegionInMap(fr.ifremer.isisfish.map.IsisMapBean map) {
FisheryRegion fisheryRegion = map.getFisheryRegion();
- FisheryRegion regionFromContext = getRegion();
+ FisheryRegion regionFromContext = getFisheryRegion();
if (fisheryRegion == null || !fisheryRegion.equals(regionFromContext)) {
if (log.isInfoEnabled()) {
log.info("Use now " + regionFromContext + " in map " + map);
Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/InputHandler.java
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/InputHandler.java 2011-03-31 16:06:07 UTC (rev 3223)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/InputHandler.java 2011-04-01 09:54:55 UTC (rev 3224)
@@ -200,6 +200,8 @@
/**
* Create new region (called if region name is not empty).
+ *
+ * @param inputUI inputUI
*/
public void createNewRegion(InputUI inputUI) {
String name = inputUI.getFieldNewRegion().getText();
@@ -225,7 +227,7 @@
/**
* Exporter la region dans un zip.
*
- * @return le nom du ficher selectionné par l'utilisateur
+ * @param inputUI inputUI
*/
public void importRegion(InputUI inputUI) {
setStatusMessage(inputUI, _("isisfish.message.import.zip"), true);
@@ -246,7 +248,7 @@
/**
* Exporter la region dans un zip.
*
- * @return le nom du ficher selectionné par l'utilisateur
+ * @param inputUI inputUI
*/
public void importRegionAndRename(InputUI inputUI) {
setStatusMessage(inputUI, _("isisfish.message.import.zip"), true);
@@ -269,6 +271,8 @@
/**
* Importer la region depuis un fichier XML de la version 2.
+ *
+ * @param inputUI inputUI
*/
public void importV2Region(InputUI inputUI) {
@@ -290,7 +294,7 @@
* Extract from a simulation the region, and rename it with name given
* by user.
*
- * @return le nom de la region entré par l'utilsateur
+ * @param inputUI inputUI
*/
public void importRegionFromSimulation(InputUI inputUI) {
@@ -334,7 +338,7 @@
*
* Call only if region is loaded.
*
- * @return file were region were exported
+ * @param inputUI inputUI
*/
public void exportRegion(InputUI inputUI) {
try {
@@ -500,10 +504,10 @@
InputContentUI inputContentUI = getUIInstanceForBeanClass(internalClass, inputUI);
// mandatory set
- inputContentUI.getVerifier().reset(); // before set bean !!!
+ inputContentUI.getSaveVerifier().reset(); // before set bean !!!
if (topiaEntity != null) {
- inputContentUI.getVerifier().addCurrentEntity(topiaEntity);
- inputContentUI.getVerifier().setInputContentUI(inputContentUI);
+ inputContentUI.getSaveVerifier().addCurrentEntity(topiaEntity);
+ inputContentUI.getSaveVerifier().setInputContentUI(inputContentUI);
}
inputContentUI.setBean((TopiaEntityContextable)topiaEntity);
@@ -699,10 +703,10 @@
// get bean for component class info
TopiaEntityContextable bean = null;
if (sensitivityBeanID == null) {
- bean = inputContentUI.getVerifier().getEntity(sensitivityBeanClass);
+ bean = inputContentUI.getSaveVerifier().getEntity(sensitivityBeanClass);
}
else {
- bean = inputContentUI.getVerifier().getEntity(sensitivityBeanClass, sensitivityBeanID);
+ bean = inputContentUI.getSaveVerifier().getEntity(sensitivityBeanClass, sensitivityBeanID);
}
if (bean != null) {
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-03-31 16:06:07 UTC (rev 3223)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/InputOneEquationUI.jaxx 2011-04-01 09:54:55 UTC (rev 3224)
@@ -109,7 +109,7 @@
// content is managed by caller, can do anythings here
if (bean != null && beanProperty != null) {
String localBeanProperty = StringUtils.capitalize(beanProperty);
- Method m = bean.getClass().getMethod("get" + localBeanProperty, null);
+ Method m = bean.getClass().getMethod("get" + localBeanProperty);
result = (Equation)m.invoke(bean);
}
} catch (Exception e) {
@@ -148,7 +148,6 @@
}
}
- at Override
public void refresh() {
// TODO binding don't work
Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/InputSaveVerifier.java
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/InputSaveVerifier.java 2011-03-31 16:06:07 UTC (rev 3223)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/InputSaveVerifier.java 2011-04-01 09:54:55 UTC (rev 3224)
@@ -5,7 +5,7 @@
* $Id$
* $HeadURL$
* %%
- * Copyright (C) 2009 - 2010 Ifremer, CodeLutin
+ * 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
@@ -131,19 +131,9 @@
protected InputContentUI<?> inputContentUI;
- //protected FisheryTreeNode currentNode = null;
- //protected String currentOnglet = null;
-
- //protected TopiaContext isisContext = null;
-
/** Map entity key to {@link TopiaEntity}. */
protected HashMap<String, TopiaEntityContextable> currentEntities = new HashMap<String, TopiaEntityContextable>();
- /** Les panels a rafraichir. */
- protected HashSet<InputContentUI<?>> currentPanels = new HashSet<InputContentUI<?>>();
- //protected InputUI rootUI;
- //protected SensitivityTabUI sensUI;
-
public InputContentUI<?> getInputContentUI() {
return inputContentUI;
}
@@ -185,7 +175,6 @@
/** Called by entity property change listener on data change. */
protected void topiaChanged() {
changed = true;
- setPanelsActifs();
setEnabled(currentSaveButton, true);
setEnabled(currentCancelButton, true);
setEnabled(currentNewButton, false);
@@ -198,7 +187,6 @@
*/
protected void noModif() {
changed = false;
- setPanelsActifs();
setEnabled(currentSaveButton, false);
setEnabled(currentCancelButton, false);
setEnabled(currentNewButton, true);
@@ -402,33 +390,7 @@
return response;
}
- protected void setPanelsActifs() {
- for (InputContentUI panel : currentPanels) {
- panel.setActive(editable);
- }
- }
-
/**
- * Refresh all registered {@link InputContentUI} component.
- *
- * Call {@link InputContentUI#refresh()} method on each component.
- */
- public void refreshAll() {
-
- // chatellier 20090602 refresh() call addCurrentPanel
- // and cause ConcurentModificationException.
- Set<InputContentUI> panelsToRefresh = (HashSet<InputContentUI>)currentPanels.clone();
- for (InputContentUI panel : panelsToRefresh) {
- if (log.isDebugEnabled()) {
- log.debug("Verifier refresh ui : " + panel);
- }
- panel.refresh();
- // do not call refresh action buttons here
- panel.setActive(editable);
- }
- }
-
- /**
* Add entity to check for modification.
*
* The verifier register to entity using {@link TopiaEntity#addPropertyChangeListener(PropertyChangeListener)}.
@@ -465,7 +427,6 @@
//}
this.currentEntities.put(key, currentEntity);
- setPanelsActifs();
}
}
@@ -489,40 +450,18 @@
public void reset() {
removeAllEntity();
- removeAllPanels();
this.currentCancelButton = null;
this.currentDeleteButton = null;
this.currentNewButton = null;
this.currentSaveButton = null;
- //this.currentOnglet = null;
- //this.currentNode = null;
}
public void removeAllEntity() {
currentEntities.clear();
editable = false;
noModif();
- setPanelsActifs();
}
- public void addCurrentPanel(InputContentUI<?>... panels) {
- /*for (InputContentUI<?> ui : panels) {
- editable = !currentEntities.isEmpty();
- this.currentPanels.add(ui);
- //if (rootUI == null) {
- // ui.setSensitivity(true);
- // ui.setLayer(true);
- //}
- ui.refresh();
- // do not call refresh action buttons here
- ui.setActive(editable);
- }*/
- }
-
- public void removeAllPanels() {
- currentPanels.clear();
- }
-
public boolean isEditable() {
return editable;
}
@@ -597,18 +536,10 @@
return null;
}
- /*public String getCurrentOnglet() {
- return currentOnglet;
- }*/
-
public void setEditable(boolean editable) {
this.editable = editable;
}
- /*public void setCurrentOnglet(String currentOnglet) {
- this.currentOnglet = currentOnglet;
- }*/
-
public SensitivityTabUI getSensPanel() {
return null; //sensUI;
}
Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/InputTabbedPaneListener.java
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/InputTabbedPaneListener.java 2011-03-31 16:06:07 UTC (rev 3223)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/InputTabbedPaneListener.java 2011-04-01 09:54:55 UTC (rev 3224)
@@ -5,7 +5,7 @@
* $Id$
* $HeadURL$
* %%
- * Copyright (C) 2009 - 2010 Ifremer, CodeLutin
+ * 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
@@ -73,6 +73,7 @@
// don't break refresh cycle
try {
TopiaEntityContextable entity = ui.getBean();
+ // refresh ui
ui.setBean(null);
ui.setBean(entity);
}
Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesEditorUI.jaxx
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesEditorUI.jaxx 2011-03-31 16:06:07 UTC (rev 3223)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesEditorUI.jaxx 2011-04-01 09:54:55 UTC (rev 3224)
@@ -77,9 +77,8 @@
});
}
- at Override
public void refresh() {
- getVerifier().addCurrentPanel(targetFactor);
+ //getSaveVerifier().addCurrentPanel(targetFactor);
if (getBean() != null) {
setTableTargetSpeciesModel();
}
@@ -101,7 +100,7 @@
}
protected void setTargetSpeciesModel() {
- java.util.List<Species> species = getRegion().getSpecies();
+ java.util.List<Species> species = getFisheryRegion().getSpecies();
SpeciesComboModel fieldTargetSpeciesModel = new SpeciesComboModel(species);
fieldTargetSpecies.setModel(fieldTargetSpeciesModel);
}
@@ -115,7 +114,7 @@
// move collection to list
// and add all entity to verifier
for (TargetSpecies oneTargetSpecies : getMetierSeasonInfo().getSpeciesTargetSpecies()) {
- getVerifier().addCurrentEntity(oneTargetSpecies);
+ getSaveVerifier().addCurrentEntity(oneTargetSpecies);
targetSpecies.add(oneTargetSpecies);
}
}
Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesUI.jaxx
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesUI.jaxx 2011-03-31 16:06:07 UTC (rev 3223)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesUI.jaxx 2011-04-01 09:54:55 UTC (rev 3224)
@@ -55,14 +55,13 @@
});
}
- at Override
-public void refresh() {
- Metier metier = getVerifier().getEntity(Metier.class);
+/*public void refresh() {
+ //Metier metier = getSaveVerifier().getEntity(Metier.class);
// add null before, for second to be considered as a changed event
// otherwize, setBean has no effect
- setBean(null);
- setBean(metier);
+ //setBean(null);
+ //setBean(metier);
getVerifier().addCurrentPanel(metierSeasonInfoSpeciesEditor);
if (getBean() != null) {
@@ -72,12 +71,12 @@
DefaultComboBoxModel seasonModel = new DefaultComboBoxModel();
fieldMetierSeasonInfo.setModel(seasonModel);
}
-}
+}*/
@Override
public void setActionButtons() {
- getVerifier().setSaveButton(save);
- getVerifier().setCancelButton(cancel);
+ getSaveVerifier().setSaveButton(save);
+ getSaveVerifier().setCancelButton(cancel);
}
protected void setSeasonModel(){
@@ -96,7 +95,7 @@
log.debug("Metier season changed : " + selectedMSI);
}
setMetierSeasonInfo(selectedMSI);
- getVerifier().addCurrentEntity(getMetierSeasonInfo());
+ getSaveVerifier().addCurrentEntity(getMetierSeasonInfo());
}
metierSeasonInfoSpeciesEditor.refresh();
}
Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoZoneUI.jaxx
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoZoneUI.jaxx 2011-03-31 16:06:07 UTC (rev 3223)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoZoneUI.jaxx 2011-04-01 09:54:55 UTC (rev 3224)
@@ -76,7 +76,7 @@
save.addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
- getVerifier().topiaSave();
+ getSaveVerifier().topiaSave();
setMetierSeasonInfoCombo();
}
});
@@ -110,7 +110,6 @@
});
}
- @Override
public void refresh() {
if (log.isDebugEnabled()) {
@@ -121,7 +120,7 @@
setMetierSeasonInfoNotNull(false);
//}
- Metier metier = getVerifier().getEntity(Metier.class);
+ Metier metier = getSaveVerifier().getEntity(Metier.class);
// don't add setBean(null) here : useless
//setBean(metier);
@@ -144,10 +143,10 @@
@Override
public void setActionButtons() {
- getVerifier().setSaveButton(save, false);
- getVerifier().setCancelButton(cancel);
- getVerifier().setNewButton(create, MetierSeasonInfo.class, false);
- getVerifier().setDeleteButton(remove, false);
+ getSaveVerifier().setSaveButton(save, false);
+ getSaveVerifier().setCancelButton(cancel);
+ getSaveVerifier().setNewButton(create, MetierSeasonInfo.class, false);
+ getSaveVerifier().setDeleteButton(remove, false);
}
protected void setSeason() {
@@ -188,7 +187,7 @@
for (ListSelectionListener listener : listeners) {
metierZones.removeListSelectionListener(listener);
}
- metierZones.fillList(getRegion().getZone(), getMetierSeasonInfo().getZone());
+ metierZones.fillList(getFisheryRegion().getZone(), getMetierSeasonInfo().getZone());
for (ListSelectionListener listener : listeners) {
metierZones.addListSelectionListener(listener);
}
@@ -212,7 +211,7 @@
protected void seasonChanged() {
init = true;
setMetierSeasonInfo((MetierSeasonInfo)metierSeasonInfoCombo.getSelectedItem());
- getVerifier().addCurrentEntity(getMetierSeasonInfo());
+ getSaveVerifier().addCurrentEntity(getMetierSeasonInfo());
setMetierSeasonInfoNotNull(getMetierSeasonInfo() != null);
setSeason();
setMetierZone();
Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/MetierTabUI.jaxx
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/MetierTabUI.jaxx 2011-03-31 16:06:07 UTC (rev 3223)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/MetierTabUI.jaxx 2011-04-01 09:54:55 UTC (rev 3224)
@@ -47,34 +47,33 @@
}
if (evt.getNewValue() != null) {
init = true;
- jaxx.runtime.SwingUtil.fillComboBox(fieldMetierGear, getRegion().getGear(), getBean().getGear(), true);
+ jaxx.runtime.SwingUtil.fillComboBox(fieldMetierGear, getFisheryRegion().getGear(), getBean().getGear(), true);
init = false;
}
}
});
}
- at Override
-public void refresh() {
+/*public void refresh() {
if (log.isDebugEnabled()) {
log.debug("Refresh called in ui : " + this);
}
- Metier metier = getVerifier().getEntity(Metier.class);
+ Metier metier = getSaveVerifier().getEntity(Metier.class);
// add null before, for second to be considered as a changed event
// otherwize, setBean has no effect
setBean(null);
setBean(metier);
-}
+}*/
@Override
public void setActionButtons() {
- getVerifier().setSaveButton(save);
- getVerifier().setCancelButton(cancel);
- getVerifier().setNewButton(create, Metier.class);
- getVerifier().setDeleteButton(remove);
+ getSaveVerifier().setSaveButton(save);
+ getSaveVerifier().setCancelButton(cancel);
+ getSaveVerifier().setNewButton(create, Metier.class);
+ getSaveVerifier().setDeleteButton(remove);
}
protected void gearChanged() {
Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/MetierUI.jaxx
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/MetierUI.jaxx 2011-03-31 16:06:07 UTC (rev 3223)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/MetierUI.jaxx 2011-04-01 09:54:55 UTC (rev 3224)
@@ -32,9 +32,8 @@
java.beans.PropertyChangeEvent;
java.beans.PropertyChangeListener;
</import>
-<script><![CDATA[
-
+<script><![CDATA[
protected void $afterCompleteSetup() {
setButtonTitle(_("isisfish.input.continueTripTypes"));
setNextPath(n_("isisfish.input.tree.triptypes"));
@@ -44,14 +43,13 @@
installChangeListener(metierTab);
}
- at Override
-public void refresh() {
+/*public void refresh() {
// add tab in reverse order
// metierTabUI at last, for this tab refresh at end, and save/cancel button linked to
// entity change
- getVerifier().addCurrentPanel(metierSeasonSpeciesUI, metierSeasonInfoUI, metierTabUI);
-}
+ getSaveVerifier().addCurrentPanel(metierSeasonSpeciesUI, metierSeasonInfoUI, metierTabUI);
+}*/
@Override
public void setActionButtons() {
Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationBasicsUI.jaxx
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationBasicsUI.jaxx 2011-03-31 16:06:07 UTC (rev 3223)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationBasicsUI.jaxx 2011-04-01 09:54:55 UTC (rev 3224)
@@ -41,10 +41,8 @@
javax.swing.JFrame
java.awt.BorderLayout
</import>
- <script><![CDATA[
-
-
+ <script><![CDATA[
protected void $afterCompleteSetup() {
addPropertyChangeListener(PROPERTY_BEAN, new PropertyChangeListener() {
public void propertyChange(PropertyChangeEvent evt) {
@@ -66,9 +64,8 @@
});
}
- at Override
public void refresh() {
- Population population = getVerifier().getEntity(Population.class);
+ Population population = getSaveVerifier().getEntity(Population.class);
// add null before, for second to be considered as a changed event
// otherwize, setBean has no effect
@@ -81,15 +78,15 @@
}
setTableAgeLengthModel();
}
- getVerifier().addCurrentPanel(growthEquation, growthReverseEquation);
+ //getSaveVerifier().addCurrentPanel(growthEquation, growthReverseEquation);
}
@Override
public void setActionButtons() {
- getVerifier().setSaveButton(save);
- getVerifier().setCancelButton(cancel);
- getVerifier().setNewButton(create, Population.class, false);
- getVerifier().setDeleteButton(remove);
+ getSaveVerifier().setSaveButton(save);
+ getSaveVerifier().setCancelButton(cancel);
+ getSaveVerifier().setNewButton(create, Population.class, false);
+ getSaveVerifier().setDeleteButton(remove);
}
/**
@@ -143,9 +140,9 @@
}
protected void create() {
- Species species = null; //getAction().getSpeciesByTopiaId(getVerifier().getIsisContext(), getVerifier().getCurrentNode().getParent().getNavigationPath());
+ Species species = null; //getAction().getSpeciesByTopiaId(getSaveVerifier().getIsisContext(), getSaveVerifier().getCurrentNode().getParent().getNavigationPath());
if (species == null){
- species = null; //getAction().getSpeciesByTopiaId(getVerifier().getIsisContext(), getVerifier().getCurrentNode().getParent().getParent().getNavigationPath());
+ species = null; //getAction().getSpeciesByTopiaId(getSaveVerifier().getIsisContext(), getSaveVerifier().getCurrentNode().getParent().getParent().getNavigationPath());
}
TopiaEntity topia = getContextValue(InputAction.class).createPopulation(getTopiaContext(), species);
Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationCapturabilityUI.jaxx
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationCapturabilityUI.jaxx 2011-03-31 16:06:07 UTC (rev 3223)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationCapturabilityUI.jaxx 2011-04-01 09:54:55 UTC (rev 3224)
@@ -34,9 +34,8 @@
java.beans.PropertyChangeListener;
org.nuiton.math.matrix.gui.MatrixPanelListener;
</import>
- <script><![CDATA[
-
+ <script><![CDATA[
protected void $afterCompleteSetup() {
addPropertyChangeListener(PROPERTY_BEAN, new PropertyChangeListener() {
public void propertyChange(PropertyChangeEvent evt) {
@@ -59,9 +58,8 @@
}
}
- at Override
-public void refresh() {
- Population population = getVerifier().getEntity(Population.class);
+/*public void refresh() {
+ Population population = getSaveVerifier().getEntity(Population.class);
// add null before, for second to be considered as a changed event
// otherwize, setBean has no effect
@@ -77,12 +75,12 @@
// TODO add only once, not at all refresh
//fieldPopulationCapturability.addMatrixListener(listener);
-}
+}*/
@Override
public void setActionButtons() {
- getVerifier().setSaveButton(save);
- getVerifier().setCancelButton(cancel);
+ getSaveVerifier().setSaveButton(save);
+ getSaveVerifier().setCancelButton(cancel);
}
]]>
</script>
Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationEquationUI.jaxx
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationEquationUI.jaxx 2011-03-31 16:06:07 UTC (rev 3223)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationEquationUI.jaxx 2011-04-01 09:54:55 UTC (rev 3224)
@@ -5,7 +5,7 @@
$Id$
$HeadURL$
%%
- Copyright (C) 2009 - 2010 Ifremer, Code Lutin
+ Copyright (C) 2009 - 2011 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
@@ -32,25 +32,21 @@
fr.ifremer.isisfish.entities.Population;
</import>
<script><![CDATA[
-
-
-
- at Override
-public void refresh() {
- Population population = getVerifier().getEntity(Population.class);
+/*public void refresh() {
+ Population population = getSaveVerifier().getEntity(Population.class);
// add null before, for second to be considered as a changed event
// otherwize, setBean has no effect
setBean(null);
setBean(population);
- getVerifier().addCurrentPanel(naturalDeathRate, meanWeight, price);
-}
+ getSaveVerifier().addCurrentPanel(naturalDeathRate, meanWeight, price);
+}*/
@Override
public void setActionButtons() {
- getVerifier().setSaveButton(save);
- getVerifier().setCancelButton(cancel);
+ getSaveVerifier().setSaveButton(save);
+ getSaveVerifier().setCancelButton(cancel);
}
]]>
</script>
Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationGroupUI.jaxx
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationGroupUI.jaxx 2011-03-31 16:06:07 UTC (rev 3223)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationGroupUI.jaxx 2011-04-01 09:54:55 UTC (rev 3224)
@@ -5,7 +5,7 @@
$Id$
$HeadURL$
%%
- Copyright (C) 2009 - 2010 Ifremer, Code Lutin
+ Copyright (C) 2009 - 2011 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
@@ -49,9 +49,8 @@
java.beans.PropertyChangeEvent;
java.beans.PropertyChangeListener;
</import>
- <script><![CDATA[
-
+ <script><![CDATA[
protected void $afterCompleteSetup() {
addPropertyChangeListener(PROPERTY_BEAN, new PropertyChangeListener() {
public void propertyChange(PropertyChangeEvent evt) {
@@ -86,23 +85,22 @@
});
}
- at Override
-public void refresh() {
+/*public void refresh() {
//if (!isActive()) {
setPopGroupNotNull(false);
//}
- Population population = getVerifier().getEntity(Population.class);
+ Population population = getSaveVerifier().getEntity(Population.class);
// add null before, for second to be considered as a changed event
// otherwize, setBean has no effect
setBean(null);
setBean(population);
-}
+}*/
@Override
public void setActionButtons() {
- getVerifier().setSaveButton(save);
- getVerifier().setCancelButton(cancel);
+ getSaveVerifier().setSaveButton(save);
+ getSaveVerifier().setCancelButton(cancel);
}
protected void setNaturalDeathRateMatrix() {
@@ -129,7 +127,7 @@
PopulationGroup selectedPopulationGroup = (PopulationGroup)populationGroupPopulationGroupComboBox.getSelectedItem();
if (selectedPopulationGroup != null) {
setPopulationGroup((PopulationGroupImpl)selectedPopulationGroup);
- getVerifier().addCurrentEntity(selectedPopulationGroup);
+ getSaveVerifier().addCurrentEntity(selectedPopulationGroup);
setNaturalDeathRateMatrix();
// init number editor (not working on bindings)
Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEmigrationUI.jaxx
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEmigrationUI.jaxx 2011-03-31 16:06:07 UTC (rev 3223)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEmigrationUI.jaxx 2011-04-01 09:54:55 UTC (rev 3224)
@@ -5,7 +5,7 @@
$Id$
$HeadURL$
%%
- Copyright (C) 2009 - 2010 Ifremer, Code Lutin
+ Copyright (C) 2009 - 2011 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
@@ -43,9 +43,8 @@
java.beans.PropertyChangeListener;
org.nuiton.math.matrix.gui.MatrixPanelListener;
</import>
- <script><![CDATA[
-
+ <script><![CDATA[
protected void $afterCompleteSetup() {
addPropertyChangeListener(PROPERTY_BEAN, new PropertyChangeListener() {
public void propertyChange(PropertyChangeEvent evt) {
@@ -53,7 +52,7 @@
populationMigrationEmigrationTable.setMatrix(null);
}
if (evt.getNewValue() != null) {
-
+
}
}
});
@@ -67,15 +66,14 @@
populationMigrationEmigrationTable.setMatrix(getPopInfo().getEmigrationMatrix().copy());
}
- at Override
-public void refresh(){
- Population population = getVerifier().getEntity(Population.class);
+/*public void refresh(){
+ Population population = getSaveVerifier().getEntity(Population.class);
// setBean(null); useless here
setBean(population);
refreshPanel();
-}
+}*/
@Override
public void setActionButtons() {
Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEquationUI.jaxx
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEquationUI.jaxx 2011-03-31 16:06:07 UTC (rev 3223)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEquationUI.jaxx 2011-04-01 09:54:55 UTC (rev 3224)
@@ -32,9 +32,8 @@
fr.ifremer.isisfish.entities.PopulationSeasonInfo;
fr.ifremer.isisfish.entities.Population;
</import>
- <script><![CDATA[
-
+ <script><![CDATA[
public void init(PopulationSeasonInfo populationSeasonInfo) {
// add null before, for second to be considered as a changed event
// otherwize, setBean has no effect
@@ -42,10 +41,9 @@
setPopInfo(populationSeasonInfo);
}
- at Override
-public void refresh() {
- getVerifier().addCurrentPanel(immigrationEquation, emigrationEquation, migrationEquation);
-}
+/*public void refresh() {
+ getSaveVerifier().addCurrentPanel(immigrationEquation, emigrationEquation, migrationEquation);
+}*/
@Override
public void setActionButtons() {
Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationImmigrationUI.jaxx
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationImmigrationUI.jaxx 2011-03-31 16:06:07 UTC (rev 3223)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationImmigrationUI.jaxx 2011-04-01 09:54:55 UTC (rev 3224)
@@ -5,7 +5,7 @@
$Id$
$HeadURL$
%%
- Copyright (C) 2009 - 2010 Ifremer, Code Lutin
+ Copyright (C) 2009 - 2011 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
@@ -43,9 +43,8 @@
org.nuiton.math.matrix.gui.MatrixPanelEvent;
org.nuiton.math.matrix.gui.MatrixPanelListener;
</import>
- <script><![CDATA[
-
+ <script><![CDATA[
protected void $afterCompleteSetup() {
addPropertyChangeListener(PROPERTY_BEAN, new PropertyChangeListener() {
public void propertyChange(PropertyChangeEvent evt) {
@@ -74,13 +73,12 @@
populationMigrationImmigrationTable.setMatrix(getPopInfo().getImmigrationMatrix().copy());
}
- at Override
-public void refresh(){
+/*public void refresh(){
Population population = getVerifier().getEntity(Population.class);
setBean(population);
refreshPanel();
-}
+}*/
@Override
public void setActionButtons() {
Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationMigrationUI.jaxx
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationMigrationUI.jaxx 2011-03-31 16:06:07 UTC (rev 3223)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationMigrationUI.jaxx 2011-04-01 09:54:55 UTC (rev 3224)
@@ -45,10 +45,8 @@
java.beans.PropertyChangeListener;
org.nuiton.math.matrix.gui.MatrixPanelListener;
</import>
- <script><![CDATA[
-
-
+ <script><![CDATA[
protected void $afterCompleteSetup() {
addPropertyChangeListener(PROPERTY_BEAN, new PropertyChangeListener() {
public void propertyChange(PropertyChangeEvent evt) {
@@ -78,14 +76,13 @@
}
}
- at Override
-public void refresh() {
- Population population = getVerifier().getEntity(Population.class);
+/*public void refresh() {
+ Population population = getSaveVerifier().getEntity(Population.class);
// setBean(null); is useless here
setBean(population);
refreshPanel();
-}
+}*/
@Override
public void setActionButtons() {
Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationUI.jaxx
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationUI.jaxx 2011-03-31 16:06:07 UTC (rev 3223)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationUI.jaxx 2011-04-01 09:54:55 UTC (rev 3224)
@@ -5,7 +5,7 @@
$Id$
$HeadURL$
%%
- Copyright (C) 2009 - 2010 Ifremer, Code Lutin
+ Copyright (C) 2009 - 2011 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
@@ -40,22 +40,22 @@
java.awt.CardLayout
</import>
<script><![CDATA[
-
-addPropertyChangeListener("bean", new PropertyChangeListener() {
- public void propertyChange(PropertyChangeEvent evt) {
- if (evt.getNewValue() == null) {
- fieldPopulationMigrationComment.setText("");
- fieldUseEquationMigration.setSelected(false);
+protected void $afterCompleteSetup() {
+ addPropertyChangeListener(PROPERTY_BEAN, new PropertyChangeListener() {
+ public void propertyChange(PropertyChangeEvent evt) {
+ if (evt.getNewValue() == null) {
+ fieldPopulationMigrationComment.setText("");
+ fieldUseEquationMigration.setSelected(false);
+ }
+ if (evt.getNewValue() != null) {
+ refresh();
+ }
}
- if (evt.getNewValue() != null) {
- refresh();
- }
- }
-});
+ });
+}
- at Override
public void refresh() {
- Population population = getVerifier().getEntity(Population.class);
+ Population population = getSaveVerifier().getEntity(Population.class);
// add null before, for second to be considered as a changed event
// otherwize, setBean has no effect
@@ -83,7 +83,7 @@
model.setPopulationSeasonInfos(null);
}
- getVerifier().addCurrentPanel(populationMigrationEquationUI, populationMigrationMigrationUI, populationMigrationImmigrationUI, populationMigrationEmigrationUI);
+ //getSaveVerifier().addCurrentPanel(populationMigrationEquationUI, populationMigrationMigrationUI, populationMigrationImmigrationUI, populationMigrationEmigrationUI);
// addCurrentPanel set all to isActive()
// force it to isSelectedPopulationSeasonInfo()
// twice for real change event :(
@@ -93,8 +93,8 @@
@Override
public void setActionButtons() {
- getVerifier().setSaveButton(save);
- getVerifier().setCancelButton(cancel);
+ getSaveVerifier().setSaveButton(save);
+ getSaveVerifier().setCancelButton(cancel);
}
protected void seasonChanged() {
@@ -102,7 +102,7 @@
PopulationSeasonInfo selectedPSI = (PopulationSeasonInfo)model.getSelectedItem();
setPopInfo(selectedPSI);
if (getPopInfo() != null) {
- getVerifier().addCurrentEntity(getPopInfo());
+ getSaveVerifier().addCurrentEntity(getPopInfo());
populationMigrationEquationUI.init(getPopInfo());
populationMigrationMigrationUI.init(getPopInfo());
populationMigrationImmigrationUI.init(getPopInfo());
Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationRecruitmentUI.jaxx
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationRecruitmentUI.jaxx 2011-03-31 16:06:07 UTC (rev 3223)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationRecruitmentUI.jaxx 2011-04-01 09:54:55 UTC (rev 3224)
@@ -34,23 +34,21 @@
java.beans.PropertyChangeListener;
org.nuiton.math.matrix.gui.MatrixPanelListener;
</import>
+
<script><![CDATA[
+protected void $afterCompleteSetup() {
+ addPropertyChangeListener(PROPERTY_BEAN, new PropertyChangeListener() {
+ public void propertyChange(PropertyChangeEvent evt) {
+ if (evt.getOldValue() != null || evt.getNewValue() == null) {
+ fieldPopulationMonthGapBetweenReproRecrutement.setText("");
+ fieldPopulationRecruitmentComment.setText("");
+ }
+ if (evt.getNewValue() != null) {
-
-addPropertyChangeListener("bean", new PropertyChangeListener() {
- public void propertyChange(PropertyChangeEvent evt) {
- if (evt.getOldValue() != null || evt.getNewValue() == null) {
- // remove previous binding on getBean()
- //jaxx.runtime.SwingUtil.removeDataBinding(get$Table0(), "fieldCellName.text", "fieldCellLongitude.text", "fieldCellLatitude.text", "fieldCellLand.selected", "fieldCellComment.text");
- fieldPopulationMonthGapBetweenReproRecrutement.setText("");
- fieldPopulationRecruitmentComment.setText("");
+ }
}
- if (evt.getNewValue() != null) {
- // add binding on getBean()
- //jaxx.runtime.SwingUtil.applyDataBinding(get$Table0(), "fieldCellName.text", "fieldCellLongitude.text", "fieldCellLatitude.text", "fieldCellLand.selected", "fieldCellComment.text");
- }
- }
-});
+ });
+}
protected void populationRecruitmentDistributionMatrixChanged(MatrixPanelEvent event) {
if (getBean() != null){
@@ -60,17 +58,14 @@
}
}
- at Override
-public void refresh() {
- Population population = getVerifier().getEntity(Population.class);
+/*public void refresh() {
+ Population population = getSaveVerifier().getEntity(Population.class);
// add null before, for second to be considered as a changed event
// otherwize, setBean has no effect
setBean(null);
setBean(population);
- getVerifier().addCurrentPanel(reproductionEquation);
-
if (getBean() != null && getBean().getRecruitmentDistribution() != null) {
fieldPopulationRecruitmentDistribution.setMatrix(getBean().getRecruitmentDistribution().copy());
@@ -80,12 +75,12 @@
// TODO add only once
//fieldPopulationRecruitmentDistribution.addMatrixListener(listener);
-}
+}*/
@Override
public void setActionButtons() {
- getVerifier().setSaveButton(save);
- getVerifier().setCancelButton(cancel);
+ getSaveVerifier().setSaveButton(save);
+ getSaveVerifier().setCancelButton(cancel);
}
]]>
</script>
Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonSpacializedUI.jaxx
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonSpacializedUI.jaxx 2011-03-31 16:06:07 UTC (rev 3223)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonSpacializedUI.jaxx 2011-04-01 09:54:55 UTC (rev 3224)
@@ -40,9 +40,8 @@
org.nuiton.math.matrix.gui.MatrixPanelListener;
javax.swing.JOptionPane
</import>
- <script><![CDATA[
-
+ <script><![CDATA[
protected void populationSeasonLengthMatrixChanged(MatrixPanelEvent event) {
if (getPopulationSeasonInfo() != null && matrixPanelPopulationSeasonLengthChange.getMatrix() != null) {
// must be a copy for fire event
@@ -51,11 +50,10 @@
}
}
- at Override
-public void refresh() {
+/*public void refresh() {
// TODO add only once
//matrixPanelPopulationSeasonLengthChange.addMatrixListener(matrixPanelListener);
-}
+}*/
@Override
public void setActionButtons() {
Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonsUI.jaxx
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonsUI.jaxx 2011-03-31 16:06:07 UTC (rev 3223)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonsUI.jaxx 2011-04-01 09:54:55 UTC (rev 3224)
@@ -42,9 +42,8 @@
java.beans.PropertyChangeListener;
org.nuiton.math.matrix.gui.MatrixPanelListener;
</import>
- <script><![CDATA[
-
+ <script><![CDATA[
protected Interval seasonInterval;
protected boolean init = false;
@@ -106,7 +105,7 @@
save.addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
- getVerifier().topiaSave();
+ getSaveVerifier().topiaSave();
setPopulationSeasonInfoCombo();
}
});
@@ -122,13 +121,12 @@
}
}
- at Override
public void refresh() {
if (!isActive()) {
setPopSeasonInfoNotNull(false);
}
- Population population = getVerifier().getEntity(Population.class);
+ Population population = getSaveVerifier().getEntity(Population.class);
// add null before, for second to be considered as a changed event
// otherwize, setBean has no effect
@@ -154,17 +152,17 @@
PopulationSeasonInfo popInfo = getPopulationSeasonInfo();
setPopulationSeasonInfo(null);
setPopulationSeasonInfo(popInfo);
- getVerifier().addCurrentEntity(getPopulationSeasonInfo());
+ getSaveVerifier().addCurrentEntity(getPopulationSeasonInfo());
}
- getVerifier().addCurrentPanel(populationSeasonSpecializedUI);
+ //getSaveVerifier().addCurrentPanel(populationSeasonSpecializedUI);
}
@Override
public void setActionButtons() {
- getVerifier().setSaveButton(save, false);
- getVerifier().setCancelButton(cancel);
- getVerifier().setNewButton(create, PopulationSeasonInfo.class, false);
- getVerifier().setDeleteButton(remove, false);
+ getSaveVerifier().setSaveButton(save, false);
+ getSaveVerifier().setCancelButton(cancel);
+ getSaveVerifier().setNewButton(create, PopulationSeasonInfo.class, false);
+ getSaveVerifier().setDeleteButton(remove, false);
}
protected void setSeasonInterval() {
@@ -225,7 +223,7 @@
setPopSeasonInfoNotNull(getPopulationSeasonInfo() != null);
setSeasonInterval();
setReproductionDistributionMatrix();
- getVerifier().addCurrentEntity(getPopulationSeasonInfo());
+ getSaveVerifier().addCurrentEntity(getPopulationSeasonInfo());
init = false;
}
Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationUI.jaxx
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationUI.jaxx 2011-03-31 16:06:07 UTC (rev 3223)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationUI.jaxx 2011-04-01 09:54:55 UTC (rev 3224)
@@ -5,7 +5,7 @@
$Id$
$HeadURL$
%%
- Copyright (C) 2009 - 2010 Ifremer, Code Lutin
+ Copyright (C) 2009 - 2011 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
@@ -31,9 +31,8 @@
static org.nuiton.i18n.I18n.n_
fr.ifremer.isisfish.ui.sensitivity.SensitivityTabbedPaneListener;
</import>
- <script><![CDATA[
-
+ <script><![CDATA[
protected void $afterCompleteSetup() {
setButtonTitle(_("isisfish.input.continueGears"));
setNextPath(n_("isisfish.input.tree.gears"));
@@ -43,12 +42,11 @@
installChangeListener(populationTab);
}
- at Override
-public void refresh() {
+/*public void refresh() {
// reverse ordre is no more needed
- getVerifier().addCurrentPanel(populationMigrationUI, populationRecruitementUI, populationCapturabilityUI,
+ getSaveVerifier().addCurrentPanel(populationMigrationUI, populationRecruitementUI, populationCapturabilityUI,
populationSeasonsUI, populationZoneUI, populationEquationUI, populationGroupUI, populationBasicsUI);
-}
+}*/
@Override
public void setActionButtons() {
Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationZonesEditorUI.jaxx
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationZonesEditorUI.jaxx 2011-03-31 16:06:07 UTC (rev 3223)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationZonesEditorUI.jaxx 2011-04-01 09:54:55 UTC (rev 3224)
@@ -37,9 +37,8 @@
java.util.ArrayList
java.awt.Dimension
</import>
- <script><![CDATA[
-
+ <script><![CDATA[
protected void $afterCompleteSetup() {
addPropertyChangeListener(PROPERTY_BEAN, new PropertyChangeListener() {
public void propertyChange(PropertyChangeEvent evt) {
@@ -63,15 +62,14 @@
getBean().setMappingZoneReproZoneRecru(fieldPopulationMappingZoneReproZoneRecru.getMatrix().clone());
}
- at Override
-public void refresh(){
+/*public void refresh(){
setPopulationZonesPresenceModel();
setFieldPopulationZonesReproductionModel(getSelectedValues(populationZonesPresence));
setFieldPopulationZonesRecruitmentModel(getSelectedValues(populationZonesPresence));
//fieldPopulationMappingZoneReproZoneRecru.removeMatrixPanelListener(listener);
setFieldPopulationMappingZoneReproZoneRecru();
//fieldPopulationMappingZoneReproZoneRecru.addMatrixListener(listener);
-}
+}*/
@Override
public void setActionButtons() {
@@ -87,7 +85,7 @@
}
protected void setPopulationZonesPresenceModel(){
if (getBean() != null){
- java.util.List<Zone> zones = getRegion().getZone();
+ java.util.List<Zone> zones = getFisheryRegion().getZone();
setModel(zones, getBean().getPopulationZone(), populationZonesPresence);
}
}
Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationZonesUI.jaxx
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationZonesUI.jaxx 2011-03-31 16:06:07 UTC (rev 3223)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationZonesUI.jaxx 2011-04-01 09:54:55 UTC (rev 3224)
@@ -27,29 +27,22 @@
<!-- bean property -->
<fr.ifremer.isisfish.entities.Population id='bean' javaBean='null'/>
- <import>
- fr.ifremer.isisfish.entities.Population;
- </import>
<script><![CDATA[
-
-
-
- at Override
-public void refresh() {
- Population population = getVerifier().getEntity(Population.class);
+/*public void refresh() {
+ Population population = getSaveVerifier().getEntity(Population.class);
// add null before, for second to be considered as a changed event
// otherwize, setBean has no effect
setBean(null);
setBean(population);
- getVerifier().addCurrentPanel(popZones);
-}
+ getSaveVerifier().addCurrentPanel(popZones);
+}*/
@Override
public void setActionButtons() {
- getVerifier().setSaveButton(save);
- getVerifier().setCancelButton(cancel);
+ getSaveVerifier().setSaveButton(save);
+ getSaveVerifier().setCancelButton(cancel);
}
]]>
</script>
Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PortUI.jaxx
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PortUI.jaxx 2011-03-31 16:06:07 UTC (rev 3223)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PortUI.jaxx 2011-04-01 09:54:55 UTC (rev 3224)
@@ -29,19 +29,18 @@
<import>
static org.nuiton.i18n.I18n.n_
- fr.ifremer.isisfish.entities.Port;
- fr.ifremer.isisfish.entities.Cell;
- com.bbn.openmap.gui.Tool;
- com.bbn.openmap.gui.OMToolSet;
- fr.ifremer.isisfish.map.CellSelectionLayer;
- fr.ifremer.isisfish.map.CopyMapToClipboardListener;
- com.bbn.openmap.event.SelectMouseMode;
- java.beans.PropertyChangeEvent;
- java.beans.PropertyChangeListener;
+ fr.ifremer.isisfish.entities.Port
+ fr.ifremer.isisfish.entities.Cell
+ com.bbn.openmap.gui.Tool
+ com.bbn.openmap.gui.OMToolSet
+ fr.ifremer.isisfish.map.CellSelectionLayer
+ fr.ifremer.isisfish.map.CopyMapToClipboardListener
+ com.bbn.openmap.event.SelectMouseMode
+ java.beans.PropertyChangeEvent
+ java.beans.PropertyChangeListener
</import>
- <script><![CDATA[
-
+ <script><![CDATA[
protected OMToolSet toolSet = new OMToolSet();
boolean portChanged = true;
@@ -89,9 +88,8 @@
});
}
- at Override
-public void refresh() {
- Port port = getVerifier().getEntity(Port.class);
+/*public void refresh() {
+ Port port = getSaveVerifier().getEntity(Port.class);
// add null before, for second to be considered as a changed event
// otherwize, setBean has no effect
@@ -99,20 +97,20 @@
setBean(port);
// reload region in map
refreshRegionInMap(portMap);
-}
+}*/
@Override
public void setActionButtons() {
- getVerifier().setSaveButton(save);
- getVerifier().setCancelButton(cancel);
- getVerifier().setNewButton(create, Port.class);
- getVerifier().setDeleteButton(remove);
+ getSaveVerifier().setSaveButton(save);
+ getSaveVerifier().setCancelButton(cancel);
+ getSaveVerifier().setNewButton(create, Port.class);
+ getSaveVerifier().setDeleteButton(remove);
}
protected void fillList() {
if (getBean() != null) {
portChanged = false;
- portCell.fillList(getRegion().getCell(), getBean().getCell());
+ portCell.fillList(getFisheryRegion().getCell(), getBean().getCell());
portCell.setSelectedValue(getBean().getCell());
portChanged = true;
}
@@ -184,7 +182,7 @@
constraints='BorderLayout.NORTH' decorator='boxed' enabled='{getBean() != null}' />
<fr.ifremer.isisfish.map.IsisMapBean id='portMap' javaBean='new fr.ifremer.isisfish.map.IsisMapBean()'
constraints='BorderLayout.CENTER' selectionMode="{fr.ifremer.isisfish.map.CellSelectionLayer.SINGLE_SELECTION}"
- decorator='boxed' enabled='{getBean() != null}' fisheryRegion='{getRegion()}' selectedCells='{getBean().getCell()}' />
+ decorator='boxed' enabled='{getBean() != null}' fisheryRegion='{getFisheryRegion()}' selectedCells='{getBean().getCell()}' />
</JPanel>
</JSplitPane>
</JPanel>
Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/RangeOfValuesUI.jaxx
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/RangeOfValuesUI.jaxx 2011-03-31 16:06:07 UTC (rev 3223)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/RangeOfValuesUI.jaxx 2011-04-01 09:54:55 UTC (rev 3224)
@@ -28,15 +28,14 @@
<fr.ifremer.isisfish.entities.Gear id='bean' javaBean='null'/>
<import>
- fr.ifremer.isisfish.types.RangeOfValues;
- fr.ifremer.isisfish.entities.Gear;
+ fr.ifremer.isisfish.types.RangeOfValues
+ fr.ifremer.isisfish.entities.Gear
java.beans.PropertyChangeEvent;
- java.beans.PropertyChangeListener;
+ java.beans.PropertyChangeListener
java.util.ArrayList
</import>
- <script><![CDATA[
-
+ <script><![CDATA[
boolean init = false;
protected void $afterCompleteSetup() {
@@ -59,9 +58,8 @@
});
}
- at Override
-public void refresh() {
- Gear gear = getVerifier().getEntity(Gear.class);
+/*public void refresh() {
+ Gear gear = getSaveVerifier().getEntity(Gear.class);
// add null before, for second to be considered as a changed event
// otherwize, setBean has no effect
@@ -78,7 +76,7 @@
jaxx.runtime.SwingUtil.fillComboBox(fieldGearParamType, values, getBean().getPossibleValue() == null ? null : getBean().getPossibleValue().getType(), true);
init = false;
}
-}
+}*/
@Override
public void setActionButtons() {
Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityEditorUI.jaxx
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityEditorUI.jaxx 2011-03-31 16:06:07 UTC (rev 3223)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityEditorUI.jaxx 2011-04-01 09:54:55 UTC (rev 3224)
@@ -32,22 +32,21 @@
<Boolean id='selectivityPopulationSelected' javaBean='false'/>
<import>
- fr.ifremer.isisfish.entities.Equation;
- fr.ifremer.isisfish.entities.Gear;
- fr.ifremer.isisfish.entities.Population;
- fr.ifremer.isisfish.entities.Selectivity;
- fr.ifremer.isisfish.entities.Species;
- fr.ifremer.isisfish.ui.input.gear.GearPopulationSelectivityModel;
- fr.ifremer.isisfish.ui.input.gear.PopulationComboModel;
- fr.ifremer.isisfish.ui.widget.editor.EquationTableEditor;
- java.beans.PropertyChangeEvent;
- java.beans.PropertyChangeListener;
+ fr.ifremer.isisfish.entities.Equation
+ fr.ifremer.isisfish.entities.Gear
+ fr.ifremer.isisfish.entities.Population
+ fr.ifremer.isisfish.entities.Selectivity
+ fr.ifremer.isisfish.entities.Species
+ fr.ifremer.isisfish.ui.input.gear.GearPopulationSelectivityModel
+ fr.ifremer.isisfish.ui.input.gear.PopulationComboModel
+ fr.ifremer.isisfish.ui.widget.editor.EquationTableEditor
+ java.beans.PropertyChangeEvent
+ java.beans.PropertyChangeListener
java.util.ArrayList
javax.swing.DefaultComboBoxModel
</import>
- <script><![CDATA[
-
+ <script><![CDATA[
protected void $afterCompleteSetup() {
addPropertyChangeListener(PROPERTY_BEAN, new PropertyChangeListener() {
public void propertyChange(PropertyChangeEvent evt) {
@@ -71,10 +70,9 @@
}
});*/
- at Override
public void refresh() {
- Gear gear = (Gear)getVerifier().getEntity(Gear.class);
+ Gear gear = (Gear)getSaveVerifier().getEntity(Gear.class);
// add null before, for second to be considered as a changed event
// otherwize, setBean has no effect
@@ -86,7 +84,7 @@
setSelectivityTableModel();
fieldSelectivityPopulation.setModel(getSelectivityPopulationModel());
}
- getVerifier().addCurrentPanel(selectivityEquation);
+ //getSaveVerifier().addCurrentPanel(selectivityEquation);
// reset to false after addCurrentPanel refresh
selectivityEquation.setActive(false);
@@ -110,7 +108,7 @@
// move collection to list
// and add all entity to verifier
for (Selectivity oneSelectivity : getBean().getPopulationSelectivity()) {
- getVerifier().addCurrentEntity(oneSelectivity);
+ getSaveVerifier().addCurrentEntity(oneSelectivity);
selectivitiesList.add(oneSelectivity);
}
}
@@ -136,7 +134,7 @@
}
protected DefaultComboBoxModel getSelectivityPopulationModel() {
- java.util.List<Species> species = getRegion().getSpecies();
+ java.util.List<Species> species = getFisheryRegion().getSpecies();
java.util.List<Population> populations = new ArrayList<Population>();
if (species != null) {
for (Species s : species) {
Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityUI.jaxx
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityUI.jaxx 2011-03-31 16:06:07 UTC (rev 3223)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityUI.jaxx 2011-04-01 09:54:55 UTC (rev 3224)
@@ -28,42 +28,25 @@
<fr.ifremer.isisfish.entities.Gear id='bean' javaBean='null'/>
<import>
- fr.ifremer.isisfish.entities.Gear;
- java.beans.PropertyChangeEvent;
- java.beans.PropertyChangeListener;
+ fr.ifremer.isisfish.entities.Gear
</import>
- <script><![CDATA[
-
-protected void $afterCompleteSetup() {
- addPropertyChangeListener(PROPERTY_BEAN, new PropertyChangeListener() {
- public void propertyChange(PropertyChangeEvent evt) {
- if (evt.getNewValue() == null) {
-
- }
- if (evt.getNewValue() != null) {
- //getVerifier().addCurrentPanel(editor);
- }
- }
- });
-}
-
- at Override
-public void refresh() {
- Gear gear = (Gear)getVerifier().getEntity(Gear.class);
+ <script><![CDATA[
+/*public void refresh() {
+ Gear gear = (Gear)getSaveVerifier().getEntity(Gear.class);
// add null before, for second to be considered as a changed event
// otherwize, setBean has no effect
setBean(null);
setBean(gear);
- getVerifier().addCurrentPanel(editor);
-}
+ getSaveVerifier().addCurrentPanel(editor);
+}*/
@Override
public void setActionButtons() {
- getVerifier().setSaveButton(save);
- getVerifier().setCancelButton(cancel);
+ getSaveVerifier().setSaveButton(save);
+ getSaveVerifier().setCancelButton(cancel);
}
@Override
Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsBasicsUI.jaxx
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsBasicsUI.jaxx 2011-03-31 16:06:07 UTC (rev 3223)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsBasicsUI.jaxx 2011-04-01 09:54:55 UTC (rev 3224)
@@ -28,17 +28,17 @@
<fr.ifremer.isisfish.entities.SetOfVessels id='bean' javaBean='null'/>
<import>
- fr.ifremer.isisfish.entities.Port;
- fr.ifremer.isisfish.entities.Equation;
- fr.ifremer.isisfish.entities.VesselType;
- fr.ifremer.isisfish.entities.Formule;
- fr.ifremer.isisfish.entities.SetOfVessels;
- jaxx.runtime.swing.editor.NumberEditor;
- java.beans.PropertyChangeEvent;
- java.beans.PropertyChangeListener;
+ fr.ifremer.isisfish.entities.Port
+ fr.ifremer.isisfish.entities.Equation
+ fr.ifremer.isisfish.entities.VesselType
+ fr.ifremer.isisfish.entities.Formule
+ fr.ifremer.isisfish.entities.SetOfVessels
+ jaxx.runtime.swing.editor.NumberEditor
+ java.beans.PropertyChangeEvent
+ java.beans.PropertyChangeListener
</import>
- <script><![CDATA[
+ <script><![CDATA[
boolean init = false;
protected void $afterCompleteSetup() {
@@ -49,17 +49,16 @@
}
if (evt.getNewValue() != null) {
init = true;
- jaxx.runtime.SwingUtil.fillComboBox(fieldSetOfVesselsPort,getRegion().getPort(), getBean().getPort(), true);
- jaxx.runtime.SwingUtil.fillComboBox(fieldSetOfVesselsVesselType,getRegion().getVesselType(), getBean().getVesselType(), true);
+ jaxx.runtime.SwingUtil.fillComboBox(fieldSetOfVesselsPort,getFisheryRegion().getPort(), getBean().getPort(), true);
+ jaxx.runtime.SwingUtil.fillComboBox(fieldSetOfVesselsVesselType,getFisheryRegion().getVesselType(), getBean().getVesselType(), true);
init=false;
}
}
});
}
- at Override
-public void refresh() {
- SetOfVessels setOfVessels = (SetOfVessels)getVerifier().getEntity(SetOfVessels.class);
+/*public void refresh() {
+ SetOfVessels setOfVessels = (SetOfVessels)getSaveVerifier().getEntity(SetOfVessels.class);
// add null before, for second to be considered as a changed event
// otherwize, setBean has no effect
@@ -68,23 +67,23 @@
if (getBean() != null) {
init = true;
- jaxx.runtime.SwingUtil.fillComboBox(fieldSetOfVesselsPort,getRegion().getPort(), getBean().getPort(), true);
- jaxx.runtime.SwingUtil.fillComboBox(fieldSetOfVesselsVesselType,getRegion().getVesselType(), getBean().getVesselType(), true);
+ jaxx.runtime.SwingUtil.fillComboBox(fieldSetOfVesselsPort,getFisheryRegion().getPort(), getBean().getPort(), true);
+ jaxx.runtime.SwingUtil.fillComboBox(fieldSetOfVesselsVesselType,getFisheryRegion().getVesselType(), getBean().getVesselType(), true);
init=false;
- getVerifier().addCurrentPanel(technicalEfficiency);
+ getSaveVerifier().addCurrentPanel(technicalEfficiency);
// NumberEditor is not working
//fieldSetOfVesselsNumberOfVessels.init();
//fieldSetOfVesselsFixedCosts.init();
}
-}
+}*/
@Override
public void setActionButtons() {
- getVerifier().setSaveButton(save);
- getVerifier().setCancelButton(cancel);
- getVerifier().setNewButton(create, SetOfVessels.class);
- getVerifier().setDeleteButton(remove);
+ getSaveVerifier().setSaveButton(save);
+ getSaveVerifier().setCancelButton(cancel);
+ getSaveVerifier().setNewButton(create, SetOfVessels.class);
+ getSaveVerifier().setDeleteButton(remove);
}
protected void portChanged() {
Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsUI.jaxx
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsUI.jaxx 2011-03-31 16:06:07 UTC (rev 3223)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsUI.jaxx 2011-04-01 09:54:55 UTC (rev 3224)
@@ -29,6 +29,7 @@
<import>
static org.nuiton.i18n.I18n.n_
</import>
+
<script><![CDATA[
protected void $afterCompleteSetup() {
setButtonTitle(_("isisfish.input.continueStrategies"));
@@ -39,12 +40,10 @@
installChangeListener(setOfVesselsTab);
}
- at Override
-public void refresh() {
+/*public void refresh() {
+ getSaveVerifier().addCurrentPanel(setOfVesselsBasicsUI, effortDescriptionUI, effortParametersUI);
+}*/
- getVerifier().addCurrentPanel(setOfVesselsBasicsUI, effortDescriptionUI, effortParametersUI);
-}
-
@Override
public void setActionButtons() {
// active les bouton sur l'onglet courant
Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/SpeciesStructuredUI.jaxx
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/SpeciesStructuredUI.jaxx 2011-03-31 16:06:07 UTC (rev 3223)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/SpeciesStructuredUI.jaxx 2011-04-01 09:54:55 UTC (rev 3224)
@@ -28,13 +28,7 @@
<Boolean id='actif' javaBean='false'/>
<script><![CDATA[
-
@Override
- public void refresh() {
-
- }
-
- @Override
public void setActionButtons() {
}
Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/SpeciesUI.jaxx
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/SpeciesUI.jaxx 2011-03-31 16:06:07 UTC (rev 3223)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/SpeciesUI.jaxx 2011-04-01 09:54:55 UTC (rev 3224)
@@ -34,9 +34,8 @@
java.beans.PropertyChangeEvent;
java.beans.PropertyChangeListener;
</import>
- <script><![CDATA[
-
+ <script><![CDATA[
protected void $afterCompleteSetup() {
setButtonTitle(_("isisfish.input.continuePopulations"));
@@ -71,8 +70,8 @@
}
}
-public void refresh() {
- Species species = (Species)getVerifier().getEntity(Species.class);
+/*public void refresh() {
+ Species species = (Species)getSaveVerifier().getEntity(Species.class);
// add null before, for second to be considered as a changed event
// otherwize, setBean has no effect
@@ -84,14 +83,14 @@
// Number Editor is not working
//fieldSpeciesCEE.init();
}
-}
+}*/
@Override
public void setActionButtons() {
- getVerifier().setSaveButton(save);
- getVerifier().setCancelButton(cancel);
- getVerifier().setNewButton(create, Species.class);
- getVerifier().setDeleteButton(delete);
+ getSaveVerifier().setSaveButton(save);
+ getSaveVerifier().setCancelButton(cancel);
+ getSaveVerifier().setNewButton(create, Species.class);
+ getSaveVerifier().setDeleteButton(delete);
}
]]>
Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/StrategyMonthInfoUI.jaxx
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/StrategyMonthInfoUI.jaxx 2011-03-31 16:06:07 UTC (rev 3223)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/StrategyMonthInfoUI.jaxx 2011-04-01 09:54:55 UTC (rev 3224)
@@ -27,14 +27,13 @@
<fr.ifremer.isisfish.entities.Strategy id='bean' javaBean='null'/>
<import>
- org.apache.commons.lang.StringUtils;
- java.beans.PropertyChangeEvent;
- java.beans.PropertyChangeListener;
+ org.apache.commons.lang.StringUtils
+ java.beans.PropertyChangeEvent
+ java.beans.PropertyChangeListener
static org.nuiton.i18n.I18n._
</import>
+
<script><![CDATA[
-
-
protected void $afterCompleteSetup() {
addPropertyChangeListener(PROPERTY_BEAN, new PropertyChangeListener() {
public void propertyChange(PropertyChangeEvent evt) {
@@ -42,25 +41,26 @@
}
if (evt.getNewValue() != null) {
- //refresh();
+
}
}
});
}
- at Override
+/*@Override
public void refresh() {
- /*getVerifier().addCurrentPanel(strategyJanuary, strategyFebuary, strategyMarch,
- strategyApril, strategyMay, strategyJune,
- strategyJuly, strategyAugust, strategySeptember,
- strategyOctober, strategyNovember, strategyDecember);*/
-}
+ //getSaveVerifier().addCurrentPanel(strategyJanuary, strategyFebuary, strategyMarch,
+ // strategyApril, strategyMay, strategyJune,
+ // strategyJuly, strategyAugust, strategySeptember,
+ // strategyOctober, strategyNovember, strategyDecember);
+}*/
@Override
public void setActionButtons() {
- getVerifier().setSaveButton(save);
- getVerifier().setCancelButton(cancel);
+ getSaveVerifier().setSaveButton(save);
+ getSaveVerifier().setCancelButton(cancel);
}
+
@Override
public void setLayer(boolean active) {
strategyJanuary.setLayer(active);
Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/StrategyOneMonthInfoUI.jaxx
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/StrategyOneMonthInfoUI.jaxx 2011-03-31 16:06:07 UTC (rev 3223)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/StrategyOneMonthInfoUI.jaxx 2011-04-01 09:54:55 UTC (rev 3224)
@@ -33,18 +33,17 @@
<fr.ifremer.isisfish.entities.StrategyMonthInfo id='strategyMonthInfo' javaBean='null'/>
<import>
- fr.ifremer.isisfish.entities.Strategy;
- fr.ifremer.isisfish.entities.StrategyMonthInfo;
- org.nuiton.math.matrix.gui.MatrixPanelEvent;
- jaxx.runtime.swing.editor.NumberEditor;
- fr.ifremer.isisfish.entities.TripType;
- org.nuiton.math.matrix.gui.MatrixPanelListener;
- java.beans.PropertyChangeEvent;
- java.beans.PropertyChangeListener;
+ fr.ifremer.isisfish.entities.Strategy
+ fr.ifremer.isisfish.entities.StrategyMonthInfo
+ org.nuiton.math.matrix.gui.MatrixPanelEvent
+ jaxx.runtime.swing.editor.NumberEditor
+ fr.ifremer.isisfish.entities.TripType
+ org.nuiton.math.matrix.gui.MatrixPanelListener
+ java.beans.PropertyChangeEvent
+ java.beans.PropertyChangeListener
</import>
- <script><![CDATA[
-
+ <script><![CDATA[
protected void $afterCompleteSetup() {
addPropertyChangeListener(PROPERTY_BEAN, new PropertyChangeListener() {
public void propertyChange(PropertyChangeEvent evt) {
@@ -67,9 +66,8 @@
}
}
- at Override
public void refresh() {
- Strategy strategy = (Strategy)getVerifier().getEntity(Strategy.class);
+ Strategy strategy = (Strategy)getSaveVerifier().getEntity(Strategy.class);
// don't use setBean(null) here
//setBean(strategy);
@@ -82,7 +80,7 @@
// otherwize, setBean has no effect
setStrategyMonthInfo(null);
setStrategyMonthInfo((StrategyMonthInfo)monthInfos[month]);
- getVerifier().addCurrentEntity(getStrategyMonthInfo());
+ getSaveVerifier().addCurrentEntity(getStrategyMonthInfo());
if (getStrategyMonthInfo() != null) {
numberOfTrips.putClientProperty("sensitivityBeanID", getStrategyMonthInfo().getTopiaId());
@@ -92,7 +90,7 @@
for (ActionListener listener : listeners) {
fieldStrategyMonthInfoTripType.removeActionListener(listener);
}
- jaxx.runtime.SwingUtil.fillComboBox(fieldStrategyMonthInfoTripType,getRegion().getTripType(), getStrategyMonthInfo().getTripType(), true);
+ jaxx.runtime.SwingUtil.fillComboBox(fieldStrategyMonthInfoTripType,getFisheryRegion().getTripType(), getStrategyMonthInfo().getTripType(), true);
for (ActionListener listener : listeners) {
fieldStrategyMonthInfoTripType.addActionListener(listener);
}
Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/StrategyTabUI.jaxx
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/StrategyTabUI.jaxx 2011-03-31 16:06:07 UTC (rev 3223)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/StrategyTabUI.jaxx 2011-04-01 09:54:55 UTC (rev 3224)
@@ -28,24 +28,37 @@
<fr.ifremer.isisfish.entities.Strategy id='bean' javaBean='null'/>
<import>
- fr.ifremer.isisfish.entities.Equation;
- fr.ifremer.isisfish.entities.Strategy;
- fr.ifremer.isisfish.entities.Formule;
- fr.ifremer.isisfish.entities.SetOfVessels;
- org.nuiton.topia.persistence.TopiaEntity;
- fr.ifremer.isisfish.ui.WelcomePanelUI;
+ fr.ifremer.isisfish.entities.Equation
+ fr.ifremer.isisfish.entities.Strategy
+ fr.ifremer.isisfish.entities.Formule
+ fr.ifremer.isisfish.entities.SetOfVessels
+ org.nuiton.topia.persistence.TopiaEntity
+ fr.ifremer.isisfish.ui.WelcomePanelUI
+ java.beans.PropertyChangeEvent
+ java.beans.PropertyChangeListener
</import>
+
<script><![CDATA[
+protected void $afterCompleteSetup() {
+ addPropertyChangeListener(PROPERTY_BEAN, new PropertyChangeListener() {
+ public void propertyChange(PropertyChangeEvent evt) {
+ if (evt.getNewValue() == null) {
+ }
+ if (evt.getNewValue() != null) {
+ refresh();
+ }
+ }
+ });
+}
- at Override
public void refresh() {
- Strategy strategy = (Strategy)getVerifier().getEntity(Strategy.class);
+ //Strategy strategy = (Strategy)getSaveVerifier().getEntity(Strategy.class);
// add null before, for second to be considered as a changed event
// otherwize, setBean has no effect
- setBean(null);
- setBean(strategy);
+ //setBean(null);
+ //setBean(strategy);
if (getBean() != null) {
setSetOfVesselsModel();
@@ -54,7 +67,7 @@
// code to replace bindings :
strategyInactivity.setActive(isActive() && getBean().getInactivityEquationUsed());
- getVerifier().addCurrentPanel(strategyInactivity);
+ //getSaveVerifier().addCurrentPanel(strategyInactivity);
}
else {
// listener seam to be called after refresh and remove content :(
@@ -70,10 +83,10 @@
@Override
public void setActionButtons() {
- getVerifier().setSaveButton(save);
- getVerifier().setCancelButton(cancel);
- getVerifier().setNewButton(create, Strategy.class);
- getVerifier().setDeleteButton(remove);
+ getSaveVerifier().setSaveButton(save);
+ getSaveVerifier().setCancelButton(cancel);
+ getSaveVerifier().setNewButton(create, Strategy.class);
+ getSaveVerifier().setDeleteButton(remove);
}
protected void setSetOfVesselsModel() {
@@ -81,7 +94,7 @@
for (ActionListener listener : listeners) {
fieldStrategySetOfVessels.removeActionListener(listener);
}
- jaxx.runtime.SwingUtil.fillComboBox(fieldStrategySetOfVessels,getRegion().getSetOfVessels(), getBean().getSetOfVessels(), true);
+ jaxx.runtime.SwingUtil.fillComboBox(fieldStrategySetOfVessels,getFisheryRegion().getSetOfVessels(), getBean().getSetOfVessels(), true);
for (ActionListener listener : listeners) {
fieldStrategySetOfVessels.addActionListener(listener);
}
Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/StrategyUI.jaxx
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/StrategyUI.jaxx 2011-03-31 16:06:07 UTC (rev 3223)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/StrategyUI.jaxx 2011-04-01 09:54:55 UTC (rev 3224)
@@ -33,12 +33,10 @@
installChangeListener(strategyTab);
}
- at Override
-public void refresh() {
+/*public void refresh() {
+ getSaveVerifier().addCurrentPanel(strategyMonthInfoUI, strategyTabUI);
+}*/
- getVerifier().addCurrentPanel(strategyMonthInfoUI, strategyTabUI);
-}
-
@Override
public void setActionButtons() {
// active les bouton sur l'onglet courant
Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/TripTypeUI.jaxx
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/TripTypeUI.jaxx 2011-03-31 16:06:07 UTC (rev 3223)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/TripTypeUI.jaxx 2011-04-01 09:54:55 UTC (rev 3224)
@@ -29,50 +29,47 @@
<import>
static org.nuiton.i18n.I18n.n_
- fr.ifremer.isisfish.entities.TripType;
- fr.ifremer.isisfish.types.TimeUnit;
- java.beans.PropertyChangeEvent;
- java.beans.PropertyChangeListener;
+ fr.ifremer.isisfish.entities.TripType
+ fr.ifremer.isisfish.types.TimeUnit
+ java.beans.PropertyChangeEvent
+ java.beans.PropertyChangeListener
</import>
+
<script><![CDATA[
+protected void $afterCompleteSetup() {
+ setButtonTitle(_("isisfish.input.continueVesselTypes"));
+ setNextPath(n_("isisfish.input.tree.vesseltypes"));
-
-setButtonTitle(_("isisfish.input.continueVesselTypes"));
-setNextPath(n_("isisfish.input.tree.vesseltypes"));
-
-addPropertyChangeListener("bean", new PropertyChangeListener() {
- public void propertyChange(PropertyChangeEvent evt) {
- if (evt.getOldValue() != null || evt.getNewValue() == null) {
- // remove previous binding on getBean()
- //jaxx.runtime.SwingUtil.removeDataBinding(get$Table0(), "fieldCellName.text", "fieldCellLongitude.text", "fieldCellLatitude.text", "fieldCellLand.selected", "fieldCellComment.text");
- fieldTripTypeName.setText("");
- fieldTripTypeDuration.setText("");
- fieldTripTypeMinTimeBetweenTrip.setText("");
- fieldTripTypeComment.setText("");
+ addPropertyChangeListener(PROPERTY_BEAN, new PropertyChangeListener() {
+ public void propertyChange(PropertyChangeEvent evt) {
+ if (evt.getOldValue() != null || evt.getNewValue() == null) {
+ fieldTripTypeName.setText("");
+ fieldTripTypeDuration.setText("");
+ fieldTripTypeMinTimeBetweenTrip.setText("");
+ fieldTripTypeComment.setText("");
+ }
+ if (evt.getNewValue() != null) {
+
+ }
}
- if (evt.getNewValue() != null) {
- // add binding on getBean()
- //jaxx.runtime.SwingUtil.applyDataBinding(get$Table0(), "fieldCellName.text", "fieldCellLongitude.text", "fieldCellLatitude.text", "fieldCellLand.selected", "fieldCellComment.text");
- }
- }
-});
+ });
+}
- at Override
-public void refresh() {
- TripType tripType = (TripType)getVerifier().getEntity(TripType.class);
+/*public void refresh() {
+ TripType tripType = (TripType)getSaveVerifier().getEntity(TripType.class);
// add null before, for second to be considered as a changed event
// otherwize, setBean has no effect
setBean(null);
setBean(tripType);
-}
+}*/
@Override
public void setActionButtons() {
- getVerifier().setSaveButton(save);
- getVerifier().setCancelButton(cancel);
- getVerifier().setNewButton(create, TripType.class);
- getVerifier().setDeleteButton(delete);
+ getSaveVerifier().setSaveButton(save);
+ getSaveVerifier().setCancelButton(cancel);
+ getSaveVerifier().setNewButton(create, TripType.class);
+ getSaveVerifier().setDeleteButton(delete);
}
]]>
</script>
Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/VesselTypeUI.jaxx
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/VesselTypeUI.jaxx 2011-03-31 16:06:07 UTC (rev 3223)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/VesselTypeUI.jaxx 2011-04-01 09:54:55 UTC (rev 3224)
@@ -29,17 +29,16 @@
<import>
static org.nuiton.i18n.I18n.n_
- fr.ifremer.isisfish.entities.VesselType;
- fr.ifremer.isisfish.entities.TripType;
- fr.ifremer.isisfish.types.TimeUnit;
- fr.ifremer.isisfish.ui.input.triptype.TripTypeListModel;
- jaxx.runtime.swing.editor.NumberEditor;
- java.beans.PropertyChangeEvent;
- java.beans.PropertyChangeListener;
+ fr.ifremer.isisfish.entities.VesselType
+ fr.ifremer.isisfish.entities.TripType
+ fr.ifremer.isisfish.types.TimeUnit
+ fr.ifremer.isisfish.ui.input.triptype.TripTypeListModel
+ jaxx.runtime.swing.editor.NumberEditor
+ java.beans.PropertyChangeEvent
+ java.beans.PropertyChangeListener
</import>
- <script><![CDATA[
-
+ <script><![CDATA[
protected void $afterCompleteSetup() {
setButtonTitle(_("isisfish.input.continueSetOfVessels"));
setNextPath(n_("isisfish.input.tree.setofvessels"));
@@ -64,9 +63,8 @@
});
}
- at Override
-public void refresh() {
- VesselType vesselType = getVerifier().getEntity(VesselType.class);
+/*public void refresh() {
+ VesselType vesselType = getSaveVerifier().getEntity(VesselType.class);
// add null before, for second to be considered as a changed event
// otherwize, setBean has no effect
@@ -76,27 +74,27 @@
if (getBean() != null) {
setListModel();
- /* NumberEditor is not working
- fieldVesselTypeLength.init();
- fieldVesselTypeLength.init();
- fieldVesselTypeSpeed.init();
- fieldVesselTypeActivityRange.init();
- fieldVesselTypeMinCrewSize.init();
- fieldVesselTypeSpeed.init();
- fieldVesselTypeUnitFuelCostOfTravel.init(); */
+ // NumberEditor is not working
+ //fieldVesselTypeLength.init();
+ //fieldVesselTypeLength.init();
+ //fieldVesselTypeSpeed.init();
+ //fieldVesselTypeActivityRange.init();
+ //fieldVesselTypeMinCrewSize.init();
+ //fieldVesselTypeSpeed.init();
+ //fieldVesselTypeUnitFuelCostOfTravel.init();
}
-}
+}*/
@Override
public void setActionButtons() {
- getVerifier().setSaveButton(save);
- getVerifier().setCancelButton(cancel);
- getVerifier().setNewButton(create, VesselType.class);
- getVerifier().setDeleteButton(delete);
+ getSaveVerifier().setSaveButton(save);
+ getSaveVerifier().setCancelButton(cancel);
+ getSaveVerifier().setNewButton(create, VesselType.class);
+ getSaveVerifier().setDeleteButton(delete);
}
protected void setListModel() {
- java.util.List<TripType> tripTypes = getRegion().getTripType();
+ java.util.List<TripType> tripTypes = getFisheryRegion().getTripType();
TripTypeListModel tripTypeModel = new TripTypeListModel(tripTypes);
vesselTypeTripType.setModel(tripTypeModel);
Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/WizardGroupCreationUI.jaxx
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/WizardGroupCreationUI.jaxx 2011-03-31 16:06:07 UTC (rev 3223)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/WizardGroupCreationUI.jaxx 2011-04-01 09:54:55 UTC (rev 3224)
@@ -24,14 +24,14 @@
-->
<JPanel id="wizardGroup" layout='{new BorderLayout()}'>
<import>
- org.nuiton.topia.TopiaContext;
- fr.ifremer.isisfish.IsisFishDAOHelper;
- fr.ifremer.isisfish.entities.Equation;
- fr.ifremer.isisfish.entities.Population;
- fr.ifremer.isisfish.entities.PopulationImpl;
- fr.ifremer.isisfish.entities.PopulationGroup;
- fr.ifremer.isisfish.entities.PopulationGroupDAO;
- fr.ifremer.isisfish.entities.PopulationDAO;
+ org.nuiton.topia.TopiaContext
+ fr.ifremer.isisfish.IsisFishDAOHelper
+ fr.ifremer.isisfish.entities.Equation
+ fr.ifremer.isisfish.entities.Population
+ fr.ifremer.isisfish.entities.PopulationImpl
+ fr.ifremer.isisfish.entities.PopulationGroup
+ fr.ifremer.isisfish.entities.PopulationGroupDAO
+ fr.ifremer.isisfish.entities.PopulationDAO
java.awt.CardLayout
javax.swing.JFrame
</import>
Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx 2011-03-31 16:06:07 UTC (rev 3223)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx 2011-04-01 09:54:55 UTC (rev 3224)
@@ -29,27 +29,25 @@
<import>
static org.nuiton.i18n.I18n.n_
- javax.swing.event.ListSelectionEvent;
- fr.ifremer.isisfish.entities.Cell;
- fr.ifremer.isisfish.entities.Zone;
- fr.ifremer.isisfish.map.CellSelectionLayer;
- fr.ifremer.isisfish.map.CopyMapToClipboardListener;
- com.bbn.openmap.event.SelectMouseMode;
- com.bbn.openmap.gui.Tool;
- com.bbn.openmap.gui.OMToolSet;
- java.beans.PropertyChangeEvent;
- java.beans.PropertyChangeListener;
+ javax.swing.event.ListSelectionEvent
+ fr.ifremer.isisfish.entities.Cell
+ fr.ifremer.isisfish.entities.Zone
+ fr.ifremer.isisfish.map.CellSelectionLayer
+ fr.ifremer.isisfish.map.CopyMapToClipboardListener
+ com.bbn.openmap.event.SelectMouseMode
+ com.bbn.openmap.gui.Tool
+ com.bbn.openmap.gui.OMToolSet
+ java.beans.PropertyChangeEvent
+ java.beans.PropertyChangeListener
java.awt.event.MouseEvent
javax.swing.DefaultListModel
java.util.ArrayList
</import>
- <script><![CDATA[
-
+ <script><![CDATA[
protected OMToolSet toolSet = new OMToolSet();
protected void $afterCompleteSetup() {
-
setButtonTitle(_("isisfish.input.continuePorts"));
setNextPath(n_("isisfish.input.tree.ports"));
@@ -84,9 +82,8 @@
});
}
- at Override
-public void refresh() {
- Zone zone = getVerifier().getEntity(Zone.class);
+/*public void refresh() {
+ Zone zone = getSaveVerifier().getEntity(Zone.class);
// add null before, for second to be considered as a changed event
// otherwize, setBean has no effect
@@ -95,20 +92,20 @@
// reload region in map
refreshRegionInMap(zoneMap);
-}
+}*/
@Override
public void setActionButtons() {
- getVerifier().setSaveButton(save);
- getVerifier().setCancelButton(cancel);
- getVerifier().setNewButton(create, Zone.class);
- getVerifier().setDeleteButton(remove);
+ getSaveVerifier().setSaveButton(save);
+ getSaveVerifier().setCancelButton(cancel);
+ getSaveVerifier().setNewButton(create, Zone.class);
+ getSaveVerifier().setDeleteButton(remove);
}
protected void setZoneCells(){
if (getBean() != null){
DefaultListModel model = new DefaultListModel();
- for (Cell c : getRegion().getCell())
+ for (Cell c : getFisheryRegion().getCell())
model.addElement(c);
zoneCells.setModel(model);
if (getBean().getCell() != null){
@@ -207,7 +204,7 @@
<fr.ifremer.isisfish.map.IsisMapBean id='zoneMap'
javaBean='new fr.ifremer.isisfish.map.IsisMapBean()'
selectionMode="{fr.ifremer.isisfish.map.CellSelectionLayer.MULT_SELECTION}"
- fisheryRegion='{getRegion()}' selectedCells='{getBean().getCell()}'
+ fisheryRegion='{getFisheryRegion()}' selectedCells='{getBean().getCell()}'
decorator='boxed' constraints='BorderLayout.CENTER'/>
</JPanel>
</JSplitPane>
Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/models/common/StringListModel.java
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/models/common/StringListModel.java 2011-03-31 16:06:07 UTC (rev 3223)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/models/common/StringListModel.java 2011-04-01 09:54:55 UTC (rev 3224)
@@ -5,7 +5,7 @@
* $Id$
* $HeadURL$
* %%
- * Copyright (C) 1999 - 2011 CodeLutin
+ * 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
@@ -22,23 +22,6 @@
* <http://www.gnu.org/licenses/gpl-2.0.html>.
* #L%
*/
-/* *##%
- * Copyright (C) 2009-2010 Ifremer, Code Lutin
- *
- * 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.
- *##%*/
package fr.ifremer.isisfish.ui.models.common;
Deleted: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/models/result/ResultListModel.java
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/models/result/ResultListModel.java 2011-03-31 16:06:07 UTC (rev 3223)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/models/result/ResultListModel.java 2011-04-01 09:54:55 UTC (rev 3224)
@@ -1,108 +0,0 @@
-/*
- * #%L
- * IsisFish
- *
- * $Id$
- * $HeadURL$
- * %%
- * Copyright (C) 2009 - 2010 Ifremer, Code Lutin
- * %%
- * 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.ui.models.result;
-
-import java.util.List;
-
-import javax.swing.DefaultListModel;
-
-import fr.ifremer.isisfish.ui.models.common.StringListModel;
-
-/**
- * Model pour la liste des noms de resultats de simulation.
- *
- * @author chatellier
- * @version $Revision$
- *
- * Last update : $Date$
- * By : $Author$
- *
- * @deprecated use {@link StringListModel}
- */
-public class ResultListModel extends DefaultListModel {
-
- /** serialVersionUID. */
- private static final long serialVersionUID = -4070846632975105788L;
-
- /** Results names. */
- protected List<String> resultsNames;
-
- /**
- * Empty constructor.
- */
- public ResultListModel() {
- this(null);
- }
-
- /**
- * Constructor with result names list.
- *
- * @param resultsNames result Names
- */
- public ResultListModel(List<String> resultsNames) {
- super();
- setResultNames(resultsNames);
- }
-
- /**
- * Get result names.
- *
- * @return the result plan names
- */
- public List<String> getResultNames() {
- return resultsNames;
- }
-
- /**
- * Set result names.
- *
- * @param resultsNames the result names to set
- */
- public void setResultNames(List<String> resultsNames) {
- this.resultsNames = resultsNames;
- }
-
- /*
- * @see javax.swing.ListModel#getElementAt(int)
- */
- @Override
- public Object getElementAt(int index) {
- return resultsNames.get(index);
- }
-
- /*
- * @see javax.swing.ListModel#getSize()
- */
- @Override
- public int getSize() {
- int size = 0;
-
- if (resultsNames != null) {
- size = resultsNames.size();
- }
- return size;
- }
-}
Deleted: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/models/sensitivityexport/SensitivityExportNameListModel.java
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/models/sensitivityexport/SensitivityExportNameListModel.java 2011-03-31 16:06:07 UTC (rev 3223)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/models/sensitivityexport/SensitivityExportNameListModel.java 2011-04-01 09:54:55 UTC (rev 3224)
@@ -1,108 +0,0 @@
-/*
- * #%L
- * IsisFish
- *
- * $Id$
- * $HeadURL$
- * %%
- * Copyright (C) 2009 - 2010 Ifremer, Code Lutin
- * %%
- * 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.ui.models.sensitivityexport;
-
-import java.util.List;
-
-import javax.swing.DefaultListModel;
-
-import fr.ifremer.isisfish.ui.models.common.StringListModel;
-
-/**
- * Model pour la liste des noms d'exports.
- *
- * @author chatellier
- * @version $Revision$
- *
- * Last update : $Date$
- * By : $Author: chatellier $
- *
- * @deprecated use {@link StringListModel}
- */
-public class SensitivityExportNameListModel extends DefaultListModel {
-
- /** serialVersionUID. */
- private static final long serialVersionUID = -4070846632975105788L;
-
- /** Analyze plan names. */
- protected List<String> sensitivityExportNames;
-
- /**
- * Empty constructor.
- */
- public SensitivityExportNameListModel() {
- this(null);
- }
-
- /**
- * Constructor with export list.
- *
- * @param exportNames exports Names
- */
- public SensitivityExportNameListModel(List<String> exportNames) {
- super();
- setSensitivityExportNames(exportNames);
- }
-
- /**
- * Get exports names.
- *
- * @return the analyze plan names
- */
- public List<String> getSensitivityExportNames() {
- return sensitivityExportNames;
- }
-
- /**
- * Set export names.
- *
- * @param sensitivityExportNames the exports names to set
- */
- public void setSensitivityExportNames(List<String> sensitivityExportNames) {
- this.sensitivityExportNames = sensitivityExportNames;
- }
-
- /*
- * @see javax.swing.ListModel#getElementAt(int)
- */
- @Override
- public Object getElementAt(int index) {
- return sensitivityExportNames.get(index);
- }
-
- /*
- * @see javax.swing.ListModel#getSize()
- */
- @Override
- public int getSize() {
- int size = 0;
-
- if (sensitivityExportNames != null) {
- size = sensitivityExportNames.size();
- }
- return size;
- }
-}
Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityChooserUI.jaxx
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityChooserUI.jaxx 2011-03-31 16:06:07 UTC (rev 3223)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityChooserUI.jaxx 2011-04-01 09:54:55 UTC (rev 3224)
@@ -24,32 +24,31 @@
-->
<Table>
<import>
- javax.swing.table.DefaultTableModel;
- fr.ifremer.isisfish.ui.simulator.SimulAction;
- fr.ifremer.isisfish.simulator.sensitivity.Domain;
- fr.ifremer.isisfish.simulator.sensitivity.Factor;
- fr.ifremer.isisfish.simulator.sensitivity.SensitivityCalculator;
- fr.ifremer.isisfish.simulator.sensitivity.domain.ContinuousDomain;
- fr.ifremer.isisfish.export.SensitivityExport;
-
- fr.ifremer.isisfish.ui.models.sensitivityexport.SensitivityExportListModel;
- fr.ifremer.isisfish.ui.models.sensitivityexport.SensitivityExportListRenderer;
- fr.ifremer.isisfish.ui.models.sensitivityexport.SensitivityExportNameListModel;
- fr.ifremer.isisfish.ui.models.sensitivityexport.SensitivityExportNameListRenderer;
- fr.ifremer.isisfish.ui.models.sensitivityexport.SensitivityExportParametersTableCellEditor;
- fr.ifremer.isisfish.ui.models.sensitivityexport.SensitivityExportParametersTableCellRenderer;
- fr.ifremer.isisfish.ui.models.sensitivityexport.SensitivityExportParametersTableModel;
-
- fr.ifremer.isisfish.ui.models.sensitivity.SensitivityCalculatorComboModel;
- fr.ifremer.isisfish.ui.models.sensitivity.SensitivityCalculatorComboRenderer;
- fr.ifremer.isisfish.ui.models.sensitivity.SensitivityCalculatorListModel;
- fr.ifremer.isisfish.ui.models.sensitivity.SensitivityCalculatorListRenderer;
- fr.ifremer.isisfish.ui.models.sensitivity.SensitivityCalculatorParametersTableCellEditor;
- fr.ifremer.isisfish.ui.models.sensitivity.SensitivityCalculatorParametersTableCellRenderer;
- fr.ifremer.isisfish.ui.models.sensitivity.SensitivityCalculatorParametersTableModel;
java.awt.CardLayout
javax.swing.ComboBoxModel
- fr.ifremer.isisfish.datastore.RegionStorage;
+ javax.swing.table.DefaultTableModel
+ fr.ifremer.isisfish.datastore.RegionStorage
+ fr.ifremer.isisfish.export.SensitivityExport
+ fr.ifremer.isisfish.simulator.sensitivity.Domain
+ fr.ifremer.isisfish.simulator.sensitivity.Factor
+ fr.ifremer.isisfish.simulator.sensitivity.SensitivityCalculator
+ fr.ifremer.isisfish.simulator.sensitivity.domain.ContinuousDomain
+ fr.ifremer.isisfish.ui.models.common.StringListModel
+ fr.ifremer.isisfish.ui.models.sensitivityexport.SensitivityExportListModel
+ fr.ifremer.isisfish.ui.models.sensitivityexport.SensitivityExportListRenderer
+ fr.ifremer.isisfish.ui.models.sensitivityexport.SensitivityExportNameListRenderer
+ fr.ifremer.isisfish.ui.models.sensitivityexport.SensitivityExportParametersTableCellEditor
+ fr.ifremer.isisfish.ui.models.sensitivityexport.SensitivityExportParametersTableCellRenderer
+ fr.ifremer.isisfish.ui.models.sensitivityexport.SensitivityExportParametersTableModel
+ fr.ifremer.isisfish.ui.models.sensitivity.SensitivityCalculatorComboModel
+ fr.ifremer.isisfish.ui.models.sensitivity.SensitivityCalculatorComboRenderer
+ fr.ifremer.isisfish.ui.models.sensitivity.SensitivityCalculatorListModel
+ fr.ifremer.isisfish.ui.models.sensitivity.SensitivityCalculatorListRenderer
+ fr.ifremer.isisfish.ui.models.sensitivity.SensitivityCalculatorParametersTableCellEditor
+ fr.ifremer.isisfish.ui.models.sensitivity.SensitivityCalculatorParametersTableCellRenderer
+ fr.ifremer.isisfish.ui.models.sensitivity.SensitivityCalculatorParametersTableModel
+ fr.ifremer.isisfish.ui.simulator.SimulAction
+
</import>
<script><![CDATA[
@@ -133,9 +132,9 @@
factorCardinality.setModel(model);
}
- protected SensitivityExportNameListModel getAvailableExportListModel() {
+ protected StringListModel getAvailableExportListModel() {
java.util.List<String> exportNames = getSimulAction().getSensitivityExportNames();
- SensitivityExportNameListModel model = new SensitivityExportNameListModel(exportNames);
+ StringListModel model = new StringListModel(exportNames);
return model;
}
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-03-31 16:06:07 UTC (rev 3223)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityInputHandler.java 2011-04-01 09:54:55 UTC (rev 3224)
@@ -159,10 +159,10 @@
InputContentUI inputContentUI = getUIInstanceForBeanClass(internalClass, sensitivityTabUI);
// mandatory set
- inputContentUI.getVerifier().reset(); // before set bean !!!
+ inputContentUI.getSaveVerifier().reset(); // before set bean !!!
if (topiaEntity != null) {
- inputContentUI.getVerifier().addCurrentEntity(topiaEntity);
- inputContentUI.getVerifier().setInputContentUI(inputContentUI);
+ inputContentUI.getSaveVerifier().addCurrentEntity(topiaEntity);
+ inputContentUI.getSaveVerifier().setInputContentUI(inputContentUI);
}
inputContentUI.setBean((TopiaEntityContextable)topiaEntity);
Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityTabbedPaneListener.java
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityTabbedPaneListener.java 2011-03-31 16:06:07 UTC (rev 3223)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityTabbedPaneListener.java 2011-04-01 09:54:55 UTC (rev 3224)
@@ -5,7 +5,7 @@
* $Id$
* $HeadURL$
* %%
- * Copyright (C) 2009 - 2010 Ifremer, CodeLutin
+ * 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
@@ -25,8 +25,6 @@
package fr.ifremer.isisfish.ui.sensitivity;
-import fr.ifremer.isisfish.ui.input.InputContentUI;
-import javax.swing.JTabbedPane;
import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener;
import org.apache.commons.logging.Log;
@@ -50,47 +48,33 @@
@Override
public void stateChanged(ChangeEvent e) {
- try {
+ /*try {
JTabbedPane pane = (JTabbedPane)e.getSource();
pane.removeChangeListener(this);
int selectedIndex = pane.getSelectedIndex();
if (cacheSelectedIndex != -1){
pane.setSelectedIndex(cacheSelectedIndex);
}
- if (InputContentUI.class.isInstance(pane.getSelectedComponent())){
- InputContentUI ui = (InputContentUI) pane.getSelectedComponent();
- if (closeUI(ui)) {
- pane.setSelectedIndex(selectedIndex);
- }
- if (InputContentUI.class.isInstance(pane.getSelectedComponent())){
- ui = (InputContentUI) pane.getSelectedComponent();
- ui.setSensitivity(true);
- ui.setLayer(true);
- // otherwise save.cancel buttons are active in last
- // refreshed ui
- ui.setActionButtons();
- ui.refresh();
- cacheSelectedIndex = pane.getSelectedIndex();
- pane.addChangeListener(this);
-
- // bug suis les UI autre que nimbus
- // la selection des onglet ne se rafraichit pas tres bien
- pane.repaint();
- }
- }
+ InputContentUI ui = (InputContentUI) pane.getSelectedComponent();
+ pane.setSelectedIndex(selectedIndex);
+ ui = (InputContentUI) pane.getSelectedComponent();
+ //ui.setSensitivity(true);
+ //ui.setLayer(true);
+ // otherwise save.cancel buttons are active in last
+ // refreshed ui
+ TopiaEntityContextable entity = ui.getBean();
+ // refresh ui
+ ui.setBean(null);
+ ui.setBean(entity);
+ ui.setActionButtons();
+ cacheSelectedIndex = pane.getSelectedIndex();
+ pane.addChangeListener(this);
+
+ // bug suis les UI autre que nimbus
+ // la selection des onglet ne se rafraichit pas tres bien
+ pane.repaint();
} catch (Exception ex) {
log.error(ex);
- }
+ }*/
}
-
- /**
- * Ask you to save if modification are made.
- *
- * @param context selected
- * @return true to change tab
- */
- protected boolean closeUI(InputContentUI context) throws Exception {
- boolean exit = true;
- return exit;
- }
}
Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/ResultChoiceUI.jaxx
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/ResultChoiceUI.jaxx 2011-03-31 16:06:07 UTC (rev 3223)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/ResultChoiceUI.jaxx 2011-04-01 09:54:55 UTC (rev 3224)
@@ -24,9 +24,9 @@
-->
<JPanel layout='{new BorderLayout()}'>
<import>
- fr.ifremer.isisfish.ui.WelcomePanelUI;
- fr.ifremer.isisfish.ui.models.result.ResultListModel;
- javax.swing.event.ListSelectionEvent;
+ fr.ifremer.isisfish.ui.WelcomePanelUI
+ fr.ifremer.isisfish.ui.models.common.StringListModel
+ javax.swing.event.ListSelectionEvent
</import>
<script><![CDATA[
@@ -53,7 +53,7 @@
// userResults = intersection(userResults,availableResult)
userResults.retainAll(availableResults);
- ResultListModel resultModel = new ResultListModel(availableResults);
+ StringListModel resultModel = new StringListModel(availableResults);
listResultNames.setModel(resultModel);
for (String userResult : userResults) {
1
0
r3223 - in isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input: . tree tree/loadors
by chatellier@users.labs.libre-entreprise.org 31 Mar '11
by chatellier@users.labs.libre-entreprise.org 31 Mar '11
31 Mar '11
Author: chatellier
Date: 2011-03-31 16:06:07 +0000 (Thu, 31 Mar 2011)
New Revision: 3223
Log:
Fix tree nextPath navigation
Modified:
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/CellUI.jaxx
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/GearUI.jaxx
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.jaxx
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/InputHandler.java
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/MetierUI.jaxx
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationUI.jaxx
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PortUI.jaxx
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsUI.jaxx
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/SpeciesUI.jaxx
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/TripTypeUI.jaxx
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/VesselTypeUI.jaxx
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/FisheryTreeHelper.java
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/FisheryTreeRenderer.java
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/SpeciesNodeLoador.java
Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/CellUI.jaxx
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/CellUI.jaxx 2011-03-31 16:02:49 UTC (rev 3222)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/CellUI.jaxx 2011-03-31 16:06:07 UTC (rev 3223)
@@ -28,6 +28,7 @@
<fr.ifremer.isisfish.entities.Cell id='bean' javaBean='null'/>
<import>
+ static org.nuiton.i18n.I18n.n_
java.awt.event.MouseEvent;
fr.ifremer.isisfish.entities.Cell;
com.bbn.openmap.gui.Tool;
@@ -48,7 +49,8 @@
protected void $afterCompleteSetup() {
setButtonTitle(_("isisfish.input.continueZones"));
- setNextPath("$root/$zones");
+ setNextPath(n_("isisfish.input.tree.zones"));
+
new OpenMapEvents(cellMap, new SelectMouseMode(false), CellSelectionLayer.SINGLE_SELECTION) {
@Override
public boolean mouseClicked(MouseEvent e) {
Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/GearUI.jaxx
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/GearUI.jaxx 2011-03-31 16:02:49 UTC (rev 3222)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/GearUI.jaxx 2011-03-31 16:06:07 UTC (rev 3223)
@@ -27,6 +27,7 @@
<fr.ifremer.isisfish.entities.Gear id='bean' javaBean='null'/>
<import>
+ static org.nuiton.i18n.I18n.n_
java.beans.PropertyChangeEvent;
java.beans.PropertyChangeListener;
</import>
@@ -34,7 +35,7 @@
protected void $afterCompleteSetup() {
setButtonTitle(_("isisfish.input.continueMetiers"));
- setNextPath("$root/$metiers");
+ setNextPath(n_("isisfish.input.tree.metiers"));
addPropertyChangeListener(PROPERTY_BEAN, new PropertyChangeListener() {
public void propertyChange(PropertyChangeEvent evt) {
Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.jaxx
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.jaxx 2011-03-31 16:02:49 UTC (rev 3222)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.jaxx 2011-03-31 16:06:07 UTC (rev 3223)
@@ -33,7 +33,7 @@
<Boolean id='sensitivity' javaBean='false'/>
<!-- Next button title -->
- <java.lang.String id='buttonTitle' javaBean='""'/>
+ <java.lang.String id='buttonTitle' javaBean='null'/>
<!-- Next path -->
<java.lang.String id='nextPath' javaBean='null'/>
@@ -129,8 +129,12 @@
}
}
protected void goTo() {
- // FIXME echatellier 20110306 use new tree api
- //getParentContainer(InputUI.class).setTreeSelection(getNextPath());
+ // FIXME il ne faut pas appeler le parent
+ // on ne sais jamais de quel type est le parent
+ InputUI inputUI = getParentContainer(InputUI.class);
+ if (inputUI != null) {
+ inputUI.getHandler().setTreeSelection(this, nextPath);
+ }
}
/**
@@ -228,5 +232,5 @@
]]></script>
<JPanel id='body' constraints='BorderLayout.CENTER' layout='{new BorderLayout()}' />
<JButton id='next' text='{getButtonTitle()}' constraints='BorderLayout.SOUTH'
- visible='{getNextPath() != null}' onActionPerformed='goTo()' decorator='boxed'/>
+ visible='{getButtonTitle() != null}' onActionPerformed='goTo()' decorator='boxed'/>
</JPanel>
Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/InputHandler.java
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/InputHandler.java 2011-03-31 16:02:49 UTC (rev 3222)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/InputHandler.java 2011-03-31 16:06:07 UTC (rev 3223)
@@ -589,13 +589,32 @@
* Called by specific UI (CellUI to change node).
*
* @param inputUI context ui (to get context value tree helper...)
- * @param topiaId node id to select
+ * @param nodeId node id to select
*/
- public void setTreeSelection(InputContentUI<?> inputUI, String topiaId) {
+ public void setTreeSelection(InputContentUI<?> inputUI, String nodeId) {
+ setTreeSelection(inputUI, null, nodeId);
+ }
+
+ /**
+ * Change tree selection with new node id.
+ *
+ * Called by specific UI (CellUI to change node).
+ *
+ * @param inputUI context ui (to get context value tree helper...)
+ * @param parentNodeId find node to select from this node
+ * @param nodeId node id to select
+ */
+ public void setTreeSelection(InputContentUI<?> inputUI, String parentNodeId, String nodeId) {
FisheryTreeHelper fisheryTreeHelper = inputUI.getContextValue(FisheryTreeHelper.class);
TreeModel fisheryTreeModel = inputUI.getContextValue(TreeModel.class);
- FisheryTreeNode newSelectNode = fisheryTreeHelper.findNode((FisheryTreeNode)fisheryTreeModel.getRoot(), topiaId);
- fisheryTreeHelper.selectNode(newSelectNode);
+ FisheryTreeNode fromNode = (FisheryTreeNode)fisheryTreeModel.getRoot();
+ if (parentNodeId != null) {
+ fromNode = fisheryTreeHelper.findNode(fromNode, parentNodeId);
+ }
+ FisheryTreeNode newSelectNode = fisheryTreeHelper.findNode(fromNode, nodeId);
+ if (newSelectNode != null) {
+ fisheryTreeHelper.selectNode(newSelectNode);
+ }
}
/**
Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/MetierUI.jaxx
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/MetierUI.jaxx 2011-03-31 16:02:49 UTC (rev 3222)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/MetierUI.jaxx 2011-03-31 16:06:07 UTC (rev 3223)
@@ -28,6 +28,7 @@
<import>
static org.nuiton.i18n.I18n._
+ static org.nuiton.i18n.I18n.n_
java.beans.PropertyChangeEvent;
java.beans.PropertyChangeListener;
</import>
@@ -36,7 +37,7 @@
protected void $afterCompleteSetup() {
setButtonTitle(_("isisfish.input.continueTripTypes"));
- setNextPath("$root/$tripTypes");
+ setNextPath(n_("isisfish.input.tree.triptypes"));
// install change listener
// (depends on sensitivity c'ant be done on constructor)
Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationUI.jaxx
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationUI.jaxx 2011-03-31 16:02:49 UTC (rev 3222)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationUI.jaxx 2011-03-31 16:06:07 UTC (rev 3223)
@@ -28,6 +28,7 @@
<fr.ifremer.isisfish.entities.Population id='bean' javaBean='null'/>
<import>
+ static org.nuiton.i18n.I18n.n_
fr.ifremer.isisfish.ui.sensitivity.SensitivityTabbedPaneListener;
</import>
<script><![CDATA[
@@ -35,7 +36,7 @@
protected void $afterCompleteSetup() {
setButtonTitle(_("isisfish.input.continueGears"));
- setNextPath("$root/$gears");
+ setNextPath(n_("isisfish.input.tree.gears"));
// install change listener
// (depends on sensitivity can't be done on constructor)
Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PortUI.jaxx
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PortUI.jaxx 2011-03-31 16:02:49 UTC (rev 3222)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PortUI.jaxx 2011-03-31 16:06:07 UTC (rev 3223)
@@ -28,6 +28,7 @@
<fr.ifremer.isisfish.entities.Port id='bean' javaBean='null'/>
<import>
+ static org.nuiton.i18n.I18n.n_
fr.ifremer.isisfish.entities.Port;
fr.ifremer.isisfish.entities.Cell;
com.bbn.openmap.gui.Tool;
@@ -73,7 +74,7 @@
};
setButtonTitle(_("isisfish.input.continueSpecies"));
- setNextPath("$root/$species");
+ setNextPath(n_("isisfish.input.tree.species"));
addPropertyChangeListener(PROPERTY_BEAN, new PropertyChangeListener() {
public void propertyChange(PropertyChangeEvent evt) {
Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsUI.jaxx
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsUI.jaxx 2011-03-31 16:02:49 UTC (rev 3222)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsUI.jaxx 2011-03-31 16:06:07 UTC (rev 3223)
@@ -26,10 +26,13 @@
<fr.ifremer.isisfish.entities.SetOfVessels id='bean' javaBean='null'/>
+ <import>
+ static org.nuiton.i18n.I18n.n_
+ </import>
<script><![CDATA[
protected void $afterCompleteSetup() {
setButtonTitle(_("isisfish.input.continueStrategies"));
- setNextPath("$root/$strategies");
+ setNextPath(n_("isisfish.input.tree.strategies"));
// install change listener
// (depends on sensitivity can't be done on constructor)
Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/SpeciesUI.jaxx
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/SpeciesUI.jaxx 2011-03-31 16:02:49 UTC (rev 3222)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/SpeciesUI.jaxx 2011-03-31 16:06:07 UTC (rev 3223)
@@ -28,6 +28,7 @@
<fr.ifremer.isisfish.entities.Species id='bean' javaBean='null'/>
<import>
+ static org.nuiton.i18n.I18n.n_
fr.ifremer.isisfish.entities.Species;
jaxx.runtime.swing.editor.NumberEditor;
java.beans.PropertyChangeEvent;
@@ -55,6 +56,21 @@
});
}
+ at Override
+protected void goTo() {
+ // FIXME il ne faut pas appeler le parent
+ // on ne sais jamais de quel type est le parent
+ InputUI inputUI = getParentContainer(InputUI.class);
+ if (inputUI != null) {
+ if (getBean() == null) {
+ inputUI.getHandler().setTreeSelection(this, n_("isisfish.input.tree.species"), n_("isisfish.input.tree.populations"));
+ }
+ else {
+ inputUI.getHandler().setTreeSelection(this, getBean().getTopiaId(), n_("isisfish.input.tree.populations"));
+ }
+ }
+}
+
public void refresh() {
Species species = (Species)getVerifier().getEntity(Species.class);
Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/TripTypeUI.jaxx
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/TripTypeUI.jaxx 2011-03-31 16:02:49 UTC (rev 3222)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/TripTypeUI.jaxx 2011-03-31 16:06:07 UTC (rev 3223)
@@ -28,6 +28,7 @@
<fr.ifremer.isisfish.entities.TripType id='bean' javaBean='null'/>
<import>
+ static org.nuiton.i18n.I18n.n_
fr.ifremer.isisfish.entities.TripType;
fr.ifremer.isisfish.types.TimeUnit;
java.beans.PropertyChangeEvent;
@@ -37,7 +38,7 @@
setButtonTitle(_("isisfish.input.continueVesselTypes"));
-setNextPath("$root/$vesselTypes");
+setNextPath(n_("isisfish.input.tree.vesseltypes"));
addPropertyChangeListener("bean", new PropertyChangeListener() {
public void propertyChange(PropertyChangeEvent evt) {
Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/VesselTypeUI.jaxx
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/VesselTypeUI.jaxx 2011-03-31 16:02:49 UTC (rev 3222)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/VesselTypeUI.jaxx 2011-03-31 16:06:07 UTC (rev 3223)
@@ -28,6 +28,7 @@
<fr.ifremer.isisfish.entities.VesselType id='bean' javaBean='null'/>
<import>
+ static org.nuiton.i18n.I18n.n_
fr.ifremer.isisfish.entities.VesselType;
fr.ifremer.isisfish.entities.TripType;
fr.ifremer.isisfish.types.TimeUnit;
@@ -41,7 +42,8 @@
protected void $afterCompleteSetup() {
setButtonTitle(_("isisfish.input.continueSetOfVessels"));
- setNextPath("$root/$setOfVessels");
+ setNextPath(n_("isisfish.input.tree.setofvessels"));
+
addPropertyChangeListener(PROPERTY_BEAN, new PropertyChangeListener() {
public void propertyChange(PropertyChangeEvent evt) {
if (evt.getOldValue() != null || evt.getNewValue() == null) {
Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx 2011-03-31 16:02:49 UTC (rev 3222)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx 2011-03-31 16:06:07 UTC (rev 3223)
@@ -28,6 +28,7 @@
<fr.ifremer.isisfish.entities.Zone id='bean' javaBean='null'/>
<import>
+ static org.nuiton.i18n.I18n.n_
javax.swing.event.ListSelectionEvent;
fr.ifremer.isisfish.entities.Cell;
fr.ifremer.isisfish.entities.Zone;
@@ -48,6 +49,10 @@
protected OMToolSet toolSet = new OMToolSet();
protected void $afterCompleteSetup() {
+
+ setButtonTitle(_("isisfish.input.continuePorts"));
+ setNextPath(n_("isisfish.input.tree.ports"));
+
toolSet.setupListeners(zoneMap);
toolMap.add((Tool)toolSet);
@@ -64,9 +69,6 @@
}
};
- setButtonTitle(_("isisfish.input.continuePorts"));
- setNextPath("$root/$ports");
-
addPropertyChangeListener(PROPERTY_BEAN, new PropertyChangeListener() {
public void propertyChange(PropertyChangeEvent evt) {
if (evt.getNewValue() == null) {
Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/FisheryTreeHelper.java
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/FisheryTreeHelper.java 2011-03-31 16:02:49 UTC (rev 3222)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/FisheryTreeHelper.java 2011-03-31 16:06:07 UTC (rev 3223)
@@ -22,7 +22,7 @@
*/
package fr.ifremer.isisfish.ui.input.tree;
-import static org.nuiton.i18n.I18n._;
+import static org.nuiton.i18n.I18n.n_;
import javax.swing.tree.TreeModel;
@@ -68,25 +68,25 @@
// first level nodes
FisheryTreeNode cellsChild = new FisheryTreeNode(Cell.class,
- _("isisfish.input.tree.cells"), null, new CellsNodeLoador());
+ n_("isisfish.input.tree.cells"), null, new CellsNodeLoador());
FisheryTreeNode zonesChild = new FisheryTreeNode(Zone.class,
- _("isisfish.input.tree.zones"), null, new ZonesNodeLoador());
+ n_("isisfish.input.tree.zones"), null, new ZonesNodeLoador());
FisheryTreeNode portsChild = new FisheryTreeNode(Port.class,
- _("isisfish.input.tree.ports"), null, new PortsNodeLoador());
+ n_("isisfish.input.tree.ports"), null, new PortsNodeLoador());
FisheryTreeNode speciesChild = new FisheryTreeNode(Species.class,
- _("isisfish.input.tree.species"), null, new SpeciesNodeLoador());
+ n_("isisfish.input.tree.species"), null, new SpeciesNodeLoador());
FisheryTreeNode gearsChild = new FisheryTreeNode(Gear.class,
- _("isisfish.input.tree.gears"), null, new GearsNodeLoador());
+ n_("isisfish.input.tree.gears"), null, new GearsNodeLoador());
FisheryTreeNode metiersChild = new FisheryTreeNode(Metier.class,
- _("isisfish.input.tree.metiers"), null, new MetiersNodeLoador());
+ n_("isisfish.input.tree.metiers"), null, new MetiersNodeLoador());
FisheryTreeNode tripTypesChild = new FisheryTreeNode(TripType.class,
- _("isisfish.input.tree.triptypes"), null, new TripTypesNodeLoador());
+ n_("isisfish.input.tree.triptypes"), null, new TripTypesNodeLoador());
FisheryTreeNode vesselTypesChild = new FisheryTreeNode(VesselType.class,
- _("isisfish.input.tree.vesseltypes"), null, new VesselTypesNodeLoador());
+ n_("isisfish.input.tree.vesseltypes"), null, new VesselTypesNodeLoador());
FisheryTreeNode setOfVesselsChild = new FisheryTreeNode(SetOfVessels.class,
- _("isisfish.input.tree.setofvessels"), null, new SetOfVesselsNodeLoador());
+ n_("isisfish.input.tree.setofvessels"), null, new SetOfVesselsNodeLoador());
FisheryTreeNode strategiesChild = new FisheryTreeNode(Strategy.class,
- _("isisfish.input.tree.strategies"), null, new StrategiesNodeLoador());
+ n_("isisfish.input.tree.strategies"), null, new StrategiesNodeLoador());
root.add(cellsChild);
root.add(zonesChild);
Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/FisheryTreeRenderer.java
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/FisheryTreeRenderer.java 2011-03-31 16:02:49 UTC (rev 3222)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/FisheryTreeRenderer.java 2011-03-31 16:06:07 UTC (rev 3223)
@@ -23,6 +23,8 @@
package fr.ifremer.isisfish.ui.input.tree;
+import static org.nuiton.i18n.I18n._;
+
import java.awt.Component;
import javax.swing.JTree;
@@ -77,7 +79,7 @@
FisheryTreeNode node = (FisheryTreeNode)value;
if (!node.isStaticNode() || node.isStringNode()) {
- stringValue = node.getId();
+ stringValue = _(node.getId());
} else {
FisheryRegion fisheryRegion = provider.getFisheryRegion();
TopiaContext topiaContext = ((FisheryRegionImpl)fisheryRegion).getTopiaContext();
Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/SpeciesNodeLoador.java
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/SpeciesNodeLoador.java 2011-03-31 16:02:49 UTC (rev 3222)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/SpeciesNodeLoador.java 2011-03-31 16:06:07 UTC (rev 3223)
@@ -22,7 +22,7 @@
*/
package fr.ifremer.isisfish.ui.input.tree.loadors;
-import static org.nuiton.i18n.I18n._;
+import static org.nuiton.i18n.I18n.n_;
import java.util.List;
@@ -67,7 +67,7 @@
// Create clients static nodes
FisheryTreeNode speciesPopulationStaticNode = new FisheryTreeNode(
- Population.class, _("isisfish.input.tree.populations"),
+ Population.class, n_("isisfish.input.tree.populations"),
null, new PopulationsNodeLoador(species));
speciesNode.add(speciesPopulationStaticNode);
1
0
r3222 - isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/migration
by chatellier@users.labs.libre-entreprise.org 31 Mar '11
by chatellier@users.labs.libre-entreprise.org 31 Mar '11
31 Mar '11
Author: chatellier
Date: 2011-03-31 16:02:49 +0000 (Thu, 31 Mar 2011)
New Revision: 3222
Log:
Add if exists condition
Modified:
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/migration/MigrationV33V331.java
Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/migration/MigrationV33V331.java
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/migration/MigrationV33V331.java 2011-03-31 13:48:34 UTC (rev 3221)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/migration/MigrationV33V331.java 2011-03-31 16:02:49 UTC (rev 3222)
@@ -65,6 +65,6 @@
// CONSTRAINT_0 est la nom généré de la constainte d'unicité
// sur les maturityGroup
// en v3.3, il n'y a qu'une contrainte sur la table population
- queries.add("ALTER TABLE POPULATION DROP CONSTRAINT CONSTRAINT_0;");
+ queries.add("ALTER TABLE POPULATION DROP CONSTRAINT IF EXISTS CONSTRAINT_0;");
}
}
1
0
r3221 - in isis-fish/branches/3.3.1/src/main: java/fr/ifremer/isisfish/datastore/migration xmi
by chatellier@users.labs.libre-entreprise.org 31 Mar '11
by chatellier@users.labs.libre-entreprise.org 31 Mar '11
31 Mar '11
Author: chatellier
Date: 2011-03-31 13:48:34 +0000 (Thu, 31 Mar 2011)
New Revision: 3221
Log:
Add migration to remove unique maturitygroup constraints
Added:
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/migration/MigrationV33V331.java
Modified:
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/migration/DatabaseMigrationClass.java
isis-fish/branches/3.3.1/src/main/xmi/isis-fish.zargo
Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/migration/DatabaseMigrationClass.java
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/migration/DatabaseMigrationClass.java 2011-03-30 16:26:57 UTC (rev 3220)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/migration/DatabaseMigrationClass.java 2011-03-31 13:48:34 UTC (rev 3221)
@@ -49,6 +49,7 @@
protected static final Version VERSION_32 = new Version("3.2");
protected static final Version VERSION_33 = new Version("3.3");
+ protected static final Version VERSION_331 = new Version("3.3.1");
public DatabaseMigrationClass() {
super(new MigrationResolver());
@@ -68,6 +69,9 @@
else if (version.equals(VERSION_33)) {
result = MigrationV32V33.class;
}
+ else if (version.equals(VERSION_331)) {
+ result = MigrationV33V331.class;
+ }
return result;
}
@@ -78,7 +82,7 @@
*/
@Override
public Version[] getAvailableVersions() {
- Version[] result = new Version[] { VERSION_32, VERSION_33 };
+ Version[] result = new Version[] { VERSION_32, VERSION_33, VERSION_331 };
return result;
}
Added: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/migration/MigrationV33V331.java
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/migration/MigrationV33V331.java (rev 0)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/migration/MigrationV33V331.java 2011-03-31 13:48:34 UTC (rev 3221)
@@ -0,0 +1,70 @@
+/*
+ * #%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 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 3.3 and 3.3.1
+ *
+ * @author chatellier
+ * @version $Revision$
+ *
+ * Last update : $Date$
+ * By : $Author$
+ */
+public class MigrationV33V331 extends MigrationCallBackForVersion {
+
+ /**
+ * Constructor.
+ *
+ * @param version version
+ * @param callback callback
+ */
+ public MigrationV33V331(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 {
+ // remove maturity group
+ // CONSTRAINT_0 est la nom généré de la constainte d'unicité
+ // sur les maturityGroup
+ // en v3.3, il n'y a qu'une contrainte sur la table population
+ queries.add("ALTER TABLE POPULATION DROP CONSTRAINT CONSTRAINT_0;");
+ }
+}
Property changes on: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/migration/MigrationV33V331.java
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Modified: isis-fish/branches/3.3.1/src/main/xmi/isis-fish.zargo
===================================================================
(Binary files differ)
1
0
r3220 - in isis-fish/branches/3.3.1/src: main/java/fr/ifremer/isisfish/simulator/launcher main/java/fr/ifremer/isisfish/simulator/sensitivity main/java/fr/ifremer/isisfish/simulator/sensitivity/domain test/java/fr/ifremer/isisfish/simulator/launcher
by chatellier@users.labs.libre-entreprise.org 30 Mar '11
by chatellier@users.labs.libre-entreprise.org 30 Mar '11
30 Mar '11
Author: chatellier
Date: 2011-03-30 16:26:57 +0000 (Wed, 30 Mar 2011)
New Revision: 3220
Log:
Gere les groups de facteurs apres calcul par les calculators et
leurs g?\195?\169n?\195?\169rations dans le prescript de simulation.
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/sensitivity/AbstractSensitivityCalculator.java
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/Domain.java
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/Factor.java
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/FactorGroup.java
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/ContinuousDomain.java
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/DiscreteDomain.java
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/EquationContinuousDomain.java
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/MatrixContinuousDomain.java
isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceTest.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-03-30 16:16:09 UTC (rev 3219)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java 2011-03-30 16:26:57 UTC (rev 3220)
@@ -82,6 +82,7 @@
import fr.ifremer.isisfish.simulator.SimulationParameter;
import fr.ifremer.isisfish.simulator.sensitivity.DesignPlan;
import fr.ifremer.isisfish.simulator.sensitivity.Factor;
+import fr.ifremer.isisfish.simulator.sensitivity.FactorGroup;
import fr.ifremer.isisfish.simulator.sensitivity.Scenario;
import fr.ifremer.isisfish.simulator.sensitivity.SensitivityCalculator;
import fr.ifremer.isisfish.simulator.sensitivity.SensitivityScenarios;
@@ -437,6 +438,8 @@
TopiaContext context = regionStorage.getStorage().beginTransaction();
sensitivitycalculator.setTopiaContext(context);
+ // Sensitivity scenario returned contains same factor references
+ // as input design plan. Factor group are still present
SensitivityScenarios sensitivityScenarios = sensitivitycalculator
.compute(designPlan, masterExportDirectory);
@@ -509,15 +512,24 @@
}
}
+ /** Permet de manipuler un int entre plusieurs appele de methodes recursive. */
+ public static class Counter {
+ protected int counter = 0;
+ public void inc() {
+ counter++;
+ }
+ public int getCounter() {
+ return counter;
+ }
+ }
+
/**
* Generate prescript to set factor values before simulation start.
*
* @param scenario to generate prescript
* @return simulation pre script with correct values
- * @throws IOException if pre script can't be made
*/
- protected String generatePreScript(Scenario scenario) throws IOException {
-
+ protected String generatePreScript(Scenario scenario) {
ConvertUtilsBean beanUtils = ConverterUtil.getConverter(null);
// n'utilise plus freemarker, car il y avait plus d'instruction
@@ -530,72 +542,93 @@
buffer.append("ConvertUtilsBean beanUtils = ConverterUtil.getConverter(db);\n");
buffer.append("SimulationParameter params = context.getSimulationStorage().getParameter();\n");
- int factorIndex = 0; // pour les collision de nom value
- for (Factor factor : scenario.getFactors()) {
- buffer.append("/* factor : ").append(factor.getName()).append(" */\n");
+ generatePreScript(beanUtils, buffer, new Counter(), scenario.getFactors());
+
+ String scriptContent = buffer.toString();
+ if (log.isTraceEnabled()) {
+ log.trace("Simulation prescript content = " + scriptContent);
+ }
+ return scriptContent;
+ }
- // cas special 1 : population de départ
- if (factor.getPath().startsWith("parameters.population.")) {
- String paramName = StringUtils.removeStart(factor.getPath(), "parameters.");
- paramName += ".number";
- // pas de convert, c'est fait comme ca dans
- // SimulationParameters.toProperties();
- MatrixND matrix = (MatrixND)factor.getValue();
- Object stringValue = String.valueOf(matrix.toList());
- buffer.append("params.setProperty(\"").append(paramName).append("\",\"").append(stringValue).append("\");\n");
+ /**
+ * Generate prescript for a factor list that can be called recursively to
+ * manage factor group.
+ *
+ * @param beanUtils beanUtils converter
+ * @param buffer buffer to fill
+ * @param level call level used to avoid variables name collision
+ * @param factors factor list to manage
+ */
+ protected void generatePreScript(ConvertUtilsBean beanUtils, StringBuffer buffer, Counter counter, Collection<Factor> factors) {
+
+ for (Factor factor : factors) {
+ if (factor instanceof FactorGroup) {
+ buffer.append("/* factor group : ").append(factor.getName()).append(" */\n");
+ FactorGroup factorGroup = (FactorGroup)factor;
+ generatePreScript(beanUtils, buffer, counter, factorGroup.getFactors());
}
- // cas special 2 : regles
- else if (factor.getPath().equals("parameters.rules")) {
- List<Rule> rules = (List<Rule>)factor.getValue();
- List<String> rulesNames = new ArrayList<String>();
- int ruleIndex = 0;
- for (Rule rule : rules) {
- rulesNames.add(rule.getClass().getSimpleName());
- Properties rulesProps = RuleHelper.getRuleAsProperties(ruleIndex++, null, rule);
- for (String rulesProp : rulesProps.stringPropertyNames()) {
- String value = rulesProps.getProperty(rulesProp);
- buffer.append("params.setProperty(\"").append(rulesProp).append("\",\"").append(value).append("\");\n");
+ else {
+ int factorIndex = counter.getCounter();
+ buffer.append("/* factor : ").append(factor.getName()).append(" */\n");
+
+ // cas special 1 : population de départ
+ if (factor.getPath().startsWith("parameters.population.")) {
+ String paramName = StringUtils.removeStart(factor.getPath(), "parameters.");
+ paramName += ".number";
+ // pas de convert, c'est fait comme ca dans
+ // SimulationParameters.toProperties();
+ MatrixND matrix = (MatrixND)factor.getValue();
+ Object stringValue = String.valueOf(matrix.toList());
+ buffer.append("params.setProperty(\"").append(paramName).append("\",\"").append(stringValue).append("\");\n");
+ }
+ // cas special 2 : regles
+ else if (factor.getPath().equals("parameters.rules")) {
+ List<Rule> rules = (List<Rule>)factor.getValue();
+ List<String> rulesNames = new ArrayList<String>();
+ int ruleIndex = 0;
+ for (Rule rule : rules) {
+ rulesNames.add(rule.getClass().getSimpleName());
+ Properties rulesProps = RuleHelper.getRuleAsProperties(ruleIndex++, null, rule);
+ for (String rulesProp : rulesProps.stringPropertyNames()) {
+ String value = rulesProps.getProperty(rulesProp);
+ buffer.append("params.setProperty(\"").append(rulesProp).append("\",\"").append(value).append("\");\n");
+ }
}
+ buffer.append("params.setProperty(\"rules\",\"").append(StringUtils.join(rulesNames, ",")).append("\");\n");
}
- buffer.append("params.setProperty(\"rules\",\"").append(StringUtils.join(rulesNames, ",")).append("\");\n");
+ // cas special 3 : equation
+ else if (factor.getDomain() instanceof EquationContinuousDomain) {
+ EquationContinuousDomain domain = (EquationContinuousDomain)factor.getDomain();
+ buffer.append("context.setValue(\"").append(factor.getName());
+ buffer.append("\",").append(factor.getValue()).append(",\"");
+ buffer.append(domain.getOperator()).append("\");\n");
+ }
+ // cas pas si special
+ else {
+ Object value = factor.getValue();
+ String stringValue = beanUtils.convert(value);
+ String path = factor.getPath();
+ String topiaId = path.substring(0, path.lastIndexOf('#'));
+ String property = path.substring(path.lastIndexOf('#') + 1);
+ // Double value123 = beanUtils.convert("mystringvalue", Double.class);
+ buffer.append(value.getClass().getName()).append(" value");
+ buffer.append(factorIndex).append(" = beanUtils.convert(\"");
+ buffer.append(stringValue).append("\", ").append(value.getClass().getName());
+ buffer.append(".class);\n");
+ // TopiaEntity entity123 = db.findByTopiaId(topiaId);
+ buffer.append("TopiaEntity entity").append(factorIndex);
+ buffer.append(" = db.findByTopiaId(\"").append(topiaId);
+ buffer.append("\");\n");
+ // BeanUtils.setProperty(entity123, "property", value123);
+ buffer.append("BeanUtils.setProperty(entity").append(factorIndex);
+ buffer.append(", \"").append(property).append("\", ");
+ buffer.append("value").append(factorIndex).append(");\n");
+ }
}
- // cas special 3 : equation
- else if (factor.getDomain() instanceof EquationContinuousDomain) {
- EquationContinuousDomain domain = (EquationContinuousDomain)factor.getDomain();
- buffer.append("context.setValue(\"").append(factor.getName());
- buffer.append("\",").append(factor.getValue()).append(",\"");
- buffer.append(domain.getOperator()).append("\");\n");
- }
- // cas pas si special
- else {
- Object value = factor.getValue();
- String stringValue = beanUtils.convert(value);
- String path = factor.getPath();
- String topiaId = path.substring(0, path.lastIndexOf('#'));
- String property = path.substring(path.lastIndexOf('#') + 1);
- // Double value123 = beanUtils.convert("mystringvalue", Double.class);
- buffer.append(value.getClass().getName()).append(" value");
- buffer.append(factorIndex).append(" = beanUtils.convert(\"");
- buffer.append(stringValue).append("\", ").append(value.getClass().getName());
- buffer.append(".class);\n");
- // TopiaEntity entity123 = db.findByTopiaId(topiaId);
- buffer.append("TopiaEntity entity").append(factorIndex);
- buffer.append(" = db.findByTopiaId(\"").append(topiaId);
- buffer.append("\");\n");
- // BeanUtils.setProperty(entity123, "property", value123);
- buffer.append("BeanUtils.setProperty(entity").append(factorIndex);
- buffer.append(", \"").append(property).append("\", ");
- buffer.append("value").append(factorIndex).append(");\n");
- }
-
- factorIndex++;
- }
- String scriptContent = buffer.toString();
- if (log.isTraceEnabled()) {
- log.trace("Simulation prescript content = " + scriptContent);
+ counter.inc();
}
- return scriptContent;
}
protected void submit(SimulationJob job) {
Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/AbstractSensitivityCalculator.java
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/AbstractSensitivityCalculator.java 2011-03-30 16:16:09 UTC (rev 3219)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/AbstractSensitivityCalculator.java 2011-03-30 16:26:57 UTC (rev 3220)
@@ -216,7 +216,7 @@
for (Factor factor:factors) {
if (factor.getDomain() instanceof DiscreteDomain) {
String attributeValues = "list(";
- Collection values = ((DiscreteDomain) factor.getDomain())
+ Collection<Object> values = ((DiscreteDomain) factor.getDomain())
.getValues().values();
for (Object j:values) {
attributeValues += j + ",";
Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/Domain.java
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/Domain.java 2011-03-30 16:16:09 UTC (rev 3219)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/Domain.java 2011-03-30 16:26:57 UTC (rev 3220)
@@ -59,19 +59,28 @@
* @return found value or <tt>null</tt> if not found
*/
Object getValueForIdentifier(Object identifier);
-
+
/**
+ * Compute value for domain.
+ *
+ * @param valueIdentifier
+ * @return computed value for domain
+ * @since 3.3.1.0
+ */
+ public Object getComputedValueForIdentifier(Object valueIdentifier);
+
+ /**
* Accept a new visitor.
*
* @param visitor
*/
public void accept(DomainVisitor visitor);
-
+
/**
* Clone the domain
*
* @return the domain cloned
*/
-
public Domain clone();
+
}
Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/Factor.java
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/Factor.java 2011-03-30 16:16:09 UTC (rev 3219)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/Factor.java 2011-03-30 16:26:57 UTC (rev 3220)
@@ -182,6 +182,17 @@
}
/**
+ * This method is protected and can be called only by {@link FactorGroup}
+ * to compute given valueIdentifier with specific factor domain
+ * implementation.
+ *
+ * @param valueIdentifier
+ */
+ protected void setComputedValueForIdentifier(Object valueIdentifier) {
+ value = domain.getComputedValueForIdentifier(valueIdentifier);
+ }
+
+ /**
* Get path.
*
* @return the path
@@ -222,10 +233,9 @@
try {
f = (Factor)super.clone();
- f.domain = domain.clone();
- //f.path = path;
- // FIXME make real clone() for value
- //f.value = value;
+ if (domain != null) {
+ f.domain = domain.clone();
+ }
} catch (CloneNotSupportedException e) {
throw new RuntimeException("Error on clone()", e);
}
Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/FactorGroup.java
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/FactorGroup.java 2011-03-30 16:16:09 UTC (rev 3219)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/FactorGroup.java 2011-03-30 16:26:57 UTC (rev 3220)
@@ -273,6 +273,38 @@
}
/**
+ * Return factor group domain depending of factor group type (discrete/continuous).
+ *
+ * @return factor group domain
+ */
+ @Override
+ public Domain getDomain() {
+ Domain domain = null;
+ if (isContinuous()) {
+ domain = new ContinuousDomain(0.0, 1.0);
+ }
+ else if (isDiscrete()) {
+ // les domaines doivent avoir les même domaines
+ // et pour l'utilisation quand fera l'appelant
+ // de getDomain(), on peut en retourner un au hazard
+ domain = factors.get(0).getDomain();
+ }
+ // else pas de factor dans le group
+ return domain;
+ }
+
+ /**
+ * Set value for label.
+ *
+ * @param valueIdentifier new value identifier to get
+ */
+ public void setValueForIdentifier(Object valueIdentifier) {
+ for (Factor factor : factors) {
+ factor.setComputedValueForIdentifier(valueIdentifier);
+ }
+ }
+
+ /**
* Accept a new visitor.
*
* @param visitor
Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/ContinuousDomain.java
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/ContinuousDomain.java 2011-03-30 16:16:09 UTC (rev 3219)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/ContinuousDomain.java 2011-03-30 16:26:57 UTC (rev 3220)
@@ -108,6 +108,19 @@
public Object getValueForIdentifier(Object identifier) {
return identifier;
}
+
+ /*
+ * @see fr.ifremer.isisfish.simulator.sensitivity.Domain#getComputedValueForIdentifier(java.lang.Object)
+ */
+ @Override
+ public Object getComputedValueForIdentifier(Object valueIdentifier) {
+ // dans ce cas, la value est entre 0 et 1
+ double doubleValue = (Double)valueIdentifier;
+
+ double value = minBound + (minBound + maxBound) * doubleValue;
+
+ return value;
+ }
/**
* Accept a new visitor.
Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/DiscreteDomain.java
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/DiscreteDomain.java 2011-03-30 16:16:09 UTC (rev 3219)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/DiscreteDomain.java 2011-03-30 16:26:57 UTC (rev 3220)
@@ -94,6 +94,14 @@
return values.get(identifier);
}
+ /*
+ * @see fr.ifremer.isisfish.simulator.sensitivity.Domain#getComputedValueForIdentifier(java.lang.Object)
+ */
+ @Override
+ public Object getComputedValueForIdentifier(Object valueIdentifier) {
+ return getValueForIdentifier(valueIdentifier);
+ }
+
/**
* Accept a new visitor.
*
Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/EquationContinuousDomain.java
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/EquationContinuousDomain.java 2011-03-30 16:16:09 UTC (rev 3219)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/EquationContinuousDomain.java 2011-03-30 16:26:57 UTC (rev 3220)
@@ -5,7 +5,7 @@
* $Id$
* $HeadURL$
* %%
- * Copyright (C) 2009 - 2010 Ifremer, CodeLutin
+ * 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
@@ -177,6 +177,14 @@
}
return identifier;
}
+
+ /*
+ * @see fr.ifremer.isisfish.simulator.sensitivity.Domain#getComputedValueForIdentifier(java.lang.Object)
+ */
+ @Override
+ public Object getComputedValueForIdentifier(Object valueIdentifier) {
+ return getValueForIdentifier(valueIdentifier);
+ }
/**
* Get value used to create the equation.
Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/MatrixContinuousDomain.java
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/MatrixContinuousDomain.java 2011-03-30 16:16:09 UTC (rev 3219)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/MatrixContinuousDomain.java 2011-03-30 16:26:57 UTC (rev 3220)
@@ -5,7 +5,7 @@
* $Id$
* $HeadURL$
* %%
- * Copyright (C) 2009 - 2010 Ifremer, CodeLutin
+ * 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
@@ -168,6 +168,14 @@
return temp;
}
+ /*
+ * @see fr.ifremer.isisfish.simulator.sensitivity.Domain#getComputedValueForIdentifier(java.lang.Object)
+ */
+ @Override
+ public Object getComputedValueForIdentifier(Object valueIdentifier) {
+ return getValueForIdentifier(valueIdentifier);
+ }
+
/**
* Get value used to create the matrix.
*
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-03-30 16:16:09 UTC (rev 3219)
+++ isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceTest.java 2011-03-30 16:26:57 UTC (rev 3220)
@@ -25,7 +25,6 @@
package fr.ifremer.isisfish.simulator.launcher;
-import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
import java.util.Properties;
@@ -58,6 +57,7 @@
import fr.ifremer.isisfish.simulator.SimulationParameterImpl;
import fr.ifremer.isisfish.simulator.sensitivity.DesignPlan;
import fr.ifremer.isisfish.simulator.sensitivity.Factor;
+import fr.ifremer.isisfish.simulator.sensitivity.FactorGroup;
import fr.ifremer.isisfish.simulator.sensitivity.Scenario;
import fr.ifremer.isisfish.simulator.sensitivity.SensitivityCalculator;
import fr.ifremer.isisfish.simulator.sensitivity.SensitivityCalculatorRandomMock;
@@ -66,7 +66,6 @@
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 freemarker.template.TemplateException;
/**
* Test for {@link SimulationService}.
@@ -227,13 +226,11 @@
/**
* Test la generation de facteur simple.
*
- * @throws IOException
- * @throws TemplateException
* @throws StorageException
* @throws TopiaException
*/
@Test
- public void testFactorPreScriptFactorInt() throws IOException, TemplateException, StorageException, TopiaException {
+ public void testFactorPreScriptFactorInt() throws StorageException, TopiaException {
// factor
Factor factor = new Factor("testint");
@@ -262,18 +259,12 @@
/**
* Creer un simulation.
* Creer un populationSeasonInfoDAO.
- * Affectation de la matrice m1.
- * Le prescript doit la changer en m2.
*
- * @throws IOException
- * @throws TemplateException
* @throws StorageException
* @throws TopiaException
- *
- * FIXME fix this test (empty schema error)
*/
@Test
- public void testFactorPreScriptFactorMatrix() throws IOException, TemplateException, StorageException, TopiaException {
+ public void testFactorPreScriptFactorMatrix() throws StorageException, TopiaException {
// matrix 1
MatrixND matrix1 = MatrixFactory.getInstance().create("test1",
@@ -329,13 +320,11 @@
/**
* Creer un scenario basé sur les EquationDomain.
*
- * @throws IOException
- * @throws TemplateException
* @throws StorageException
* @throws TopiaException
*/
@Test
- public void testFactorPreScriptEquation() throws IOException, TemplateException, StorageException, TopiaException {
+ public void testFactorPreScriptEquation() throws StorageException, TopiaException {
// factor
Factor factorEquation = new Factor("test.equation.name.K1");
@@ -356,7 +345,7 @@
SimulationService service = SimulationService.getService();
String scriptContent = service.generatePreScript(scenario);
- log.info("Script = " + scriptContent);
+ //log.info("Script = " + scriptContent);
// le nom de la valeur de la variable n'apparait pas "en elle meme"
// dans le prescript, il y a seulement le nom
@@ -368,12 +357,10 @@
* Test que la generation du prescript avec l'ajout des populations
* de départ et des regles de IsisFish 3.3.1.0 fonctionne correctement.
*
- * @throws TemplateException
- * @throws IOException
* @throws IsisFishException
*/
@Test
- public void testPrescriptGenerationPopAndRules() throws IOException, TemplateException, IsisFishException {
+ public void testPrescriptGenerationPopAndRules() throws IsisFishException {
// get a context to a database
RegionStorage regionStorage = RegionStorage.getRegion("BaseMotosICA");
@@ -416,11 +403,92 @@
// generate prescript for that wonderfull scenario
SimulationService service = SimulationService.getService();
String preScriptContent = service.generatePreScript(scenario1);
- log.info("Script = " + preScriptContent);
+ //log.info("Script = " + preScriptContent);
Assert.assertTrue(preScriptContent.contains("params.setProperty(\"population.xxx.number\""));
Assert.assertTrue(preScriptContent.contains("params.setProperty(\"rule.0.parameter.species\",\"fr.ifremer.isisfish.entities.Species#1169028645830#0.022262364425031378\");"));
Assert.assertTrue(preScriptContent.contains("params.setProperty(\"rule.1.parameter.propSurvie\",\"42.0\");"));
Assert.assertTrue(preScriptContent.contains("rules\",\"TACpoids,TailleMin\")"));
}
+
+ /**
+ * Test que la generation du prescript avec l'ajout des groupes des facteurs
+ * depuis IsisFish 3.3.1.0 fonctionne correctement.
+ *
+ * @throws IsisFishException
+ */
+ @Test
+ public void testPrescriptGenerationGroups() throws IsisFishException {
+
+ // build test scenario
+ Scenario scenario1 = new Scenario();
+
+ // factor 1
+ Factor factor1 = new Factor("factor 1 (double)");
+ ContinuousDomain domain1 = new ContinuousDomain();
+ domain1.setMinBound(0.0);
+ domain1.setMaxBound(50.0);
+ domain1.setCardinality(4);
+ factor1.setDomain(domain1);
+ factor1.setPath("fr.ifremer.isisfish.entities.PopulationGroup#1156461521013#0.1715620681984218#maxLength");
+
+ // factor 2
+ Factor factor2 = new Factor("factor 2 (double)");
+ ContinuousDomain domain2 = new ContinuousDomain();
+ domain2.setMinBound(1.0);
+ domain2.setMaxBound(9.0);
+ domain2.setCardinality(3);
+ factor2.setDomain(domain2);
+ factor2.setPath("fr.ifremer.isisfish.entities.PopulationGroup#1156461521064#0.022976136053553198#minLength");
+
+ // factor 3
+ Factor factor3 = new Factor("factor 3 (double)");
+ DiscreteDomain domain3 = new DiscreteDomain();
+ domain3.getValues().put(0.0, 12.3);
+ domain3.getValues().put(1.0, 70.9);
+ domain3.getValues().put(2.0, 21.0);
+ domain3.getValues().put(3.0, -12.1);
+ domain3.getValues().put(4.0, -8.45);
+ factor3.setDomain(domain3);
+ factor3.setPath("fr.ifremer.isisfish.entities.PopulationGroup#1156461521013#0.1715620681984218#maxLength");
+
+ // factor 4
+ Factor factor4 = new Factor("factor 4 (double)");
+ DiscreteDomain domain4 = new DiscreteDomain();
+ domain4.getValues().put(0.0, -7.3);
+ domain4.getValues().put(1.0, 4.9);
+ domain4.getValues().put(2.0, -42.0);
+ domain4.getValues().put(3.0, 27.1);
+ domain4.getValues().put(4.0, 53.32);
+ factor4.setDomain(domain4);
+ factor4.setPath("fr.ifremer.isisfish.entities.PopulationGroup#1156461521064#0.022976136053553198#minLength");
+
+ // group continu
+ FactorGroup group1 = new FactorGroup("myContinuousGroup");
+ group1.addFactor(factor1);
+ group1.addFactor(factor2);
+
+ // group discret
+ FactorGroup group2 = new FactorGroup("myDiscreteGroup");
+ group2.addFactor(factor3);
+ group2.addFactor(factor4);
+
+ // compute AS => scenario
+ group1.setValueForIdentifier(0.75);
+ scenario1.addFactor(group1);
+ group2.setValueForIdentifier(2.0);
+ scenario1.addFactor(group2);
+
+ // generate prescript for that wonderfull scenario
+ SimulationService service = SimulationService.getService();
+ String preScriptContent = service.generatePreScript(scenario1);
+ //log.info("Script = " + preScriptContent);
+
+ Assert.assertTrue(preScriptContent.contains("/* factor group : myContinuousGroup */"));
+ Assert.assertTrue(preScriptContent.contains("beanUtils.convert(\"37.5\""));
+ Assert.assertTrue(preScriptContent.contains("beanUtils.convert(\"8.5\""));
+ Assert.assertTrue(preScriptContent.contains("/* factor group : myDiscreteGroup */"));
+ Assert.assertTrue(preScriptContent.contains("beanUtils.convert(\"21.0\""));
+ Assert.assertTrue(preScriptContent.contains("value4 = beanUtils.convert(\"-42.0\""));
+ }
}
1
0