This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See http://git.codelutin.com/tutti.git commit 844ccd4ba3238ddb19347b08d57b012530b52fd8 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Feb 6 09:40:55 2015 +0100 ajout des methodes getAllGears et getAllVessel sur PersistenceService --- .../fr/ifremer/tutti/service/PersistenceService.java | 12 ++++++++++++ .../referential/ReferentialTemporaryGearService.java | 7 ++----- .../referential/ReferentialTemporaryVesselService.java | 6 ++---- .../swing/action/OpenReplaceTemporaryGearUIAction.java | 3 +-- .../action/OpenReplaceTemporaryVesselUIAction.java | 3 +-- .../ManageTemporaryReferentialUIHandler.java | 17 ++++------------- 6 files changed, 22 insertions(+), 26 deletions(-) diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/PersistenceService.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/PersistenceService.java index a7ce38b..59e208d 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/PersistenceService.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/PersistenceService.java @@ -775,6 +775,12 @@ public class PersistenceService extends AbstractTuttiService implements TuttiPer //-- Referential methods --// //------------------------------------------------------------------------// + public List<Vessel> getAllVessel() { + List<Vessel> targetList = Lists.newArrayList(getAllFishingVessel()); + targetList.addAll(getAllScientificVessel()); + return targetList; + } + @Override public List<Vessel> getAllScientificVessel() { return driver.getAllScientificVessel(); @@ -845,6 +851,12 @@ public class PersistenceService extends AbstractTuttiService implements TuttiPer return driver.getLocation(id); } + public List<Gear> getAllGear() { + List<Gear> targetList = Lists.newArrayList(getAllScientificGear()); + targetList.addAll(getAllFishingGear()); + return targetList; + } + @Override public List<Gear> getAllScientificGear() { return driver.getAllScientificGear(); diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/ReferentialTemporaryGearService.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/ReferentialTemporaryGearService.java index 9985612..d01ac79 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/ReferentialTemporaryGearService.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/ReferentialTemporaryGearService.java @@ -49,7 +49,6 @@ import java.io.BufferedWriter; import java.io.File; import java.io.IOException; import java.io.Reader; -import java.util.ArrayList; import java.util.Collection; import java.util.List; @@ -85,8 +84,7 @@ public class ReferentialTemporaryGearService extends AbstractTuttiService { } // get all vessel names - List<Gear> allGears = new ArrayList<>(persistenceService.getAllFishingGear()); - allGears.addAll(persistenceService.getAllScientificGear()); + List<Gear> allGears = Lists.newArrayList(persistenceService.getAllGear()); ImportRequestResult<Gear, Integer> requestResult = processImportFile(file, allGears); @@ -130,8 +128,7 @@ public class ReferentialTemporaryGearService extends AbstractTuttiService { if (log.isInfoEnabled()) { log.info("Getting all gears from database"); } - List<Gear> targetList = Lists.newArrayList(persistenceService.getAllFishingGear()); - targetList.addAll(persistenceService.getAllScientificGear()); + List<Gear> targetList = Lists.newArrayList(persistenceService.getAllGear()); if (log.isInfoEnabled()) { log.info("Got " + targetList.size() + " gears"); } diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/ReferentialTemporaryVesselService.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/ReferentialTemporaryVesselService.java index 3bf60de..ba17c75 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/ReferentialTemporaryVesselService.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/ReferentialTemporaryVesselService.java @@ -84,8 +84,7 @@ public class ReferentialTemporaryVesselService extends AbstractTuttiService { } // get all vessels - List<Vessel> existingVessels = Lists.newArrayList(persistenceService.getAllFishingVessel()); - existingVessels.addAll(persistenceService.getAllScientificVessel()); + List<Vessel> existingVessels = Lists.newArrayList(persistenceService.getAllVessel()); ImportRequestResult<Vessel, String> requestResult = processImportFile(file, existingVessels); @@ -122,8 +121,7 @@ public class ReferentialTemporaryVesselService extends AbstractTuttiService { if (log.isInfoEnabled()) { log.info("Getting all vessels from database"); } - List<Vessel> targetList = Lists.newArrayList(persistenceService.getAllFishingVessel()); - targetList.addAll(persistenceService.getAllScientificVessel()); + List<Vessel> targetList = Lists.newArrayList(persistenceService.getAllVessel()); if (log.isInfoEnabled()) { log.info("Got " + targetList.size() + " vessels"); } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/OpenReplaceTemporaryGearUIAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/OpenReplaceTemporaryGearUIAction.java index 90f4790..0f025c0 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/OpenReplaceTemporaryGearUIAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/OpenReplaceTemporaryGearUIAction.java @@ -71,8 +71,7 @@ public class OpenReplaceTemporaryGearUIAction extends AbstractOpenReplaceTempora @Override protected List<Gear> getTargetList(PersistenceService persistenceService) { - List<Gear> targetList = Lists.newArrayList(persistenceService.getAllFishingGear()); - targetList.addAll(persistenceService.getAllScientificGear()); + List<Gear> targetList = Lists.newArrayList(persistenceService.getAllGear()); return targetList; } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/OpenReplaceTemporaryVesselUIAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/OpenReplaceTemporaryVesselUIAction.java index ebee1ab..863bacf 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/OpenReplaceTemporaryVesselUIAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/OpenReplaceTemporaryVesselUIAction.java @@ -71,8 +71,7 @@ public class OpenReplaceTemporaryVesselUIAction extends AbstractOpenReplaceTempo @Override protected List<Vessel> getTargetList(PersistenceService persistenceService) { - List<Vessel> targetList = Lists.newArrayList(persistenceService.getAllFishingVessel()); - targetList.addAll(persistenceService.getAllScientificVessel()); + List<Vessel> targetList = Lists.newArrayList(persistenceService.getAllVessel()); return targetList; } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ManageTemporaryReferentialUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ManageTemporaryReferentialUIHandler.java index 29e8434..63cadac 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ManageTemporaryReferentialUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ManageTemporaryReferentialUIHandler.java @@ -26,7 +26,6 @@ import fr.ifremer.tutti.persistence.entities.referential.Gear; import fr.ifremer.tutti.persistence.entities.referential.Person; import fr.ifremer.tutti.persistence.entities.referential.Species; import fr.ifremer.tutti.persistence.entities.referential.Vessel; -import fr.ifremer.tutti.service.PersistenceService; import fr.ifremer.tutti.ui.swing.util.AbstractTuttiUIHandler; import fr.ifremer.tutti.ui.swing.util.TuttiUIUtil; import jaxx.runtime.validator.swing.SwingValidator; @@ -39,7 +38,6 @@ import javax.swing.JComboBox; import javax.swing.JComponent; import java.awt.event.ActionEvent; import java.awt.event.MouseEvent; -import java.util.ArrayList; import java.util.List; /** @@ -63,24 +61,17 @@ public class ManageTemporaryReferentialUIHandler extends AbstractTuttiUIHandler< super.beforeInit(ui); ManageTemporaryReferentialUIModel model = new ManageTemporaryReferentialUIModel(); - PersistenceService persistenceService = getContext().getPersistenceService(); - List<Species> temporarySpecies = new ArrayList<Species>(persistenceService.getAllSpecies()); - temporarySpecies = persistenceService.retainTemporarySpeciesList(temporarySpecies); + List<Species> temporarySpecies = getContext().getReferentialTemporarySpeciesService().getTemporarySpeciess(); model.setNbTemporarySpecies(temporarySpecies.size()); - List<Vessel> temporaryVessels = new ArrayList<Vessel>(persistenceService.getAllFishingVessel()); - temporaryVessels.addAll(persistenceService.getAllScientificVessel()); - temporaryVessels = persistenceService.retainTemporaryVesselList(temporaryVessels); + List<Vessel> temporaryVessels = getContext().getReferentialTemporaryVesselService().getTemporaryVessels(); model.setNbTemporaryVessels(temporaryVessels.size()); - List<Gear> temporaryGears = new ArrayList<Gear>(persistenceService.getAllFishingGear()); - temporaryGears.addAll(persistenceService.getAllScientificGear()); - temporaryGears = persistenceService.retainTemporaryGearList(temporaryGears); + List<Gear> temporaryGears = getContext().getReferentialTemporaryGearService().getTemporaryGears(); model.setNbTemporaryGears(temporaryGears.size()); - List<Person> temporaryPersons = new ArrayList<Person>(persistenceService.getAllPerson()); - temporaryPersons = persistenceService.retainTemporaryPersonList(temporaryPersons); + List<Person> temporaryPersons = getContext().getReferentialTemporaryPersonService().getTemporaryPersons(); model.setNbTemporaryPersons(temporaryPersons.size()); ui.setContextValue(model); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.