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

r3266 - isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input
by chatellier＠users.labs.libre-entreprise.org 18 Apr '11

18 Apr '11

Author: chatellier Date: 2011-04-18 15:46:47 +0000 (Mon, 18 Apr 2011) New Revision: 3266 Log: Correction creation de nouvelles entit?\195?\169s Modified: 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/InputSaveVerifier.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/InputSaveVerifier.java 2011-04-18 15:46:07 UTC (rev 3265) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/InputSaveVerifier.java 2011-04-18 15:46:47 UTC (rev 3266) @@ -211,7 +211,7 @@ topiaContext.commitTransaction(); InputUI inputUI = inputContentUI.getContextValue(InputUI.class, JAXXUtil.PARENT); - inputUI.getHandler().insertTreeNode(inputUI, type, topiaEntity.getTopiaId()); + inputUI.getHandler().insertTreeNode(inputUI, type, topiaEntity); //rootUI.setStatusMessage(_("isisfish.message.creation.finished")); } catch (Exception eee) {

1 0

r3265 - isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input
by chatellier＠users.labs.libre-entreprise.org 18 Apr '11

18 Apr '11

Author: chatellier Date: 2011-04-18 15:46:07 +0000 (Mon, 18 Apr 2011) New Revision: 3265 Log: Correction creation de nouvelles entit?\195?\169s 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-18 15:44:40 UTC (rev 3264) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/InputHandler.java 2011-04-18 15:46:07 UTC (rev 3265) @@ -82,6 +82,8 @@ import fr.ifremer.isisfish.ui.input.tree.FisheryTreeNode; import fr.ifremer.isisfish.ui.input.tree.FisheryTreeRenderer; import fr.ifremer.isisfish.ui.input.tree.FisheryTreeSelectionModel; +import fr.ifremer.isisfish.ui.input.tree.loadors.FisheryTreeNodeLoador; +import fr.ifremer.isisfish.ui.models.common.StringListModel; import fr.ifremer.isisfish.ui.sensitivity.FactorWizardUI; import fr.ifremer.isisfish.ui.sensitivity.SensitivityInputHandler; import fr.ifremer.isisfish.ui.simulator.filter.SimulationFilterUtil; @@ -232,6 +234,10 @@ 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); } @@ -513,12 +519,12 @@ } InputContentUI inputContentUI = getUIInstanceForBeanClass(internalClass, inputUI); + inputContentUI.getSaveVerifier().setInputContentUI(inputContentUI); // mandatory set //inputContentUI.getSaveVerifier().reset(); // before set bean !!! if (topiaEntity != null) { inputContentUI.getSaveVerifier().addCurrentEntity(topiaEntity); - inputContentUI.getSaveVerifier().setInputContentUI(inputContentUI); } inputContentUI.setBean((TopiaEntityContextable)topiaEntity); @@ -651,12 +657,12 @@ * * @param inputUI ui containing tree * @param nodeClass node type to create - * @param topiaId node id to insert + * @param topiaEntity node to insert */ - public void insertTreeNode(InputUI inputUI, Class<?> nodeClass, String topiaId) { + public void insertTreeNode(InputUI inputUI, Class nodeClass, TopiaEntityContextable topiaEntity) { FisheryTreeHelper fisheryTreeHelper = inputUI.getContextValue(FisheryTreeHelper.class); - // on par du principe que pour ne pas compliquer les ui est les lier + // on part du principe que pour ne pas compliquer les ui est les lier // à l'arbre, on ajoute un nouveau noeud en fils de celui selectionné // (ou son parent si la creation à lieu à partir d'un noeud bean) FisheryTreeNode selectedNode = fisheryTreeHelper.getSelectedNode(); @@ -664,7 +670,9 @@ selectedNode = selectedNode.getParent(); } - FisheryTreeNode newNode = new FisheryTreeNode(nodeClass, topiaId, null, null); + FisheryTreeNodeLoador typeNodeLoador = fisheryTreeHelper.getLoadorFor(nodeClass); + // must use loador to properly load species node + FisheryTreeNode newNode = (FisheryTreeNode)typeNodeLoador.createNode(topiaEntity, null); fisheryTreeHelper.insertNode(selectedNode, newNode); fisheryTreeHelper.selectNode(newNode); }

1 0

r3264 - in isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/tree: . loadors
by chatellier＠users.labs.libre-entreprise.org 18 Apr '11

18 Apr '11

Author: chatellier Date: 2011-04-18 15:44:40 +0000 (Mon, 18 Apr 2011) New Revision: 3264 Log: Correction de la creation du noeud "Espece" auquel il manquait les sous noeuds. Added: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/FisheryTreeNodeLoador.java Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/FisheryTreeHelper.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/CellsNodeLoador.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/GearsNodeLoador.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/MetiersNodeLoador.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/PopulationsNodeLoador.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/PortsNodeLoador.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/SetOfVesselsNodeLoador.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/SpeciesNodeLoador.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/StrategiesNodeLoador.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/TripTypesNodeLoador.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/VesselTypesNodeLoador.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/ZonesNodeLoador.java Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/FisheryTreeHelper.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/FisheryTreeHelper.java 2011-04-18 15:44:03 UTC (rev 3263) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/FisheryTreeHelper.java 2011-04-18 15:44:40 UTC (rev 3264) @@ -24,9 +24,15 @@ import static org.nuiton.i18n.I18n.n_; +import java.util.HashMap; +import java.util.Map; + import javax.swing.tree.TreeModel; import jaxx.runtime.swing.nav.tree.NavTreeHelper; + +import org.nuiton.topia.persistence.TopiaEntity; + import fr.ifremer.isisfish.entities.Cell; import fr.ifremer.isisfish.entities.FisheryRegion; import fr.ifremer.isisfish.entities.Gear; @@ -39,6 +45,7 @@ import fr.ifremer.isisfish.entities.VesselType; import fr.ifremer.isisfish.entities.Zone; import fr.ifremer.isisfish.ui.input.tree.loadors.CellsNodeLoador; +import fr.ifremer.isisfish.ui.input.tree.loadors.FisheryTreeNodeLoador; import fr.ifremer.isisfish.ui.input.tree.loadors.GearsNodeLoador; import fr.ifremer.isisfish.ui.input.tree.loadors.MetiersNodeLoador; import fr.ifremer.isisfish.ui.input.tree.loadors.PortsNodeLoador; @@ -57,6 +64,12 @@ */ public class FisheryTreeHelper extends NavTreeHelper<FisheryTreeNode> { + public Map<Class, FisheryTreeNodeLoador<? extends TopiaEntity>> loadorCache = new HashMap<Class, FisheryTreeNodeLoador<? extends TopiaEntity>>(); + + public <T extends TopiaEntity> FisheryTreeNodeLoador<? extends TopiaEntity> getLoadorFor(Class<T> type) { + return loadorCache.get(type); + } + public TreeModel createTreeModel(FisheryRegion fisheryRegion) { FisheryDataProvider provider = new FisheryDataProvider(fisheryRegion); @@ -66,27 +79,68 @@ FisheryTreeNode root = new FisheryTreeNode(FisheryRegion.class, fisheryRegion.getTopiaId(), null, null); + // declare loador + loadorCache.put(Cell.class, new CellsNodeLoador()); + loadorCache.put(Zone.class, new ZonesNodeLoador()); + loadorCache.put(Port.class, new PortsNodeLoador()); + loadorCache.put(Species.class, new SpeciesNodeLoador()); + loadorCache.put(Gear.class, new GearsNodeLoador()); + loadorCache.put(Metier.class, new MetiersNodeLoador()); + loadorCache.put(TripType.class, new TripTypesNodeLoador()); + loadorCache.put(VesselType.class, new VesselTypesNodeLoador()); + loadorCache.put(SetOfVessels.class, new SetOfVesselsNodeLoador()); + loadorCache.put(Strategy.class, new StrategiesNodeLoador()); + // first level nodes + CellsNodeLoador cellsNodeLoador = new CellsNodeLoador(); FisheryTreeNode cellsChild = new FisheryTreeNode(Cell.class, - n_("isisfish.input.tree.cells"), null, new CellsNodeLoador()); + n_("isisfish.input.tree.cells"), null, cellsNodeLoador); + loadorCache.put(Cell.class, cellsNodeLoador); + + ZonesNodeLoador zonesNodeLoador = new ZonesNodeLoador(); FisheryTreeNode zonesChild = new FisheryTreeNode(Zone.class, - n_("isisfish.input.tree.zones"), null, new ZonesNodeLoador()); + n_("isisfish.input.tree.zones"), null, zonesNodeLoador); + loadorCache.put(Zone.class, zonesNodeLoador); + + PortsNodeLoador portsNodeLoador = new PortsNodeLoador(); FisheryTreeNode portsChild = new FisheryTreeNode(Port.class, - n_("isisfish.input.tree.ports"), null, new PortsNodeLoador()); + n_("isisfish.input.tree.ports"), null, portsNodeLoador); + loadorCache.put(Port.class, portsNodeLoador); + + SpeciesNodeLoador speciesNodeLoador = new SpeciesNodeLoador(); FisheryTreeNode speciesChild = new FisheryTreeNode(Species.class, - n_("isisfish.input.tree.species"), null, new SpeciesNodeLoador()); + n_("isisfish.input.tree.species"), null, speciesNodeLoador); + loadorCache.put(Species.class, speciesNodeLoador); + + GearsNodeLoador gearsNodeLoador = new GearsNodeLoador(); FisheryTreeNode gearsChild = new FisheryTreeNode(Gear.class, - n_("isisfish.input.tree.gears"), null, new GearsNodeLoador()); + n_("isisfish.input.tree.gears"), null, gearsNodeLoador); + loadorCache.put(Gear.class, gearsNodeLoador); + + MetiersNodeLoador metiersNodeLoador = new MetiersNodeLoador(); FisheryTreeNode metiersChild = new FisheryTreeNode(Metier.class, - n_("isisfish.input.tree.metiers"), null, new MetiersNodeLoador()); + n_("isisfish.input.tree.metiers"), null, metiersNodeLoador); + loadorCache.put(Metier.class, metiersNodeLoador); + + TripTypesNodeLoador tripTypesNodeLoador = new TripTypesNodeLoador(); FisheryTreeNode tripTypesChild = new FisheryTreeNode(TripType.class, - n_("isisfish.input.tree.triptypes"), null, new TripTypesNodeLoador()); + n_("isisfish.input.tree.triptypes"), null, tripTypesNodeLoador); + loadorCache.put(TripType.class, tripTypesNodeLoador); + + VesselTypesNodeLoador vesselTypesNodeLoador = new VesselTypesNodeLoador(); FisheryTreeNode vesselTypesChild = new FisheryTreeNode(VesselType.class, - n_("isisfish.input.tree.vesseltypes"), null, new VesselTypesNodeLoador()); + n_("isisfish.input.tree.vesseltypes"), null, vesselTypesNodeLoador); + loadorCache.put(VesselType.class, vesselTypesNodeLoador); + + SetOfVesselsNodeLoador setOfVesselsNodeLoador = new SetOfVesselsNodeLoador(); FisheryTreeNode setOfVesselsChild = new FisheryTreeNode(SetOfVessels.class, - n_("isisfish.input.tree.setofvessels"), null, new SetOfVesselsNodeLoador()); + n_("isisfish.input.tree.setofvessels"), null, setOfVesselsNodeLoador); + loadorCache.put(SetOfVessels.class, setOfVesselsNodeLoador); + + StrategiesNodeLoador strategiesNodeLoador = new StrategiesNodeLoador(); FisheryTreeNode strategiesChild = new FisheryTreeNode(Strategy.class, - n_("isisfish.input.tree.strategies"), null, new StrategiesNodeLoador()); + n_("isisfish.input.tree.strategies"), null, strategiesNodeLoador); + loadorCache.put(Strategy.class, strategiesNodeLoador); root.add(cellsChild); root.add(zonesChild); Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/CellsNodeLoador.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/CellsNodeLoador.java 2011-04-18 15:44:03 UTC (rev 3263) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/CellsNodeLoador.java 2011-04-18 15:44:40 UTC (rev 3264) @@ -25,7 +25,6 @@ import java.util.List; import jaxx.runtime.swing.nav.NavDataProvider; -import jaxx.runtime.swing.nav.tree.NavTreeNodeChildLoador; import fr.ifremer.isisfish.entities.Cell; import fr.ifremer.isisfish.entities.FisheryRegion; import fr.ifremer.isisfish.ui.input.tree.FisheryDataProvider; @@ -37,7 +36,7 @@ * @author chatellier * @since 3.4.0.0 */ -public class CellsNodeLoador extends NavTreeNodeChildLoador<Cell, Cell, FisheryTreeNode> { +public class CellsNodeLoador extends FisheryTreeNodeLoador<Cell> { /** serialVersionUID. */ private static final long serialVersionUID = 6540304326033236054L; Added: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/FisheryTreeNodeLoador.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/FisheryTreeNodeLoador.java (rev 0) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/FisheryTreeNodeLoador.java 2011-04-18 15:44:40 UTC (rev 3264) @@ -0,0 +1,52 @@ +/* + * #%L + * + * + * $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 Lesser General Public License as + * published by the Free Software Foundation, either version 3 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 Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ + +package fr.ifremer.isisfish.ui.input.tree.loadors; + +import jaxx.runtime.swing.nav.tree.NavTreeNodeChildLoador; + +import org.nuiton.topia.persistence.TopiaEntity; + +import fr.ifremer.isisfish.ui.input.tree.FisheryTreeNode; + +/** + * Common class to all loador. + * + * @author chatellier + * @version $Revision$ + * + * Last update : $Date$ + * By : $Author$ + * @param <T> + */ +public abstract class FisheryTreeNodeLoador<T extends TopiaEntity> extends NavTreeNodeChildLoador<T, T, FisheryTreeNode> { + + /** serialVersionUID. */ + private static final long serialVersionUID = 7738607604066405224L; + + public FisheryTreeNodeLoador(Class<T> type) { + super(type); + } +} Property changes on: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/FisheryTreeNodeLoador.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/GearsNodeLoador.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/GearsNodeLoador.java 2011-04-18 15:44:03 UTC (rev 3263) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/GearsNodeLoador.java 2011-04-18 15:44:40 UTC (rev 3264) @@ -25,7 +25,6 @@ import java.util.List; import jaxx.runtime.swing.nav.NavDataProvider; -import jaxx.runtime.swing.nav.tree.NavTreeNodeChildLoador; import fr.ifremer.isisfish.entities.FisheryRegion; import fr.ifremer.isisfish.entities.Gear; import fr.ifremer.isisfish.ui.input.tree.FisheryDataProvider; @@ -37,7 +36,7 @@ * @author chatellier * @since 3.4.0.0 */ -public class GearsNodeLoador extends NavTreeNodeChildLoador<Gear, Gear, FisheryTreeNode> { +public class GearsNodeLoador extends FisheryTreeNodeLoador<Gear> { /** serialVersionUID. */ private static final long serialVersionUID = 6540304326033236054L; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/MetiersNodeLoador.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/MetiersNodeLoador.java 2011-04-18 15:44:03 UTC (rev 3263) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/MetiersNodeLoador.java 2011-04-18 15:44:40 UTC (rev 3264) @@ -25,7 +25,6 @@ import java.util.List; import jaxx.runtime.swing.nav.NavDataProvider; -import jaxx.runtime.swing.nav.tree.NavTreeNodeChildLoador; import fr.ifremer.isisfish.entities.Metier; import fr.ifremer.isisfish.entities.FisheryRegion; import fr.ifremer.isisfish.ui.input.tree.FisheryDataProvider; @@ -37,7 +36,7 @@ * @author chatellier * @since 3.4.0.0 */ -public class MetiersNodeLoador extends NavTreeNodeChildLoador<Metier, Metier, FisheryTreeNode> { +public class MetiersNodeLoador extends FisheryTreeNodeLoador<Metier> { /** serialVersionUID. */ private static final long serialVersionUID = 6540304326033236054L; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/PopulationsNodeLoador.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/PopulationsNodeLoador.java 2011-04-18 15:44:03 UTC (rev 3263) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/PopulationsNodeLoador.java 2011-04-18 15:44:40 UTC (rev 3264) @@ -23,10 +23,10 @@ package fr.ifremer.isisfish.ui.input.tree.loadors; import java.util.ArrayList; +import java.util.Collections; import java.util.List; import jaxx.runtime.swing.nav.NavDataProvider; -import jaxx.runtime.swing.nav.tree.NavTreeNodeChildLoador; import fr.ifremer.isisfish.entities.Population; import fr.ifremer.isisfish.entities.Species; import fr.ifremer.isisfish.ui.input.tree.FisheryTreeNode; @@ -37,7 +37,7 @@ * @author chatellier * @since 3.4.0.0 */ -public class PopulationsNodeLoador extends NavTreeNodeChildLoador<Population, Population, FisheryTreeNode> { +public class PopulationsNodeLoador extends FisheryTreeNodeLoador<Population> { /** serialVersionUID. */ private static final long serialVersionUID = 6540304326033236054L; @@ -51,7 +51,13 @@ @Override public List<Population> getData(Class<?> parentClass, String parentId, NavDataProvider dataProvider) throws Exception { - List<Population> populations = new ArrayList<Population>(species.getPopulation()); + List<Population> populations = null; + if (species.getPopulation() != null) { + populations = new ArrayList<Population>(species.getPopulation()); + } + else { + populations = Collections.EMPTY_LIST; + } return populations; } Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/PortsNodeLoador.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/PortsNodeLoador.java 2011-04-18 15:44:03 UTC (rev 3263) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/PortsNodeLoador.java 2011-04-18 15:44:40 UTC (rev 3264) @@ -25,7 +25,6 @@ import java.util.List; import jaxx.runtime.swing.nav.NavDataProvider; -import jaxx.runtime.swing.nav.tree.NavTreeNodeChildLoador; import fr.ifremer.isisfish.entities.Port; import fr.ifremer.isisfish.entities.FisheryRegion; import fr.ifremer.isisfish.ui.input.tree.FisheryDataProvider; @@ -37,7 +36,7 @@ * @author chatellier * @since 3.4.0.0 */ -public class PortsNodeLoador extends NavTreeNodeChildLoador<Port, Port, FisheryTreeNode> { +public class PortsNodeLoador extends FisheryTreeNodeLoador<Port> { /** serialVersionUID. */ private static final long serialVersionUID = 6540304326033236054L; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/SetOfVesselsNodeLoador.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/SetOfVesselsNodeLoador.java 2011-04-18 15:44:03 UTC (rev 3263) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/SetOfVesselsNodeLoador.java 2011-04-18 15:44:40 UTC (rev 3264) @@ -25,7 +25,6 @@ import java.util.List; import jaxx.runtime.swing.nav.NavDataProvider; -import jaxx.runtime.swing.nav.tree.NavTreeNodeChildLoador; import fr.ifremer.isisfish.entities.FisheryRegion; import fr.ifremer.isisfish.entities.SetOfVessels; import fr.ifremer.isisfish.ui.input.tree.FisheryDataProvider; @@ -37,7 +36,7 @@ * @author chatellier * @since 3.4.0.0 */ -public class SetOfVesselsNodeLoador extends NavTreeNodeChildLoador<SetOfVessels, SetOfVessels, FisheryTreeNode> { +public class SetOfVesselsNodeLoador extends FisheryTreeNodeLoador<SetOfVessels> { /** serialVersionUID. */ private static final long serialVersionUID = 6540304326033236054L; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/SpeciesNodeLoador.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/SpeciesNodeLoador.java 2011-04-18 15:44:03 UTC (rev 3263) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/SpeciesNodeLoador.java 2011-04-18 15:44:40 UTC (rev 3264) @@ -27,7 +27,6 @@ import java.util.List; import jaxx.runtime.swing.nav.NavDataProvider; -import jaxx.runtime.swing.nav.tree.NavTreeNodeChildLoador; import fr.ifremer.isisfish.entities.FisheryRegion; import fr.ifremer.isisfish.entities.Population; import fr.ifremer.isisfish.entities.Species; @@ -40,7 +39,7 @@ * @author chatellier * @since 3.4.0.0 */ -public class SpeciesNodeLoador extends NavTreeNodeChildLoador<Species, Species, FisheryTreeNode> { +public class SpeciesNodeLoador extends FisheryTreeNodeLoador<Species> { /** serialVersionUID. */ private static final long serialVersionUID = 6540304326033236054L; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/StrategiesNodeLoador.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/StrategiesNodeLoador.java 2011-04-18 15:44:03 UTC (rev 3263) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/StrategiesNodeLoador.java 2011-04-18 15:44:40 UTC (rev 3264) @@ -25,7 +25,6 @@ import java.util.List; import jaxx.runtime.swing.nav.NavDataProvider; -import jaxx.runtime.swing.nav.tree.NavTreeNodeChildLoador; import fr.ifremer.isisfish.entities.Strategy; import fr.ifremer.isisfish.entities.FisheryRegion; import fr.ifremer.isisfish.ui.input.tree.FisheryDataProvider; @@ -37,7 +36,7 @@ * @author chatellier * @since 3.4.0.0 */ -public class StrategiesNodeLoador extends NavTreeNodeChildLoador<Strategy, Strategy, FisheryTreeNode> { +public class StrategiesNodeLoador extends FisheryTreeNodeLoador<Strategy> { /** serialVersionUID. */ private static final long serialVersionUID = 6540304326033236054L; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/TripTypesNodeLoador.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/TripTypesNodeLoador.java 2011-04-18 15:44:03 UTC (rev 3263) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/TripTypesNodeLoador.java 2011-04-18 15:44:40 UTC (rev 3264) @@ -25,7 +25,6 @@ import java.util.List; import jaxx.runtime.swing.nav.NavDataProvider; -import jaxx.runtime.swing.nav.tree.NavTreeNodeChildLoador; import fr.ifremer.isisfish.entities.TripType; import fr.ifremer.isisfish.entities.FisheryRegion; import fr.ifremer.isisfish.ui.input.tree.FisheryDataProvider; @@ -37,7 +36,7 @@ * @author chatellier * @since 3.4.0.0 */ -public class TripTypesNodeLoador extends NavTreeNodeChildLoador<TripType, TripType, FisheryTreeNode> { +public class TripTypesNodeLoador extends FisheryTreeNodeLoador<TripType> { /** serialVersionUID. */ private static final long serialVersionUID = 6540304326033236054L; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/VesselTypesNodeLoador.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/VesselTypesNodeLoador.java 2011-04-18 15:44:03 UTC (rev 3263) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/VesselTypesNodeLoador.java 2011-04-18 15:44:40 UTC (rev 3264) @@ -25,7 +25,6 @@ import java.util.List; import jaxx.runtime.swing.nav.NavDataProvider; -import jaxx.runtime.swing.nav.tree.NavTreeNodeChildLoador; import fr.ifremer.isisfish.entities.VesselType; import fr.ifremer.isisfish.entities.FisheryRegion; import fr.ifremer.isisfish.ui.input.tree.FisheryDataProvider; @@ -37,7 +36,7 @@ * @author chatellier * @since 3.4.0.0 */ -public class VesselTypesNodeLoador extends NavTreeNodeChildLoador<VesselType, VesselType, FisheryTreeNode> { +public class VesselTypesNodeLoador extends FisheryTreeNodeLoador<VesselType> { /** serialVersionUID. */ private static final long serialVersionUID = 6540304326033236054L; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/ZonesNodeLoador.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/ZonesNodeLoador.java 2011-04-18 15:44:03 UTC (rev 3263) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/ZonesNodeLoador.java 2011-04-18 15:44:40 UTC (rev 3264) @@ -25,9 +25,8 @@ import java.util.List; import jaxx.runtime.swing.nav.NavDataProvider; -import jaxx.runtime.swing.nav.tree.NavTreeNodeChildLoador; -import fr.ifremer.isisfish.entities.Zone; import fr.ifremer.isisfish.entities.FisheryRegion; +import fr.ifremer.isisfish.entities.Zone; import fr.ifremer.isisfish.ui.input.tree.FisheryDataProvider; import fr.ifremer.isisfish.ui.input.tree.FisheryTreeNode; @@ -37,7 +36,7 @@ * @author chatellier * @since 3.4.0.0 */ -public class ZonesNodeLoador extends NavTreeNodeChildLoador<Zone, Zone, FisheryTreeNode> { +public class ZonesNodeLoador extends FisheryTreeNodeLoador<Zone> { /** serialVersionUID. */ private static final long serialVersionUID = 6540304326033236054L;

1 0

r3263 - in isis-fish/branches/3.3.1/src/main: java/fr/ifremer/isisfish/ui/input/check resources/i18n
by chatellier＠users.labs.libre-entreprise.org 18 Apr '11

18 Apr '11

Author: chatellier Date: 2011-04-18 15:44:03 +0000 (Mon, 18 Apr 2011) New Revision: 3263 Log: Add check about port Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/check/CheckRegion.java 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/java/fr/ifremer/isisfish/ui/input/check/CheckRegion.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/check/CheckRegion.java 2011-04-18 14:31:52 UTC (rev 3262) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/check/CheckRegion.java 2011-04-18 15:44:03 UTC (rev 3263) @@ -468,7 +468,12 @@ } static public void check(Port port, CheckResult result){ - + if (StringUtils.isBlank(port.getName())) { + result.addWarning(port, _("isisfish.error.empty.name")); + } + if (port.getCell() == null) { + result.addWarning(port, _("isisfish.error.undefined.mesh.sector")); + } } } // CheckSaisie 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-18 14:31:52 UTC (rev 3262) +++ isis-fish/branches/3.3.1/src/main/resources/i18n/isis-fish_en_GB.properties 2011-04-18 15:44:03 UTC (rev 3263) @@ -328,6 +328,7 @@ isisfish.error.not.null.natural.death=Null natural mortality isisfish.error.not.possible.metier=Pas de m\u00E9tier possible isisfish.error.not.support.class=this class does not support +isisfish.error.null.semantics=Null semantics for %s isisfish.error.number.classes.upper.zero=Error, the number of classes must be upper than 0 isisfish.error.out.memory=Out of memory try with more memory (option -mx) isisfish.error.overlap.season=Cette saison chevauche une autre saison 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-18 14:31:52 UTC (rev 3262) +++ isis-fish/branches/3.3.1/src/main/resources/i18n/isis-fish_fr_FR.properties 2011-04-18 15:44:03 UTC (rev 3263) @@ -328,6 +328,7 @@ isisfish.error.not.null.natural.death=mortalite naturelle nulle isisfish.error.not.possible.metier=Pas de m\u00E9tier possible isisfish.error.not.support.class=La classe %s ne supporte pas les descritions +isisfish.error.null.semantics=Semantiques nulle pour %s isisfish.error.number.classes.upper.zero=Error, the number of classes must be upper than 0 isisfish.error.out.memory=Out of memory try with more memory (option -mx) isisfish.error.overlap.season=Cette saison chevauche une autre saison

1 0

r3262 - isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input
by chatellier＠users.labs.libre-entreprise.org 18 Apr '11

18 Apr '11

Author: chatellier Date: 2011-04-18 14:31:52 +0000 (Mon, 18 Apr 2011) New Revision: 3262 Log: Fix npe when clicking on map with no bean loaded 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/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/CellUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/CellUI.jaxx 2011-04-18 14:19:01 UTC (rev 3261) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/CellUI.jaxx 2011-04-18 14:31:52 UTC (rev 3262) @@ -64,8 +64,8 @@ // TODO a fixer, le clic droit du menu contextuel // passe aussi par ici et change la selection //if (e.getButton() == MouseEvent.BUTTON1) { - for (Cell c : cellMap.getSelectedCells()) { - if (getBean() != null) { + 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); result = true; 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-18 14:19:01 UTC (rev 3261) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PortUI.jaxx 2011-04-18 14:31:52 UTC (rev 3262) @@ -61,8 +61,8 @@ new OpenMapEvents(portMap, new SelectMouseMode(false), CellSelectionLayer.SINGLE_SELECTION) { @Override public boolean mouseClicked(MouseEvent e) { - for (Cell c : portMap.getSelectedCells()) { - if (getBean() != null) { + if (getBean() != null) { // impossible de desactiver la carte :( + for (Cell c : portMap.getSelectedCells()) { if (getBean().getCell() != null) { if (!getBean().getCell().getTopiaId().equals(c.getTopiaId())){ getBean().setCell(c); @@ -183,7 +183,7 @@ <cell fill='horizontal' weightx='0.5'> <JButton id='delete' decorator='boxed' text="isisfish.common.remove" - enabled="{!validator.isChanged()}" + enabled="{!validator.isChanged() && getBean() != null}" onActionPerformed="getSaveVerifier().delete()"/> </cell> </row> 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-18 14:19:01 UTC (rev 3261) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx 2011-04-18 14:31:52 UTC (rev 3262) @@ -66,11 +66,15 @@ new OpenMapEvents(zoneMap, new SelectMouseMode(false), CellSelectionLayer.MULT_SELECTION) { @Override public boolean mouseClicked(MouseEvent e) { - getBean().setCell(zoneMap.getSelectedCells()); - if (getBean().getCell() != null){ - zoneCells.setSelectedValues(getBean().getCell().toArray()); + 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; + } } - return true; + return result; } }; @@ -203,7 +207,7 @@ <cell fill='horizontal' weightx='0.5'> <JButton id='delete' decorator='boxed' text="isisfish.common.remove" - enabled="{!validator.isChanged()}" + enabled="{!validator.isChanged() && getBean() != null}" onActionPerformed="getSaveVerifier().delete()"/> </cell> </row>

1 0

r3261 - isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/check
by chatellier＠users.labs.libre-entreprise.org 18 Apr '11

18 Apr '11

Author: chatellier Date: 2011-04-18 14:19:01 +0000 (Mon, 18 Apr 2011) New Revision: 3261 Log: Remove wrong comment Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/check/CheckResult.java Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/check/CheckResult.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/check/CheckResult.java 2011-04-18 14:18:23 UTC (rev 3260) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/check/CheckResult.java 2011-04-18 14:19:01 UTC (rev 3261) @@ -180,7 +180,8 @@ /** * Permet d'ajouter une info sur un objet. - * @param o l'objet sur lequel le message porte, surment un descendant d'un DBobjet + * + * @param o l'objet sur lequel le message porte * @param message le message à ajouter */ public void addInfo(Object o, String message) { @@ -194,7 +195,8 @@ /** * Permet d'ajouter un avertissement sur un objet. - * @param o l'objet sur lequel le message porte, surment un descendant d'un DBobjet + * + * @param o l'objet sur lequel le message porte * @param message le message à ajouter */ public void addWarning(Object o, String message) { @@ -208,7 +210,8 @@ /** * Permet d'ajouter une error sur un objet. - * @param o l'objet sur lequel le message porte, surment un descendant d'un DBobjet + * + * @param o l'objet sur lequel le message porte * @param message le message à ajouter */ public void addError(Object o, String message) {

1 0

r3260 - isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/check
by chatellier＠users.labs.libre-entreprise.org 18 Apr '11

18 Apr '11

Author: chatellier Date: 2011-04-18 14:18:23 +0000 (Mon, 18 Apr 2011) New Revision: 3260 Log: Improve code Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/check/CheckResult.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/check/CheckResultFrame.java Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/check/CheckResult.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/check/CheckResult.java 2011-04-18 14:08:16 UTC (rev 3259) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/check/CheckResult.java 2011-04-18 14:18:23 UTC (rev 3260) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2002 - 2010 Ifremer, CodeLutin + * Copyright (C) 2002 - 2011 Ifremer, CodeLutin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -25,10 +25,13 @@ package fr.ifremer.isisfish.ui.input.check; +import java.util.HashMap; +import java.util.Iterator; import java.util.LinkedHashSet; -import java.util.Iterator; -import java.util.HashMap; import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.Set; /** * Classe permettant de créer le résultat d'une vérification de la bonne saisie des objets. @@ -44,60 +47,62 @@ */ public class CheckResult { // CheckResult - LinkedHashSet order = new LinkedHashSet(); + protected Set<Object> order = new LinkedHashSet<Object>(); - HashMap info = new HashMap(); - HashMap warning = new HashMap(); - HashMap error = new HashMap(); + protected Map<Object, List<String>> info = new HashMap<Object, List<String>>(); + protected Map<Object, List<String>> warning = new HashMap<Object, List<String>>(); + protected Map<Object, List<String>> error = new HashMap<Object, List<String>>(); public StringBuffer getInfo() { StringBuffer result = new StringBuffer(); - for(Iterator i=order.iterator(); i.hasNext();){ + for (Iterator i = order.iterator(); i.hasNext();) { Object o = i.next(); StringBuffer tmp = getInfo(o); - if(tmp.length() != 0){ + if (tmp.length() != 0) { String title = o.toString(); tmp.insert(0, "\n"); - for(int e=0; e<title.length(); e++){ + for (int e = 0; e < title.length(); e++) { tmp.insert(0, "="); } - tmp.insert(0, title+"\n"); + tmp.insert(0, title + "\n"); tmp.append("\n"); result.append(tmp.toString()); } } return result; } + public StringBuffer getWarning() { StringBuffer result = new StringBuffer(); - for(Iterator i=order.iterator(); i.hasNext();){ + for (Iterator i = order.iterator(); i.hasNext();) { Object o = i.next(); StringBuffer tmp = getWarning(o); - if(tmp.length() != 0){ + if (tmp.length() != 0) { String title = o.toString(); tmp.insert(0, "\n"); - for(int e=0; e<title.length(); e++){ + for (int e = 0; e < title.length(); e++) { tmp.insert(0, "="); } - tmp.insert(0, title+"\n"); + tmp.insert(0, title + "\n"); tmp.append("\n"); result.append(tmp.toString()); } } return result; } + public StringBuffer getError() { StringBuffer result = new StringBuffer(); - for(Iterator i=order.iterator(); i.hasNext();){ + for (Iterator i = order.iterator(); i.hasNext();) { Object o = i.next(); StringBuffer tmp = getError(o); - if(tmp.length() != 0){ + if (tmp.length() != 0) { String title = o.toString(); tmp.insert(0, "\n"); - for(int e=0; e<title.length(); e++){ + for (int e = 0; e < title.length(); e++) { tmp.insert(0, "="); } - tmp.insert(0, title+"\n"); + tmp.insert(0, title + "\n"); tmp.append("\n"); result.append(tmp.toString()); } @@ -107,37 +112,39 @@ public StringBuffer getInfo(Object o) { StringBuffer result = new StringBuffer(); - LinkedList list = (LinkedList)info.get(o); - if(list != null && list.size() != 0){ + List list = info.get(o); + if (list != null && list.size() != 0) { result.append("Info\n"); result.append("----\n"); - for(Iterator i=list.iterator(); i.hasNext();){ + for (Iterator i = list.iterator(); i.hasNext();) { result.append(i.next().toString()); result.append("\n"); } } return result; } + public StringBuffer getWarning(Object o) { StringBuffer result = new StringBuffer(); - LinkedList list = (LinkedList)warning.get(o); - if(list != null && list.size() != 0){ + List list = warning.get(o); + if (list != null && list.size() != 0) { result.append("Problème\n"); result.append("--------\n"); - for(Iterator i=list.iterator(); i.hasNext();){ + for (Iterator i = list.iterator(); i.hasNext();) { result.append(i.next().toString()); result.append("\n"); } } return result; } + public StringBuffer getError(Object o) { StringBuffer result = new StringBuffer(); - LinkedList list = (LinkedList)error.get(o); - if(list != null && list.size() != 0){ + List list = error.get(o); + if (list != null && list.size() != 0) { result.append("Erreur\n"); result.append("------\n"); - for(Iterator i=list.iterator(); i.hasNext();){ + for (Iterator i = list.iterator(); i.hasNext();) { result.append(i.next().toString()); result.append("\n"); } @@ -145,27 +152,27 @@ return result; } - public StringBuffer getAll(Object o){ + public StringBuffer getAll(Object o) { StringBuffer result = new StringBuffer(); result.append(getError(o).toString()); result.append(getWarning(o).toString()); result.append(getInfo(o).toString()); - if (result.length() != 0){ + if (result.length() != 0) { String title = o.toString(); result.insert(0, "\n"); - for(int i=0; i<title.length(); i++){ + for (int i = 0; i < title.length(); i++) { result.insert(0, "="); } - result.insert(0, title+"\n"); + result.insert(0, title + "\n"); } result.append("\n"); return result; } - public StringBuffer getAll(){ + public StringBuffer getAll() { StringBuffer result = new StringBuffer(); - for(Iterator i=order.iterator(); i.hasNext();){ + for (Iterator i = order.iterator(); i.hasNext();) { result.append(getAll(i.next())); } return result; @@ -176,11 +183,11 @@ * @param o l'objet sur lequel le message porte, surment un descendant d'un DBobjet * @param message le message à ajouter */ - public void addInfo(Object o, String message){ + public void addInfo(Object o, String message) { order.add(o); - LinkedList list = (LinkedList)info.get(o); - if(list == null){ - info.put(o, list = new LinkedList()); + List<String> list = info.get(o); + if (list == null) { + info.put(o, list = new LinkedList<String>()); } list.add(message); } @@ -190,11 +197,11 @@ * @param o l'objet sur lequel le message porte, surment un descendant d'un DBobjet * @param message le message à ajouter */ - public void addWarning(Object o, String message){ + public void addWarning(Object o, String message) { order.add(o); - LinkedList list = (LinkedList)warning.get(o); - if(list == null){ - warning.put(o, list = new LinkedList()); + List<String> list = warning.get(o); + if (list == null) { + warning.put(o, list = new LinkedList<String>()); } list.add(message); } @@ -204,14 +211,13 @@ * @param o l'objet sur lequel le message porte, surment un descendant d'un DBobjet * @param message le message à ajouter */ - public void addError(Object o, String message){ + public void addError(Object o, String message) { order.add(o); - LinkedList list = (LinkedList)error.get(o); - if(list == null){ - error.put(o, list = new LinkedList()); + List<String> list = error.get(o); + if (list == null) { + error.put(o, list = new LinkedList<String>()); } list.add(message); } } // CheckResult - Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/check/CheckResultFrame.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/check/CheckResultFrame.java 2011-04-18 14:08:16 UTC (rev 3259) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/check/CheckResultFrame.java 2011-04-18 14:18:23 UTC (rev 3260) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2002 - 2010 Ifremer, CodeLutin + * Copyright (C) 2002 - 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 @@ -74,4 +74,3 @@ } } // CheckResultFrame -

1 0

r3259 - isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/check
by chatellier＠users.labs.libre-entreprise.org 18 Apr '11

18 Apr '11

Author: chatellier Date: 2011-04-18 14:08:16 +0000 (Mon, 18 Apr 2011) New Revision: 3259 Log: Fix a lot of potential NPE Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/check/CheckRegion.java Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/check/CheckRegion.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/check/CheckRegion.java 2011-04-18 13:49:02 UTC (rev 3258) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/check/CheckRegion.java 2011-04-18 14:08:16 UTC (rev 3259) @@ -109,62 +109,56 @@ static public void check(PopulationGroup classPop, CheckResult result){ // error - if(classPop.getMeanWeight() < 0){ + if (classPop.getMeanWeight() < 0) { result.addError(classPop, _("isisfish.error.invalid.mean.weight")); } - // if(classPop.getMortaliteNaturelle() < 0){ - // result.addError(classPop, _("isisfish.error.invalidate.natural.death")); - // } // warning - if(classPop.getMeanWeight() == 0){ + if (classPop.getMeanWeight() == 0) { result.addWarning(classPop, _("isisfish.error.not.null.mean.weight")); } - // if(classPop.getMortaliteNaturelle() == 0){ - // result.addWarning(classPop, _("isisfish.error.not.null.natural.death")); - // } } - static public void check(Gear engin, CheckResult result){ - if("".equals(engin.getName())){ + static public void check(Gear engin, CheckResult result) { + if (StringUtils.isBlank(engin.getName())) { result.addWarning(engin, _("isisfish.error.empty.name")); } - if("".equals(engin.getEffortUnit())){ + if (StringUtils.isBlank(engin.getEffortUnit())) { result.addWarning(engin, _("isisfish.error.empty.unit")); } Collection<Selectivity> selectivites = engin.getPopulationSelectivity(); - if(selectivites.size() == 0){ + if (CollectionUtils.isEmpty(selectivites)) { result.addWarning(engin, _("isisfish.error.empty.selectivity")); - }else{ - for(Selectivity selectivity : selectivites){ + } else { + for (Selectivity selectivity : selectivites) { check(selectivity, result); } } - if(engin.getPossibleValue() == null){ + if (engin.getPossibleValue() == null) { result.addWarning(engin, _("isisfish.error.invalid.range")); } - if("".equals(engin.getParameterName())){ + if (StringUtils.isBlank(engin.getParameterName())) { result.addInfo(engin, _("isisfish.error.empty.params.name")); } } static public void check(MetierSeasonInfo infoSaisonMetier, CheckResult result){ - if(infoSaisonMetier.getZone() == null || infoSaisonMetier.getZone().size() == 0){ + if (CollectionUtils.isEmpty(infoSaisonMetier.getZone())) { result.addWarning(infoSaisonMetier, _("isisfish.error.no.sector")); } Collection<TargetSpecies> especeCaptus = infoSaisonMetier.getSpeciesTargetSpecies(); - if(especeCaptus.size() == 0){ + if (CollectionUtils.isEmpty(especeCaptus)) { result.addInfo(infoSaisonMetier, _("isisfish.error.empty.species")); - }else{ - for(TargetSpecies i : especeCaptus){ + } else { + for (TargetSpecies i : especeCaptus) { check(i, result); } } } - static public boolean isEmptyMatrix(MatrixND mat) { + static public boolean isEmptyMatrix(Object entity, MatrixND mat) { boolean result = true; for (MatrixIterator i = mat.iterator(); result && i.next();) { result = false; @@ -201,75 +195,87 @@ static public void check(PopulationSeasonInfo infoSaisonPop, CheckResult result){ if (infoSaisonPop.getUseEquationMigration()) { check(infoSaisonPop, "MigrationEquation", infoSaisonPop.getMigrationEquation(), result); - check(infoSaisonPop, "Emigration", infoSaisonPop.getEmigrationEquation(), result); + check(infoSaisonPop, "EmigrationEquation", infoSaisonPop.getEmigrationEquation(), result); check(infoSaisonPop, "ImmigrationEquation", infoSaisonPop.getImmigrationEquation(), result); } else { - - // FIXME chatellier 20110221 NPE in getMigrationMatrix() - // with null zones or populations - if (isEmptyMatrix(infoSaisonPop.getMigrationMatrix())) { - result.addInfo(infoSaisonPop, _("isisfish.error.empty.migration")); - } else if(isNullMatrix(infoSaisonPop.getMigrationMatrix())) { - result.addInfo(infoSaisonPop, _("isisfish.error.empty.migration")); - } else if(isNegativeMatrix(infoSaisonPop.getMigrationMatrix())) { - result.addError(infoSaisonPop, _("isisfish.error.migration.negative")); + + try { + if (isEmptyMatrix(infoSaisonPop, infoSaisonPop.getMigrationMatrix())) { + result.addInfo(infoSaisonPop, _("isisfish.error.empty.migration")); + } else if(isNullMatrix(infoSaisonPop.getMigrationMatrix())) { + result.addInfo(infoSaisonPop, _("isisfish.error.empty.migration")); + } else if(isNegativeMatrix(infoSaisonPop.getMigrationMatrix())) { + result.addError(infoSaisonPop, _("isisfish.error.migration.negative")); + } } + catch (NullPointerException e) { + result.addError(infoSaisonPop, _("isisfish.error.null.semantics", "MigrationEquation")); + } - - if (isEmptyMatrix(infoSaisonPop.getEmigrationMatrix())) { - result.addInfo(infoSaisonPop, _("isisfish.error.empty.emigration")); - } else if(isNullMatrix(infoSaisonPop.getEmigrationMatrix())) { - result.addInfo(infoSaisonPop, _("isisfish.error.empty.emigration")); - } else if(isNegativeMatrix(infoSaisonPop.getEmigrationMatrix())) { - result.addError(infoSaisonPop, _("isisfish.error.emigration.negative")); + try { + if (isEmptyMatrix(infoSaisonPop, infoSaisonPop.getEmigrationMatrix())) { + result.addInfo(infoSaisonPop, _("isisfish.error.empty.emigration")); + } else if(isNullMatrix(infoSaisonPop.getEmigrationMatrix())) { + result.addInfo(infoSaisonPop, _("isisfish.error.empty.emigration")); + } else if(isNegativeMatrix(infoSaisonPop.getEmigrationMatrix())) { + result.addError(infoSaisonPop, _("isisfish.error.emigration.negative")); + } } + catch (NullPointerException e) { + result.addError(infoSaisonPop, _("isisfish.error.null.semantics", "EmigrationEquation")); + } - if (isEmptyMatrix(infoSaisonPop.getImmigrationMatrix())) { - result.addInfo(infoSaisonPop, _("isisfish.error.empty.immigration")); - } else if(isNullMatrix(infoSaisonPop.getImmigrationMatrix())) { - result.addInfo(infoSaisonPop, _("isisfish.error.empty.immigration")); - } else if(isNegativeMatrix(infoSaisonPop.getImmigrationMatrix())) { - result.addError(infoSaisonPop, _("isisfish.error.immigration.negative")); + try { + if (isEmptyMatrix(infoSaisonPop, infoSaisonPop.getImmigrationMatrix())) { + result.addInfo(infoSaisonPop, _("isisfish.error.empty.immigration")); + } else if(isNullMatrix(infoSaisonPop.getImmigrationMatrix())) { + result.addInfo(infoSaisonPop, _("isisfish.error.empty.immigration")); + } else if(isNegativeMatrix(infoSaisonPop.getImmigrationMatrix())) { + result.addError(infoSaisonPop, _("isisfish.error.immigration.negative")); + } } + catch (NullPointerException e) { + result.addError(infoSaisonPop, _("isisfish.error.null.semantics", "ImmigrationEquation")); + } } } - static public void check(Cell maille, CheckResult result){ - if("".equals(maille.getName())){ + static public void check(Cell maille, CheckResult result) { + if (StringUtils.isBlank(maille.getName())) { result.addWarning(maille, _("isisfish.error.empty.name")); } } static public void check(Species metaPop, CheckResult result){ Collection<Population> pops = metaPop.getPopulation(); - if(pops.size() == 0){ + if (CollectionUtils.isEmpty(pops)) { result.addWarning(metaPop, _("isisfish.error.empty.population")); - }else{ - for(Population pop : pops){ + } else { + for (Population pop : pops) { check(pop, result); } } - if("".equals(metaPop.getName())){ + if (StringUtils.isBlank(metaPop.getName())) { result.addInfo(metaPop, _("isisfish.error.empty.species.name")); } - if("".equals(metaPop.getScientificName())){ + if (StringUtils.isBlank(metaPop.getScientificName())) { result.addInfo(metaPop, _("isisfish.error.empty.scientific.name")); } - if("".equals(metaPop.getCodeRubbin())){ + if (StringUtils.isBlank(metaPop.getCodeRubbin())) { result.addInfo(metaPop, _("isisfish.error.empty.code.rubbin")); } } static public void check(Metier metier, CheckResult result){ - if("".equals(metier.getName())){ + if (StringUtils.isBlank(metier.getName())) { result.addWarning(metier, _("isisfish.error.empty.name")); } List<MetierSeasonInfo> infoSaisons = metier.getMetierSeasonInfo(); - if(infoSaisons.size() == 0){ + if (CollectionUtils.isEmpty(infoSaisons)) { result.addWarning(metier, _("isisfish.error.empty.season")); - }else{ + } else { Set<Month> months = new HashSet<Month>(); - for(MetierSeasonInfo info : infoSaisons){ + for (MetierSeasonInfo info : infoSaisons) { if (!Collections.disjoint(months, info.getMonths())) { result.addError(info, _("isisfish.error.overlap.season")); } @@ -277,71 +283,64 @@ check(info, result); } } - if(metier.getGear() == null){ + if (metier.getGear() == null) { result.addError(metier, _("isisfish.error.undefined.gear")); - }else{ + } else { check(metier.getGear(), result); - } - - try { - if (!metier.getGear().getPossibleValue().contains(metier.getGearParameterValue())) { + + try { + if (!metier.getGear().getPossibleValue().contains(metier.getGearParameterValue())) { + result.addWarning(metier, _("isisfish.error.invalid.values.params")); + } + } catch(Exception e) { + // can't happen StringIndexOutOfBoundsException + // if gear.PossibleValue if not valid result.addWarning(metier, _("isisfish.error.invalid.values.params")); } - } catch(Exception e) { - // can't happen StringIndexOutOfBoundsException - // if gear.PossibleValue if not valid - result.addWarning(metier, _("isisfish.error.invalid.values.params")); } - } static public void check(Population pop, CheckResult result){ - if("".equals(pop.getName())){ + if (StringUtils.isBlank(pop.getName())) { result.addWarning(pop, _("isisfish.error.empty.name")); } - if("".equals(pop.getGeographicId())){ + if (StringUtils.isBlank(pop.getGeographicId())) { result.addInfo(pop, _("isisfish.error.empty.id.geographic")); } - if(pop.getMaturityGroup() == null){ + if (pop.getMaturityGroup() == null) { result.addInfo(pop, _("isisfish.error.not.null.class.grown")); } check(pop, "Growth", pop.getGrowth(), result); check(pop, "GrowthReverse", pop.getGrowthReverse(), result); List<PopulationGroup> classes = pop.getPopulationGroup(); - if(classes.size() == 0){ + if (CollectionUtils.isEmpty(classes)) { result.addWarning(pop, _("isisfish.error.undefined.classes")); - }else{ - for(PopulationGroup group : classes){ + } else { + for (PopulationGroup group : classes) { check(group, result); } } - // if(pop.getMortNatClasseNaissance() == 0){ - // result.addInfo(pop, _("isisfish.error.undefined.natural.death")); - // } - // if(pop.getMortNatClasseNaissance() < 0){ - // result.addWarning(pop, _("isisfish.error.invalid.natural.death")); - // } - if(pop.getMonthGapBetweenReproRecrutement() < 0){ + if (pop.getMonthGapBetweenReproRecrutement() < 0) { result.addWarning(pop, _("isisfish.error.invalid.interval.reproduction.recruitment")); } if (isNullMatrix(pop.getMappingZoneReproZoneRecru())) { result.addWarning(pop, _("isisfish.error.undefined.correspondence.zones.reproduction.recruitment")); } - if(pop.getPopulationZone() == null || pop.getPopulationZone().size() == 0){ + if (CollectionUtils.isEmpty(pop.getPopulationZone())) { result.addWarning(pop, _("isisfish.error.undefined.zone.population")); } - if(pop.getRecruitmentZone() == null || pop.getRecruitmentZone().size() == 0){ + if (CollectionUtils.isEmpty(pop.getRecruitmentZone())) { result.addWarning(pop, _("isisfish.error.undefined.zone.recruitment")); } - if(pop.getReproductionZone() == null || pop.getReproductionZone().size() == 0){ + if (CollectionUtils.isEmpty(pop.getReproductionZone())) { result.addWarning(pop, _("isisfish.error.undefined.zone.reproduction")); } List<PopulationSeasonInfo> infoSaisons = pop.getPopulationSeasonInfo(); - if(infoSaisons.size() == 0){ + if (CollectionUtils.isEmpty(infoSaisons)) { result.addWarning(pop, _("isisfish.error.empty.season")); - }else{ + } else { Set<Month> months = new HashSet<Month>(); - for(PopulationSeasonInfo info : infoSaisons){ + for (PopulationSeasonInfo info : infoSaisons) { if (!Collections.disjoint(months, info.getMonths())) { result.addError(info, _("isisfish.error.overlap.season")); } @@ -354,10 +353,7 @@ check(pop, "ReproductionEquation", pop.getReproductionEquation(), result); check(pop, "NaturalDeathRate", pop.getNaturalDeathRate(), result); - if (pop.getRecruitmentDistribution() == null) { - result.addWarning(pop, _("isisfish.error.missing.distribution.recruitment")); - } - else if (sumMatrix(pop.getRecruitmentDistribution()) != 1) { + if (pop.getRecruitmentDistribution() == null || sumMatrix(pop.getRecruitmentDistribution()) != 1) { result.addWarning(pop, _("isisfish.error.invalid.distribution.recruitment")); } } @@ -449,7 +445,7 @@ result.addWarning(sov, _("isisfish.error.invalid.costs.fix")); } Collection<EffortDescription> efforts = sov.getPossibleMetiers(); - if (efforts.size() == 0) { + if (CollectionUtils.isEmpty(efforts)) { result.addWarning(sov, _("isisfish.error.not.possible.metier")); } else { for (EffortDescription effort : efforts) {

1 0

r3258 - isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/check
by chatellier＠users.labs.libre-entreprise.org 18 Apr '11

18 Apr '11

Author: chatellier Date: 2011-04-18 13:49:02 +0000 (Mon, 18 Apr 2011) New Revision: 3258 Log: Fix a lot of potential NPE Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/check/CheckRegion.java Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/check/CheckRegion.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/check/CheckRegion.java 2011-04-18 13:40:19 UTC (rev 3257) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/check/CheckRegion.java 2011-04-18 13:49:02 UTC (rev 3258) @@ -33,6 +33,8 @@ import java.util.List; import java.util.Set; +import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.lang.xwork.StringUtils; import org.nuiton.math.matrix.MatrixIterator; import org.nuiton.math.matrix.MatrixND; @@ -361,57 +363,57 @@ } static public void check(FisheryRegion region, CheckResult result){ - if("".equals(region.getName())){ + if (StringUtils.isBlank(region.getName())) { result.addWarning(region, _("isisfish.error.empty.name")); } List<Zone> secteurs = region.getZone(); - if(secteurs.size() == 0){ + if (CollectionUtils.isEmpty(secteurs)) { result.addWarning(region, _("isisfish.error.undefined.sector")); - }else{ - for(Zone zone : secteurs){ + } else { + for(Zone zone : secteurs) { check(zone, result); } } List<Cell> mailles = region.getCell(); - if(mailles.size() == 0){ + if (CollectionUtils.isEmpty(mailles)) { result.addWarning(region, _("isisfish.error.undefined.mesh")); - }else{ - for(Cell cell : mailles){ + } else { + for (Cell cell : mailles) { check(cell, result); } } List<Species> metaPops = region.getSpecies(); - if(metaPops.size() == 0){ + if (CollectionUtils.isEmpty(metaPops)) { result.addWarning(region, _("isisfish.error.undefined.meta.population")); - }else{ - for(Species species : metaPops){ + } else { + for (Species species : metaPops) { check(species, result); } } List<Metier> metiers = region.getMetier(); - if(metiers.size() == 0){ + if (CollectionUtils.isEmpty(metiers)) { result.addWarning(region, _("isisfish.error.undefined.meta.population")); - }else{ - for(Metier metier : metiers){ + } else { + for (Metier metier : metiers) { check(metier, result); } } List<Strategy> strategies = region.getStrategy(); - if(strategies.size() == 0){ + if (CollectionUtils.isEmpty(strategies)){ result.addWarning(region, _("isisfish.error.undefined.stategy")); - }else{ - for(Strategy strategy : strategies){ + } else { + for (Strategy strategy : strategies) { check(strategy, result); } } } static public void check(Zone secteur, CheckResult result){ - if("".equals(secteur.getName())){ + if (StringUtils.isBlank(secteur.getName())) { result.addWarning(secteur, _("isisfish.error.empty.name")); } - if(secteur.getCell().size() == 0){ + if (CollectionUtils.isEmpty(secteur.getCell())) { result.addWarning(secteur, _("isisfish.error.undefined.mesh.sector")); } } @@ -421,17 +423,17 @@ } - static public void check(Strategy strategy, CheckResult result){ - if("".equals(strategy.getName())){ + static public void check(Strategy strategy, CheckResult result) { + if (StringUtils.isBlank(strategy.getName())) { result.addWarning(strategy, _("isisfish.error.empty.name")); } check(strategy.getSetOfVessels(), result); List<StrategyMonthInfo> smi = strategy.getStrategyMonthInfo(); - if(smi.size() != 12){ + if (smi == null || smi.size() != 12) { result.addWarning(strategy, _("isisfish.error.undefined.stategy.months")); - }else{ - for(StrategyMonthInfo info : smi){ + } else { + for (StrategyMonthInfo info : smi) { check(info, result); } } @@ -440,22 +442,22 @@ static public void check(SetOfVessels sov, CheckResult result){ check(sov.getPort(), result); - if(sov.getNumberOfVessels() < 0){ + if (sov.getNumberOfVessels() < 0) { result.addWarning(sov, _("isisfish.error.invalid.number")); } - if(sov.getFixedCosts() < 0){ + if (sov.getFixedCosts() < 0) { result.addWarning(sov, _("isisfish.error.invalid.costs.fix")); } Collection<EffortDescription> efforts = sov.getPossibleMetiers(); - if(efforts.size() == 0){ + if (efforts.size() == 0) { result.addWarning(sov, _("isisfish.error.not.possible.metier")); - }else{ - for(EffortDescription effort : efforts) { + } else { + for (EffortDescription effort : efforts) { check(effort, result); } } } - + // TODO check for VesselType, TripType, Port, StrategyMonthInfo static public void check(EffortDescription effort, CheckResult result){

1 0

r3257 - isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities
by chatellier＠users.labs.libre-entreprise.org 18 Apr '11

18 Apr '11

Author: chatellier Date: 2011-04-18 13:40:19 +0000 (Mon, 18 Apr 2011) New Revision: 3257 Log: Remove deprecated stuff Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/PopulationSeasonInfoImpl.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/StrategyMonthInfoImpl.java Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/PopulationSeasonInfoImpl.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/PopulationSeasonInfoImpl.java 2011-04-18 08:58:21 UTC (rev 3256) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/PopulationSeasonInfoImpl.java 2011-04-18 13:40:19 UTC (rev 3257) @@ -76,7 +76,7 @@ List oldMonths = null; if (result != null) { - oldMonths = result.getSemantics(0); + oldMonths = result.getSemantic(0); } List<Month> months = getMonths(); @@ -813,7 +813,7 @@ // l'equation doit mettre les resultats dans la matrice result e.evaluate("N", N, "pop", pop, "month", month, "prepro", coeff .getValue(month), "zoneRepro", zoneRepro, "groups", N - .getSemantics(0), "zones", N.getSemantics(1), "result", + .getSemantic(0), "zones", N.getSemantic(1), "result", result); } } catch (Exception eee) { Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/StrategyMonthInfoImpl.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/StrategyMonthInfoImpl.java 2011-04-18 08:58:21 UTC (rev 3256) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/StrategyMonthInfoImpl.java 2011-04-18 13:40:19 UTC (rev 3257) @@ -75,7 +75,7 @@ // se le metier n'y ait pas on renvera 0; MatrixND mat = super.getProportionMetier(); if (mat != null) { - int indice = mat.getSemantics(0).indexOf(metier); + int indice = mat.getSemantic(0).indexOf(metier); if (indice >= 0) { result = mat.getValue(indice); } @@ -120,7 +120,7 @@ _("isisfish.strategyMonthInfo.proportion"), new List[] { metiers }, new String[] { _("isisfish.strategyMonthInfo.metier") }); - } else if (!result.getSemantics(0).equals(metiers)) { + } else if (!result.getSemantic(0).equals(metiers)) { MatrixND tmp = MatrixFactory.getInstance().create( _("isisfish.strategyMonthInfo.proportion"), new List[] { metiers },

1 0