GitLab

at 2017-08-06T22:39:19+02:00

Let ui handler be a Services provider, helps a lot

 import fr.ird.observe.services.dto.reference.ReferentialReferenceSet;

 import fr.ird.observe.services.dto.reference.ReferentialReferences;

 import fr.ird.observe.services.dto.referential.ReferentialDto;

+import fr.ird.observe.services.service.DataSourceService;

+import fr.ird.observe.services.service.LastUpdateDateService;

+import fr.ird.observe.services.service.ObserveService;

+import fr.ird.observe.services.service.PingService;

+import fr.ird.observe.services.service.actions.consolidate.ConsolidateDataService;

+import fr.ird.observe.services.service.actions.report.ReportService;

+import fr.ird.observe.services.service.actions.synchro.referential.diff.ReferentialSynchronizeDiffService;

+import fr.ird.observe.services.service.actions.synchro.referential.legacy.UnidirectionalReferentialSynchronizeLocalService;

+import fr.ird.observe.services.service.actions.synchro.referential.ng.ReferentialSynchronizeService;

+import fr.ird.observe.services.service.actions.validate.ValidateService;

+import fr.ird.observe.services.service.data.NavigationService;

+import fr.ird.observe.services.service.data.TripManagementService;

+import fr.ird.observe.services.service.data.longline.ActivityLongLineEncounterService;

+import fr.ird.observe.services.service.data.longline.ActivityLongLineSensorUsedService;

+import fr.ird.observe.services.service.data.longline.ActivityLonglineService;

+import fr.ird.observe.services.service.data.longline.BranchlineService;

+import fr.ird.observe.services.service.data.longline.SetLonglineCatchService;

+import fr.ird.observe.services.service.data.longline.SetLonglineDetailCompositionService;

+import fr.ird.observe.services.service.data.longline.SetLonglineGlobalCompositionService;

+import fr.ird.observe.services.service.data.longline.SetLonglineService;

+import fr.ird.observe.services.service.data.longline.TdrService;

+import fr.ird.observe.services.service.data.longline.TripLonglineGearUseService;

+import fr.ird.observe.services.service.data.longline.TripLonglineService;

+import fr.ird.observe.services.service.data.seine.ActivitySeineService;

+import fr.ird.observe.services.service.data.seine.FloatingObjectService;

+import fr.ird.observe.services.service.data.seine.NonTargetCatchReleaseService;

+import fr.ird.observe.services.service.data.seine.NonTargetCatchService;

+import fr.ird.observe.services.service.data.seine.NonTargetSampleService;

+import fr.ird.observe.services.service.data.seine.ObjectObservedSpeciesService;

+import fr.ird.observe.services.service.data.seine.ObjectSchoolEstimateService;

+import fr.ird.observe.services.service.data.seine.RouteService;

+import fr.ird.observe.services.service.data.seine.SchoolEstimateService;

+import fr.ird.observe.services.service.data.seine.SetSeineService;

+import fr.ird.observe.services.service.data.seine.TargetCatchService;

+import fr.ird.observe.services.service.data.seine.TargetSampleService;

+import fr.ird.observe.services.service.data.seine.TransmittingBuoyOperationService;

+import fr.ird.observe.services.service.data.seine.TripSeineGearUseService;

+import fr.ird.observe.services.service.data.seine.TripSeineService;

+import fr.ird.observe.services.service.referential.ReferentialService;

+import fr.ird.observe.services.service.sql.SqlScriptProducerService;

 import java.awt.Component;

 import java.awt.Dimension;

 import java.awt.FocusTraversalPolicy;

 import org.nuiton.validator.NuitonValidatorScope;

 

 

+import static fr.ird.observe.client.db.ObserveSwingDataSource.MAIN;

 import static org.nuiton.i18n.I18n.t;

 

 /**

  * @author Tony Chemit - dev@tchemit.fr

  * @since 1.4

  */

-public abstract class ContentUIHandler<E extends IdDto, U extends ContentUI<E, U>> {

+public abstract class ContentUIHandler<E extends IdDto, U extends ContentUI<E, U>> implements ObserveServicesProvider {

 

     /** Logger */

     static private final Log log = LogFactory.getLog(ContentUIHandler.class);

     /** l'interface graphique que le controleur utilise */

     protected U ui;

 

-

     public void beforeInit(U ui) {

         this.ui = ui;

         prefix = "[" + ui.getClass().getSimpleName() + "] ";

 

     }

 

-    protected ObserveServicesProvider getServicesProvider() {

-        return ObserveSwingDataSource.MAIN;

-    }

-

     protected <D extends ReferentialDto> FormRequestDefinition<D> getReferentialFormRequest(Class<D> type) {

         return ObserveSwingApplicationContext.get().getFormRequestDefinitionProvider().getDefinition(type);

     }

     private <D extends ReferentialDto> FormRequestDefinition<D> getFormRequest(String type) {

         return ObserveSwingApplicationContext.get().getFormRequestDefinitionProvider().getDefinition(type);

     }

+

+    @Override

+    public <S extends ObserveService> S getService(Class<S> serviceType) {

+        return MAIN.getService(serviceType);

+    }

+

+    @Override

+    public LastUpdateDateService getLastUpdateDateService() {

+        return MAIN.getLastUpdateDateService();

+    }

+

+    @Override

+    public SqlScriptProducerService getSqlScriptProducerService() {

+        return MAIN.getSqlScriptProducerService();

+    }

+

+    @Override

+    public ValidateService getValidateService() {

+        return MAIN.getValidateService();

+    }

+

+    @Override

+    public ReportService getReportService() {

+        return MAIN.getReportService();

+    }

+

+    @Override

+    public PingService getPingService() {

+        return MAIN.getPingService();

+    }

+

+    @Override

+    public TripManagementService getTripManagementService() {

+        return MAIN.getTripManagementService();

+    }

+

+    @Override

+    public ConsolidateDataService getConsolidateDataService() {

+        return MAIN.getConsolidateDataService();

+    }

+

+    @Override

+    public UnidirectionalReferentialSynchronizeLocalService getUnidirectionalReferentialSynchronizeLocalService() {

+        return MAIN.getUnidirectionalReferentialSynchronizeLocalService();

+    }

+

+    @Override

+    public ReferentialSynchronizeService getReferentialSynchronizeService() {

+        return MAIN.getReferentialSynchronizeService();

+    }

+

+    @Override

+    public ReferentialSynchronizeDiffService getReferentialSynchronizeDiffService() {

+        return MAIN.getReferentialSynchronizeDiffService();

+    }

+

+    @Override

+    public DataSourceService getDataSourceService() {

+        return MAIN.getDataSourceService();

+    }

+

+    @Override

+    public NavigationService getNavigationService() {

+        return MAIN.getNavigationService();

+    }

+

+    @Override

+    public ReferentialService getReferentialService() {

+        return MAIN.getReferentialService();

+    }

+

+    @Override

+    public TripSeineService getTripSeineService() {

+        return MAIN.getTripSeineService();

+    }

+

+    @Override

+    public RouteService getRouteService() {

+        return MAIN.getRouteService();

+    }

+

+    @Override

+    public FloatingObjectService getFloatingObjectService() {

+        return MAIN.getFloatingObjectService();

+    }

+

+    @Override

+    public ActivitySeineService getActivitySeineService() {

+        return MAIN.getActivitySeineService();

+    }

+

+    @Override

+    public SetSeineService getSetSeineService() {

+        return MAIN.getSetSeineService();

+    }

+

+    @Override

+    public TripLonglineService getTripLonglineService() {

+        return MAIN.getTripLonglineService();

+    }

+

+    @Override

+    public ActivityLonglineService getActivityLonglineService() {

+        return MAIN.getActivityLonglineService();

+    }

+

+    @Override

+    public SetLonglineService getSetLonglineService() {

+        return MAIN.getSetLonglineService();

+    }

+

+    @Override

+    public SetLonglineGlobalCompositionService getSetLonglineGlobalCompositionService() {

+        return MAIN.getSetLonglineGlobalCompositionService();

+    }

+

+    @Override

+    public SetLonglineDetailCompositionService getSetLonglineDetailCompositionService() {

+        return MAIN.getSetLonglineDetailCompositionService();

+    }

+

+    @Override

+    public TransmittingBuoyOperationService getTransmittingBuoyOperationService() {

+        return MAIN.getTransmittingBuoyOperationService();

+    }

+

+    @Override

+    public BranchlineService getBranchlineService() {

+        return MAIN.getBranchlineService();

+    }

+

+    @Override

+    public SetLonglineCatchService getSetLonglineCatchService() {

+        return MAIN.getSetLonglineCatchService();

+    }

+

+    @Override

+    public ActivityLongLineEncounterService getActivityLongLineEncounterService() {

+        return MAIN.getActivityLongLineEncounterService();

+    }

+

+    @Override

+    public TripLonglineGearUseService getTripLonglineGearUseService() {

+        return MAIN.getTripLonglineGearUseService();

+    }

+

+    @Override

+    public ActivityLongLineSensorUsedService getActivityLongLineSensorUsedService() {

+        return MAIN.getActivityLongLineSensorUsedService();

+    }

+

+    @Override

+    public TdrService getTdrService() {

+        return MAIN.getTdrService();

+    }

+

+    @Override

+    public TripSeineGearUseService getTripSeineGearUseService() {

+        return MAIN.getTripSeineGearUseService();

+    }

+

+    @Override

+    public NonTargetCatchService getNonTargetCatchService() {

+        return MAIN.getNonTargetCatchService();

+    }

+

+    @Override

+    public NonTargetCatchReleaseService getNonTargetCatchReleaseService() {

+        return MAIN.getNonTargetCatchReleaseService();

+    }

+

+    @Override

+    public NonTargetSampleService getNonTargetSampleService() {

+        return MAIN.getNonTargetSampleService();

+    }

+

+    @Override

+    public ObjectObservedSpeciesService getObjectObservedSpeciesService() {

+        return MAIN.getObjectObservedSpeciesService();

+    }

+

+    @Override

+    public ObjectSchoolEstimateService getObjectSchoolEstimateService() {

+        return MAIN.getObjectSchoolEstimateService();

+    }

+

+    @Override

+    public SchoolEstimateService getSchoolEstimateService() {

+        return MAIN.getSchoolEstimateService();

+    }

+

+    @Override

+    public TargetCatchService getTargetCatchService() {

+        return MAIN.getTargetCatchService();

+    }

+

+    @Override

+    public TargetSampleService getTargetSampleService() {

+        return MAIN.getTargetSampleService();

+    }

+

+    @Override

+    public void close() {

+

+    }

 }
 

     }

 

-    private SetLonglineDetailCompositionService getSetLonglineDetailCompositionService() {

-        return getServicesProvider().getSetLonglineDetailCompositionService();

-    }

-

 }
 import fr.ird.observe.services.dto.longline.SetLonglineGlobalCompositionDto;

 import fr.ird.observe.services.dto.longline.SetLonglineGlobalCompositionHelper;

 import fr.ird.observe.services.dto.result.SaveResultDto;

-import fr.ird.observe.services.service.data.longline.SetLonglineGlobalCompositionService;

 import org.apache.commons.logging.Log;

 import org.apache.commons.logging.LogFactory;

 import org.nuiton.jaxx.runtime.spi.UIHandler;

         getUi().getBaitsCompositionUI().getHandler().afterSave(refresh);

     }

 

-    private SetLonglineGlobalCompositionService getSetLonglineGlobalCompositionService() {

-

-        return getServicesProvider().getSetLonglineGlobalCompositionService();

-    }

-

 }
 import fr.ird.observe.services.dto.longline.SetLonglineHelper;

 import fr.ird.observe.services.dto.reference.DataReference;

 import fr.ird.observe.services.dto.result.SaveResultDto;

-import fr.ird.observe.services.service.data.longline.SetLonglineService;

 import java.beans.PropertyChangeListener;

 import java.util.HashSet;

 import java.util.Set;

 

     }

 

-    private SetLonglineService getSetLonglineService() {

-        return getServicesProvider().getSetLonglineService();

-    }

 }
 import fr.ird.observe.services.dto.seine.FloatingObjectTransmittingBuoyHelper;

 import fr.ird.observe.services.dto.seine.TransmittingBuoyDto;

 import fr.ird.observe.services.dto.seine.TransmittingBuoyHelper;

-import fr.ird.observe.services.service.data.seine.TransmittingBuoyOperationService;

 import java.awt.GridLayout;

 import java.util.ArrayList;

 import java.util.Collection;

         return objectOperation;

     }

 

-    private TransmittingBuoyOperationService getTransmittingBuoyOperationService() {

-        return getServicesProvider().getTransmittingBuoyOperationService();

-    }

-

 }
 import fr.ird.observe.services.dto.seine.FloatingObjectHelper;

 import fr.ird.observe.services.dto.seine.FloatingObjectPartDto;

 import fr.ird.observe.services.dto.seine.ObjectMaterialHierarchyDto;

-import fr.ird.observe.services.service.data.seine.FloatingObjectService;

 import java.awt.Color;

 import java.util.HashSet;

 import java.util.List;

         }, Color.RED, Color.WHITE));

     }

 

-    private FloatingObjectService getFloatingObjectService() {

-        return getServicesProvider().getFloatingObjectService();

-    }

-

     protected void computeTabValidState(SwingValidatorMessageTableModel errorTableModel) {

 

         Set<String> errorProperties = new HashSet<>();

 import fr.ird.observe.services.dto.seine.RouteDto;

 import fr.ird.observe.services.dto.seine.SetSeineDto;

 import fr.ird.observe.services.dto.seine.SetSeineHelper;

-import fr.ird.observe.services.service.data.seine.RouteService;

-import fr.ird.observe.services.service.data.seine.SetSeineService;

 import java.beans.PropertyChangeListener;

 import java.util.Date;

 import java.util.HashSet;

         getModel().setForm(form);

         SetSeineHelper.copySetSeineDto(form.getObject(), bean);

 

-        RouteService routeService = getServicesProvider().getRouteService();

-

-        RouteDto route = routeService.loadDto(selectedRouteId);

+        RouteDto route = getRouteService().loadDto(selectedRouteId);

 

         Date time = bean.getStartTime();

 

 

     }

 

-    private SetSeineService getSetSeineService() {

-        return getServicesProvider().getSetSeineService();

-    }

 }
  */

 

 import fr.ird.observe.client.ui.util.treetable.JRadioButtonProvider;

-import fr.ird.observe.services.dto.seine.ObjectMaterialHierarchyDto;

 import java.awt.Component;

 import java.util.Objects;

 import javax.swing.JTable;

 import fr.ird.observe.services.dto.longline.TripLonglineDto;

 import fr.ird.observe.services.dto.reference.DataReference;

 import fr.ird.observe.services.dto.result.TripChildSaveResultDto;

-import fr.ird.observe.services.service.data.longline.ActivityLonglineService;

 import java.util.Optional;

 import javax.swing.SwingUtilities;

 import org.apache.commons.logging.Log;

 

     }

 

-    private ActivityLonglineService getActivityLonglineService() {

-        return getServicesProvider().getActivityLonglineService();

-    }

 }
 import fr.ird.observe.services.dto.referential.ReferentialDto;

 import fr.ird.observe.services.dto.referential.VesselHelper;

 import fr.ird.observe.services.dto.result.SaveResultDto;

-import fr.ird.observe.services.service.data.longline.TripLonglineService;

 import java.util.Collection;

 import java.util.Date;

 import java.util.LinkedList;

         return result;

     }

 

-    private TripLonglineService getTripLonglineService() {

-        return getServicesProvider().getTripLonglineService();

-    }

 }
 import fr.ird.observe.services.dto.seine.ActivitySeineHelper;

 import fr.ird.observe.services.dto.seine.RouteDto;

 import fr.ird.observe.services.dto.seine.TripSeineDto;

-import fr.ird.observe.services.service.data.seine.ActivitySeineService;

 import java.util.HashSet;

 import java.util.List;

 import java.util.Optional;

 

     }

 

-    private ActivitySeineService getActivitySeineService() {

-        return getServicesProvider().getActivitySeineService();

-    }

-

 }
 import fr.ird.observe.services.dto.seine.RouteDto;

 import fr.ird.observe.services.dto.seine.RouteHelper;

 import fr.ird.observe.services.dto.seine.TripSeineDto;

-import fr.ird.observe.services.service.data.seine.RouteService;

 import java.util.Date;

 import javax.swing.JOptionPane;

 import org.apache.commons.logging.Log;

         return !create && getOpenDataManager().canOpenRoute(getSelectedParentId());

     }

 

-    private RouteService getRouteService() {

-        return getServicesProvider().getRouteService();

-    }

 }
 import fr.ird.observe.services.dto.result.SaveResultDto;

 import fr.ird.observe.services.dto.seine.TripSeineDto;

 import fr.ird.observe.services.dto.seine.TripSeineHelper;

-import fr.ird.observe.services.service.data.seine.TripSeineService;

 import java.util.Collection;

 import java.util.Date;

 import java.util.LinkedList;

         return result;

     }

 

-    private TripSeineService getTripSeineService() {

-        return getServicesProvider().getTripSeineService();

-    }

-

 }
 import fr.ird.observe.services.dto.referential.ReferentialDto;

 import fr.ird.observe.services.dto.result.SaveResultDto;

 import fr.ird.observe.services.service.DataNotFoundException;

-import fr.ird.observe.services.service.referential.ReferentialService;

 import java.awt.Container;

 import java.awt.Dimension;

 import java.awt.Font;

         binder.copy(source, target);

     }

 

-    private ReferentialService getReferentialService() {

-        return getServicesProvider().getReferentialService();

-    }

-

 }
 import fr.ird.observe.services.dto.referential.longline.CatchFateLonglineDto;

 import fr.ird.observe.services.dto.referential.longline.HealthnessDto;

 import fr.ird.observe.services.dto.result.SaveResultDto;

-import fr.ird.observe.services.service.data.longline.BranchlineService;

-import fr.ird.observe.services.service.data.longline.SetLonglineCatchService;

 import fr.ird.observe.services.service.data.longline.TripLonglineService;

 import java.beans.PropertyChangeListener;

 import java.util.Calendar;

         }

 

         String openSetLonglineId = getDataContext().getSelectedSetLonglineId();

-        SaveResultDto saveResult = getBranchLineService().save(openSetLonglineId, branchline);

+        SaveResultDto saveResult = getBranchlineService().save(openSetLonglineId, branchline);

         saveResult.toDto(branchline);

 

         // on recopie le last update car c'est le laste update de SetLongline qui est renvoyé.

 

                 String tripLonglineId = getDataContext().getSelectedTripLonglineId();

 

-                TripLonglineService tripLonglineService = getServicesProvider().getTripLonglineService();

+                TripLonglineService tripLonglineService = getTripLonglineService();

                 result = (List) tripLonglineService.getSpeciesByListAndTrip(tripLonglineId, speciesListId);

 

                 result = ReferentialReferences.filterEnabled(result);

 

             String setLonglineId = getDataContext().getSelectedSetLonglineId();

 

-            Form<BranchlineDto> form = getBranchLineService().loadForm(setLonglineId, newValue.getId());

+            Form<BranchlineDto> form = getBranchlineService().loadForm(setLonglineId, newValue.getId());

             BranchlineHelper.copyBranchlineDto(form.getObject(), branchline);

 

             if (ui.getValidator().getBean() == null) {

         return (CatchLonglineTableModel) super.getTableModel();

     }

 

-    private SetLonglineCatchService getSetLonglineCatchService() {

-        return getServicesProvider().getSetLonglineCatchService();

-    }

-

-    private BranchlineService getBranchLineService() {

-        return getServicesProvider().getBranchlineService();

-    }

-

     public void moveCatchLonglineUp() {

         int selectedRow = getUi().getTable().getSelectedRow();

         getTableModel().moveUp(selectedRow);

 import fr.ird.observe.services.dto.referential.SpeciesListDto;

 import fr.ird.observe.services.dto.referential.longline.EncounterTypeDto;

 import fr.ird.observe.services.dto.result.SaveResultDto;

-import fr.ird.observe.services.service.data.longline.ActivityLongLineEncounterService;

 import fr.ird.observe.services.service.referential.ReferentialService;

 import java.util.Collection;

 import java.util.LinkedList;

     @Override

     protected void doPersist(ActivityLonglineEncounterDto bean) {

 

-        SaveResultDto saveResult = getActivityLongLineEncouterService().save(bean);

+        SaveResultDto saveResult = getActivityLongLineEncounterService().save(bean);

         saveResult.toDto(bean);

 

     }

 

     @Override

     protected void loadEditBean(String beanId) {

-        Form<ActivityLonglineEncounterDto> form = getActivityLongLineEncouterService().loadForm(beanId);

+        Form<ActivityLonglineEncounterDto> form = getActivityLongLineEncounterService().loadForm(beanId);

         loadReferentialReferenceSetsInModel(form);

 

         getModel().setForm(form);

 

                 String speciesListId = ObserveSwingApplicationContext.get().getConfig().getSpeciesListLonglineEncounterId();

 

-                ReferentialService referentialService = getServicesProvider().getReferentialService();

+                ReferentialService referentialService = getReferentialService();

 

                 Form<SpeciesListDto> speciesListDtoForm = referentialService.loadForm(SpeciesListDto.class, speciesListId);

                 SpeciesListDto speciesListDto = speciesListDtoForm.getObject();

 

     }

 

-    private ActivityLongLineEncounterService getActivityLongLineEncouterService() {

-        return getServicesProvider().getActivityLongLineEncounterService();

-    }

 }
 import fr.ird.observe.services.dto.referential.GearCaracteristicTypeHelper;

 import fr.ird.observe.services.dto.referential.GearDto;

 import fr.ird.observe.services.dto.result.SaveResultDto;

-import fr.ird.observe.services.service.data.longline.TripLonglineGearUseService;

 import fr.ird.observe.services.service.referential.ReferentialService;

 import java.awt.GridBagConstraints;

 import java.awt.Insets;

 

     List<GearUseFeaturesMeasurementLonglineDto> getDefaultGearUseFeaturesMeasurementLongline(String gearId) {

 

-        ReferentialService referentialService = getServicesProvider().getReferentialService();

+        ReferentialService referentialService = getReferentialService();

 

         Form<GearDto> gearDtoForm = referentialService.loadForm(GearDto.class, gearId);

 

         TripLonglineGearUseHelper.copyTripLonglineGearUseDto(form.getObject(), getBean());

     }

 

-    private TripLonglineGearUseService getTripLonglineGearUseService() {

-        return getServicesProvider().getTripLonglineGearUseService();

-    }

-

 }
 import fr.ird.observe.services.dto.referential.longline.SensorDataFormatDto;

 import fr.ird.observe.services.dto.referential.longline.SensorTypeDto;

 import fr.ird.observe.services.dto.result.SaveResultDto;

-import fr.ird.observe.services.service.data.longline.ActivityLongLineSensorUsedService;

 import java.io.File;

 import java.io.IOException;

 import java.nio.file.Files;

 

             DataFileDto dataFile = getTableEditBean().getData();

             if (dataFile == null) {

-                dataFile = getActivityLonglineSensorUsedService().getDataFile(getTableEditBean().getId());

+                dataFile = getActivityLongLineSensorUsedService().getDataFile(getTableEditBean().getId());

             }

 

             int response = UIHelper.askUser(ui,

         DataFileDto dataFile = getTableEditBean().getData();

 

         if (dataFile == null) {

-            dataFile = getActivityLonglineSensorUsedService().getDataFile(getTableEditBean().getId());

+            dataFile = getActivityLongLineSensorUsedService().getDataFile(getTableEditBean().getId());

         }

 

 

     @Override

     protected void doPersist(ActivityLonglineSensorUsedDto bean) {

 

-        SaveResultDto saveResult = getActivityLonglineSensorUsedService().save(bean);

+        SaveResultDto saveResult = getActivityLongLineSensorUsedService().save(bean);

         saveResult.toDto(bean);

 

     }

 

     @Override

     protected void loadEditBean(String beanId) {

-        Form<ActivityLonglineSensorUsedDto> form = getActivityLonglineSensorUsedService().loadForm(beanId);

+        Form<ActivityLonglineSensorUsedDto> form = getActivityLongLineSensorUsedService().loadForm(beanId);

         loadReferentialReferenceSetsInModel(form);

         getModel().setForm(form);

         ActivityLonglineSensorUsedHelper.copyActivityLonglineSensorUsedDto(form.getObject(), getBean());

     }

 

-    private ActivityLongLineSensorUsedService getActivityLonglineSensorUsedService() {

-        return getServicesProvider().getActivityLongLineSensorUsedService();

-    }

-

 }
 import fr.ird.observe.services.dto.referential.ReferentialDto;

 import fr.ird.observe.services.dto.referential.longline.SensorBrandDto;

 import fr.ird.observe.services.dto.result.SaveResultDto;

-import fr.ird.observe.services.service.data.longline.TdrService;

 import fr.ird.observe.services.service.data.longline.TripLonglineService;

 import java.beans.PropertyChangeListener;

 import java.io.File;

 

                 String tripLonglineId = getDataContext().getSelectedTripLonglineId();

 

-                TripLonglineService tripLonglineService = getServicesProvider().getTripLonglineService();

+                TripLonglineService tripLonglineService = getTripLonglineService();

                 result = (List) tripLonglineService.getSpeciesByListAndTrip(tripLonglineId, speciesListId);

 

                 result = ReferentialReferences.filterEnabled(result);

         SetLonglineTdrHelper.copySetLonglineTdrDto(form.getObject(), getBean());

 

     }

-

-    private TdrService getTdrService() {

-        return getServicesProvider().getTdrService();

-    }

 }
 import fr.ird.observe.services.dto.seine.TripSeineDto;

 import fr.ird.observe.services.dto.seine.TripSeineGearUseDto;

 import fr.ird.observe.services.dto.seine.TripSeineGearUseHelper;

-import fr.ird.observe.services.service.data.seine.TripSeineGearUseService;

 import fr.ird.observe.services.service.referential.ReferentialService;

 import java.awt.GridBagConstraints;

 import java.awt.Insets;

 

     List<GearUseFeaturesMeasurementSeineDto> getDefaultGearUseFeaturesMeasurementSeine(String gearId) {

 

-        ReferentialService referentialService = getServicesProvider().getReferentialService();

+        ReferentialService referentialService = getReferentialService();

 

         Form<GearDto> gearDtoForm = referentialService.loadForm(GearDto.class, gearId);

 

         TripSeineGearUseHelper.copyTripSeineGearUseDto(form.getObject(), getBean());

     }

 

-    private TripSeineGearUseService getTripSeineGearUseService() {

-        return getServicesProvider().getTripSeineGearUseService();

-    }

-

 }
 import fr.ird.observe.services.dto.seine.NonTargetCatchReleaseDto;

 import fr.ird.observe.services.dto.seine.SetSeineNonTargetCatchReleaseDto;

 import fr.ird.observe.services.dto.seine.SetSeineNonTargetCatchReleaseHelper;

-import fr.ird.observe.services.service.data.seine.NonTargetCatchReleaseService;

-import fr.ird.observe.services.service.referential.ReferentialService;

 import java.beans.PropertyChangeListener;

 import java.util.ArrayList;

 import java.util.Collection;

 

     }

 

-    private NonTargetCatchReleaseService getNonTargetCatchReleaseService() {

-        return getServicesProvider().getNonTargetCatchReleaseService();

-    }

-

-

-    private ReferentialService getReferentialService() {

-        return getServicesProvider().getReferentialService();

-    }

-

     public void moveCatchLonglineUp() {

         int selectedRow = getUi().getTable().getSelectedRow();

         getTableModel().moveUp(selectedRow);

 import fr.ird.observe.services.dto.seine.NonTargetCatchHelper;

 import fr.ird.observe.services.dto.seine.SetSeineNonTargetCatchDto;

 import fr.ird.observe.services.dto.seine.SetSeineNonTargetCatchHelper;

-import fr.ird.observe.services.service.data.seine.NonTargetCatchService;

 import fr.ird.observe.services.service.data.seine.TripSeineService;

 import java.beans.PropertyChangeListener;

 import java.util.ArrayList;

                 String speciesListId = ObserveSwingApplicationContext.get().getConfig().getSpeciesListSeineNonTargetCatchId();

                 String tripSeineId = getDataContext().getSelectedTripSeineId();

 

-                TripSeineService tripSeineService = getServicesProvider().getTripSeineService();

+                TripSeineService tripSeineService = getTripSeineService();

                 result = (List) tripSeineService.getSpeciesByListAndTrip(tripSeineId, speciesListId);

 

                 result = ReferentialReferences.filterEnabled(result);

         return result;

     }

 

-    private NonTargetCatchService getNonTargetCatchService() {

-        return getServicesProvider().getNonTargetCatchService();

-    }

 }
 import fr.ird.observe.services.dto.seine.NonTargetSampleDto;

 import fr.ird.observe.services.dto.seine.NonTargetSampleHelper;

 import fr.ird.observe.services.dto.seine.SetSeineDto;

-import fr.ird.observe.services.service.data.seine.NonTargetSampleService;

 import java.util.Collection;

 import java.util.LinkedList;

 import java.util.List;

 

     }

 

-    private NonTargetSampleService getNonTargetSampleService() {

-        return getServicesProvider().getNonTargetSampleService();

-    }

-

     private Optional<ReferentialReference<SizeMeasureTypeDto>> getSpeciesDefaultSizeMeasureType(ReferentialReference<SpeciesDto> species) {

         Optional<ReferentialReference<SizeMeasureTypeDto>> result = Optional.empty();

         if (species != null) {

 import fr.ird.observe.services.dto.seine.FloatingObjectObservedSpeciesHelper;

 import fr.ird.observe.services.dto.seine.ObjectObservedSpeciesDto;

 import fr.ird.observe.services.dto.seine.ObjectSchoolEstimateDto;

-import fr.ird.observe.services.service.data.seine.ObjectObservedSpeciesService;

 import fr.ird.observe.services.service.referential.ReferentialService;

 import java.util.Collection;

 import java.util.LinkedList;

             case ObjectSchoolEstimateDto.PROPERTY_SPECIES: {

                 String speciesListId = ObserveSwingApplicationContext.get().getConfig().getSpeciesListSeineObjectObservedSpeciesId();

 

-                ReferentialService referentialService = getServicesProvider().getReferentialService();

+                ReferentialService referentialService = getReferentialService();

                 Form<SpeciesListDto> speciesListDtoForm = referentialService.loadForm(SpeciesListDto.class, speciesListId);

                 SpeciesListDto speciesListDto = speciesListDtoForm.getObject();

 

 

     }

 

-    private ObjectObservedSpeciesService getObjectObservedSpeciesService() {

-        return getServicesProvider().getObjectObservedSpeciesService();

-    }

 }
 import fr.ird.observe.services.dto.seine.FloatingObjectSchoolEstimateDto;

 import fr.ird.observe.services.dto.seine.FloatingObjectSchoolEstimateHelper;

 import fr.ird.observe.services.dto.seine.ObjectSchoolEstimateDto;

-import fr.ird.observe.services.service.data.seine.ObjectSchoolEstimateService;

 import fr.ird.observe.services.service.referential.ReferentialService;

 import java.util.Collection;

 import java.util.LinkedList;

             case ObjectSchoolEstimateDto.PROPERTY_SPECIES: {

                 String speciesListId = ObserveSwingApplicationContext.get().getConfig().getSpeciesListSeineObjectSchoolEstimateId();

 

-                ReferentialService referentialService = getServicesProvider().getReferentialService();

+                ReferentialService referentialService = getReferentialService();

                 Form<SpeciesListDto> speciesListDtoForm = referentialService.loadForm(SpeciesListDto.class, speciesListId);

                 SpeciesListDto speciesListDto = speciesListDtoForm.getObject();

 

 

     }

 

-    private ObjectSchoolEstimateService getObjectSchoolEstimateService() {

-        return getServicesProvider().getObjectSchoolEstimateService();

-    }

 }
 import fr.ird.observe.services.dto.seine.SchoolEstimateDto;

 import fr.ird.observe.services.dto.seine.SetSeineSchoolEstimateDto;

 import fr.ird.observe.services.dto.seine.SetSeineSchoolEstimateHelper;

-import fr.ird.observe.services.service.data.seine.SchoolEstimateService;

 import fr.ird.observe.services.service.data.seine.TripSeineService;

 import java.util.Collection;

 import java.util.Collections;

                 String speciesListId = ObserveSwingApplicationContext.get().getConfig().getSpeciesListSeineSchoolEstimateId();

                 String tripSeineId = getDataContext().getSelectedTripSeineId();

 

-                TripSeineService tripSeineService = getServicesProvider().getTripSeineService();

+                TripSeineService tripSeineService = getTripSeineService();

                 result = (List) tripSeineService.getSpeciesByListAndTrip(tripSeineId, speciesListId);

 

                 result = ReferentialReferences.filterEnabled(result);

 

     }

 

-    private SchoolEstimateService getSchoolEstimateService() {

-        return getServicesProvider().getSchoolEstimateService();

-    }

 }
 import fr.ird.observe.services.dto.seine.SetSeineTargetCatchHelper;

 import fr.ird.observe.services.dto.seine.TargetCatchDto;

 import fr.ird.observe.services.dto.seine.TargetCatchHelper;

-import fr.ird.observe.services.service.data.seine.TargetCatchService;

 import fr.ird.observe.services.service.data.seine.TripSeineService;

 import java.util.Collection;

 import java.util.Collections;

                 String speciesListId = ObserveSwingApplicationContext.get().getConfig().getSpeciesListSeineTargetCatchId();

                 String tripSeineId = getDataContext().getSelectedTripSeineId();

 

-                TripSeineService tripSeineService = getServicesProvider().getTripSeineService();

+                TripSeineService tripSeineService = getTripSeineService();

                 result = (List) tripSeineService.getSpeciesByListAndTrip(tripSeineId, speciesListId);

 

                 result = ReferentialReferences.filterEnabled(result);

 

     }

 

-    private TargetCatchService getTargetCatchService() {

-        return getServicesProvider().getTargetCatchService();

-    }

-

 }
 import fr.ird.observe.services.dto.seine.SetSeineTargetCatchHelper;

 import fr.ird.observe.services.dto.seine.TargetCatchDto;

 import fr.ird.observe.services.dto.seine.TargetCatchHelper;

-import fr.ird.observe.services.service.data.seine.TargetCatchService;

 import fr.ird.observe.services.service.data.seine.TripSeineService;

 import java.util.ArrayList;

 import java.util.Collection;

                 String speciesListId = ObserveSwingApplicationContext.get().getConfig().getSpeciesListSeineTargetCatchId();

                 String tripSeineId = getDataContext().getSelectedTripSeineId();

 

-                TripSeineService tripSeineService = getServicesProvider().getTripSeineService();

+                TripSeineService tripSeineService = getTripSeineService();

                 result = (List) tripSeineService.getSpeciesByListAndTrip(tripSeineId, speciesListId);

 

                 result = ReferentialReferences.filterEnabled(result);

 

     }

 

-    private TargetCatchService getTargetCatchService() {

-        return getServicesProvider().getTargetCatchService();

-    }

 }
 import fr.ird.observe.services.dto.seine.TargetLengthDto;

 import fr.ird.observe.services.dto.seine.TargetSampleDto;

 import fr.ird.observe.services.dto.seine.TargetSampleHelper;

-import fr.ird.observe.services.service.data.seine.TargetSampleService;

 import java.util.Collection;

 import java.util.LinkedList;

 import java.util.List;

 

     }

 

-    private TargetSampleService getTargetSampleService() {

-        return getServicesProvider().getTargetSampleService();

-    }

-

     private Optional<ReferentialReference<SizeMeasureTypeDto>> getSpeciesDefaultSizeMeasureType(ReferentialReference<SpeciesDto> species) {

         Optional<ReferentialReference<SizeMeasureTypeDto>> result = Optional.empty();

         if (species != null) {

...	...	@@ -1377,8 +1377,4 @@ public class LonglineDetailCompositionUIHandler extends ContentUIHandler<SetLong
1377	1377
1378	1378	}
1379	1379
1380		- private SetLonglineDetailCompositionService getSetLonglineDetailCompositionService() {
1381		- return getServicesProvider().getSetLonglineDetailCompositionService();
1382		- }
1383		-
1384	1380	}

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe

Commits:

29 changed files:

Changes: