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

r1909 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity
by chatellier＠users.labs.libre-entreprise.org March 4, 2009

March 4, 2009

Author: chatellier Date: 2009-03-04 13:14:34 +0000 (Wed, 04 Mar 2009) New Revision: 1909 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/SensitivityException.java Log: Remove autogenerated comment Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/SensitivityException.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/SensitivityException.java 2009-03-04 11:53:49 UTC (rev 1908) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/SensitivityException.java 2009-03-04 13:14:34 UTC (rev 1909) @@ -41,6 +41,5 @@ */ public SensitivityException(String message, Throwable cause) { super(message, cause); - // TODO Auto-generated constructor stub } }

1 0

r1908 - isis-fish/trunk/src/test/java/fr/ifremer
by chatellier＠users.labs.libre-entreprise.org March 4, 2009

March 4, 2009

Author: chatellier Date: 2009-03-04 11:53:49 +0000 (Wed, 04 Mar 2009) New Revision: 1908 Modified: isis-fish/trunk/src/test/java/fr/ifremer/TestUtils.java Log: Do not copy .svn sub directories Modified: isis-fish/trunk/src/test/java/fr/ifremer/TestUtils.java =================================================================== --- isis-fish/trunk/src/test/java/fr/ifremer/TestUtils.java 2009-03-04 11:18:49 UTC (rev 1907) +++ isis-fish/trunk/src/test/java/fr/ifremer/TestUtils.java 2009-03-04 11:53:49 UTC (rev 1908) @@ -1,7 +1,9 @@ package fr.ifremer; import java.io.File; +import java.io.FileFilter; +import org.apache.commons.io.FileUtils; import org.codelutin.util.FileUtil; import fr.ifremer.isisfish.IsisFish; @@ -62,13 +64,17 @@ IsisFish.init(); IsisFish.initVCS(); - - FileUtil.copyRecursively(new File("src/test/resources/test-database/analyseplans"), dirDatabase); - FileUtil.copyRecursively(new File("src/test/resources/test-database/export"), dirDatabase); - FileUtil.copyRecursively(new File("src/test/resources/test-database/regions"), dirDatabase); - FileUtil.copyRecursively(new File("src/test/resources/test-database/rules"), dirDatabase); - FileUtil.copyRecursively(new File("src/test/resources/test-database/scripts"), dirDatabase); - FileUtil.copyRecursively(new File("src/test/resources/test-database/simulators"), dirDatabase); + + FileUtils.copyDirectory(new File("src/test/resources/test-database"), dirDatabase, new FileFilter() { + @Override + public boolean accept(File pathname) { + boolean result = true; + if(pathname.getAbsolutePath().indexOf(File.separator + ".svn") != -1) { + result = false; + } + return result; + } + }); } /**

1 0

r1907 - in isis-fish/trunk/src: main/java/fr/ifremer/isisfish/util test/java/fr/ifremer test/java/fr/ifremer/isisfish/simulator test/java/fr/ifremer/isisfish/simulator/launcher test/java/fr/ifremer/isisfish/util test/java/fr/ifremer/isisfish/vcs
by chatellier＠users.labs.libre-entreprise.org March 4, 2009

March 4, 2009

Author: chatellier Date: 2009-03-04 11:18:49 +0000 (Wed, 04 Mar 2009) New Revision: 1907 Added: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/MatrixConverter.java Removed: isis-fish/trunk/src/test/java/fr/ifremer/isisfish/util/MethodTest.java Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/ConverterUtil.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/StringConverter.java isis-fish/trunk/src/test/java/fr/ifremer/TestUtils.java isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/SimulationPreScriptTest.java isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceTest.java isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/launcher/SshSimulatorLauncherTest.java isis-fish/trunk/src/test/java/fr/ifremer/isisfish/util/CompileHelperTest.java isis-fish/trunk/src/test/java/fr/ifremer/isisfish/vcs/VCSSVNTest.java Log: Add matrix serialization to string. Fix some tests. Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/ConverterUtil.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/ConverterUtil.java 2009-03-03 17:19:33 UTC (rev 1906) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/ConverterUtil.java 2009-03-04 11:18:49 UTC (rev 1907) @@ -1,5 +1,5 @@ /* *##% - * Copyright (C) 2006 + * Copyright (C) 2006 - 2009 * Ifremer, Code Lutin, Cédric Pineau, Benjamin Poussin * * This program is free software; you can redistribute it and/or @@ -17,22 +17,11 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *##%*/ -/* * - * ConverterUtil.java - * - * Created: 25 sept. 06 19:37:16 - * - * @author poussin - * @version $Revision$ - * - * Last update: $Date$ - * by : $Author$ - */ - package fr.ifremer.isisfish.util; import org.apache.commons.beanutils.BeanUtilsBean; import org.apache.commons.beanutils.ConvertUtilsBean; +import org.codelutin.math.matrix.MatrixND; import org.codelutin.topia.TopiaContext; import org.codelutin.topia.persistence.TopiaEntity; @@ -41,26 +30,30 @@ import fr.ifremer.isisfish.types.RangeOfValues; import fr.ifremer.isisfish.types.TimeUnit; - /** + * ConverterUtil. + * + * Created: 25 sept. 06 19:37:16 + * * @author poussin + * @version $Revision$ * + * Last update: $Date$ + * by : $Author$ */ - public class ConverterUtil { - static public ConvertUtilsBean getConverter(TopiaContext context) { + public static ConvertUtilsBean getConverter(TopiaContext context) { BeanUtilsBean result = BeanUtilsBean.getInstance(); ConvertUtilsBean cub = result.getConvertUtils(); - - cub.register(new TopiaEntityConverter(context), TopiaEntity.class); - - // FIXME see if register done in IsisFish.init() method permit to remove next line + // mise en place de converter de string vers des objet ... + cub.register(new TopiaEntityConverter(context), TopiaEntity.class); cub.register(new DateConverter(), Date.class); cub.register(new MonthConverter(), Month.class); cub.register(new TimeUnitConverter(), TimeUnit.class); cub.register(new RangeOfValuesConverter(), RangeOfValues.class); + cub.register(new MatrixConverter(), MatrixND.class); // ... et inversement cub.register(new StringConverter(), String.class); @@ -68,5 +61,3 @@ } } - - Added: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/MatrixConverter.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/MatrixConverter.java (rev 0) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/MatrixConverter.java 2009-03-04 11:18:49 UTC (rev 1907) @@ -0,0 +1,77 @@ +/* *##% Copyright (C) 2009 + * Code Lutin, Cédric 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. ##% + */ + +package fr.ifremer.isisfish.util; + +import org.apache.commons.beanutils.ConversionException; +import org.apache.commons.beanutils.Converter; +import org.apache.commons.lang.StringEscapeUtils; +import org.codelutin.math.matrix.MatrixND; +import org.codelutin.math.matrix.MatrixStringEncoder; +import org.codelutin.topia.persistence.TopiaEntity; + +/** + * Classe utilisées pour convertir des matrices en string et vice-versa. + * + * @author chatellier + * @version $Revision: 1526 $ + * + * Last update: $Date: 2008-10-07 18:46:13 +0200 (mar 07 oct 2008) $ + * by : $Author: tchemit $ + */ +public class MatrixConverter extends MatrixStringEncoder implements Converter { + + protected Converter defaultStringConverter = new org.apache.commons.beanutils.converters.StringConverter(); + + /* + * @see org.apache.commons.beanutils.Converter#convert(java.lang.Class, java.lang.Object) + */ + public Object convert(Class type, Object value) { + Object result; + if (value instanceof MatrixND) { + result = value; + } else if (value instanceof String) { + String sValue = (String)value; + sValue = StringEscapeUtils.unescapeJava(sValue); + result = getMatrixFromString(sValue); + } else if (value == null) { + result = null; + } else { + throw new ConversionException("Can't convert '" + value + "' to " + type.getName()); + } + return result; + } + + /* + * @see org.codelutin.math.matrix.MatrixStringEncoder#getQualifiedName(java.lang.Object) + */ + @Override + public String getQualifiedName(Object o) { + + String qualifiedName; + + if(o instanceof TopiaEntity) { + qualifiedName = TopiaEntity.class.getName(); + } + else { + qualifiedName = o.getClass().getName(); + } + return qualifiedName; + } + +} Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/StringConverter.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/StringConverter.java 2009-03-03 17:19:33 UTC (rev 1906) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/StringConverter.java 2009-03-04 11:18:49 UTC (rev 1907) @@ -1,5 +1,5 @@ -/* - * *##% Copyright (C) 2006 Code Lutin, Cédric Pineau, Benjamin Poussin +/* *##% Copyright (C) 2006 - 2009 + * Code Lutin, Cédric 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 @@ -16,21 +16,11 @@ * Place - Suite 330, Boston, MA 02111-1307, USA. ##% */ -/******************************************************************************* - * StringConverter.java - * - * Created: 12 janv. 2006 20:38:26 - * - * @author poussin - * - * @version $Revision$ - * - * Last update: $Date$ by : $Author$ - */ - package fr.ifremer.isisfish.util; import org.apache.commons.beanutils.Converter; +import org.apache.commons.lang.StringEscapeUtils; +import org.codelutin.math.matrix.MatrixND; import org.codelutin.topia.persistence.TopiaEntity; import fr.ifremer.isisfish.types.Date; @@ -38,22 +28,24 @@ import fr.ifremer.isisfish.types.TimeUnit; /** - * Classe utilise pour convertir en chaine un objet Date, Month ou TopiaEntity - * Utilisé pour la conversion et le stockage en propriete des parametres + * Classe utilisée pour convertir en chaine un objet Date, Month ou TopiaEntity. + * Utilisé pour la conversion et le stockage en propriete des parametres. + * + * Created: 12 janv. 2006 20:38:26 + * * @author poussin * + * @version $Revision$ + * + * Last update: $Date$ + * by : $Author$ */ public class StringConverter implements Converter { - private Converter defaultStringConverter = - new org.apache.commons.beanutils.converters.StringConverter(); + protected Converter defaultStringConverter = new org.apache.commons.beanutils.converters.StringConverter(); - /* - * (non-Javadoc) - * - * @see org.apache.commons.beanutils.Converter#convert(java.lang.Class, - * java.lang.Object) + * @see org.apache.commons.beanutils.Converter#convert(java.lang.Class, java.lang.Object) */ public Object convert(Class type, Object o) { Object result = null; @@ -66,6 +58,10 @@ result = String.valueOf(((Month) o).getMonthNumber()); } else if (o instanceof TimeUnit) { result = String.valueOf(((TimeUnit) o).getTime()); + } else if (o instanceof MatrixND) { + MatrixConverter converter = new MatrixConverter(); + result = converter.getMatrixAsString((MatrixND)o); + result = StringEscapeUtils.escapeJava((String)result); } else { // dans tous les autres cas, on appelle le converter par defaut result = defaultStringConverter.convert(type, o); Modified: isis-fish/trunk/src/test/java/fr/ifremer/TestUtils.java =================================================================== --- isis-fish/trunk/src/test/java/fr/ifremer/TestUtils.java 2009-03-03 17:19:33 UTC (rev 1906) +++ isis-fish/trunk/src/test/java/fr/ifremer/TestUtils.java 2009-03-04 11:18:49 UTC (rev 1907) @@ -44,6 +44,9 @@ } /** + * Toujours appeler cette method pour les test d'isis. + * (sinon,il ira ecrire dans le isis-database-3 officiel). + * * Create a temp dir and init isis with that temp dir as database. * * @throws Exception Modified: isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/SimulationPreScriptTest.java =================================================================== --- isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/SimulationPreScriptTest.java 2009-03-03 17:19:33 UTC (rev 1906) +++ isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/SimulationPreScriptTest.java 2009-03-04 11:18:49 UTC (rev 1907) @@ -73,7 +73,6 @@ * * FIXME fix this test (empty schema error) */ - at Ignore public class SimulationPreScriptTest { private static final Log log = LogFactory.getLog(SimulationPreScriptTest.class); @@ -84,12 +83,15 @@ @BeforeClass public static void init() throws Exception { - TestUtils.init(); + //TestUtils.init(); freemarkerConfiguration = TestUtils.getFreemarkerConfiguration(); } @Before - public void setUp() { + public void setUp() throws Exception { + // not do it in @BeforeClass + // test wil fail ! + TestUtils.init(); System.setProperty("hibernate.hbm2ddl.auto", "create"); } Modified: isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceTest.java =================================================================== --- isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceTest.java 2009-03-03 17:19:33 UTC (rev 1906) +++ isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceTest.java 2009-03-04 11:18:49 UTC (rev 1907) @@ -25,10 +25,7 @@ import org.apache.commons.logging.LogFactory; import org.codelutin.math.matrix.MatrixFactory; import org.codelutin.math.matrix.MatrixND; -import org.junit.After; import org.junit.Before; -import org.junit.BeforeClass; -import org.junit.Ignore; import org.junit.Test; import fr.ifremer.TestUtils; @@ -60,21 +57,13 @@ private static final Log log = LogFactory.getLog(SimulationServiceTest.class); - @BeforeClass - public static void init() throws Exception { + @Before + public void setUp() throws Exception { + // not do it in @BeforeClass + // test wil fail ! TestUtils.init(); } - @Before - public void setUp() { - - } - - @After - public void tearDown() { - - } - /** * Build a test {@link DesignPlan}. * @@ -84,7 +73,7 @@ DesignPlan designPlan = new DesignPlan(); // factor 1 - Factor<Double> factor1 = new Factor<Double>("test double 1"); + Factor<Double> factor1 = new Factor<Double>("factor 1 (double)"); ContinuousDomain<Double> domain1 = new ContinuousDomain<Double>(); domain1.setMinBound(0.0); domain1.setMaxBound(50.0); @@ -92,7 +81,7 @@ factor1.setPath("fr.ifremer.isisfish.entities.PopulationGroup#1156461521013#0.1715620681984218#maxLength"); // factor 2 - Factor<Double> factor2 = new Factor<Double>("test double 2"); + Factor<Double> factor2 = new Factor<Double>("factor 2 (double)"); DiscreteDomain<Double> domain2 = new DiscreteDomain<Double>(); domain2.getValues().put(0.0, 12.3); domain2.getValues().put(1.0, 70.9); @@ -103,7 +92,7 @@ factor2.setPath("fr.ifremer.isisfish.entities.PopulationGroup#1156461521064#0.022976136053553198#minLength"); // factor 3 - Factor<Double> factor3 = new Factor<Double>("testint"); + Factor<Double> factor3 = new Factor<Double>("factor 3 (double)"); ContinuousDomain<Double> domain3 = new ContinuousDomain<Double>(); domain3.setMinBound(12.0); domain3.setMaxBound(99.0); @@ -135,14 +124,6 @@ matrix1.setValue(new int[] { 2, 0 }, 12); matrix1.setValue(new int[] { 2, 1 }, -1); - // factor 1 - Factor<Double> factor1 = new Factor<Double>("test double 1"); - ContinuousDomain<Double> domain1 = new ContinuousDomain<Double>(); - domain1.setMinBound(0.0); - domain1.setMaxBound(50.0); - factor1.setDomain(domain1); - factor1.setPath("fr.ifremer.isisfish.entities.Population#1156462366818#0.5536481119187864#maxLength"); - // matrix 2 MatrixND matrix2 = MatrixFactory.getInstance().create("test1", new int[] { 3, 2 }, new String[] { "col1", "col2" }); @@ -153,19 +134,15 @@ matrix2.setValue(new int[] { 2, 0 }, 12); matrix2.setValue(new int[] { 2, 1 }, -1); - // factor 2 - Factor<Double> factor2 = new Factor<Double>("test double 2"); - DiscreteDomain<Double> domain2 = new DiscreteDomain<Double>(); - domain2.getValues().put(0.0, 12.3); - domain2.getValues().put(1.0, 70.9); - domain2.getValues().put(2.0, 21.0); - domain2.getValues().put(3.0, -12.1); - domain2.getValues().put(4.0, -8.45); - factor2.setDomain(domain2); - factor2.setPath("fr.ifremer.isisfish.entities.PopulationGroup#1156461521064#0.022976136053553198#minLength"); + // factor 1 + Factor<MatrixND> factor1 = new Factor<MatrixND>("factor 1 (matrixND)"); + DiscreteDomain<MatrixND> domain1 = new DiscreteDomain<MatrixND>(); + domain1.getValues().put(0.0, matrix1); + domain1.getValues().put(1.0, matrix2); + factor1.setDomain(domain1); + factor1.setPath("fr.ifremer.isisfish.entities.StrategyMonthInfo#1156808754768#0.7282750856395208#proportionMetier"); designPlan.getFactors().add(factor1); - designPlan.getFactors().add(factor2); return designPlan; } @@ -173,7 +150,7 @@ /** * Lance une simulation avec des facteurs de sensibilité. */ - @Ignore + @Test public void testRunSensivitySimulation() { SimulationParameter params = new SimulationParameter(); @@ -222,10 +199,10 @@ /** * Lance une simulation avec des facteurs de sensibilité. * - * This test call R. + * This test use factors with matrix. */ @Test - public void testRunSensivitySimulationMorris() { + public void testRunSensivitySimulationWithMatrix() { SimulationParameter params = new SimulationParameter(); // set params region @@ -251,10 +228,9 @@ SimulatorLauncher launcher = new InProcessSimulatorLauncher(); service.addSimulationLauncher(launcher); - //SensitivityCalculator sensitivityCalculator = new SensitivityCalculatorRMorris(); SensitivityCalculator sensitivityCalculator = new SensitivityCalculatorRandomMock(); - DesignPlan designPlan = getTestDesignPlan(); + DesignPlan designPlan = getTestMatrixDesignPlan(); service.submit("sensitivity test number 1", params, launcher, 0, sensitivityCalculator, designPlan); Modified: isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/launcher/SshSimulatorLauncherTest.java =================================================================== --- isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/launcher/SshSimulatorLauncherTest.java 2009-03-03 17:19:33 UTC (rev 1906) +++ isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/launcher/SshSimulatorLauncherTest.java 2009-03-04 11:18:49 UTC (rev 1907) @@ -1,5 +1,5 @@ /* *##% - * Copyright (C) 2008 Code Lutin + * Copyright (C) 2008 - 2009 Code Lutin * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -54,16 +54,20 @@ final String SIMULATIONID = "testid"; final String SIMULATIONZIP = "test.zip"; final String ISISHOME = IsisFish.config.getSimulatorSshIsisHome(); - + SSHSimulatorLauncher launcher = new SSHSimulatorLauncher(); - String content = launcher.getSimulationScriptLaunchContent(SSHSimulatorLauncher.SQUB_SCRIPT_TEMPLATE, SIMULATIONID, SIMULATIONZIP); + String content = launcher.getSimulationScriptLaunchContent( + SSHSimulatorLauncher.SQUB_SCRIPT_TEMPLATE, SIMULATIONID, + SIMULATIONZIP); // simulation parameters - Assert.assertTrue("String \"" + SIMULATIONID + "\" not found in template", - content.indexOf(SIMULATIONID) > 0); - Assert.assertTrue("String \"" + SIMULATIONZIP + "\" not found in template", + Assert.assertTrue("String \"" + SIMULATIONID + + "\" not found in template", content + .indexOf(SIMULATIONID) > 0); + Assert.assertTrue("String \"" + SIMULATIONZIP + + "\" not found in template", content.indexOf(SIMULATIONZIP) > 0); - + // isis location Assert.assertTrue("String \"" + ISISHOME + "\" not found in template", content.indexOf(ISISHOME) > 0); Modified: isis-fish/trunk/src/test/java/fr/ifremer/isisfish/util/CompileHelperTest.java =================================================================== --- isis-fish/trunk/src/test/java/fr/ifremer/isisfish/util/CompileHelperTest.java 2009-03-03 17:19:33 UTC (rev 1906) +++ isis-fish/trunk/src/test/java/fr/ifremer/isisfish/util/CompileHelperTest.java 2009-03-04 11:18:49 UTC (rev 1907) @@ -1,5 +1,5 @@ /* - * *##% Copyright (C) 2006 Code Lutin, Cédric Pineau, Benjamin Poussin + * *##% Copyright (C) 2006 - 2009 Code Lutin, Cédric 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 @@ -16,18 +16,6 @@ * Place - Suite 330, Boston, MA 02111-1307, USA. ##% */ -/******************************************************************************* - * ClassUtilTest.java - * - * Created: 12 janv. 2006 16:20:33 - * - * @author poussin - * - * @version $Revision$ - * - * Last update: $Date$ by : $Author$ - */ - package fr.ifremer.isisfish.util; import junit.framework.TestCase; @@ -41,10 +29,17 @@ import java.util.List; /** + * ClassUtilTest. + * + * Created: 12 janv. 2006 16:20:33 + * * @author poussin * + * @version $Revision$ + * + * Last update: $Date$ + * by : $Author$ */ - public class CompileHelperTest extends TestCase { public void testCompile() throws Exception { @@ -52,12 +47,13 @@ String filename = FileUtil.basename(f, ".java"); String code = "public class " + filename + " {}"; FileUtil.writeString(f, code); - + List<File> classpath = new ArrayList<File>(); classpath.add(f.getParentFile()); - - CompileHelper.compile(classpath, Collections.singletonList(f), f.getParentFile(), null); + CompileHelper.compile(classpath, Collections.singletonList(f), f + .getParentFile(), null); + // essai de chargement de la classe URL[] cp = new URL[] { f.getParentFile().toURI().toURL() }; //URL[] cp = new URL[] { f.getParentFile().toURL() }; @@ -80,10 +76,11 @@ FileUtil.writeString(fB, codeB); File dest = new File(fB.getParentFile(), "testCompile"); - + List<File> classpath = new ArrayList<File>(); classpath.add(fB.getParentFile()); - CompileHelper.compile(classpath, Collections.singletonList(fB), dest, null); + CompileHelper.compile(classpath, Collections.singletonList(fB), dest, + null); { // essai de chargement de la classe Deleted: isis-fish/trunk/src/test/java/fr/ifremer/isisfish/util/MethodTest.java =================================================================== --- isis-fish/trunk/src/test/java/fr/ifremer/isisfish/util/MethodTest.java 2009-03-03 17:19:33 UTC (rev 1906) +++ isis-fish/trunk/src/test/java/fr/ifremer/isisfish/util/MethodTest.java 2009-03-04 11:18:49 UTC (rev 1907) @@ -1,10 +0,0 @@ -package fr.ifremer.isisfish.util; - -/** - * to mark a test method (public void testXXX throws Exception()) in our TestCase - */ - at java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME) - at java.lang.annotation.Target(value = {java.lang.annotation.ElementType.METHOD}) - -public @interface MethodTest { -} Modified: isis-fish/trunk/src/test/java/fr/ifremer/isisfish/vcs/VCSSVNTest.java =================================================================== --- isis-fish/trunk/src/test/java/fr/ifremer/isisfish/vcs/VCSSVNTest.java 2009-03-03 17:19:33 UTC (rev 1906) +++ isis-fish/trunk/src/test/java/fr/ifremer/isisfish/vcs/VCSSVNTest.java 2009-03-04 11:18:49 UTC (rev 1907) @@ -91,7 +91,7 @@ */ @BeforeClass public static void init() throws Exception { - IsisFish.init(); + TestUtils.init(); template = new File(TMPDIR, "testsvn-template"); remoteRepo = new File(TMPDIR, "testsvn-repo");

1 0

r1906 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator
by sletellier＠users.labs.libre-entreprise.org March 3, 2009

March 3, 2009

Author: sletellier Date: 2009-03-03 17:19:33 +0000 (Tue, 03 Mar 2009) New Revision: 1906 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulUI.jaxx Log: Ajout de la saisie des sensibilit?\195?\169s Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx 2009-03-03 17:19:21 UTC (rev 1905) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx 2009-03-03 17:19:33 UTC (rev 1906) @@ -31,12 +31,17 @@ */ --> <Table> + +  + <Boolean id='sensitivity' javaBean='false'/> + <script><![CDATA[ import static org.codelutin.i18n.I18n._; import fr.ifremer.isisfish.ui.Common; import fr.ifremer.isisfish.datastore.RuleStorage; import fr.ifremer.isisfish.ui.WelcomeUI; import fr.ifremer.isisfish.ui.WelcomePanelUI; + import fr.ifremer.isisfish.ui.WelcomeTabUI; import fr.ifremer.isisfish.simulator.SimulationParameter; import fr.ifremer.isisfish.simulator.launcher.SimulatorLauncher; import fr.ifremer.isisfish.entities.Strategy; @@ -58,6 +63,9 @@ import org.dom4j.Element; import fr.ifremer.isisfish.simulator.launcher.SimulationService; import fr.ifremer.isisfish.simulator.launcher.SimulationJob; + import fr.ifremer.isisfish.ui.sensitivity.SensitivityUI; + import fr.ifremer.isisfish.entities.FisheryRegionImpl; + import fr.ifremer.isisfish.datastore.StorageException; import fr.ifremer.isisfish.simulator.launcher.SimulationServiceListener; SimulationServiceListener simulationListener; @@ -81,6 +89,7 @@ setContextValue(action); } public void refresh(){ + setSensitivity(getParentContainer(SensitivityUI.class) != null); SimulationService.getService().removeSimulationServiceListener(simulationListener); SimulationService.getService().addSimulationServiceListener(simulationListener); if (getContextValue(SimulAction.class).getSimulationStorage() != null){ @@ -117,6 +126,15 @@ public void run() { getContextValue(SimulAction.class).regionChange(selected); refresh(); + if (isSensitivity()){ + try { + System.out.println("isSelectivity"); + getParentContainer(SensitivityUI.class).getSensitivityTabUI().setRegion((FisheryRegionImpl) getContextValue(SimulAction.class).getSimulationParameter().getRegion().getFisheryRegion()); + getParentContainer(SensitivityUI.class).getSensitivityTabUI().setTreeModel(); + } catch (StorageException ex) { + log.debug(ex.getMessage(), ex); + }; + } getParentContainer(WelcomePanelUI.class).setInfoText(_("isisfish.message.region.loaded")); } }); @@ -156,8 +174,7 @@ } protected void simul(){ getContextValue(SimulAction.class).launchSimulation(fieldSimulParamsName.getText(), (SimulatorLauncher)comboSelLauncher.getSelectedItem()); - SimulUI simul = getParentContainer(SimulUI.class); - simul.selTab(6); + getParentContainer(WelcomeTabUI.class).selTab(5); } protected void enablePreSimul(){ if (fieldUseSimulPreScripts.isSelected()){ Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulUI.jaxx 2009-03-03 17:19:21 UTC (rev 1905) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulUI.jaxx 2009-03-03 17:19:33 UTC (rev 1906) @@ -34,6 +34,11 @@ <script><![CDATA[ import org.dom4j.DocumentHelper; import org.dom4j.Element; + import jaxx.runtime.JAXXInitialContext; + import fr.ifremer.isisfish.ui.input.InputAction; + import fr.ifremer.isisfish.ui.input.InputSaveVerifier; + import fr.ifremer.isisfish.datastore.StorageException; + import fr.ifremer.isisfish.entities.FisheryRegionImpl; public SimulUI(SimulAction action){ setContextValue(action); @@ -56,7 +61,6 @@ exportUI.refresh(); resultChoiceUI.refresh(); advencedParamsUI.refresh(); - queueUI.refresh(); } protected void importSimulation(){ JFileChooser fc = new JFileChooser(); @@ -77,9 +81,6 @@ File file = fc.getSelectedFile(); //This is where a real application would open the file. getContextValue(SimulAction.class).saveSimulation(file); -// Element result = DocumentHelper.createElement("simul"); -// result.add(paramsUI.save()); -// System.out.println(result.asXML()); } } ]]> @@ -109,8 +110,5 @@ <tab id="advancedParamsUITab" title='isisfish.advancedParameters.title'> <AdvancedParamsUI id="advencedParamsUI" constructorParams='getContextValue(SimulAction.class)'/> </tab> - <tab id="queueUITab" title='isisfish.queue.title'> - <QueueUI id="queueUI" constructorParams='getContextValue(SimulAction.class)'/> - </tab> </JTabbedPane> </JPanel> \ No newline at end of file

1 0

r1905 - in isis-fish/trunk: . src/main/java/fr/ifremer/isisfish/ui src/main/java/fr/ifremer/isisfish/ui/input src/main/java/fr/ifremer/isisfish/ui/sensitivity src/main/java/fr/ifremer/isisfish/ui/util src/main/resources src/main/resources/i18n src/main/resources/images
by sletellier＠users.labs.libre-entreprise.org March 3, 2009

March 3, 2009

Author: sletellier Date: 2009-03-03 17:19:21 +0000 (Tue, 03 Mar 2009) New Revision: 1905 Added: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityNavigationTreeSelectionAdapter.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityTabUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/util/UtilsUI.java isis-fish/trunk/src/main/resources/images/Queue.gif isis-fish/trunk/src/main/resources/images/sensitivities.gif isis-fish/trunk/src/main/resources/sensitivity.properties Modified: isis-fish/trunk/pom.xml isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeTabUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/CellUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescriptionUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/FisheryRegionUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/GearTabUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/GearUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputAction.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputOneEquationUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputSaveVerifier.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoZoneUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierTabUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/NoneUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationBasicsUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationCapturabilityUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationEquationUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationGroupUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEmigrationUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEquationUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationImmigrationUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationMigrationUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationRecruitmentUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonsUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationZonesUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PortUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsTabsUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SpeciesUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyMonthInfoUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyOneMonthInfoUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyTabUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/TripTypeUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/VesselTypeUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/WizardGroupCreationUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties Log: Ajout de la saisie des sensibilit?\195?\169s Modified: isis-fish/trunk/pom.xml =================================================================== --- isis-fish/trunk/pom.xml 2009-03-03 10:47:43 UTC (rev 1904) +++ isis-fish/trunk/pom.xml 2009-03-03 17:19:21 UTC (rev 1905) @@ -345,7 +345,7 @@ <labs.project>isis-fish</labs.project>  - <jaxx.version>1.2</jaxx.version> + <jaxx.version>1.3-SNAPSHOT</jaxx.version> <topia.version>2.1.3</topia.version> <topia.service.version>1.0.2</topia.service.version> <lutinmatrix.version>1.3-SNAPSHOT</lutinmatrix.version> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeTabUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeTabUI.jaxx 2009-03-03 10:47:43 UTC (rev 1904) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeTabUI.jaxx 2009-03-03 17:19:21 UTC (rev 1905) @@ -33,18 +33,25 @@ <JPanel id='welcomePanelUI' layout='{new BorderLayout()}'> <script><![CDATA[ import fr.ifremer.isisfish.ui.simulator.SimulAction; - import fr.ifremer.isisfish.ui.input.InputAction; import fr.ifremer.isisfish.ui.result.ResultAction; import jaxx.runtime.JAXXInitialContext; + import fr.ifremer.isisfish.ui.input.InputAction; import fr.ifremer.isisfish.ui.input.InputSaveVerifier; simulUI.getContextValue(SimulAction.class).init(); + + public void selTab(int i){ + simulTabs.setSelectedIndex(i); + } ]]> </script> <JTabbedPane id="simulTabs" tabPlacement='{JTabbedPane.LEFT}' constraints="BorderLayout.CENTER"> <tab title=' ' icon='{new ImageIcon(getClass().getResource("/images/simulation.gif"))}'> <fr.ifremer.isisfish.ui.simulator.SimulUI id='simulUI' constructorParams='new SimulAction()'/> </tab> + <tab title=' ' icon='{new ImageIcon(getClass().getResource("/images/sensitivities.gif"))}'> + <fr.ifremer.isisfish.ui.sensitivity.SensitivityUI id="sensitivityUI" constructorParams='new JAXXInitialContext().add(new InputAction()).add(new InputSaveVerifier()).add(this)'/> + </tab> <tab title=' ' icon='{new ImageIcon(getClass().getResource("/images/calc.gif"))}'> <fr.ifremer.isisfish.ui.result.ResultView/> </tab> @@ -54,5 +61,8 @@ <tab title=' ' icon='{new ImageIcon(getClass().getResource("/images/bookPage.gif"))}'> <fr.ifremer.isisfish.ui.script.ScriptUI/> </tab> + <tab title=' ' icon='{new ImageIcon(getClass().getResource("/images/Queue.gif"))}'> + <fr.ifremer.isisfish.ui.simulator.QueueUI/> + </tab> </JTabbedPane> </JPanel> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeUI.jaxx 2009-03-03 10:47:43 UTC (rev 1904) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeUI.jaxx 2009-03-03 17:19:21 UTC (rev 1905) @@ -36,6 +36,7 @@ import fr.ifremer.isisfish.ui.simulator.SimulAction; import fr.ifremer.isisfish.ui.input.InputUI; import fr.ifremer.isisfish.ui.input.InputAction; + import fr.ifremer.isisfish.ui.sensitivity.SensitivityUI; import fr.ifremer.isisfish.ui.result.ResultAction; import fr.ifremer.isisfish.ui.result.ResultView; import fr.ifremer.isisfish.ui.script.ScriptUI; @@ -161,6 +162,7 @@ <JMenuItem text="isisfish.welcome.menu.result" onActionPerformed='openFrame(new ResultView(), _("isisfish.result.title"))'/> <JMenuItem text="isisfish.welcome.menu.input" onActionPerformed='openFrame(new InputUI(new JAXXInitialContext().add(verifier).add(new InputAction()).add(new InputSaveVerifier()).add(this)), _("isisfish.input.title"))'/> <JMenuItem text="isisfish.welcome.menu.script" onActionPerformed='openFrame(new ScriptUI(), _("isisfish.script.title"))'/> + <JMenuItem text="isisfish.sensitivity.title" onActionPerformed='openFrame(new SensitivityUI(new JAXXInitialContext().add(new InputAction()).add(new InputSaveVerifier()).add(this)), _("isisfish.sensitivity.title"))'/> <JSeparator/> <JMenuItem text="isisfish.welcome.menu.queue" onActionPerformed='openFrame(new QueueUI(), _("isisfish.queue.title"))'/> <JSeparator/> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/CellUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/CellUI.jaxx 2009-03-03 10:47:43 UTC (rev 1904) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/CellUI.jaxx 2009-03-03 17:19:21 UTC (rev 1905) @@ -132,7 +132,8 @@ <JLabel text="isisfish.cell.name" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='1.0'> - <JTextField id="fieldCellName" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getName())}' onKeyReleased='getBean().setName(fieldCellName.getText())' enabled='{isActif()}'/> + <JTextField id="fieldCellName" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getName())}' decorator='boxed' + _bean='{getBean()}' _method='"Name"' onKeyReleased='getBean().setName(fieldCellName.getText())' enabled='{isActif()}'/> </cell> </row> <row> @@ -140,7 +141,7 @@ <JLabel text="isisfish.cell.latitude" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='1.0'> - <JTextField id="fieldCellLatitude" text='{getBean().getLatitude()}' editable="false" enabled='{isActif()}'/> + <JTextField id="fieldCellLatitude" text='{getBean().getLatitude()}' editable="false" enabled='{isActif()}' decorator='boxed' _bean='{CellImpl.class}' _method='"Latitude"'/> </cell> </row> <row> @@ -148,7 +149,7 @@ <JLabel text="isisfish.cell.longitude" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='1.0'> - <JTextField id="fieldCellLongitude" text='{getBean().getLongitude()}' editable="false" enabled='{isActif()}'/> + <JTextField id="fieldCellLongitude" text='{getBean().getLongitude()}' editable="false" enabled='{isActif()}' decorator='boxed' _bean='{CellImpl.class}' _method='"Longitude"'/> </cell> </row> <row> @@ -156,7 +157,7 @@ <JLabel text="isisfish.cell.land" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='1.0'> - <JCheckBox id="fieldCellLand" onActionPerformed='getBean().setLand(fieldCellLand.isSelected())' enabled='{isActif()}' selected='{getBean().getLand()}'/> + <JCheckBox id="fieldCellLand" onActionPerformed='getBean().setLand(fieldCellLand.isSelected())' enabled='{isActif()}' selected='{getBean().getLand()}' decorator='boxed' _bean='{CellImpl.class}' _method='"Land"'/> </cell> </row> <row> @@ -167,7 +168,7 @@ <row> <cell columns='2' fill='both' weighty='1.0' weightx='1.0'> <JScrollPane> - <JTextArea id="fieldCellComment" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getComment())}' onKeyReleased='getBean().setComment(fieldCellComment.getText())' enabled='{isActif()}'/> + <JTextArea id="fieldCellComment" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getComment())}' onKeyReleased='getBean().setComment(fieldCellComment.getText())' enabled='{isActif()}' decorator='boxed' _bean='{CellImpl.class}' _method='"Comment"'/> </JScrollPane> </cell> </row> @@ -186,4 +187,4 @@ </JPanel> </JSplitPane> </JPanel> -</fr.ifremer.isisfish.ui.input.InputContentUI> \ No newline at end of file +</fr.ifremer.isisfish.ui.input.InputContentUI> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescriptionUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescriptionUI.jaxx 2009-03-03 10:47:43 UTC (rev 1904) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescriptionUI.jaxx 2009-03-03 17:19:21 UTC (rev 1905) @@ -142,7 +142,7 @@ <JLabel text="isisfish.effortDescription.fishingOperation" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='1.0'> - <JTextField id="fieldEffortDescriptionFishingOperation" text='{getEffortDescription().getFishingOperation()}' onKeyReleased='getEffortDescription().setFishingOperation(Integer.parseInt(fieldEffortDescriptionFishingOperation.getText()))' enabled='{isActif()}'/> + <JTextField id="fieldEffortDescriptionFishingOperation" text='{getEffortDescription().getFishingOperation()}' onKeyReleased='getEffortDescription().setFishingOperation(Integer.parseInt(fieldEffortDescriptionFishingOperation.getText()))' enabled='{isActif()}' decorator='boxed' _bean='{EffortDescriptionImpl.class}' _method='"FishingOperation"'/> </cell> </row> <row> @@ -150,7 +150,7 @@ <JLabel text="isisfish.effortDescription.fishingOperationDuration" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='1.0'> - <JTextField id="fieldEffortDescriptionFishingOperationDuration" text='{getEffortDescription().getFishingOperationDuration() == null ? "" : getEffortDescription().getFishingOperationDuration().getHour()}' onKeyReleased='getEffortDescription().setFishingOperationDuration(new TimeUnit(3600 * Double.parseDouble(fieldEffortDescriptionFishingOperationDuration.getText())))' enabled='{isActif()}'/> + <JTextField id="fieldEffortDescriptionFishingOperationDuration" text='{getEffortDescription().getFishingOperationDuration() == null ? "" : getEffortDescription().getFishingOperationDuration().getHour()}' onKeyReleased='getEffortDescription().setFishingOperationDuration(new TimeUnit(3600 * Double.parseDouble(fieldEffortDescriptionFishingOperationDuration.getText())))' enabled='{isActif()}' decorator='boxed' _bean='{EffortDescriptionImpl.class}' _method='"FishingOperationDuration"'/> </cell> </row> <row> @@ -158,7 +158,7 @@ <JLabel text="isisfish.effortDescription.gearsNumberPerOperation" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='1.0'> - <JTextField id="fieldEffortDescriptionGearsNumberPerOperation" text='{getEffortDescription().getGearsNumberPerOperation()}' onKeyReleased='getEffortDescription().setGearsNumberPerOperation(Integer.parseInt(fieldEffortDescriptionGearsNumberPerOperation.getText()))' enabled='{isActif()}'/> + <JTextField id="fieldEffortDescriptionGearsNumberPerOperation" text='{getEffortDescription().getGearsNumberPerOperation()}' onKeyReleased='getEffortDescription().setGearsNumberPerOperation(Integer.parseInt(fieldEffortDescriptionGearsNumberPerOperation.getText()))' enabled='{isActif()}' decorator='boxed' _bean='{EffortDescriptionImpl.class}' _method='"GearsNumberPerOperation"'/> </cell> </row> <row> @@ -166,7 +166,7 @@ <JLabel text="isisfish.effortDescription.crewSize" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='1.0'> - <JTextField id="fieldEffortDescriptionCrewSize" text='{getEffortDescription().getCrewSize()}' onKeyReleased='getEffortDescription().setCrewSize(Integer.parseInt(fieldEffortDescriptionCrewSize.getText()))' enabled='{isActif()}'/> + <JTextField id="fieldEffortDescriptionCrewSize" text='{getEffortDescription().getCrewSize()}' onKeyReleased='getEffortDescription().setCrewSize(Integer.parseInt(fieldEffortDescriptionCrewSize.getText()))' enabled='{isActif()}' decorator='boxed' _bean='{EffortDescriptionImpl.class}' _method='"CrewSize"'/> </cell> </row> <row> @@ -174,7 +174,7 @@ <JLabel text="isisfish.effortDescription.unitCostOfFishing" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='1.0'> - <JTextField id="fieldEffortDescriptionUnitCostOfFishing" text='{getEffortDescription().getUnitCostOfFishing()}' onKeyReleased='getEffortDescription().setUnitCostOfFishing(Double.parseDouble(fieldEffortDescriptionUnitCostOfFishing.getText()))' enabled='{isActif()}'/> + <JTextField id="fieldEffortDescriptionUnitCostOfFishing" text='{getEffortDescription().getUnitCostOfFishing()}' onKeyReleased='getEffortDescription().setUnitCostOfFishing(Double.parseDouble(fieldEffortDescriptionUnitCostOfFishing.getText()))' enabled='{isActif()}' decorator='boxed' _bean='{EffortDescriptionImpl.class}' _method='"UnitCostOfFishing"'/> </cell> </row> <row> @@ -182,7 +182,7 @@ <JLabel text="isisfish.effortDescription.fixedCrewSalary" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='1.0'> - <JTextField id="fieldEffortDescriptionFixedCrewSalary" text='{getEffortDescription().getFixedCrewSalary()}' onKeyReleased='getEffortDescription().setFixedCrewSalary(Double.parseDouble(fieldEffortDescriptionFixedCrewSalary.getText()))' enabled='{isActif()}'/> + <JTextField id="fieldEffortDescriptionFixedCrewSalary" text='{getEffortDescription().getFixedCrewSalary()}' onKeyReleased='getEffortDescription().setFixedCrewSalary(Double.parseDouble(fieldEffortDescriptionFixedCrewSalary.getText()))' enabled='{isActif()}' decorator='boxed' _bean='{EffortDescriptionImpl.class}' _method='"FixedCrewSalary"'/> </cell> </row> <row> @@ -190,7 +190,7 @@ <JLabel text="isisfish.effortDescription.crewFoodCost" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='1.0'> - <JTextField id="fieldEffortDescriptionCrewFoodCost" text='{getEffortDescription().getCrewFoodCost()}' onKeyReleased='getEffortDescription().setCrewFoodCost(Double.parseDouble(fieldEffortDescriptionCrewFoodCost.getText()))' enabled='{isActif()}'/> + <JTextField id="fieldEffortDescriptionCrewFoodCost" text='{getEffortDescription().getCrewFoodCost()}' onKeyReleased='getEffortDescription().setCrewFoodCost(Double.parseDouble(fieldEffortDescriptionCrewFoodCost.getText()))' enabled='{isActif()}' decorator='boxed' _bean='{EffortDescriptionImpl.class}' _method='"CrewFoodCost"'/> </cell> </row> <row> @@ -198,7 +198,7 @@ <JLabel text="isisfish.effortDescription.crewShareRate" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='1.0'> - <JTextField id="fieldEffortDescriptionCrewShareRate" text='{getEffortDescription().getCrewShareRate()}' onKeyReleased='getEffortDescription().setCrewShareRate(Double.parseDouble(fieldEffortDescriptionCrewShareRate.getText()))' enabled='{isActif()}'/> + <JTextField id="fieldEffortDescriptionCrewShareRate" text='{getEffortDescription().getCrewShareRate()}' onKeyReleased='getEffortDescription().setCrewShareRate(Double.parseDouble(fieldEffortDescriptionCrewShareRate.getText()))' enabled='{isActif()}' decorator='boxed' _bean='{EffortDescriptionImpl.class}' _method='"CrewShareRate"'/> </cell> </row> <row> @@ -206,7 +206,7 @@ <JLabel text="isisfish.effortDescription.repairAndMaintenanceGearCost" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='1.0'> - <JTextField id="fieldEffortDescriptionRepairAndMaintenanceGearCost" text='{getEffortDescription().getRepairAndMaintenanceGearCost()}' onKeyReleased='getEffortDescription().setRepairAndMaintenanceGearCost(Double.parseDouble(fieldEffortDescriptionRepairAndMaintenanceGearCost.getText()))' enabled='{isActif()}'/> + <JTextField id="fieldEffortDescriptionRepairAndMaintenanceGearCost" text='{getEffortDescription().getRepairAndMaintenanceGearCost()}' onKeyReleased='getEffortDescription().setRepairAndMaintenanceGearCost(Double.parseDouble(fieldEffortDescriptionRepairAndMaintenanceGearCost.getText()))' enabled='{isActif()}' decorator='boxed' _bean='{EffortDescriptionImpl.class}' _method='"RepairAndMaintenanceGearCost"'/> </cell> </row> <row> @@ -214,7 +214,7 @@ <JLabel text="isisfish.effortDescription.landingCosts" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='1.0'> - <JTextField id="fieldEffortDescriptionLandingCosts" text='{getEffortDescription().getLandingCosts()}' onKeyReleased='getEffortDescription().setLandingCosts(Double.parseDouble(fieldEffortDescriptionLandingCosts.getText()))' enabled='{isActif()}'/> + <JTextField id="fieldEffortDescriptionLandingCosts" text='{getEffortDescription().getLandingCosts()}' onKeyReleased='getEffortDescription().setLandingCosts(Double.parseDouble(fieldEffortDescriptionLandingCosts.getText()))' enabled='{isActif()}' decorator='boxed' _bean='{EffortDescriptionImpl.class}' _method='"LandingCosts"'/> </cell> </row> <row> @@ -222,7 +222,7 @@ <JLabel text="isisfish.effortDescription.otherRunningCost" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='1.0'> - <JTextField id="fieldEffortDescriptionOtherRunningCost" text='{getEffortDescription().getOtherRunningCost()}' onKeyReleased='getEffortDescription().setOtherRunningCost(Double.parseDouble(fieldEffortDescriptionOtherRunningCost.getText()))' enabled='{isActif()}'/> + <JTextField id="fieldEffortDescriptionOtherRunningCost" text='{getEffortDescription().getOtherRunningCost()}' onKeyReleased='getEffortDescription().setOtherRunningCost(Double.parseDouble(fieldEffortDescriptionOtherRunningCost.getText()))' enabled='{isActif()}' decorator='boxed' _bean='{EffortDescriptionImpl.class}' _method='"OtherRunningCost"'/> </cell> </row> <row> @@ -246,4 +246,4 @@ </cell> </row> </Table> -</fr.ifremer.isisfish.ui.input.InputContentUI> \ No newline at end of file +</fr.ifremer.isisfish.ui.input.InputContentUI> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/FisheryRegionUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/FisheryRegionUI.jaxx 2009-03-03 10:47:43 UTC (rev 1904) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/FisheryRegionUI.jaxx 2009-03-03 17:19:21 UTC (rev 1905) @@ -133,7 +133,10 @@ </row> <row> <cell columns='3' fill='horizontal' weightx='1.0'> - <JTextField id="fieldRegion" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getName())}' onKeyReleased='getBean().setName(fieldRegion.getText())'/> + <JTextField id="fieldRegion" decorator='boxed' + _bean='{FisheryRegionImpl.class}' _method='"Name"' + text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getName())}' + onKeyReleased='getBean().setName(fieldRegion.getText())'/> </cell> </row> <row> @@ -146,7 +149,8 @@ <JLabel text="isisfish.fisheryRegion.latitude.min"/> </cell> <cell columns='2' fill='horizontal' weightx='1.0'> - <JTextField id="fieldLatMin" text='{getBean().getMinLatitude()}' onKeyReleased='getBean().setMinLatitude(Float.parseFloat(fieldLatMin.getText()))'/> + <JTextField id="fieldLatMin" text='{getBean().getMinLatitude()}' decorator='boxed' + _bean='{FisheryRegionImpl.class}' _method='"MinLatitude"' onKeyReleased='getBean().setMinLatitude(Float.parseFloat(fieldLatMin.getText()))'/> </cell> </row> <row> @@ -154,7 +158,8 @@ <JLabel text="isisfish.fisheryRegion.latitude.max"/> </cell> <cell columns='2' fill='horizontal' weightx='1.0'> - <JTextField id="fieldLatMax" text='{getBean().getMaxLatitude()}' onKeyReleased='getBean().setMaxLatitude(Float.parseFloat(fieldLatMax.getText()))'/> + <JTextField id="fieldLatMax" text='{getBean().getMaxLatitude()}' decorator='boxed' + _bean='{FisheryRegionImpl.class}' _method='"MaxLatitude"' onKeyReleased='getBean().setMaxLatitude(Float.parseFloat(fieldLatMax.getText()))'/> </cell> </row> <row> @@ -162,7 +167,8 @@ <JLabel text="isisfish.fisheryRegion.longitude.min"/> </cell> <cell columns='2' fill='horizontal' weightx='1.0'> - <JTextField id="fieldLongMin" text='{getBean().getMinLongitude()}' onKeyReleased='getBean().setMinLongitude(Float.parseFloat(fieldLongMin.getText()))'/> + <JTextField id="fieldLongMin" text='{getBean().getMinLongitude()}' decorator='boxed' + _bean='{FisheryRegionImpl.class}' _method='"MinLongitude"' onKeyReleased='getBean().setMinLongitude(Float.parseFloat(fieldLongMin.getText()))'/> </cell> </row> <row> @@ -170,7 +176,8 @@ <JLabel text="isisfish.fisheryRegion.longitude.max"/> </cell> <cell columns='2' fill='horizontal' weightx='1.0'> - <JTextField id="fieldLongMax" text='{getBean().getMaxLongitude()}' onKeyReleased='getBean().setMaxLongitude(Float.parseFloat(fieldLongMax.getText()))'/> + <JTextField id="fieldLongMax" text='{getBean().getMaxLongitude()}' decorator='boxed' + _bean='{FisheryRegionImpl.class}' _method='"MaxLongitude"' onKeyReleased='getBean().setMaxLongitude(Float.parseFloat(fieldLongMax.getText()))'/> </cell> </row> <row> @@ -183,7 +190,8 @@ <JLabel text="isisfish.fisheryRegion.latitude"/> </cell> <cell columns='2' fill='horizontal' weightx='1.0'> - <JTextField id="fieldCellLengthLatitude" text='{getBean().getCellLengthLatitude()}' onKeyReleased='getBean().setCellLengthLatitude(Float.parseFloat(fieldCellLengthLatitude.getText()))'/> + <JTextField id="fieldCellLengthLatitude" text='{getBean().getCellLengthLatitude()}' decorator='boxed' + _bean='{FisheryRegionImpl.class}' _method='"CellLengthLatitude"' onKeyReleased='getBean().setCellLengthLatitude(Float.parseFloat(fieldCellLengthLatitude.getText()))'/> </cell> </row> <row> @@ -191,7 +199,8 @@ <JLabel text="isisfish.fisheryRegion.longitude"/> </cell> <cell columns='2' fill='horizontal' weightx='1.0'> - <JTextField id="fieldCellLengthLongitude" text='{getBean().getCellLengthLongitude()}' onKeyReleased='getBean().setCellLengthLongitude(Float.parseFloat(fieldCellLengthLongitude.getText()))'/> + <JTextField id="fieldCellLengthLongitude" text='{getBean().getCellLengthLongitude()}' decorator='boxed' + _bean='{FisheryRegionImpl.class}' _method='"CellLengthLongitude"' onKeyReleased='getBean().setCellLengthLongitude(Float.parseFloat(fieldCellLengthLongitude.getText()))'/> </cell> </row> <row> @@ -223,7 +232,8 @@ <row> <cell columns='3' fill='both' weightx='1.0' weighty='0.4'> <JScrollPane> - <JTextArea id="fieldComment" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getComment())}' onKeyReleased='getBean().setComment(fieldComment.getText())'/> + <JTextArea id="fieldComment" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getComment())}' decorator='boxed' + _bean='{FisheryRegionImpl.class}' _method='"Comment"' onKeyReleased='getBean().setComment(fieldComment.getText())'/> </JScrollPane> </cell> </row> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/GearTabUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/GearTabUI.jaxx 2009-03-03 10:47:43 UTC (rev 1904) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/GearTabUI.jaxx 2009-03-03 17:19:21 UTC (rev 1905) @@ -99,7 +99,7 @@ <JLabel text="isisfish.gear.name" enabled='{isActif()}'/> </cell> <cell columns="2" fill='horizontal' weightx='1.0'> - <JTextField id="fieldGearName" text='{getBean().getName()}' onKeyReleased='getBean().setName(fieldGearName.getText())' enabled='{isActif()}'/> + <JTextField id="fieldGearName" text='{getBean().getName()}' onKeyReleased='getBean().setName(fieldGearName.getText())' enabled='{isActif()}' decorator='boxed' _bean='{GearImpl.class}' _method='"Name"'/> </cell> </row> <row> @@ -107,7 +107,7 @@ <JLabel text="isisfish.gear.effortUnit" enabled='{isActif()}'/> </cell> <cell columns="2" fill='horizontal' weightx='1.0'> - <JTextField id="fieldGearEffortUnit" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getEffortUnit())}' onKeyReleased='getBean().setEffortUnit(fieldGearEffortUnit.getText())' enabled='{isActif()}'/> + <JTextField id="fieldGearEffortUnit" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getEffortUnit())}' onKeyReleased='getBean().setEffortUnit(fieldGearEffortUnit.getText())' enabled='{isActif()}' decorator='boxed' _bean='{GearImpl.class}' _method='"EffortUnit"'/> </cell> </row> <row> @@ -115,7 +115,7 @@ <JLabel text="isisfish.gear.standardisationFactor" enabled='{isActif()}'/> </cell> <cell columns="2" fill='horizontal' weightx='1.0'> - <JTextField id="fieldGearStandardisationFactor" text='{getBean().getStandardisationFactor()}' onKeyReleased='getBean().setStandardisationFactor(Double.parseDouble(fieldGearStandardisationFactor.getText()))' enabled='{isActif()}'/> + <JTextField id="fieldGearStandardisationFactor" text='{getBean().getStandardisationFactor()}' onKeyReleased='getBean().setStandardisationFactor(Double.parseDouble(fieldGearStandardisationFactor.getText()))' enabled='{isActif()}' decorator='boxed' _bean='{GearImpl.class}' _method='"StandardisationFactor"'/> </cell> </row> <row> @@ -123,7 +123,7 @@ <JLabel text="isisfish.gear.technicalParameter" enabled='{isActif()}'/> </cell> <cell columns="2" fill='horizontal' weightx='1.0'> - <JTextField id="fieldGearParamName" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getParameterName())}' onKeyReleased='getBean().setParameterName(fieldGearParamName.getText())' enabled='{isActif()}'/> + <JTextField id="fieldGearParamName" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getParameterName())}' onKeyReleased='getBean().setParameterName(fieldGearParamName.getText())' enabled='{isActif()}' decorator='boxed' _bean='{GearImpl.class}' _method='"ParameterName"'/> </cell> </row> <row> @@ -134,7 +134,7 @@ <JComboBox id="fieldGearParamType" onActionPerformed='paramChanged()' enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='0.5'> - <JTextField id="fieldGearParamPossibleValue" text='{getBean().getPossibleValue() == null ? "" : getBean().getPossibleValue().getValues()}' onKeyReleased='paramChanged()' enabled='{isActif()}'/> + <JTextField id="fieldGearParamPossibleValue" text='{getBean().getPossibleValue() == null ? "" : getBean().getPossibleValue().getValues()}' onKeyReleased='paramChanged()' enabled='{isActif()}' decorator='boxed' _bean='{GearImpl.class}' _method='"PossibleValue"'/> </cell> </row> <row> @@ -143,7 +143,7 @@ </cell> <cell columns="2" fill='both' weightx='1.0' weighty='1.0'> <JScrollPane> - <JTextArea id="fieldGearComment" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getComment())}' onKeyReleased='getBean().setComment(fieldGearComment.getText())' enabled='{isActif()}'/> + <JTextArea id="fieldGearComment" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getComment())}' onKeyReleased='getBean().setComment(fieldGearComment.getText())' enabled='{isActif()}' decorator='boxed' _bean='{GearImpl.class}' _method='"Comment"'/> </JScrollPane> </cell> </row> @@ -173,4 +173,4 @@ </cell> </row> </Table> -</fr.ifremer.isisfish.ui.input.InputContentUI> \ No newline at end of file +</fr.ifremer.isisfish.ui.input.InputContentUI> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/GearUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/GearUI.jaxx 2009-03-03 10:47:43 UTC (rev 1904) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/GearUI.jaxx 2009-03-03 17:19:21 UTC (rev 1905) @@ -52,4 +52,4 @@ <tab title='{_("isisfish.selectivity.title")}'><SelectivityUI id="selectivityUI" constructorParams='this'/></tab> </JTabbedPane> </JPanel> -</fr.ifremer.isisfish.ui.input.InputContentUI> \ No newline at end of file +</fr.ifremer.isisfish.ui.input.InputContentUI> 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 2009-03-03 10:47:43 UTC (rev 1904) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputAction.java 2009-03-03 17:19:21 UTC (rev 1905) @@ -321,7 +321,7 @@ * * @param name name of region */ - public FisheryRegion loadRegion(InputUI ui, String name) { + public FisheryRegion loadRegion(jaxx.runtime.JAXXObject ui, String name) { if (log.isTraceEnabled()) { log.trace("loadRegion called"); } Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.jaxx 2009-03-03 10:47:43 UTC (rev 1904) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.jaxx 2009-03-03 17:19:21 UTC (rev 1905) @@ -25,6 +25,9 @@ import org.codelutin.topia.persistence.TopiaEntity; import javax.swing.JComponent; import jaxx.runtime.SwingUtil; +import java.lang.reflect.Method; +import org.apache.commons.beanutils.MethodUtils; +import fr.ifremer.isisfish.ui.util.UtilsUI; public void refresh(){} public InputAction getAction() { @@ -45,18 +48,42 @@ public void setBean(TopiaEntity t){}; public void setLayer(boolean active) { - System.out.println(active); - for (JComponent boxed : SwingUtil.getLayeredComponents(this)) { - //TODO si dans le component, on a une certaine propriete, - //TODO on utilise le layer avec icone, sinon un layer sans icone (blocage totale) - jaxx.runtime.swing.BlockingLayerUI ui = active ? layerUI.clone() : null; - SwingUtil.getLayer(boxed).setUI(ui); + if (this.get$objectMap() != null){ + for (JComponent boxed : SwingUtil.getLayeredComponents(this)) { + // Verifie si dans l'entré existe dans le fichier sensitivity.properties + Class classBean = (Class)boxed.getClientProperty("bean"); + String method = (String)boxed.getClientProperty("method"); + boolean isSensitivity = UtilsUI.isSensitivity(classBean.getSimpleName().replace("Impl", "") + "." + method); + + jaxx.runtime.swing.BlockingLayerUI ui = active ? layerUI.clone() : null; + ui.setUseIcon(isSensitivity); + SwingUtil.getLayer(boxed).setUI(ui); + } } } + protected void accept(ActionEvent e) { JComponent source = (JComponent) e.getSource(); - System.out.println(source); + Class classBean = (Class)source.getClientProperty("bean"); + String method = (String)source.getClientProperty("method"); + + System.out.println("bean : " + classBean); + System.out.println("method : " + method); + System.out.println("in Properies : " + UtilsUI.isSensitivity(classBean.getSimpleName().replace("Impl", "") + "." + method)); + + Object result = null; + try { + if (classBean != null && method != null){ + TopiaEntity bean = getVerifier().getEntity(classBean); + + Method m = bean.getClass().getMethod("get" + method, null); + result = m.invoke(bean, (Object[])null); + } + } catch (Exception ex) { + System.out.println(ex); + } + System.out.println("result : " + result); } ]]> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputOneEquationUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputOneEquationUI.jaxx 2009-03-03 10:47:43 UTC (rev 1904) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputOneEquationUI.jaxx 2009-03-03 17:19:21 UTC (rev 1905) @@ -240,4 +240,4 @@ </cell> </row> </Table> -</fr.ifremer.isisfish.ui.input.InputContentUI> \ No newline at end of file +</fr.ifremer.isisfish.ui.input.InputContentUI> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputSaveVerifier.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputSaveVerifier.java 2009-03-03 10:47:43 UTC (rev 1904) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputSaveVerifier.java 2009-03-03 17:19:21 UTC (rev 1905) @@ -275,7 +275,7 @@ } } } - protected void refreshAll(){ + public void refreshAll(){ for (InputContentUI panel : currentPanels){ panel.refresh(); panel.setActif(editable); Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputUI.jaxx 2009-03-03 10:47:43 UTC (rev 1904) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputUI.jaxx 2009-03-03 17:19:21 UTC (rev 1905) @@ -260,4 +260,4 @@ <JPanel id="inputPane" layout='{getCardlayout()}' constraints='"normale"'/> </JPanel> </JSplitPane> -</JPanel> \ No newline at end of file +</JPanel> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesUI.jaxx 2009-03-03 10:47:43 UTC (rev 1904) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesUI.jaxx 2009-03-03 17:19:21 UTC (rev 1905) @@ -288,4 +288,4 @@ </cell> </row> </Table> -</fr.ifremer.isisfish.ui.input.InputContentUI> \ No newline at end of file +</fr.ifremer.isisfish.ui.input.InputContentUI> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoZoneUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoZoneUI.jaxx 2009-03-03 10:47:43 UTC (rev 1904) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoZoneUI.jaxx 2009-03-03 17:19:21 UTC (rev 1905) @@ -225,7 +225,7 @@ </cell> <cell fill='both' weightx='1.0' weighty='0.3'> <JScrollPane minimumSize='{new Dimension(0,0)}' preferredSize='{new Dimension(0,0)}'> - <JTextArea id="fieldMetierSeasonZoneComment" text='{getMetierSeasonInfo() == null ? "" : jaxx.runtime.SwingUtil.getStringValue(getMetierSeasonInfo().getSeasonZoneComment())}' onKeyReleased='getMetierSeasonInfo().setSeasonZoneComment(fieldMetierSeasonZoneComment.getText())' enabled='{isMetierSeasonInfoNotNull()}'/> + <JTextArea id="fieldMetierSeasonZoneComment" text='{getMetierSeasonInfo() == null ? "" : jaxx.runtime.SwingUtil.getStringValue(getMetierSeasonInfo().getSeasonZoneComment())}' onKeyReleased='getMetierSeasonInfo().setSeasonZoneComment(fieldMetierSeasonZoneComment.getText())' enabled='{isMetierSeasonInfoNotNull()}' decorator='boxed' _bean='{MetierSeasonInfo.class}' _method='"SeasonZoneComment"'/> </JScrollPane> </cell> </row> @@ -255,4 +255,4 @@ </cell> </row> </Table> -</fr.ifremer.isisfish.ui.input.InputContentUI> \ No newline at end of file +</fr.ifremer.isisfish.ui.input.InputContentUI> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierTabUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierTabUI.jaxx 2009-03-03 10:47:43 UTC (rev 1904) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierTabUI.jaxx 2009-03-03 17:19:21 UTC (rev 1905) @@ -75,7 +75,7 @@ <JLabel text="isisfish.metier.name" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='1.0'> - <JTextField id="fieldMetierName" text='{getBean().getName()}' onKeyReleased='getBean().setName(fieldMetierName.getText())' enabled='{isActif()}'/> + <JTextField id="fieldMetierName" text='{getBean().getName()}' onKeyReleased='getBean().setName(fieldMetierName.getText())' enabled='{isActif()}' decorator='boxed' _bean='{MetierImpl.class}' _method='"Name"'/> </cell> </row> <row> @@ -91,7 +91,7 @@ <JLabel text="isisfish.metier.rangeValues" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='1.0'> - <JTextField id="fieldMetierParam" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getGearParameterValue())}' onKeyReleased='getBean().setGearParameterValue(fieldMetierParam.getText())' enabled='{isActif()}'/> + <JTextField id="fieldMetierParam" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getGearParameterValue())}' onKeyReleased='getBean().setGearParameterValue(fieldMetierParam.getText())' enabled='{isActif()}' decorator='boxed' _bean='{MetierImpl.class}' _method='"GearParameterValue"'/> </cell> </row> <row> @@ -100,7 +100,7 @@ </cell> <cell fill='both' weightx='1.0' weighty='1.0'> <JScrollPane minimumSize='{new Dimension(0,0)}' preferredSize='{new Dimension(0,0)}'> - <JTextArea id="fieldMetierComment" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getComment())}' onKeyReleased='getBean().setComment(fieldMetierComment.getText())' enabled='{isActif()}'/> + <JTextArea id="fieldMetierComment" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getComment())}' onKeyReleased='getBean().setComment(fieldMetierComment.getText())' enabled='{isActif()}' decorator='boxed' _bean='{MetierImpl.class}' _method='"Comment"'/> </JScrollPane> </cell> </row> @@ -130,4 +130,4 @@ </cell> </row> </Table> -</fr.ifremer.isisfish.ui.input.InputContentUI> \ No newline at end of file +</fr.ifremer.isisfish.ui.input.InputContentUI> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierUI.jaxx 2009-03-03 10:47:43 UTC (rev 1904) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierUI.jaxx 2009-03-03 17:19:21 UTC (rev 1905) @@ -55,4 +55,4 @@ <tab title='{_("isisfish.metierSeasonInfoSpecies.title")}'><MetierSeasonInfoSpeciesUI id="metierSeasonSpeciesUI" constructorParams='this'/></tab> </JTabbedPane> </JPanel> -</fr.ifremer.isisfish.ui.input.InputContentUI> \ No newline at end of file +</fr.ifremer.isisfish.ui.input.InputContentUI> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/NoneUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/NoneUI.jaxx 2009-03-03 10:47:43 UTC (rev 1904) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/NoneUI.jaxx 2009-03-03 17:19:21 UTC (rev 1905) @@ -1,3 +1,3 @@ <JPanel layout='{new BorderLayout()}'> <JLabel id='none' horizontalAlignment="0" text="isisfish.input.selectRegion" constraints='BorderLayout.CENTER'/> -</JPanel> \ No newline at end of file +</JPanel> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationBasicsUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationBasicsUI.jaxx 2009-03-03 10:47:43 UTC (rev 1904) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationBasicsUI.jaxx 2009-03-03 17:19:21 UTC (rev 1905) @@ -153,7 +153,7 @@ <JLabel text="isisfish.populationBasics.name" enabled='{isActif()}'/> </cell> <cell columns='2' fill='horizontal' weightx='1.0'> - <JTextField id="fieldPopulationBasicsName" text='{getBean().getName()}' onKeyReleased='getBean().setName(fieldPopulationBasicsName.getText())' enabled='{isActif()}'/> + <JTextField id="fieldPopulationBasicsName" text='{getBean().getName()}' onKeyReleased='getBean().setName(fieldPopulationBasicsName.getText())' enabled='{isActif()}' decorator='boxed' _bean='{PopulationImpl.class}' _method='"Name"'/> </cell> </row> <row> @@ -161,7 +161,7 @@ <JLabel text="isisfish.populationBasics.geographicID" enabled='{isActif()}'/> </cell> <cell columns='2' fill='horizontal' weightx='1.0'> - <JTextField id="fieldPopulationBasicsGeographicID" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getGeographicId())}' onKeyReleased='getBean().setGeographicId(fieldPopulationBasicsGeographicID.getText())' enabled='{isActif()}'/> + <JTextField id="fieldPopulationBasicsGeographicID" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getGeographicId())}' onKeyReleased='getBean().setGeographicId(fieldPopulationBasicsGeographicID.getText())' enabled='{isActif()}' decorator='boxed' _bean='{PopulationImpl.class}' _method='"GeographicId"'/> </cell> </row> <row> @@ -183,7 +183,7 @@ <JComboBox id="fieldPopulationBasicsMatureClass" onActionPerformed='matureClassChanged()' enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='0.5'> - <JCheckBox id="fieldPopulationBasicsPlusGroup" text="isisfish.populationBasics.plusGroup" selected='{getBean().getPlusGroup()}' onActionPerformed='getBean().setPlusGroup(fieldPopulationBasicsPlusGroup.isSelected())' enabled='{isActif()}'/> + <JCheckBox id="fieldPopulationBasicsPlusGroup" text="isisfish.populationBasics.plusGroup" selected='{getBean().getPlusGroup()}' onActionPerformed='getBean().setPlusGroup(fieldPopulationBasicsPlusGroup.isSelected())' enabled='{isActif()}' decorator='boxed' _bean='{PopulationImpl.class}' _method='"PlusGroup"'/> </cell> </row> <row> @@ -207,7 +207,7 @@ </cell> <cell columns='2' fill='both' weightx='1.0' weighty='0.2'> <JScrollPane> - <JTextArea id="fieldPopulationBasicsComment" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getComment())}' onKeyReleased='getBean().setComment(fieldPopulationBasicsComment.getText())' enabled='{isActif()}'/> + <JTextArea id="fieldPopulationBasicsComment" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getComment())}' onKeyReleased='getBean().setComment(fieldPopulationBasicsComment.getText())' enabled='{isActif()}' decorator='boxed' _bean='{PopulationImpl.class}' _method='"Comment"'/> </JScrollPane> </cell> </row> @@ -246,4 +246,4 @@ </cell> </row> </Table> -</fr.ifremer.isisfish.ui.input.InputContentUI> \ No newline at end of file +</fr.ifremer.isisfish.ui.input.InputContentUI> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationCapturabilityUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationCapturabilityUI.jaxx 2009-03-03 10:47:43 UTC (rev 1904) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationCapturabilityUI.jaxx 2009-03-03 17:19:21 UTC (rev 1905) @@ -92,7 +92,7 @@ </row> <row> <cell columns='2' fill='both' weightx='1.0'> - <org.codelutin.math.matrix.gui.MatrixPanelEditor id ='fieldPopulationCapturability' matrix='{getBean().getCapturability() == null ? null : getBean().getCapturability().copy()}' enabled='{isActif()}'/> + <org.codelutin.math.matrix.gui.MatrixPanelEditor id ='fieldPopulationCapturability' matrix='{getBean().getCapturability() == null ? null : getBean().getCapturability().copy()}' enabled='{isActif()}' decorator='boxed' _bean='{PopulationImpl.class}' _method='"Capturability"'/> </cell> </row> <row> @@ -103,7 +103,7 @@ <row> <cell columns='2' fill='both' weightx='1.0' weighty='1.0'> <JScrollPane> - <JTextArea id="fieldPopulationCapturabilityComment" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getCapturabilityComment())}' onKeyReleased='getBean().setCapturabilityComment(fieldPopulationCapturabilityComment.getText())' enabled='{isActif()}'/> + <JTextArea id="fieldPopulationCapturabilityComment" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getCapturabilityComment())}' onKeyReleased='getBean().setCapturabilityComment(fieldPopulationCapturabilityComment.getText())' enabled='{isActif()}' decorator='boxed' _bean='{PopulationImpl.class}' _method='"CapturabilityComment"'/> </JScrollPane> </cell> </row> @@ -116,4 +116,4 @@ </cell> </row> </Table> -</fr.ifremer.isisfish.ui.input.InputContentUI> \ No newline at end of file +</fr.ifremer.isisfish.ui.input.InputContentUI> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationEquationUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationEquationUI.jaxx 2009-03-03 10:47:43 UTC (rev 1904) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationEquationUI.jaxx 2009-03-03 17:19:21 UTC (rev 1905) @@ -95,4 +95,4 @@ </cell> </row> </Table> -</fr.ifremer.isisfish.ui.input.InputContentUI> \ No newline at end of file +</fr.ifremer.isisfish.ui.input.InputContentUI> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationGroupUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationGroupUI.jaxx 2009-03-03 10:47:43 UTC (rev 1904) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationGroupUI.jaxx 2009-03-03 17:19:21 UTC (rev 1905) @@ -117,7 +117,7 @@ <JLabel text="isisfish.populationGroup.meanWeigth" enabled='{isPopGroupNotNull()}'/> </cell> <cell columns='2' fill='horizontal' weightx='1.0'> - <JTextField id="fieldPopulationGroupMeanWeight" text='{getPopulationGroup().getMeanWeight()}' editable='{false}' enabled='{isPopGroupNotNull()}'/> + <JTextField id="fieldPopulationGroupMeanWeight" text='{getPopulationGroup().getMeanWeight()}' editable='{false}' enabled='{isPopGroupNotNull()}' decorator='boxed' _bean='{PopulationGroupImpl.class}' _method='"MeanWeight"'/> </cell> </row> <row> @@ -125,7 +125,7 @@ <JLabel text="isisfish.populationGroup.price" enabled='{isPopGroupNotNull()}'/> </cell> <cell columns='2' fill='horizontal' weightx='1.0'> - <JTextField id="fieldPopulationGroupPrice" text='{getPopulationGroup().getPrice()}' editable='{false}' enabled='{isPopGroupNotNull()}'/> + <JTextField id="fieldPopulationGroupPrice" text='{getPopulationGroup().getPrice()}' editable='{false}' enabled='{isPopGroupNotNull()}' decorator='boxed' _bean='{PopulationGroupImpl.class}' _method='"Price"'/> </cell> </row> <row> @@ -133,7 +133,7 @@ <JLabel text="isisfish.populationGroup.naturalDeathRate" enabled='{isPopGroupNotNull()}'/> </cell> <cell columns='2' fill='both' weightx='1.0' weighty='0.5'> - <org.codelutin.math.matrix.gui.MatrixPanelEditor id ='fieldPopulationGroupNaturalDeathRate' matrix='{getBean() == null || getPopulationGroup() == null ? null : ((AbstractMatrixND)getBean().getNaturalDeathRateMatrix()).getSubMatrixOnSemantic(0, getPopulationGroup())}' enabled='{isPopGroupNotNull()}'/> + <org.codelutin.math.matrix.gui.MatrixPanelEditor id ='fieldPopulationGroupNaturalDeathRate' matrix='{getBean() == null || getPopulationGroup() == null ? null : ((AbstractMatrixND)getBean().getNaturalDeathRateMatrix()).getSubMatrixOnSemantic(0, getPopulationGroup())}' enabled='{isPopGroupNotNull()}' decorator='boxed' _bean='{PopulationImpl.class}' _method='"NaturalDeathRateMatrix"'/> </cell> </row> <row> @@ -141,7 +141,7 @@ <JLabel text="isisfish.populationGroup.reproductionRate" enabled='{isPopGroupNotNull()}'/> </cell> <cell columns='2' fill='horizontal' weightx='1.0'> - <JTextField id="fieldPopulationGroupReproductionRate" text='{getPopulationGroup().getReproductionRate()}' onKeyReleased='getPopulationGroup().setReproductionRate(Double.parseDouble(fieldPopulationGroupReproductionRate.getText()))' enabled='{isPopGroupNotNull()}'/> + <JTextField id="fieldPopulationGroupReproductionRate" text='{getPopulationGroup().getReproductionRate()}' onKeyReleased='getPopulationGroup().setReproductionRate(Double.parseDouble(fieldPopulationGroupReproductionRate.getText()))' enabled='{isPopGroupNotNull()}' decorator='boxed' _bean='{PopulationGroupImpl.class}' _method='"ReproductionRate"'/> </cell> </row> <row> @@ -149,7 +149,7 @@ <JLabel text="isisfish.populationGroup.age" enabled='{isPopGroupNotNull()}'/> </cell> <cell columns='2' fill='horizontal' weightx='1.0'> - <JTextField id="fieldPopulationGroupAge" text='{getPopulationGroup().getAge()}' onKeyReleased='getPopulationGroup().setAge(Double.parseDouble(fieldPopulationGroupAge.getText()))' enabled='{isPopGroupNotNull()}'/> + <JTextField id="fieldPopulationGroupAge" text='{getPopulationGroup().getAge()}' onKeyReleased='getPopulationGroup().setAge(Double.parseDouble(fieldPopulationGroupAge.getText()))' enabled='{isPopGroupNotNull()}' decorator='boxed' _bean='{PopulationGroupImpl.class}' _method='"Age"'/> </cell> </row> <row> @@ -157,10 +157,10 @@ <JLabel text="isisfish.populationGroup.length" enabled='{isPopGroupNotNull()}'/> </cell> <cell fill='both' weightx='0.5'> - <JTextField id="fieldPopulationGroupMinLength" text='{getPopulationGroup().getMinLength()}' onKeyReleased='getPopulationGroup().setMinLength(Double.parseDouble(fieldPopulationGroupMinLength.getText()))' enabled='{isPopGroupNotNull()}'/> + <JTextField id="fieldPopulationGroupMinLength" text='{getPopulationGroup().getMinLength()}' onKeyReleased='getPopulationGroup().setMinLength(Double.parseDouble(fieldPopulationGroupMinLength.getText()))' enabled='{isPopGroupNotNull()}' decorator='boxed' _bean='{PopulationGroupImpl.class}' _method='"MinLength"'/> </cell> <cell fill='both' weightx='0.5'> - <JTextField id="fieldPopulationGroupMaxLength" text='{getPopulationGroup().getMaxLength()}' onKeyReleased='getPopulationGroup().setMaxLength(Double.parseDouble(fieldPopulationGroupMaxLength.getText()))' enabled='{isPopGroupNotNull()}'/> + <JTextField id="fieldPopulationGroupMaxLength" text='{getPopulationGroup().getMaxLength()}' onKeyReleased='getPopulationGroup().setMaxLength(Double.parseDouble(fieldPopulationGroupMaxLength.getText()))' enabled='{isPopGroupNotNull()}' decorator='boxed' _bean='{PopulationGroupImpl.class}' _method='"MaxLength"'/> </cell> </row> <row> @@ -169,7 +169,7 @@ </cell> <cell columns='2' fill='both' weightx='1.0' weighty='0.5'> <JScrollPane> - <JTextArea id="fieldPopulationGroupComment" text='{jaxx.runtime.SwingUtil.getStringValue(getPopulationGroup().getComment())}' onKeyReleased='getPopulationGroup().setComment(fieldPopulationGroupComment.getText())' enabled='{isPopGroupNotNull()}'/> + <JTextArea id="fieldPopulationGroupComment" text='{jaxx.runtime.SwingUtil.getStringValue(getPopulationGroup().getComment())}' onKeyReleased='getPopulationGroup().setComment(fieldPopulationGroupComment.getText())' enabled='{isPopGroupNotNull()}' decorator='boxed' _bean='{PopulationGroupImpl.class}' _method='"Comment"'/> </JScrollPane> </cell> </row> @@ -188,4 +188,4 @@ </cell> </row> </Table> -</fr.ifremer.isisfish.ui.input.InputContentUI> \ No newline at end of file +</fr.ifremer.isisfish.ui.input.InputContentUI> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEmigrationUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEmigrationUI.jaxx 2009-03-03 10:47:43 UTC (rev 1904) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEmigrationUI.jaxx 2009-03-03 17:19:21 UTC (rev 1905) @@ -224,7 +224,7 @@ </row> <row columns='4'> <cell fill='both' weightx='1.0' weighty='1.0'> - <org.codelutin.math.matrix.gui.MatrixPanelEditor id ='populationMigrationEmigrationTable' linearModel="true" matrix='{getPopInfo().getEmigrationMatrix().copy()}' enabled='{isActif()}'/> + <org.codelutin.math.matrix.gui.MatrixPanelEditor id ='populationMigrationEmigrationTable' linearModel="true" matrix='{getPopInfo().getEmigrationMatrix().copy()}' enabled='{isActif()}' decorator='boxed' _bean='{PopulationSeasonInfoImpl.class}' _method='"EmigrationMatrix"'/> </cell> </row> <row> @@ -233,4 +233,4 @@ </cell> </row> </Table> -</fr.ifremer.isisfish.ui.input.InputContentUI> \ No newline at end of file +</fr.ifremer.isisfish.ui.input.InputContentUI> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEquationUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEquationUI.jaxx 2009-03-03 10:47:43 UTC (rev 1904) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEquationUI.jaxx 2009-03-03 17:19:21 UTC (rev 1905) @@ -91,4 +91,4 @@ </cell> </row> </Table> -</fr.ifremer.isisfish.ui.input.InputContentUI> \ No newline at end of file +</fr.ifremer.isisfish.ui.input.InputContentUI> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationImmigrationUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationImmigrationUI.jaxx 2009-03-03 10:47:43 UTC (rev 1904) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationImmigrationUI.jaxx 2009-03-03 17:19:21 UTC (rev 1905) @@ -194,7 +194,7 @@ </row> <row columns='4'> <cell fill='both' weightx='1.0' weighty='1.0'> - <org.codelutin.math.matrix.gui.MatrixPanelEditor id ='populationMigrationImmigrationTable' linearModel="true" matrix='{getPopInfo().getImmigrationMatrix().copy()}' enabled='{isActif()}'/> + <org.codelutin.math.matrix.gui.MatrixPanelEditor id ='populationMigrationImmigrationTable' linearModel="true" matrix='{getPopInfo().getImmigrationMatrix().copy()}' enabled='{isActif()}' decorator='boxed' _bean='{PopulationSeasonInfoImpl.class}' _method='"ImmigrationMatrix"'/> </cell> </row> <row> @@ -203,4 +203,4 @@ </cell> </row> </Table> -</fr.ifremer.isisfish.ui.input.InputContentUI> \ No newline at end of file +</fr.ifremer.isisfish.ui.input.InputContentUI> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationMigrationUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationMigrationUI.jaxx 2009-03-03 10:47:43 UTC (rev 1904) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationMigrationUI.jaxx 2009-03-03 17:19:21 UTC (rev 1905) @@ -211,7 +211,7 @@ </row> <row columns='4'> <cell fill='both' weightx='1.0' weighty='1.0'> - <org.codelutin.math.matrix.gui.MatrixPanelEditor id ='populationMigrationMigrationTable' linearModel="true" matrix='{getPopInfo().getMigrationMatrix().copy()}' enabled='{isActif()}'/> + <org.codelutin.math.matrix.gui.MatrixPanelEditor id ='populationMigrationMigrationTable' linearModel="true" matrix='{getPopInfo().getMigrationMatrix().copy()}' enabled='{isActif()}' decorator='boxed' _bean='{PopulationSeasonInfoImpl.class}' _method='"MigrationMatrix"'/> </cell> </row> <row> @@ -220,4 +220,4 @@ </cell> </row> </Table> - </fr.ifremer.isisfish.ui.input.InputContentUI> \ No newline at end of file + </fr.ifremer.isisfish.ui.input.InputContentUI> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationUI.jaxx 2009-03-03 10:47:43 UTC (rev 1904) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationUI.jaxx 2009-03-03 17:19:21 UTC (rev 1905) @@ -129,7 +129,7 @@ </row> <row> <cell columns='2' anchor='west'> - <JCheckBox id="fieldUseEquationMigration" selected='{getPopInfo() == null ? true : getPopInfo().getUseEquationMigration()}' text="isisfish.populationMigration.useEquation" onActionPerformed='useEquationChanged()' enabled='{isActif()}'/> + <JCheckBox id="fieldUseEquationMigration" selected='{getPopInfo() == null ? true : getPopInfo().getUseEquationMigration()}' text="isisfish.populationMigration.useEquation" onActionPerformed='useEquationChanged()' enabled='{isActif()}' decorator='boxed' _bean='{PopulationSeasonInfoImpl.class}' _method='"UseEquationMigration"'/> </cell> </row> <row> @@ -150,7 +150,7 @@ </cell> <cell fill='both' weightx='1.0' weighty='0.3'> <JScrollPane> - <JTextArea id="fieldPopulationMigrationComment" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getMigrationComment())}' onKeyReleased='getBean().setMigrationComment(fieldPopulationMigrationComment.getText())' enabled='{isActif()}'/> + <JTextArea id="fieldPopulationMigrationComment" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getMigrationComment())}' onKeyReleased='getBean().setMigrationComment(fieldPopulationMigrationComment.getText())' enabled='{isActif()}' decorator='boxed' _bean='{PopulationImpl.class}' _method='"MigrationComment"'/> </JScrollPane> </cell> </row> @@ -169,4 +169,4 @@ </cell> </row> </Table> -</fr.ifremer.isisfish.ui.input.InputContentUI> \ No newline at end of file +</fr.ifremer.isisfish.ui.input.InputContentUI> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationRecruitmentUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationRecruitmentUI.jaxx 2009-03-03 10:47:43 UTC (rev 1904) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationRecruitmentUI.jaxx 2009-03-03 17:19:21 UTC (rev 1905) @@ -103,7 +103,7 @@ <JLabel text="Month Gap BetweenRepro Recruitment" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='1.0'> - <JTextField id="fieldPopulationMonthGapBetweenReproRecrutement" text='{getBean().getMonthGapBetweenReproRecrutement()}' onKeyReleased='getBean().setMonthGapBetweenReproRecrutement(Integer.parseInt(fieldPopulationMonthGapBetweenReproRecrutement.getText()))' enabled='{isActif()}'/> + <JTextField id="fieldPopulationMonthGapBetweenReproRecrutement" text='{getBean().getMonthGapBetweenReproRecrutement()}' onKeyReleased='getBean().setMonthGapBetweenReproRecrutement(Integer.parseInt(fieldPopulationMonthGapBetweenReproRecrutement.getText()))' enabled='{isActif()}' decorator='boxed' _bean='{PopulationImpl.class}' _method='"MonthGapBetweenReproRecrutement"'/> </cell> </row> <row> @@ -111,7 +111,7 @@ <JLabel text="isisfish.populationRecruitment.recruitmentDistribution" enabled='{isActif()}'/> </cell> <cell fill='both' weightx='1.0'> - <org.codelutin.math.matrix.gui.MatrixPanelEditor id ='fieldPopulationRecruitmentDistribution' matrix='{getBean().getRecruitmentDistribution() == null ? null : getBean().getRecruitmentDistribution().copy()}' enabled='{isActif()}'/> + <org.codelutin.math.matrix.gui.MatrixPanelEditor id ='fieldPopulationRecruitmentDistribution' matrix='{getBean().getRecruitmentDistribution() == null ? null : getBean().getRecruitmentDistribution().copy()}' enabled='{isActif()}' decorator='boxed' _bean='{PopulationImpl.class}' _method='"RecruitmentDistribution"'/> </cell> </row> <row> @@ -128,7 +128,7 @@ </cell> <cell fill='both' weightx='1.0' weighty='0.5'> <JScrollPane> - <JTextArea id="fieldPopulationRecruitmentComment" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getRecruitmentComment())}' onKeyReleased='getBean().setRecruitmentComment(fieldPopulationRecruitmentComment.getText())' enabled='{isActif()}'/> + <JTextArea id="fieldPopulationRecruitmentComment" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getRecruitmentComment())}' onKeyReleased='getBean().setRecruitmentComment(fieldPopulationRecruitmentComment.getText())' enabled='{isActif()}' decorator='boxed' _bean='{PopulationImpl.class}' _method='"RecruitmentComment"'/> </JScrollPane> </cell> </row> @@ -150,4 +150,4 @@ </cell> </row> </Table> -</fr.ifremer.isisfish.ui.input.InputContentUI> \ No newline at end of file +</fr.ifremer.isisfish.ui.input.InputContentUI> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonsUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonsUI.jaxx 2009-03-03 10:47:43 UTC (rev 1904) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonsUI.jaxx 2009-03-03 17:19:21 UTC (rev 1905) @@ -234,7 +234,7 @@ <JLabel text="isisfish.populationSeasons.distributionSpawning" enabled='{isPopSeasonInfoNotNull()}'/> </cell> <cell fill='both' weightx='1.0'> - <org.codelutin.math.matrix.gui.MatrixPanelEditor id ='fieldPopulationSeasonReproductionDistribution' matrix='{getPopulationSeasonInfo() == null ? null : getPopulationSeasonInfo().getLengthChangeMatrix()}' enabled='{isPopSeasonInfoNotNull()}'/> + <org.codelutin.math.matrix.gui.MatrixPanelEditor id ='fieldPopulationSeasonReproductionDistribution' matrix='{getPopulationSeasonInfo() == null ? null : getPopulationSeasonInfo().getLengthChangeMatrix()}' enabled='{isPopSeasonInfoNotNull()}' decorator='boxed' _bean='{PopulationSeasonInfoImpl.class}' _method='"LengthChangeMatrix"'/> </cell> </row> <row> @@ -243,7 +243,7 @@ </cell> <cell fill='both' weightx='1.0' weighty='1.0'> <JScrollPane> - <JTextArea id="fieldPopulationSeasonComment" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getSeasonsComment())}' onKeyReleased='getBean().setSeasonsComment(fieldPopulationSeasonComment.getText())' enabled='{isPopSeasonInfoNotNull()}'/> + <JTextArea id="fieldPopulationSeasonComment" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getSeasonsComment())}' onKeyReleased='getBean().setSeasonsComment(fieldPopulationSeasonComment.getText())' enabled='{isPopSeasonInfoNotNull()}' decorator='boxed' _bean='{PopulationImpl.class}' _method='"SeasonsComment"'/> </JScrollPane> </cell> </row> @@ -273,4 +273,4 @@ </cell> </row> </Table> -</fr.ifremer.isisfish.ui.input.InputContentUI> \ No newline at end of file +</fr.ifremer.isisfish.ui.input.InputContentUI> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationUI.jaxx 2009-03-03 10:47:43 UTC (rev 1904) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationUI.jaxx 2009-03-03 17:19:21 UTC (rev 1905) @@ -82,4 +82,4 @@ </tab> </JTabbedPane> </JPanel> -</fr.ifremer.isisfish.ui.input.InputContentUI> \ No newline at end of file +</fr.ifremer.isisfish.ui.input.InputContentUI> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationZonesUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationZonesUI.jaxx 2009-03-03 10:47:43 UTC (rev 1904) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationZonesUI.jaxx 2009-03-03 17:19:21 UTC (rev 1905) @@ -219,4 +219,4 @@ </cell> </row> </Table> -</fr.ifremer.isisfish.ui.input.InputContentUI> \ No newline at end of file +</fr.ifremer.isisfish.ui.input.InputContentUI> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PortUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PortUI.jaxx 2009-03-03 10:47:43 UTC (rev 1904) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PortUI.jaxx 2009-03-03 17:19:21 UTC (rev 1905) @@ -144,7 +144,7 @@ </row> <row> <cell columns='2' fill='horizontal' weightx='1.0' > - <JTextField id="fieldPortName" text='{getBean().getName()}' onKeyReleased='getBean().setName(fieldPortName.getText())' enabled='{isActif()}'/> + <JTextField id="fieldPortName" text='{getBean().getName()}' onKeyReleased='getBean().setName(fieldPortName.getText())' enabled='{isActif()}' decorator='boxed' _bean='{PortImpl.class}' _method='"Name"'/> </cell> </row> <row> @@ -156,7 +156,7 @@ <row> <cell columns='2' fill='both' weighty='0.7' weightx='1.0'> <JScrollPane> - <JList id="portCell" selectedValue='{getBean().getCell()}' selectionMode="0" onMouseClicked='portChanged()' enabled='{isActif()}'/> + <JList id="portCell" selectedValue='{getBean().getCell()}' selectionMode="0" onMouseClicked='portChanged()' enabled='{isActif()}' decorator='boxed' _bean='{PortImpl.class}' _method='"Cell"'/> </JScrollPane> </cell> </row> @@ -168,7 +168,7 @@ <row> <cell columns='2' fill='both' weighty='0.3' weightx='1.0' > <JScrollPane> - <JTextArea id="fieldPortComment" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getComment())}' onKeyReleased='getBean().setComment(fieldPortComment.getText())' enabled='{isActif()}'/> + <JTextArea id="fieldPortComment" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getComment())}' onKeyReleased='getBean().setComment(fieldPortComment.getText())' enabled='{isActif()}' decorator='boxed' _bean='{PortImpl.class}' _method='"Comment"'/> </JScrollPane> </cell> </row> @@ -191,10 +191,10 @@ </Table> <JPanel id='map' layout='{new BorderLayout()}'> <fr.ifremer.isisfish.map.OpenMapToolPanel id='toolMap' javaBean='new fr.ifremer.isisfish.map.OpenMapToolPanel()' constraints='BorderLayout.NORTH'/> - <fr.ifremer.isisfish.map.IsisMapBean id='portMap' selectedCells='{getBean().getCell()}' javaBean='new fr.ifremer.isisfish.map.IsisMapBean()' constraints='BorderLayout.CENTER' selectionMode="1"/> + <fr.ifremer.isisfish.map.IsisMapBean id='portMap' selectedCells='{getBean().getCell()}' javaBean='new fr.ifremer.isisfish.map.IsisMapBean()' constraints='BorderLayout.CENTER' selectionMode="1" decorator='boxed' _bean='{PortImpl.class}' _method='"Cell"'/> </JPanel> </JSplitPane> </cell> </row> </Table> -</fr.ifremer.isisfish.ui.input.InputContentUI> \ No newline at end of file +</fr.ifremer.isisfish.ui.input.InputContentUI> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityUI.jaxx 2009-03-03 10:47:43 UTC (rev 1904) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityUI.jaxx 2009-03-03 17:19:21 UTC (rev 1905) @@ -98,7 +98,6 @@ public void refresh(){ getVerifier().setSaveButton(save); getVerifier().setCancelButton(cancel); - InputAction action = getAction(); setBean(null); Gear gear = (Gear)getVerifier().getEntity(Gear.class); setBean((GearImpl) gear); Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsTabsUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsTabsUI.jaxx 2009-03-03 10:47:43 UTC (rev 1904) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsTabsUI.jaxx 2009-03-03 17:19:21 UTC (rev 1905) @@ -98,7 +98,7 @@ <JLabel text="isisfish.setOfVessels.name" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='1.0'> - <JTextField id="fieldSetOfVesselsName" text='{getBean().getName()}' onKeyReleased='getBean().setName(fieldSetOfVesselsName.getText())' enabled='{isActif()}'/> + <JTextField id="fieldSetOfVesselsName" text='{getBean().getName()}' onKeyReleased='getBean().setName(fieldSetOfVesselsName.getText())' enabled='{isActif()}' decorator='boxed' _bean='{SetOfVesselsImpl.class}' _method='"Name"'/> </cell> </row> <row> @@ -122,7 +122,7 @@ <JLabel text="isisfish.setOfVessels.numberOfVessels" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='1.0'> - <JTextField id="fieldSetOfVesselsNumberOfVessels" text='{getBean().getNumberOfVessels()}' onKeyReleased='getBean().setNumberOfVessels(Integer.parseInt(fieldSetOfVesselsNumberOfVessels.getText()))' enabled='{isActif()}'/> + <JTextField id="fieldSetOfVesselsNumberOfVessels" text='{getBean().getNumberOfVessels()}' onKeyReleased='getBean().setNumberOfVessels(Integer.parseInt(fieldSetOfVesselsNumberOfVessels.getText()))' enabled='{isActif()}' decorator='boxed' _bean='{SetOfVesselsImpl.class}' _method='"NumberOfVessels"'/> </cell> </row> <row> @@ -130,7 +130,7 @@ <JLabel text="isisfish.setOfVessels.fixedCosts" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='1.0'> - <JTextField id="fieldSetOfVesselsFixedCosts" text='{getBean().getFixedCosts()}' onKeyReleased='getBean().setFixedCosts(Double.parseDouble(fieldSetOfVesselsFixedCosts.getText()))' enabled='{isActif()}'/> + <JTextField id="fieldSetOfVesselsFixedCosts" text='{getBean().getFixedCosts()}' onKeyReleased='getBean().setFixedCosts(Double.parseDouble(fieldSetOfVesselsFixedCosts.getText()))' enabled='{isActif()}' decorator='boxed' _bean='{SetOfVesselsImpl.class}' _method='"FixedCosts"'/> </cell> </row> <row> @@ -144,7 +144,7 @@ </cell> <cell fill='both' weightx='1.0' weighty='0.3'> <JScrollPane> - <JTextArea id="fieldSetOfVesselsComment" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getComment())}' onKeyReleased='getBean().setComment(fieldSetOfVesselsComment.getText())' enabled='{isActif()}'/> + <JTextArea id="fieldSetOfVesselsComment" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getComment())}' onKeyReleased='getBean().setComment(fieldSetOfVesselsComment.getText())' enabled='{isActif()}' decorator='boxed' _bean='{SetOfVesselsImpl.class}' _method='"Comment"'/> </JScrollPane> </cell> </row> @@ -174,4 +174,4 @@ </cell> </row> </Table> -</fr.ifremer.isisfish.ui.input.InputContentUI> \ No newline at end of file +</fr.ifremer.isisfish.ui.input.InputContentUI> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SpeciesUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SpeciesUI.jaxx 2009-03-03 10:47:43 UTC (rev 1904) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SpeciesUI.jaxx 2009-03-03 17:19:21 UTC (rev 1905) @@ -84,7 +84,7 @@ <JLabel text="isisfish.species.name" enabled='{isActif()}'/> </cell> <cell fill='horizontal' columns='2' weightx='1.0'> - <JTextField id="fieldSpeciesName" text='{getBean().getName()}' onKeyReleased='getBean().setName(fieldSpeciesName.getText())' enabled='{isActif()}'/> + <JTextField id="fieldSpeciesName" text='{getBean().getName()}' onKeyReleased='getBean().setName(fieldSpeciesName.getText())' enabled='{isActif()}' decorator='boxed' _bean='{SpeciesImpl.class}' _method='"Name"'/> </cell> </row> <row> @@ -92,7 +92,7 @@ <JLabel text="isisfish.species.scientificName" enabled='{isActif()}'/> </cell> <cell fill='horizontal' columns='2' weightx='1.0'> - <JTextField id="fieldSpeciesScientificName" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getScientificName())}' onKeyReleased='getBean().setScientificName(fieldSpeciesScientificName.getText())' enabled='{isActif()}'/> + <JTextField id="fieldSpeciesScientificName" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getScientificName())}' onKeyReleased='getBean().setScientificName(fieldSpeciesScientificName.getText())' enabled='{isActif()}' decorator='boxed' _bean='{SpeciesImpl.class}' _method='"ScientificName"'/> </cell> </row> <row> @@ -100,7 +100,7 @@ <JLabel text="isisfish.species.rubbinCode" enabled='{isActif()}'/> </cell> <cell fill='horizontal' columns='2' weightx='1.0'> - <JTextField id="fieldSpeciesCodeRubbin" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getCodeRubbin())}' onKeyReleased='getBean().setCodeRubbin(fieldSpeciesCodeRubbin.getText())' enabled='{isActif()}'/> + <JTextField id="fieldSpeciesCodeRubbin" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getCodeRubbin())}' onKeyReleased='getBean().setCodeRubbin(fieldSpeciesCodeRubbin.getText())' enabled='{isActif()}' decorator='boxed' _bean='{SpeciesImpl.class}' _method='"CodeRubbin"'/> </cell> </row> <row> @@ -108,7 +108,7 @@ <JLabel text="isisfish.species.cee" enabled='{isActif()}'/> </cell> <cell fill='horizontal' columns='2' weightx='1.0'> - <JTextField id="fieldSpeciesCEE" text='{getBean().getCodeCEE()}' onKeyReleased='getBean().setCodeCEE(Integer.parseInt(fieldSpeciesCEE.getText()))' enabled='{isActif()}'/> + <JTextField id="fieldSpeciesCEE" text='{getBean().getCodeCEE()}' onKeyReleased='getBean().setCodeCEE(Integer.parseInt(fieldSpeciesCEE.getText()))' enabled='{isActif()}' decorator='boxed' _bean='{SpeciesImpl.class}' _method='"CodeCEE"'/> </cell> </row> <row> @@ -116,10 +116,10 @@ <JLabel text="isisfish.species.structured" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='0.5'> - <JRadioButton id="fieldSpeciesDynamicAge" text="isisfish.species.age" selected='{getBean().getAgeGroupType()}' buttonGroup="structuredGroup" onItemStateChanged='getBean().setAgeGroupType(fieldSpeciesDynamicAge.isSelected())' enabled='{isActif()}'/> + <JRadioButton id="fieldSpeciesDynamicAge" text="isisfish.species.age" selected='{getBean().getAgeGroupType()}' buttonGroup="structuredGroup" onItemStateChanged='getBean().setAgeGroupType(fieldSpeciesDynamicAge.isSelected())' enabled='{isActif()}' decorator='boxed' _bean='{SpeciesImpl.class}' _method='"AgeGroupType"'/> </cell> <cell fill='horizontal' weightx='0.5'> - <JRadioButton id="fieldSpeciesDynamicLength" text="isisfish.species.length" selected='{!getBean().getAgeGroupType()}' buttonGroup="structuredGroup" enabled='{isActif()}'/> + <JRadioButton id="fieldSpeciesDynamicLength" text="isisfish.species.length" selected='{!getBean().getAgeGroupType()}' buttonGroup="structuredGroup" enabled='{isActif()}' decorator='boxed' _bean='{SpeciesImpl.class}' _method='"AgeGroupType"'/> </cell> </row> <row> @@ -128,7 +128,7 @@ </cell> <cell fill='both' columns='2' weightx='1.0' weighty='1.0'> <JScrollPane> - <JTextArea id="fieldSpeciesComment" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getComment())}' onKeyReleased='getBean().setComment(fieldSpeciesComment.getText())' enabled='{isActif()}'/> + <JTextArea id="fieldSpeciesComment" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getComment())}' onKeyReleased='getBean().setComment(fieldSpeciesComment.getText())' enabled='{isActif()}' decorator='boxed' _bean='{SpeciesImpl.class}' _method='"Comment"'/> </JScrollPane> </cell> </row> @@ -158,4 +158,4 @@ </cell> </row> </Table> -</fr.ifremer.isisfish.ui.input.InputContentUI> \ No newline at end of file +</fr.ifremer.isisfish.ui.input.InputContentUI> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyMonthInfoUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyMonthInfoUI.jaxx 2009-03-03 10:47:43 UTC (rev 1904) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyMonthInfoUI.jaxx 2009-03-03 17:19:21 UTC (rev 1905) @@ -116,4 +116,4 @@ </row> </Table> </JPanel> -</fr.ifremer.isisfish.ui.input.InputContentUI> \ No newline at end of file +</fr.ifremer.isisfish.ui.input.InputContentUI> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyOneMonthInfoUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyOneMonthInfoUI.jaxx 2009-03-03 10:47:43 UTC (rev 1904) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyOneMonthInfoUI.jaxx 2009-03-03 17:19:21 UTC (rev 1905) @@ -136,7 +136,7 @@ <JLabel text="isisfish.strategyMonthInfo.numberOfTrips" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='0.5' anchor='west'> - <JLabel id='numberOfTrips' text='{getStrategyMonthInfo().getNumberOfTrips()}' enabled='{isActif()}'/> + <JLabel id='numberOfTrips' text='{getStrategyMonthInfo().getNumberOfTrips()}' enabled='{isActif()}' decorator='boxed' _bean='{StrategyMonthInfoImpl.class}' _method='"NumberOfTrips"'/> </cell> </row> <row> @@ -144,13 +144,13 @@ <JLabel text="isisfish.strategyMonthInfo.minInactivityDays" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='0.5'> - <JTextField id="fieldStrategyMonthInfoMinInactivityDays" text='{getStrategyMonthInfo().getMinInactivityDays()}' onKeyReleased='getStrategyMonthInfo().setMinInactivityDays(Double.parseDouble(fieldStrategyMonthInfoMinInactivityDays.getText()))' enabled='{isActif()}'/> + <JTextField id="fieldStrategyMonthInfoMinInactivityDays" text='{getStrategyMonthInfo().getMinInactivityDays()}' onKeyReleased='getStrategyMonthInfo().setMinInactivityDays(Double.parseDouble(fieldStrategyMonthInfoMinInactivityDays.getText()))' enabled='{isActif()}' decorator='boxed' _bean='{StrategyMonthInfoImpl.class}' _method='"MinInactivityDays"'/> </cell> </row> <row> <cell columns='2' fill='both' weightx='1.0' weighty='1.0'> - <org.codelutin.math.matrix.gui.MatrixPanelEditor id="fieldStrategyMonthInfoProportion" linearModelShowDefault='{true}' linearModel='{true}' matrix='{getStrategyMonthInfo().getProportionMetier() == null ? null : getStrategyMonthInfo().getProportionMetier().copy()}' enabled='{isActif()}'/> + <org.codelutin.math.matrix.gui.MatrixPanelEditor id="fieldStrategyMonthInfoProportion" linearModelShowDefault='{true}' linearModel='{true}' matrix='{getStrategyMonthInfo().getProportionMetier() == null ? null : getStrategyMonthInfo().getProportionMetier().copy()}' enabled='{isActif()}' decorator='boxed' _bean='{StrategyMonthInfoImpl.class}' _method='"ProportionMetier"'/> </cell> </row> </Table> -</fr.ifremer.isisfish.ui.input.InputContentUI> \ No newline at end of file +</fr.ifremer.isisfish.ui.input.InputContentUI> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyTabUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyTabUI.jaxx 2009-03-03 10:47:43 UTC (rev 1904) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyTabUI.jaxx 2009-03-03 17:19:21 UTC (rev 1905) @@ -98,7 +98,7 @@ <JLabel text="isisfish.strategy.name" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='1.0'> - <JTextField id="fieldStrategyName" text='{getBean().getName()}' onKeyReleased='getBean().setName(fieldStrategyName.getText())' enabled='{isActif()}'/> + <JTextField id="fieldStrategyName" text='{getBean().getName()}' onKeyReleased='getBean().setName(fieldStrategyName.getText())' enabled='{isActif()}' decorator='boxed' _bean='{StrategyImpl.class}' _method='"Name"'/> </cell> </row> <row> @@ -114,7 +114,7 @@ <JLabel text="isisfish.strategy.proportionSetOfVessels" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='1.0'> - <JTextField id="fieldStrategyProportionSetOfVessels" text='{getBean().getProportionSetOfVessels()}' onKeyReleased='getBean().setProportionSetOfVessels(Double.parseDouble(fieldStrategyProportionSetOfVessels.getText()))' enabled='{isActif()}'/> + <JTextField id="fieldStrategyProportionSetOfVessels" text='{getBean().getProportionSetOfVessels()}' onKeyReleased='getBean().setProportionSetOfVessels(Double.parseDouble(fieldStrategyProportionSetOfVessels.getText()))' enabled='{isActif()}' decorator='boxed' _bean='{StrategyImpl.class}' _method='"ProportionSetOfVessels"'/> </cell> </row> <row> @@ -122,7 +122,7 @@ <JPanel/> </cell> <cell fill='horizontal' weightx='1.0'> - <JCheckBox id="fieldUseEquationInactivity" selected='{getBean().getInactivityEquationUsed()}' text="isisfish.strategy.inactivityEquationUsed" onActionPerformed='getBean().setInactivityEquationUsed(fieldUseEquationInactivity.isSelected())' enabled='{isActif()}'/> + <JCheckBox id="fieldUseEquationInactivity" selected='{getBean().getInactivityEquationUsed()}' text="isisfish.strategy.inactivityEquationUsed" onActionPerformed='getBean().setInactivityEquationUsed(fieldUseEquationInactivity.isSelected())' enabled='{isActif()}' decorator='boxed' _bean='{StrategyImpl.class}' _method='"InactivityEquationUsed"'/> </cell> </row> <row> @@ -136,7 +136,7 @@ </cell> <cell fill='both' weightx='1.0' weighty='0.3'> <JScrollPane> - <JTextArea id="fieldStrategyComment" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getComment())}' onKeyReleased='getBean().setComment(fieldStrategyComment.getText())' enabled='{isActif()}'/> + <JTextArea id="fieldStrategyComment" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getComment())}' onKeyReleased='getBean().setComment(fieldStrategyComment.getText())' enabled='{isActif()}' decorator='boxed' _bean='{StrategyImpl.class}' _method='"Comment"'/> </JScrollPane> </cell> </row> @@ -166,4 +166,4 @@ </cell> </row> </Table> -</fr.ifremer.isisfish.ui.input.InputContentUI> \ No newline at end of file +</fr.ifremer.isisfish.ui.input.InputContentUI> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/TripTypeUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/TripTypeUI.jaxx 2009-03-03 10:47:43 UTC (rev 1904) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/TripTypeUI.jaxx 2009-03-03 17:19:21 UTC (rev 1905) @@ -81,7 +81,7 @@ <JLabel text="isisfish.tripType.name" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='1.0'> - <JTextField id="fieldTripTypeName" text='{getBean().getName()}' onKeyReleased='getBean().setName(fieldTripTypeName.getText())' enabled='{isActif()}'/> + <JTextField id="fieldTripTypeName" text='{getBean().getName()}' onKeyReleased='getBean().setName(fieldTripTypeName.getText())' enabled='{isActif()}' decorator='boxed' _bean='{TripTypeImpl.class}' _method='"Name"'/> </cell> </row> <row> @@ -89,7 +89,7 @@ <JLabel text="isisfish.tripType.duration" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='1.0'> - <JTextField id="fieldTripTypeDuration" text='{getBean().getTripDuration().getHour()}' onKeyReleased='getBean().setTripDuration(new TimeUnit(Double.parseDouble(fieldTripTypeDuration.getText()) * 3600))' enabled='{isActif()}'/> + <JTextField id="fieldTripTypeDuration" text='{getBean().getTripDuration().getHour()}' onKeyReleased='getBean().setTripDuration(new TimeUnit(Double.parseDouble(fieldTripTypeDuration.getText()) * 3600))' enabled='{isActif()}' decorator='boxed' _bean='{TripTypeImpl.class}' _method='"TripDuration"'/> </cell> </row> <row> @@ -97,7 +97,7 @@ <JLabel text="isisfish.tripType.minTime" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='1.0'> - <JTextField id="fieldTripTypeMinTimeBetweenTrip" text='{getBean().getMinTimeBetweenTrip().getHour()}' onKeyReleased='getBean().setMinTimeBetweenTrip(new TimeUnit(Double.parseDouble(fieldTripTypeMinTimeBetweenTrip.getText()) * 3600))' enabled='{isActif()}'/> + <JTextField id="fieldTripTypeMinTimeBetweenTrip" text='{getBean().getMinTimeBetweenTrip().getHour()}' onKeyReleased='getBean().setMinTimeBetweenTrip(new TimeUnit(Double.parseDouble(fieldTripTypeMinTimeBetweenTrip.getText()) * 3600))' enabled='{isActif()}' decorator='boxed' _bean='{TripTypeImpl.class}' _method='"MinTimeBetweenTrip"'/> </cell> </row> <row> @@ -106,7 +106,7 @@ </cell> <cell fill='both' weightx='1.0' weighty='1.0'> <JScrollPane> - <JTextArea id="fieldTripTypeComment" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getComment())}' onKeyReleased='getBean().setComment(fieldTripTypeComment.getText())' enabled='{isActif()}'/> + <JTextArea id="fieldTripTypeComment" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getComment())}' onKeyReleased='getBean().setComment(fieldTripTypeComment.getText())' enabled='{isActif()}' decorator='boxed' _bean='{TripTypeImpl.class}' _method='"Comment"'/> </JScrollPane> </cell> </row> @@ -137,4 +137,4 @@ </row> </Table> </fr.ifremer.isisfish.ui.input.InputContentUI> - \ No newline at end of file + Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/VesselTypeUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/VesselTypeUI.jaxx 2009-03-03 10:47:43 UTC (rev 1904) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/VesselTypeUI.jaxx 2009-03-03 17:19:21 UTC (rev 1905) @@ -102,7 +102,7 @@ <JLabel text="isisfish.vesselType.name" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='1.0'> - <JTextField id="fieldVesselTypeName" text='{getBean().getName()}' enabled='{isActif()}' onKeyReleased='getBean().setName(fieldVesselTypeName.getText())'/> + <JTextField id="fieldVesselTypeName" text='{getBean().getName()}' enabled='{isActif()}' onKeyReleased='getBean().setName(fieldVesselTypeName.getText())' decorator='boxed' _bean='{VesselTypeImpl.class}' _method='"Name"'/> </cell> </row> <row> @@ -110,7 +110,7 @@ <JLabel text="isisfish.vesselType.length" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='1.0'> - <JTextField id="fieldVesselTypeLength" text='{getBean().getLength()}' enabled='{isActif()}' onKeyReleased='getBean().setLength(Integer.parseInt(fieldVesselTypeLength.getText()))'/> + <JTextField id="fieldVesselTypeLength" text='{getBean().getLength()}' enabled='{isActif()}' onKeyReleased='getBean().setLength(Integer.parseInt(fieldVesselTypeLength.getText()))' decorator='boxed' _bean='{VesselTypeImpl.class}' _method='"Length"'/> </cell> </row> <row> @@ -118,7 +118,7 @@ <JLabel text="isisfish.vesselType.speed" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='1.0'> - <JTextField id="fieldVesselTypeSpeed" text='{getBean().getSpeed()}' enabled='{isActif()}' onKeyReleased='getBean().setSpeed(Double.parseDouble(fieldVesselTypeSpeed.getText()))'/> + <JTextField id="fieldVesselTypeSpeed" text='{getBean().getSpeed()}' enabled='{isActif()}' onKeyReleased='getBean().setSpeed(Double.parseDouble(fieldVesselTypeSpeed.getText()))' decorator='boxed' _bean='{VesselTypeImpl.class}' _method='"Speed"'/> </cell> </row> <row> @@ -126,7 +126,7 @@ <JLabel text="isisfish.vesselType.maxDuration" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='1.0'> - <JTextField id="fieldVesselTypeMaxTripDuration" text='{getBean().getMaxTripDuration().getHour()}' enabled='{isActif()}' onKeyReleased='getBean().setMaxTripDuration(new TimeUnit(Double.parseDouble(fieldVesselTypeMaxTripDuration.getText()) * 3600))'/> + <JTextField id="fieldVesselTypeMaxTripDuration" text='{getBean().getMaxTripDuration().getHour()}' enabled='{isActif()}' onKeyReleased='getBean().setMaxTripDuration(new TimeUnit(Double.parseDouble(fieldVesselTypeMaxTripDuration.getText()) * 3600))' decorator='boxed' _bean='{VesselTypeImpl.class}' _method='"MaxTripDuration"'/> </cell> </row> <row> @@ -134,7 +134,7 @@ <JLabel text="isisfish.vesselType.activityRange" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='1.0'> - <JTextField id="fieldVesselTypeActivityRange" text='{getBean().getActivityRange()}' enabled='{isActif()}' onKeyReleased='getBean().setActivityRange(Double.parseDouble(fieldVesselTypeActivityRange.getText()))'/> + <JTextField id="fieldVesselTypeActivityRange" text='{getBean().getActivityRange()}' enabled='{isActif()}' onKeyReleased='getBean().setActivityRange(Double.parseDouble(fieldVesselTypeActivityRange.getText()))' decorator='boxed' _bean='{VesselTypeImpl.class}' _method='"ActivityRange"'/> </cell> </row> <row> @@ -142,7 +142,7 @@ <JLabel text="isisfish.vesselType.miniCrew" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='1.0'> - <JTextField id="fieldVesselTypeMinCrewSize" text='{getBean().getMinCrewSize()}' enabled='{isActif()}' onKeyReleased='getBean().setMinCrewSize(Integer.parseInt(fieldVesselTypeMinCrewSize.getText()))'/> + <JTextField id="fieldVesselTypeMinCrewSize" text='{getBean().getMinCrewSize()}' enabled='{isActif()}' onKeyReleased='getBean().setMinCrewSize(Integer.parseInt(fieldVesselTypeMinCrewSize.getText()))' decorator='boxed' _bean='{VesselTypeImpl.class}' _method='"MinCrewSize"'/> </cell> </row> <row> @@ -150,7 +150,7 @@ <JLabel text="isisfish.vesselType.fuelCost" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='1.0'> - <JTextField id="fieldVesselTypeUnitFuelCostOfTravel" text='{getBean().getUnitFuelCostOfTravel()}' onKeyReleased='getBean().setUnitFuelCostOfTravel(Double.parseDouble(fieldVesselTypeUnitFuelCostOfTravel.getText()))' enabled='{isActif()}'/> + <JTextField id="fieldVesselTypeUnitFuelCostOfTravel" text='{getBean().getUnitFuelCostOfTravel()}' onKeyReleased='getBean().setUnitFuelCostOfTravel(Double.parseDouble(fieldVesselTypeUnitFuelCostOfTravel.getText()))' enabled='{isActif()}' decorator='boxed' _bean='{VesselTypeImpl.class}' _method='"UnitFuelCostOfTravel"'/> </cell> </row> <row> @@ -159,7 +159,7 @@ </cell> <cell fill='both' weightx='1.0' weighty='0.7'> <JScrollPane> - <JList id="vesselTypeTripType" selectedValues='{getBean().getTripType().toArray()}' onMouseClicked='tripTypeChanged()' enabled='{isActif()}'/> + <JList id="vesselTypeTripType" selectedValues='{getBean().getTripType().toArray()}' onMouseClicked='tripTypeChanged()' enabled='{isActif()}' decorator='boxed' _bean='{VesselTypeImpl.class}' _method='"TripType"'/> </JScrollPane> </cell> </row> @@ -169,7 +169,7 @@ </cell> <cell fill='both' weightx='1.0' weighty='0.3'> <JScrollPane> - <JTextArea id="fieldVesselTypeComment" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getComment())}' onKeyReleased='getBean().setComment(fieldVesselTypeComment.getText())' enabled='{isActif()}'/> + <JTextArea id="fieldVesselTypeComment" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getComment())}' onKeyReleased='getBean().setComment(fieldVesselTypeComment.getText())' enabled='{isActif()}' decorator='boxed' _bean='{VesselTypeImpl.class}' _method='"Comment"'/> </JScrollPane> </cell> </row> @@ -199,4 +199,4 @@ </cell> </row> </Table> -</fr.ifremer.isisfish.ui.input.InputContentUI> \ No newline at end of file +</fr.ifremer.isisfish.ui.input.InputContentUI> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/WizardGroupCreationUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/WizardGroupCreationUI.jaxx 2009-03-03 10:47:43 UTC (rev 1904) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/WizardGroupCreationUI.jaxx 2009-03-03 17:19:21 UTC (rev 1905) @@ -579,4 +579,4 @@ </cell> </row> </Table> -</JPanel> \ No newline at end of file +</JPanel> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx 2009-03-03 10:47:43 UTC (rev 1904) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx 2009-03-03 17:19:21 UTC (rev 1905) @@ -148,7 +148,7 @@ <row> <cell columns='2' fill='both' weighty='0.7' weightx='1.0'> <JScrollPane> - <JList id="zoneCells" enabled='{isActif()}' selectedValues='{getBean().getCell().toArray()}' onMouseClicked='if ( isActif() ) { zoneCellsChange(); }'/> + <JList id="zoneCells" enabled='{isActif()}' selectedValues='{getBean().getCell().toArray()}' onMouseClicked='if ( isActif() ) { zoneCellsChange(); }' decorator='boxed' _bean='{ZoneImpl.class}' _method='"Cell"'/> </JScrollPane> </cell> </row> @@ -199,4 +199,4 @@ </cell> </row> </Table> -</fr.ifremer.isisfish.ui.input.InputContentUI> \ No newline at end of file +</fr.ifremer.isisfish.ui.input.InputContentUI> Added: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityNavigationTreeSelectionAdapter.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityNavigationTreeSelectionAdapter.java (rev 0) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityNavigationTreeSelectionAdapter.java 2009-03-03 17:19:21 UTC (rev 1905) @@ -0,0 +1,227 @@ +/* + * To change this template, choose Tools | Templates + * and open the template in the editor. + */ + +package fr.ifremer.isisfish.ui.sensitivity; + +import fr.ifremer.isisfish.entities.Cell; +import fr.ifremer.isisfish.entities.FisheryRegion; +import fr.ifremer.isisfish.entities.Gear; +import fr.ifremer.isisfish.entities.Metier; +import fr.ifremer.isisfish.entities.Population; +import fr.ifremer.isisfish.entities.Port; +import fr.ifremer.isisfish.entities.SetOfVessels; +import fr.ifremer.isisfish.entities.Species; +import fr.ifremer.isisfish.entities.TripType; +import fr.ifremer.isisfish.entities.VesselType; +import fr.ifremer.isisfish.entities.Zone; +import fr.ifremer.isisfish.ui.input.*; +import jaxx.runtime.Decorator; +import jaxx.runtime.JAXXContextEntryDef; +import jaxx.runtime.swing.CardLayout2; +import jaxx.runtime.swing.JAXXTree; +import jaxx.runtime.swing.navigation.NavigationTreeModel; +import jaxx.runtime.swing.navigation.NavigationTreeModel.NavigationTreeNode; +import jaxx.runtime.swing.navigation.NavigationTreeModelBuilder; +import jaxx.runtime.swing.navigation.NavigationTreeModelBuilder.ChildBuilder; +import jaxx.runtime.swing.navigation.NavigationTreeSelectionAdapterWithCardLayout; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import static org.codelutin.i18n.I18n._; +import org.codelutin.topia.persistence.TopiaEntity; + +import javax.swing.JOptionPane; +import javax.swing.JPanel; +import javax.swing.JTree; +import javax.swing.event.TreeSelectionEvent; +import java.awt.Component; +import org.hibernate.transaction.JOTMTransactionManagerLookup; + +/** @author letellier */ +public class SensitivityNavigationTreeSelectionAdapter extends NavigationTreeSelectionAdapterWithCardLayout { + + /** to use log facility, just put in your code: log.info(\"...\"); */ + static private final Log log = LogFactory.getLog(SensitivityNavigationTreeSelectionAdapter.class); + + protected NavigationTreeNode currentNode = null; + protected InputContentUI currentUI = null; + protected TopiaEntity currentEntity = null; + + public SensitivityNavigationTreeSelectionAdapter(SensitivityTabUI context, boolean register) { + super(SensitivityTabUI.class, null, context, Strategy.PER_UI_TYPE); + + if (context.getNavigation() == null) { + throw new IllegalArgumentException("could not have a null 'navigation' in ui " + context); + } + + if (register) { + // register in tree this listener + context.getNavigation().addTreeSelectionListener(this); + } + } + + @Override + protected JPanel getContentContainer() { + return ((SensitivityTabUI) context).getInputPane(); + } + + @Override + protected CardLayout2 getContentLayout() { + return ((SensitivityTabUI) context).getCardlayout(); + } + + @Override + protected NavigationTreeModel getNavigationTreeModel() { + return (NavigationTreeModel) ((SensitivityTabUI) context).getNavigation().getModel(); + } + + @Override + protected void goBackToPreviousNode(TreeSelectionEvent event, Exception e) { + if (e != null) { +// ErrorDialogUI.showError(e); + e.printStackTrace(); + } + // go back to previous node + returnToPreviousNode(getNavigationTree(), event); + } + + + protected JAXXTree getNavigationTree() { + return ((SensitivityTabUI) context).getNavigation(); + } + + @Override + protected void openUI(Component newUI, NavigationTreeNode node) throws Exception { + super.openUI(newUI, node); + // apply refresh method (should a contract for all this ui with a method refresh...) + try { + currentUI = (InputContentUI) newUI; + if (currentUI != null) + currentUI.setLayer(true); + context.getContextValue(InputSaveVerifier.class).addCurrentPanel(currentUI); + currentNode = node; + } catch (Exception e) { + log.debug(e.getMessage(), e); + } + } + + @Override + protected boolean closeUI(TreeSelectionEvent event, Component component) throws Exception { + boolean exit = true; + return exit; + } + + @Override + protected void addSelectedBeanInContext(NavigationTreeNode node, Object data) { + if (log.isDebugEnabled()) { + log.debug("find data for contextPath <" + node.getContextPath() + "> : " + (data == null ? null : data.getClass())); + } + InputSaveVerifier verif = context.getContextValue(InputSaveVerifier.class); + verif.removeAllEntity(); + if (TopiaEntity.class.isInstance(data)){ + verif.addCurrentEntity((TopiaEntity) data); + } + else{ + verif.addCurrentEntity(null); + } + verif.refreshAll(); + verif.setCurrentNode(node); + } + + public static NavigationTreeModel getTreeModel(String regionName, FisheryRegion fisheryRegion) { + + NavigationTreeModelBuilder builder = new NavigationTreeModelBuilder("/"); + + if (regionName == null) { + return null; + } + + ChildBuilder<TopiaEntity> childParentBuilder = new ChildBuilder<TopiaEntity>(builder) { + + Decorator<? extends TopiaEntity> decorator; + + public void init(Class<? extends TopiaEntity> klass) { + decorator = jaxx.runtime.PropertyDecorator.newDecorator(klass, "name"); + } + + public Decorator<? extends TopiaEntity> getDecorator(TopiaEntity child) { + return decorator; + } + + public String getJXPath(TopiaEntity child) { + return "..[@topiaId=\"" + child.getTopiaId() + "\"]"; + } + + public String getNavigationPath(TopiaEntity child) { + return child.getTopiaId(); + } + }; + + ChildBuilder<TopiaEntity> childBuilder = new ChildBuilder<TopiaEntity>(builder) { + + Decorator<? extends TopiaEntity> decorator; + + public void init(Class<? extends TopiaEntity> klass) { + decorator = jaxx.runtime.PropertyDecorator.newDecorator(klass, "name"); + } + + public Decorator<? extends TopiaEntity> getDecorator(TopiaEntity child) { + return decorator; + } + + public String getJXPath(TopiaEntity child) { + return "..[@topiaId=\"" + child.getTopiaId() + "\"]"; + } + + public String getNavigationPath(TopiaEntity child) { + return child.getTopiaId(); + } + }; + + try { + + NavigationTreeNode root = builder.build(null, regionName, JAXXContextEntryDef.newDef(FisheryRegion.class), "$root", FisheryRegionUI.class, null); + + childBuilder.build(builder.build(root, "Cells", "../cell", "$cells", CellUI.class, null), + true, Cell.class, fisheryRegion.getCell(), CellUI.class, null); + + childBuilder.build(builder.build(root, "Zones", "../zone", "$zones", ZoneUI.class, null), + true, Zone.class, fisheryRegion.getZone(), ZoneUI.class, null); + + childBuilder.build(builder.build(root, "Ports", "../port", "$ports", PortUI.class, null), + true, Port.class, fisheryRegion.getPort(), PortUI.class, null); + + NavigationTreeNode species = builder.build(root, "Species", "../species", "$species", SpeciesUI.class, null); + + for (Species specie : fisheryRegion.getSpecies()) { + NavigationTreeNode speciesChild = builder.build(species, specie.toString(), "..[@topiaId=\"" + specie.getTopiaId() + "\"]", specie.getTopiaId(), SpeciesUI.class, null); + NavigationTreeNode populations = builder.build(speciesChild, "Populations", "../population", "$populations", PopulationUI.class, null); + childBuilder.build(populations, true, Population.class, specie.getPopulation(), PopulationUI.class, null); + } + + childBuilder.build(builder.build(root, "Gears", "../gear", "$gears", GearUI.class, null), + true, Gear.class, fisheryRegion.getGear(), GearUI.class, null); + + childBuilder.build(builder.build(root, "Metiers", "../metier", "$metiers", MetierUI.class, null), + true, Metier.class, fisheryRegion.getMetier(), MetierUI.class, null); + + childBuilder.build(builder.build(root, "TripTypes", "../tripType", "$tripTypes", TripTypeUI.class, null), + true, TripType.class, fisheryRegion.getTripType(), TripTypeUI.class, null); + + childBuilder.build(builder.build(root, "VesselTypes", "../vesselType", "$vesselTypes", VesselTypeUI.class, null), + true, VesselType.class, fisheryRegion.getVesselType(), VesselTypeUI.class, null); + + childBuilder.build(builder.build(root, "SetOfVessels", "../setOfVessels", "$setOfVessels", SetOfVesselsUI.class, null), + true, SetOfVessels.class, fisheryRegion.getSetOfVessels(), SetOfVesselsUI.class, null); + + childBuilder.build(builder.build(root, "Strategies", "../strategy", "$strategies", StrategyUI.class, null), + true, fr.ifremer.isisfish.entities.Strategy.class, fisheryRegion.getStrategy(), StrategyUI.class, null); + + } catch (Exception ex) { + log.error(ex.getMessage(), ex); + } + return builder.getModel(); + } + +} Added: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityTabUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityTabUI.jaxx (rev 0) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityTabUI.jaxx 2009-03-03 17:19:21 UTC (rev 1905) @@ -0,0 +1,130 @@ + +<JPanel id="sensibilityTabUI" layout='{new BorderLayout()}'> + + <javax.swing.tree.DefaultTreeSelectionModel id='navigationSelectionModel' selectionMode='{javax.swing.tree.TreeSelectionModel.SINGLE_TREE_SELECTION}'/> + + <jaxx.runtime.swing.CardLayout2 id='cardlayout'/> + + <java.awt.CardLayout id='cardlayoutPrincipal'/> + + <fr.ifremer.isisfish.entities.FisheryRegionImpl id='region' javaBean='null'/> + + <script><![CDATA[ + +import fr.ifremer.isisfish.datastore.RegionStorage; +import fr.ifremer.isisfish.entities.FisheryRegionImpl; +import fr.ifremer.isisfish.ui.Common; +import fr.ifremer.isisfish.ui.WelcomePanelUI; +import fr.ifremer.isisfish.ui.input.InputAction; +import fr.ifremer.isisfish.ui.input.InputNavigationTreeSelectionAdapter; +import javax.swing.tree.DefaultTreeModel; +import javax.swing.tree.TreePath; +import jaxx.runtime.swing.navigation.NavigationTreeCellRenderer; +import jaxx.runtime.swing.navigation.NavigationTreeModel; +import fr.ifremer.isisfish.ui.input.InputSaveVerifier; +import org.codelutin.topia.TopiaContext; +import jaxx.runtime.swing.navigation.NavigationTreeModel.NavigationTreeNode; +import jaxx.runtime.swing.navigation.NavigationUtil; + +protected InputAction getInputAction(){ + return getContextValue(InputAction.class); +} +protected InputSaveVerifier getVerifier(){ + return getContextValue(InputSaveVerifier.class); +} +protected RegionStorage getRegionStorage(){ + return getContextValue(RegionStorage.class); +} +public void setTreeModel(){ + if (getRegion() != null){ + getCardlayoutPrincipal().show(inputPanePrincipal,"normale"); + String regionName = getRegion().getName(); + setContextValue(getRegion()); + NavigationTreeModel model = SensitivityNavigationTreeSelectionAdapter.getTreeModel(regionName, getRegion()); + navigation.setSelectionModel(navigationSelectionModel); + navigation.setCellRenderer(new NavigationTreeCellRenderer(this)); + + setContextValue(model); + navigation.setModel(model); + new SensitivityNavigationTreeSelectionAdapter(this, true); + setTreeSelection("$root"); + } +} +public void repaintNode(String path){ + NavigationTreeModel model = getContextValue(NavigationTreeModel.class); + NavigationTreeNode currentNode = model.findNode(path); + model.nodeChanged(currentNode); +} +public void setTreeSelection(String path){ + NavigationTreeNode node = NavigationUtil.findNode(this, null, path); + TreePath pathToRoot = new TreePath(getContextValue(NavigationTreeModel.class).getPathToRoot(node)); + navigation.setSelectionPath(pathToRoot); + navigation.scrollPathToVisible(pathToRoot); +} +protected void setInfoText(String s){ + WelcomePanelUI root = getParentContainer(WelcomePanelUI.class); + root.setInfoText(s); +} +protected void regionNull(){ + getCardlayoutPrincipal().show(inputPanePrincipal,"none"); + DefaultTreeModel model = new DefaultTreeModel(null); + navigation.setModel(model); +} + ]]> + </script> + <JSplitPane oneTouchExpandable="true" dividerLocation="200" orientation="HORIZONTAL" constraints='BorderLayout.CENTER'> + <JPanel layout='{new BorderLayout()}'> + <JSplitPane oneTouchExpandable="true" dividerLocation="400" orientation="VERTICAL" constraints='BorderLayout.CENTER'> + <Table> + <row> + <cell columns='2' fill='both' weightx='1.0' weighty='1.0'> + <JScrollPane> + <JTree id="navigation" rootVisible="true" selectionRow='0' model='{new DefaultTreeModel(null)}'/> + </JScrollPane> + </cell> + </row> + </Table> + <JPanel id="factorPanel" name="factorPanel" layout='{new BorderLayout()}'> + <JScrollPane constraints='BorderLayout.CENTER'> + <JTree id="factors" rootVisible="true" selectionRow='0' model='{new DefaultTreeModel(null)}'/> + </JScrollPane> + </JPanel> + </JSplitPane> + </JPanel> + <JPanel id='inputPanePrincipal' layout='{getCardlayoutPrincipal()}'> + <fr.ifremer.isisfish.ui.input.NoneUI id='noneUI' constraints='"none"'/> + <JPanel id="inputPane" layout='{getCardlayout()}' constraints='"normale"'/> + </JPanel> + </JSplitPane> +</JPanel> \ No newline at end of file Added: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityUI.jaxx (rev 0) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityUI.jaxx 2009-03-03 17:19:21 UTC (rev 1905) @@ -0,0 +1,56 @@ + +<JPanel layout='{new BorderLayout()}'> + <script><![CDATA[ + import fr.ifremer.isisfish.ui.simulator.SimulAction; + import fr.ifremer.isisfish.ui.result.ResultAction; + import jaxx.runtime.JAXXInitialContext; + import fr.ifremer.isisfish.ui.input.InputAction; + import fr.ifremer.isisfish.ui.input.InputSaveVerifier; + import fr.ifremer.isisfish.ui.simulator.ParamsUI; + import fr.ifremer.isisfish.ui.sensitivity.SensitivityTabUI; + + public void selTab(int i){ + sensitivityTabs.setSelectedIndex(i); + } + ]]> + </script> + <JTabbedPane id="sensitivityTabs" constraints="BorderLayout.CENTER"> + <tab title='isisfish.params.title'> + <ParamsUI id='paramsUI' constructorParams='new SimulAction()'/> + </tab> + <tab title='isisfish.sensitivity.title'> + <SensitivityTabUI id="sensitivityTabUI" constructorParams='new JAXXInitialContext().add(new InputAction()).add(new InputSaveVerifier()).add(this)'/> + </tab> + </JTabbedPane> +</JPanel> Added: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/util/UtilsUI.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/util/UtilsUI.java (rev 0) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/util/UtilsUI.java 2009-03-03 17:19:21 UTC (rev 1905) @@ -0,0 +1,54 @@ +/* + * To change this template, choose Tools | Templates + * and open the template in the editor. + */ + +package fr.ifremer.isisfish.ui.util; + +import java.io.InputStream; +import java.io.File; +import java.io.FileNotFoundException; +import java.io.FileReader; +import java.io.IOException; +import java.util.Properties; +import java.util.logging.Level; +import java.util.logging.Logger; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import static org.codelutin.i18n.I18n._; + +/** + * + * @author letellier + */ +public class UtilsUI { + + private static final Log log = LogFactory.getLog(UtilsUI.class); + static final String propertiesPath = "/sensitivity.properties"; + + static public boolean isSensitivity(String sens){ + Properties data = loadProperties(); + System.out.println(sens + " " + data.getProperty(sens)); + return data.getProperty(sens) != null; + + } + + private static Properties loadProperties(){ + InputStream stream = null; + Properties data = null; + try { + stream = UtilsUI.class.getResourceAsStream(propertiesPath); + data = new Properties(); + data.load(stream); + } catch (IOException ex) { + Logger.getLogger(UtilsUI.class.getName()).log(Level.SEVERE, null, ex); + } finally{ + try { + stream.close(); + } catch (IOException ex) { + Logger.getLogger(UtilsUI.class.getName()).log(Level.SEVERE, null, ex); + } + } + return data; + } +} Modified: isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties =================================================================== --- isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties 2009-03-03 10:47:43 UTC (rev 1904) +++ isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties 2009-03-03 17:19:21 UTC (rev 1905) @@ -841,6 +841,7 @@ isisfish.sensWizardPanels.validate=Validate isisfish.sensWizardPanels.values=Values isisfish.sensibilityWizard.title=Sensibility Wizard +isisfish.sensitivity.title=Sensitivities input isisfish.server.ssh.generateKey.title=Generate Ssh key isisfish.setOfVessels.comments=Comments isisfish.setOfVessels.fixedCosts=Fixed costs Modified: isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties =================================================================== --- isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties 2009-03-03 10:47:43 UTC (rev 1904) +++ isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties 2009-03-03 17:19:21 UTC (rev 1905) @@ -841,6 +841,7 @@ isisfish.sensWizardPanels.validate=Valider isisfish.sensWizardPanels.values=Valeurs isisfish.sensibilityWizard.title=Sensibility Wizard +isisfish.sensitivity.title=Saisie des sensibilit\u00E9s isisfish.server.ssh.generateKey.title=G\u00E9n\u00E9rer une cl\u00E9 SSH isisfish.setOfVessels.comments=Commentaires isisfish.setOfVessels.fixedCosts=Co\u00FBts fixes Added: isis-fish/trunk/src/main/resources/images/Queue.gif =================================================================== (Binary files differ) Property changes on: isis-fish/trunk/src/main/resources/images/Queue.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: isis-fish/trunk/src/main/resources/images/sensitivities.gif =================================================================== (Binary files differ) Property changes on: isis-fish/trunk/src/main/resources/images/sensitivities.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: isis-fish/trunk/src/main/resources/sensitivity.properties =================================================================== --- isis-fish/trunk/src/main/resources/sensitivity.properties (rev 0) +++ isis-fish/trunk/src/main/resources/sensitivity.properties 2009-03-03 17:19:21 UTC (rev 1905) @@ -0,0 +1,82 @@ +Cell.Latitude +Cell.Longitude +Cell.Land +Cell.Comment +EffortDescription.FishingOperation +EffortDescription.FishingOperationDuration +EffortDescription.GearsNumberPerOperation +EffortDescription.CrewSize +EffortDescription.UnitCostOfFishing +EffortDescription.FixedCrewSalary +EffortDescription.CrewFoodCost +EffortDescription.CrewShareRate +EffortDescription.RepairAndMaintenanceGearCost +EffortDescription.LandingCosts +EffortDescription.OtherRunningCost +Gear.Name +Gear.EffortUnit +Gear.StandardisationFactor +Gear.ParameterName +Gear.PossibleValue +Gear.Comment +Metier.Name +Metier.GearParameterValue +Metier.Comment +Population.Name +Population.GeographicId +Population.PlusGroup +Population.Comment +Population.Capturability +Population.CapturabilityComment +PopulationGroup.MeanWeight +PopulationGroup.Price +Population.NaturalDeathRateMatrix +PopulationGroup.ReproductionRate +PopulationGroup.Age +PopulationGroup.MinLength +PopulationGroup.MaxLength +PopulationGroup.Comment +PopulationSeasonInfo.EmigrationMatrix +PopulationSeasonInfo.ImmigrationMatrix +PopulationSeasonInfo.MigrationMatrix +PopulationSeasonInfo.UseEquationMigration +Population.MigrationComment +Population.MonthGapBetweenReproRecrutement +Population.RecruitmentDistribution +Population.RecruitmentComment +StrategyMonthInfo.LengthChangeMatrix +Population.SeasonsComment +Port.Name +Port.Cell +Port.Comment +SetOfVessels.Name +SetOfVessels.NumberOfVessels +SetOfVessels.FixedCosts +SetOfVessels.Comment +Species.Name +Species.ScientificName +Species.CodeRubbin +Species.CodeCEE +Species.AgeGroupType +Species.AgeGroupType +Species.Comment +StrategyMonthInfo.NumberOfTrips +StrategyMonthInfo.ProportionMetier +Strategy.Name +Strategy.ProportionSetOfVessels +Strategy.InactivityEquationUsed +Strategy.Comment +TripType.Name +TripType.TripDuration +TripType.MinTimeBetweenTrip +TripType.Comment +VesselType.Name +VesselType.Length +VesselType.Speed +VesselType.MaxTripDuration +VesselType.ActivityRange +VesselType.MinCrewSize +VesselType.UnitFuelCostOfTravel +VesselType.TripType +VesselType.Comment +Zone.Cell \ No newline at end of file

1 0

r1904 - isis-fish/trunk
by jcouteau＠users.labs.libre-entreprise.org March 3, 2009

March 3, 2009

Author: jcouteau Date: 2009-03-03 10:47:43 +0000 (Tue, 03 Mar 2009) New Revision: 1904 Modified: isis-fish/trunk/pom.xml Log: Change lutinmatrix version in dependencies Modified: isis-fish/trunk/pom.xml =================================================================== --- isis-fish/trunk/pom.xml 2009-03-02 17:22:39 UTC (rev 1903) +++ isis-fish/trunk/pom.xml 2009-03-03 10:47:43 UTC (rev 1904) @@ -348,7 +348,7 @@ <jaxx.version>1.2</jaxx.version> <topia.version>2.1.3</topia.version> <topia.service.version>1.0.2</topia.service.version> - <lutinmatrix.version>1.2</lutinmatrix.version> + <lutinmatrix.version>1.3-SNAPSHOT</lutinmatrix.version> <lutinutil.version>1.0.3</lutinutil.version> <i18n.version>0.9</i18n.version> <lutinwidget.version>0.13</lutinwidget.version>

1 0

r1903 - in isis-fish/trunk/src: main/java/fr/ifremer/isisfish/simulator/sensitivity main/resources/templates/script test/java/fr/ifremer/isisfish/datastore test/java/fr/ifremer/isisfish/simulator/launcher test/java/fr/ifremer/isisfish/simulator/sensitivity
by chatellier＠users.labs.libre-entreprise.org March 2, 2009

March 2, 2009

Author: chatellier Date: 2009-03-02 17:22:39 +0000 (Mon, 02 Mar 2009) New Revision: 1903 Removed: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/FactorsAnalysePlan.java Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/SensitivityCalculator.java isis-fish/trunk/src/main/resources/templates/script/sensitivity.ftl isis-fish/trunk/src/test/java/fr/ifremer/isisfish/datastore/SensitivityStorageTest.java isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceTest.java isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/SensitivityCalculatorRandomMock.java Log: Add SimulationStorage list on SensivityCalculator interfaces Fix tests. Deleted: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/FactorsAnalysePlan.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/FactorsAnalysePlan.java 2009-03-02 16:58:18 UTC (rev 1902) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/FactorsAnalysePlan.java 2009-03-02 17:22:39 UTC (rev 1903) @@ -1,182 +0,0 @@ -/* *##% - * Copyright (C) 2009 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.simulator.sensitivity; - -import static org.codelutin.i18n.I18n._; - -import java.io.Serializable; -import java.lang.reflect.Field; -import java.lang.reflect.InvocationTargetException; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import org.apache.commons.beanutils.BeanUtils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.codelutin.topia.TopiaContext; -import org.codelutin.topia.TopiaException; -import org.codelutin.topia.persistence.TopiaEntity; - -import fr.ifremer.isisfish.datastore.SimulationStorage; -import fr.ifremer.isisfish.simulator.AnalysePlanContext; -import fr.ifremer.isisfish.simulator.AnalysePlanIndependent; -import fr.ifremer.isisfish.util.Doc; - -/** - * Analyze plan to manage factors. - * - * This plan is independent, because factors do not depend - * each others. - * - * @author chatellier - * @version $Revision: 1.0 $ - * - * Last update : $Date: 23 févr. 2009 $ - * By : $Author: chatellier $ - */ -public class FactorsAnalysePlan implements AnalysePlanIndependent { - - /** to use log facility, just put in your code: log.info("..."); */ - private static Log log = LogFactory.getLog(FactorsAnalysePlan.class); - - /** - * Domaine à utiliser pour le plan d'analyse. - */ - @Doc(value = "Factors design plan") - public DesignPlan designPlan; - - /** - * Map entre les numeros de simulation et les facteurs - * a appliquer à cette simulation. - * - * Start at 0. - */ - protected Map<Integer, List<Factor<? extends Serializable>>> simulationsFactors; - - /* - * @see fr.ifremer.isisfish.simulator.AnalysePlan#getDescription() - */ - @Override - public String getDescription() throws Exception { - return _("Factors analyse plan"); - } - - /* - * @see fr.ifremer.isisfish.simulator.AnalysePlan#getNecessaryResult() - */ - @Override - public String[] getNecessaryResult() { - // return value could not be null - return new String[0]; - } - - /* - * @see fr.ifremer.isisfish.simulator.AnalysePlan#init(fr.ifremer.isisfish.simulator.AnalysePlanContext) - */ - @Override - public void init(AnalysePlanContext context) throws Exception { - - // here to call R ? - SensitivityCalculator sensitivityCalculator = null; - - /*Scenario scenario = sensitivityCalculator.getScenario(designPlan); - scenarioToMap(scenario);*/ - } - - /** - * Convertit un scenario en une map indexée. - * - * Methode a part pour être stéreotypée. - */ - protected void scenarioToMap(Scenario scenario) - throws Exception { - int simulationIndex = 0; - simulationsFactors = new HashMap<Integer, List<Factor<? extends Serializable>>>(); - /*for (List<Factor<? extends Serializable>> scenarioValue : scenario.getFactors()) { - simulationsFactors.put(simulationIndex, scenarioValue); - simulationIndex++; - }*/ - } - - /* - * @see fr.ifremer.isisfish.simulator.AnalysePlan#beforeSimulation(fr.ifremer.isisfish.simulator.AnalysePlanContext, fr.ifremer.isisfish.datastore.SimulationStorage) - */ - @Override - public boolean beforeSimulation(AnalysePlanContext context, - SimulationStorage nextSimulation) throws Exception { - - int simulationNumber = context.getNumber(); - - if (log.isInfoEnabled()) { - log.info("Before simulation number " + simulationNumber); - } - - List<Factor<? extends Serializable>> factors = simulationsFactors.get(simulationNumber); - - if (log.isDebugEnabled()) { - // get specified line in domain array - // to inject into simulation storage - log.debug("Factor used for this simulation" + factors); - } - - putFactorIntoSimulation(factors, nextSimulation); - - // true to do next simulation - return true; - } - - /** - * Put factors value into simulation. - * - * @param factors to put - * @param simulation to put factors into - * @throws TopiaException if db errors - * @throws InvocationTargetException - * @throws IllegalAccessException - */ - protected void putFactorIntoSimulation(List<Factor<? extends Serializable>> factors, SimulationStorage simulation) throws TopiaException, IllegalAccessException, InvocationTargetException { - // inject factors into simulation - TopiaContext rootContext = simulation.getStorage(); - TopiaContext childContext = rootContext.beginTransaction(); - - for (Factor<? extends Serializable> factor : factors) { - Serializable value = factor.getValue(); - String path = factor.getPath(); - - // path is like "org.codelutin.factor#1234567890#0.12242345354#name" - String topiaId = path.substring(0, path.lastIndexOf("#")); - String propertyName = path.substring(0, path.lastIndexOf("#")); - - TopiaEntity entity = childContext.findByTopiaId(topiaId); - BeanUtils.setProperty(entity, propertyName, value); - } - } - - /* - * @see fr.ifremer.isisfish.simulator.AnalysePlan#afterSimulation(fr.ifremer.isisfish.simulator.AnalysePlanContext, fr.ifremer.isisfish.datastore.SimulationStorage) - */ - @Override - public boolean afterSimulation(AnalysePlanContext context, - SimulationStorage lastSimulation) throws Exception { - - // true to do next simulation - return true; - } -} Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/SensitivityCalculator.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/SensitivityCalculator.java 2009-03-02 16:58:18 UTC (rev 1902) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/SensitivityCalculator.java 2009-03-02 17:22:39 UTC (rev 1903) @@ -18,6 +18,10 @@ package fr.ifremer.isisfish.simulator.sensitivity; +import java.util.List; + +import fr.ifremer.isisfish.datastore.SimulationStorage; + /** * Interface commune à toutes implémentation * de calcul de sensibilité. @@ -65,10 +69,13 @@ * à l'outils de d'analyse de sensibilité. * * @param sensitivityScenarios résultats de scenarios + * @param simulationStorages ensemble des {@link SimulationStorage} + * qui ont résultés des simulations * @throws SensitivityException if calculator impl fail to execute * * @see SensitivityScenarios */ - void analyzeResult(SensitivityScenarios sensitivityScenarios) + void analyzeResult(SensitivityScenarios sensitivityScenarios, + List<SimulationStorage> simulationStorages) throws SensitivityException; } Modified: isis-fish/trunk/src/main/resources/templates/script/sensitivity.ftl =================================================================== --- isis-fish/trunk/src/main/resources/templates/script/sensitivity.ftl 2009-03-02 16:58:18 UTC (rev 1902) +++ isis-fish/trunk/src/main/resources/templates/script/sensitivity.ftl 2009-03-02 17:22:39 UTC (rev 1903) @@ -2,14 +2,17 @@ import static org.codelutin.i18n.I18n._; +import java.util.List; + import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.codelutin.math.matrix.*; -import fr.ifremer.isisfish.util.Doc; +import fr.ifremer.isisfish.datastore.SimulationStorage; import fr.ifremer.isisfish.entities.*; import fr.ifremer.isisfish.simulator.sensitivity.*; +import fr.ifremer.isisfish.util.Doc; /** * ${name}.java @@ -69,11 +72,14 @@ * à l'outils de d'analyse de sensibilité. * * @param sensitivityScenarios résultats de scenarios + * @param simulationStorages ensemble des {@link SimulationStorage} + * qui ont résultés des simulations * @throws SensitivityException if calculator impl fail to execute * * @see SensitivityScenarios */ - public void analyzeResult(SensitivityScenarios sensitivityScenarios) + public void analyzeResult(SensitivityScenarios sensitivityScenarios, + List<SimulationStorage> simulationStorages) throws SensitivityException { } Modified: isis-fish/trunk/src/test/java/fr/ifremer/isisfish/datastore/SensitivityStorageTest.java =================================================================== --- isis-fish/trunk/src/test/java/fr/ifremer/isisfish/datastore/SensitivityStorageTest.java 2009-03-02 16:58:18 UTC (rev 1902) +++ isis-fish/trunk/src/test/java/fr/ifremer/isisfish/datastore/SensitivityStorageTest.java 2009-03-02 17:22:39 UTC (rev 1903) @@ -31,8 +31,6 @@ import fr.ifremer.TestUtils; import fr.ifremer.isisfish.IsisFish; -import fr.ifremer.isisfish.util.ClasspathTemplateLoader; -import freemarker.cache.TemplateLoader; import freemarker.template.Configuration; import freemarker.template.Template; Modified: isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceTest.java =================================================================== --- isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceTest.java 2009-03-02 16:58:18 UTC (rev 1902) +++ isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceTest.java 2009-03-02 17:22:39 UTC (rev 1903) @@ -23,6 +23,8 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.codelutin.math.matrix.MatrixFactory; +import org.codelutin.math.matrix.MatrixND; import org.junit.After; import org.junit.Before; import org.junit.BeforeClass; @@ -65,13 +67,12 @@ @Before public void setUp() { - //System.setProperty("hibernate.hbm2ddl.auto", "create"); - System.setProperty("java.library.path", "/usr/local/lib"); + } @After public void tearDown() { - //System.setProperty("hibernate.hbm2ddl.auto", ""); + } /** @@ -117,6 +118,59 @@ } /** + * Build a test {@link DesignPlan} filled with matrix. + * + * @return a test {@link DesignPlan} + */ + protected DesignPlan getTestMatrixDesignPlan() { + DesignPlan designPlan = new DesignPlan(); + + // matrix 1 + MatrixND matrix1 = MatrixFactory.getInstance().create("test1", + new int[] { 3, 2 }, new String[] { "col1", "col2" }); + matrix1.setValue(new int[] { 0, 0 }, 13); + matrix1.setValue(new int[] { 0, 1 }, -14); + matrix1.setValue(new int[] { 1, 0 }, 21); + matrix1.setValue(new int[] { 1, 1 }, 2); + matrix1.setValue(new int[] { 2, 0 }, 12); + matrix1.setValue(new int[] { 2, 1 }, -1); + + // factor 1 + Factor<Double> factor1 = new Factor<Double>("test double 1"); + ContinuousDomain<Double> domain1 = new ContinuousDomain<Double>(); + domain1.setMinBound(0.0); + domain1.setMaxBound(50.0); + factor1.setDomain(domain1); + factor1.setPath("fr.ifremer.isisfish.entities.Population#1156462366818#0.5536481119187864#maxLength"); + + // matrix 2 + MatrixND matrix2 = MatrixFactory.getInstance().create("test1", + new int[] { 3, 2 }, new String[] { "col1", "col2" }); + matrix2.setValue(new int[] { 0, 0 }, 13); + matrix2.setValue(new int[] { 0, 1 }, -14); + matrix2.setValue(new int[] { 1, 0 }, 21); + matrix2.setValue(new int[] { 1, 1 }, 2); + matrix2.setValue(new int[] { 2, 0 }, 12); + matrix2.setValue(new int[] { 2, 1 }, -1); + + // factor 2 + Factor<Double> factor2 = new Factor<Double>("test double 2"); + DiscreteDomain<Double> domain2 = new DiscreteDomain<Double>(); + domain2.getValues().put(0.0, 12.3); + domain2.getValues().put(1.0, 70.9); + domain2.getValues().put(2.0, 21.0); + domain2.getValues().put(3.0, -12.1); + domain2.getValues().put(4.0, -8.45); + factor2.setDomain(domain2); + factor2.setPath("fr.ifremer.isisfish.entities.PopulationGroup#1156461521064#0.022976136053553198#minLength"); + + designPlan.getFactors().add(factor1); + designPlan.getFactors().add(factor2); + + return designPlan; + } + + /** * Lance une simulation avec des facteurs de sensibilité. */ @Ignore Modified: isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/SensitivityCalculatorRandomMock.java =================================================================== --- isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/SensitivityCalculatorRandomMock.java 2009-03-02 16:58:18 UTC (rev 1902) +++ isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/SensitivityCalculatorRandomMock.java 2009-03-02 17:22:39 UTC (rev 1903) @@ -24,6 +24,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import fr.ifremer.isisfish.datastore.SimulationStorage; import fr.ifremer.isisfish.simulator.launcher.SimulationServiceTest; import fr.ifremer.isisfish.simulator.sensitivity.SensitivityCalculator; import fr.ifremer.isisfish.simulator.sensitivity.DesignPlan; @@ -48,6 +49,10 @@ private static final Log log = LogFactory.getLog(SimulationServiceTest.class); + public String getDescription(){ + return "Implementation of random sensibility calculator"; + } + public SensitivityScenarios compute(DesignPlan plan) { if (log.isDebugEnabled()) { @@ -91,12 +96,9 @@ } - public void analyzeResult(SensitivityScenarios sensitivityScenarios) { + public void analyzeResult(SensitivityScenarios sensitivityScenarios, + List<SimulationStorage> simulationStorages) { } - - public String getDescription(){ - return "Implementation of Morris method using R"; - } }

1 0

r1902 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/versionning
by chatellier＠users.labs.libre-entreprise.org March 2, 2009

March 2, 2009

Author: chatellier Date: 2009-03-02 16:58:18 +0000 (Mon, 02 Mar 2009) New Revision: 1902 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/versionning/VCSGenerateSshKeyUI.jaxx Log: Ajout de <![CDATA[ ]]> sinon les && ca marche pas trop en jaxx Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/versionning/VCSGenerateSshKeyUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/versionning/VCSGenerateSshKeyUI.jaxx 2009-03-02 16:22:01 UTC (rev 1901) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/versionning/VCSGenerateSshKeyUI.jaxx 2009-03-02 16:58:18 UTC (rev 1902) @@ -1,5 +1,5 @@ <JDialog title='isisfish.server.ssh.generateKey.title' modal='true'> - <script> + <script><![CDATA[ import com.sshtools.j2ssh.transport.publickey.OpenSSHPublicKeyFormat; import com.sshtools.j2ssh.transport.publickey.SshKeyGenerator; import org.codelutin.util.FileUtil; @@ -55,7 +55,6 @@ sshkeygenerator.generateKeyPair("dsa", 1024, f.getAbsolutePath(), vcsLogin, ""); } // convert to openSSH ? - if (serverPublicKeyFile. File publicKeyFile = new File(serverPublicKeyFile.getText()); // bug #1623, le dossier parent n'existe pas if (publicKeyFile.getParentFile() != null && publicKeyFile.getParentFile().isDirectory()) { @@ -85,7 +84,7 @@ protected void setColor(boolean invalid, JComponent component) { component.setForeground(invalid ? Color.red: Color.black); } - </script> + ]]></script> <Table> <row fill='horizontal'> <cell>

1 0

r1901 - isis-fish/trunk
by chatellier＠users.labs.libre-entreprise.org March 2, 2009

March 2, 2009

Author: chatellier Date: 2009-03-02 16:22:01 +0000 (Mon, 02 Mar 2009) New Revision: 1901 Modified: isis-fish/trunk/pom.xml Log: Update h2 version. Changelog 1.1.108 : - Recovery did not work if there were more than 255 lobs stored as files. Modified: isis-fish/trunk/pom.xml =================================================================== --- isis-fish/trunk/pom.xml 2009-03-02 15:34:56 UTC (rev 1900) +++ isis-fish/trunk/pom.xml 2009-03-02 16:22:01 UTC (rev 1901) @@ -220,7 +220,7 @@ <dependency> <groupId>com.h2database</groupId> <artifactId>h2</artifactId> - <version>1.1.106</version> + <version>1.1.108</version> <scope>compile</scope> </dependency>

1 0

r1900 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator
by chatellier＠users.labs.libre-entreprise.org March 2, 2009

March 2, 2009

Author: chatellier Date: 2009-03-02 15:34:56 +0000 (Mon, 02 Mar 2009) New Revision: 1900 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/PopulationMonitor.java Log: Ajout de la methode "setDiscard". Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/PopulationMonitor.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/PopulationMonitor.java 2009-03-02 14:22:38 UTC (rev 1899) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/PopulationMonitor.java 2009-03-02 15:34:56 UTC (rev 1900) @@ -1,5 +1,5 @@ /* *##% - * Copyright (C) 2006 + * Copyright (C) 2006 - 2009 * Ifremer, Code Lutin, Cédric Pineau, Benjamin Poussin * * This program is free software; you can redistribute it and/or @@ -17,18 +17,6 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *##%*/ -/* * - * PopulationMonitor.java - * - * Created: 21 août 2006 15:41:18 - * - * @author poussin - * @version $Revision: 428 $ - * - * Last update: $Date: 2007-10-15 14:56:13 +0200 (lun, 15 oct 2007) $ - * by : $Author: bpoussin $ - */ - package fr.ifremer.isisfish.simulator; import java.util.ArrayList; @@ -51,7 +39,6 @@ import fr.ifremer.isisfish.types.Month; import java.util.Collections; - /** * Classe permettant le suivi des populations de la simulation. * <p> @@ -62,13 +49,16 @@ * Il serait bon que ce groupe deviennent un vrai groupe et que ce code specifique * puisse etre supprimer. * - * * @author poussin + * @version $Revision: 428 $ + * + * Last update: $Date: 2007-10-15 14:56:13 +0200 (lun, 15 oct 2007) $ + * by : $Author: bpoussin $ */ public class PopulationMonitor { - + /** to use log facility, just put in your code: log.info(\"...\"); */ - static private Log log = LogFactory.getLog(PopulationMonitor.class); + private static Log log = LogFactory.getLog(PopulationMonitor.class); /** La liste des pops monitorer par cette instance */ protected List<Population> pops = null; @@ -82,6 +72,7 @@ protected Map<Population, MatrixND> catchs = new HashMap<Population, MatrixND>(); /** catch per population, only last catch is remaining */ protected Map<Population, MatrixND> holdCatchs = new HashMap<Population, MatrixND>(); + protected double totalHoldCatch = 0; /** @@ -96,7 +87,8 @@ * @param pops */ public void init(List<Population> pops) { - this.pops = Collections.unmodifiableList(new ArrayList<Population>(pops)); + this.pops = Collections + .unmodifiableList(new ArrayList<Population>(pops)); for (Population pop : this.pops) { reproductions.put(pop, new HashMap<Date, MatrixND>()); discards.put(pop, new HashMap<Date, MatrixND>()); @@ -110,7 +102,7 @@ public List<Population> getPopulations() { return pops; } - + /** * Return current biomass for species * @param species @@ -118,14 +110,14 @@ */ public double getBiomass(Species species) { double result = 0; - + for (Population pop : species.getPopulation()) { result += getBiomass(pop); } return result; } - + /** * Return current biomass for population * @param pop @@ -133,20 +125,20 @@ */ public double getBiomass(Population pop) { double result = 0; - + MatrixND n = getN(pop); if (n != null) { n = n.sumOverDim(1); - for (MatrixIterator i=n.iterator(); i.next();){ - Object [] coord = i.getSemanticsCoordinates(); - PopulationGroup group = (PopulationGroup)coord[0]; + for (MatrixIterator i = n.iterator(); i.next();) { + Object[] coord = i.getSemanticsCoordinates(); + PopulationGroup group = (PopulationGroup) coord[0]; result += i.getValue() * group.getMeanWeight(); } } - + return result; } - + /** * Return current numbers for population * @param pop @@ -154,17 +146,17 @@ */ public MatrixND getN(Population pop) { MatrixND result = Ns.get(pop); - + 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()); } - + return result; } - + public void setN(Population pop, MatrixND mat) { Ns.put(pop, mat); } @@ -175,9 +167,9 @@ public MatrixND getReproduction(Date date, Population pop) { return this.reproductions.get(pop).get(date); } - + /** - * @param reproduction The reproduction to set. + * @param repro The reproduction to set. */ public void setReproduction(Date date, Population pop, MatrixND repro) { reproductions.get(pop).put(date, repro); @@ -193,7 +185,7 @@ if (log.isTraceEnabled()) { log.trace("Matrix repro before mortality: " + reproduction); } - + for (MatrixIterator mi = reproduction.iterator(); mi.next();) { Object[] sems = mi.getSemanticsCoordinates(); Zone z = (Zone) sems[0]; @@ -201,7 +193,8 @@ if (log.isTraceEnabled()) { log.trace("NaturalDeath zone " + z + "=" + coeff); } - mi.setValue(mi.getValue() * Math.exp(-coeff / Month.NUMBER_OF_MONTH)); + mi.setValue(mi.getValue() + * Math.exp(-coeff / Month.NUMBER_OF_MONTH)); } if (log.isTraceEnabled()) { log.trace("Matrix repro after mortality: " + reproduction); @@ -223,17 +216,19 @@ MatrixND matEtalement = pop.getRecruitmentDistribution(); int etalement = matEtalement.getDim(0); - MatrixND result = MatrixFactory.getInstance().create( - new List[]{pop.getPopulationGroup(), pop.getPopulationZone()}); + MatrixND result = MatrixFactory.getInstance() + .create( + new List[] { pop.getPopulationGroup(), + pop.getPopulationZone() }); // pour chaque - for(int e=0; e<etalement; e++){ + for (int e = 0; e < etalement; e++) { // recuperation de la reproduction stucture en zone repro - Date d = new Date(date.getDate() - e - - pop.getMonthGapBetweenReproRecrutement()); - MatrixND repro = (MatrixND)reproductions.get(pop).get(d); + Date d = new Date(date.getDate() - e + - pop.getMonthGapBetweenReproRecrutement()); + MatrixND repro = (MatrixND) reproductions.get(pop).get(d); - if(repro != null){ // si une repro existe pour le mois + if (repro != null) { // si une repro existe pour le mois // on fait la correspondance entre les zones repro et // recrutement @@ -249,52 +244,55 @@ // on multiplie la repro par le coeff de recrutement double coeff = matEtalement.getValue(e); - + MatrixND matRepro = repro.copy(); matRepro = matRepro.mults(coeff); matRepro.setSemantics(0, zoneRepros); MatrixND mapping = pop.getMappingZoneReproZoneRecru(); - for(Zone zoneRepro : zoneRepros){ - MatrixND submapping = mapping.getSubMatrix(0, new Object[]{zoneRepro}); - for (MatrixIterator i=submapping.iterator(); i.hasNext();) { + for (Zone zoneRepro : zoneRepros) { + MatrixND submapping = mapping.getSubMatrix(0, + new Object[] { zoneRepro }); + for (MatrixIterator i = submapping.iterator(); i.hasNext();) { i.next(); Object[] sem = i.getSemanticsCoordinates(); - Zone zoneRecru = (Zone)sem[1]; + Zone zoneRecru = (Zone) sem[1]; double c = i.getValue(); - result.setValue(classe, zoneRecru, c*matRepro.getValue(zoneRepro) - +result.getValue(classe, zoneRecru)); - } + result.setValue(classe, zoneRecru, c + * matRepro.getValue(zoneRepro) + + result.getValue(classe, zoneRecru)); + } } } } - - if(pop.getSpecies().getAgeGroupType()){ + + if (pop.getSpecies().getAgeGroupType()) { // conversion et retour de la matrice en vecteur MatrixND N = pop.N2DToN1D(result); // on applique les migrations et le changement d'age sur le resultat // on suppose que la reproduction est toujours dans une seul saison - Date dateRepro = new Date(date.getDate() - - pop.getMonthGapBetweenReproRecrutement()); - + Date dateRepro = new Date(date.getDate() + - pop.getMonthGapBetweenReproRecrutement()); + // recherche les saisons des differents mois entre les deux dates List<PopulationSeasonInfo> infos = pop.getPopulationSeasonInfo(); List<PopulationSeasonInfo> usedSeasons = new ArrayList<PopulationSeasonInfo>(); - + while (date.after(dateRepro)) { dateRepro = dateRepro.next(); Month month = dateRepro.getMonth(); for (PopulationSeasonInfo info : infos) { if (month.equals(info.getFirstMonth())) { usedSeasons.add(info); - dateRepro = new Date(dateRepro.getDate() + info.getMonths().size() - 1); // -1 because, for have next() + dateRepro = new Date(dateRepro.getDate() + + info.getMonths().size() - 1); // -1 because, for have next() break; } } } - - for(PopulationSeasonInfo info : usedSeasons){ + + for (PopulationSeasonInfo info : usedSeasons) { Month month = info.getFirstMonth(); MatrixND CA = info.getGroupChangeMatrix(month); MatrixND MI = info.getMigrationMatrix(month, result); @@ -305,14 +303,14 @@ result = pop.split2D(N); } return result; - } + } /** * @param catchPerStrategyMet */ public void holdCatch(Population pop, MatrixND catchPerStrategyMet) { catchs.put(pop, catchPerStrategyMet); - + MatrixND holdCatch = holdCatchs.get(pop); if (holdCatch == null) { holdCatch = MatrixFactory.getInstance().create(catchPerStrategyMet); @@ -320,10 +318,10 @@ } else { holdCatch.add(catchPerStrategyMet); } - + // compute total - for(MatrixIterator i=catchPerStrategyMet.iterator(); i.next();){ - this.totalHoldCatch += i.getValue(); + for (MatrixIterator i = catchPerStrategyMet.iterator(); i.next();) { + this.totalHoldCatch += i.getValue(); } } @@ -336,7 +334,7 @@ MatrixND result = catchs.get(pop); return result; } - + /** * @param pop * @return @@ -345,7 +343,7 @@ MatrixND result = holdCatchs.get(pop); return result; } - + /** * @param pop * @return @@ -354,7 +352,7 @@ double result = totalHoldCatch; return result; } - + /** * raz capture cumulée de toutes les pops */ @@ -365,14 +363,35 @@ } /** - * @param date - * @param pop - * @return + * Get discard. + * + * @param date date to get discard + * @param pop population to get discard + * @return le discard */ public MatrixND getDiscard(Date date, Population pop) { MatrixND result = discards.get(pop).get(date); return result; } + + /** + * Set discard. + * + * Force discard at date for population. + * + * @param date date to set discard + * @param pop population to set discard + * @param discard le discard + */ + public void setDiscard(Date date, Population pop, MatrixND discard) { + Map<Date, MatrixND> oneDiscard = discards.get(pop); + synchronized (oneDiscard) { + // meme si discards.get(pop) != null + // replace toujours le précédent + MatrixND tmp = discard.copy(); + discards.get(pop).put(date, tmp); + } + } /** * FIXME: discards n'est jamais vider, on le conserve pour toutes les annees @@ -384,7 +403,7 @@ */ public void addDiscard(Date date, Population pop, MatrixND discard) { Map<Date, MatrixND> oneDiscard = discards.get(pop); - synchronized(oneDiscard) { + synchronized (oneDiscard) { MatrixND tmp = oneDiscard.get(date); if (tmp == null) { tmp = discard.copy(); @@ -394,6 +413,6 @@ } } } + + } - -

1 0