[Observe-commits] 03/04: Utilisation du support de services dans l'application swing

This is an automated email from the git hooks/post-receive script. New commit to branch feature/7549_administration_des_sources_de_donnes in repository tutti. See http://git.codelutin.com/tutti.git commit 3dbaf8ff9e7d1ba0c440f63d1a8795172f67854b Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Jan 10 19:06:51 2016 +0100 Utilisation du support de services dans l'application swing --- .../observe/ObserveSwingApplicationContext.java | 53 +++---- .../observe/db/ObserveServiceSupportFactory.java | 157 +++++++++++++++++++++ .../fr/ird/observe/db/ObserveSwingDataSource.java | 143 +++++++------------ .../ui/actions/shared/AbstractUIAction.java | 7 + .../shared/MoveActivityLonglinesUIAction.java | 2 +- .../actions/shared/MoveActivitySeinesUIAction.java | 2 +- .../ui/actions/shared/MoveRoutesUIAction.java | 2 +- .../actions/shared/MoveTripLonglinesUIAction.java | 3 +- .../ui/actions/shared/MoveTripSeinesUIAction.java | 3 +- .../fr/ird/observe/ui/admin/AdminTabUIHandler.java | 4 +- .../java/fr/ird/observe/ui/admin/AdminUIModel.java | 4 +- .../ui/admin/consolidate/ConsolidateUIHandler.java | 2 +- .../observe/ui/admin/export/ExportUIHandler.java | 4 +- .../observe/ui/admin/report/ReportUIHandler.java | 4 +- .../observe/ui/admin/save/SaveLocalUIHandler.java | 3 +- .../ui/admin/validate/ValidateUIHandler.java | 2 +- .../ird/observe/ui/content/ContentUIHandler.java | 5 + .../LonglineDetailCompositionUIHandler.java | 2 +- .../LonglineGlobalCompositionUIHandler.java | 5 +- .../impl/longline/SetLonglineUIHandler.java | 3 +- .../ActivitySeineObservedSystemUIHandler.java | 5 +- ...ngObjectTransmittingBuoyOperationUIHandler.java | 3 +- .../impl/seine/FloatingObjectUIHandler.java | 2 +- .../ui/content/impl/seine/SetSeineUIHandler.java | 5 +- .../impl/longline/ActivityLonglinesUIHandler.java | 5 +- .../list/impl/longline/TripLonglinesUIHandler.java | 5 +- .../list/impl/seine/ActivitySeinesUIHandler.java | 5 +- .../content/list/impl/seine/RoutesUIHandler.java | 5 +- .../list/impl/seine/TripSeinesUIHandler.java | 5 +- .../impl/longline/ActivityLonglineUIHandler.java | 3 +- .../open/impl/longline/TripLonglineUIHandler.java | 3 +- .../open/impl/seine/ActivitySeineUIHandler.java | 5 +- .../ui/content/open/impl/seine/RouteUIHandler.java | 2 +- .../open/impl/seine/TripSeineUIHandler.java | 3 +- .../ui/content/ref/ContentReferenceUIHandler.java | 2 +- .../impl/longline/CatchLonglineUIHandler.java | 9 +- .../table/impl/longline/EncounterUIHandler.java | 3 +- .../longline/GearUseFeaturesLonglineUIHandler.java | 6 +- .../table/impl/longline/SensorUsedUIHandler.java | 2 +- .../content/table/impl/longline/TdrUIHandler.java | 2 +- .../impl/seine/GearUseFeaturesSeineUIHandler.java | 6 +- .../table/impl/seine/NonTargetCatchUIHandler.java | 3 +- .../table/impl/seine/NonTargetSampleUIHandler.java | 3 +- .../impl/seine/ObjectObservedSpeciesUIHandler.java | 3 +- .../impl/seine/ObjectSchoolEstimateUIHandler.java | 3 +- .../table/impl/seine/SchoolEstimateUIHandler.java | 3 +- .../table/impl/seine/TargetCatchUIHandler.java | 3 +- .../impl/seine/TargetDiscardCatchUIHandler.java | 3 +- .../table/impl/seine/TargetSampleUIHandler.java | 3 +- .../ird/observe/ui/storage/StorageUIHandler.java | 7 +- .../fr/ird/observe/ui/storage/StorageUIModel.java | 4 +- .../ui/storage/tabs/DataSelectionModel.java | 6 +- .../ui/tree/AbstrctReferenceNodeSupport.java | 4 +- .../ird/observe/ui/tree/ActivityLonglineNode.java | 5 +- .../fr/ird/observe/ui/tree/ActivitySeineNode.java | 5 +- .../observe/ui/tree/FloatingObjectSeineNode.java | 5 +- .../java/fr/ird/observe/ui/tree/ObserveNode.java | 7 + .../ird/observe/ui/tree/ProgramLonglineNode.java | 5 +- .../fr/ird/observe/ui/tree/ProgramSeineNode.java | 5 +- .../fr/ird/observe/ui/tree/RouteSeineNode.java | 5 +- .../fr/ird/observe/ui/tree/SetLonglineNode.java | 5 +- .../java/fr/ird/observe/ui/tree/SetSeineNode.java | 5 +- .../fr/ird/observe/ui/tree/TripLonglineNode.java | 5 +- .../java/fr/ird/observe/ui/tree/TripSeineNode.java | 5 +- .../actions/ChangeActivityRouteActionListener.java | 4 +- .../actions/ChangeActivityTripActionListener.java | 4 +- .../actions/ChangeRouteTripActionListener.java | 4 +- .../actions/ChangeTripProgramActionListener.java | 6 +- .../ui/tree/actions/NodeChangeActionListener.java | 5 + .../ui/tree/loadors/AbstractNodeChildLoador.java | 5 + .../loadors/ActivityLonglinesNodeChildLoador.java | 3 +- .../tree/loadors/ActivitySeineNodeChildLoador.java | 3 +- .../loadors/ActivitySeinesNodeChildLoador.java | 3 +- .../loadors/ProgramLonglineNodeChildLoador.java | 3 +- .../tree/loadors/ProgramSeineNodeChildLoador.java | 3 +- .../ui/tree/loadors/RootNodeChildLoador.java | 3 - .../ui/tree/loadors/RoutesNodeChildLoador.java | 3 +- .../ird/observe/validation/ValidationContext.java | 18 +-- 78 files changed, 363 insertions(+), 302 deletions(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ObserveSwingApplicationContext.java b/observe-application-swing/src/main/java/fr/ird/observe/ObserveSwingApplicationContext.java index e523539..b1b4b80 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ObserveSwingApplicationContext.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ObserveSwingApplicationContext.java @@ -21,7 +21,6 @@ */ package fr.ird.observe; -import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Lists; import fr.ird.observe.configuration.ObserveSwingApplicationConfig; @@ -31,8 +30,8 @@ import fr.ird.observe.db.constants.DbMode; import fr.ird.observe.db.event.ObserveSwingDataSourceEvent; import fr.ird.observe.db.event.ObserveSwingDataSourceListenerAdapter; import fr.ird.observe.services.ObserveDataSourceConfigurationMainFactory; -import fr.ird.observe.services.ObserveService; import fr.ird.observe.services.ObserveServiceMainFactory; +import fr.ird.observe.services.ObserveServiceSupport; import fr.ird.observe.services.configuration.ObserveDataSourceConfiguration; import fr.ird.observe.services.configuration.ObserveDataSourceConfigurationTopiaH2; import fr.ird.observe.services.configuration.ObserveDataSourceInformation; @@ -44,17 +43,8 @@ import fr.ird.observe.services.dto.referential.ProgramDto; import fr.ird.observe.services.service.BabModelVersionException; import fr.ird.observe.services.service.DatabaseConnexionNotAuthorizedException; import fr.ird.observe.services.service.DatabaseNotFoundException; -import fr.ird.observe.services.service.ReferentialService; import fr.ird.observe.services.service.actions.validate.ValidateServiceUtils; import fr.ird.observe.services.service.actions.validate.ValidatorDto; -import fr.ird.observe.services.service.longline.ActivityLonglineService; -import fr.ird.observe.services.service.longline.SetLonglineService; -import fr.ird.observe.services.service.longline.TripLonglineService; -import fr.ird.observe.services.service.seine.ActivitySeineService; -import fr.ird.observe.services.service.seine.FloatingObjectService; -import fr.ird.observe.services.service.seine.RouteService; -import fr.ird.observe.services.service.seine.SetSeineService; -import fr.ird.observe.services.service.seine.TripSeineService; import fr.ird.observe.ui.DecoratorService; import fr.ird.observe.ui.ObserveMainUI; import fr.ird.observe.ui.ObserveMainUIHandler; @@ -350,17 +340,6 @@ public class ObserveSwingApplicationContext extends DefaultApplicationContext im return result; } - public <S extends ObserveService> S newService(Class<S> serviceType) { - - ObserveSwingDataSource dataSource = getDataSource(); - - Preconditions.checkNotNull(dataSource, "Aucune source de données configurée"); - - S service = dataSource.newService(serviceType); - - return service; - } - public final DataContext getDataContext() { DataContext result = DATA_CONTEXT_ENTRY_DEF.getContextValue(this); if (result == null) { @@ -429,7 +408,6 @@ public class ObserveSwingApplicationContext extends DefaultApplicationContext im } - //------------------------------------------- // UI instances //------------------------------------------- @@ -540,7 +518,7 @@ public class ObserveSwingApplicationContext extends DefaultApplicationContext im JPanel container = ui.getContent(); Component currentContent = layout.getVisibleComponent(container); if (currentContent != null && - currentContent instanceof ContentUI<?>) { + currentContent instanceof ContentUI<?>) { result = (ContentUI<?>) currentContent; } @@ -650,7 +628,7 @@ public class ObserveSwingApplicationContext extends DefaultApplicationContext im int reponse = UIHelper.askUser( t("observe.title.no.local.db.found"), t("observe.message.no.local.db.found", - config.getLocalDBDirectory()), + config.getLocalDBDirectory()), JOptionPane.QUESTION_MESSAGE, new Object[]{ t("observe.choice.useRemoteStorage"), @@ -798,7 +776,7 @@ public class ObserveSwingApplicationContext extends DefaultApplicationContext im if (log.isDebugEnabled()) { log.debug("dispose ui from storage " + - source.getLabel() + ": " + mainUI.getName()); + source.getLabel() + ": " + mainUI.getName()); } mainUI.setMode(ObserveUIMode.NO_DB); @@ -832,7 +810,7 @@ public class ObserveSwingApplicationContext extends DefaultApplicationContext im if (mainUI != null) { if (log.isDebugEnabled()) { log.debug("loading ui for storage " + source.getLabel() + - ": " + mainUI.getName()); + ": " + mainUI.getName()); } DataContext dataContext = mainUI.getDataContext(); @@ -921,7 +899,7 @@ public class ObserveSwingApplicationContext extends DefaultApplicationContext im if (!dataSourceConfigurationH2.getDatabaseFile().exists()) { throw new IllegalStateException( "local base must exist, when using this method (" + - dataSourceConfigurationH2.getDirectory() + ')'); + dataSourceConfigurationH2.getDirectory() + ')'); } ObserveSwingDataSource dataSource = get().newDataSource(dataSourceConfigurationH2); @@ -934,6 +912,7 @@ public class ObserveSwingApplicationContext extends DefaultApplicationContext im boolean exists = true; + ObserveServiceSupport serviceSupportFactory = getDataSource().getServiceSupportFactory(); for (int i = 0, l = ids.length; i < l; i++) { String id = ids[i]; @@ -942,39 +921,39 @@ public class ObserveSwingApplicationContext extends DefaultApplicationContext im if (exists) { if (IdDtos.isProgramId(id)) { - exists = newService(ReferentialService.class).exists(ProgramDto.class, id); + exists = serviceSupportFactory.getReferentialService().exists(ProgramDto.class, id); } else if (IdDtos.isTripSeineId(id)) { - exists = newService(TripSeineService.class).exists(id); + exists = serviceSupportFactory.getTripSeineService().exists(id); } else if (IdDtos.isRouteId(id)) { - exists = newService(RouteService.class).exists(id); + exists = serviceSupportFactory.getRouteService().exists(id); } else if (IdDtos.isActivitySeineId(id)) { - exists = newService(ActivitySeineService.class).exists(id); + exists = serviceSupportFactory.getActivitySeineService().exists(id); } else if (IdDtos.isSetSeineId(id)) { - exists = newService(SetSeineService.class).exists(id); + exists = serviceSupportFactory.getSetSeineService().exists(id); } else if (IdDtos.isFloatingObjectId(id)) { - exists = newService(FloatingObjectService.class).exists(id); + exists = serviceSupportFactory.getFloatingObjectService().exists(id); } else if (IdDtos.isTripLonglineId(id)) { - exists = newService(TripLonglineService.class).exists(id); + exists = serviceSupportFactory.getTripLonglineService().exists(id); } else if (IdDtos.isActivityLonglineId(id)) { - exists = newService(ActivityLonglineService.class).exists(id); + exists = serviceSupportFactory.getActivityLonglineService().exists(id); } else if (IdDtos.isSetLonglineId(id)) { - exists = newService(SetLonglineService.class).exists(id); + exists = serviceSupportFactory.getSetLonglineService().exists(id); } else { diff --git a/observe-application-swing/src/main/java/fr/ird/observe/db/ObserveServiceSupportFactory.java b/observe-application-swing/src/main/java/fr/ird/observe/db/ObserveServiceSupportFactory.java new file mode 100644 index 0000000..f1cbb0d --- /dev/null +++ b/observe-application-swing/src/main/java/fr/ird/observe/db/ObserveServiceSupportFactory.java @@ -0,0 +1,157 @@ +package fr.ird.observe.db; + +import fr.ird.observe.ObserveSwingApplicationContext; +import fr.ird.observe.configuration.ObserveSwingApplicationConfig; +import fr.ird.observe.services.ObserveService; +import fr.ird.observe.services.ObserveServiceInitializer; +import fr.ird.observe.services.ObserveServiceMainFactory; +import fr.ird.observe.services.ObserveServiceSupport; +import fr.ird.observe.services.ObserveSpeciesListConfiguration; +import fr.ird.observe.services.configuration.ObserveDataSourceConfiguration; +import fr.ird.observe.services.configuration.ObserveDataSourceConfigurationAndConnection; +import fr.ird.observe.services.configuration.ObserveDataSourceConnection; +import fr.ird.observe.services.dto.constants.ReferentialLocale; +import fr.ird.observe.services.service.DataSourceService; +import fr.ird.observe.services.service.PingService; +import fr.ird.observe.services.service.ReferentialService; +import fr.ird.observe.services.service.SqlScriptProducerService; +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.validate.ValidateService; +import fr.ird.observe.services.service.longline.ActivityLongLineEncouterService; +import fr.ird.observe.services.service.longline.ActivityLongLineSensorUsedService; +import fr.ird.observe.services.service.longline.ActivityLonglineService; +import fr.ird.observe.services.service.longline.BranchlineService; +import fr.ird.observe.services.service.longline.SetLonglineCatchService; +import fr.ird.observe.services.service.longline.SetLonglineDetailCompositionService; +import fr.ird.observe.services.service.longline.SetLonglineGlobalCompositionService; +import fr.ird.observe.services.service.longline.SetLonglineService; +import fr.ird.observe.services.service.longline.TdrService; +import fr.ird.observe.services.service.longline.TripLonglineGearUseService; +import fr.ird.observe.services.service.longline.TripLonglineService; +import fr.ird.observe.services.service.seine.ActivitySeineObservedSystemService; +import fr.ird.observe.services.service.seine.ActivitySeineService; +import fr.ird.observe.services.service.seine.FloatingObjectService; +import fr.ird.observe.services.service.seine.NonTargetCatchService; +import fr.ird.observe.services.service.seine.NonTargetSampleService; +import fr.ird.observe.services.service.seine.ObjectObservedSpeciesService; +import fr.ird.observe.services.service.seine.ObjectSchoolEstimateService; +import fr.ird.observe.services.service.seine.RouteService; +import fr.ird.observe.services.service.seine.SchoolEstimateService; +import fr.ird.observe.services.service.seine.SetSeineService; +import fr.ird.observe.services.service.seine.TargetCatchService; +import fr.ird.observe.services.service.seine.TargetSampleService; +import fr.ird.observe.services.service.seine.TransmittingBuoyOperationService; +import fr.ird.observe.services.service.seine.TripSeineGearUseService; +import fr.ird.observe.services.service.seine.TripSeineService; + +import java.io.File; +import java.util.Locale; + +/** + * Created on 10/01/16. + * + * @author Tony Chemit - chemit@codelutin.com + */ +public class ObserveServiceSupportFactory implements ObserveServiceSupport { + + private static final long serialVersionUID = 1L; + + public static ObserveServiceSupport newServiceSupport(ObserveSwingDataSource dataSource) { + return new ObserveServiceSupportFactory(dataSource.getConfiguration(), dataSource.getConnection()); + } + + public static ObserveServiceSupport newServiceSupport(ObserveDataSourceConfiguration configuration) { + return new ObserveServiceSupportFactory(configuration, null); + } + + public static ObserveServiceSupport newServiceSupport(ObserveDataSourceConfiguration configuration, ObserveDataSourceConnection connection) { + return new ObserveServiceSupportFactory(configuration, connection); + } + + private final ObserveServiceInitializer observeServiceInitializer; + + private ObserveServiceSupportFactory(ObserveDataSourceConfiguration configuration, ObserveDataSourceConnection connection) { + this.observeServiceInitializer = getObserveServiceInitializer(configuration, connection); + } + + @Override public SqlScriptProducerService getSqlScriptProducerService() { return newService(SqlScriptProducerService.class); } + @Override public ReferentialService getReferentialService() { + return newService(ReferentialService.class); + } + @Override public DataSourceService getDataSourceService() { + return newService(DataSourceService.class); + } + @Override public PingService getPingService() { return newService(PingService.class); } + @Override public ConsolidateDataService getConsolidateDataService() { return newService(ConsolidateDataService.class); } + @Override public ReportService getReportService() { return newService(ReportService.class); } + @Override public ValidateService getValidateService() { return newService(ValidateService.class); } + @Override public TripSeineService getTripSeineService() { return newService(TripSeineService.class); } + @Override public RouteService getRouteService() { return newService(RouteService.class); } + @Override public ActivitySeineService getActivitySeineService() { return newService(ActivitySeineService.class); } + @Override public SetSeineService getSetSeineService() { return newService(SetSeineService.class); } + @Override public FloatingObjectService getFloatingObjectService() { return newService(FloatingObjectService.class); } + @Override public TripLonglineService getTripLonglineService() { return newService(TripLonglineService.class); } + @Override public ActivityLonglineService getActivityLonglineService() { return newService(ActivityLonglineService.class); } + @Override public SetLonglineService getSetLonglineService() { return newService(SetLonglineService.class); } + @Override public SetLonglineDetailCompositionService getSetLonglineDetailCompositionService() { return newService(SetLonglineDetailCompositionService.class); } + @Override public SetLonglineGlobalCompositionService getSetLonglineGlobalCompositionService() { return newService(SetLonglineGlobalCompositionService.class); } + @Override public ActivitySeineObservedSystemService getActivitySeineObservedSystemService() { return newService(ActivitySeineObservedSystemService.class); } + @Override public TransmittingBuoyOperationService getTransmittingBuoyOperationService() { return newService(TransmittingBuoyOperationService.class); } + @Override public SetLonglineCatchService getSetLonglineCatchService() { return newService(SetLonglineCatchService.class); } + @Override public BranchlineService getBranchlineService() { return newService(BranchlineService.class); } + @Override public ActivityLongLineEncouterService getActivityLongLineEncouterService() { return newService(ActivityLongLineEncouterService.class); } + @Override public TripLonglineGearUseService getTripLonglineGearUseService() { return newService(TripLonglineGearUseService.class); } + @Override public ActivityLongLineSensorUsedService getActivityLongLineSensorUsedService() { return newService(ActivityLongLineSensorUsedService.class); } + @Override public TdrService getTdrService() { return newService(TdrService.class); } + @Override public TripSeineGearUseService getTripSeineGearUseService() { return newService(TripSeineGearUseService.class); } + @Override public NonTargetCatchService getNonTargetCatchService() { return newService(NonTargetCatchService.class); } + @Override public NonTargetSampleService getNonTargetSampleService() { return newService(NonTargetSampleService.class); } + @Override public ObjectObservedSpeciesService getObjectObservedSpeciesService() { return newService(ObjectObservedSpeciesService.class); } + @Override public ObjectSchoolEstimateService getObjectSchoolEstimateService() { return newService(ObjectSchoolEstimateService.class); } + @Override public SchoolEstimateService getSchoolEstimateService() { return newService(SchoolEstimateService.class); } + @Override public TargetCatchService getTargetCatchService() { return newService(TargetCatchService.class); } + @Override public TargetSampleService getTargetSampleService() { return newService(TargetSampleService.class); } + + private <S extends ObserveService> S newService(Class<S> serviceType) { + + ObserveServiceMainFactory serviceFactory = ObserveServiceMainFactory.get(); + S service = serviceFactory.newService(observeServiceInitializer, serviceType); + return service; + + } + + private ObserveServiceInitializer getObserveServiceInitializer(ObserveDataSourceConfiguration configuration, ObserveDataSourceConnection connection) { + + ObserveSwingApplicationContext context = ObserveSwingApplicationContext.get(); + + ObserveSwingApplicationConfig config = context.getConfig(); + + Locale locale = config.getLocale(); + + File tmpDirectory = config.getTmpDirectory(); + + ReferentialLocale referentialLocale = ReferentialLocale.valueOf(locale); + + ObserveDataSourceConfigurationAndConnection configurationAndConnection = new ObserveDataSourceConfigurationAndConnection(configuration, connection); + + ObserveSpeciesListConfiguration speciesListConfiguration = new ObserveSpeciesListConfiguration(); + speciesListConfiguration.setSpeciesListLonglineCatchId(config.getSpeciesListLonglineCatchId()); + speciesListConfiguration.setSpeciesListLonglineDepredatorId(config.getSpeciesListLonglineDepredatorId()); + speciesListConfiguration.setSpeciesListLonglineEncounterId(config.getSpeciesListLonglineEncounterId()); + speciesListConfiguration.setSpeciesListSeineNonTargetCatchId(config.getSpeciesListSeineNonTargetCatchId()); + speciesListConfiguration.setSpeciesListSeineObjectObservedSpeciesId(config.getSpeciesListSeineObjectObservedSpeciesId()); + speciesListConfiguration.setSpeciesListSeineObjectSchoolEstimateId(config.getSpeciesListSeineObjectSchoolEstimateId()); + speciesListConfiguration.setSpeciesListSeineSchoolEstimateId(config.getSpeciesListSeineSchoolEstimateId()); + speciesListConfiguration.setSpeciesListSeineTargetCatchId(config.getSpeciesListSeineTargetCatchId()); + + ObserveServiceInitializer observeServiceInitializer = ObserveServiceInitializer.create( + locale, + referentialLocale, + tmpDirectory, + speciesListConfiguration, + configurationAndConnection); + + return observeServiceInitializer; + } +} diff --git a/observe-application-swing/src/main/java/fr/ird/observe/db/ObserveSwingDataSource.java b/observe-application-swing/src/main/java/fr/ird/observe/db/ObserveSwingDataSource.java index eaa11af..6e907d3 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/db/ObserveSwingDataSource.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/db/ObserveSwingDataSource.java @@ -7,12 +7,8 @@ import fr.ird.observe.ObserveSwingApplicationContext; import fr.ird.observe.configuration.ObserveSwingApplicationConfig; import fr.ird.observe.db.event.ObserveSwingDataSourceEvent; import fr.ird.observe.db.event.ObserveSwingDataSourceListener; -import fr.ird.observe.services.ObserveService; -import fr.ird.observe.services.ObserveServiceInitializer; -import fr.ird.observe.services.ObserveServiceMainFactory; -import fr.ird.observe.services.ObserveSpeciesListConfiguration; +import fr.ird.observe.services.ObserveServiceSupport; import fr.ird.observe.services.configuration.ObserveDataSourceConfiguration; -import fr.ird.observe.services.configuration.ObserveDataSourceConfigurationAndConnection; import fr.ird.observe.services.configuration.ObserveDataSourceConfigurationRest; import fr.ird.observe.services.configuration.ObserveDataSourceConfigurationTopiaH2; import fr.ird.observe.services.configuration.ObserveDataSourceConfigurationTopiaPG; @@ -22,7 +18,6 @@ import fr.ird.observe.services.dto.DataSourceCreateConfigurationDto; import fr.ird.observe.services.dto.DataSourceCreateWithNoReferentialImportException; import fr.ird.observe.services.dto.IncompatibleDataSourceCreateConfigurationException; import fr.ird.observe.services.dto.ObserveDbUserDto; -import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.services.dto.referential.ReferentialReference; import fr.ird.observe.services.dto.referential.ReferentialReferenceSet; @@ -32,7 +27,6 @@ import fr.ird.observe.services.service.DatabaseConnexionNotAuthorizedException; import fr.ird.observe.services.service.DatabaseNotFoundException; import fr.ird.observe.services.service.ObserveReferentialCache; import fr.ird.observe.services.service.ReferentialService; -import fr.ird.observe.services.service.SqlScriptProducerService; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.jdesktop.beans.AbstractSerializableBean; @@ -41,8 +35,6 @@ import org.nuiton.version.Version; import javax.swing.JOptionPane; import javax.swing.event.EventListenerList; import java.io.Closeable; -import java.io.File; -import java.util.Locale; import java.util.Set; import static org.nuiton.i18n.I18n.t; @@ -56,7 +48,9 @@ public class ObserveSwingDataSource extends AbstractSerializableBean implements private static final Log log = LogFactory.getLog(ObserveSwingDataSource.class); - /** le conteneur de listeners */ + /** + * le conteneur de listeners + */ protected final EventListenerList listenerList; protected final ObserveDataSourceConfiguration configuration; @@ -65,6 +59,8 @@ public class ObserveSwingDataSource extends AbstractSerializableBean implements protected ObserveDataSourceConnection connection; + protected ObserveServiceSupport serviceSupportFactory; + public ObserveSwingDataSource(ObserveDataSourceConfiguration configuration) { this.configuration = configuration; this.listenerList = new EventListenerList(); @@ -83,14 +79,6 @@ public class ObserveSwingDataSource extends AbstractSerializableBean implements return configuration.getLabel(); } -// public String getAuthenticationToken() { -// String result = null; -// if (connection != null) { -// result = connection.getAuthenticationToken(); -// } -// return result; -// } - public boolean canWriteData() { boolean result = connection != null && connection.canWriteData(); return result; @@ -139,10 +127,12 @@ public class ObserveSwingDataSource extends AbstractSerializableBean implements fireOpening(); - DataSourceService dataSourceService = newService(DataSourceService.class); + DataSourceService dataSourceService = getServiceSupportFactory().getDataSourceService(); connection = dataSourceService.open(configuration); + serviceSupportFactory = null; + fireNewMessage(t("observe.storage.message.opened", getLabel())); fireOpened(); } @@ -154,10 +144,12 @@ public class ObserveSwingDataSource extends AbstractSerializableBean implements fireNewMessage(t("observe.storage.message.creating", getLabel())); fireOpening(); - DataSourceService dataSourceService = newService(DataSourceService.class); + DataSourceService dataSourceService = getServiceSupportFactory().getDataSourceService(); connection = dataSourceService.create(configuration, createDto); + serviceSupportFactory = null; + fireNewMessage(t("observe.storage.message.created", getLabel())); fireOpened(); } @@ -172,11 +164,10 @@ public class ObserveSwingDataSource extends AbstractSerializableBean implements referentialCache.close(); - DataSourceService dataSourceService = newService(DataSourceService.class); - - dataSourceService.close(); + getServiceSupportFactory().getDataSourceService().close(); connection = null; + serviceSupportFactory = null; fireNewMessage(t("observe.storage.message.closed", getLabel())); fireClosed(); @@ -185,21 +176,36 @@ public class ObserveSwingDataSource extends AbstractSerializableBean implements public void destroy() { - checkIsOpen(); - fireNewMessage(t("observe.storage.message.destroying", getLabel())); - fireClosing(); + if (isOpen()) { - referentialCache.close(); + String label = getLabel(); - DataSourceService dataSourceService = newService(DataSourceService.class); + fireNewMessage(t("observe.storage.message.destroying", label)); - dataSourceService.destroy(); + fireClosing(); - connection = null; + getServiceSupportFactory().getDataSourceService().destroy(); - fireNewMessage(t("observe.storage.message.destroyed", getLabel())); - fireClosed(); + fireNewMessage(t("observe.storage.message.closed", label)); + + referentialCache.close(); + connection = null; + serviceSupportFactory = null; + + fireClosed(); + + + } else { + + ObserveSwingApplicationConfig config = ObserveSwingApplicationContext.get().getConfig(); + ObserveDataSourceConfigurationTopiaH2 dataSourceConfiguration = config.getDataSourceConfigurationH2(t("observe.storage.label.local")); + + ObserveServiceSupport serviceFactory = ObserveServiceSupportFactory.newServiceSupport(dataSourceConfiguration); + DataSourceService dataSourceService = serviceFactory.getDataSourceService(); + dataSourceService.destroy(); + + } } @@ -207,7 +213,7 @@ public class ObserveSwingDataSource extends AbstractSerializableBean implements checkIsNotOpen(); - DataSourceService dataSourceService = newService(DataSourceService.class); + DataSourceService dataSourceService = getServiceSupportFactory().getDataSourceService(); Set<ObserveDbUserDto> users = dataSourceService.getUsers(getConfiguration()); @@ -219,7 +225,7 @@ public class ObserveSwingDataSource extends AbstractSerializableBean implements checkIsNotOpen(); - DataSourceService dataSourceService = newService(DataSourceService.class); + DataSourceService dataSourceService = getServiceSupportFactory().getDataSourceService(); dataSourceService.applySecurity(getConfiguration(), users); } @@ -250,7 +256,7 @@ public class ObserveSwingDataSource extends AbstractSerializableBean implements if (answer == JOptionPane.YES_OPTION) { - DataSourceService dataSourceService = newService(DataSourceService.class); + DataSourceService dataSourceService = getServiceSupportFactory().getDataSourceService(); if (log.isInfoEnabled()) { @@ -266,7 +272,7 @@ public class ObserveSwingDataSource extends AbstractSerializableBean implements public ImmutableMap<Class<?>, ReferentialReferenceSet<?>> updateReferentialReferenceSetsCache(String referentialReferenceSetsRequestName) { - ReferentialService referentialService = newService(ReferentialService.class); + ReferentialService referentialService = getServiceSupportFactory().getReferentialService(); return referentialCache.loadReferenceSets(referentialService, referentialReferenceSetsRequestName); } @@ -275,7 +281,7 @@ public class ObserveSwingDataSource extends AbstractSerializableBean implements checkIsOpen(); - ReferentialService referentialService = newService(ReferentialService.class); + ReferentialService referentialService = getServiceSupportFactory().getReferentialService(); ReferentialReferenceSet<D> referentialReferenceSet = referentialCache.getReferentialReferenceSet(referentialService, type); return referentialReferenceSet.getReferences(); @@ -285,25 +291,18 @@ public class ObserveSwingDataSource extends AbstractSerializableBean implements return connection != null; } - public SqlScriptProducerService newSqlScriptProducerService() { - return newService(SqlScriptProducerService.class); - } - - public <S extends ObserveService> S newService(Class<S> serviceType) { - - ObserveServiceInitializer observeServiceInitializer = getObserveServiceInitializer(); - - ObserveServiceMainFactory serviceFactory = ObserveServiceMainFactory.get(); - - S service = serviceFactory.newService(observeServiceInitializer, serviceType); - return service; + public ObserveServiceSupport getServiceSupportFactory() { + if (serviceSupportFactory == null) { + serviceSupportFactory = ObserveServiceSupportFactory.newServiceSupport(this); + } + return serviceSupportFactory; } public ObserveDataSourceInformation checkCanConnect() throws DatabaseConnexionNotAuthorizedException, DatabaseNotFoundException { checkIsNotAlreadyOpen(); - DataSourceService dataSourceService = newService(DataSourceService.class); + DataSourceService dataSourceService = getServiceSupportFactory().getDataSourceService(); ObserveDataSourceInformation dataSourceInformation = dataSourceService.checkCanConnect(configuration); @@ -331,16 +330,6 @@ public class ObserveSwingDataSource extends AbstractSerializableBean implements return listenerList.getListeners(ObserveSwingDataSourceListener.class); } -// public boolean containsObserveSwingDataSourceListener(ObserveSwingDataSourceListener listener) { -// ObserveSwingDataSourceListener[] listeners = getObserveSwingDataSourceListener(); -// for (ObserveSwingDataSourceListener l : listeners) { -// if (l.equals(listener)) { -// return true; -// } -// } -// return false; -// } - public void removeObserveSwingDataSourceListener(ObserveSwingDataSourceListener listener) { if (log.isInfoEnabled()) { log.info("removing listener " + listener); @@ -366,40 +355,6 @@ public class ObserveSwingDataSource extends AbstractSerializableBean implements } } - protected ObserveServiceInitializer getObserveServiceInitializer() { - - ObserveSwingApplicationContext context = ObserveSwingApplicationContext.get(); - - ObserveSwingApplicationConfig config = context.getConfig(); - - Locale locale = config.getLocale(); - - File tmpDirectory = config.getTmpDirectory(); - - ReferentialLocale referentialLocale = ReferentialLocale.valueOf(locale); - - ObserveDataSourceConfigurationAndConnection configurationAndConnection = new ObserveDataSourceConfigurationAndConnection(configuration, connection); - - ObserveSpeciesListConfiguration speciesListConfiguration = new ObserveSpeciesListConfiguration(); - speciesListConfiguration.setSpeciesListLonglineCatchId(config.getSpeciesListLonglineCatchId()); - speciesListConfiguration.setSpeciesListLonglineDepredatorId(config.getSpeciesListLonglineDepredatorId()); - speciesListConfiguration.setSpeciesListLonglineEncounterId(config.getSpeciesListLonglineEncounterId()); - speciesListConfiguration.setSpeciesListSeineNonTargetCatchId(config.getSpeciesListSeineNonTargetCatchId()); - speciesListConfiguration.setSpeciesListSeineObjectObservedSpeciesId(config.getSpeciesListSeineObjectObservedSpeciesId()); - speciesListConfiguration.setSpeciesListSeineObjectSchoolEstimateId(config.getSpeciesListSeineObjectSchoolEstimateId()); - speciesListConfiguration.setSpeciesListSeineSchoolEstimateId(config.getSpeciesListSeineSchoolEstimateId()); - speciesListConfiguration.setSpeciesListSeineTargetCatchId(config.getSpeciesListSeineTargetCatchId()); - - ObserveServiceInitializer observeServiceInitializer = ObserveServiceInitializer.create( - locale, - referentialLocale, - tmpDirectory, - speciesListConfiguration, - configurationAndConnection); - - return observeServiceInitializer; - } - protected void fireOpening() { ObserveSwingDataSourceEvent evt = new ObserveSwingDataSourceEvent(this); for (ObserveSwingDataSourceListener listener : getObserveSwingDataSourceListener()) { diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/shared/AbstractUIAction.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/shared/AbstractUIAction.java index 4f4fde1..cf36688 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/shared/AbstractUIAction.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/shared/AbstractUIAction.java @@ -21,7 +21,9 @@ */ package fr.ird.observe.ui.actions.shared; +import fr.ird.observe.ObserveSwingApplicationContext; import fr.ird.observe.db.DataContext; +import fr.ird.observe.services.ObserveServiceSupport; import fr.ird.observe.ui.ObserveMainUI; import fr.ird.observe.ui.content.ObserveContentUI; import fr.ird.observe.ui.tree.ObserveNode; @@ -110,4 +112,9 @@ public abstract class AbstractUIAction extends AbstractAction { boolean wasCollapsed = tree.isCollapsed(activityPath); return wasCollapsed; } + + protected ObserveServiceSupport getServiceSupportFactory() { + return ObserveSwingApplicationContext.get().getDataSource().getServiceSupportFactory(); + } + } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/shared/MoveActivityLonglinesUIAction.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/shared/MoveActivityLonglinesUIAction.java index ab3614e..349bcda 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/shared/MoveActivityLonglinesUIAction.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/shared/MoveActivityLonglinesUIAction.java @@ -110,7 +110,7 @@ public class MoveActivityLonglinesUIAction extends AbstractUIAction { // change the tripLongline of the selected activities List<DataReference<ActivityLonglineDto>> selectedDatas = activityLonglinesUI.getModel().getSelectedDatas(); List<String> activityIds = Lists.transform(selectedDatas, DataReference.getIdFunction()); - ActivityLonglineService service = ObserveSwingApplicationContext.get().newService(ActivityLonglineService.class); + ActivityLonglineService service = getServiceSupportFactory().getActivityLonglineService(); List<Integer> positions = service.moveActivityLonglinesToTripLongline(activityIds, tripLonglineId); // update the tree diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/shared/MoveActivitySeinesUIAction.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/shared/MoveActivitySeinesUIAction.java index 4d9f92e..c9e8708 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/shared/MoveActivitySeinesUIAction.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/shared/MoveActivitySeinesUIAction.java @@ -109,7 +109,7 @@ public class MoveActivitySeinesUIAction extends AbstractUIAction { // change the route of the selected activities List<DataReference<ActivitySeineDto>> selectedDatas = ((ActivitySeinesUIModel) ui.getModel()).getSelectedDatas(); List<String> activityIds = Lists.transform(selectedDatas, DataReference.getIdFunction()); - ActivitySeineService service = ObserveSwingApplicationContext.get().newService(ActivitySeineService.class); + ActivitySeineService service = getServiceSupportFactory().getActivitySeineService(); List<Integer> positions = service.moveActivitySeinesToRoute(activityIds, routeId); // update the tree diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/shared/MoveRoutesUIAction.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/shared/MoveRoutesUIAction.java index ec2f97b..eb9f9bf 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/shared/MoveRoutesUIAction.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/shared/MoveRoutesUIAction.java @@ -110,7 +110,7 @@ public class MoveRoutesUIAction extends AbstractUIAction { // change the tripseine of the selected routes List<DataReference<RouteDto>> selectedDatas = theUi.getModel().getSelectedDatas(); List<String> routeIds = Lists.transform(selectedDatas, DataReference.getIdFunction()); - RouteService service = ObserveSwingApplicationContext.get().newService(RouteService.class); + RouteService service = getServiceSupportFactory().getRouteService(); List<Integer> positions = service.moveRoutesToTripSeine(routeIds, tripSeineId); // update the tree diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/shared/MoveTripLonglinesUIAction.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/shared/MoveTripLonglinesUIAction.java index 71027f8..4fc974f 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/shared/MoveTripLonglinesUIAction.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/shared/MoveTripLonglinesUIAction.java @@ -1,6 +1,5 @@ package fr.ird.observe.ui.actions.shared; -import fr.ird.observe.ObserveSwingApplicationContext; import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.constants.GearType; import fr.ird.observe.services.dto.longline.TripLonglineDto; @@ -48,7 +47,7 @@ public class MoveTripLonglinesUIAction extends MoveTripsUIAction<TripLonglineDto @Override protected List<Integer> getPositions(List<String> tripIds, String programId) { - TripLonglineService service = ObserveSwingApplicationContext.get().newService(TripLonglineService.class); + TripLonglineService service = getServiceSupportFactory().getTripLonglineService(); return service.moveTripLonglinesToProgram(tripIds, programId); } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/shared/MoveTripSeinesUIAction.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/shared/MoveTripSeinesUIAction.java index 005fd57..d78892e 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/shared/MoveTripSeinesUIAction.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/shared/MoveTripSeinesUIAction.java @@ -1,6 +1,5 @@ package fr.ird.observe.ui.actions.shared; -import fr.ird.observe.ObserveSwingApplicationContext; import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.constants.GearType; import fr.ird.observe.services.dto.seine.TripSeineDto; @@ -48,7 +47,7 @@ public class MoveTripSeinesUIAction extends MoveTripsUIAction<TripSeineDto> { @Override protected List<Integer> getPositions(List<String> tripIds, String programId) { - TripSeineService service = ObserveSwingApplicationContext.get().newService(TripSeineService.class); + TripSeineService service = getServiceSupportFactory().getTripSeineService(); return service.moveTripSeinesToProgram(tripIds, programId); } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/AdminTabUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/AdminTabUIHandler.java index 9c2a7fa..58a441b 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/AdminTabUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/AdminTabUIHandler.java @@ -124,7 +124,7 @@ public class AdminTabUIHandler { openSource(source); - SqlScriptProducerService sqlScriptProducerService = source.newSqlScriptProducerService(); + SqlScriptProducerService sqlScriptProducerService = source.getServiceSupportFactory().getSqlScriptProducerService(); // on replique les données specifiees ImmutableSet<String> dataIds = ImmutableSet.<String>copyOf(tripIds); @@ -136,7 +136,7 @@ public class AdminTabUIHandler { openSource(target); - DataSourceService dataSourceService = target.newService(DataSourceService.class); + DataSourceService dataSourceService = target.getServiceSupportFactory().getDataSourceService(); ImportDataDto importData = new ImportDataDto(dataDump, dataIds); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/AdminUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/AdminUIModel.java index cc7a22f..445b6e3 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/AdminUIModel.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/AdminUIModel.java @@ -1330,11 +1330,11 @@ public class AdminUIModel extends WizardExtModel<AdminStep> { List<DataReference<?>> existingTrip = Lists.newArrayList(); - TripSeineService tripSeineService = source.newService(TripSeineService.class); + TripSeineService tripSeineService = source.getServiceSupportFactory().getTripSeineService(); DataReferenceSet<TripSeineDto> tripSeineSet = tripSeineService.getAllTripSeine(); existingTrip.addAll(tripSeineSet.getReferences()); - TripLonglineService tripLonglineService = source.newService(TripLonglineService.class); + TripLonglineService tripLonglineService = source.getServiceSupportFactory().getTripLonglineService(); DataReferenceSet<TripLonglineDto> tripLonglineSet = tripLonglineService.getAllTripLongline(); existingTrip.addAll(tripLonglineSet.getReferences()); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/consolidate/ConsolidateUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/consolidate/ConsolidateUIHandler.java index 92d26de..e3b7720 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/consolidate/ConsolidateUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/consolidate/ConsolidateUIHandler.java @@ -143,7 +143,7 @@ public class ConsolidateUIHandler extends AdminTabUIHandler { try { - ConsolidateDataService consolidateDataService = dataSource.newService(ConsolidateDataService.class); + ConsolidateDataService consolidateDataService = dataSource.getServiceSupportFactory().getConsolidateDataService(); ConsolidateTripSeineDataRequest request = new ConsolidateTripSeineDataRequest(); request.setTripSeineIds(tripIds); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/export/ExportUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/export/ExportUIHandler.java index d6a0891..0c8b01b 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/export/ExportUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/export/ExportUIHandler.java @@ -295,13 +295,13 @@ public class ExportUIHandler extends AdminTabUIHandler { if (TripSeineDto.class.isAssignableFrom(trip.getType())) { - TripSeineService tripSeineService = centralSource.newService(TripSeineService.class); + TripSeineService tripSeineService = centralSource.getServiceSupportFactory().getTripSeineService(); tripSeineService.delete(tripId); } else if (TripLonglineDto.class.isAssignableFrom(trip.getType())) { - TripLonglineService tripLonglineService = centralSource.newService(TripLonglineService.class); + TripLonglineService tripLonglineService = centralSource.getServiceSupportFactory().getTripLonglineService(); tripLonglineService.delete(tripId); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/report/ReportUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/report/ReportUIHandler.java index f8d4ab0..0ff1e7c 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/report/ReportUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/report/ReportUIHandler.java @@ -336,7 +336,7 @@ public class ReportUIHandler extends AdminTabUIHandler { } - ReportService reportService = dataSource.newService(ReportService.class); + ReportService reportService = dataSource.getServiceSupportFactory().getReportService(); report = reportService.populateVariables(report, getModel().getSelectedTrip().getId()); @@ -455,7 +455,7 @@ public class ReportUIHandler extends AdminTabUIHandler { dataSource.open(); } - ReportService reportService = dataSource.newService(ReportService.class); + ReportService reportService = dataSource.getServiceSupportFactory().getReportService(); DataMatrix data = reportService.executeReport(report, trip.getId()); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/save/SaveLocalUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/save/SaveLocalUIHandler.java index 6bef01e..50d56ab 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/save/SaveLocalUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/save/SaveLocalUIHandler.java @@ -22,7 +22,6 @@ package fr.ird.observe.ui.admin.save; import fr.ird.observe.db.ObserveSwingDataSource; -import fr.ird.observe.services.service.SqlScriptProducerRequest; import fr.ird.observe.services.service.SqlScriptProducerService; import fr.ird.observe.ui.UIHelper; import fr.ird.observe.ui.admin.AdminStep; @@ -161,7 +160,7 @@ public class SaveLocalUIHandler extends AdminTabUIHandler { // on effectue une sauvegarde de la base locale File backupFile = stepModel.getBackupFile(); - SqlScriptProducerService dumpService = source.newSqlScriptProducerService(); + SqlScriptProducerService dumpService = source.getServiceSupportFactory().getSqlScriptProducerService(); byte[] dump = dumpService.getAllDataDump(); try (FileOutputStream outputStream = new FileOutputStream(backupFile)) { diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/validate/ValidateUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/validate/ValidateUIHandler.java index d51fe50..1fefd0b 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/validate/ValidateUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/validate/ValidateUIHandler.java @@ -428,7 +428,7 @@ public class ValidateUIHandler extends AdminTabUIHandler { dataSourceToValidate.open(); } - ValidateService validateService = dataSourceToValidate.newService(ValidateService.class); + ValidateService validateService = dataSourceToValidate.getServiceSupportFactory().getValidateService(); Map<Class<? extends IdDto>, ValidateResultForDtoType> messages = Maps.newHashMap(); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUIHandler.java index f155134..26a6140 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUIHandler.java @@ -31,6 +31,7 @@ import fr.ird.observe.ObserveSwingTechnicalException; import fr.ird.observe.db.DataContext; import fr.ird.observe.db.ObserveSwingDataSource; import fr.ird.observe.db.constants.DataContextType; +import fr.ird.observe.services.ObserveServiceSupport; import fr.ird.observe.services.dto.AbstractObserveDto; import fr.ird.observe.services.dto.DataDto; import fr.ird.observe.services.dto.DataReference; @@ -626,6 +627,10 @@ public abstract class ContentUIHandler<E extends IdDto> { return ObserveSwingApplicationContext.get().getDataSource(); } + protected ObserveServiceSupport getServiceSupport() { + return getDataSource().getServiceSupportFactory(); + } + protected ObserveOpenDataManager getOpenDataManager() { ObserveOpenDataManager openDataManager = ObserveSwingApplicationContext.get().getOpenDataManager(); return openDataManager; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/LonglineDetailCompositionUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/LonglineDetailCompositionUIHandler.java index 3089436..180c407 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/LonglineDetailCompositionUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/LonglineDetailCompositionUIHandler.java @@ -1406,7 +1406,7 @@ public class LonglineDetailCompositionUIHandler extends ContentUIHandler<SetLong } protected SetLonglineDetailCompositionService getSetLonglineDetailCompositionService() { - return ObserveSwingApplicationContext.get().newService(SetLonglineDetailCompositionService.class); + return getServiceSupport().getSetLonglineDetailCompositionService(); } } \ No newline at end of file diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/LonglineGlobalCompositionUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/LonglineGlobalCompositionUIHandler.java index f0d857a..80467ed 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/LonglineGlobalCompositionUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/LonglineGlobalCompositionUIHandler.java @@ -22,10 +22,9 @@ package fr.ird.observe.ui.content.impl.longline; * #L% */ -import fr.ird.observe.ObserveSwingApplicationContext; import fr.ird.observe.db.DataContext; -import fr.ird.observe.db.constants.DataContextType; import fr.ird.observe.db.ObserveSwingDataSource; +import fr.ird.observe.db.constants.DataContextType; import fr.ird.observe.services.dto.Form; import fr.ird.observe.services.dto.longline.ActivityLonglineDto; import fr.ird.observe.services.dto.longline.SetLonglineGlobalCompositionDto; @@ -234,7 +233,7 @@ public class LonglineGlobalCompositionUIHandler extends ContentUIHandler<SetLong } protected SetLonglineGlobalCompositionService getSetLonglineGlobalCompositionService() { - return ObserveSwingApplicationContext.get().newService(SetLonglineGlobalCompositionService.class); + return getServiceSupport().getSetLonglineGlobalCompositionService(); } } \ No newline at end of file diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/SetLonglineUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/SetLonglineUIHandler.java index 0cb1c5b..905f14c 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/SetLonglineUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/SetLonglineUIHandler.java @@ -22,7 +22,6 @@ package fr.ird.observe.ui.content.impl.longline; * #L% */ -import fr.ird.observe.ObserveSwingApplicationContext; import fr.ird.observe.db.DataContext; import fr.ird.observe.db.ObserveSwingDataSource; import fr.ird.observe.db.constants.DataContextType; @@ -478,6 +477,6 @@ public class SetLonglineUIHandler extends ContentUIHandler<SetLonglineDto> { } protected SetLonglineService getSetLonglineService() { - return ObserveSwingApplicationContext.get().newService(SetLonglineService.class); + return getServiceSupport().getSetLonglineService(); } } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/ActivitySeineObservedSystemUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/ActivitySeineObservedSystemUIHandler.java index 4c0f636..162fddb 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/ActivitySeineObservedSystemUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/ActivitySeineObservedSystemUIHandler.java @@ -21,11 +21,10 @@ */ package fr.ird.observe.ui.content.impl.seine; -import fr.ird.observe.ObserveSwingApplicationContext; import fr.ird.observe.db.DataContext; +import fr.ird.observe.db.ObserveSwingDataSource; import fr.ird.observe.db.constants.DataContextType; import fr.ird.observe.services.dto.Form; -import fr.ird.observe.db.ObserveSwingDataSource; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.dto.seine.ActivitySeineObservedSystemDto; import fr.ird.observe.services.dto.seine.ActivitySeineObservedSystemDtos; @@ -118,6 +117,6 @@ public class ActivitySeineObservedSystemUIHandler extends ContentUIHandler<Activ } protected ActivitySeineObservedSystemService getActivitySeineObservedSystemService() { - return ObserveSwingApplicationContext.get().newService(ActivitySeineObservedSystemService.class); + return getServiceSupport().getActivitySeineObservedSystemService(); } } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectTransmittingBuoyOperationUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectTransmittingBuoyOperationUIHandler.java index 868b258..c856343 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectTransmittingBuoyOperationUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectTransmittingBuoyOperationUIHandler.java @@ -22,7 +22,6 @@ package fr.ird.observe.ui.content.impl.seine; import com.google.common.collect.Lists; -import fr.ird.observe.ObserveSwingApplicationContext; import fr.ird.observe.db.DataContext; import fr.ird.observe.db.ObserveSwingDataSource; import fr.ird.observe.db.constants.DataContextType; @@ -369,7 +368,7 @@ public class FloatingObjectTransmittingBuoyOperationUIHandler extends ContentUIH } protected TransmittingBuoyOperationService getTransmittingBuoyOperationService() { - return ObserveSwingApplicationContext.get().newService(TransmittingBuoyOperationService.class); + return getServiceSupport().getTransmittingBuoyOperationService(); } } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectUIHandler.java index 79dbee5..823ca8a 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectUIHandler.java @@ -219,6 +219,6 @@ public class FloatingObjectUIHandler extends ContentUIHandler<FloatingObjectDto> } protected FloatingObjectService getFloatingObjectService() { - return getDataSource().newService(FloatingObjectService.class); + return getServiceSupport().getFloatingObjectService(); } } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/SetSeineUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/SetSeineUIHandler.java index 6f8cfa9..23262ce 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/SetSeineUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/SetSeineUIHandler.java @@ -21,7 +21,6 @@ */ package fr.ird.observe.ui.content.impl.seine; -import fr.ird.observe.ObserveSwingApplicationContext; import fr.ird.observe.db.DataContext; import fr.ird.observe.db.ObserveSwingDataSource; import fr.ird.observe.db.constants.ConstantsI18n; @@ -190,7 +189,7 @@ public class SetSeineUIHandler extends ContentUIHandler<SetSeineDto> { getModel().setForm(form); SetSeineDtos.copySetSeineDto(form.getObject(), bean); - RouteService routeService = ObserveSwingApplicationContext.get().newService(RouteService.class); + RouteService routeService = getServiceSupport().getRouteService(); //FIXME ! Pourquoi donc récupérer le formulaire d'une route ici ? juste remonter la donnée dont on a //FIXME besoin depuis le service Form<RouteDto> route = routeService.loadForm(selectedRouteId); @@ -351,6 +350,6 @@ public class SetSeineUIHandler extends ContentUIHandler<SetSeineDto> { } protected SetSeineService getSetSeineService() { - return ObserveSwingApplicationContext.get().newService(SetSeineService.class); + return getServiceSupport().getSetSeineService(); } } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/longline/ActivityLonglinesUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/longline/ActivityLonglinesUIHandler.java index 58a240f..41c815b 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/longline/ActivityLonglinesUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/longline/ActivityLonglinesUIHandler.java @@ -22,7 +22,6 @@ package fr.ird.observe.ui.content.list.impl.longline; * #L% */ -import fr.ird.observe.ObserveSwingApplicationContext; import fr.ird.observe.db.DataContext; import fr.ird.observe.db.constants.DataContextType; import fr.ird.observe.services.dto.DataReference; @@ -116,7 +115,7 @@ public class ActivityLonglinesUIHandler extends ContentListUIHandler<TripLonglin @Override protected List<DataReference<ActivityLonglineDto>> getChilds(TripLonglineDto bean) { - ActivityLonglineService service = ObserveSwingApplicationContext.get().newService(ActivityLonglineService.class); + ActivityLonglineService service = getServiceSupport().getActivityLonglineService(); DataReferenceSet<ActivityLonglineDto> activityLonglineStubByRoute = service.getActivityLonglineByTripLongline(bean.getId()); if (log.isDebugEnabled()) { @@ -129,7 +128,7 @@ public class ActivityLonglinesUIHandler extends ContentListUIHandler<TripLonglin @Override protected void loadParentBean() { - TripLonglineService service = getDataSource().newService(TripLonglineService.class); + TripLonglineService service = getServiceSupport().getTripLonglineService(); Form<TripLonglineDto> form = service.loadForm(getSelectedParentId()); loadReferentialReferenceSetsInModel(form); getModel().setForm(form); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/longline/TripLonglinesUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/longline/TripLonglinesUIHandler.java index fb4ab20..38ec4ae 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/longline/TripLonglinesUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/longline/TripLonglinesUIHandler.java @@ -22,7 +22,6 @@ package fr.ird.observe.ui.content.list.impl.longline; * #L% */ -import fr.ird.observe.ObserveSwingApplicationContext; import fr.ird.observe.db.DataContext; import fr.ird.observe.db.constants.DataContextType; import fr.ird.observe.services.dto.DataReference; @@ -99,7 +98,7 @@ public class TripLonglinesUIHandler extends ContentListUIHandler<ProgramDto, Tri @Override protected List<DataReference<TripLonglineDto>> getChilds(ProgramDto bean) { - TripLonglineService service = ObserveSwingApplicationContext.get().newService(TripLonglineService.class); + TripLonglineService service = getServiceSupport().getTripLonglineService(); DataReferenceSet<TripLonglineDto> tripLonglineByProgram = service.getTripLonglineByProgram(bean.getId()); if (log.isDebugEnabled()) { @@ -111,7 +110,7 @@ public class TripLonglinesUIHandler extends ContentListUIHandler<ProgramDto, Tri @Override protected void loadParentBean() { - ReferentialService service = ObserveSwingApplicationContext.get().newService(ReferentialService.class); + ReferentialService service = getServiceSupport().getReferentialService(); Form<ProgramDto> form = service.loadForm(ProgramDto.class, getSelectedParentId()); loadReferentialReferenceSetsInModel(form); getModel().setForm(form); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/ActivitySeinesUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/ActivitySeinesUIHandler.java index a4bbf3c..e6f81ba 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/ActivitySeinesUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/ActivitySeinesUIHandler.java @@ -21,7 +21,6 @@ */ package fr.ird.observe.ui.content.list.impl.seine; -import fr.ird.observe.ObserveSwingApplicationContext; import fr.ird.observe.db.DataContext; import fr.ird.observe.db.constants.DataContextType; import fr.ird.observe.services.dto.DataReference; @@ -114,7 +113,7 @@ public class ActivitySeinesUIHandler extends ContentListUIHandler<RouteDto, Acti @Override protected List<DataReference<ActivitySeineDto>> getChilds(RouteDto bean) { - ActivitySeineService service = ObserveSwingApplicationContext.get().newService(ActivitySeineService.class); + ActivitySeineService service = getServiceSupport().getActivitySeineService(); DataReferenceSet<ActivitySeineDto> activitySeineByRoute = service.getActivitySeineByRoute(bean.getId()); if (log.isDebugEnabled()) { @@ -126,7 +125,7 @@ public class ActivitySeinesUIHandler extends ContentListUIHandler<RouteDto, Acti @Override protected void loadParentBean() { - RouteService service = ObserveSwingApplicationContext.get().newService(RouteService.class); + RouteService service = getServiceSupport().getRouteService(); Form<RouteDto> form = service.loadForm(getSelectedParentId()); loadReferentialReferenceSetsInModel(form); getModel().setForm(form); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/RoutesUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/RoutesUIHandler.java index f5462e1..538b824 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/RoutesUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/RoutesUIHandler.java @@ -21,7 +21,6 @@ */ package fr.ird.observe.ui.content.list.impl.seine; -import fr.ird.observe.ObserveSwingApplicationContext; import fr.ird.observe.db.DataContext; import fr.ird.observe.db.constants.DataContextType; import fr.ird.observe.services.dto.DataReference; @@ -111,7 +110,7 @@ public class RoutesUIHandler extends ContentListUIHandler<TripSeineDto, RouteDto @Override protected List<DataReference<RouteDto>> getChilds(TripSeineDto bean) { - RouteService service = ObserveSwingApplicationContext.get().newService(RouteService.class); + RouteService service = getServiceSupport().getRouteService(); DataReferenceSet<RouteDto> routeByTripSeine = service.getRouteByTripSeine(bean.getId()); if (log.isDebugEnabled()) { @@ -124,7 +123,7 @@ public class RoutesUIHandler extends ContentListUIHandler<TripSeineDto, RouteDto @Override protected void loadParentBean() { - TripSeineService service = ObserveSwingApplicationContext.get().newService(TripSeineService.class); + TripSeineService service = getServiceSupport().getTripSeineService(); Form<TripSeineDto> form = service.loadForm(getSelectedParentId()); loadReferentialReferenceSetsInModel(form); getModel().setForm(form); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/TripSeinesUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/TripSeinesUIHandler.java index 85442e6..35ae8c9 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/TripSeinesUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/TripSeinesUIHandler.java @@ -21,7 +21,6 @@ */ package fr.ird.observe.ui.content.list.impl.seine; -import fr.ird.observe.ObserveSwingApplicationContext; import fr.ird.observe.db.DataContext; import fr.ird.observe.db.constants.DataContextType; import fr.ird.observe.services.dto.DataReference; @@ -96,7 +95,7 @@ public class TripSeinesUIHandler extends ContentListUIHandler<ProgramDto, TripSe @Override protected List<DataReference<TripSeineDto>> getChilds(ProgramDto bean) { - TripSeineService service = ObserveSwingApplicationContext.get().newService(TripSeineService.class); + TripSeineService service = getServiceSupport().getTripSeineService(); DataReferenceSet<TripSeineDto> tripSeineByProgram = service.getTripSeineByProgram(bean.getId()); if (log.isDebugEnabled()) { @@ -109,7 +108,7 @@ public class TripSeinesUIHandler extends ContentListUIHandler<ProgramDto, TripSe @Override protected void loadParentBean() { - ReferentialService service = ObserveSwingApplicationContext.get().newService(ReferentialService.class); + ReferentialService service = getServiceSupport().getReferentialService(); Form<ProgramDto> form = service.loadForm(ProgramDto.class, getSelectedParentId()); loadReferentialReferenceSetsInModel(form); getModel().setForm(form); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/ActivityLonglineUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/ActivityLonglineUIHandler.java index b08d35f..7a948b1 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/ActivityLonglineUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/ActivityLonglineUIHandler.java @@ -22,7 +22,6 @@ package fr.ird.observe.ui.content.open.impl.longline; * #L% */ -import fr.ird.observe.ObserveSwingApplicationContext; import fr.ird.observe.db.DataContext; import fr.ird.observe.db.constants.DataContextType; import fr.ird.observe.services.dto.Form; @@ -343,6 +342,6 @@ public class ActivityLonglineUIHandler extends ContentOpenableUIHandler<Activity } protected ActivityLonglineService getActivityLonglineService() { - return ObserveSwingApplicationContext.get().newService(ActivityLonglineService.class); + return getServiceSupport().getActivityLonglineService(); } } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/TripLonglineUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/TripLonglineUIHandler.java index 81ccf7d..3f5d2c5 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/TripLonglineUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/TripLonglineUIHandler.java @@ -24,7 +24,6 @@ package fr.ird.observe.ui.content.open.impl.longline; import com.google.common.base.Predicate; import com.google.common.collect.Iterables; -import fr.ird.observe.ObserveSwingApplicationContext; import fr.ird.observe.configuration.ObserveSwingApplicationConfig; import fr.ird.observe.db.DataContext; import fr.ird.observe.db.constants.DataContextType; @@ -357,6 +356,6 @@ public class TripLonglineUIHandler extends ContentOpenableUIHandler<TripLongline } protected TripLonglineService getTripLonglineService() { - return ObserveSwingApplicationContext.get().newService(TripLonglineService.class); + return getServiceSupport().getTripLonglineService(); } } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/ActivitySeineUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/ActivitySeineUIHandler.java index 010f48c..16a150d 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/ActivitySeineUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/ActivitySeineUIHandler.java @@ -21,7 +21,6 @@ */ package fr.ird.observe.ui.content.open.impl.seine; -import fr.ird.observe.ObserveSwingApplicationContext; import fr.ird.observe.db.DataContext; import fr.ird.observe.db.constants.DataContextType; import fr.ird.observe.services.dto.Form; @@ -32,7 +31,6 @@ import fr.ird.observe.services.dto.seine.ActivitySeineDto; import fr.ird.observe.services.dto.seine.ActivitySeineDtos; import fr.ird.observe.services.dto.seine.RouteDto; import fr.ird.observe.services.dto.seine.TripSeineDto; -import fr.ird.observe.services.service.ReferentialService; import fr.ird.observe.services.service.seine.ActivitySeineService; import fr.ird.observe.ui.content.ContentMode; import fr.ird.observe.ui.content.ContentUIModel; @@ -326,7 +324,6 @@ public class ActivitySeineUIHandler extends ContentOpenableUIHandler<ActivitySei public String getActivity6Label() { - ReferentialService service = ObserveSwingApplicationContext.get().newService(ReferentialService.class); Set<ReferentialReference<VesselActivitySeineDto>> activities = getDataSource().getReferentialReferences(VesselActivitySeineDto.class); for (ReferentialReference<VesselActivitySeineDto> vesselActivity : activities) { @@ -361,7 +358,7 @@ public class ActivitySeineUIHandler extends ContentOpenableUIHandler<ActivitySei } protected ActivitySeineService getActivitySeineService() { - return ObserveSwingApplicationContext.get().newService(ActivitySeineService.class); + return getServiceSupport().getActivitySeineService(); } } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/RouteUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/RouteUIHandler.java index d8ca426..7589ea9 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/RouteUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/RouteUIHandler.java @@ -452,6 +452,6 @@ public class RouteUIHandler extends ContentOpenableUIHandler<RouteDto> { } protected RouteService getRouteService() { - return ObserveSwingApplicationContext.get().newService(RouteService.class); + return getServiceSupport().getRouteService(); } } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/TripSeineUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/TripSeineUIHandler.java index 3ba0763..478e11f 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/TripSeineUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/TripSeineUIHandler.java @@ -23,7 +23,6 @@ package fr.ird.observe.ui.content.open.impl.seine; import com.google.common.base.Predicate; import com.google.common.collect.Iterables; -import fr.ird.observe.ObserveSwingApplicationContext; import fr.ird.observe.configuration.ObserveSwingApplicationConfig; import fr.ird.observe.db.DataContext; import fr.ird.observe.db.constants.DataContextType; @@ -352,7 +351,7 @@ public class TripSeineUIHandler extends ContentOpenableUIHandler<TripSeineDto> { } protected TripSeineService getTripSeineService() { - return ObserveSwingApplicationContext.get().newService(TripSeineService.class); + return getServiceSupport().getTripSeineService(); } } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/ContentReferenceUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/ContentReferenceUIHandler.java index b6e2e6d..c931134 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/ContentReferenceUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/ContentReferenceUIHandler.java @@ -877,7 +877,7 @@ public class ContentReferenceUIHandler<E extends ReferentialDto> extends Content } protected ReferentialService getReferentialService() { - return ObserveSwingApplicationContext.get().newService(ReferentialService.class); + return getServiceSupport().getReferentialService(); } } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/CatchLonglineUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/CatchLonglineUIHandler.java index 124c1a7..8ce1f94 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/CatchLonglineUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/CatchLonglineUIHandler.java @@ -23,7 +23,6 @@ package fr.ird.observe.ui.content.table.impl.longline; */ import com.google.common.collect.Lists; -import fr.ird.observe.ObserveSwingApplicationContext; import fr.ird.observe.db.constants.DataContextType; import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.DataReferenceSet; @@ -536,7 +535,7 @@ public class CatchLonglineUIHandler extends ContentTableUIHandler<SetLonglineCat ReferentialReferenceDecorator<SizeMeasureTypeDto> decorator = getReferentialReferenceDecorator(SizeMeasureTypeDto.class); //FIXME Load data on init -// ReferentialService referentialService = ObserveSwingApplicationContext.get().newService(ReferentialService.class); +// ReferentialService referentialService = ObserveSwingApplicationContext.get().getReferentialService(); // ReferenceSetDto<SizeMeasureTypeDto> sizeMeasureTypeDtoRefSet = referentialService.getReferenceSet(SizeMeasureTypeDto.class); // ArrayList<ReferenceDto<SizeMeasureTypeDto>> sizeMeasureTypes = Lists.newArrayList(sizeMeasureTypeDtoRefSet.getReferences()); @@ -565,7 +564,7 @@ public class CatchLonglineUIHandler extends ContentTableUIHandler<SetLonglineCat ReferentialReferenceDecorator<WeightMeasureTypeDto> decorator = getReferentialReferenceDecorator(WeightMeasureTypeDto.class); //FIXME Load data on init -// ReferentialService referentialService = ObserveSwingApplicationContext.get().newService(ReferentialService.class); +// ReferentialService referentialService = ObserveSwingApplicationContext.get().getReferentialService(); // ReferenceSetDto<WeightMeasureTypeDto> weightMeasureTypeDtoRefSet = referentialService.getReferenceSet(WeightMeasureTypeDto.class); // ArrayList<ReferenceDto<WeightMeasureTypeDto>> weightMeasureTypes = Lists.newArrayList(weightMeasureTypeDtoRefSet.getReferences()); @@ -837,10 +836,10 @@ public class CatchLonglineUIHandler extends ContentTableUIHandler<SetLonglineCat } protected SetLonglineCatchService getSetLonglineCatchService() { - return ObserveSwingApplicationContext.get().newService(SetLonglineCatchService.class); + return getServiceSupport().getSetLonglineCatchService(); } protected BranchlineService getBranchLineService() { - return ObserveSwingApplicationContext.get().newService(BranchlineService.class); + return getServiceSupport().getBranchlineService(); } } \ No newline at end of file diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/EncounterUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/EncounterUIHandler.java index fe2ef62..a0e848c 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/EncounterUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/EncounterUIHandler.java @@ -22,7 +22,6 @@ package fr.ird.observe.ui.content.table.impl.longline; * #L% */ -import fr.ird.observe.ObserveSwingApplicationContext; import fr.ird.observe.db.constants.DataContextType; import fr.ird.observe.services.dto.Form; import fr.ird.observe.services.dto.longline.ActivityLonglineEncouterDto; @@ -115,6 +114,6 @@ public class EncounterUIHandler extends ContentTableUIHandler<ActivityLonglineEn } protected ActivityLongLineEncouterService getActivityLongLineEncouterService() { - return ObserveSwingApplicationContext.get().newService(ActivityLongLineEncouterService.class); + return getServiceSupport().getActivityLongLineEncouterService(); } } \ No newline at end of file diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/GearUseFeaturesLonglineUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/GearUseFeaturesLonglineUIHandler.java index 449c96a..b6c1564 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/GearUseFeaturesLonglineUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/GearUseFeaturesLonglineUIHandler.java @@ -208,7 +208,7 @@ public class GearUseFeaturesLonglineUIHandler extends ContentTableUIHandler<Trip public List<GearUseFeaturesMeasurementLonglineDto> getDefaultGearUseFeaturesMeasurementLongline(String gearId) { - ReferentialService referentialService = getDataSource().newService(ReferentialService.class); + ReferentialService referentialService = getServiceSupport().getReferentialService(); Form<GearDto> gearDtoForm = referentialService.loadForm(GearDto.class, gearId); @@ -350,7 +350,7 @@ public class GearUseFeaturesLonglineUIHandler extends ContentTableUIHandler<Trip ReferentialReferenceDecorator<GearCaracteristicDto> decorator = getReferentialReferenceDecorator(GearCaracteristicDto.class); //FIXME Load data on init -// ReferentialService referentialService = ObserveSwingApplicationContext.get().newService(ReferentialService.class); +// ReferentialService referentialService = ObserveSwingApplicationContext.get().getReferentialService(); // Set<ReferentialReference<GearCaracteristicDto>> gearCaracteristicreferences = getModel().getReferentialReferences(GearCaracteristicDto.class, ""); // List<ReferentialReference<GearCaracteristicDto>> gearCaracteristics = Lists.newArrayList(gearCaracteristicreferences); @@ -498,7 +498,7 @@ public class GearUseFeaturesLonglineUIHandler extends ContentTableUIHandler<Trip } protected TripLonglineGearUseService getTripLonglineGearUseService() { - return ObserveSwingApplicationContext.get().newService(TripLonglineGearUseService.class); + return getServiceSupport().getTripLonglineGearUseService(); } static class SectionTemplatesAutotSelectRowAndShowPopupAction extends AutotSelectRowAndShowPopupActionSupport { diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/SensorUsedUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/SensorUsedUIHandler.java index c1eccf8..1af3960 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/SensorUsedUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/SensorUsedUIHandler.java @@ -245,7 +245,7 @@ public class SensorUsedUIHandler extends ContentTableUIHandler<ActivityLonglineS } protected ActivityLongLineSensorUsedService getActivityLonglineSensorUsedService() { - return ObserveSwingApplicationContext.get().newService(ActivityLongLineSensorUsedService.class); + return getServiceSupport().getActivityLongLineSensorUsedService(); } } \ No newline at end of file diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/TdrUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/TdrUIHandler.java index 7f0dba4..d2f5c35 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/TdrUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/TdrUIHandler.java @@ -494,6 +494,6 @@ public class TdrUIHandler extends ContentTableUIHandler<SetLonglineTdrDto, TdrDt } protected TdrService getTdrService() { - return ObserveSwingApplicationContext.get().newService(TdrService.class); + return getServiceSupport().getTdrService(); } } \ No newline at end of file diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeaturesSeineUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeaturesSeineUIHandler.java index e5ce0b0..87ac9ef 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeaturesSeineUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeaturesSeineUIHandler.java @@ -206,7 +206,7 @@ public class GearUseFeaturesSeineUIHandler extends ContentTableUIHandler<TripSei public List<GearUseFeaturesMeasurementSeineDto> getDefaultGearUseFeaturesMeasurementSeine(String gearId) { - ReferentialService referentialService = getDataSource().newService(ReferentialService.class); + ReferentialService referentialService = getServiceSupport().getReferentialService(); Form<GearDto> gearDtoForm = referentialService.loadForm(GearDto.class, gearId); @@ -347,7 +347,7 @@ public class GearUseFeaturesSeineUIHandler extends ContentTableUIHandler<TripSei ReferentialReferenceDecorator<GearCaracteristicDto> decorator = getReferentialReferenceDecorator(GearCaracteristicDto.class); //FIXME Load data on init -// ReferentialService referentialService = ObserveSwingApplicationContext.get().newService(ReferentialService.class); +// ReferentialService referentialService = ObserveSwingApplicationContext.get().getReferentialService(); // Set<ReferentialReference<GearCaracteristicDto>> gearCaracteristicReferences = getModel().getReferentialReferences(GearCaracteristicDto.class, ""); // List<ReferentialReference<GearCaracteristicDto>> gearCaracteristics = Lists.newArrayList(gearCaracteristicReferences); @@ -495,7 +495,7 @@ public class GearUseFeaturesSeineUIHandler extends ContentTableUIHandler<TripSei } protected TripSeineGearUseService getTripSeineGearUseService() { - return ObserveSwingApplicationContext.get().newService(TripSeineGearUseService.class); + return getServiceSupport().getTripSeineGearUseService(); } static class SectionTemplatesAutotSelectRowAndShowPopupAction extends AutotSelectRowAndShowPopupActionSupport { diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/NonTargetCatchUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/NonTargetCatchUIHandler.java index e99beac..347c38b 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/NonTargetCatchUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/NonTargetCatchUIHandler.java @@ -24,7 +24,6 @@ package fr.ird.observe.ui.content.table.impl.seine; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; import com.google.common.collect.Sets; -import fr.ird.observe.ObserveSwingApplicationContext; import fr.ird.observe.db.constants.DataContextType; import fr.ird.observe.services.dto.Form; import fr.ird.observe.services.dto.constants.seine.NonTargetCatchComputedValueSource; @@ -377,6 +376,6 @@ public class NonTargetCatchUIHandler extends ContentTableUIHandler<SetSeineNonTa } protected NonTargetCatchService getNonTargetCatchService() { - return ObserveSwingApplicationContext.get().newService(NonTargetCatchService.class); + return getServiceSupport().getNonTargetCatchService(); } } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/NonTargetSampleUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/NonTargetSampleUIHandler.java index b5cfb35..f82dae7 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/NonTargetSampleUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/NonTargetSampleUIHandler.java @@ -22,7 +22,6 @@ package fr.ird.observe.ui.content.table.impl.seine; import com.google.common.collect.Lists; -import fr.ird.observe.ObserveSwingApplicationContext; import fr.ird.observe.db.DataContext; import fr.ird.observe.db.constants.DataContextType; import fr.ird.observe.services.dto.Form; @@ -311,6 +310,6 @@ public class NonTargetSampleUIHandler extends ContentTableUIHandler<NonTargetSam } protected NonTargetSampleService getNonTargetSampleService() { - return ObserveSwingApplicationContext.get().newService(NonTargetSampleService.class); + return getServiceSupport().getNonTargetSampleService(); } } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/ObjectObservedSpeciesUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/ObjectObservedSpeciesUIHandler.java index 7e556c4..b2456e3 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/ObjectObservedSpeciesUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/ObjectObservedSpeciesUIHandler.java @@ -21,7 +21,6 @@ */ package fr.ird.observe.ui.content.table.impl.seine; -import fr.ird.observe.ObserveSwingApplicationContext; import fr.ird.observe.db.constants.DataContextType; import fr.ird.observe.services.dto.Form; import fr.ird.observe.services.dto.referential.SpeciesDto; @@ -109,6 +108,6 @@ public class ObjectObservedSpeciesUIHandler extends ContentTableUIHandler<Floati } protected ObjectObservedSpeciesService getObjectObservedSpeciesService() { - return ObserveSwingApplicationContext.get().newService(ObjectObservedSpeciesService.class); + return getServiceSupport().getObjectObservedSpeciesService(); } } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/ObjectSchoolEstimateUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/ObjectSchoolEstimateUIHandler.java index 1604deb..f6d2fe0 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/ObjectSchoolEstimateUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/ObjectSchoolEstimateUIHandler.java @@ -21,7 +21,6 @@ */ package fr.ird.observe.ui.content.table.impl.seine; -import fr.ird.observe.ObserveSwingApplicationContext; import fr.ird.observe.db.constants.DataContextType; import fr.ird.observe.services.dto.Form; import fr.ird.observe.services.dto.referential.SpeciesDto; @@ -105,6 +104,6 @@ public class ObjectSchoolEstimateUIHandler extends ContentTableUIHandler<Floatin } protected ObjectSchoolEstimateService getObjectSchoolEstimateService() { - return ObserveSwingApplicationContext.get().newService(ObjectSchoolEstimateService.class); + return getServiceSupport().getObjectSchoolEstimateService(); } } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/SchoolEstimateUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/SchoolEstimateUIHandler.java index b33abab..0f2a958 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/SchoolEstimateUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/SchoolEstimateUIHandler.java @@ -25,7 +25,6 @@ import com.google.common.base.Predicates; import com.google.common.collect.Collections2; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; -import fr.ird.observe.ObserveSwingApplicationContext; import fr.ird.observe.db.constants.DataContextType; import fr.ird.observe.services.dto.Form; import fr.ird.observe.services.dto.referential.ReferentialReference; @@ -143,6 +142,6 @@ public class SchoolEstimateUIHandler extends ContentTableUIHandler<SetSeineSchoo } protected SchoolEstimateService getSchoolEstimateService() { - return ObserveSwingApplicationContext.get().newService(SchoolEstimateService.class); + return getServiceSupport().getSchoolEstimateService(); } } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetCatchUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetCatchUIHandler.java index 06810be..6c7ed26 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetCatchUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetCatchUIHandler.java @@ -23,7 +23,6 @@ package fr.ird.observe.ui.content.table.impl.seine; import com.google.common.collect.Iterables; import com.google.common.collect.Sets; -import fr.ird.observe.ObserveSwingApplicationContext; import fr.ird.observe.db.constants.DataContextType; import fr.ird.observe.services.dto.Form; import fr.ird.observe.services.dto.referential.ReferentialReference; @@ -292,7 +291,7 @@ public class TargetCatchUIHandler extends ContentTableUIHandler<SetSeineTargetCa } protected TargetCatchService getTargetCatchService() { - return ObserveSwingApplicationContext.get().newService(TargetCatchService.class); + return getServiceSupport().getTargetCatchService(); } } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetDiscardCatchUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetDiscardCatchUIHandler.java index 5167056..6d46b80 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetDiscardCatchUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetDiscardCatchUIHandler.java @@ -24,7 +24,6 @@ package fr.ird.observe.ui.content.table.impl.seine; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; import com.google.common.collect.Sets; -import fr.ird.observe.ObserveSwingApplicationContext; import fr.ird.observe.db.constants.DataContextType; import fr.ird.observe.services.dto.Form; import fr.ird.observe.services.dto.referential.ReferentialReference; @@ -500,6 +499,6 @@ public class TargetDiscardCatchUIHandler extends ContentTableUIHandler<SetSeineT } protected TargetCatchService getTargetCatchService() { - return ObserveSwingApplicationContext.get().newService(TargetCatchService.class); + return getServiceSupport().getTargetCatchService(); } } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetSampleUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetSampleUIHandler.java index ba6de85..a2042d1 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetSampleUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetSampleUIHandler.java @@ -21,7 +21,6 @@ */ package fr.ird.observe.ui.content.table.impl.seine; -import fr.ird.observe.ObserveSwingApplicationContext; import fr.ird.observe.db.DataContext; import fr.ird.observe.db.constants.DataContextType; import fr.ird.observe.services.dto.Form; @@ -327,6 +326,6 @@ public class TargetSampleUIHandler extends ContentTableUIHandler<TargetSampleDto } protected TargetSampleService getTargetSampleService() { - return ObserveSwingApplicationContext.get().newService(TargetSampleService.class); + return getServiceSupport().getTargetSampleService(); } } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/StorageUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/StorageUIHandler.java index 4856d7a..df11007 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/StorageUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/StorageUIHandler.java @@ -46,7 +46,6 @@ import fr.ird.observe.services.dto.ObserveDbUserDto; import fr.ird.observe.services.service.BabModelVersionException; import fr.ird.observe.services.service.DatabaseConnexionNotAuthorizedException; import fr.ird.observe.services.service.DatabaseNotFoundException; -import fr.ird.observe.services.service.SqlScriptProducerRequest; import fr.ird.observe.services.service.SqlScriptProducerService; import fr.ird.observe.ui.DecoratorService; import fr.ird.observe.ui.ObserveMainUI; @@ -423,7 +422,7 @@ public class StorageUIHandler { log.debug(">>> do backup with " + localDataSource + " in " + f); } try { - SqlScriptProducerService dumpProducerService = localDataSource.newSqlScriptProducerService(); + SqlScriptProducerService dumpProducerService = localDataSource.getServiceSupportFactory().getSqlScriptProducerService(); backupLocalDatabase(dumpProducerService, f); } catch (Exception e) { ErrorDialogUI.showError(e); @@ -529,7 +528,7 @@ public class StorageUIHandler { " in " + f); } try { - SqlScriptProducerService dumpProducerService = observeContext.newService(SqlScriptProducerService.class); + SqlScriptProducerService dumpProducerService = localDataSource.getServiceSupportFactory().getSqlScriptProducerService(); backupLocalDatabase(dumpProducerService, f); config.setInitialDumpExist(true); } catch (Exception e) { @@ -641,7 +640,7 @@ public class StorageUIHandler { File dst, Set<DataReference> trips) { - SqlScriptProducerService dumpService = dataSource.newService(SqlScriptProducerService.class); + SqlScriptProducerService dumpService = dataSource.getServiceSupportFactory().getSqlScriptProducerService(); if (trips == null) { diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/StorageUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/StorageUIModel.java index 43b776c..cf2897a 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/StorageUIModel.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/StorageUIModel.java @@ -1589,7 +1589,7 @@ public class StorageUIModel extends WizardModel<StorageStep> { source.open(); - SqlScriptProducerService dumpService = source.newService(SqlScriptProducerService.class); + SqlScriptProducerService dumpService = source.getServiceSupportFactory().getSqlScriptProducerService(); byte[] dump = dumpService.getReferentialDump(); result.setImportDatabase(dump); @@ -1736,7 +1736,7 @@ public class StorageUIModel extends WizardModel<StorageStep> { if (DbMode.USE_SERVER.equals(getDbMode()) || DbMode.CREATE_LOCAL.equals(getDbMode()) && CreationMode.IMPORT_SERVER_STORAGE.equals(creationMode)) { - PingService pingService = dataSource.newService(PingService.class); + PingService pingService = dataSource.getServiceSupportFactory().getPingService(); Version modelServerVersion = pingService.ping(); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/tabs/DataSelectionModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/tabs/DataSelectionModel.java index 488eaed..b41e2d8 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/tabs/DataSelectionModel.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/tabs/DataSelectionModel.java @@ -38,7 +38,6 @@ import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.services.dto.referential.ReferentialDtos; import fr.ird.observe.services.dto.referential.ReferentialReference; import fr.ird.observe.services.dto.seine.TripSeineDto; -import fr.ird.observe.services.service.ReferentialService; import fr.ird.observe.services.service.longline.TripLonglineService; import fr.ird.observe.services.service.seine.TripSeineService; import org.apache.commons.collections4.CollectionUtils; @@ -69,9 +68,8 @@ public class DataSelectionModel implements Serializable { Map<ReferentialReference<ProgramDto>, List<DataReference>> datas = Maps.newHashMap(); - ReferentialService referentialService = source.newService(ReferentialService.class); - TripSeineService tripSeineService = source.newService(TripSeineService.class); - TripLonglineService tripLonglineService = source.newService(TripLonglineService.class); + TripSeineService tripSeineService = source.getServiceSupportFactory().getTripSeineService(); + TripLonglineService tripLonglineService = source.getServiceSupportFactory().getTripLonglineService(); Set<ReferentialReference<ProgramDto>> programSet = source.getReferentialReferences(ProgramDto.class); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/AbstrctReferenceNodeSupport.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/AbstrctReferenceNodeSupport.java index 9a6b94f..bd31fbe 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/AbstrctReferenceNodeSupport.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/AbstrctReferenceNodeSupport.java @@ -51,7 +51,7 @@ public abstract class AbstrctReferenceNodeSupport<E extends IdDto, R extends Abs protected boolean reloadEntity; - protected abstract R fetchEntity(); + protected abstract R fetchEntity(ObserveDataProvider dataProvider); protected AbstrctReferenceNodeSupport(Class<E> internalClass, R entity) { this(internalClass, entity, null); @@ -102,7 +102,7 @@ public abstract class AbstrctReferenceNodeSupport<E extends IdDto, R extends Abs log.info("will load entity " + internalClass.getSimpleName() + " : " + id); } - entity = fetchEntity(); + entity = fetchEntity(oProvider); } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/ActivityLonglineNode.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/ActivityLonglineNode.java index 61ddd09..dd45479 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/ActivityLonglineNode.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/ActivityLonglineNode.java @@ -22,7 +22,6 @@ package fr.ird.observe.ui.tree; * #L% */ -import fr.ird.observe.ObserveSwingApplicationContext; import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.longline.ActivityLonglineDto; import fr.ird.observe.services.service.longline.ActivityLonglineService; @@ -43,8 +42,8 @@ public class ActivityLonglineNode extends DataReferenceNodeSupport<ActivityLongl } @Override - protected DataReference<ActivityLonglineDto> fetchEntity() { - ActivityLonglineService service = ObserveSwingApplicationContext.get().newService(ActivityLonglineService.class); + protected DataReference<ActivityLonglineDto> fetchEntity(ObserveDataProvider dataProvider) { + ActivityLonglineService service = getServiceSupportFactory(dataProvider).getActivityLonglineService(); DataReference<ActivityLonglineDto> referenceDto = service.loadReferenceToRead(getId()); return referenceDto; } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/ActivitySeineNode.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/ActivitySeineNode.java index ce85749..16973be 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/ActivitySeineNode.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/ActivitySeineNode.java @@ -22,7 +22,6 @@ package fr.ird.observe.ui.tree; * #L% */ -import fr.ird.observe.ObserveSwingApplicationContext; import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.seine.ActivitySeineDto; import fr.ird.observe.services.service.seine.ActivitySeineService; @@ -43,8 +42,8 @@ public class ActivitySeineNode extends DataReferenceNodeSupport<ActivitySeineDto } @Override - protected DataReference<ActivitySeineDto> fetchEntity() { - ActivitySeineService service = ObserveSwingApplicationContext.get().newService(ActivitySeineService.class); + protected DataReference<ActivitySeineDto> fetchEntity(ObserveDataProvider dataProvider) { + ActivitySeineService service = getServiceSupportFactory(dataProvider).getActivitySeineService(); DataReference<ActivitySeineDto> referenceDto = service.loadReferenceToRead(getId()); return referenceDto; } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/FloatingObjectSeineNode.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/FloatingObjectSeineNode.java index 406a1c0..b9d7227 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/FloatingObjectSeineNode.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/FloatingObjectSeineNode.java @@ -22,7 +22,6 @@ package fr.ird.observe.ui.tree; * #L% */ -import fr.ird.observe.ObserveSwingApplicationContext; import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.seine.FloatingObjectDto; import fr.ird.observe.services.service.seine.FloatingObjectService; @@ -43,8 +42,8 @@ public class FloatingObjectSeineNode extends DataReferenceNodeSupport<FloatingOb } @Override - protected DataReference<FloatingObjectDto> fetchEntity() { - FloatingObjectService service = ObserveSwingApplicationContext.get().newService(FloatingObjectService.class); + protected DataReference<FloatingObjectDto> fetchEntity(ObserveDataProvider dataProvider) { + FloatingObjectService service = getServiceSupportFactory(dataProvider).getFloatingObjectService(); DataReference<FloatingObjectDto> referenceDto = service.loadReferenceToRead(getId()); return referenceDto; } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/ObserveNode.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/ObserveNode.java index 2c71c57..d535d11 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/ObserveNode.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/ObserveNode.java @@ -21,12 +21,14 @@ */ package fr.ird.observe.ui.tree; +import fr.ird.observe.services.ObserveServiceSupport; import fr.ird.observe.services.dto.OpenableDto; import fr.ird.observe.services.dto.longline.ActivityLonglineDto; import fr.ird.observe.services.dto.longline.TripLonglineDto; import fr.ird.observe.services.dto.seine.ActivitySeineDto; import fr.ird.observe.services.dto.seine.RouteDto; import fr.ird.observe.services.dto.seine.TripSeineDto; +import jaxx.runtime.swing.nav.NavDataProvider; import jaxx.runtime.swing.nav.tree.NavTreeNode; import jaxx.runtime.swing.nav.tree.NavTreeNodeChildLoador; import org.apache.commons.logging.Log; @@ -116,4 +118,9 @@ public class ObserveNode extends NavTreeNode<ObserveNode> { public boolean isActivityLonglineNode() { return isDataNode() && ActivityLonglineDto.class.isAssignableFrom(internalClass); } + + + protected ObserveServiceSupport getServiceSupportFactory(NavDataProvider dataProvider) { + return ((ObserveDataProvider)dataProvider).getDataSource().getServiceSupportFactory(); + } } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/ProgramLonglineNode.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/ProgramLonglineNode.java index f6afe07..9e8f176 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/ProgramLonglineNode.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/ProgramLonglineNode.java @@ -22,7 +22,6 @@ package fr.ird.observe.ui.tree; * #L% */ -import fr.ird.observe.ObserveSwingApplicationContext; import fr.ird.observe.services.dto.constants.GearType; import fr.ird.observe.services.dto.referential.ProgramDto; import fr.ird.observe.services.dto.referential.ReferentialReference; @@ -49,8 +48,8 @@ public class ProgramLonglineNode extends ReferentialReferenceNodeSupport<Program } @Override - protected ReferentialReference<ProgramDto> fetchEntity() { - ReferentialService service = ObserveSwingApplicationContext.get().newService(ReferentialService.class); + protected ReferentialReference<ProgramDto> fetchEntity(ObserveDataProvider dataProvider) { + ReferentialService service = getServiceSupportFactory(dataProvider).getReferentialService(); ReferentialReference<ProgramDto> referenceDto = service.loadReference(ProgramDto.class, getId()); return referenceDto; } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/ProgramSeineNode.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/ProgramSeineNode.java index ec51409..73f61e7 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/ProgramSeineNode.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/ProgramSeineNode.java @@ -22,7 +22,6 @@ package fr.ird.observe.ui.tree; * #L% */ -import fr.ird.observe.ObserveSwingApplicationContext; import fr.ird.observe.services.dto.constants.GearType; import fr.ird.observe.services.dto.referential.ProgramDto; import fr.ird.observe.services.dto.referential.ReferentialReference; @@ -47,8 +46,8 @@ public class ProgramSeineNode extends ReferentialReferenceNodeSupport<ProgramDto } @Override - protected ReferentialReference<ProgramDto> fetchEntity() { - ReferentialService service = ObserveSwingApplicationContext.get().newService(ReferentialService.class); + protected ReferentialReference<ProgramDto> fetchEntity(ObserveDataProvider dataProvider) { + ReferentialService service = getServiceSupportFactory(dataProvider).getReferentialService(); ReferentialReference<ProgramDto> referenceDto = service.loadReference(ProgramDto.class, getId()); return referenceDto; } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/RouteSeineNode.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/RouteSeineNode.java index f1d3cf7..5e8ec1c 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/RouteSeineNode.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/RouteSeineNode.java @@ -22,7 +22,6 @@ package fr.ird.observe.ui.tree; * #L% */ -import fr.ird.observe.ObserveSwingApplicationContext; import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.seine.RouteDto; import fr.ird.observe.services.service.seine.RouteService; @@ -42,8 +41,8 @@ public class RouteSeineNode extends DataReferenceNodeSupport<RouteDto> { } @Override - protected DataReference<RouteDto> fetchEntity() { - RouteService routeService = ObserveSwingApplicationContext.get().newService(RouteService.class); + protected DataReference<RouteDto> fetchEntity(ObserveDataProvider dataProvider) { + RouteService routeService = getServiceSupportFactory(dataProvider).getRouteService(); DataReference<RouteDto> referenceDto = routeService.loadReferenceToRead(getId()); return referenceDto; } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/SetLonglineNode.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/SetLonglineNode.java index 777d6c0..3da2a81 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/SetLonglineNode.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/SetLonglineNode.java @@ -22,7 +22,6 @@ package fr.ird.observe.ui.tree; * #L% */ -import fr.ird.observe.ObserveSwingApplicationContext; import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.longline.SetLonglineDto; import fr.ird.observe.services.service.longline.SetLonglineService; @@ -43,8 +42,8 @@ public class SetLonglineNode extends DataReferenceNodeSupport<SetLonglineDto> { } @Override - protected DataReference<SetLonglineDto> fetchEntity() { - SetLonglineService service = ObserveSwingApplicationContext.get().newService(SetLonglineService.class); + protected DataReference<SetLonglineDto> fetchEntity(ObserveDataProvider dataProvider) { + SetLonglineService service = getServiceSupportFactory(dataProvider).getSetLonglineService(); DataReference<SetLonglineDto> referenceDto = service.loadReferenceToRead(getId()); return referenceDto; } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/SetSeineNode.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/SetSeineNode.java index e8fa36e..97269d0 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/SetSeineNode.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/SetSeineNode.java @@ -22,7 +22,6 @@ package fr.ird.observe.ui.tree; * #L% */ -import fr.ird.observe.ObserveSwingApplicationContext; import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.seine.SetSeineDto; import fr.ird.observe.services.service.seine.SetSeineService; @@ -43,8 +42,8 @@ public class SetSeineNode extends DataReferenceNodeSupport<SetSeineDto> { } @Override - protected DataReference<SetSeineDto> fetchEntity() { - SetSeineService service = ObserveSwingApplicationContext.get().newService(SetSeineService.class); + protected DataReference<SetSeineDto> fetchEntity(ObserveDataProvider dataProvider) { + SetSeineService service = getServiceSupportFactory(dataProvider).getSetSeineService(); DataReference<SetSeineDto> referenceDto = service.loadReferenceToRead(getId()); return referenceDto; } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/TripLonglineNode.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/TripLonglineNode.java index 48dce95..dc1c54e 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/TripLonglineNode.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/TripLonglineNode.java @@ -22,7 +22,6 @@ package fr.ird.observe.ui.tree; * #L% */ -import fr.ird.observe.ObserveSwingApplicationContext; import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.longline.TripLonglineDto; import fr.ird.observe.services.service.longline.TripLonglineService; @@ -42,8 +41,8 @@ public class TripLonglineNode extends DataReferenceNodeSupport<TripLonglineDto> } @Override - protected DataReference<TripLonglineDto> fetchEntity() { - TripLonglineService tripLonglineService = ObserveSwingApplicationContext.get().newService(TripLonglineService.class); + protected DataReference<TripLonglineDto> fetchEntity(ObserveDataProvider dataProvider) { + TripLonglineService tripLonglineService = getServiceSupportFactory(dataProvider).getTripLonglineService(); DataReference<TripLonglineDto> referenceDto = tripLonglineService.loadReferenceToRead(getId()); return referenceDto; } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/TripSeineNode.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/TripSeineNode.java index 043195d..be06931 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/TripSeineNode.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/TripSeineNode.java @@ -22,7 +22,6 @@ package fr.ird.observe.ui.tree; * #L% */ -import fr.ird.observe.ObserveSwingApplicationContext; import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.seine.TripSeineDto; import fr.ird.observe.services.service.seine.TripSeineService; @@ -43,8 +42,8 @@ public class TripSeineNode extends DataReferenceNodeSupport<TripSeineDto> { @Override - protected DataReference<TripSeineDto> fetchEntity() { - TripSeineService tripSeineService = ObserveSwingApplicationContext.get().newService(TripSeineService.class); + protected DataReference<TripSeineDto> fetchEntity(ObserveDataProvider dataProvider) { + TripSeineService tripSeineService = getServiceSupportFactory(dataProvider).getTripSeineService(); DataReference<TripSeineDto> referenceDto = tripSeineService.loadReferenceToRead(getId()); return referenceDto; } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/actions/ChangeActivityRouteActionListener.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/actions/ChangeActivityRouteActionListener.java index 75c13eb..8fbf4b1 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/actions/ChangeActivityRouteActionListener.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/actions/ChangeActivityRouteActionListener.java @@ -75,9 +75,7 @@ public class ChangeActivityRouteActionListener extends NodeChangeActionListener protected int moveNodeToParent(String nodeId, String parentNodeId) { int position; - ObserveSwingApplicationContext applicationContext = ObserveSwingApplicationContext.get(); - - ActivitySeineService service = applicationContext.newService(ActivitySeineService.class); + ActivitySeineService service = getServiceSupport().getActivitySeineService(); position = service.moveActivitySeineToRoute(nodeId, parentNodeId); return position; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/actions/ChangeActivityTripActionListener.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/actions/ChangeActivityTripActionListener.java index 57f0341..8c0fb4c 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/actions/ChangeActivityTripActionListener.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/actions/ChangeActivityTripActionListener.java @@ -75,9 +75,7 @@ public class ChangeActivityTripActionListener extends NodeChangeActionListener { protected int moveNodeToParent(String nodeId, String parentNodeId) { int position; - ObserveSwingApplicationContext applicationContext = ObserveSwingApplicationContext.get(); - - ActivityLonglineService service = applicationContext.newService(ActivityLonglineService.class); + ActivityLonglineService service = getServiceSupport().getActivityLonglineService(); position = service.moveActivityLonglineToTripLongline(nodeId, parentNodeId); return position; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/actions/ChangeRouteTripActionListener.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/actions/ChangeRouteTripActionListener.java index e7f8e1c..982a2ca 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/actions/ChangeRouteTripActionListener.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/actions/ChangeRouteTripActionListener.java @@ -75,9 +75,7 @@ public class ChangeRouteTripActionListener extends NodeChangeActionListener { protected int moveNodeToParent(String nodeId, String parentNodeId) { int position; - ObserveSwingApplicationContext applicationContext = ObserveSwingApplicationContext.get(); - - RouteService service = applicationContext.newService(RouteService.class); + RouteService service = getServiceSupport().getRouteService(); position = service.moveRouteToTripSeine(nodeId, parentNodeId); return position; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/actions/ChangeTripProgramActionListener.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/actions/ChangeTripProgramActionListener.java index 2b57c35..1abd0a5 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/actions/ChangeTripProgramActionListener.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/actions/ChangeTripProgramActionListener.java @@ -71,14 +71,12 @@ public class ChangeTripProgramActionListener extends NodeChangeActionListener { protected int moveNodeToParent(String nodeId, String parentNodeId) { int position; - ObserveSwingApplicationContext applicationContext = ObserveSwingApplicationContext.get(); - if (IdDtos.isTripLonglineId(nodeId)) { - TripLonglineService service = applicationContext.newService(TripLonglineService.class); + TripLonglineService service = getServiceSupport().getTripLonglineService(); position = service.moveTripLonglineToProgram(nodeId, parentNodeId); } else { - TripSeineService service = applicationContext.newService(TripSeineService.class); + TripSeineService service = getServiceSupport().getTripSeineService(); position = service.moveTripSeineToProgram(nodeId, parentNodeId); } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/actions/NodeChangeActionListener.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/actions/NodeChangeActionListener.java index 6854c5a..bec942f 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/actions/NodeChangeActionListener.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/actions/NodeChangeActionListener.java @@ -24,6 +24,7 @@ package fr.ird.observe.ui.tree.actions; import fr.ird.observe.db.ObserveSwingDataSource; +import fr.ird.observe.services.ObserveServiceSupport; import fr.ird.observe.ui.tree.ObserveNode; import fr.ird.observe.ui.tree.ObserveTreeHelper; import org.apache.commons.logging.Log; @@ -109,4 +110,8 @@ public abstract class NodeChangeActionListener implements ActionListener { protected abstract int moveNodeToParent(String nodeId, String parentNodeId); protected abstract void openParent(ObserveNode parentNode); + + protected ObserveServiceSupport getServiceSupport() { + return dataSource.getServiceSupportFactory(); + } } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/AbstractNodeChildLoador.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/AbstractNodeChildLoador.java index 2d0ae76..b8b717a 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/AbstractNodeChildLoador.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/AbstractNodeChildLoador.java @@ -22,6 +22,7 @@ package fr.ird.observe.ui.tree.loadors; import fr.ird.observe.db.ObserveSwingDataSource; +import fr.ird.observe.services.ObserveServiceSupport; import fr.ird.observe.ui.storage.tabs.DataSelectionModel; import fr.ird.observe.ui.tree.ObserveDataProvider; import fr.ird.observe.ui.tree.ObserveNode; @@ -54,4 +55,8 @@ public abstract class AbstractNodeChildLoador<T, O> extends NavTreeNodeChildLoad return result; } + protected ObserveServiceSupport getServiceSupportFactory(NavDataProvider dataProvider) { + return getDataSource(dataProvider).getServiceSupportFactory(); + } + } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ActivityLonglinesNodeChildLoador.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ActivityLonglinesNodeChildLoador.java index d2a6d37..91e1678 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ActivityLonglinesNodeChildLoador.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ActivityLonglinesNodeChildLoador.java @@ -22,7 +22,6 @@ package fr.ird.observe.ui.tree.loadors; * #L% */ -import fr.ird.observe.ObserveSwingApplicationContext; import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.DataReferenceSet; import fr.ird.observe.services.dto.longline.ActivityLonglineDto; @@ -53,7 +52,7 @@ public class ActivityLonglinesNodeChildLoador extends AbstractDataReferenceChild String parentId, NavDataProvider dataProvider) throws Exception { - ActivityLonglineService activityLonglineService = ObserveSwingApplicationContext.get().newService(ActivityLonglineService.class); + ActivityLonglineService activityLonglineService = getServiceSupportFactory(dataProvider).getActivityLonglineService(); DataReferenceSet<ActivityLonglineDto> activityLonglineByTripLongline = activityLonglineService.getActivityLonglineByTripLongline(parentId); return new ArrayList<>(activityLonglineByTripLongline.getReferences()); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ActivitySeineNodeChildLoador.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ActivitySeineNodeChildLoador.java index 171e171..fbfef03 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ActivitySeineNodeChildLoador.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ActivitySeineNodeChildLoador.java @@ -21,7 +21,6 @@ */ package fr.ird.observe.ui.tree.loadors; -import fr.ird.observe.ObserveSwingApplicationContext; import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.DataReferenceSet; import fr.ird.observe.services.dto.seine.ActivitySeineDto; @@ -117,7 +116,7 @@ public class ActivitySeineNodeChildLoador extends AbstractDataReferenceChildLoad String parentId, NavDataProvider dataProvider) throws Exception { - FloatingObjectService service = ObserveSwingApplicationContext.get().newService(FloatingObjectService.class); + FloatingObjectService service = getServiceSupportFactory(dataProvider).getFloatingObjectService(); DataReferenceSet<FloatingObjectDto> floatingObjectByActivitySeine = service.getFloatingObjectByActivitySeine(parentId); return new ArrayList<>(floatingObjectByActivitySeine.getReferences()); } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ActivitySeinesNodeChildLoador.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ActivitySeinesNodeChildLoador.java index d741961..fc90e6b 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ActivitySeinesNodeChildLoador.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ActivitySeinesNodeChildLoador.java @@ -21,7 +21,6 @@ */ package fr.ird.observe.ui.tree.loadors; -import fr.ird.observe.ObserveSwingApplicationContext; import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.DataReferenceSet; import fr.ird.observe.services.dto.seine.ActivitySeineDto; @@ -52,7 +51,7 @@ public class ActivitySeinesNodeChildLoador extends AbstractDataReferenceChildLoa String parentId, NavDataProvider dataProvider) throws Exception { - ActivitySeineService activitySeineService = ObserveSwingApplicationContext.get().newService(ActivitySeineService.class); + ActivitySeineService activitySeineService = getServiceSupportFactory(dataProvider).getActivitySeineService(); DataReferenceSet<ActivitySeineDto> activitySeineStubByRoute = activitySeineService.getActivitySeineByRoute(parentId); return new ArrayList<>(activitySeineStubByRoute.getReferences()); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ProgramLonglineNodeChildLoador.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ProgramLonglineNodeChildLoador.java index 70c65bc..fce5ac5 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ProgramLonglineNodeChildLoador.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ProgramLonglineNodeChildLoador.java @@ -23,7 +23,6 @@ package fr.ird.observe.ui.tree.loadors; */ import com.google.common.collect.Lists; -import fr.ird.observe.ObserveSwingApplicationContext; import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.DataReferenceSet; import fr.ird.observe.services.dto.longline.TripLonglineDto; @@ -92,7 +91,7 @@ public class ProgramLonglineNodeChildLoador extends AbstractNodeChildLoador<Data } else { - TripLonglineService tripLonglineService = ObserveSwingApplicationContext.get().newService(TripLonglineService.class); + TripLonglineService tripLonglineService = getServiceSupportFactory(dataProvider).getTripLonglineService(); DataReferenceSet<TripLonglineDto> tripLonglineByProgram = tripLonglineService.getTripLonglineByProgram(parentId); result = Lists.newArrayList(tripLonglineByProgram.getReferences()); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ProgramSeineNodeChildLoador.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ProgramSeineNodeChildLoador.java index 03899dc..ac79be4 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ProgramSeineNodeChildLoador.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ProgramSeineNodeChildLoador.java @@ -22,7 +22,6 @@ package fr.ird.observe.ui.tree.loadors; import com.google.common.collect.Lists; -import fr.ird.observe.ObserveSwingApplicationContext; import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.DataReferenceSet; import fr.ird.observe.services.dto.seine.TripSeineDto; @@ -90,7 +89,7 @@ public class ProgramSeineNodeChildLoador extends AbstractNodeChildLoador<DataRef } else { - TripSeineService tripSeineService = ObserveSwingApplicationContext.get().newService(TripSeineService.class); + TripSeineService tripSeineService = getServiceSupportFactory(dataProvider).getTripSeineService(); DataReferenceSet<TripSeineDto> tripSeineByProgram = tripSeineService.getTripSeineByProgram(parentId); result = new ArrayList<>(tripSeineByProgram.getReferences()); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/RootNodeChildLoador.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/RootNodeChildLoador.java index 2630d0b..7259ef5 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/RootNodeChildLoador.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/RootNodeChildLoador.java @@ -22,11 +22,9 @@ package fr.ird.observe.ui.tree.loadors; import com.google.common.collect.Lists; -import fr.ird.observe.ObserveSwingApplicationContext; import fr.ird.observe.services.dto.constants.GearType; import fr.ird.observe.services.dto.referential.ProgramDto; import fr.ird.observe.services.dto.referential.ReferentialReference; -import fr.ird.observe.services.service.ReferentialService; import fr.ird.observe.ui.storage.tabs.DataSelectionModel; import fr.ird.observe.ui.tree.ObserveNode; import fr.ird.observe.ui.tree.ObserveTreeHelper; @@ -85,7 +83,6 @@ public class RootNodeChildLoador extends AbstractNodeChildLoador<ReferentialRefe if (selectionModel != null) { data = Lists.newArrayList(selectionModel.getDatas().keySet()); } else { - ReferentialService service = ObserveSwingApplicationContext.get().newService(ReferentialService.class); Set<ReferentialReference<ProgramDto>> referentialReferenceSet = getDataSource(dataProvider).getReferentialReferences(ProgramDto.class); data = new ArrayList<>(referentialReferenceSet); } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/RoutesNodeChildLoador.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/RoutesNodeChildLoador.java index a7e7da1..f737fa7 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/RoutesNodeChildLoador.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/RoutesNodeChildLoador.java @@ -21,7 +21,6 @@ */ package fr.ird.observe.ui.tree.loadors; -import fr.ird.observe.ObserveSwingApplicationContext; import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.DataReferenceSet; import fr.ird.observe.services.dto.seine.RouteDto; @@ -59,7 +58,7 @@ public class RoutesNodeChildLoador extends AbstractDataReferenceChildLoador<Rout String parentId, NavDataProvider dataProvider) throws Exception { - RouteService routeService = ObserveSwingApplicationContext.get().newService(RouteService.class); + RouteService routeService = getServiceSupportFactory(dataProvider).getRouteService(); DataReferenceSet<RouteDto> routeByTripSeine = routeService.getRouteByTripSeine(parentId); return new ArrayList<>(routeByTripSeine.getReferences()); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/validation/ValidationContext.java b/observe-application-swing/src/main/java/fr/ird/observe/validation/ValidationContext.java index 3bbd490..301f10c 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/validation/ValidationContext.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/validation/ValidationContext.java @@ -67,7 +67,7 @@ public class ValidationContext { @Override public TripSeineDto get(ObserveSwingDataSource dataSource, String id) { - TripSeineService service = dataSource.newService(TripSeineService.class); + TripSeineService service = dataSource.getServiceSupportFactory().getTripSeineService(); TripSeineDto dto = service.loadDto(id); return dto; } @@ -77,7 +77,7 @@ public class ValidationContext { @Override public RouteDto get(ObserveSwingDataSource dataSource, String id) { - RouteService service = dataSource.newService(RouteService.class); + RouteService service = dataSource.getServiceSupportFactory().getRouteService(); RouteDto dto = service.loadDto(id); return dto; } @@ -87,7 +87,7 @@ public class ValidationContext { @Override public ActivitySeineDto get(ObserveSwingDataSource dataSource, String id) { - ActivitySeineService service = dataSource.newService(ActivitySeineService.class); + ActivitySeineService service = dataSource.getServiceSupportFactory().getActivitySeineService(); ActivitySeineDto dto = service.loadDto(id); return dto; } @@ -97,7 +97,7 @@ public class ValidationContext { @Override public TripLonglineDto get(ObserveSwingDataSource dataSource, String id) { - TripLonglineService service = dataSource.newService(TripLonglineService.class); + TripLonglineService service = dataSource.getServiceSupportFactory().getTripLonglineService(); TripLonglineDto dto = service.loadDto(id); return dto; } @@ -107,7 +107,7 @@ public class ValidationContext { @Override public ActivityLonglineDto get(ObserveSwingDataSource dataSource, String id) { - ActivityLonglineService service = dataSource.newService(ActivityLonglineService.class); + ActivityLonglineService service = dataSource.getServiceSupportFactory().getActivityLonglineService(); ActivityLonglineDto dto = service.loadDto(id); return dto; } @@ -117,7 +117,7 @@ public class ValidationContext { @Override public SetSeineDto get(ObserveSwingDataSource dataSource, String id) { - SetSeineService service = dataSource.newService(SetSeineService.class); + SetSeineService service = dataSource.getServiceSupportFactory().getSetSeineService(); SetSeineDto dto = service.loadDto(id); return dto; } @@ -127,7 +127,7 @@ public class ValidationContext { @Override public SetLonglineDto get(ObserveSwingDataSource dataSource, String id) { - SetLonglineService service = dataSource.newService(SetLonglineService.class); + SetLonglineService service = dataSource.getServiceSupportFactory().getSetLonglineService(); SetLonglineDto dto = service.loadDto(id); return dto; } @@ -137,7 +137,7 @@ public class ValidationContext { @Override public FloatingObjectDto get(ObserveSwingDataSource dataSource, String id) { - FloatingObjectService service = dataSource.newService(FloatingObjectService.class); + FloatingObjectService service = dataSource.getServiceSupportFactory().getFloatingObjectService(); FloatingObjectDto dto = service.loadDto(id); return dto; } @@ -147,7 +147,7 @@ public class ValidationContext { @Override public SpeciesDto get(ObserveSwingDataSource dataSource, String id) { - ReferentialService service = dataSource.newService(ReferentialService.class); + ReferentialService service = dataSource.getServiceSupportFactory().getReferentialService(); SpeciesDto dto = service.loadSpecies(id); return dto; } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.