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

r3296 - in isis-fish/branches/3.3.1: . src/main/java/fr/ifremer/isisfish
by chatellier＠users.labs.libre-entreprise.org April 29, 2011

April 29, 2011

Author: chatellier Date: 2011-04-29 09:19:23 +0000 (Fri, 29 Apr 2011) New Revision: 3296 Log: Update to nuiton utils 2.2 Modified: isis-fish/branches/3.3.1/pom.xml isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/IsisConfig.java Modified: isis-fish/branches/3.3.1/pom.xml =================================================================== --- isis-fish/branches/3.3.1/pom.xml 2011-04-29 09:19:09 UTC (rev 3295) +++ isis-fish/branches/3.3.1/pom.xml 2011-04-29 09:19:23 UTC (rev 3296) @@ -496,7 +496,7 @@ <jaxxVersion>2.4.2-SNAPSHOT</jaxxVersion> <eugeneVersion>2.3.3</eugeneVersion> <topiaVersion>2.5.3</topiaVersion> - <nuitonUtilsVersion>2.1.1</nuitonUtilsVersion> + <nuitonUtilsVersion>2.2-SNAPSHOT</nuitonUtilsVersion> <nuitonI18nVersion>2.3.2</nuitonI18nVersion> <nuitonWidgetsVersion>1.1.2-SNAPSHOT</nuitonWidgetsVersion> <jrstPluginVersion>1.2</jrstPluginVersion> Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/IsisConfig.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/IsisConfig.java 2011-04-29 09:19:09 UTC (rev 3295) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/IsisConfig.java 2011-04-29 09:19:23 UTC (rev 3296) @@ -869,7 +869,7 @@ * @throws org.nuiton.util.ArgumentsParserException */ @Override - public void parse(String... args) throws ArgumentsParserException { + public ApplicationConfig parse(String... args) throws ArgumentsParserException { super.parse(args); // dans la version precedente (3.1) seul le fichier user existe, il est // donc le seul a devoir etre modifie @@ -942,6 +942,8 @@ if (log.isDebugEnabled()) { printConfig(); } + + return this; } //////////////////////////////////////////////////

1 0

r3295 - in isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input: . model
by chatellier＠users.labs.libre-entreprise.org April 29, 2011

April 29, 2011

Author: chatellier Date: 2011-04-29 09:19:09 +0000 (Fri, 29 Apr 2011) New Revision: 3295 Log: Fix port and zone edition Added: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/model/TopiaEntityListModel.java Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PortUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PortUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PortUI.jaxx 2011-04-28 08:28:23 UTC (rev 3294) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PortUI.jaxx 2011-04-29 09:19:09 UTC (rev 3295) @@ -38,6 +38,7 @@ com.bbn.openmap.event.SelectMouseMode java.beans.PropertyChangeEvent java.beans.PropertyChangeListener + java.awt.event.MouseEvent </import> <BeanValidator id='validator' @@ -65,12 +66,12 @@ for (Cell c : portMap.getSelectedCells()) { if (getBean().getCell() != null) { if (!getBean().getCell().getTopiaId().equals(c.getTopiaId())){ - getBean().setCell(c); + portCell.setSelectedValue(c); return true; } } else { - getBean().setCell(c); + portCell.setSelectedValue(c); return true; } } @@ -89,7 +90,7 @@ fieldPortComment.setText(""); } if (evt.getNewValue() != null) { - fillList(); + fillCellList(); } } }); @@ -106,7 +107,7 @@ refreshRegionInMap(portMap); }*/ -protected void fillList() { +protected void fillCellList() { if (getBean() != null) { portChanged = false; portCell.fillList(getFisheryRegion().getCell(), getBean().getCell()); @@ -143,7 +144,8 @@ <row> <cell columns='2' fill='both' weighty='0.7' weightx='1.0'> <JScrollPane id="spPortCell"> - <JAXXList id="portCell" selectedValue='{getBean().getCell()}' selectionMode="0" onMouseClicked='portChanged()' enabled='{isActive()}' decorator='boxed' /> + <JAXXList id="portCell" selectedValue='{getBean().getCell()}' selectionMode="0" + onValueChanged='portChanged()' enabled='{isActive()}' decorator='boxed' /> </JScrollPane> </cell> </row> @@ -193,7 +195,8 @@ constraints='BorderLayout.NORTH' decorator='boxed' enabled='{getBean() != null}' /> <fr.ifremer.isisfish.map.IsisMapBean id='portMap' javaBean='new fr.ifremer.isisfish.map.IsisMapBean()' constraints='BorderLayout.CENTER' selectionMode="{fr.ifremer.isisfish.map.CellSelectionLayer.SINGLE_SELECTION}" - decorator='boxed' enabled='{getBean() != null}' fisheryRegion='{getFisheryRegion()}' selectedCells='{getBean().getCell()}' /> + decorator='boxed' enabled='{getBean() != null}' fisheryRegion='{getFisheryRegion()}' + selectedCells='{getBean() == null ? null : bean.getCell()}' /> </JPanel> </JSplitPane> </JPanel> Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx 2011-04-28 08:28:23 UTC (rev 3294) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx 2011-04-29 09:19:09 UTC (rev 3295) @@ -34,13 +34,13 @@ fr.ifremer.isisfish.entities.Zone fr.ifremer.isisfish.map.CellSelectionLayer fr.ifremer.isisfish.map.CopyMapToClipboardListener + fr.ifremer.isisfish.ui.input.model.TopiaEntityListModel com.bbn.openmap.event.SelectMouseMode com.bbn.openmap.gui.Tool com.bbn.openmap.gui.OMToolSet java.beans.PropertyChangeEvent java.beans.PropertyChangeListener java.awt.event.MouseEvent - javax.swing.DefaultListModel java.util.ArrayList </import> @@ -69,10 +69,7 @@ boolean result = false; if (getBean() != null) { // impossible de desactiver la carte :( getBean().setCell(zoneMap.getSelectedCells()); - if (getBean().getCell() != null){ - zoneCells.setSelectedValues(getBean().getCell().toArray()); - result = true; - } + setZoneCells(); } return result; } @@ -83,36 +80,25 @@ if (evt.getNewValue() == null) { fieldZoneName.setText(""); fieldZoneComment.setText(""); - zoneMap.setSelectedCells((Cell)null); + zoneMap.setSelectedCells(); } if (evt.getNewValue() != null) { setZoneCells(); - zoneMap.setSelectedCells(getBean().getCell()); } } }); } -/*public void refresh() { - Zone zone = getSaveVerifier().getEntity(Zone.class); - - // add null before, for second to be considered as a changed event - // otherwize, setBean has no effect - setBean(null); - setBean(zone); - - // reload region in map - refreshRegionInMap(zoneMap); -}*/ - -protected void setZoneCells(){ - if (getBean() != null){ - DefaultListModel model = new DefaultListModel(); - for (Cell c : getFisheryRegion().getCell()) - model.addElement(c); +protected void setZoneCells() { + if (getBean() != null) { + List<Cell> cells = getFisheryRegion().getCell(); + TopiaEntityListModel model = new TopiaEntityListModel(cells); zoneCells.setModel(model); - if (getBean().getCell() != null){ - zoneCells.setSelectedValues(getBean().getCell().toArray()); + if (getBean().getCell() != null) { + for (Cell selectedCell : getBean().getCell()) { + int index = cells.indexOf(selectedCell); + zoneCells.addSelectionInterval(index, index); + } } } } @@ -129,11 +115,6 @@ getBean().setCell(cells); } } - else { - if (log.isDebugEnabled()) { - log.debug("Duplicated event skipped"); - } - } } ]]> </script> @@ -161,9 +142,8 @@ <row> <cell columns='2' fill='both' weighty='0.7' weightx='1.0'> <JScrollPane id="spZoneCells"> -  - <JAXXList id="zoneCells" enabled='{isActive()}' selectedValues='{getBean().getCell() == null ? null : getBean().getCell().toArray()}' - onValueChanged='zoneCellsChange(event)' decorator='boxed'/> + <JList id="zoneCells" enabled='{isActive()}' + onValueChanged='zoneCellsChange(event)' decorator='boxed'/> </JScrollPane> </cell> </row> @@ -219,8 +199,9 @@ <fr.ifremer.isisfish.map.IsisMapBean id='zoneMap' javaBean='new fr.ifremer.isisfish.map.IsisMapBean()' selectionMode="{fr.ifremer.isisfish.map.CellSelectionLayer.MULT_SELECTION}" - fisheryRegion='{getFisheryRegion()}' selectedCells='{getBean().getCell()}' + fisheryRegion='{getFisheryRegion()}' selectedCells='{getBean()==null?null:bean.getCell()}' decorator='boxed' constraints='BorderLayout.CENTER'/> +  </JPanel> </JSplitPane> </JPanel> Added: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/model/TopiaEntityListModel.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/model/TopiaEntityListModel.java (rev 0) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/model/TopiaEntityListModel.java 2011-04-29 09:19:09 UTC (rev 3295) @@ -0,0 +1,91 @@ +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2011 Ifremer, CodeLutin, Chatellier Eric + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * 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.input.model; + +import java.util.List; + +import javax.swing.DefaultListModel; + +import org.nuiton.topia.persistence.TopiaEntity; + +/** + * Model pour la liste des {@link TopiaEntity}. + * + * Pas de selection par defaut. + * + * @author chatellier + * @version $Revision$ + * + * Last update : $Date$ + * By : $Author$ + */ +public class TopiaEntityListModel extends DefaultListModel { + + /** serialVersionUID. */ + private static final long serialVersionUID = 6171850179969290032L; + + /** Zones list */ + protected List<? extends TopiaEntity> entities; + + /** + * Constructor with entities list. + * + * @param entities entities list + */ + public TopiaEntityListModel(List<? extends TopiaEntity> entities) { + this.entities = entities; + } + + /* + * @see javax.swing.ListModel#getElementAt(int) + */ + @Override + public Object getElementAt(int index) { + return entities.get(index); + } + + /* + * @see javax.swing.ListModel#getSize() + */ + @Override + public int getSize() { + int size = 0; + + if (entities != null) { + size = entities.size(); + } + return size; + } + + /** + * Return elements in model. + * + * @return elements in model + */ + public List<? extends TopiaEntity> getElements() { + return entities; + } +} Property changes on: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/model/TopiaEntityListModel.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL

1 0

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

April 28, 2011

Author: chatellier Date: 2011-04-28 08:28:23 +0000 (Thu, 28 Apr 2011) New Revision: 3294 Log: Remove unused imports Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/FisheryRegionUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/InputHandler.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoZoneUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/MetierUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationBasicsUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationEquationUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsBasicsUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/StrategyTabUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/WizardGroupCreationUI.jaxx Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/FisheryRegionUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/FisheryRegionUI.jaxx 2011-04-28 08:28:07 UTC (rev 3293) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/FisheryRegionUI.jaxx 2011-04-28 08:28:23 UTC (rev 3294) @@ -36,8 +36,6 @@ java.beans.PropertyChangeEvent; java.beans.PropertyChangeListener; javax.swing.DefaultListModel - javax.swing.JTabbedPane - javax.swing.JTable </import> <BeanValidator id='validator' Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.jaxx 2011-04-28 08:28:07 UTC (rev 3293) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.jaxx 2011-04-28 08:28:23 UTC (rev 3294) @@ -65,7 +65,6 @@ javax.swing.event.ChangeListener fr.ifremer.isisfish.entities.FisheryRegion fr.ifremer.isisfish.ui.sensitivity.SensitivityUtils - fr.ifremer.isisfish.ui.sensitivity.FactorWizardUI fr.ifremer.isisfish.ui.sensitivity.SensitivityTabbedPaneListener fr.ifremer.isisfish.ui.WelcomePanelUI org.nuiton.topia.persistence.TopiaEntityContextable 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-04-28 08:28:07 UTC (rev 3293) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/InputHandler.java 2011-04-28 08:28:23 UTC (rev 3294) @@ -162,7 +162,7 @@ fisheryTreeHelper.setDataProvider(dataProvider); TreeModel fisheryTreeModel = fisheryTreeHelper.createTreeModel(fisheryRegion); // fix strange region switch error - inputUI.getFisheryRegionTree().setCellRenderer(null); + //inputUI.getFisheryRegionTree().setCellRenderer(null); inputUI.getFisheryRegionTree().setModel(fisheryTreeModel); inputUI.getFisheryRegionTree().setCellRenderer(new FisheryTreeRenderer(dataProvider)); inputUI.getFisheryRegionTree().setSelectionModel(new FisheryTreeSelectionModel(inputUI)); Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoZoneUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoZoneUI.jaxx 2011-04-28 08:28:07 UTC (rev 3293) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoZoneUI.jaxx 2011-04-28 08:28:23 UTC (rev 3294) @@ -32,7 +32,6 @@ <import> fr.ifremer.isisfish.entities.Metier; fr.ifremer.isisfish.entities.MetierSeasonInfo; - fr.ifremer.isisfish.entities.Season; fr.ifremer.isisfish.entities.Zone; fr.ifremer.isisfish.types.Month; fr.ifremer.isisfish.ui.input.model.MetierSeasonInfoComboModel; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/MetierUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/MetierUI.jaxx 2011-04-28 08:28:07 UTC (rev 3293) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/MetierUI.jaxx 2011-04-28 08:28:23 UTC (rev 3294) @@ -29,8 +29,6 @@ <import> static org.nuiton.i18n.I18n._ static org.nuiton.i18n.I18n.n_ - java.beans.PropertyChangeEvent; - java.beans.PropertyChangeListener; </import> <script><![CDATA[ Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationBasicsUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationBasicsUI.jaxx 2011-04-28 08:28:07 UTC (rev 3293) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationBasicsUI.jaxx 2011-04-28 08:28:23 UTC (rev 3294) @@ -28,8 +28,6 @@ <fr.ifremer.isisfish.entities.Population id='bean' javaBean='null'/> <import> - fr.ifremer.isisfish.entities.Equation; - fr.ifremer.isisfish.entities.Formule; fr.ifremer.isisfish.entities.Species; fr.ifremer.isisfish.entities.PopulationGroup; fr.ifremer.isisfish.entities.Population; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationEquationUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationEquationUI.jaxx 2011-04-28 08:28:07 UTC (rev 3293) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationEquationUI.jaxx 2011-04-28 08:28:23 UTC (rev 3294) @@ -28,7 +28,6 @@ <fr.ifremer.isisfish.entities.Population id='bean' javaBean='null'/> <import> - fr.ifremer.isisfish.entities.Formule; fr.ifremer.isisfish.entities.Population; </import> Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationUI.jaxx 2011-04-28 08:28:07 UTC (rev 3293) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationUI.jaxx 2011-04-28 08:28:23 UTC (rev 3294) @@ -29,7 +29,6 @@ <import> static org.nuiton.i18n.I18n.n_ - fr.ifremer.isisfish.ui.sensitivity.SensitivityTabbedPaneListener; </import> <script><![CDATA[ Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsBasicsUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsBasicsUI.jaxx 2011-04-28 08:28:07 UTC (rev 3293) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsBasicsUI.jaxx 2011-04-28 08:28:23 UTC (rev 3294) @@ -29,9 +29,7 @@ <import> fr.ifremer.isisfish.entities.Port - fr.ifremer.isisfish.entities.Equation fr.ifremer.isisfish.entities.VesselType - fr.ifremer.isisfish.entities.Formule fr.ifremer.isisfish.entities.SetOfVessels fr.ifremer.isisfish.ui.input.model.PortComboModel fr.ifremer.isisfish.ui.input.model.VesselTypeComboModel Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/StrategyTabUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/StrategyTabUI.jaxx 2011-04-28 08:28:07 UTC (rev 3293) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/StrategyTabUI.jaxx 2011-04-28 08:28:23 UTC (rev 3294) @@ -28,12 +28,8 @@ <fr.ifremer.isisfish.entities.Strategy id='bean' javaBean='null'/> <import> - fr.ifremer.isisfish.entities.Equation fr.ifremer.isisfish.entities.Strategy - fr.ifremer.isisfish.entities.Formule fr.ifremer.isisfish.entities.SetOfVessels - org.nuiton.topia.persistence.TopiaEntity - fr.ifremer.isisfish.ui.WelcomePanelUI java.beans.PropertyChangeEvent java.beans.PropertyChangeListener fr.ifremer.isisfish.ui.input.model.SetOfVesselsComboModel Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/WizardGroupCreationUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/WizardGroupCreationUI.jaxx 2011-04-28 08:28:07 UTC (rev 3293) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/WizardGroupCreationUI.jaxx 2011-04-28 08:28:23 UTC (rev 3294) @@ -30,7 +30,6 @@ fr.ifremer.isisfish.entities.Population fr.ifremer.isisfish.entities.PopulationGroup fr.ifremer.isisfish.entities.PopulationGroupDAO - fr.ifremer.isisfish.entities.PopulationDAO java.awt.CardLayout javax.swing.JFrame </import>

1 0

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

April 28, 2011

Author: chatellier Date: 2011-04-28 08:28:07 +0000 (Thu, 28 Apr 2011) New Revision: 3293 Log: Remove deprecated stuff Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/CellUI.jaxx Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/CellUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/CellUI.jaxx 2011-04-26 15:52:55 UTC (rev 3292) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/CellUI.jaxx 2011-04-28 08:28:07 UTC (rev 3293) @@ -67,7 +67,7 @@ if (getBean() != null) { // impossible de desactiver la carte :( for (Cell c : cellMap.getSelectedCells()) { if (!c.getTopiaId().equals(getBean().getTopiaId())) { - jaxx.runtime.SwingUtil.fillComboBox(fieldCell,getFisheryRegion().getCell(), c); + fieldCell.setSelectedItem(c); result = true; } }

1 0

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

April 26, 2011

Author: chatellier Date: 2011-04-26 15:52:55 +0000 (Tue, 26 Apr 2011) New Revision: 3292 Log: Add some validation check when creating need factors Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/DefaultContinuousPanelUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/MatrixContinuousPanelUI.jaxx Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/DefaultContinuousPanelUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/DefaultContinuousPanelUI.jaxx 2011-04-26 15:52:05 UTC (rev 3291) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/DefaultContinuousPanelUI.jaxx 2011-04-26 15:52:55 UTC (rev 3292) @@ -49,7 +49,36 @@ @Override public boolean isFactorValid() { - return true; + boolean valid = false; + + try { + if (continueSelected) { + if (percentageTypeFactor) { + Double coefficient = Double.parseDouble(coefficientField.getText().trim()); + Double referenceValue = Double.parseDouble(referenceValueField.getText().trim()); + String operator = (String)operatorField.getSelectedItem(); + valid = coefficient != null && + referenceValue != null && + operator != null; + } + else { + Double minValue = Double.parseDouble(continueMin.getText().trim()); + Double maxValue = Double.parseDouble(continueMax.getText().trim()); + valid = minValue != null && + maxValue != null; + } + } + else { + valid = true; + } + } + catch (NumberFormatException eee) { + if (log.isWarnEnabled()) { + log.warn("Double parse error", eee); + } + } + + return valid; } ]]></script> <JPanel id="content"> Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/MatrixContinuousPanelUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/MatrixContinuousPanelUI.jaxx 2011-04-26 15:52:05 UTC (rev 3291) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/MatrixContinuousPanelUI.jaxx 2011-04-26 15:52:55 UTC (rev 3292) @@ -29,7 +29,14 @@ <script><![CDATA[ @Override public boolean isFactorValid() { - return true; + boolean valid = false; + + Double coefficient = Double.parseDouble(coef.getText().trim()); + String selectedOperator = (String)operator.getSelectedItem(); + valid = coefficient != null && + selectedOperator != null; + + return valid; } ]]></script> <JPanel id='content'>

1 0

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

April 26, 2011

Author: chatellier Date: 2011-04-26 15:52:05 +0000 (Tue, 26 Apr 2011) New Revision: 3291 Log: Fix region switch Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityInputHandler.java Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityInputHandler.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityInputHandler.java 2011-04-26 15:51:37 UTC (rev 3290) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityInputHandler.java 2011-04-26 15:52:05 UTC (rev 3291) @@ -114,6 +114,8 @@ FisheryDataProvider dataProvider = new FisheryDataProvider(fisheryRegion); treeHelper.setDataProvider(dataProvider); TreeModel model = treeHelper.createTreeModel(fisheryRegion); + // fix strange region switch error + sensitivityTabUI.getFisheryRegionTree().setCellRenderer(null); sensitivityTabUI.getFisheryRegionTree().setModel(model); sensitivityTabUI.getFisheryRegionTree().setCellRenderer(new FisheryTreeRenderer(dataProvider)); treeHelper.setUI(sensitivityTabUI.getFisheryRegionTree(), true, false, null);

1 0

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

April 26, 2011

Author: chatellier Date: 2011-04-26 15:51:37 +0000 (Tue, 26 Apr 2011) New Revision: 3290 Log: Remove ask to save unsave when saving fishery -_- Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/FisheryRegionUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/InputSaveVerifier.java Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/FisheryRegionUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/FisheryRegionUI.jaxx 2011-04-26 15:51:04 UTC (rev 3289) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/FisheryRegionUI.jaxx 2011-04-26 15:51:37 UTC (rev 3290) @@ -126,6 +126,12 @@ protected void save() { setInfoText(_("isisfish.message.checking.cell")); + + // this make save done by verifier instead of saveFisheryRegion + // and refresh tree is not working + getSaveVerifier().reset(); + + // save generating cells getInputAction().saveFisheryRegion(getBean()); // reload tree @@ -133,7 +139,6 @@ inputUI.getHandler().reloadFisheryTree(inputUI); setInfoText(_("isisfish.message.save.finished")); - refresh(); } ]]></script> <JPanel id="body"> Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/InputSaveVerifier.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/InputSaveVerifier.java 2011-04-26 15:51:04 UTC (rev 3289) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/InputSaveVerifier.java 2011-04-26 15:51:37 UTC (rev 3290) @@ -382,6 +382,7 @@ */ public void reset() { currentEntities.clear(); + noModif(); } /*public void removeAllEntity() {

1 0

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

April 26, 2011

Author: chatellier Date: 2011-04-26 15:51:04 +0000 (Tue, 26 Apr 2011) New Revision: 3289 Log: Fix delete and create region Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/InputHandler.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/InputHandler.java 2011-04-26 12:34:57 UTC (rev 3288) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/InputHandler.java 2011-04-26 15:51:04 UTC (rev 3289) @@ -130,52 +130,55 @@ if (log.isDebugEnabled()) { log.debug("Load region " + name); } - - FisheryRegion fisheryRegion = null; - RegionStorage regionStorage = null; - TopiaContext topiaContext = null; - // load region - try { - regionStorage = RegionStorage.getRegion(name); - topiaContext = regionStorage.getStorage().beginTransaction(); - fisheryRegion = RegionStorage.getFisheryRegion(topiaContext); - } catch (TopiaException ex) { - throw new IsisFishRuntimeException("Can't load region", ex); - } catch (StorageException ex) { - throw new IsisFishRuntimeException("Can't load region", ex); - } - - // TODO echatellier 20110323 voir pour remplacer le binding - inputUI.setRegionLoaded(fisheryRegion != null); - - if (fisheryRegion == null) { + if (name == null) { // show empty region ui - inputUI.getCardlayoutPrincipal().show(inputUI.getInputPanePrincipal(),"none"); + inputUI.getCardlayoutPrincipal().show(inputUI.getInputPanePrincipal(), "none"); TreeModel model = new DefaultTreeModel(null); inputUI.getFisheryRegionTree().setModel(model); } else { + FisheryRegion fisheryRegion = null; + RegionStorage regionStorage = null; + TopiaContext topiaContext = null; + + // load region + try { + regionStorage = RegionStorage.getRegion(name); + topiaContext = regionStorage.getStorage().beginTransaction(); + fisheryRegion = RegionStorage.getFisheryRegion(topiaContext); + } catch (TopiaException ex) { + throw new IsisFishRuntimeException("Can't load region", ex); + } catch (StorageException ex) { + throw new IsisFishRuntimeException("Can't load region", ex); + } + + // TODO echatellier 20110323 voir pour remplacer le binding + inputUI.setRegionLoaded(fisheryRegion != null); + // init tree model loader with fishery region - FisheryTreeHelper treeHelper = new FisheryTreeHelper(); + FisheryTreeHelper fisheryTreeHelper = new FisheryTreeHelper(); FisheryDataProvider dataProvider = new FisheryDataProvider(fisheryRegion); - treeHelper.setDataProvider(dataProvider); - TreeModel model = treeHelper.createTreeModel(fisheryRegion); + fisheryTreeHelper.setDataProvider(dataProvider); + TreeModel fisheryTreeModel = fisheryTreeHelper.createTreeModel(fisheryRegion); // fix strange region switch error inputUI.getFisheryRegionTree().setCellRenderer(null); - inputUI.getFisheryRegionTree().setModel(model); + inputUI.getFisheryRegionTree().setModel(fisheryTreeModel); inputUI.getFisheryRegionTree().setCellRenderer(new FisheryTreeRenderer(dataProvider)); inputUI.getFisheryRegionTree().setSelectionModel(new FisheryTreeSelectionModel(inputUI)); - treeHelper.setUI(inputUI.getFisheryRegionTree(), true, false, null); + fisheryTreeHelper.setUI(inputUI.getFisheryRegionTree(), true, false, null); // global context value : fisheryRegion, regionStorage, treeHelper inputUI.setContextValue(fisheryRegion); inputUI.setContextValue(regionStorage); - inputUI.setContextValue(treeHelper); - inputUI.setContextValue(model); + inputUI.setContextValue(fisheryTreeHelper); + inputUI.setContextValue(fisheryTreeModel); inputUI.setContextValue(topiaContext); inputUI.getCardlayoutPrincipal().show(inputUI.getInputPanePrincipal(),"normale"); + + // autoselect roto node (fire some event) + fisheryTreeHelper.selectNode((FisheryTreeNode)fisheryTreeModel.getRoot()); } } @@ -209,9 +212,7 @@ SwingUtilities.invokeLater(new Runnable() { public void run() { loadRegion(inputUI, name); - // FIXME getVerifier().setIsisContext(getContextValue(TopiaContext.class)); setStatusMessage(inputUI, _("isisfish.message.load.finished")); - // FIXME setTreeModel(); } }); } @@ -236,18 +237,32 @@ throw new IsisFishRuntimeException("Can't create region", ex); } inputUI.getFieldNewRegion().setText(""); - - // refresh region list - StringListModel regionsModel = new StringListModel(RegionStorage.getRegionNames()); - inputUI.getFieldCurrentRegion().setModel(regionsModel); - // event is fired by setSelectedItem to call #regionChange - inputUI.getFieldCurrentRegion().setSelectedItem(name); + refreshRegionList(inputUI, name); } setStatusMessage(inputUI, _("isisfish.message.creation.finished")); } - + /** + * Rafraichit la liste des regions. + * + * @param inputUI inputUI + * @param selectedItem region to select + */ + protected void refreshRegionList(InputUI inputUI, String selectedItem) { + // refresh region list + StringListModel regionsModel = new StringListModel(RegionStorage.getRegionNames()); + inputUI.getFieldCurrentRegion().setModel(regionsModel); + // event is fired by setSelectedItem to call #regionChange + if (selectedItem != null) { + inputUI.getFieldCurrentRegion().setSelectedItem(selectedItem); + } + else { + loadRegion(inputUI, null); + } + } + + /** * Exporter la region dans un zip. * * @param inputUI inputUI @@ -402,6 +417,7 @@ _("isisfish.message.confirm.remove.region", regionStorage.getName())); if (resp == JOptionPane.YES_OPTION) { regionStorage.delete(vcsDelete); + refreshRegionList(inputUI, null); } } catch (StorageException eee) { throw new IsisFishRuntimeException("Can't delete region", eee);

1 0

r3288 - in isis-fish/branches/3.3.1/src: main/java/fr/ifremer/isisfish/mexico/xml test/java/fr/ifremer/isisfish/mexico test/resources/mexico
by chatellier＠users.labs.libre-entreprise.org April 26, 2011

April 26, 2011

Author: chatellier Date: 2011-04-26 12:34:57 +0000 (Tue, 26 Apr 2011) New Revision: 3288 Log: Rechargement des facteurs (pourcentage/min-max) + test unitaire Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/xml/ContinuousDomainXMLVisitor.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/xml/DomXMLParser.java isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/mexico/MexicoHelperTest.java isis-fish/branches/3.3.1/src/test/resources/mexico/mexicohelper_designplan.xml isis-fish/branches/3.3.1/src/test/resources/mexico/mexicohelper_factorgroupdp.xml Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/xml/ContinuousDomainXMLVisitor.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/xml/ContinuousDomainXMLVisitor.java 2011-04-26 12:34:21 UTC (rev 3287) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/xml/ContinuousDomainXMLVisitor.java 2011-04-26 12:34:57 UTC (rev 3288) @@ -50,7 +50,16 @@ ContinuousDomain cDomain = (ContinuousDomain)domain; xmlBuffer.append(" cardinality=\"" + cDomain.getCardinality() + "\">"); - xmlBuffer.append("<range min=\"" + cDomain.getMinBound() + "\" max=\"" + cDomain.getMaxBound() + "\" />"); + // facteur continue pourcentage + if (cDomain.getOperator() != null) { + xmlBuffer.append("<percentage coefficient=\"" + cDomain.getCoefficient() + "\""); + xmlBuffer.append(" operator=\"" + cDomain.getOperator() + "\""); + xmlBuffer.append(" reference=\"" + cDomain.getReferenceValue() + "\" />"); + } + else { + // facteur continue min/max + xmlBuffer.append("<range min=\"" + cDomain.getMinBound() + "\" max=\"" + cDomain.getMaxBound() + "\" />"); + } } /** Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/xml/DomXMLParser.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/xml/DomXMLParser.java 2011-04-26 12:34:21 UTC (rev 3287) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/xml/DomXMLParser.java 2011-04-26 12:34:57 UTC (rev 3288) @@ -147,14 +147,22 @@ else { // continous domain domain = new ContinuousDomain(); + + Element percentageElement = fixedElement.element("percentage"); + if (percentageElement != null) { + domain.setCoefficient(Double.valueOf(percentageElement.attributeValue("coefficient"))); + domain.setOperator(percentageElement.attributeValue("operator")); + domain.setReferenceValue(Double.valueOf(percentageElement.attributeValue("reference"))); + } + else { + // <range max="1.0" min="0.0"/> + Element rangeElement = fixedElement.element("range"); + domain.setMinBound(Double.valueOf(rangeElement.attributeValue("min"))); + domain.setMaxBound(Double.valueOf(rangeElement.attributeValue("max"))); + } } - + domain.setCardinality(Integer.valueOf(fixedElement.attributeValue("cardinality"))); - - // <range max="1.0" min="0.0"/> - Element rangeElement = fixedElement.element("range"); - domain.setMinBound(Double.valueOf(rangeElement.attributeValue("min"))); - domain.setMaxBound(Double.valueOf(rangeElement.attributeValue("max"))); factor.setDomain(domain); } else if ("discrete".equals(property)) { @@ -210,15 +218,24 @@ else { // continous domain domain = new ContinuousDomain(); + + Element percentageElement = fixedElement.element("percentage"); + if (percentageElement != null) { + domain.setCoefficient(Double.valueOf(percentageElement.attributeValue("coefficient"))); + domain.setOperator(percentageElement.attributeValue("operator")); + domain.setReferenceValue(Double.valueOf(percentageElement.attributeValue("reference"))); + } + else { + // <range max="1" min="3"/> + Element rangeElement = fixedElement.element("range"); + domain.setMinBound(Integer.valueOf(rangeElement.attributeValue("min"))); + domain.setMaxBound(Integer.valueOf(rangeElement.attributeValue("max"))); + } + } domain.setCardinality(Integer.valueOf(fixedElement.attributeValue("cardinality"))); - // <range max="1" min="3"/> - Element rangeElement = fixedElement.element("range"); - domain.setMinBound(Integer.valueOf(rangeElement.attributeValue("min"))); - domain.setMaxBound(Integer.valueOf(rangeElement.attributeValue("max"))); - factor.setDomain(domain); } else if ("discrete".equals(property)) { DiscreteDomain domain = new DiscreteDomain(); Modified: isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/mexico/MexicoHelperTest.java =================================================================== --- isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/mexico/MexicoHelperTest.java 2011-04-26 12:34:21 UTC (rev 3287) +++ isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/mexico/MexicoHelperTest.java 2011-04-26 12:34:57 UTC (rev 3288) @@ -28,6 +28,7 @@ import java.io.File; import java.io.IOException; import java.util.Arrays; +import java.util.List; import java.util.Properties; import java.util.SortedMap; import java.util.TreeMap; @@ -158,18 +159,30 @@ domain5.setOperator("-"); factorEquationContinuous.setDomain(domain5); factorEquationContinuous.setPath("fr.ifremer.isisfish.entities.PopulationGroup#1156461521076#0.6526656643346673#maxLength"); - - // factor 6 : rule factor - Factor factorRuleDiscrete = new Factor("factor 6 (RuleDiscrete)"); - RuleDomain domain6 = new RuleDomain(); - SortedMap<Object, Object> rules = new TreeMap<Object, Object>(); - rules.put("ruleset1", Arrays.asList(ruleTacPoids, ruleTailleMin)); - rules.put("ruleset2", Arrays.asList(ruleTailleMin)); - domain6.setValues(rules); - factorRuleDiscrete.setDomain(domain6); - + + // factor 1 + Factor factorContinuousPercentage = new Factor("factor 6 (double continuous percentage)"); + ContinuousDomain domain6 = new ContinuousDomain(); + domain6.setCoefficient(5.0); + domain6.setReferenceValue(14.0); + domain6.setOperator("*"); + domain6.setCardinality(5); + factorContinuousPercentage.setDomain(domain6); + factorContinuousPercentage.setPath("fr.ifremer.isisfish.entities.PopulationGroup#1142003453434#0.223499349929004#size"); + // 3.4.0.0 if (useGroupAndRule) { + + // factor 7 : rule factor + Factor factorRuleDiscrete = new Factor("factor 7 (RuleDiscrete)"); + RuleDomain domain7 = new RuleDomain(); + SortedMap<Object, Object> rules = new TreeMap<Object, Object>(); + rules.put("ruleset1", Arrays.asList(ruleTacPoids, ruleTailleMin)); + rules.put("ruleset2", Arrays.asList(ruleTailleMin)); + domain7.setValues(rules); + factorRuleDiscrete.setDomain(domain7); + factorRuleDiscrete.setPath("parameters.rules"); + FactorGroup group1 = new FactorGroup("discretegrp"); group1.addFactor(factorDiscrete); group1.addFactor(factorRuleDiscrete); @@ -189,6 +202,7 @@ designPlan.addFactor(factorContinuous2); designPlan.addFactor(factorMatrixContinuous); designPlan.addFactor(factorEquationContinuous); + designPlan.addFactor(factorContinuousPercentage); } return designPlan; @@ -242,13 +256,20 @@ File testFile = new File("src/test/resources/mexico/mexicohelper_designplan.xml"); // topia context can be null in tests DesignPlan plan = MexicoHelper.getDesignPlanFromXML(testFile, null); + List<Factor> factors = plan.getFactors(); - Assert.assertEquals(5, plan.getFactors().size()); + Assert.assertEquals(6, factors.size()); String xml = MexicoHelper.getDesignPlanAsXML(plan); if (log.isDebugEnabled()) { log.debug("testGetDesignPlanFromXML xml = " + xml); } + + // assert on continuous factor (percentage, non percentage) (3.4.0.0) + ContinuousDomain domain1 = (ContinuousDomain)factors.get(0).getDomain(); + Assert.assertNull(domain1.getOperator()); + ContinuousDomain domain6 = (ContinuousDomain)factors.get(5).getDomain(); + Assert.assertNotNull(domain6.getOperator()); } /** Modified: isis-fish/branches/3.3.1/src/test/resources/mexico/mexicohelper_designplan.xml =================================================================== --- isis-fish/branches/3.3.1/src/test/resources/mexico/mexicohelper_designplan.xml 2011-04-26 12:34:21 UTC (rev 3287) +++ isis-fish/branches/3.3.1/src/test/resources/mexico/mexicohelper_designplan.xml 2011-04-26 12:34:57 UTC (rev 3288) @@ -97,5 +97,13 @@ </fixed> </domain> </factor> + <factor name="factor 6 (double continuous percentage)" property="continuous" type="real"> + <target>fr.ifremer.isisfish.entities.PopulationGroup#1142003453434#0.223499349929004#size</target> + <domain> + <fixed cardinality="5"> + <percentage operator="*" coefficient="5" reference="14"/> + </fixed> + </domain> + </factor> </factors> </experimentalDesign> \ No newline at end of file Modified: isis-fish/branches/3.3.1/src/test/resources/mexico/mexicohelper_factorgroupdp.xml =================================================================== --- isis-fish/branches/3.3.1/src/test/resources/mexico/mexicohelper_factorgroupdp.xml 2011-04-26 12:34:21 UTC (rev 3287) +++ isis-fish/branches/3.3.1/src/test/resources/mexico/mexicohelper_factorgroupdp.xml 2011-04-26 12:34:57 UTC (rev 3288) @@ -87,8 +87,8 @@ </fixed> </domain> </factor> - <factor name="factor 6 (RuleDiscrete)" property="discrete" type="rule"> - <target>null</target> + <factor name="factor 7 (RuleDiscrete)" property="discrete" type="rule"> + <target>parameters.rules</target> <domain> <fixed cardinality="2"> <enumeration>

1 0

r3287 - isis-fish/branches/3.3.1/src/main/resources/i18n
by chatellier＠users.labs.libre-entreprise.org April 26, 2011

April 26, 2011

Author: chatellier Date: 2011-04-26 12:34:21 +0000 (Tue, 26 Apr 2011) New Revision: 3287 Log: Fix i18n Modified: isis-fish/branches/3.3.1/src/main/resources/i18n/isis-fish_en_GB.properties isis-fish/branches/3.3.1/src/main/resources/i18n/isis-fish_fr_FR.properties Modified: isis-fish/branches/3.3.1/src/main/resources/i18n/isis-fish_en_GB.properties =================================================================== --- isis-fish/branches/3.3.1/src/main/resources/i18n/isis-fish_en_GB.properties 2011-04-26 09:42:02 UTC (rev 3286) +++ isis-fish/branches/3.3.1/src/main/resources/i18n/isis-fish_en_GB.properties 2011-04-26 12:34:21 UTC (rev 3287) @@ -916,7 +916,7 @@ isisfish.sensitivity.equation.variable.value=Value isisfish.sensitivity.export=Export isisfish.sensitivity.factor=Factor -isisfish.sensitivity.factor.notvalid=Factor not valid ! +isisfish.sensitivity.factor.notvalid=Factor not valid \! isisfish.sensitivity.factors=Factors isisfish.sensitivity.firstValue=First value isisfish.sensitivity.increment=Cardinality Modified: isis-fish/branches/3.3.1/src/main/resources/i18n/isis-fish_fr_FR.properties =================================================================== --- isis-fish/branches/3.3.1/src/main/resources/i18n/isis-fish_fr_FR.properties 2011-04-26 09:42:02 UTC (rev 3286) +++ isis-fish/branches/3.3.1/src/main/resources/i18n/isis-fish_fr_FR.properties 2011-04-26 12:34:21 UTC (rev 3287) @@ -916,7 +916,7 @@ isisfish.sensitivity.equation.variable.value=Valeur isisfish.sensitivity.export=Export isisfish.sensitivity.factor=Facteur -isisfish.sensitivity.factor.notvalid=Facteur non valide ! +isisfish.sensitivity.factor.notvalid=Facteur non valide \! isisfish.sensitivity.factors=Facteurs isisfish.sensitivity.firstValue=Premi\u00E8re valeur isisfish.sensitivity.increment=Cardinalit\u00E9

1 0