Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 43206554 by Tony CHEMIT at 2017-08-06T22:39:19+02:00 Let ui handler be a Services provider, helps a lot - - - - - 29 changed files: - client/src/main/java/fr/ird/observe/client/ui/content/ContentUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/impl/longline/LonglineDetailCompositionUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/impl/longline/LonglineGlobalCompositionUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/impl/longline/SetLonglineUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/impl/seine/FloatingObjectTransmittingBuoyOperationUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/impl/seine/FloatingObjectUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/impl/seine/SetSeineUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/impl/seine/dcp/FloatingObjectPartsTableCellRenderer.java - client/src/main/java/fr/ird/observe/client/ui/content/open/impl/longline/ActivityLonglineUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/open/impl/longline/TripLonglineUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/open/impl/seine/ActivitySeineUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/open/impl/seine/RouteUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/open/impl/seine/TripSeineUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/ref/ContentReferenceUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/table/impl/longline/CatchLonglineUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/table/impl/longline/EncounterUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/table/impl/longline/GearUseFeaturesLonglineUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/table/impl/longline/SensorUsedUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/table/impl/longline/TdrUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/table/impl/seine/GearUseFeaturesSeineUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/table/impl/seine/NonTargetCatchReleaseUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/table/impl/seine/NonTargetCatchUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/table/impl/seine/NonTargetSampleUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/table/impl/seine/ObjectObservedSpeciesUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/table/impl/seine/ObjectSchoolEstimateUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/table/impl/seine/SchoolEstimateUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/table/impl/seine/TargetCatchUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/table/impl/seine/TargetDiscardCatchUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/table/impl/seine/TargetSampleUIHandler.java Changes: ===================================== client/src/main/java/fr/ird/observe/client/ui/content/ContentUIHandler.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/ContentUIHandler.java +++ b/client/src/main/java/fr/ird/observe/client/ui/content/ContentUIHandler.java @@ -53,6 +53,46 @@ import fr.ird.observe.services.dto.reference.ReferentialReference; import fr.ird.observe.services.dto.reference.ReferentialReferenceSet; import fr.ird.observe.services.dto.reference.ReferentialReferences; import fr.ird.observe.services.dto.referential.ReferentialDto; +import fr.ird.observe.services.service.DataSourceService; +import fr.ird.observe.services.service.LastUpdateDateService; +import fr.ird.observe.services.service.ObserveService; +import fr.ird.observe.services.service.PingService; +import fr.ird.observe.services.service.actions.consolidate.ConsolidateDataService; +import fr.ird.observe.services.service.actions.report.ReportService; +import fr.ird.observe.services.service.actions.synchro.referential.diff.ReferentialSynchronizeDiffService; +import fr.ird.observe.services.service.actions.synchro.referential.legacy.UnidirectionalReferentialSynchronizeLocalService; +import fr.ird.observe.services.service.actions.synchro.referential.ng.ReferentialSynchronizeService; +import fr.ird.observe.services.service.actions.validate.ValidateService; +import fr.ird.observe.services.service.data.NavigationService; +import fr.ird.observe.services.service.data.TripManagementService; +import fr.ird.observe.services.service.data.longline.ActivityLongLineEncounterService; +import fr.ird.observe.services.service.data.longline.ActivityLongLineSensorUsedService; +import fr.ird.observe.services.service.data.longline.ActivityLonglineService; +import fr.ird.observe.services.service.data.longline.BranchlineService; +import fr.ird.observe.services.service.data.longline.SetLonglineCatchService; +import fr.ird.observe.services.service.data.longline.SetLonglineDetailCompositionService; +import fr.ird.observe.services.service.data.longline.SetLonglineGlobalCompositionService; +import fr.ird.observe.services.service.data.longline.SetLonglineService; +import fr.ird.observe.services.service.data.longline.TdrService; +import fr.ird.observe.services.service.data.longline.TripLonglineGearUseService; +import fr.ird.observe.services.service.data.longline.TripLonglineService; +import fr.ird.observe.services.service.data.seine.ActivitySeineService; +import fr.ird.observe.services.service.data.seine.FloatingObjectService; +import fr.ird.observe.services.service.data.seine.NonTargetCatchReleaseService; +import fr.ird.observe.services.service.data.seine.NonTargetCatchService; +import fr.ird.observe.services.service.data.seine.NonTargetSampleService; +import fr.ird.observe.services.service.data.seine.ObjectObservedSpeciesService; +import fr.ird.observe.services.service.data.seine.ObjectSchoolEstimateService; +import fr.ird.observe.services.service.data.seine.RouteService; +import fr.ird.observe.services.service.data.seine.SchoolEstimateService; +import fr.ird.observe.services.service.data.seine.SetSeineService; +import fr.ird.observe.services.service.data.seine.TargetCatchService; +import fr.ird.observe.services.service.data.seine.TargetSampleService; +import fr.ird.observe.services.service.data.seine.TransmittingBuoyOperationService; +import fr.ird.observe.services.service.data.seine.TripSeineGearUseService; +import fr.ird.observe.services.service.data.seine.TripSeineService; +import fr.ird.observe.services.service.referential.ReferentialService; +import fr.ird.observe.services.service.sql.SqlScriptProducerService; import java.awt.Component; import java.awt.Dimension; import java.awt.FocusTraversalPolicy; @@ -97,6 +137,7 @@ import org.nuiton.jaxx.widgets.select.FilterableDoubleList; import org.nuiton.validator.NuitonValidatorScope; +import static fr.ird.observe.client.db.ObserveSwingDataSource.MAIN; import static org.nuiton.i18n.I18n.t; /** @@ -105,7 +146,7 @@ import static org.nuiton.i18n.I18n.t; * @author Tony Chemit - dev@tchemit.fr * @since 1.4 */ -public abstract class ContentUIHandler<E extends IdDto, U extends ContentUI<E, U>> { +public abstract class ContentUIHandler<E extends IdDto, U extends ContentUI<E, U>> implements ObserveServicesProvider { /** Logger */ static private final Log log = LogFactory.getLog(ContentUIHandler.class); @@ -121,7 +162,6 @@ public abstract class ContentUIHandler<E extends IdDto, U extends ContentUI<E, U /** l'interface graphique que le controleur utilise */ protected U ui; - public void beforeInit(U ui) { this.ui = ui; prefix = "[" + ui.getClass().getSimpleName() + "] "; @@ -1182,10 +1222,6 @@ public abstract class ContentUIHandler<E extends IdDto, U extends ContentUI<E, U } - protected ObserveServicesProvider getServicesProvider() { - return ObserveSwingDataSource.MAIN; - } - protected <D extends ReferentialDto> FormRequestDefinition<D> getReferentialFormRequest(Class<D> type) { return ObserveSwingApplicationContext.get().getFormRequestDefinitionProvider().getDefinition(type); } @@ -1197,4 +1233,209 @@ public abstract class ContentUIHandler<E extends IdDto, U extends ContentUI<E, U private <D extends ReferentialDto> FormRequestDefinition<D> getFormRequest(String type) { return ObserveSwingApplicationContext.get().getFormRequestDefinitionProvider().getDefinition(type); } + + @Override + public <S extends ObserveService> S getService(Class<S> serviceType) { + return MAIN.getService(serviceType); + } + + @Override + public LastUpdateDateService getLastUpdateDateService() { + return MAIN.getLastUpdateDateService(); + } + + @Override + public SqlScriptProducerService getSqlScriptProducerService() { + return MAIN.getSqlScriptProducerService(); + } + + @Override + public ValidateService getValidateService() { + return MAIN.getValidateService(); + } + + @Override + public ReportService getReportService() { + return MAIN.getReportService(); + } + + @Override + public PingService getPingService() { + return MAIN.getPingService(); + } + + @Override + public TripManagementService getTripManagementService() { + return MAIN.getTripManagementService(); + } + + @Override + public ConsolidateDataService getConsolidateDataService() { + return MAIN.getConsolidateDataService(); + } + + @Override + public UnidirectionalReferentialSynchronizeLocalService getUnidirectionalReferentialSynchronizeLocalService() { + return MAIN.getUnidirectionalReferentialSynchronizeLocalService(); + } + + @Override + public ReferentialSynchronizeService getReferentialSynchronizeService() { + return MAIN.getReferentialSynchronizeService(); + } + + @Override + public ReferentialSynchronizeDiffService getReferentialSynchronizeDiffService() { + return MAIN.getReferentialSynchronizeDiffService(); + } + + @Override + public DataSourceService getDataSourceService() { + return MAIN.getDataSourceService(); + } + + @Override + public NavigationService getNavigationService() { + return MAIN.getNavigationService(); + } + + @Override + public ReferentialService getReferentialService() { + return MAIN.getReferentialService(); + } + + @Override + public TripSeineService getTripSeineService() { + return MAIN.getTripSeineService(); + } + + @Override + public RouteService getRouteService() { + return MAIN.getRouteService(); + } + + @Override + public FloatingObjectService getFloatingObjectService() { + return MAIN.getFloatingObjectService(); + } + + @Override + public ActivitySeineService getActivitySeineService() { + return MAIN.getActivitySeineService(); + } + + @Override + public SetSeineService getSetSeineService() { + return MAIN.getSetSeineService(); + } + + @Override + public TripLonglineService getTripLonglineService() { + return MAIN.getTripLonglineService(); + } + + @Override + public ActivityLonglineService getActivityLonglineService() { + return MAIN.getActivityLonglineService(); + } + + @Override + public SetLonglineService getSetLonglineService() { + return MAIN.getSetLonglineService(); + } + + @Override + public SetLonglineGlobalCompositionService getSetLonglineGlobalCompositionService() { + return MAIN.getSetLonglineGlobalCompositionService(); + } + + @Override + public SetLonglineDetailCompositionService getSetLonglineDetailCompositionService() { + return MAIN.getSetLonglineDetailCompositionService(); + } + + @Override + public TransmittingBuoyOperationService getTransmittingBuoyOperationService() { + return MAIN.getTransmittingBuoyOperationService(); + } + + @Override + public BranchlineService getBranchlineService() { + return MAIN.getBranchlineService(); + } + + @Override + public SetLonglineCatchService getSetLonglineCatchService() { + return MAIN.getSetLonglineCatchService(); + } + + @Override + public ActivityLongLineEncounterService getActivityLongLineEncounterService() { + return MAIN.getActivityLongLineEncounterService(); + } + + @Override + public TripLonglineGearUseService getTripLonglineGearUseService() { + return MAIN.getTripLonglineGearUseService(); + } + + @Override + public ActivityLongLineSensorUsedService getActivityLongLineSensorUsedService() { + return MAIN.getActivityLongLineSensorUsedService(); + } + + @Override + public TdrService getTdrService() { + return MAIN.getTdrService(); + } + + @Override + public TripSeineGearUseService getTripSeineGearUseService() { + return MAIN.getTripSeineGearUseService(); + } + + @Override + public NonTargetCatchService getNonTargetCatchService() { + return MAIN.getNonTargetCatchService(); + } + + @Override + public NonTargetCatchReleaseService getNonTargetCatchReleaseService() { + return MAIN.getNonTargetCatchReleaseService(); + } + + @Override + public NonTargetSampleService getNonTargetSampleService() { + return MAIN.getNonTargetSampleService(); + } + + @Override + public ObjectObservedSpeciesService getObjectObservedSpeciesService() { + return MAIN.getObjectObservedSpeciesService(); + } + + @Override + public ObjectSchoolEstimateService getObjectSchoolEstimateService() { + return MAIN.getObjectSchoolEstimateService(); + } + + @Override + public SchoolEstimateService getSchoolEstimateService() { + return MAIN.getSchoolEstimateService(); + } + + @Override + public TargetCatchService getTargetCatchService() { + return MAIN.getTargetCatchService(); + } + + @Override + public TargetSampleService getTargetSampleService() { + return MAIN.getTargetSampleService(); + } + + @Override + public void close() { + + } } ===================================== client/src/main/java/fr/ird/observe/client/ui/content/impl/longline/LonglineDetailCompositionUIHandler.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/impl/longline/LonglineDetailCompositionUIHandler.java +++ b/client/src/main/java/fr/ird/observe/client/ui/content/impl/longline/LonglineDetailCompositionUIHandler.java @@ -1377,8 +1377,4 @@ public class LonglineDetailCompositionUIHandler extends ContentUIHandler<SetLong } - private SetLonglineDetailCompositionService getSetLonglineDetailCompositionService() { - return getServicesProvider().getSetLonglineDetailCompositionService(); - } - } ===================================== client/src/main/java/fr/ird/observe/client/ui/content/impl/longline/LonglineGlobalCompositionUIHandler.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/impl/longline/LonglineGlobalCompositionUIHandler.java +++ b/client/src/main/java/fr/ird/observe/client/ui/content/impl/longline/LonglineGlobalCompositionUIHandler.java @@ -40,7 +40,6 @@ import fr.ird.observe.services.dto.longline.ActivityLonglineDto; import fr.ird.observe.services.dto.longline.SetLonglineGlobalCompositionDto; import fr.ird.observe.services.dto.longline.SetLonglineGlobalCompositionHelper; import fr.ird.observe.services.dto.result.SaveResultDto; -import fr.ird.observe.services.service.data.longline.SetLonglineGlobalCompositionService; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.jaxx.runtime.spi.UIHandler; @@ -236,9 +235,4 @@ public class LonglineGlobalCompositionUIHandler extends ContentUIHandler<SetLong getUi().getBaitsCompositionUI().getHandler().afterSave(refresh); } - private SetLonglineGlobalCompositionService getSetLonglineGlobalCompositionService() { - - return getServicesProvider().getSetLonglineGlobalCompositionService(); - } - } ===================================== client/src/main/java/fr/ird/observe/client/ui/content/impl/longline/SetLonglineUIHandler.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/impl/longline/SetLonglineUIHandler.java +++ b/client/src/main/java/fr/ird/observe/client/ui/content/impl/longline/SetLonglineUIHandler.java @@ -38,7 +38,6 @@ import fr.ird.observe.services.dto.longline.SetLonglineDto; import fr.ird.observe.services.dto.longline.SetLonglineHelper; import fr.ird.observe.services.dto.reference.DataReference; import fr.ird.observe.services.dto.result.SaveResultDto; -import fr.ird.observe.services.service.data.longline.SetLonglineService; import java.beans.PropertyChangeListener; import java.util.HashSet; import java.util.Set; @@ -492,7 +491,4 @@ public class SetLonglineUIHandler extends ContentUIHandler<SetLonglineDto, SetLo } - private SetLonglineService getSetLonglineService() { - return getServicesProvider().getSetLonglineService(); - } } ===================================== client/src/main/java/fr/ird/observe/client/ui/content/impl/seine/FloatingObjectTransmittingBuoyOperationUIHandler.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/impl/seine/FloatingObjectTransmittingBuoyOperationUIHandler.java +++ b/client/src/main/java/fr/ird/observe/client/ui/content/impl/seine/FloatingObjectTransmittingBuoyOperationUIHandler.java @@ -40,7 +40,6 @@ import fr.ird.observe.services.dto.seine.FloatingObjectTransmittingBuoyDto; import fr.ird.observe.services.dto.seine.FloatingObjectTransmittingBuoyHelper; import fr.ird.observe.services.dto.seine.TransmittingBuoyDto; import fr.ird.observe.services.dto.seine.TransmittingBuoyHelper; -import fr.ird.observe.services.service.data.seine.TransmittingBuoyOperationService; import java.awt.GridLayout; import java.util.ArrayList; import java.util.Collection; @@ -364,8 +363,4 @@ public class FloatingObjectTransmittingBuoyOperationUIHandler extends ContentUIH return objectOperation; } - private TransmittingBuoyOperationService getTransmittingBuoyOperationService() { - return getServicesProvider().getTransmittingBuoyOperationService(); - } - } ===================================== client/src/main/java/fr/ird/observe/client/ui/content/impl/seine/FloatingObjectUIHandler.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/impl/seine/FloatingObjectUIHandler.java +++ b/client/src/main/java/fr/ird/observe/client/ui/content/impl/seine/FloatingObjectUIHandler.java @@ -47,7 +47,6 @@ import fr.ird.observe.services.dto.seine.FloatingObjectDto; import fr.ird.observe.services.dto.seine.FloatingObjectHelper; import fr.ird.observe.services.dto.seine.FloatingObjectPartDto; import fr.ird.observe.services.dto.seine.ObjectMaterialHierarchyDto; -import fr.ird.observe.services.service.data.seine.FloatingObjectService; import java.awt.Color; import java.util.HashSet; import java.util.List; @@ -416,10 +415,6 @@ public class FloatingObjectUIHandler extends ContentUIHandler<FloatingObjectDto, }, Color.RED, Color.WHITE)); } - private FloatingObjectService getFloatingObjectService() { - return getServicesProvider().getFloatingObjectService(); - } - protected void computeTabValidState(SwingValidatorMessageTableModel errorTableModel) { Set<String> errorProperties = new HashSet<>(); ===================================== client/src/main/java/fr/ird/observe/client/ui/content/impl/seine/SetSeineUIHandler.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/impl/seine/SetSeineUIHandler.java +++ b/client/src/main/java/fr/ird/observe/client/ui/content/impl/seine/SetSeineUIHandler.java @@ -39,8 +39,6 @@ import fr.ird.observe.services.dto.seine.ActivitySeineDto; import fr.ird.observe.services.dto.seine.RouteDto; import fr.ird.observe.services.dto.seine.SetSeineDto; import fr.ird.observe.services.dto.seine.SetSeineHelper; -import fr.ird.observe.services.service.data.seine.RouteService; -import fr.ird.observe.services.service.data.seine.SetSeineService; import java.beans.PropertyChangeListener; import java.util.Date; import java.util.HashSet; @@ -179,9 +177,7 @@ public class SetSeineUIHandler extends ContentUIHandler<SetSeineDto, SetSeineUI> getModel().setForm(form); SetSeineHelper.copySetSeineDto(form.getObject(), bean); - RouteService routeService = getServicesProvider().getRouteService(); - - RouteDto route = routeService.loadDto(selectedRouteId); + RouteDto route = getRouteService().loadDto(selectedRouteId); Date time = bean.getStartTime(); @@ -339,7 +335,4 @@ public class SetSeineUIHandler extends ContentUIHandler<SetSeineDto, SetSeineUI> } - private SetSeineService getSetSeineService() { - return getServicesProvider().getSetSeineService(); - } } ===================================== client/src/main/java/fr/ird/observe/client/ui/content/impl/seine/dcp/FloatingObjectPartsTableCellRenderer.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/impl/seine/dcp/FloatingObjectPartsTableCellRenderer.java +++ b/client/src/main/java/fr/ird/observe/client/ui/content/impl/seine/dcp/FloatingObjectPartsTableCellRenderer.java @@ -23,7 +23,6 @@ package fr.ird.observe.client.ui.content.impl.seine.dcp; */ import fr.ird.observe.client.ui.util.treetable.JRadioButtonProvider; -import fr.ird.observe.services.dto.seine.ObjectMaterialHierarchyDto; import java.awt.Component; import java.util.Objects; import javax.swing.JTable; ===================================== client/src/main/java/fr/ird/observe/client/ui/content/open/impl/longline/ActivityLonglineUIHandler.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/open/impl/longline/ActivityLonglineUIHandler.java +++ b/client/src/main/java/fr/ird/observe/client/ui/content/open/impl/longline/ActivityLonglineUIHandler.java @@ -35,7 +35,6 @@ import fr.ird.observe.services.dto.longline.ActivityLonglineHelper; import fr.ird.observe.services.dto.longline.TripLonglineDto; import fr.ird.observe.services.dto.reference.DataReference; import fr.ird.observe.services.dto.result.TripChildSaveResultDto; -import fr.ird.observe.services.service.data.longline.ActivityLonglineService; import java.util.Optional; import javax.swing.SwingUtilities; import org.apache.commons.logging.Log; @@ -304,7 +303,4 @@ class ActivityLonglineUIHandler extends ContentOpenableUIHandler<ActivityLonglin } - private ActivityLonglineService getActivityLonglineService() { - return getServicesProvider().getActivityLonglineService(); - } } ===================================== client/src/main/java/fr/ird/observe/client/ui/content/open/impl/longline/TripLonglineUIHandler.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/open/impl/longline/TripLonglineUIHandler.java +++ b/client/src/main/java/fr/ird/observe/client/ui/content/open/impl/longline/TripLonglineUIHandler.java @@ -39,7 +39,6 @@ import fr.ird.observe.services.dto.referential.PersonHelper; import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.services.dto.referential.VesselHelper; import fr.ird.observe.services.dto.result.SaveResultDto; -import fr.ird.observe.services.service.data.longline.TripLonglineService; import java.util.Collection; import java.util.Date; import java.util.LinkedList; @@ -362,7 +361,4 @@ class TripLonglineUIHandler extends ContentOpenableUIHandler<TripLonglineDto, Tr return result; } - private TripLonglineService getTripLonglineService() { - return getServicesProvider().getTripLonglineService(); - } } ===================================== client/src/main/java/fr/ird/observe/client/ui/content/open/impl/seine/ActivitySeineUIHandler.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/open/impl/seine/ActivitySeineUIHandler.java +++ b/client/src/main/java/fr/ird/observe/client/ui/content/open/impl/seine/ActivitySeineUIHandler.java @@ -38,7 +38,6 @@ import fr.ird.observe.services.dto.seine.ActivitySeineDto; import fr.ird.observe.services.dto.seine.ActivitySeineHelper; import fr.ird.observe.services.dto.seine.RouteDto; import fr.ird.observe.services.dto.seine.TripSeineDto; -import fr.ird.observe.services.service.data.seine.ActivitySeineService; import java.util.HashSet; import java.util.List; import java.util.Optional; @@ -372,8 +371,4 @@ class ActivitySeineUIHandler extends ContentOpenableUIHandler<ActivitySeineDto, } - private ActivitySeineService getActivitySeineService() { - return getServicesProvider().getActivitySeineService(); - } - } ===================================== client/src/main/java/fr/ird/observe/client/ui/content/open/impl/seine/RouteUIHandler.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/open/impl/seine/RouteUIHandler.java +++ b/client/src/main/java/fr/ird/observe/client/ui/content/open/impl/seine/RouteUIHandler.java @@ -39,7 +39,6 @@ import fr.ird.observe.services.dto.seine.ActivitySeineDto; import fr.ird.observe.services.dto.seine.RouteDto; import fr.ird.observe.services.dto.seine.RouteHelper; import fr.ird.observe.services.dto.seine.TripSeineDto; -import fr.ird.observe.services.service.data.seine.RouteService; import java.util.Date; import javax.swing.JOptionPane; import org.apache.commons.logging.Log; @@ -413,7 +412,4 @@ class RouteUIHandler extends ContentOpenableUIHandler<RouteDto, RouteUI> impleme return !create && getOpenDataManager().canOpenRoute(getSelectedParentId()); } - private RouteService getRouteService() { - return getServicesProvider().getRouteService(); - } } ===================================== client/src/main/java/fr/ird/observe/client/ui/content/open/impl/seine/TripSeineUIHandler.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/open/impl/seine/TripSeineUIHandler.java +++ b/client/src/main/java/fr/ird/observe/client/ui/content/open/impl/seine/TripSeineUIHandler.java @@ -38,7 +38,6 @@ import fr.ird.observe.services.dto.referential.VesselHelper; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.dto.seine.TripSeineDto; import fr.ird.observe.services.dto.seine.TripSeineHelper; -import fr.ird.observe.services.service.data.seine.TripSeineService; import java.util.Collection; import java.util.Date; import java.util.LinkedList; @@ -355,8 +354,4 @@ class TripSeineUIHandler extends ContentOpenableUIHandler<TripSeineDto, TripSein return result; } - private TripSeineService getTripSeineService() { - return getServicesProvider().getTripSeineService(); - } - } ===================================== client/src/main/java/fr/ird/observe/client/ui/content/ref/ContentReferenceUIHandler.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/ref/ContentReferenceUIHandler.java +++ b/client/src/main/java/fr/ird/observe/client/ui/content/ref/ContentReferenceUIHandler.java @@ -47,7 +47,6 @@ import fr.ird.observe.services.dto.referential.ProgramHelper; import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.service.DataNotFoundException; -import fr.ird.observe.services.service.referential.ReferentialService; import java.awt.Container; import java.awt.Dimension; import java.awt.Font; @@ -830,8 +829,4 @@ public class ContentReferenceUIHandler<E extends ReferentialDto, U extends Conte binder.copy(source, target); } - private ReferentialService getReferentialService() { - return getServicesProvider().getReferentialService(); - } - } ===================================== client/src/main/java/fr/ird/observe/client/ui/content/table/impl/longline/CatchLonglineUIHandler.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/table/impl/longline/CatchLonglineUIHandler.java +++ b/client/src/main/java/fr/ird/observe/client/ui/content/table/impl/longline/CatchLonglineUIHandler.java @@ -59,8 +59,6 @@ import fr.ird.observe.services.dto.referential.WeightMeasureTypeDto; import fr.ird.observe.services.dto.referential.longline.CatchFateLonglineDto; import fr.ird.observe.services.dto.referential.longline.HealthnessDto; import fr.ird.observe.services.dto.result.SaveResultDto; -import fr.ird.observe.services.service.data.longline.BranchlineService; -import fr.ird.observe.services.service.data.longline.SetLonglineCatchService; import fr.ird.observe.services.service.data.longline.TripLonglineService; import java.beans.PropertyChangeListener; import java.util.Calendar; @@ -239,7 +237,7 @@ public class CatchLonglineUIHandler extends ContentTableUIHandler<SetLonglineCat } String openSetLonglineId = getDataContext().getSelectedSetLonglineId(); - SaveResultDto saveResult = getBranchLineService().save(openSetLonglineId, branchline); + SaveResultDto saveResult = getBranchlineService().save(openSetLonglineId, branchline); saveResult.toDto(branchline); // on recopie le last update car c'est le laste update de SetLongline qui est renvoyé. @@ -674,7 +672,7 @@ public class CatchLonglineUIHandler extends ContentTableUIHandler<SetLonglineCat String tripLonglineId = getDataContext().getSelectedTripLonglineId(); - TripLonglineService tripLonglineService = getServicesProvider().getTripLonglineService(); + TripLonglineService tripLonglineService = getTripLonglineService(); result = (List) tripLonglineService.getSpeciesByListAndTrip(tripLonglineId, speciesListId); result = ReferentialReferences.filterEnabled(result); @@ -808,7 +806,7 @@ public class CatchLonglineUIHandler extends ContentTableUIHandler<SetLonglineCat String setLonglineId = getDataContext().getSelectedSetLonglineId(); - Form<BranchlineDto> form = getBranchLineService().loadForm(setLonglineId, newValue.getId()); + Form<BranchlineDto> form = getBranchlineService().loadForm(setLonglineId, newValue.getId()); BranchlineHelper.copyBranchlineDto(form.getObject(), branchline); if (ui.getValidator().getBean() == null) { @@ -1003,14 +1001,6 @@ public class CatchLonglineUIHandler extends ContentTableUIHandler<SetLonglineCat return (CatchLonglineTableModel) super.getTableModel(); } - private SetLonglineCatchService getSetLonglineCatchService() { - return getServicesProvider().getSetLonglineCatchService(); - } - - private BranchlineService getBranchLineService() { - return getServicesProvider().getBranchlineService(); - } - public void moveCatchLonglineUp() { int selectedRow = getUi().getTable().getSelectedRow(); getTableModel().moveUp(selectedRow); ===================================== client/src/main/java/fr/ird/observe/client/ui/content/table/impl/longline/EncounterUIHandler.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/table/impl/longline/EncounterUIHandler.java +++ b/client/src/main/java/fr/ird/observe/client/ui/content/table/impl/longline/EncounterUIHandler.java @@ -37,7 +37,6 @@ import fr.ird.observe.services.dto.referential.SpeciesDto; import fr.ird.observe.services.dto.referential.SpeciesListDto; import fr.ird.observe.services.dto.referential.longline.EncounterTypeDto; import fr.ird.observe.services.dto.result.SaveResultDto; -import fr.ird.observe.services.service.data.longline.ActivityLongLineEncounterService; import fr.ird.observe.services.service.referential.ReferentialService; import java.util.Collection; import java.util.LinkedList; @@ -104,14 +103,14 @@ public class EncounterUIHandler extends ContentTableUIHandler<ActivityLonglineEn @Override protected void doPersist(ActivityLonglineEncounterDto bean) { - SaveResultDto saveResult = getActivityLongLineEncouterService().save(bean); + SaveResultDto saveResult = getActivityLongLineEncounterService().save(bean); saveResult.toDto(bean); } @Override protected void loadEditBean(String beanId) { - Form<ActivityLonglineEncounterDto> form = getActivityLongLineEncouterService().loadForm(beanId); + Form<ActivityLonglineEncounterDto> form = getActivityLongLineEncounterService().loadForm(beanId); loadReferentialReferenceSetsInModel(form); getModel().setForm(form); @@ -129,7 +128,7 @@ public class EncounterUIHandler extends ContentTableUIHandler<ActivityLonglineEn String speciesListId = ObserveSwingApplicationContext.get().getConfig().getSpeciesListLonglineEncounterId(); - ReferentialService referentialService = getServicesProvider().getReferentialService(); + ReferentialService referentialService = getReferentialService(); Form<SpeciesListDto> speciesListDtoForm = referentialService.loadForm(SpeciesListDto.class, speciesListId); SpeciesListDto speciesListDto = speciesListDtoForm.getObject(); @@ -151,7 +150,4 @@ public class EncounterUIHandler extends ContentTableUIHandler<ActivityLonglineEn } - private ActivityLongLineEncounterService getActivityLongLineEncouterService() { - return getServicesProvider().getActivityLongLineEncounterService(); - } } ===================================== client/src/main/java/fr/ird/observe/client/ui/content/table/impl/longline/GearUseFeaturesLonglineUIHandler.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/table/impl/longline/GearUseFeaturesLonglineUIHandler.java +++ b/client/src/main/java/fr/ird/observe/client/ui/content/table/impl/longline/GearUseFeaturesLonglineUIHandler.java @@ -45,7 +45,6 @@ import fr.ird.observe.services.dto.referential.GearCaracteristicDto; import fr.ird.observe.services.dto.referential.GearCaracteristicTypeHelper; import fr.ird.observe.services.dto.referential.GearDto; import fr.ird.observe.services.dto.result.SaveResultDto; -import fr.ird.observe.services.service.data.longline.TripLonglineGearUseService; import fr.ird.observe.services.service.referential.ReferentialService; import java.awt.GridBagConstraints; import java.awt.Insets; @@ -190,7 +189,7 @@ public class GearUseFeaturesLonglineUIHandler extends ContentTableUIHandler<Trip List<GearUseFeaturesMeasurementLonglineDto> getDefaultGearUseFeaturesMeasurementLongline(String gearId) { - ReferentialService referentialService = getServicesProvider().getReferentialService(); + ReferentialService referentialService = getReferentialService(); Form<GearDto> gearDtoForm = referentialService.loadForm(GearDto.class, gearId); @@ -480,8 +479,4 @@ public class GearUseFeaturesLonglineUIHandler extends ContentTableUIHandler<Trip TripLonglineGearUseHelper.copyTripLonglineGearUseDto(form.getObject(), getBean()); } - private TripLonglineGearUseService getTripLonglineGearUseService() { - return getServicesProvider().getTripLonglineGearUseService(); - } - } ===================================== client/src/main/java/fr/ird/observe/client/ui/content/table/impl/longline/SensorUsedUIHandler.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/table/impl/longline/SensorUsedUIHandler.java +++ b/client/src/main/java/fr/ird/observe/client/ui/content/table/impl/longline/SensorUsedUIHandler.java @@ -37,7 +37,6 @@ import fr.ird.observe.services.dto.referential.longline.SensorBrandDto; import fr.ird.observe.services.dto.referential.longline.SensorDataFormatDto; import fr.ird.observe.services.dto.referential.longline.SensorTypeDto; import fr.ird.observe.services.dto.result.SaveResultDto; -import fr.ird.observe.services.service.data.longline.ActivityLongLineSensorUsedService; import java.io.File; import java.io.IOException; import java.nio.file.Files; @@ -115,7 +114,7 @@ public class SensorUsedUIHandler extends ContentTableUIHandler<ActivityLonglineS DataFileDto dataFile = getTableEditBean().getData(); if (dataFile == null) { - dataFile = getActivityLonglineSensorUsedService().getDataFile(getTableEditBean().getId()); + dataFile = getActivityLongLineSensorUsedService().getDataFile(getTableEditBean().getId()); } int response = UIHelper.askUser(ui, @@ -180,7 +179,7 @@ public class SensorUsedUIHandler extends ContentTableUIHandler<ActivityLonglineS DataFileDto dataFile = getTableEditBean().getData(); if (dataFile == null) { - dataFile = getActivityLonglineSensorUsedService().getDataFile(getTableEditBean().getId()); + dataFile = getActivityLongLineSensorUsedService().getDataFile(getTableEditBean().getId()); } @@ -216,21 +215,17 @@ public class SensorUsedUIHandler extends ContentTableUIHandler<ActivityLonglineS @Override protected void doPersist(ActivityLonglineSensorUsedDto bean) { - SaveResultDto saveResult = getActivityLonglineSensorUsedService().save(bean); + SaveResultDto saveResult = getActivityLongLineSensorUsedService().save(bean); saveResult.toDto(bean); } @Override protected void loadEditBean(String beanId) { - Form<ActivityLonglineSensorUsedDto> form = getActivityLonglineSensorUsedService().loadForm(beanId); + Form<ActivityLonglineSensorUsedDto> form = getActivityLongLineSensorUsedService().loadForm(beanId); loadReferentialReferenceSetsInModel(form); getModel().setForm(form); ActivityLonglineSensorUsedHelper.copyActivityLonglineSensorUsedDto(form.getObject(), getBean()); } - private ActivityLongLineSensorUsedService getActivityLonglineSensorUsedService() { - return getServicesProvider().getActivityLongLineSensorUsedService(); - } - } ===================================== client/src/main/java/fr/ird/observe/client/ui/content/table/impl/longline/TdrUIHandler.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/table/impl/longline/TdrUIHandler.java +++ b/client/src/main/java/fr/ird/observe/client/ui/content/table/impl/longline/TdrUIHandler.java @@ -40,7 +40,6 @@ import fr.ird.observe.services.dto.reference.ReferentialReferences; import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.services.dto.referential.longline.SensorBrandDto; import fr.ird.observe.services.dto.result.SaveResultDto; -import fr.ird.observe.services.service.data.longline.TdrService; import fr.ird.observe.services.service.data.longline.TripLonglineService; import java.beans.PropertyChangeListener; import java.io.File; @@ -459,7 +458,7 @@ public class TdrUIHandler extends ContentTableUIHandler<SetLonglineTdrDto, TdrDt String tripLonglineId = getDataContext().getSelectedTripLonglineId(); - TripLonglineService tripLonglineService = getServicesProvider().getTripLonglineService(); + TripLonglineService tripLonglineService = getTripLonglineService(); result = (List) tripLonglineService.getSpeciesByListAndTrip(tripLonglineId, speciesListId); result = ReferentialReferences.filterEnabled(result); @@ -493,8 +492,4 @@ public class TdrUIHandler extends ContentTableUIHandler<SetLonglineTdrDto, TdrDt SetLonglineTdrHelper.copySetLonglineTdrDto(form.getObject(), getBean()); } - - private TdrService getTdrService() { - return getServicesProvider().getTdrService(); - } } ===================================== client/src/main/java/fr/ird/observe/client/ui/content/table/impl/seine/GearUseFeaturesSeineUIHandler.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/table/impl/seine/GearUseFeaturesSeineUIHandler.java +++ b/client/src/main/java/fr/ird/observe/client/ui/content/table/impl/seine/GearUseFeaturesSeineUIHandler.java @@ -45,7 +45,6 @@ import fr.ird.observe.services.dto.seine.GearUseFeaturesSeineDto; import fr.ird.observe.services.dto.seine.TripSeineDto; import fr.ird.observe.services.dto.seine.TripSeineGearUseDto; import fr.ird.observe.services.dto.seine.TripSeineGearUseHelper; -import fr.ird.observe.services.service.data.seine.TripSeineGearUseService; import fr.ird.observe.services.service.referential.ReferentialService; import java.awt.GridBagConstraints; import java.awt.Insets; @@ -190,7 +189,7 @@ public class GearUseFeaturesSeineUIHandler extends ContentTableUIHandler<TripSei List<GearUseFeaturesMeasurementSeineDto> getDefaultGearUseFeaturesMeasurementSeine(String gearId) { - ReferentialService referentialService = getServicesProvider().getReferentialService(); + ReferentialService referentialService = getReferentialService(); Form<GearDto> gearDtoForm = referentialService.loadForm(GearDto.class, gearId); @@ -480,8 +479,4 @@ public class GearUseFeaturesSeineUIHandler extends ContentTableUIHandler<TripSei TripSeineGearUseHelper.copyTripSeineGearUseDto(form.getObject(), getBean()); } - private TripSeineGearUseService getTripSeineGearUseService() { - return getServicesProvider().getTripSeineGearUseService(); - } - } ===================================== client/src/main/java/fr/ird/observe/client/ui/content/table/impl/seine/NonTargetCatchReleaseUIHandler.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/table/impl/seine/NonTargetCatchReleaseUIHandler.java +++ b/client/src/main/java/fr/ird/observe/client/ui/content/table/impl/seine/NonTargetCatchReleaseUIHandler.java @@ -38,8 +38,6 @@ import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.dto.seine.NonTargetCatchReleaseDto; import fr.ird.observe.services.dto.seine.SetSeineNonTargetCatchReleaseDto; import fr.ird.observe.services.dto.seine.SetSeineNonTargetCatchReleaseHelper; -import fr.ird.observe.services.service.data.seine.NonTargetCatchReleaseService; -import fr.ird.observe.services.service.referential.ReferentialService; import java.beans.PropertyChangeListener; import java.util.ArrayList; import java.util.Collection; @@ -282,15 +280,6 @@ public class NonTargetCatchReleaseUIHandler extends ContentTableUIHandler<SetSei } - private NonTargetCatchReleaseService getNonTargetCatchReleaseService() { - return getServicesProvider().getNonTargetCatchReleaseService(); - } - - - private ReferentialService getReferentialService() { - return getServicesProvider().getReferentialService(); - } - public void moveCatchLonglineUp() { int selectedRow = getUi().getTable().getSelectedRow(); getTableModel().moveUp(selectedRow); ===================================== client/src/main/java/fr/ird/observe/client/ui/content/table/impl/seine/NonTargetCatchUIHandler.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/table/impl/seine/NonTargetCatchUIHandler.java +++ b/client/src/main/java/fr/ird/observe/client/ui/content/table/impl/seine/NonTargetCatchUIHandler.java @@ -42,7 +42,6 @@ import fr.ird.observe.services.dto.seine.NonTargetCatchDto; import fr.ird.observe.services.dto.seine.NonTargetCatchHelper; import fr.ird.observe.services.dto.seine.SetSeineNonTargetCatchDto; import fr.ird.observe.services.dto.seine.SetSeineNonTargetCatchHelper; -import fr.ird.observe.services.service.data.seine.NonTargetCatchService; import fr.ird.observe.services.service.data.seine.TripSeineService; import java.beans.PropertyChangeListener; import java.util.ArrayList; @@ -389,7 +388,7 @@ public class NonTargetCatchUIHandler extends ContentTableUIHandler<SetSeineNonTa String speciesListId = ObserveSwingApplicationContext.get().getConfig().getSpeciesListSeineNonTargetCatchId(); String tripSeineId = getDataContext().getSelectedTripSeineId(); - TripSeineService tripSeineService = getServicesProvider().getTripSeineService(); + TripSeineService tripSeineService = getTripSeineService(); result = (List) tripSeineService.getSpeciesByListAndTrip(tripSeineId, speciesListId); result = ReferentialReferences.filterEnabled(result); @@ -416,7 +415,4 @@ public class NonTargetCatchUIHandler extends ContentTableUIHandler<SetSeineNonTa return result; } - private NonTargetCatchService getNonTargetCatchService() { - return getServicesProvider().getNonTargetCatchService(); - } } ===================================== client/src/main/java/fr/ird/observe/client/ui/content/table/impl/seine/NonTargetSampleUIHandler.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/table/impl/seine/NonTargetSampleUIHandler.java +++ b/client/src/main/java/fr/ird/observe/client/ui/content/table/impl/seine/NonTargetSampleUIHandler.java @@ -39,7 +39,6 @@ import fr.ird.observe.services.dto.seine.NonTargetLengthDto; import fr.ird.observe.services.dto.seine.NonTargetSampleDto; import fr.ird.observe.services.dto.seine.NonTargetSampleHelper; import fr.ird.observe.services.dto.seine.SetSeineDto; -import fr.ird.observe.services.service.data.seine.NonTargetSampleService; import java.util.Collection; import java.util.LinkedList; import java.util.List; @@ -354,10 +353,6 @@ public class NonTargetSampleUIHandler extends AbstractSampleUIHandler<NonTargetS } - private NonTargetSampleService getNonTargetSampleService() { - return getServicesProvider().getNonTargetSampleService(); - } - private Optional<ReferentialReference<SizeMeasureTypeDto>> getSpeciesDefaultSizeMeasureType(ReferentialReference<SpeciesDto> species) { Optional<ReferentialReference<SizeMeasureTypeDto>> result = Optional.empty(); if (species != null) { ===================================== client/src/main/java/fr/ird/observe/client/ui/content/table/impl/seine/ObjectObservedSpeciesUIHandler.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/table/impl/seine/ObjectObservedSpeciesUIHandler.java +++ b/client/src/main/java/fr/ird/observe/client/ui/content/table/impl/seine/ObjectObservedSpeciesUIHandler.java @@ -37,7 +37,6 @@ import fr.ird.observe.services.dto.seine.FloatingObjectObservedSpeciesDto; import fr.ird.observe.services.dto.seine.FloatingObjectObservedSpeciesHelper; import fr.ird.observe.services.dto.seine.ObjectObservedSpeciesDto; import fr.ird.observe.services.dto.seine.ObjectSchoolEstimateDto; -import fr.ird.observe.services.service.data.seine.ObjectObservedSpeciesService; import fr.ird.observe.services.service.referential.ReferentialService; import java.util.Collection; import java.util.LinkedList; @@ -122,7 +121,7 @@ public class ObjectObservedSpeciesUIHandler extends ContentTableUIHandler<Floati case ObjectSchoolEstimateDto.PROPERTY_SPECIES: { String speciesListId = ObserveSwingApplicationContext.get().getConfig().getSpeciesListSeineObjectObservedSpeciesId(); - ReferentialService referentialService = getServicesProvider().getReferentialService(); + ReferentialService referentialService = getReferentialService(); Form<SpeciesListDto> speciesListDtoForm = referentialService.loadForm(SpeciesListDto.class, speciesListId); SpeciesListDto speciesListDto = speciesListDtoForm.getObject(); @@ -143,7 +142,4 @@ public class ObjectObservedSpeciesUIHandler extends ContentTableUIHandler<Floati } - private ObjectObservedSpeciesService getObjectObservedSpeciesService() { - return getServicesProvider().getObjectObservedSpeciesService(); - } } ===================================== client/src/main/java/fr/ird/observe/client/ui/content/table/impl/seine/ObjectSchoolEstimateUIHandler.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/table/impl/seine/ObjectSchoolEstimateUIHandler.java +++ b/client/src/main/java/fr/ird/observe/client/ui/content/table/impl/seine/ObjectSchoolEstimateUIHandler.java @@ -35,7 +35,6 @@ import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.dto.seine.FloatingObjectSchoolEstimateDto; import fr.ird.observe.services.dto.seine.FloatingObjectSchoolEstimateHelper; import fr.ird.observe.services.dto.seine.ObjectSchoolEstimateDto; -import fr.ird.observe.services.service.data.seine.ObjectSchoolEstimateService; import fr.ird.observe.services.service.referential.ReferentialService; import java.util.Collection; import java.util.LinkedList; @@ -118,7 +117,7 @@ public class ObjectSchoolEstimateUIHandler extends ContentTableUIHandler<Floatin case ObjectSchoolEstimateDto.PROPERTY_SPECIES: { String speciesListId = ObserveSwingApplicationContext.get().getConfig().getSpeciesListSeineObjectSchoolEstimateId(); - ReferentialService referentialService = getServicesProvider().getReferentialService(); + ReferentialService referentialService = getReferentialService(); Form<SpeciesListDto> speciesListDtoForm = referentialService.loadForm(SpeciesListDto.class, speciesListId); SpeciesListDto speciesListDto = speciesListDtoForm.getObject(); @@ -138,7 +137,4 @@ public class ObjectSchoolEstimateUIHandler extends ContentTableUIHandler<Floatin } - private ObjectSchoolEstimateService getObjectSchoolEstimateService() { - return getServicesProvider().getObjectSchoolEstimateService(); - } } ===================================== client/src/main/java/fr/ird/observe/client/ui/content/table/impl/seine/SchoolEstimateUIHandler.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/table/impl/seine/SchoolEstimateUIHandler.java +++ b/client/src/main/java/fr/ird/observe/client/ui/content/table/impl/seine/SchoolEstimateUIHandler.java @@ -36,7 +36,6 @@ import fr.ird.observe.services.dto.seine.ObjectSchoolEstimateDto; import fr.ird.observe.services.dto.seine.SchoolEstimateDto; import fr.ird.observe.services.dto.seine.SetSeineSchoolEstimateDto; import fr.ird.observe.services.dto.seine.SetSeineSchoolEstimateHelper; -import fr.ird.observe.services.service.data.seine.SchoolEstimateService; import fr.ird.observe.services.service.data.seine.TripSeineService; import java.util.Collection; import java.util.Collections; @@ -151,7 +150,7 @@ public class SchoolEstimateUIHandler extends ContentTableUIHandler<SetSeineSchoo String speciesListId = ObserveSwingApplicationContext.get().getConfig().getSpeciesListSeineSchoolEstimateId(); String tripSeineId = getDataContext().getSelectedTripSeineId(); - TripSeineService tripSeineService = getServicesProvider().getTripSeineService(); + TripSeineService tripSeineService = getTripSeineService(); result = (List) tripSeineService.getSpeciesByListAndTrip(tripSeineId, speciesListId); result = ReferentialReferences.filterEnabled(result); @@ -169,7 +168,4 @@ public class SchoolEstimateUIHandler extends ContentTableUIHandler<SetSeineSchoo } - private SchoolEstimateService getSchoolEstimateService() { - return getServicesProvider().getSchoolEstimateService(); - } } ===================================== client/src/main/java/fr/ird/observe/client/ui/content/table/impl/seine/TargetCatchUIHandler.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/table/impl/seine/TargetCatchUIHandler.java +++ b/client/src/main/java/fr/ird/observe/client/ui/content/table/impl/seine/TargetCatchUIHandler.java @@ -41,7 +41,6 @@ import fr.ird.observe.services.dto.seine.SetSeineTargetCatchDto; import fr.ird.observe.services.dto.seine.SetSeineTargetCatchHelper; import fr.ird.observe.services.dto.seine.TargetCatchDto; import fr.ird.observe.services.dto.seine.TargetCatchHelper; -import fr.ird.observe.services.service.data.seine.TargetCatchService; import fr.ird.observe.services.service.data.seine.TripSeineService; import java.util.Collection; import java.util.Collections; @@ -300,7 +299,7 @@ public class TargetCatchUIHandler extends ContentTableUIHandler<SetSeineTargetCa String speciesListId = ObserveSwingApplicationContext.get().getConfig().getSpeciesListSeineTargetCatchId(); String tripSeineId = getDataContext().getSelectedTripSeineId(); - TripSeineService tripSeineService = getServicesProvider().getTripSeineService(); + TripSeineService tripSeineService = getTripSeineService(); result = (List) tripSeineService.getSpeciesByListAndTrip(tripSeineId, speciesListId); result = ReferentialReferences.filterEnabled(result); @@ -318,8 +317,4 @@ public class TargetCatchUIHandler extends ContentTableUIHandler<SetSeineTargetCa } - private TargetCatchService getTargetCatchService() { - return getServicesProvider().getTargetCatchService(); - } - } ===================================== client/src/main/java/fr/ird/observe/client/ui/content/table/impl/seine/TargetDiscardCatchUIHandler.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/table/impl/seine/TargetDiscardCatchUIHandler.java +++ b/client/src/main/java/fr/ird/observe/client/ui/content/table/impl/seine/TargetDiscardCatchUIHandler.java @@ -42,7 +42,6 @@ import fr.ird.observe.services.dto.seine.SetSeineTargetCatchDto; import fr.ird.observe.services.dto.seine.SetSeineTargetCatchHelper; import fr.ird.observe.services.dto.seine.TargetCatchDto; import fr.ird.observe.services.dto.seine.TargetCatchHelper; -import fr.ird.observe.services.service.data.seine.TargetCatchService; import fr.ird.observe.services.service.data.seine.TripSeineService; import java.util.ArrayList; import java.util.Collection; @@ -430,7 +429,7 @@ public class TargetDiscardCatchUIHandler extends ContentTableUIHandler<SetSeineT String speciesListId = ObserveSwingApplicationContext.get().getConfig().getSpeciesListSeineTargetCatchId(); String tripSeineId = getDataContext().getSelectedTripSeineId(); - TripSeineService tripSeineService = getServicesProvider().getTripSeineService(); + TripSeineService tripSeineService = getTripSeineService(); result = (List) tripSeineService.getSpeciesByListAndTrip(tripSeineId, speciesListId); result = ReferentialReferences.filterEnabled(result); @@ -448,7 +447,4 @@ public class TargetDiscardCatchUIHandler extends ContentTableUIHandler<SetSeineT } - private TargetCatchService getTargetCatchService() { - return getServicesProvider().getTargetCatchService(); - } } ===================================== client/src/main/java/fr/ird/observe/client/ui/content/table/impl/seine/TargetSampleUIHandler.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/table/impl/seine/TargetSampleUIHandler.java +++ b/client/src/main/java/fr/ird/observe/client/ui/content/table/impl/seine/TargetSampleUIHandler.java @@ -39,7 +39,6 @@ import fr.ird.observe.services.dto.seine.SetSeineDto; import fr.ird.observe.services.dto.seine.TargetLengthDto; import fr.ird.observe.services.dto.seine.TargetSampleDto; import fr.ird.observe.services.dto.seine.TargetSampleHelper; -import fr.ird.observe.services.service.data.seine.TargetSampleService; import java.util.Collection; import java.util.LinkedList; import java.util.List; @@ -388,10 +387,6 @@ public class TargetSampleUIHandler<U extends ContentTableUI<TargetSampleDto, Tar } - private TargetSampleService getTargetSampleService() { - return getServicesProvider().getTargetSampleService(); - } - private Optional<ReferentialReference<SizeMeasureTypeDto>> getSpeciesDefaultSizeMeasureType(ReferentialReference<SpeciesDto> species) { Optional<ReferentialReference<SizeMeasureTypeDto>> result = Optional.empty(); if (species != null) { View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/432065545bf39071ddc58aed6b04... --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/432065545bf39071ddc58aed6b04... You're receiving this email because of your account on gitlab.com.