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

r3319 - isis-fish/branches/3.3.1/src/main/resources
by chatellier＠users.labs.libre-entreprise.org May 12, 2011

May 12, 2011

Author: chatellier Date: 2011-05-12 09:42:22 +0000 (Thu, 12 May 2011) New Revision: 3319 Log: Unused file Removed: isis-fish/branches/3.3.1/src/main/resources/interpreter.properties Deleted: isis-fish/branches/3.3.1/src/main/resources/interpreter.properties =================================================================== --- isis-fish/branches/3.3.1/src/main/resources/interpreter.properties 2011-05-12 09:41:48 UTC (rev 3318) +++ isis-fish/branches/3.3.1/src/main/resources/interpreter.properties 2011-05-12 09:42:22 UTC (rev 3319) @@ -1,47 +0,0 @@ -### -# #%L -# IsisFish -# -# $Id$ -# $HeadURL$ -# %% -# Copyright (C) 1999 - 2010 CodeLutin -# %% -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as -# published by the Free Software Foundation, either version 2 of the -# License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public -# License along with this program. If not, see -# <http://www.gnu.org/licenses/gpl-2.0.html>. -# #L% -### -# ------------------------------------------------------------------- -# Copyright 2002-2005 Delft University of Technology. -# -# Licensed under the Lesser General Purpose, (the "License"); -# The properties in this file control the interpreter -# ------------------------------------------------------------------- - -# ------------------------------------------------------------------- -# Copyright 2002-2005 Delft University of Technology. -# -# Licensed under the Lesser General Purpose, (the "License"); -# The properties in this file control the interpreter -# ------------------------------------------------------------------- - -# Interpreter Factory------------------------------------------------ -#interpreter.operation.factory=nl.tudelft.simulation.dsol.interpreter.operations.InterpreterFactory -#interpreter.operation.factory=nl.tudelft.simulation.dsol.interpreter.operations.reflection.ReflectionFactory -interpreter.operation.factory=nl.tudelft.simulation.dsol.interpreter.process.ProcessFactory -interpreter.operation.oracle=umontreal.iro.lecuyer.simprocs.dsol.SSJInterpretationOracle - -# Interpreter Log Level---------------------------------------------- -interpreter.logLevel=WARNING -

1 0

r3318 - isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator
by chatellier＠users.labs.libre-entreprise.org May 12, 2011

May 12, 2011

Author: chatellier Date: 2011-05-12 09:41:48 +0000 (Thu, 12 May 2011) New Revision: 3318 Log: Fix NPE when creating population factor Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java 2011-05-06 08:18:06 UTC (rev 3317) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java 2011-05-12 09:41:48 UTC (rev 3318) @@ -1288,6 +1288,7 @@ MatrixContinuousDomain factorDomain = new MatrixContinuousDomain(); MatrixND populationEffectives = getSimulationParameter().getNumberOf(population); factorDomain.setMatrix(populationEffectives.copy()); + factorDomain.setCoefficient(0.0); selectedFactor.setDomain(factorDomain); } }

1 0

r3317 - isis-fish/branches/3.3.1/src/main/assembly
by chatellier＠users.labs.libre-entreprise.org May 6, 2011

May 6, 2011

Author: chatellier Date: 2011-05-06 08:18:06 +0000 (Fri, 06 May 2011) New Revision: 3317 Log: Update xml definition Modified: isis-fish/branches/3.3.1/src/main/assembly/bin.xml Modified: isis-fish/branches/3.3.1/src/main/assembly/bin.xml =================================================================== --- isis-fish/branches/3.3.1/src/main/assembly/bin.xml 2011-05-04 10:33:59 UTC (rev 3316) +++ isis-fish/branches/3.3.1/src/main/assembly/bin.xml 2011-05-06 08:18:06 UTC (rev 3317) @@ -24,8 +24,9 @@ #L% --> -<assembly xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/assembly-1.1.1.xsd"> +<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd"> <id>bin</id> <formats> <format>zip</format>

1 0

r3316 - isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/launcher
by jcouteau＠users.labs.libre-entreprise.org May 4, 2011

May 4, 2011

Author: jcouteau Date: 2011-05-04 10:33:59 +0000 (Wed, 04 May 2011) New Revision: 3316 Log: Display sensitivity errors to the user Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java 2011-05-03 16:26:19 UTC (rev 3315) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java 2011-05-04 10:33:59 UTC (rev 3316) @@ -506,9 +506,7 @@ } } catch (Exception e) { - if (log.isErrorEnabled()) { - log.error("Can't get scenarios from calculator", e); - } + throw new IsisFishRuntimeException("Can't get scenarios from calculator", e); } }

1 0

r3315 - isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/entity
by chatellier＠users.labs.libre-entreprise.org May 3, 2011

May 3, 2011

Author: chatellier Date: 2011-05-03 16:26:19 +0000 (Tue, 03 May 2011) New Revision: 3315 Log: Remove System out Modified: isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/entity/PopulationSeasonInfoTest.java Modified: isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/entity/PopulationSeasonInfoTest.java =================================================================== --- isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/entity/PopulationSeasonInfoTest.java 2011-05-03 16:25:46 UTC (rev 3314) +++ isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/entity/PopulationSeasonInfoTest.java 2011-05-03 16:26:19 UTC (rev 3315) @@ -29,7 +29,6 @@ import java.awt.HeadlessException; import java.util.ArrayList; -import java.util.Arrays; import java.util.List; import javax.swing.Box; @@ -61,21 +60,14 @@ public class PopulationSeasonInfoTest extends AbstractIsisFishTest { /** Logger for this class */ - private static final Log log = LogFactory - .getLog(PopulationSeasonInfoTest.class); + private static final Log log = LogFactory.getLog(PopulationSeasonInfoTest.class); - @Test - public void testToString() { - String[] s = new String[] { "toto", "titi", "tutu" }; - System.out.println(Arrays.toString(s)); - } - /* * Test method for 'fr.ifremer.isisfish.entities.PopulationSeasonInfoImpl.getGroupChangeMatrix(Month)' */ @Test public void testGetGroupChangeMatrix() throws InterruptedException { - System.out.println("begin"); + int nbrAge = 3; int nbrZone = 2; boolean groupplus = true; @@ -142,8 +134,6 @@ log.error("No X11 display available", he); } } - - System.out.println("end"); } /**

1 0

r3314 - isis-fish/branches/3.3.1
by chatellier＠users.labs.libre-entreprise.org May 3, 2011

May 3, 2011

Author: chatellier Date: 2011-05-03 16:25:46 +0000 (Tue, 03 May 2011) New Revision: 3314 Log: Remove unique version suffix Modified: isis-fish/branches/3.3.1/pom.xml Modified: isis-fish/branches/3.3.1/pom.xml =================================================================== --- isis-fish/branches/3.3.1/pom.xml 2011-05-02 15:23:52 UTC (rev 3313) +++ isis-fish/branches/3.3.1/pom.xml 2011-05-03 16:25:46 UTC (rev 3314) @@ -548,7 +548,6 @@ <addClasspath>true</addClasspath> <mainClass>${maven.jar.main.class}</mainClass> <classpathPrefix>lib/</classpathPrefix> - <useUniqueVersions>false</useUniqueVersions> </manifest> </archive> </configuration>

1 0

r3313 - isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator
by chatellier＠users.labs.libre-entreprise.org May 2, 2011

May 2, 2011

Author: chatellier Date: 2011-05-02 15:23:52 +0000 (Mon, 02 May 2011) New Revision: 3313 Log: Fix selection when reloading simulation Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx 2011-05-02 15:07:45 UTC (rev 3312) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx 2011-05-02 15:23:52 UTC (rev 3313) @@ -249,36 +249,35 @@ } protected void setListSimulParamsStrategiesItems() { + List<Strategy> strategiesSelected = simulAction.getSimulationParameter().getStrategies(); DefaultListModel listSimulParamsStrategiesModel = new DefaultListModel(); java.util.List<Strategy> strategies = simulAction.getStrategies(); for (Strategy s : strategies){ listSimulParamsStrategiesModel.addElement(s); } listSimulParamsStrategies.setModel(listSimulParamsStrategiesModel); - java.util.List<Strategy> strategiesSelected = simulAction.getSimulationParameter().getStrategies(); if (listSimulParamsStrategiesModel.size() != 0) { for (Strategy s : strategiesSelected){ int index = listSimulParamsStrategiesModel.indexOf(s); listSimulParamsStrategies.addSelectionInterval(index, index); } - - strategySelected(); + //strategySelected(); } } protected void setListSimulParamsPopulationsItems(){ + List<Population> populationsSelected = simulAction.getSimulationParameter().getPopulations(); DefaultListModel listSimulParamsPopulationsModel = new DefaultListModel(); - java.util.List<Population> populations = simulAction.getPopulations(); + List<Population> populations = simulAction.getPopulations(); for (Population p : populations){ listSimulParamsPopulationsModel.addElement(p); } listSimulParamsPopulations.setModel(listSimulParamsPopulationsModel); - java.util.List<Population> populationsSelected = simulAction.getSimulationParameter().getPopulations(); if (listSimulParamsPopulationsModel.size() != 0) { for (Population p : populationsSelected) { int index = listSimulParamsPopulationsModel.indexOf(p); listSimulParamsPopulations.addSelectionInterval(index, index); } - simulAction.populationSelected(this); + //simulAction.populationSelected(this); } }

1 0

r3312 - in isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui: input models/common result sensitivity simulator
by chatellier＠users.labs.libre-entreprise.org May 2, 2011

May 2, 2011

Author: chatellier Date: 2011-05-02 15:07:45 +0000 (Mon, 02 May 2011) New Revision: 3312 Log: Fix un probleme de declanchement d'event lors de la selection par defaut du premier r?\195?\169sultat Added: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/models/common/StringComboModel.java Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/InputHandler.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/InputUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/models/common/StringListModel.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/result/ResultHandler.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivitySecondPassUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/InputHandler.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/InputHandler.java 2011-05-02 14:39:03 UTC (rev 3311) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/InputHandler.java 2011-05-02 15:07:45 UTC (rev 3312) @@ -86,7 +86,7 @@ import fr.ifremer.isisfish.ui.input.tree.FisheryTreeRenderer; import fr.ifremer.isisfish.ui.input.tree.FisheryTreeSelectionModel; import fr.ifremer.isisfish.ui.input.tree.loadors.PopulationsNodeLoador; -import fr.ifremer.isisfish.ui.models.common.StringListModel; +import fr.ifremer.isisfish.ui.models.common.StringComboModel; import fr.ifremer.isisfish.ui.sensitivity.FactorWizardUI; import fr.ifremer.isisfish.ui.sensitivity.SensitivityInputHandler; import fr.ifremer.isisfish.ui.simulator.filter.SimulationFilterUtil; @@ -250,7 +250,7 @@ */ protected void refreshRegionList(InputUI inputUI, String selectedItem) { // refresh region list - StringListModel regionsModel = new StringListModel(RegionStorage.getRegionNames()); + StringComboModel regionsModel = new StringComboModel(RegionStorage.getRegionNames()); inputUI.getFieldCurrentRegion().setModel(regionsModel); // event is fired by setSelectedItem to call #regionChange if (selectedItem != null) { Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/InputUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/InputUI.jaxx 2011-05-02 14:39:03 UTC (rev 3311) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/InputUI.jaxx 2011-05-02 15:07:45 UTC (rev 3312) @@ -64,7 +64,7 @@ <row> <cell columns='2' fill='horizontal' weightx='1.0'> <JComboBox id="fieldCurrentRegion" onItemStateChanged='getHandler().regionChange(this, event)' - model='{new fr.ifremer.isisfish.ui.models.common.StringListModel(fr.ifremer.isisfish.datastore.RegionStorage.getRegionNames())}'/> + model='{new fr.ifremer.isisfish.ui.models.common.StringComboModel(fr.ifremer.isisfish.datastore.RegionStorage.getRegionNames())}'/> </cell> </row> </Table> Added: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/models/common/StringComboModel.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/models/common/StringComboModel.java (rev 0) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/models/common/StringComboModel.java 2011-05-02 15:07:45 UTC (rev 3312) @@ -0,0 +1,107 @@ +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2011 Ifremer, CodeLutin, Chatellier Eric + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 2 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-2.0.html>. + * #L% + */ + +package fr.ifremer.isisfish.ui.models.common; + +import java.util.List; + +import javax.swing.DefaultComboBoxModel; +import javax.swing.JComboBox; + +/** + * Model pour pour la representation d'une liste de {@link String}. + * Utilisation dans les {@link JComboBox}. + * + * @author chatellier + * @version $Revision$ + * + * Last update : $Date$ + * By : $Author$ + */ +public class StringComboModel extends DefaultComboBoxModel { + + /** serialVersionUID. */ + private static final long serialVersionUID = -4070846632975105788L; + + /** {@link String} list. */ + protected List<String> stringList; + + /** + * Empty constructor. + */ + public StringComboModel() { + this(null); + } + + /** + * Constructor with export list. + * + * @param stringList {@link String} list + */ + public StringComboModel(List<String> stringList) { + setStringList(stringList); + } + + /** + * Get {@link String} list. + * + * @return {@link String} list + */ + public List<String> getStringList() { + return stringList; + } + + /** + * Set {@link String} list. + * + * @param stringList {@link String} list to set + */ + public void setStringList(List<String> stringList) { + this.stringList = stringList; + // reset selected + setSelectedItem(null); + } + + /* + * @see javax.swing.ListModel#getElementAt(int) + */ + @Override + public Object getElementAt(int index) { + return stringList.get(index); + } + + /* + * @see javax.swing.ListModel#getSize() + */ + @Override + public int getSize() { + int size = 0; + + if (stringList != null) { + size = stringList.size(); + } + return size; + } +} Property changes on: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/models/common/StringComboModel.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/models/common/StringListModel.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/models/common/StringListModel.java 2011-05-02 14:39:03 UTC (rev 3311) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/models/common/StringListModel.java 2011-05-02 15:07:45 UTC (rev 3312) @@ -28,13 +28,11 @@ import java.util.List; import javax.swing.AbstractListModel; -import javax.swing.ComboBoxModel; -import javax.swing.JComboBox; import javax.swing.JList; /** * Model pour pour la representation d'une liste de {@link String}. - * Utilisation dans les {@link JList} et {@link JComboBox}. + * Utilisation dans les {@link JList}. * * @author chatellier * @version $Revision$ @@ -42,7 +40,7 @@ * Last update : $Date$ * By : $Author: chatellier $ */ -public class StringListModel extends AbstractListModel implements ComboBoxModel { +public class StringListModel extends AbstractListModel { /** serialVersionUID. */ private static final long serialVersionUID = -4070846632975105788L; @@ -50,9 +48,6 @@ /** {@link String} list. */ protected List<String> stringList; - /** Selected element. */ - protected Object selectedElement; - /** * Empty constructor. */ @@ -85,8 +80,6 @@ */ public void setStringList(List<String> stringList) { this.stringList = stringList; - // reset selected - selectedElement = null; } /* @@ -109,20 +102,4 @@ } return size; } - - /* - * @see javax.swing.ComboBoxModel#setSelectedItem(java.lang.Object) - */ - @Override - public void setSelectedItem(Object anItem) { - selectedElement = anItem; - } - - /* - * @see javax.swing.ComboBoxModel#getSelectedItem() - */ - @Override - public Object getSelectedItem() { - return selectedElement; - } } Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/result/ResultHandler.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/result/ResultHandler.java 2011-05-02 14:39:03 UTC (rev 3311) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/result/ResultHandler.java 2011-05-02 15:07:45 UTC (rev 3312) @@ -60,6 +60,7 @@ import fr.ifremer.isisfish.simulator.launcher.SimulationService; import fr.ifremer.isisfish.simulator.launcher.SimulationServiceListener; import fr.ifremer.isisfish.ui.CommonHandler; +import fr.ifremer.isisfish.ui.models.common.StringComboModel; import fr.ifremer.isisfish.ui.models.common.StringListModel; /** @@ -110,7 +111,7 @@ java.util.List<String> value = SimulationStorage.getSimulationNames(); resultUI.getSimulationComboBox().setEditable(false); - StringListModel model = new StringListModel(value); + StringComboModel model = new StringComboModel(value); resultUI.getSimulationComboBox().setModel(model); resultUI.getSimulationComboBox().setSelectedItem(null); } @@ -198,7 +199,7 @@ matrixViewerPanel.addMatrixFilter(new ResultMatrixFilter(resultStorage)); // init available results list - StringListModel model = new StringListModel(resultStorage.getResultName()); + StringComboModel model = new StringComboModel(resultStorage.getResultName()); resultSimulationFrame.getResultsComboBox().setModel(model); resultSimulationFrame.getResultsComboBox().addItemListener(new ItemListener() { @Override @@ -207,16 +208,18 @@ String selectedMatrixName = (String)e.getItem(); MatrixND matrix = resultStorage.getMatrix(selectedMatrixName, resultSimulationFrame.topiaContext); matrixViewerPanel.setMatrix(matrix); + System.out.println("adding matrix"); } } }); - if (model.getSize() > 0) { - model.setSelectedItem(model.getElementAt(0)); - } // force summary display matrixViewerPanel.updateSelectedRenderingComponent(); resultSimulationFrame.getMatrixViewerContainer().add(matrixViewerPanel, BorderLayout.CENTER); + + if (model.getSize() > 0) { + model.setSelectedItem(model.getElementAt(0)); + } } catch (TopiaException ex) { throw new IsisFishRuntimeException("Can't open simulation", ex); } catch (StorageException ex) { Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivitySecondPassUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivitySecondPassUI.jaxx 2011-05-02 14:39:03 UTC (rev 3311) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivitySecondPassUI.jaxx 2011-05-02 15:07:45 UTC (rev 3312) @@ -34,7 +34,7 @@ fr.ifremer.isisfish.simulator.launcher.SimulationJob fr.ifremer.isisfish.simulator.launcher.SimulationServiceListener fr.ifremer.isisfish.ui.simulator.SimulAction - fr.ifremer.isisfish.ui.models.common.StringListModel + fr.ifremer.isisfish.ui.models.common.StringComboModel </import> <script><![CDATA[ @@ -67,7 +67,7 @@ /** * Model de contenu de la liste des nom de simulations */ - public StringListModel getSensitivitySimulationModel() { + public StringComboModel getSensitivitySimulationModel() { java.util.List<String> asNames = new ArrayList<String>(); for (String simulationName : SimulationStorage.getSimulationNames()) { if (simulationName.startsWith("as_")) { @@ -78,7 +78,7 @@ } } - StringListModel model = new StringListModel(asNames); + StringComboModel model = new StringComboModel(asNames); return model; } Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx 2011-05-02 14:39:03 UTC (rev 3311) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx 2011-05-02 15:07:45 UTC (rev 3312) @@ -41,7 +41,7 @@ fr.ifremer.isisfish.ui.SimulationUI; fr.ifremer.isisfish.ui.WelcomePanelUI; fr.ifremer.isisfish.ui.WelcomeTabUI; - fr.ifremer.isisfish.ui.models.common.StringListModel; + fr.ifremer.isisfish.ui.models.common.StringComboModel; fr.ifremer.isisfish.ui.models.rule.RuleComboModel; fr.ifremer.isisfish.ui.models.rule.RuleNamesListRenderer; fr.ifremer.isisfish.ui.models.rule.RuleListModel; @@ -81,7 +81,7 @@ regionStorageListener = new StorageChangeListener() { @Override public void versionDataChanged(StorageChangeEvent e) { - StringListModel model = new StringListModel(fr.ifremer.isisfish.datastore.RegionStorage.getRegionNames()); + StringComboModel model = new StringComboModel(fr.ifremer.isisfish.datastore.RegionStorage.getRegionNames()); fieldSimulParamsRegion.setModel(model); } }; @@ -387,7 +387,7 @@ </cell> <cell fill="horizontal" weightx="1.0"> <JComboBox id="fieldSimulParamsRegion" - model='{new fr.ifremer.isisfish.ui.models.common.StringListModel(fr.ifremer.isisfish.datastore.RegionStorage.getRegionNames())}' + model='{new fr.ifremer.isisfish.ui.models.common.StringComboModel(fr.ifremer.isisfish.datastore.RegionStorage.getRegionNames())}' selectedItem='{getContextValue(SimulAction.class).getSimulationParameter().getRegionName()}' onActionPerformed='regionChange()' /> </cell>

1 0

r3311 - isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input
by chatellier＠users.labs.libre-entreprise.org May 2, 2011

May 2, 2011

Author: chatellier Date: 2011-05-02 14:39:03 +0000 (Mon, 02 May 2011) New Revision: 3311 Log: Fix migration edition Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEmigrationUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationImmigrationUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationMigrationUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationUI.jaxx Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEmigrationUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEmigrationUI.jaxx 2011-05-02 14:38:48 UTC (rev 3310) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEmigrationUI.jaxx 2011-05-02 14:39:03 UTC (rev 3311) @@ -52,7 +52,7 @@ populationMigrationEmigrationTable.setMatrix(null); } if (evt.getNewValue() != null) { - + refreshPanel(); } } }); @@ -78,18 +78,7 @@ public void refreshPanel() { setFieldPopulationMigrationMigrationGroupChooserModel(); setFieldPopulationMigrationMigrationDepartureZoneChooserModel(); - remove.setEnabled(false); setAddButton(); - - /*populationMigrationEmigrationTable.addMatrixListener(new MatrixPanelListener() { - @Override - public void matrixChanged(MatrixPanelEvent arg0) { - remove.setEnabled(populationMigrationEmigrationTable.getTable().getSelectedRow() != -1); - if (popInfo != null){ - popInfo.setMigrationMatrix(populationMigrationEmigrationTable.getMatrix().clone()); - } - } - });*/ } protected void populationMigrationEmigrationMatrixChanged(MatrixPanelEvent event) { @@ -119,18 +108,15 @@ } protected void remove() { - log.debug("removeEmigration called"); - try { - int row = populationMigrationEmigrationTable.getTable().getSelectedRow(); + int row = populationMigrationEmigrationTable.getTable().getSelectedRow(); + if (row != -1) { Object group = populationMigrationEmigrationTable.getTable().getValueAt(row, 0); - Object departure = populationMigrationEmigrationTable.getTable().getValueAt(row, 1); - + Object arrival = populationMigrationEmigrationTable.getTable().getValueAt(row, 1); + MatrixND mat = popInfo.getEmigrationMatrix().clone(); - mat.setValue(group, departure, 0); + mat.setValue(group, arrival, 0); popInfo.setEmigrationMatrix(mat); - remove.setEnabled(false); - } catch(Exception eee) { - log.error("Can't remove migration", eee); + populationMigrationEmigrationTable.setMatrix(getPopInfo().getEmigrationMatrix().copy()); } } protected void groupChanged() { @@ -178,20 +164,21 @@ </row> <row columns='4'> <cell fill='horizontal' weightx='1.0'> - <JButton id="add" text="isisfish.common.add" onActionPerformed='add()' enabled='{isActive()}'/> + <JButton id="add" text="isisfish.common.add" onActionPerformed='add()' + enabled='false'/> </cell> </row> <row columns='4'> <cell fill='both' weightx='1.0' weighty='1.0'> <org.nuiton.math.matrix.gui.MatrixPanelEditor id='populationMigrationEmigrationTable' linearModel="true" enabled='{isActive()}' - onMatrixChanged="populationMigrationEmigrationMatrixChanged(event)" - onMouseReleased="remove.setEnabled(populationMigrationEmigrationTable.getTable().getSelectedRow() != -1)"/> + onMatrixChanged="populationMigrationEmigrationMatrixChanged(event)"/> </cell> </row> <row> <cell columns='4' fill='horizontal' weightx='1.0'> - <JButton id="remove" text="isisfish.common.remove" onActionPerformed='remove()' enabled='{isActive()}'/> + <JButton id="remove" text="isisfish.common.remove" + onActionPerformed='remove()' enabled='{isActive()}'/> </cell> </row> </Table> Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationImmigrationUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationImmigrationUI.jaxx 2011-05-02 14:38:48 UTC (rev 3310) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationImmigrationUI.jaxx 2011-05-02 14:39:03 UTC (rev 3311) @@ -52,7 +52,7 @@ populationMigrationImmigrationTable.setMatrix(null); } if (evt.getNewValue() != null) { - + refreshPanel(); } } }); @@ -83,8 +83,6 @@ public void refreshPanel(){ setFieldPopulationMigrationMigrationGroupChooserModel(); setFieldPopulationMigrationMigrationArrivalZoneChooserModel(); - - remove.setEnabled(false); setAddButton(); } protected void setFieldPopulationMigrationMigrationGroupChooserModel(){ @@ -97,23 +95,24 @@ jaxx.runtime.SwingUtil.fillComboBox(fieldPopulationMigrationImmigrationArrivalZoneChooser, getBean().getPopulationZone(), null, true); } } -protected void add(){ +protected void add() { getContextValue(InputAction.class).addImmigration(getPopInfo(), (PopulationGroup) fieldPopulationMigrationImmigrationGroupChooser.getSelectedItem(), (Zone) fieldPopulationMigrationImmigrationArrivalZoneChooser.getSelectedItem(), Double.parseDouble(fieldPopulationMigrationImmigrationCoefficient.getText())); populationMigrationImmigrationTable.setMatrix(getPopInfo().getImmigrationMatrix().clone()); } -protected void remove(){ +protected void remove() { int row = populationMigrationImmigrationTable.getTable().getSelectedRow(); - Object group = populationMigrationImmigrationTable.getTable().getValueAt(row, 0); - Object departure = populationMigrationImmigrationTable.getTable().getValueAt(row, 1); - Object arrival = populationMigrationImmigrationTable.getTable().getValueAt(row, 2); - - MatrixND mat = getPopInfo().getImmigrationMatrix().clone(); - mat.setValue(group, departure, arrival, 0); - getPopInfo().setImmigrationMatrix(mat); - remove.setEnabled(false); + if (row != -1) { + Object group = populationMigrationImmigrationTable.getTable().getValueAt(row, 0); + Object departure = populationMigrationImmigrationTable.getTable().getValueAt(row, 1); + + MatrixND mat = getPopInfo().getImmigrationMatrix().clone(); + mat.setValue(group, departure, 0); + getPopInfo().setImmigrationMatrix(mat); + populationMigrationImmigrationTable.setMatrix(getPopInfo().getImmigrationMatrix().copy()); + } } protected void groupChanged(){ setGPopSelected(fieldPopulationMigrationImmigrationGroupChooser.getSelectedItem() != null); @@ -161,20 +160,21 @@ </row> <row columns='4'> <cell fill='horizontal' weightx='1.0'> - <JButton id="add" text="isisfish.common.add" onActionPerformed='add()' enabled='{isActive()}'/> + <JButton id="add" text="isisfish.common.add" onActionPerformed='add()' + enabled='false'/> </cell> </row> <row columns='4'> <cell fill='both' weightx='1.0' weighty='1.0'> <org.nuiton.math.matrix.gui.MatrixPanelEditor id='populationMigrationImmigrationTable' linearModel="true" enabled='{isActive()}' - onMatrixChanged="populationMigrationImmigrationMatrixChanged(event)" - onMouseReleased="remove.setEnabled(populationMigrationImmigrationTable.getTable().getSelectedRow() != -1)"/> + onMatrixChanged="populationMigrationImmigrationMatrixChanged(event)"/> </cell> </row> <row> <cell columns='4' fill='horizontal' weightx='1.0'> - <JButton id="remove" text="isisfish.common.remove" onActionPerformed='remove()' enabled='{isActive()}'/> + <JButton id="remove" text="isisfish.common.remove" + onActionPerformed='remove()' enabled='{isActive()}'/> </cell> </row> </Table> Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationMigrationUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationMigrationUI.jaxx 2011-05-02 14:38:48 UTC (rev 3310) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationMigrationUI.jaxx 2011-05-02 14:39:03 UTC (rev 3311) @@ -72,9 +72,7 @@ //setPopInfo(null); //setPopInfo(pi); - if (getPopInfo() != null && getPopInfo().getMigrationMatrix() != null){ - populationMigrationMigrationTable.setMatrix(getPopInfo().getMigrationMatrix().copy()); - } + populationMigrationMigrationTable.setMatrix(getPopInfo().getMigrationMatrix().copy()); } /*public void refresh() { @@ -90,9 +88,6 @@ setFieldPopulationMigrationMigrationDepartureZoneChooserModel(); setFieldPopulationMigrationMigrationArrivalZoneChooserModel(); - //populationMigrationMigrationTable.addMatrixListener(listener); - - //remove.setEnabled(false); //setAddButton(); } protected void setFieldPopulationMigrationMigrationGroupChooserModel(){ @@ -118,16 +113,18 @@ Double.parseDouble(fieldPopulationMigrationMigrationCoefficient.getText())); populationMigrationMigrationTable.setMatrix(getPopInfo().getMigrationMatrix().clone()); } -protected void remove(){ +protected void remove() { int row = populationMigrationMigrationTable.getTable().getSelectedRow(); - Object group = populationMigrationMigrationTable.getTable().getValueAt(row, 0); - Object departure = populationMigrationMigrationTable.getTable().getValueAt(row, 1); - Object arrival = populationMigrationMigrationTable.getTable().getValueAt(row, 2); - - MatrixND mat = getPopInfo().getMigrationMatrix().clone(); - mat.setValue(group, departure, arrival, 0); - getPopInfo().setMigrationMatrix(mat); - remove.setEnabled(false); + if (row != -1) { + Object group = populationMigrationMigrationTable.getTable().getValueAt(row, 0); + Object departure = populationMigrationMigrationTable.getTable().getValueAt(row, 1); + Object arrival = populationMigrationMigrationTable.getTable().getValueAt(row, 2); + + MatrixND mat = getPopInfo().getMigrationMatrix().clone(); + mat.setValue(group, departure, arrival, 0); + getPopInfo().setMigrationMatrix(mat); + populationMigrationMigrationTable.setMatrix(getPopInfo().getMigrationMatrix().copy()); + } } /*protected void groupChanged(){ setGPopSelected(fieldPopulationMigrationMigrationGroupChooser.getSelectedItem() != null); @@ -197,15 +194,15 @@ </row> <row columns='4'> <cell fill='both' weightx='1.0' weighty='1.0'> - <org.nuiton.math.matrix.gui.MatrixPanelEditor id ='populationMigrationMigrationTable' + <org.nuiton.math.matrix.gui.MatrixPanelEditor id='populationMigrationMigrationTable' linearModel='{true}' enabled='{isActive()}' - onMatrixChanged="populationMigrationMigrationMatrixChanged(event)" - onMouseReleased="remove.setEnabled(isActive() && populationMigrationMigrationTable.getTable().getSelectedRow() != -1)"/> + onMatrixChanged="populationMigrationMigrationMatrixChanged(event)" /> </cell> </row> <row> <cell columns='4' fill='horizontal' weightx='1.0'> - <JButton id="remove" text="isisfish.common.remove" onActionPerformed='remove()' /> + <JButton id="remove" text="isisfish.common.remove" + onActionPerformed='remove()' enabled='{isActive()}' /> </cell> </row> </Table> Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationUI.jaxx 2011-05-02 14:38:48 UTC (rev 3310) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationUI.jaxx 2011-05-02 14:39:03 UTC (rev 3311) @@ -43,7 +43,15 @@ bean='{getBean()}' beanClass='fr.ifremer.isisfish.entities.Population' uiClass="jaxx.runtime.validator.swing.ui.ImageValidationUI"> </BeanValidator> + + <BeanValidator id='validatorSeason' context="migration" + bean='{getPopInfo()}' beanClass='fr.ifremer.isisfish.entities.PopulationSeasonInfo' + uiClass="jaxx.runtime.validator.swing.ui.ImageValidationUI"> + </BeanValidator> + <ChangeModel id="changeModel" changed="{validator.isChanged() || validatorSeason.isChanged()}" + valid="{validator.isValid() && validatorSeason.isValid()}" /> + <script><![CDATA[ protected void $afterCompleteSetup() { addPropertyChangeListener(PROPERTY_BEAN, new PropertyChangeListener() { @@ -191,13 +199,13 @@ <cell fill='horizontal' weightx='0.5'> <JButton id='save' decorator='boxed' text="isisfish.common.save" - enabled="{validator.isValid() && validator.isChanged()}" - onActionPerformed="getSaveVerifier().save();validator.setChanged(false);"/> + enabled="{changeModel.isValid() && changeModel.isChanged()}" + onActionPerformed="getSaveVerifier().save();validator.setChanged(false);validatorSeason.setChanged(false);"/> </cell> <cell fill='horizontal' weightx='0.5'> <JButton id='cancel' decorator='boxed' text="isisfish.common.cancel" - enabled="{validator.isChanged()}" + enabled="{changeModel.isChanged()}" onActionPerformed="getSaveVerifier().cancel()"/> </cell> </row>

1 0

r3310 - isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input
by chatellier＠users.labs.libre-entreprise.org May 2, 2011

May 2, 2011

Author: chatellier Date: 2011-05-02 14:38:48 +0000 (Mon, 02 May 2011) New Revision: 3310 Log: Fix ui desablisation Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesUI.jaxx Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesUI.jaxx 2011-05-02 12:59:19 UTC (rev 3309) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesUI.jaxx 2011-05-02 14:38:48 UTC (rev 3310) @@ -64,13 +64,13 @@ if (evt.getNewValue() == null) { DefaultComboBoxModel seasonModel = new DefaultComboBoxModel(); fieldMetierSeasonInfo.setModel(seasonModel); - setMetierSeasonInfo(null); - setSpecies(null); } if (evt.getNewValue() != null) { setSeasonModel(); setTargetSpeciesModel(); } + setSpecies(null); + setMetierSeasonInfo(null); } }); }

1 0