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;