branch feature/7553 updated (cf10568 -> 53e2380)
This is an automated email from the git hooks/post-receive script. New change to branch feature/7553 in repository observe. See http://git.codelutin.com/observe.git from cf10568 chargement des programmes dans l'arbre (refs #7553) new 45fa95f chargement des tripseine dans l'arbre (refs #7553) new 58ba04b remplacement des anciens datasources par les nouveaux new 747f827 chargement des noeuds des routes (refs #7553) new 53e2380 affichage des icones des noeuds (refs #7553) The 4 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 53e2380e107c76d5e045cd24f37a7ad3d8fe7879 Author: Kevin Morin <morin@codelutin.com> Date: Thu Oct 1 15:25:50 2015 +0200 affichage des icones des noeuds (refs #7553) commit 747f82772531f39baa75bebabfef8bf6d2ff32f0 Author: Kevin Morin <morin@codelutin.com> Date: Thu Oct 1 11:36:57 2015 +0200 chargement des noeuds des routes (refs #7553) commit 58ba04bb5242a55f8c7432cf1a4089efa208c148 Author: Kevin Morin <morin@codelutin.com> Date: Wed Sep 30 16:37:41 2015 +0200 remplacement des anciens datasources par les nouveaux commit 45fa95f54d80616717ffc91a634cc3f1796736c8 Author: Kevin Morin <morin@codelutin.com> Date: Wed Sep 30 15:50:48 2015 +0200 chargement des tripseine dans l'arbre (refs #7553) Summary of changes: .../src/main/filters/observe-ui.properties | 72 +-- .../observe/ObserveSwingApplicationContext.java | 15 +- .../business/ObserveApplicationContext.java | 13 +- .../fr/ird/observe/business/db/DataSource.java | 225 ---------- .../ird/observe/business/db/DataSourceConfig.java | 219 ---------- .../observe/business/db/DataSourceConfigParam.java | 43 -- .../observe/business/db/DataSourceException.java | 55 --- .../ird/observe/business/db/DataSourceFactory.java | 457 ------------------- .../observe/business/db/DataSourceProvider.java | 72 --- .../db/constants/CommonDataSourceConfigParam.java | 128 ------ .../business/db/model/DataSelectionModel.java | 482 +++++++++++++++++++++ .../business/report/model/ReportExecute.java | 9 +- .../business/validation/ObserveValidator.java | 5 +- .../business/validation/ValidationContext.java | 13 +- .../java/fr/ird/observe/ui/DecoratorService.java | 147 ++++--- .../ird/observe/ui/actions/ShowConfigAction.java | 20 +- .../fr/ird/observe/ui/admin/AdminTabUIHandler.java | 24 +- .../ui/admin/validate/ValidateUIHandler.java | 2 +- .../java/fr/ird/observe/ui/content/ContentUI.jaxx | 6 +- .../observe/ui/content/ContentUIInitializer.java | 2 +- .../ird/observe/ui/content/ObserveContentUI.java | 5 +- .../impl/longline/ActivityLonglinesUIHandler.java | 2 +- .../list/impl/longline/TripLonglinesUIHandler.java | 2 +- .../list/impl/seine/ActivitySeinesUIHandler.java | 4 +- .../ui/content/open/ContentOpenableUIHandler.java | 2 +- .../impl/longline/ActivityLonglineUIHandler.java | 4 +- .../open/impl/longline/TripLonglineUIHandler.java | 2 +- .../open/impl/seine/ActivitySeineUIHandler.java | 4 +- .../ui/content/table/ContentTableUIHandler.java | 2 +- .../longline/BranchlinesCompositionUIHandler.java | 2 +- .../CatchLonglineContentTableUIInitializer.java | 2 +- .../impl/longline/CatchLonglineUIHandler.java | 2 +- .../longline/FloatlinesCompositionUIHandler.java | 2 +- .../longline/GearUseFeaturesLonglineUIHandler.java | 2 +- .../impl/longline/HooksCompositionUIHandler.java | 2 +- .../content/table/impl/longline/TdrUIHandler.java | 10 +- .../impl/seine/GearUseFeaturesSeineUIHandler.java | 2 +- .../table/impl/seine/NonTargetCatchUIHandler.java | 2 +- .../table/impl/seine/NonTargetSampleUIHandler.java | 8 +- .../table/impl/seine/SchoolEstimateUIHandler.java | 2 +- .../table/impl/seine/TargetCatchUIHandler.java | 6 +- .../impl/seine/TargetDiscardCatchUIHandler.java | 6 +- .../table/impl/seine/TargetSampleUIHandler.java | 10 +- .../ird/observe/ui/storage/ObstunaAdminAction.java | 2 +- .../ird/observe/ui/storage/StorageUIHandler.java | 37 +- .../ui/storage/tabs/DataSelectionModel.java | 3 +- .../ui/storage/tabs/StorageTabUIHandler.java | 4 +- .../ui/tree/AbstractObserveTreeCellRenderer.java | 12 +- .../ird/observe/ui/tree/ActivityLonglineNode.java | 2 +- .../fr/ird/observe/ui/tree/ActivitySeineNode.java | 2 +- .../fr/ird/observe/ui/tree/DtoNodeSupport.java | 13 +- .../observe/ui/tree/FloatingObjectSeineNode.java | 2 +- .../ird/observe/ui/tree/ObserveDataProvider.java | 24 +- .../fr/ird/observe/ui/tree/ObserveTreeHelper.java | 13 +- .../ird/observe/ui/tree/ProgramLonglineNode.java | 25 +- .../fr/ird/observe/ui/tree/RouteSeineNode.java | 21 +- .../fr/ird/observe/ui/tree/SetLonglineNode.java | 2 +- .../java/fr/ird/observe/ui/tree/SetSeineNode.java | 2 +- .../fr/ird/observe/ui/tree/TripLonglineNode.java | 2 +- .../java/fr/ird/observe/ui/tree/TripSeineNode.java | 28 +- .../actions/ChangeTripProgramActionListener.java | 7 +- .../ui/tree/loadors/AbstractNodeChildLoador.java | 29 +- .../loadors/AbstractReferenceDtoChildLoador.java | 15 + .../loadors/ActivityLonglineNodeChildLoador.java | 14 +- .../loadors/ActivityLonglinesNodeChildLoador.java | 2 +- .../tree/loadors/ActivitySeineNodeChildLoador.java | 2 +- .../loadors/ActivitySeinesNodeChildLoador.java | 18 +- .../loadors/FloatingObjectNodeChildLoador.java | 21 +- .../loadors/ProgramLonglineNodeChildLoador.java | 2 +- .../tree/loadors/ProgramSeineNodeChildLoador.java | 26 +- .../loadors/ReferenceCommonNodeChildLoador.java | 46 +- .../loadors/ReferenceLonglineNodeChildLoador.java | 29 +- .../loadors/ReferenceSeineNodeChildLoador.java | 30 +- .../ui/tree/loadors/RootNodeChildLoador.java | 2 +- .../ui/tree/loadors/RoutesNodeChildLoador.java | 25 +- .../tree/loadors/SetLonglineNodeChildLoador.java | 16 +- .../ui/tree/loadors/SetSeineNodeChildLoador.java | 20 +- .../observe/ui/util/tripMap/TripMapUIHandler.java | 5 +- .../v1/seine/ActivitySeineServiceController.java | 9 +- .../v1/seine/RouteServiceController.java | 6 +- .../v1/seine/TripSeineServiceController.java | 6 +- .../service/seine/ActivitySeineService.java | 6 +- .../services/service/seine/RouteService.java | 6 +- .../services/service/seine/TripSeineService.java | 6 +- .../service/seine/TripSeineServiceRestTest.java | 51 +-- .../service/seine/ActivitySeineServiceTopia.java | 30 +- .../services/service/seine/RouteServiceTopia.java | 24 +- .../service/seine/TripSeineServiceTopia.java | 29 +- .../service/seine/TripSeineServiceTopiaTest.java | 41 +- 89 files changed, 1078 insertions(+), 1733 deletions(-) delete mode 100644 observe-application-swing/src/main/java/fr/ird/observe/business/db/DataSource.java delete mode 100644 observe-application-swing/src/main/java/fr/ird/observe/business/db/DataSourceConfig.java delete mode 100644 observe-application-swing/src/main/java/fr/ird/observe/business/db/DataSourceConfigParam.java delete mode 100644 observe-application-swing/src/main/java/fr/ird/observe/business/db/DataSourceException.java delete mode 100644 observe-application-swing/src/main/java/fr/ird/observe/business/db/DataSourceFactory.java delete mode 100644 observe-application-swing/src/main/java/fr/ird/observe/business/db/DataSourceProvider.java delete mode 100644 observe-application-swing/src/main/java/fr/ird/observe/business/db/constants/CommonDataSourceConfigParam.java create mode 100644 observe-application-swing/src/main/java/fr/ird/observe/business/db/model/DataSelectionModel.java create mode 100644 observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/AbstractReferenceDtoChildLoador.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch feature/7553 in repository observe. See http://git.codelutin.com/observe.git commit 45fa95f54d80616717ffc91a634cc3f1796736c8 Author: Kevin Morin <morin@codelutin.com> Date: Wed Sep 30 15:50:48 2015 +0200 chargement des tripseine dans l'arbre (refs #7553) --- .../observe/ObserveSwingApplicationContext.java | 15 +-- .../java/fr/ird/observe/ui/DecoratorService.java | 145 +++++++++++---------- .../ui/storage/tabs/DataSelectionModel.java | 3 +- .../ird/observe/ui/tree/ProgramLonglineNode.java | 25 +++- .../java/fr/ird/observe/ui/tree/TripSeineNode.java | 28 ++++ .../tree/loadors/ProgramSeineNodeChildLoador.java | 14 +- .../v1/seine/TripSeineServiceController.java | 6 +- .../services/service/seine/TripSeineService.java | 6 +- .../service/seine/TripSeineServiceRestTest.java | 51 ++++---- .../service/seine/TripSeineServiceTopia.java | 29 +++-- .../service/seine/TripSeineServiceTopiaTest.java | 41 +++--- 11 files changed, 211 insertions(+), 152 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 756316c..e3e2c24 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 @@ -42,7 +42,6 @@ import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.longline.TripLonglineStubDto; import fr.ird.observe.services.dto.referential.ProgramDto; import fr.ird.observe.services.dto.referential.ProgramDtos; -import fr.ird.observe.services.dto.seine.TripSeineStubDto; import fr.ird.observe.services.service.DatabaseConnexionNotAuthorizedException; import fr.ird.observe.services.service.DatabaseNotFoundException; import fr.ird.observe.services.service.ReferentialService; @@ -78,10 +77,8 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.decorator.Decorator; -import javax.swing.ActionMap; -import javax.swing.JOptionPane; -import javax.swing.JPanel; -import java.awt.Component; +import javax.swing.*; +import java.awt.*; import java.io.File; import java.util.Arrays; import java.util.List; @@ -706,10 +703,10 @@ public class ObserveSwingApplicationContext extends DefaultApplicationContext { String programName = (String) programDtoRef.getPropertyValue("label"); log.info("- " + programName); if (ProgramDtos.isProgramSeine(programDtoRef)) { - List<TripSeineStubDto> tripSeines = tripSeineService.getTripSeineByProgram(programDtoRef.getId()); - for (TripSeineStubDto tripSeine : tripSeines) { - log.info(" - " + tripSeine.getVesselLabel() + " " + tripSeine.getStartDate() + " - " + tripSeine.getEndDate()); - } +// List<TripSeineStubDto> tripSeines = tripSeineService.getTripSeineByProgram(programDtoRef.getId()); +// for (TripSeineStubDto tripSeine : tripSeines) { +// log.info(" - " + tripSeine.getVesselLabel() + " " + tripSeine.getStartDate() + " - " + tripSeine.getEndDate()); +// } } else if (ProgramDtos.isProgramLongline(programDtoRef)) { List<TripLonglineStubDto> tripLonglines = tripLonglineService.getTripLonglineStubByProgram(programDtoRef.getId()); for (TripLonglineStubDto tripLongline : tripLonglines) { diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/DecoratorService.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/DecoratorService.java index 9a76434..befb2c8 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/DecoratorService.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/DecoratorService.java @@ -21,18 +21,11 @@ */ package fr.ird.observe.ui; -import fr.ird.observe.ui.util.decorator.LengthWeightParameterDecorator; -import fr.ird.observe.ui.util.decorator.NonTargetCatchDecorator; -import fr.ird.observe.ui.util.decorator.NonTargetLengthDecorator; -import fr.ird.observe.ui.util.decorator.ObjectObservedSpeciesDecorator; -import fr.ird.observe.ui.util.decorator.ReferenceDecorator; -import fr.ird.observe.ui.util.decorator.SpeciesDecorator; -import fr.ird.observe.ui.util.decorator.TripLonglineDecorator; -import fr.ird.observe.ui.util.decorator.TripSeineDecorator; import fr.ird.observe.business.gps.GPSPoint; import fr.ird.observe.business.gps.GPSPointInterval; import fr.ird.observe.entities.longline.SectionTemplate; import fr.ird.observe.services.dto.AbstractObserveDto; +import fr.ird.observe.services.dto.IdDto; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.longline.ActivityLonglineDto; import fr.ird.observe.services.dto.longline.BasketDto; @@ -51,7 +44,6 @@ import fr.ird.observe.services.dto.referential.OceanDto; import fr.ird.observe.services.dto.referential.OrganismDto; import fr.ird.observe.services.dto.referential.PersonDto; import fr.ird.observe.services.dto.referential.ProgramDto; -import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.services.dto.referential.SexDto; import fr.ird.observe.services.dto.referential.SpeciesGroupDto; import fr.ird.observe.services.dto.referential.SpeciesListDto; @@ -108,6 +100,15 @@ import fr.ird.observe.services.dto.seine.SetSeineDto; import fr.ird.observe.services.dto.seine.TargetCatchDto; import fr.ird.observe.services.dto.seine.TargetLengthDto; import fr.ird.observe.services.dto.seine.TransmittingBuoyDto; +import fr.ird.observe.services.dto.seine.TripSeineDto; +import fr.ird.observe.ui.util.decorator.LengthWeightParameterDecorator; +import fr.ird.observe.ui.util.decorator.NonTargetCatchDecorator; +import fr.ird.observe.ui.util.decorator.NonTargetLengthDecorator; +import fr.ird.observe.ui.util.decorator.ObjectObservedSpeciesDecorator; +import fr.ird.observe.ui.util.decorator.ReferenceDecorator; +import fr.ird.observe.ui.util.decorator.SpeciesDecorator; +import fr.ird.observe.ui.util.decorator.TripLonglineDecorator; +import fr.ird.observe.ui.util.decorator.TripSeineDecorator; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.decorator.Decorator; @@ -404,7 +405,7 @@ public class DecoratorService extends DecoratorProvider { registerJXPathDecorator(ProgramDto.class, t("observe.common.program") + " ${" + libelle + "}$s"); - registerReferentialDtoDecorator(ProgramDto.class, t("observe.common.program") + " ${label}$s"); + registerReferenceDtoDecorator(ProgramDto.class, t("observe.common.program") + " ${label}$s"); registerJXPathDecorator(RouteDto.class, "${date}$td/%1$tm/%1$tY"); registerMultiJXPathDecorator( @@ -416,19 +417,19 @@ public class DecoratorService extends DecoratorProvider { "${timeStamp}$td/%1$tm/%1$tY %1$tH:%1$tM##${vesselActivityLongline/" + libelle + "}$s", "##", " - "); registerMultiJXPathDecorator(PersonDto.class, "${lastName}$s##${firstName}$s", "##", " "); - registerDefaultReferentialDtoDecorator(SexDto.class, libelle); + registerDefaultReferenceDtoDecorator(SexDto.class, libelle); //FIXME Use startDate - endDate - registerDefaultReferentialDtoDecorator(FpaZoneDto.class, libelle); - registerDefaultReferentialDtoDecorator(OceanDto.class, libelle); - registerDefaultReferentialDtoDecorator(DetectionModeDto.class, libelle); - registerDefaultReferentialDtoDecorator(VesselDto.class, libelle); - registerDefaultReferentialDtoDecorator(CountryDto.class, libelle); - registerReferentialDtoDecorator(VesselSizeCategoryDto.class, "${code}$s##${gaugeLabel}$s##${capacityLabel}$s"); - registerDefaultReferentialDtoDecorator(VesselTypeDto.class, libelle); - registerDefaultReferentialDtoDecorator(VesselActivitySeineDto.class, libelle); - registerDefaultReferentialDtoDecorator(SurroundingActivityDto.class, libelle); - registerDefaultReferentialDtoDecorator(ObservedSystemDto.class, libelle); - registerReferentialDtoDecorator(WindDto.class, "${code}$s##${" + libelle + "}$s##${speedRange}$s"); + registerDefaultReferenceDtoDecorator(FpaZoneDto.class, libelle); + registerDefaultReferenceDtoDecorator(OceanDto.class, libelle); + registerDefaultReferenceDtoDecorator(DetectionModeDto.class, libelle); + registerDefaultReferenceDtoDecorator(VesselDto.class, libelle); + registerDefaultReferenceDtoDecorator(CountryDto.class, libelle); + registerReferenceDtoDecorator(VesselSizeCategoryDto.class, "${code}$s##${gaugeLabel}$s##${capacityLabel}$s"); + registerDefaultReferenceDtoDecorator(VesselTypeDto.class, libelle); + registerDefaultReferenceDtoDecorator(VesselActivitySeineDto.class, libelle); + registerDefaultReferenceDtoDecorator(SurroundingActivityDto.class, libelle); + registerDefaultReferenceDtoDecorator(ObservedSystemDto.class, libelle); + registerReferenceDtoDecorator(WindDto.class, "${code}$s##${" + libelle + "}$s##${speedRange}$s"); registerMultiJXPathDecorator( FloatingObjectDto.class, "DCP ${objectType/" + libelle + "}$s", "##", " - "); @@ -436,51 +437,51 @@ public class DecoratorService extends DecoratorProvider { registerJXPathDecorator(SetSeineDto.class, t("observe.common.setSeine")); //FIXME Remove this registerJXPathDecorator(SetLonglineDto.class, t("observe.common.setLongline")); - registerDefaultReferentialDtoDecorator(ObjectFateDto.class, libelle); - registerDefaultReferentialDtoDecorator(OrganismDto.class, libelle); - registerDefaultReferentialDtoDecorator(ObjectTypeDto.class, libelle); - registerDefaultReferentialDtoDecorator(ObjectOperationDto.class, libelle); - registerDefaultReferentialDtoDecorator(SpeciesStatusDto.class, libelle); - registerDefaultReferentialDtoDecorator(TransmittingBuoyTypeDto.class, libelle); - registerDefaultReferentialDtoDecorator(TransmittingBuoyOperationDto.class, libelle); - registerDefaultReferentialDtoDecorator(ReasonForNullSetDto.class, libelle); - registerDefaultReferentialDtoDecorator(ReasonForNoFishingDto.class, libelle); - registerDefaultReferentialDtoDecorator(WeightCategoryDto.class, libelle); - registerDefaultReferentialDtoDecorator(ReasonForDiscardDto.class, libelle); - registerDefaultReferentialDtoDecorator(SpeciesFateDto.class, libelle); - registerDefaultReferentialDtoDecorator(SpeciesGroupDto.class, libelle); - registerDefaultReferentialDtoDecorator(SpeciesListDto.class, libelle); - - registerDefaultReferentialDtoDecorator(BaitHaulingStatusDto.class, libelle); - registerDefaultReferentialDtoDecorator(BaitSettingStatusDto.class, libelle); - registerDefaultReferentialDtoDecorator(BaitTypeDto.class, libelle); - registerDefaultReferentialDtoDecorator(CatchFateLonglineDto.class, libelle); - registerDefaultReferentialDtoDecorator(EncounterTypeDto.class, libelle); - registerDefaultReferentialDtoDecorator(HealthnessDto.class, libelle); - registerDefaultReferentialDtoDecorator(HookPositionDto.class, libelle); - registerDefaultReferentialDtoDecorator(HookSizeDto.class, libelle); - registerDefaultReferentialDtoDecorator(HookTypeDto.class, libelle); - registerDefaultReferentialDtoDecorator(ItemVerticalPositionDto.class, libelle); - registerDefaultReferentialDtoDecorator(ItemHorizontalPositionDto.class, libelle); - registerDefaultReferentialDtoDecorator(LightsticksColorDto.class, libelle); - registerDefaultReferentialDtoDecorator(LightsticksTypeDto.class, libelle); - registerDefaultReferentialDtoDecorator(LineTypeDto.class, libelle); - registerDefaultReferentialDtoDecorator(MaturityStatusDto.class, libelle); - registerDefaultReferentialDtoDecorator(MitigationTypeDto.class, libelle); - registerReferentialDtoDecorator(SensorBrandDto.class, "${code}$s##${brandName}$s"); - registerDefaultReferentialDtoDecorator(SensorDataFormatDto.class, libelle); - registerDefaultReferentialDtoDecorator(SensorTypeDto.class, libelle); - registerDefaultReferentialDtoDecorator(SettingShapeDto.class, libelle); - registerDefaultReferentialDtoDecorator(SizeMeasureTypeDto.class, libelle); - registerDefaultReferentialDtoDecorator(StomacFullnessDto.class, libelle); - registerDefaultReferentialDtoDecorator(TripTypeDto.class, libelle); - registerDefaultReferentialDtoDecorator(VesselActivityLonglineDto.class, libelle); - registerDefaultReferentialDtoDecorator(WeightMeasureTypeDto.class, libelle); - registerDefaultReferentialDtoDecorator(GearCaracteristicTypeDto.class, libelle); - registerDefaultReferentialDtoDecorator(GearCaracteristicDto.class, libelle); - registerDefaultReferentialDtoDecorator(GearDto.class, libelle); - - registerReferentialDtoDecorator(HarbourDto.class, "${code}$s##${name}$s##${locode}$s"); + registerDefaultReferenceDtoDecorator(ObjectFateDto.class, libelle); + registerDefaultReferenceDtoDecorator(OrganismDto.class, libelle); + registerDefaultReferenceDtoDecorator(ObjectTypeDto.class, libelle); + registerDefaultReferenceDtoDecorator(ObjectOperationDto.class, libelle); + registerDefaultReferenceDtoDecorator(SpeciesStatusDto.class, libelle); + registerDefaultReferenceDtoDecorator(TransmittingBuoyTypeDto.class, libelle); + registerDefaultReferenceDtoDecorator(TransmittingBuoyOperationDto.class, libelle); + registerDefaultReferenceDtoDecorator(ReasonForNullSetDto.class, libelle); + registerDefaultReferenceDtoDecorator(ReasonForNoFishingDto.class, libelle); + registerDefaultReferenceDtoDecorator(WeightCategoryDto.class, libelle); + registerDefaultReferenceDtoDecorator(ReasonForDiscardDto.class, libelle); + registerDefaultReferenceDtoDecorator(SpeciesFateDto.class, libelle); + registerDefaultReferenceDtoDecorator(SpeciesGroupDto.class, libelle); + registerDefaultReferenceDtoDecorator(SpeciesListDto.class, libelle); + + registerDefaultReferenceDtoDecorator(BaitHaulingStatusDto.class, libelle); + registerDefaultReferenceDtoDecorator(BaitSettingStatusDto.class, libelle); + registerDefaultReferenceDtoDecorator(BaitTypeDto.class, libelle); + registerDefaultReferenceDtoDecorator(CatchFateLonglineDto.class, libelle); + registerDefaultReferenceDtoDecorator(EncounterTypeDto.class, libelle); + registerDefaultReferenceDtoDecorator(HealthnessDto.class, libelle); + registerDefaultReferenceDtoDecorator(HookPositionDto.class, libelle); + registerDefaultReferenceDtoDecorator(HookSizeDto.class, libelle); + registerDefaultReferenceDtoDecorator(HookTypeDto.class, libelle); + registerDefaultReferenceDtoDecorator(ItemVerticalPositionDto.class, libelle); + registerDefaultReferenceDtoDecorator(ItemHorizontalPositionDto.class, libelle); + registerDefaultReferenceDtoDecorator(LightsticksColorDto.class, libelle); + registerDefaultReferenceDtoDecorator(LightsticksTypeDto.class, libelle); + registerDefaultReferenceDtoDecorator(LineTypeDto.class, libelle); + registerDefaultReferenceDtoDecorator(MaturityStatusDto.class, libelle); + registerDefaultReferenceDtoDecorator(MitigationTypeDto.class, libelle); + registerReferenceDtoDecorator(SensorBrandDto.class, "${code}$s##${brandName}$s"); + registerDefaultReferenceDtoDecorator(SensorDataFormatDto.class, libelle); + registerDefaultReferenceDtoDecorator(SensorTypeDto.class, libelle); + registerDefaultReferenceDtoDecorator(SettingShapeDto.class, libelle); + registerDefaultReferenceDtoDecorator(SizeMeasureTypeDto.class, libelle); + registerDefaultReferenceDtoDecorator(StomacFullnessDto.class, libelle); + registerDefaultReferenceDtoDecorator(TripTypeDto.class, libelle); + registerDefaultReferenceDtoDecorator(VesselActivityLonglineDto.class, libelle); + registerDefaultReferenceDtoDecorator(WeightMeasureTypeDto.class, libelle); + registerDefaultReferenceDtoDecorator(GearCaracteristicTypeDto.class, libelle); + registerDefaultReferenceDtoDecorator(GearCaracteristicDto.class, libelle); + registerDefaultReferenceDtoDecorator(GearDto.class, libelle); + + registerReferenceDtoDecorator(HarbourDto.class, "${code}$s##${name}$s##${locode}$s"); registerMultiJXPathDecorator( ObjectSchoolEstimateDto.class, @@ -522,6 +523,10 @@ public class DecoratorService extends DecoratorProvider { // TripSeine decorator registerDecorator(new TripSeineDecorator(libelle)); + registerReferenceDtoDecorator(TripSeineDto.class, + "${startDate}$td/%1$tm/%1$tY##${endDate}$td/%2$tm/%2$tY##${vessel/" + + libelle + "}$s##${observerLabel}$s"); + // TripLongline decorator registerDecorator(new TripLonglineDecorator(libelle)); @@ -567,11 +572,11 @@ public class DecoratorService extends DecoratorProvider { } - protected <T extends ReferentialDto> void registerDefaultReferentialDtoDecorator(Class<T> referenceType, String libelle) { - registerReferentialDtoDecorator(referenceType, "${code}$s##${" + libelle + "}$s"); + protected <T extends IdDto> void registerDefaultReferenceDtoDecorator(Class<T> referenceType, String libelle) { + registerReferenceDtoDecorator(referenceType, "${code}$s##${" + libelle + "}$s"); } - protected <T extends ReferentialDto> void registerReferentialDtoDecorator(Class<T> referenceType, String expression) { + protected <T extends IdDto> void registerReferenceDtoDecorator(Class<T> referenceType, String expression) { registerDecorator(referenceType.getSimpleName(), new ReferenceDecorator(expression)); } 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 f20ad4f..c2fe997 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 @@ -77,7 +77,8 @@ public class DataSelectionModel implements Serializable { if (ProgramDtos.isProgramSeine(program)) { - idDtos.addAll(tripSeineService.getTripSeineByProgram(program.getId())); + //FIXME +// idDtos.addAll(tripSeineService.getTripSeineByProgram(program.getId())); } else if (ProgramDtos.isProgramLongline(program)) { 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 3ee6500..7bd5c7d 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,9 +22,15 @@ package fr.ird.observe.ui.tree; * #L% */ +import com.google.common.collect.Lists; +import fr.ird.observe.ObserveSwingApplicationContext; +import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.ReferenceDto; +import fr.ird.observe.services.dto.ReferenceDtos; import fr.ird.observe.services.dto.constants.GearType; import fr.ird.observe.services.dto.referential.ProgramDto; +import fr.ird.observe.services.dto.referential.ReferentialReferenceDto; +import fr.ird.observe.services.service.ReferentialService; import fr.ird.observe.ui.tree.loadors.ProgramLonglineNodeChildLoador; /** @@ -45,10 +51,19 @@ public class ProgramLonglineNode extends DtoNodeSupport<ProgramDto> { setEntity(entity); } - //FIXME -// @Override -// protected Program getEntity(DataService dataService, DataSource source) throws DataSourceException { -// return dataService.getProgramStub(source, id); -// } + @Override + protected ReferenceDto<ProgramDto> fetchEntity() { + FormDto<ProgramDto> formDto = ObserveSwingApplicationContext.get().newService(ReferentialService.class).loadToRead(ProgramDto.class, id); + ReferenceDto<ProgramDto> referenceDto = + ReferenceDtos.newReferenceDto(ProgramDto.class, Lists.newArrayList(ProgramDto.PROPERTY_ID, + ProgramDto.PROPERTY_CODE, + ProgramDto.PROPERTY_GEAR_TYPE, + ReferentialReferenceDto.PROPERTY_LABEL)); + referenceDto.setPropertyValue(ProgramDto.PROPERTY_ID, formDto.getForm().getId()); + referenceDto.setPropertyValue(ProgramDto.PROPERTY_CODE, formDto.getForm().getCode()); + referenceDto.setPropertyValue(ProgramDto.PROPERTY_GEAR_TYPE, formDto.getForm().getGearType()); + referenceDto.setPropertyValue(ReferentialReferenceDto.PROPERTY_LABEL, formDto.getForm().getLabel2()); + 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 0a508af..ff3e2f7 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,8 +22,13 @@ package fr.ird.observe.ui.tree; * #L% */ +import com.google.common.collect.Lists; +import fr.ird.observe.ObserveSwingApplicationContext; +import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.ReferenceDto; +import fr.ird.observe.services.dto.ReferenceDtos; import fr.ird.observe.services.dto.seine.TripSeineDto; +import fr.ird.observe.services.service.seine.TripSeineService; /** * Created on 4/9/15. @@ -44,4 +49,27 @@ public class TripSeineNode extends DtoNodeSupport<TripSeineDto> { // return dataService.getTripSeineStub(source, id); // } + + @Override + protected ReferenceDto<TripSeineDto> fetchEntity() { + TripSeineService tripSeineService = ObserveSwingApplicationContext.get().newService(TripSeineService.class); + FormDto<TripSeineDto> formDto = tripSeineService.loadToRead(entity.getId()); + +// "${startDate}$td/%1$tm/%1$tY##${endDate}$td/%2$tm/%2$tY##${vessel/" +// + libelle + "}$s##${observerLabel}$s" + + ReferenceDto<TripSeineDto> referenceDto = + ReferenceDtos.newReferenceDto(TripSeineDto.class, Lists.newArrayList(TripSeineDto.PROPERTY_ID, + TripSeineDto.PROPERTY_START_DATE, + TripSeineDto.PROPERTY_END_DATE, + TripSeineDto.PROPERTY_VESSEL, + TripSeineDto.PROPERTY_OBSERVER)); + referenceDto.setPropertyValue(TripSeineDto.PROPERTY_ID, formDto.getForm().getId()); + referenceDto.setPropertyValue(TripSeineDto.PROPERTY_START_DATE, formDto.getForm().getStartDate()); + referenceDto.setPropertyValue(TripSeineDto.PROPERTY_END_DATE, formDto.getForm().getEndDate()); + referenceDto.setPropertyValue(TripSeineDto.PROPERTY_VESSEL, formDto.getForm().getVessel()); + referenceDto.setPropertyValue(TripSeineDto.PROPERTY_OBSERVER, formDto.getForm().getObserver()); + + return referenceDto; + } } 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 a9190c1..8f3f563 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 @@ -21,14 +21,19 @@ */ package fr.ird.observe.ui.tree.loadors; +import fr.ird.observe.ObserveSwingApplicationContext; import fr.ird.observe.db.ObserveSwingDataSource; import fr.ird.observe.services.dto.ReferenceDto; +import fr.ird.observe.services.dto.ReferenceDtos; +import fr.ird.observe.services.dto.ReferenceSetDto; import fr.ird.observe.services.dto.seine.TripSeineDto; +import fr.ird.observe.services.service.seine.TripSeineService; import fr.ird.observe.ui.tree.ObserveNode; import fr.ird.observe.ui.tree.TripSeineNode; import jaxx.runtime.swing.nav.NavDataProvider; import jaxx.runtime.swing.nav.tree.NavTreeBridge; +import java.util.ArrayList; import java.util.List; import static org.nuiton.i18n.I18n.n; @@ -79,8 +84,6 @@ public class ProgramSeineNodeChildLoador extends AbstractNodeChildLoador<TripSei // DataService service = getDataService(); // DataSelectionModel selectionModel = getSelectionModel(dataProvider); - List<TripSeineDto> result; - //FIXME // if (selectionModel != null) { // result = new ArrayList<TripSeine>(); @@ -93,11 +96,14 @@ public class ProgramSeineNodeChildLoador extends AbstractNodeChildLoador<TripSei // } else { // // result = service.getTripSeineStubByProgram(dataSource, parentId); -// + // } // return result; - return null; + TripSeineService tripSeineService = ObserveSwingApplicationContext.get().newService(TripSeineService.class); + ReferenceSetDto<TripSeineDto> tripSeineByProgram = tripSeineService.getTripSeineByProgram(parentId); + + return new ArrayList<>(ReferenceDtos.castToCollectionOfReferenceDto(tripSeineByProgram.getReference())); } diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/TripSeineServiceController.java b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/TripSeineServiceController.java index 864257a..d13e7e9 100644 --- a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/TripSeineServiceController.java +++ b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/TripSeineServiceController.java @@ -24,12 +24,10 @@ package fr.ird.observe.application.web.controller.v1.seine; import fr.ird.observe.application.web.controller.v1.ObserveAuthenticatedServiceControllerSupport; import fr.ird.observe.services.dto.FormDto; +import fr.ird.observe.services.dto.ReferenceSetDto; import fr.ird.observe.services.dto.seine.TripSeineDto; -import fr.ird.observe.services.dto.seine.TripSeineStubDto; import fr.ird.observe.services.service.seine.TripSeineService; -import java.util.List; - /** * @author Sylvain Bavencoff - bavencoff@codelutin.com */ @@ -40,7 +38,7 @@ public class TripSeineServiceController extends ObserveAuthenticatedServiceContr } @Override - public List<TripSeineStubDto> getTripSeineByProgram(String programId) { + public ReferenceSetDto<TripSeineDto> getTripSeineByProgram(String programId) { return service.getTripSeineByProgram(programId); } diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/TripSeineService.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/TripSeineService.java index ccab5b1..ca6bd99 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/TripSeineService.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/TripSeineService.java @@ -24,23 +24,21 @@ package fr.ird.observe.services.service.seine; import fr.ird.observe.services.ObserveService; import fr.ird.observe.services.dto.FormDto; +import fr.ird.observe.services.dto.ReferenceSetDto; import fr.ird.observe.services.dto.seine.TripSeineDto; -import fr.ird.observe.services.dto.seine.TripSeineStubDto; import fr.ird.observe.services.spi.DeleteRequest; import fr.ird.observe.services.spi.PostRequest; import fr.ird.observe.services.spi.ReadDataPermission; import fr.ird.observe.services.spi.Write; import fr.ird.observe.services.spi.WriteDataPermission; -import java.util.List; - /** * @author Sylvain Bavencoff - bavencoff@codelutin.com */ public interface TripSeineService extends ObserveService { @ReadDataPermission - List<TripSeineStubDto> getTripSeineByProgram(String programId); + ReferenceSetDto<TripSeineDto> getTripSeineByProgram(String programId); @ReadDataPermission FormDto<TripSeineDto> loadToRead(String tripSeineId); diff --git a/observe-services-rest/src/test/java/fr/ird/observe/services/service/seine/TripSeineServiceRestTest.java b/observe-services-rest/src/test/java/fr/ird/observe/services/service/seine/TripSeineServiceRestTest.java index b6c049f..082fc2e 100644 --- a/observe-services-rest/src/test/java/fr/ird/observe/services/service/seine/TripSeineServiceRestTest.java +++ b/observe-services-rest/src/test/java/fr/ird/observe/services/service/seine/TripSeineServiceRestTest.java @@ -26,6 +26,8 @@ import com.google.common.collect.Collections2; import com.google.common.collect.Iterables; import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.IdDtos; +import fr.ird.observe.services.dto.ReferenceDto; +import fr.ird.observe.services.dto.ReferenceDtos; import fr.ird.observe.services.dto.ReferenceSetDto; import fr.ird.observe.services.dto.ReferenceSetDtos; import fr.ird.observe.services.dto.referential.HarbourDto; @@ -34,7 +36,6 @@ import fr.ird.observe.services.dto.referential.PersonDto; import fr.ird.observe.services.dto.referential.ReferentialReferenceDto; import fr.ird.observe.services.dto.referential.VesselDto; import fr.ird.observe.services.dto.seine.TripSeineDto; -import fr.ird.observe.services.dto.seine.TripSeineStubDto; import fr.ird.observe.services.service.AbstractServiceRestTest; import org.junit.Assert; import org.junit.Ignore; @@ -42,7 +43,6 @@ import org.junit.Test; import org.nuiton.util.DateUtil; import java.util.Collection; -import java.util.List; /** * @author Sylvain Bavencoff - bavencoff@codelutin.com @@ -62,37 +62,38 @@ public class TripSeineServiceRestTest extends AbstractServiceRestTest{ @Test public void getTripSeineByProgramTest() { - List<TripSeineStubDto> stubDtos = service.getTripSeineByProgram(PROGRAM_ID); + ReferenceSetDto<TripSeineDto> stubDtos = service.getTripSeineByProgram(PROGRAM_ID); Assert.assertNotNull(stubDtos); - Assert.assertEquals(135, stubDtos.size()); + Assert.assertEquals(135, stubDtos.sizeReference()); - TripSeineStubDto tripSeineStub1Dto = Iterables.find(stubDtos, IdDtos.newIdPredicate(TRIP_SEINE_ID_1)); + ReferenceDto<TripSeineDto> tripSeineStub1Dto = Iterables.find(stubDtos.getReference(), + ReferenceDtos.newIdPredicate(TRIP_SEINE_ID_1)); Assert.assertEquals(TRIP_SEINE_ID_1, tripSeineStub1Dto.getId()); - Assert.assertEquals(DateUtil.createDate(25, 1, 2013), tripSeineStub1Dto.getStartDate()); - Assert.assertEquals(DateUtil.createDate(27, 2, 2013), tripSeineStub1Dto.getEndDate()); - Assert.assertEquals("BERNICA", tripSeineStub1Dto.getVesselLabel()); - Assert.assertEquals("Varenne Fanchon", tripSeineStub1Dto.getObserverLabel()); + Assert.assertEquals(DateUtil.createDate(25, 1, 2013), tripSeineStub1Dto.getPropertyValue(TripSeineDto.PROPERTY_START_DATE)); + Assert.assertEquals(DateUtil.createDate(27, 2, 2013), tripSeineStub1Dto.getPropertyValue(TripSeineDto.PROPERTY_END_DATE)); + Assert.assertEquals("BERNICA", tripSeineStub1Dto.getPropertyValue(TripSeineDto.PROPERTY_VESSEL)); + Assert.assertEquals("Varenne Fanchon", tripSeineStub1Dto.getPropertyValue(TripSeineDto.PROPERTY_OBSERVER)); + ReferenceDto<TripSeineDto> tripSeineStub2Dto = Iterables.find(stubDtos.getReference(), + ReferenceDtos.newIdPredicate(TRIP_SEINE_ID_2)); - TripSeineStubDto tripSeineStu2Dto = Iterables.find(stubDtos, IdDtos.newIdPredicate(TRIP_SEINE_ID_2)); + Assert.assertEquals(TRIP_SEINE_ID_2, tripSeineStub2Dto.getId()); + Assert.assertEquals(DateUtil.createDate(26, 1, 2013), tripSeineStub2Dto.getPropertyValue(TripSeineDto.PROPERTY_START_DATE)); + Assert.assertEquals(DateUtil.createDate(12, 3, 2013), tripSeineStub2Dto.getPropertyValue(TripSeineDto.PROPERTY_END_DATE)); + Assert.assertEquals("VIA EUROS", tripSeineStub2Dto.getPropertyValue(TripSeineDto.PROPERTY_VESSEL)); + Assert.assertEquals("Protat Martin", tripSeineStub2Dto.getPropertyValue(TripSeineDto.PROPERTY_OBSERVER)); - Assert.assertEquals(TRIP_SEINE_ID_2, tripSeineStu2Dto.getId()); - Assert.assertEquals(DateUtil.createDate(26, 1, 2013), tripSeineStu2Dto.getStartDate()); - Assert.assertEquals(DateUtil.createDate(12, 3, 2013), tripSeineStu2Dto.getEndDate()); - Assert.assertEquals("VIA EUROS", tripSeineStu2Dto.getVesselLabel()); - Assert.assertEquals("Protat Martin", tripSeineStu2Dto.getObserverLabel()); - - - TripSeineStubDto tripSeineStub3Dto = Iterables.find(stubDtos, IdDtos.newIdPredicate(TRIP_SEINE_ID_3)); + ReferenceDto<TripSeineDto> tripSeineStub3Dto = Iterables.find(stubDtos.getReference(), + ReferenceDtos.newIdPredicate(TRIP_SEINE_ID_3)); Assert.assertEquals(TRIP_SEINE_ID_3, tripSeineStub3Dto.getId()); - Assert.assertEquals(DateUtil.createDate(1, 2, 2013), tripSeineStub3Dto.getStartDate()); - Assert.assertEquals(DateUtil.createDate(17, 3, 2013), tripSeineStub3Dto.getEndDate()); - Assert.assertEquals("GUERIDEN", tripSeineStub3Dto.getVesselLabel()); - Assert.assertEquals("Le Bourdonnec Pierre", tripSeineStub3Dto.getObserverLabel()); + Assert.assertEquals(DateUtil.createDate(1, 2, 2013), tripSeineStub3Dto.getPropertyValue(TripSeineDto.PROPERTY_START_DATE)); + Assert.assertEquals(DateUtil.createDate(17, 3, 2013), tripSeineStub3Dto.getPropertyValue(TripSeineDto.PROPERTY_END_DATE)); + Assert.assertEquals("GUERIDEN", tripSeineStub3Dto.getPropertyValue(TripSeineDto.PROPERTY_VESSEL)); + Assert.assertEquals("Le Bourdonnec Pierre", tripSeineStub3Dto.getPropertyValue(TripSeineDto.PROPERTY_OBSERVER)); } @@ -284,11 +285,11 @@ public class TripSeineServiceRestTest extends AbstractServiceRestTest{ service.delete(TRIP_SEINE_ID_1); - List<TripSeineStubDto> tripSeineByProgram = service.getTripSeineByProgram(PROGRAM_ID); + ReferenceSetDto<TripSeineDto> tripSeineByProgram = service.getTripSeineByProgram(PROGRAM_ID); - Assert.assertEquals(2, tripSeineByProgram.size()); + Assert.assertEquals(2, tripSeineByProgram.sizeReference()); - Assert.assertTrue(Iterables.isEmpty(IdDtos.filterById(tripSeineByProgram, TRIP_SEINE_ID_1))); + Assert.assertTrue(Iterables.isEmpty(IdDtos.filterById(tripSeineByProgram.getReference(), TRIP_SEINE_ID_1))); } diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/TripSeineServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/TripSeineServiceTopia.java index 2ae405d..19c9bbe 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/TripSeineServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/TripSeineServiceTopia.java @@ -23,19 +23,24 @@ package fr.ird.observe.services.service.seine; */ import com.google.common.collect.Lists; +import com.google.common.collect.Sets; import fr.ird.observe.entities.constants.ReferenceLocale; import fr.ird.observe.entities.referentiel.Program; import fr.ird.observe.entities.seine.TripSeine; import fr.ird.observe.entities.seine.TripSeineTopiaDao; import fr.ird.observe.services.ObserveServiceTopia; import fr.ird.observe.services.dto.FormDto; +import fr.ird.observe.services.dto.ReferenceDto; +import fr.ird.observe.services.dto.ReferenceDtos; +import fr.ird.observe.services.dto.ReferenceSetDto; +import fr.ird.observe.services.dto.ReferenceSetDtos; import fr.ird.observe.services.dto.referential.ProgramDto; import fr.ird.observe.services.dto.seine.TripSeineDto; -import fr.ird.observe.services.dto.seine.TripSeineStubDto; import org.nuiton.util.DateUtil; import java.util.Collections; import java.util.Date; +import java.util.LinkedHashSet; import java.util.List; /** @@ -48,7 +53,7 @@ public class TripSeineServiceTopia extends ObserveServiceTopia implements TripSe } @Override - public List<TripSeineStubDto> getTripSeineByProgram(String programId) { + public ReferenceSetDto<TripSeineDto> getTripSeineByProgram(String programId) { ReferenceLocale referenceLocale = getReferenceLocale(); @@ -57,22 +62,28 @@ public class TripSeineServiceTopia extends ObserveServiceTopia implements TripSe List<TripSeine> tripSeines = getDao().findAllStubByProgramId(programId, referenceLocale); - List<TripSeineStubDto> stubs = Lists.newLinkedList(); + LinkedHashSet<ReferenceDto<TripSeineDto>> stubs = Sets.newLinkedHashSet(); for (TripSeine tripSeine : tripSeines) { - TripSeineStubDto stub = new TripSeineStubDto(); + ReferenceDto<TripSeineDto> stub = ReferenceDtos.newReferenceDto(TripSeineDto.class, + Lists.newArrayList(TripSeineDto.PROPERTY_ID, + TripSeineDto.PROPERTY_START_DATE, + TripSeineDto.PROPERTY_END_DATE, + TripSeineDto.PROPERTY_VESSEL, + TripSeineDto.PROPERTY_OBSERVER)); stub.setId(tripSeine.getTopiaId()); - stub.setStartDate(tripSeine.getStartDate()); - stub.setEndDate(tripSeine.getEndDate()); - stub.setVesselLabel(referenceLocale.getLabel(tripSeine.getVessel())); - stub.setObserverLabel(tripSeine.getObserverLabel()); + stub.setPropertyValue(TripSeineDto.PROPERTY_START_DATE, tripSeine.getStartDate()); + stub.setPropertyValue(TripSeineDto.PROPERTY_END_DATE, tripSeine.getEndDate()); + stub.setPropertyValue(TripSeineDto.PROPERTY_VESSEL, referenceLocale.getLabel(tripSeine.getVessel())); + stub.setPropertyValue(TripSeineDto.PROPERTY_OBSERVER, tripSeine.getObserverLabel()); stubs.add(stub); } - return stubs; + ReferenceSetDto<TripSeineDto> result = ReferenceSetDtos.newReferenceSetDto(TripSeineDto.class, stubs, null); + return result; } @Override diff --git a/observe-services-topia/src/test/java/fr/ird/observe/services/service/seine/TripSeineServiceTopiaTest.java b/observe-services-topia/src/test/java/fr/ird/observe/services/service/seine/TripSeineServiceTopiaTest.java index a991c4c..fa84c7e 100644 --- a/observe-services-topia/src/test/java/fr/ird/observe/services/service/seine/TripSeineServiceTopiaTest.java +++ b/observe-services-topia/src/test/java/fr/ird/observe/services/service/seine/TripSeineServiceTopiaTest.java @@ -27,6 +27,7 @@ import com.google.common.collect.ImmutableSet; import fr.ird.observe.entities.seine.TripSeine; import fr.ird.observe.services.ObserveServiceContextTopiaTaiste; import fr.ird.observe.services.dto.FormDto; +import fr.ird.observe.services.dto.ReferenceDto; import fr.ird.observe.services.dto.ReferenceSetDto; import fr.ird.observe.services.dto.ReferenceSetDtos; import fr.ird.observe.services.dto.referential.HarbourDto; @@ -35,7 +36,6 @@ import fr.ird.observe.services.dto.referential.PersonDto; import fr.ird.observe.services.dto.referential.ReferentialReferenceDto; import fr.ird.observe.services.dto.referential.VesselDto; import fr.ird.observe.services.dto.seine.TripSeineDto; -import fr.ird.observe.services.dto.seine.TripSeineStubDto; import fr.ird.observe.services.service.AbstractServiceTopiaTest; import fr.ird.observe.services.service.ConcurrentModificationException; import fr.ird.observe.services.service.ReferentialService; @@ -46,7 +46,6 @@ import org.nuiton.util.DateUtil; import java.util.Calendar; import java.util.Collection; import java.util.Date; -import java.util.List; import java.util.Set; /** @@ -84,38 +83,38 @@ public class TripSeineServiceTopiaTest extends AbstractServiceTopiaTest { @Test public void getTripSeineByProgramTest() { - List<TripSeineStubDto> stubDtos = service.getTripSeineByProgram(PROGRAM_ID); + ReferenceSetDto<TripSeineDto> stubDtos = service.getTripSeineByProgram(PROGRAM_ID); Assert.assertNotNull(stubDtos); - Assert.assertEquals(3, stubDtos.size()); + Assert.assertEquals(3, stubDtos.sizeReference()); - TripSeineStubDto tripSeineStubDto = stubDtos.get(0); + ReferenceDto tripSeineStubDto = stubDtos.getReference(0); TripSeine tripSeine = dataSourceResource.findById(TripSeine.class, TRIP_SEINE_ID_1); Assert.assertEquals(tripSeine.getTopiaId(), tripSeineStubDto.getId()); - Assert.assertEquals(0, tripSeine.getStartDate().compareTo(tripSeineStubDto.getStartDate())); - Assert.assertEquals(0, tripSeine.getEndDate().compareTo(tripSeineStubDto.getEndDate())); - Assert.assertEquals(tripSeine.getVessel().getLabel2(), tripSeineStubDto.getVesselLabel()); - Assert.assertEquals(tripSeine.getObserverLabel(), tripSeineStubDto.getObserverLabel()); + Assert.assertEquals(0, tripSeine.getStartDate().compareTo((Date) tripSeineStubDto.getPropertyValue(TripSeineDto.PROPERTY_START_DATE))); + Assert.assertEquals(0, tripSeine.getEndDate().compareTo((Date) tripSeineStubDto.getPropertyValue(TripSeineDto.PROPERTY_END_DATE))); + Assert.assertEquals(tripSeine.getVessel().getLabel2(), tripSeineStubDto.getPropertyValue(TripSeineDto.PROPERTY_VESSEL)); + Assert.assertEquals(tripSeine.getObserverLabel(), tripSeineStubDto.getPropertyValue(TripSeineDto.PROPERTY_OBSERVER)); - tripSeineStubDto = stubDtos.get(1); + tripSeineStubDto = stubDtos.getReference(1); tripSeine = dataSourceResource.findById(TripSeine.class, TRIP_SEINE_ID_2); Assert.assertEquals(tripSeine.getTopiaId(), tripSeineStubDto.getId()); - Assert.assertEquals(0, tripSeine.getStartDate().compareTo(tripSeineStubDto.getStartDate())); - Assert.assertEquals(0, tripSeine.getEndDate().compareTo(tripSeineStubDto.getEndDate())); - Assert.assertEquals(tripSeine.getVessel().getLabel2(), tripSeineStubDto.getVesselLabel()); - Assert.assertEquals(tripSeine.getObserverLabel(), tripSeineStubDto.getObserverLabel()); + Assert.assertEquals(0, tripSeine.getStartDate().compareTo((Date) tripSeineStubDto.getPropertyValue(TripSeineDto.PROPERTY_START_DATE))); + Assert.assertEquals(0, tripSeine.getEndDate().compareTo((Date) tripSeineStubDto.getPropertyValue(TripSeineDto.PROPERTY_END_DATE))); + Assert.assertEquals(tripSeine.getVessel().getLabel2(), tripSeineStubDto.getPropertyValue(TripSeineDto.PROPERTY_VESSEL)); + Assert.assertEquals(tripSeine.getObserverLabel(), tripSeineStubDto.getPropertyValue(TripSeineDto.PROPERTY_OBSERVER)); - tripSeineStubDto = stubDtos.get(2); + tripSeineStubDto = stubDtos.getReference(2); tripSeine = dataSourceResource.findById(TripSeine.class, TRIP_SEINE_ID_3); Assert.assertEquals(tripSeine.getTopiaId(), tripSeineStubDto.getId()); - Assert.assertEquals(0, tripSeine.getStartDate().compareTo(tripSeineStubDto.getStartDate())); - Assert.assertEquals(0, tripSeine.getEndDate().compareTo(tripSeineStubDto.getEndDate())); - Assert.assertEquals(tripSeine.getVessel().getLabel2(), tripSeineStubDto.getVesselLabel()); - Assert.assertEquals(tripSeine.getObserverLabel(), tripSeineStubDto.getObserverLabel()); + Assert.assertEquals(0, tripSeine.getStartDate().compareTo((Date) tripSeineStubDto.getPropertyValue(TripSeineDto.PROPERTY_START_DATE))); + Assert.assertEquals(0, tripSeine.getEndDate().compareTo((Date) tripSeineStubDto.getPropertyValue(TripSeineDto.PROPERTY_END_DATE))); + Assert.assertEquals(tripSeine.getVessel().getLabel2(), tripSeineStubDto.getPropertyValue(TripSeineDto.PROPERTY_VESSEL)); + Assert.assertEquals(tripSeine.getObserverLabel(), tripSeineStubDto.getPropertyValue(TripSeineDto.PROPERTY_OBSERVER)); } @@ -392,9 +391,9 @@ public class TripSeineServiceTopiaTest extends AbstractServiceTopiaTest { service.delete(TRIP_SEINE_ID_1); - List<TripSeineStubDto> tripSeineByProgram = service.getTripSeineByProgram(PROGRAM_ID); + ReferenceSetDto<TripSeineDto> tripSeineByProgram = service.getTripSeineByProgram(PROGRAM_ID); - Assert.assertEquals(2, tripSeineByProgram.size()); + Assert.assertEquals(2, tripSeineByProgram.sizeReference()); Assert.assertFalse(dataSourceResource.exists(TripSeine.class, TRIP_SEINE_ID_1)); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch feature/7553 in repository observe. See http://git.codelutin.com/observe.git commit 58ba04bb5242a55f8c7432cf1a4089efa208c148 Author: Kevin Morin <morin@codelutin.com> Date: Wed Sep 30 16:37:41 2015 +0200 remplacement des anciens datasources par les nouveaux --- .../business/ObserveApplicationContext.java | 13 +- .../fr/ird/observe/business/db/DataSource.java | 225 ---------- .../ird/observe/business/db/DataSourceConfig.java | 219 ---------- .../observe/business/db/DataSourceConfigParam.java | 43 -- .../observe/business/db/DataSourceException.java | 55 --- .../ird/observe/business/db/DataSourceFactory.java | 457 --------------------- .../observe/business/db/DataSourceProvider.java | 72 ---- .../db/constants/CommonDataSourceConfigParam.java | 128 ------ .../business/report/model/ReportExecute.java | 9 +- .../business/validation/ObserveValidator.java | 5 +- .../business/validation/ValidationContext.java | 13 +- .../ird/observe/ui/actions/ShowConfigAction.java | 20 +- .../fr/ird/observe/ui/admin/AdminTabUIHandler.java | 24 +- .../ui/admin/validate/ValidateUIHandler.java | 2 +- .../java/fr/ird/observe/ui/content/ContentUI.jaxx | 6 +- .../observe/ui/content/ContentUIInitializer.java | 2 +- .../ird/observe/ui/content/ObserveContentUI.java | 5 +- .../impl/longline/ActivityLonglinesUIHandler.java | 2 +- .../list/impl/longline/TripLonglinesUIHandler.java | 2 +- .../list/impl/seine/ActivitySeinesUIHandler.java | 2 +- .../ui/content/open/ContentOpenableUIHandler.java | 2 +- .../impl/longline/ActivityLonglineUIHandler.java | 4 +- .../open/impl/longline/TripLonglineUIHandler.java | 2 +- .../open/impl/seine/ActivitySeineUIHandler.java | 4 +- .../ui/content/table/ContentTableUIHandler.java | 2 +- .../longline/BranchlinesCompositionUIHandler.java | 2 +- .../CatchLonglineContentTableUIInitializer.java | 2 +- .../impl/longline/CatchLonglineUIHandler.java | 2 +- .../longline/FloatlinesCompositionUIHandler.java | 2 +- .../longline/GearUseFeaturesLonglineUIHandler.java | 2 +- .../impl/longline/HooksCompositionUIHandler.java | 2 +- .../content/table/impl/longline/TdrUIHandler.java | 10 +- .../impl/seine/GearUseFeaturesSeineUIHandler.java | 2 +- .../table/impl/seine/NonTargetCatchUIHandler.java | 2 +- .../table/impl/seine/NonTargetSampleUIHandler.java | 8 +- .../table/impl/seine/SchoolEstimateUIHandler.java | 2 +- .../table/impl/seine/TargetCatchUIHandler.java | 6 +- .../impl/seine/TargetDiscardCatchUIHandler.java | 6 +- .../table/impl/seine/TargetSampleUIHandler.java | 10 +- .../ird/observe/ui/storage/ObstunaAdminAction.java | 2 +- .../ird/observe/ui/storage/StorageUIHandler.java | 37 +- .../ird/observe/ui/tree/ActivityLonglineNode.java | 2 +- .../fr/ird/observe/ui/tree/ActivitySeineNode.java | 2 +- .../observe/ui/tree/FloatingObjectSeineNode.java | 2 +- .../fr/ird/observe/ui/tree/RouteSeineNode.java | 2 +- .../fr/ird/observe/ui/tree/SetLonglineNode.java | 2 +- .../java/fr/ird/observe/ui/tree/SetSeineNode.java | 2 +- .../fr/ird/observe/ui/tree/TripLonglineNode.java | 2 +- .../java/fr/ird/observe/ui/tree/TripSeineNode.java | 2 +- .../actions/ChangeTripProgramActionListener.java | 7 +- .../loadors/ActivityLonglineNodeChildLoador.java | 3 +- .../loadors/FloatingObjectNodeChildLoador.java | 4 +- .../loadors/ReferenceCommonNodeChildLoador.java | 4 +- .../loadors/ReferenceLonglineNodeChildLoador.java | 4 +- .../loadors/ReferenceSeineNodeChildLoador.java | 4 +- .../tree/loadors/SetLonglineNodeChildLoador.java | 4 +- .../ui/tree/loadors/SetSeineNodeChildLoador.java | 4 +- .../observe/ui/util/tripMap/TripMapUIHandler.java | 5 +- 58 files changed, 132 insertions(+), 1338 deletions(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/business/ObserveApplicationContext.java b/observe-application-swing/src/main/java/fr/ird/observe/business/ObserveApplicationContext.java index 66b1965..846e44a 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/business/ObserveApplicationContext.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/business/ObserveApplicationContext.java @@ -23,10 +23,11 @@ package fr.ird.observe.business; import fr.ird.observe.configuration.ObserveSwingApplicationConfig; import fr.ird.observe.business.db.DataContext; -import fr.ird.observe.business.db.DataSource; + import fr.ird.observe.business.gps.GPSService; import fr.ird.observe.business.validation.ObserveValidator; import fr.ird.observe.business.validation.ValidationContext; +import fr.ird.observe.db.ObserveSwingDataSource; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.ui.DecoratorService; import jaxx.runtime.JAXXUtil; @@ -81,8 +82,8 @@ public class ObserveApplicationContext extends DefaultApplicationContext { JAXXUtil.newContextEntryDef(DataContext.class); /** the jaxx context entry to store the data source (says the ui data source) */ - public static final JAXXContextEntryDef<DataSource> DATA_SOURCE_ENTRY_DEF = - JAXXUtil.newContextEntryDef(DataSource.class); + public static final JAXXContextEntryDef<ObserveSwingDataSource> DATA_SOURCE_ENTRY_DEF = + JAXXUtil.newContextEntryDef(ObserveSwingDataSource.class); public static final JAXXContextEntryDef<ValidationContext> VALIDATION_CONTEXT_ENTRY_DEF = JAXXUtil.newContextEntryDef(ValidationContext.class); @@ -103,12 +104,12 @@ public class ObserveApplicationContext extends DefaultApplicationContext { return CONFIG_ENTRY_DEF.getContextValue(this); } - public final DataSource getDataSource() { - DataSource dataSource = DATA_SOURCE_ENTRY_DEF.getContextValue(this); + public final ObserveSwingDataSource getDataSource() { + ObserveSwingDataSource dataSource = DATA_SOURCE_ENTRY_DEF.getContextValue(this); return dataSource; } - public final void setDataSource(DataSource source) { + public final void setDataSource(ObserveSwingDataSource source) { if (source == null) { DATA_SOURCE_ENTRY_DEF.removeContextValue(this); } else { diff --git a/observe-application-swing/src/main/java/fr/ird/observe/business/db/DataSource.java b/observe-application-swing/src/main/java/fr/ird/observe/business/db/DataSource.java deleted file mode 100644 index 98aa6b8..0000000 --- a/observe-application-swing/src/main/java/fr/ird/observe/business/db/DataSource.java +++ /dev/null @@ -1,225 +0,0 @@ -/* - * #%L - * ObServe :: Business - * %% - * Copyright (C) 2008 - 2010 IRD, Codelutin, Tony Chemit - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ -package fr.ird.observe.business.db; - -import fr.ird.observe.business.db.constants.DataSourceState; -import org.nuiton.util.version.Version; - -import java.io.File; -import java.util.Properties; - -/** - * Le contrat d'une source de données. - * - * @author Tony Chemit - chemit@codelutin.com - * @since 1.4 - */ -public interface DataSource { - - String OPEN_PROPERTY_KEY = "open"; - - String REFERENTIEL_PROPERTY_KEY = "referentiel"; - - String DATA_PROPERTY_KEY = "data"; - - // ------------------------------------------------------------------------- - // Methodes de démarrage et fermeture de la source de données - // ------------------------------------------------------------------------- - - /** - * Pour initialiser le service sans l'ouvrir. - * <p/> - * Note: cette opération est délégué à la configuration. - * <p/> - * A la fin de cette méthode, l'état doit être {@link - * DataSourceState#INIT} si - * tout s'est bien déroulé. - * - * @see DataSourceConfig#init() - */ - void init(); - - /** - * Ouvre le service. - * <p/> - * Après cette opération, le service doit être en état {@link - * DataSourceState#OPEN} si - * tout s'est bien déroulé. - * - * @throws DataSourceException si pb - */ - void doOpen() throws DataSourceException; - - /** - * Ferme le service. - * <p/> - * Après cette opération, le service doit être en état {@link - * DataSourceState#CLOSED} - * - * @param destroy drapeau pour savoir si on doit détruire la base après - * fermeture. - * @throws DataSourceException if pb - */ - void doClose(boolean destroy) throws DataSourceException; - - // ------------------------------------------------------------------------- - // Methodes d'accès aux état internes de la source de données - // ------------------------------------------------------------------------- - - /** - * Recupère la version de la base. (ne peut pas être utilisé avant que la - * base soit ouverte). - * <p/> - * Note: si la base n'est pas versionnée, la version est nulle. - * - * @return la version de la base, ou <code>null</code> si la base n'est pas - * versionnee - * @throws DataSourceException if pb - */ - Version getDbVersion() throws DataSourceException; - - /** @return le libellé court du service */ - String getShortLabel(); - - /** @return le libellé complet du service */ - String getLabel(); - - /** - * @return {@code true} si le service est ouvert (i.e qu'il y a une - * connection ouverte vers la base). - */ - boolean isOpen(); - - boolean wasClosed(); - - /** @return la configuration du service */ - DataSourceConfig getConfig(); - - /** @return {@code true} si on peut lire le référentiel */ - boolean canReadReferentiel(); - - /** @return {@code true} si on peut écrire sur le référentiel */ - boolean canWriteReferentiel(); - - /** @return {@code true} si on peut lire les donées observer */ - boolean canReadData(); - - /** @return {@code true} si on peut écrire des données observer */ - boolean canWriteData(); - - Properties getConfigForTopia(); - - // ------------------------------------------------------------------------- - // Methodes de manipulation des transactions, DAO et TopiaService - // ------------------------------------------------------------------------- - - //FIXME -// /** @return le parent de tous les context topia. */ -// TopiaContext getRootCtxt(); -// -// TopiaContext beginTransaction(String methodName) throws DataSourceException; -// -// void rollbackTransaction(TopiaContext context, -// String methodName) throws DataSourceException; -// -// void commitTransaction(TopiaContext context, -// String methodName) throws DataSourceException; -// -// void closeTransaction(TopiaContext context, -// String methodName) throws DataSourceException; - -// ReplicationService getReplicationService(); -// -// <S extends TopiaService> S getTopiaService(Class<S> serviceType); -// -// <P extends TopiaEntity> TopiaDAO<P> getDAO(TopiaContext context, -// Class<P> entityType) throws TopiaException; -// -// <P extends TopiaEntity> TopiaDAO<P> getDAO(TopiaContext context, -// P entity) throws TopiaException; -// -// <E extends OpenableEntity & TopiaEntity> E getOpen(TopiaContext tx, -// Class<E> klass) throws DataSourceException; -// -// String[] getOpenIds(TopiaContext tx) throws DataSourceException; - - /** - * Exporte la base de données dans un script gzip-compresse. - * <p/> - * Note : Actuellement, seul esl bases de type H2 peuvent utiliser cette - * fonctionnalitee. - * - * @param gzipFile le fichier ou ecrire le script gzippe - * @throws DataSourceException si un pb pendant l'objectOperation - */ - void storeDB(File gzipFile) throws DataSourceException; - - //FIXME -// /** -// * Décore un obet persistant. -// * -// * @param tx la transaction à utiliser (si elle est nulle on en crée une que l'on ferme avant la fin de l'appel). -// * @param id l'id de l'obet à décorer -// * @param decorator le décorateur -// * @return la décoration -// * @throws DataSourceException si pas possible de récupérer l'objet en base -// */ -// String decorateEntity(TopiaContext tx, -// String id, -// Decorator<?> decorator) throws DataSourceException; -// -// <E extends TopiaEntity> List<E> loadDecoratedEntities(TopiaContext tx, -// Class<E> entityClass, -// Decorator<E> decorator) throws DataSourceException; - - // ------------------------------------------------------------------------- - // Methodes de vérification d'état - // ------------------------------------------------------------------------- - - /** - * Verifie que l'etat du service est l'un de ceux donnes en parametre. - * - * @param state les etats acceptes - * @throws IllegalStateException si l'etat du service n'est pas l'un de ceux - * donnes en parametre - */ - void checkState(DataSourceState... state) throws IllegalStateException; - - // ------------------------------------------------------------------------- - // Methodes de l'api des écouteurs sur évènement sur source de données - // ------------------------------------------------------------------------- - - //FIXME -// void addDataSourceListener(DataSourceListener listener); -// -// boolean containsDataSourceListener(DataSourceListener listener); -// -// void removeDataSourceListener(DataSourceListener listener); -// -// DataSourceListener[] getDataSourceListeners(); -// -// void fireNewMessage(String message); -// -// void fireNewMessage(String message, DataSourceEvent.MessageLevel level); -// -// <E> E findByTopiaId(TopiaContext tx, String entityId) throws TopiaException; -} diff --git a/observe-application-swing/src/main/java/fr/ird/observe/business/db/DataSourceConfig.java b/observe-application-swing/src/main/java/fr/ird/observe/business/db/DataSourceConfig.java deleted file mode 100644 index ead8e9a..0000000 --- a/observe-application-swing/src/main/java/fr/ird/observe/business/db/DataSourceConfig.java +++ /dev/null @@ -1,219 +0,0 @@ -/* - * #%L - * ObServe :: Business - * %% - * Copyright (C) 2008 - 2010 IRD, Codelutin, Tony Chemit - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ -package fr.ird.observe.business.db; - -import fr.ird.observe.db.constantes.CreationMode; -import fr.ird.observe.business.db.constants.DataPolicy; -import fr.ird.observe.business.db.constants.DataSourceState; - -import java.util.EnumSet; -import java.util.Properties; -import java.util.Set; - -/** - * Le contrat de la configuration d'une source de données. - * - * @author Tony Chemit - chemit@codelutin.com - * @since 1.4 - */ -public interface DataSourceConfig extends Cloneable { - - /** - * Récupère la valeur d'un paramètre. - * - * @param <T> le type de la valeur d'un paramètre - * @param param la définition du paramètre - * @param type le type du paramètre - * @return la valeur du paramètre - */ - <T> T get(DataSourceConfigParam param, Class<T> type); - - /** - * Positionne une nouvelle valeur pour unparamètre donné. - * <p/> - * Note: si on passe la valeur <code>null</code> alors le paramètre ne sera - * plus utilisé (jusqu'à ré-affectation d'un valeur non nulle). - * - * @param param la définition du paramètre - * @param value la nouvelle valeur à positionner - */ - void set(DataSourceConfigParam param, Object value); - - /** - * Prépare l'utilisation de la configuration sans ouvrir aucun connexion - * vers la base de données associée. - * <p/> - * A la fin de cette méthode, l'état doit être {@link - * DataSourceState#INIT} si - * tout s'est bien déroulé. - */ - void init(); - - /** @return la configuration sous forme l'un fichier de properties. */ - Properties getDbConfig(); - - /** - * Méthode pour valider la configuration. - * <p/> - * Cette méthode doit être appelée par le service avant toute ouverture de - * service pour assurer que l'on obtiendra un service valide. - * - * @return {@code true} si la configuration est valide. - */ - boolean isValid(); - - /** - * @return {@code true} si le service de persistance utilise un cache - * sur les entités du référentiel. - */ - boolean isUseCache(); - - /** @return le label court de la source de donnees. */ - String getShortLabel(); - - /** @return le label long de la source de donnees. */ - String getLabel(); - - /** @return le login pour se connecter a la base */ - String getLogin(); - - /** @return le mot de passe pour se connecter a la base */ - char[] getPassword(); - - /** - * @return {@code true} si on doit effectuer une tentative de mise a - * jour de la base a l'ouverture du service. - */ - boolean isCanMigrate(); - - boolean isShowMigrationSql(); - - boolean isShowMigrationProgression(); - - void setShowMigrationSql(boolean showSql); - - void setShowMigrationProgression(boolean showProgression); - - /** - * Positionne le login de connexion. - * - * @param login le nouveau login de connexion - */ - void setLogin(String login); - - /** - * Positionne le mot de passe de connexion. - * - * @param password le nouveau mot de passe de connexion - */ - void setPassword(char[] password); - - /** - * Positionne le label court de la source de donnees. - * - * @param shortLabel le nouvel label court de la source de donnes. - */ - void setShortLabel(String shortLabel); - - /** - * Positionne le drapeau d'utilisation du cache des entites. - * <p/> - * Il s'agit d'un cache sur le referentiel, mise a jour a chaque - * modification sur une entite du referentiel. - * <p/> - * Sera util lorsque l'on editera le referentiel dans l'application. - * - * @param useCache la nouvelle valeur du drapeau - */ - void setUseCache(boolean useCache); - - /** @return une instance clonee de la configuration */ - DataSourceConfig clone(); - - /** - * Recopie cette configuration vers la configuratyion donnee en parametre. - * - * @param config la configuration destination - */ - void copyTo(DataSourceConfig config); - - /** @return les droits sur la source de donnees */ - EnumSet<DataPolicy> getPolicy(); - - /** - * Recupère les droits utilisables sur ce service de persistance. - * <p/> - * La liste des droits sera positionné dans le champ {@link #getPolicy()}. - * <p/> - * Cette méthode est appellé à l'ouverture du service si la connexion a bien - * été établie. - */ - void detectPolicy(); - - /** @return les droits sur la source de donnees formates. */ - String getPolicyLabel(); - - void fillWrights(StringBuilder buffer, boolean read, - boolean write, String label); - - /** - * @param canMigrate pour indiquer si on doit effecuter une tentative de - * mise a jour a l'ouverture du service. - */ - void setCanMigrate(boolean canMigrate); - - boolean isCanReadData(); - - boolean isCanReadReferentiel(); - - boolean isCanWriteData(); - - boolean isCanWriteReferentiel(); - - CreationMode getCreationMode(); - - void setCreationMode(CreationMode creationMode); - - DataSourceConfig getImportConfig(); - - void setImportConfig(DataSourceConfig importConfig); - - DataSourceConfig getImportDataConfig(); - - void setImportDataConfig(DataSourceConfig importDataConfig); - - Set<String> getImportDataIds(); - - void setImportDataIds(Set<String> importDataIds); - -// boolean hasH2ImportConfig(); -// -// boolean hasPGImportConfig(); - - boolean hasImportReferentielConfig(); - - boolean hasImportDataConfig(); - -// H2DataSourceConfig getH2ImportConfig(); -// -// PGDataSourceConfig getPGImportConfig(); -} diff --git a/observe-application-swing/src/main/java/fr/ird/observe/business/db/DataSourceConfigParam.java b/observe-application-swing/src/main/java/fr/ird/observe/business/db/DataSourceConfigParam.java deleted file mode 100644 index 8002ce2..0000000 --- a/observe-application-swing/src/main/java/fr/ird/observe/business/db/DataSourceConfigParam.java +++ /dev/null @@ -1,43 +0,0 @@ -/* - * #%L - * ObServe :: Business - * %% - * Copyright (C) 2008 - 2010 IRD, Codelutin, Tony Chemit - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ -package fr.ird.observe.business.db; - -/** - * Le contrat d'un paramètre de la configuration d'une source de données. - * - * @author Tony Chemit - chemit@codelutin.com - * @since 1.4 - */ -public interface DataSourceConfigParam { - - /** - * @return le lastName de la clef utilisée pour stocker la valeur de la - * propriété. - */ - String getMapName(); - - /** @return le lastName de la propriété. */ - String getPropertyName(); - - /** @return le type de la propriété. */ - Class<?> getType(); -} diff --git a/observe-application-swing/src/main/java/fr/ird/observe/business/db/DataSourceException.java b/observe-application-swing/src/main/java/fr/ird/observe/business/db/DataSourceException.java deleted file mode 100644 index 4a970c0..0000000 --- a/observe-application-swing/src/main/java/fr/ird/observe/business/db/DataSourceException.java +++ /dev/null @@ -1,55 +0,0 @@ -/* - * #%L - * ObServe :: Business - * %% - * Copyright (C) 2008 - 2010 IRD, Codelutin, Tony Chemit - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ -package fr.ird.observe.business.db; - -/** - * L'exception déclanché lors de l'accès aux méthodes de la source de données. - * - * @author Tony Chemit - chemit@codelutin.com - * @since 1.4 - */ -public class DataSourceException extends Exception { - - private final static long serialVersionUID = 1L; - - protected final String methodName; - - public DataSourceException(String message, String methodName) { - super(message); - this.methodName = methodName; - } - - public DataSourceException(Throwable cause, String methodName) { - super(cause); - this.methodName = methodName; - } - - public DataSourceException(String message, Throwable cause, String methodName) { - super(message, cause); - this.methodName = methodName; - } - - public String getMethodName() { - return methodName; - } - -} diff --git a/observe-application-swing/src/main/java/fr/ird/observe/business/db/DataSourceFactory.java b/observe-application-swing/src/main/java/fr/ird/observe/business/db/DataSourceFactory.java deleted file mode 100644 index 6846264..0000000 --- a/observe-application-swing/src/main/java/fr/ird/observe/business/db/DataSourceFactory.java +++ /dev/null @@ -1,457 +0,0 @@ -/* - * #%L - * ObServe :: Business - * %% - * Copyright (C) 2008 - 2010 IRD, Codelutin, Tony Chemit - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ -package fr.ird.observe.business.db; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - -import java.util.Collections; -import java.util.HashSet; -import java.util.ServiceLoader; -import java.util.Set; - -import static org.nuiton.i18n.I18n.t; - -/** - * L'usine de source de données. - * - * @author Tony Chemit - chemit@codelutin.com - * @since 1.4 - */ -public class DataSourceFactory { - - /** Logger */ - private static final Log log = - LogFactory.getLog(DataSourceFactory.class); - - /** l'ensemble des proversId découverts */ - protected static Set<DataSourceProvider<?, ?>> proversId; - - /** l'ensemble des services actuellement ouverts */ - protected static final Set<DataSource> services = - new HashSet<DataSource>(); - - /** - * un ecouteur sur les services pour mettre à jour la liste des services - * actifs - */ - //FIXME -// protected static final DataSourceListener l = -// new DataSourceListenerAdapter() { -// -// @Override -// public void onClosed(DataSourceEvent event) { -// DataSource s = event.getSource(); -// if (log.isDebugEnabled()) { -// log.debug("remove active service " + s.getLabel()); -// } -// services.remove(s); -// } -// -// @Override -// public void onOpened(DataSourceEvent event) { -// DataSource s = event.getSource(); -// if (log.isDebugEnabled()) { -// log.debug("add active service " + s.getLabel()); -// } -// services.add(s); -// } -// -// @Override -// public void onNewMessage(DataSourceEvent event) { -// if (log.isInfoEnabled()) { -// log.info(event.getMessage()); -// } -// } -// }; - - //FIXME -// public static Version getModelVersion() { -// if (ObserveServiceHelper.context != null) { -// ApplicationConfig config; -// config = ObserveServiceHelper.context.getContextValue(ApplicationConfig.class); -// if (config != null) { -// return config.getOption(Version.class, -// AbstractDataSourceMigration.DB_VERSION); -// } -// } -// return null; -// } - - /** - * @param label le label du service de persistance - * @param params les paramètres de la configuration - * @return la configuration instanciée - */ -//FIXME -// public static H2DataSourceConfig newH2Config(String label, Object... params) { -// -// H2DataSourceConfig config = newConfig(label, -// H2DataSourceConfig.class, -// H2DataSource.class, -// params -// ); -// -// return config; -// } - - /** - * @param label le label du service de persistance - * @param params les paramètres de la configuration - * @return la configuration instanciée - */ -//FIXME -// public static PGDataSourceConfig newPGConfig(String label, Object... params) { -// -// PGDataSourceConfig config = newConfig(label, -// PGDataSourceConfig.class, -// PGDataSource.class, -// params -// ); -// -// return config; -// } - -//FIXME -// public static PGDataSource newService(PGDataSourceConfig config) { -// -// PGDataSource service = newService(config, PGDataSource.class); -// -// return service; -// } - -//FIXME -// public static H2DataSource newService(H2DataSourceConfig config) { -// -// H2DataSource service = newService(config, H2DataSource.class); -// -// return service; -// } - -//FIXME -// public static DataSource newService(DataSourceConfig config) { -// -// DataSource service = null; -// -// if (config instanceof H2DataSourceConfig) { -// service = newService((H2DataSourceConfig) config); -// } else if (config instanceof PGDataSourceConfig) { -// service = newService((PGDataSourceConfig) config); -// } -// -// return service; -// } - - /** - * @param <C> le type de la configuration - * @param label le label du service de persistance - * @param configClass le type de configuration - * @param serviceClass le type de service - * @param params les paramètres de la configuration - * @return la configuration instanciée - */ - private static <C extends DataSourceConfig, S extends DataSource> C newConfig(String label, - Class<C> configClass, - Class<S> serviceClass, - Object... params) { - - DataSourceProvider<C, S> provider = - getProvider(configClass, serviceClass); - - C config = provider.newConfig(label, params); - - return config; - } -// -//FIXME -// public static <C extends DataSourceConfig, S extends DataSource> S -// newService(C config, Class<S> serviceClass) { -// -// DataSourceProvider<C, S> provider = getProvider(config, serviceClass); -// -// S service = provider.newService(config); -// -// service.addDataSourceListener(l); -// -// service.init(); -// -// return service; -// } - - public static Set<DataSourceProvider<?, ?>> getProversId() { - if (proversId == null) { - proversId = discover(); - } - return proversId; - } -//FIXME -// public static void dispose() throws DataSourceException { -// if (log.isInfoEnabled()) { -// log.info("close all services (" + services.size() + ')'); -// } -// -// for (DataSource service : services) { -// // on supprime le listener qui met a jour la liste de services -// // sinon on entre en concurrence de modification -// service.removeDataSourceListener(l); -// if (service.isOpen()) { -// service.doClose(false); -// } -// } -// services.clear(); -// } - - @SuppressWarnings("unchecked") - protected static <C extends DataSourceConfig, S extends DataSource> - DataSourceProvider<C, S> getProvider(Class<C> configClass, - Class<S> serviceClass) { - - if (configClass == null) { - throw new NullPointerException("configClass can not be null"); - } - - if (serviceClass == null) { - throw new NullPointerException("serviceClass can not be null"); - } - - for (DataSourceProvider<?, ?> p : getProversId()) { - if (configClass.equals(p.getConfigClass()) && - serviceClass.equals(p.getServiceClass())) { - return (DataSourceProvider<C, S>) p; - } - } - return null; - } - - @SuppressWarnings("unchecked") - protected static <C extends DataSourceConfig, S extends DataSource> - DataSourceProvider<C, S> getProvider(C config, - Class<S> serviceClass) { - - if (config == null) { - throw new NullPointerException("config can not be null"); - } - - if (serviceClass == null) { - throw new NullPointerException("serviceClass can not be null"); - } - - Class<C> configClass = (Class<C>) config.getClass(); - return getProvider(configClass, serviceClass); - } - - protected static Set<DataSourceProvider<?, ?>> discover() { - Set<DataSourceProvider<?, ?>> detected; - detected = new HashSet<DataSourceProvider<?, ?>>(); - if (log.isDebugEnabled()) { - log.debug("init " + DataSourceFactory.class); - } - for (DataSourceProvider<?, ?> p : ServiceLoader.load(DataSourceProvider.class)) { - detected.add(p); - if (log.isDebugEnabled()) { - log.debug(t("observe.storage.message.provider.detected", p.getServiceClass().getName())); - } - } - - return Collections.unmodifiableSet(detected); - } - - /** - * Creates the config for an empty local storage. - * - * @param label label of storage - * @param dir directory of the database - * @param login login to connect ot the storage - * @param password password to connect ot the storage - * @return the instanciate config - */ -//FIXME -// public static H2DataSourceConfig newH2ConfigEmpty( -// String label, -// File dir, -// String login, -// char[] password) { -// H2DataSourceConfig config = newH2Config( -// label, -// CommonDataSourceConfigParam.LOGIN, login, -// CommonDataSourceConfigParam.PASSWORD, password, -// CommonDataSourceConfigParam.CREATION_MODE, CreationMode.EMPTY, -// H2DataSourceConfigParam.DIRECTORY, dir -// ); -// return config; -// } - - /** - * Creates the config for a new local storage loaded from the given {@code - * dump}. - * - * @param label label of storage - * @param dir directory of the database - * @param dump url of the dump to load - * @param login login to connect ot the storage - * @param password password to connect ot the storage - * @param canMigrate flag to migrate db if required - * @return the instanciate config - */ -//FIXME -// public static H2DataSourceConfig newH2ConfigFromDump( -// String label, -// File dir, -// URL dump, -// String login, -// char[] password, -// boolean canMigrate) { -// H2DataSourceConfig config = newH2Config( -// label, -// CommonDataSourceConfigParam.LOGIN, login, -// CommonDataSourceConfigParam.PASSWORD, password, -// CommonDataSourceConfigParam.CREATION_MODE, CreationMode.IMPORT_EXTERNAL_DUMP, -// H2DataSourceConfigParam.DUMP, dump, -// H2DataSourceConfigParam.DIRECTORY, dir, -// CommonDataSourceConfigParam.CAN_MIGRATE, canMigrate -// ); -// return config; -// } - - /** - * Creates the config for an existing local storage with migration if - * required. - * - * @param label label of storage - * @param dir directory of the database - * @param login login to connect ot the storage - * @param password password to connect ot the storage - * @param canMigrate flag to update database - * @return the instanciate config - */ -//FIXME -// public static H2DataSourceConfig newH2ConfigUseLocalStorage( -// String label, -// File dir, -// String login, -// char[] password, -// boolean canMigrate) { -// H2DataSourceConfig config = newH2Config( -// label, -// CommonDataSourceConfigParam.LOGIN, login, -// CommonDataSourceConfigParam.PASSWORD, password, -// H2DataSourceConfigParam.DIRECTORY, dir, -// CommonDataSourceConfigParam.CAN_MIGRATE, canMigrate -// ); -// return config; -// } - - /** - * Creates the config for an new local storage with a copy of the - * referentiel of local storage given his {@code importConfig} with - * migration if required. - * - * @param label label of storage - * @param dir directory of the database - * @param importConfig import service configuration - * @param login login to connect ot the storage - * @param password password to connect ot the storage - * @param canMigrate flag to allow migration - * @return the instanciate config - */ -//FIXME -// public static H2DataSourceConfig newH2ConfigImportLocalStorage( -// String label, -// File dir, -// H2DataSourceConfig importConfig, -// String login, -// char[] password, -// boolean canMigrate) { -// H2DataSourceConfig config = newH2Config( -// label, -// CommonDataSourceConfigParam.LOGIN, login, -// CommonDataSourceConfigParam.PASSWORD, password, -// CommonDataSourceConfigParam.CREATION_MODE, CreationMode.IMPORT_LOCAL_STORAGE, -// H2DataSourceConfigParam.DIRECTORY, dir, -// CommonDataSourceConfigParam.IMPORT_CONFIG, importConfig, -// CommonDataSourceConfigParam.CAN_MIGRATE, canMigrate -// ); -// return config; -// } - - /** - * Creates the config for an new local storage with a copy of the - * referentiel of remote storage given his {@code importConfig} with - * migration if required. - * - * @param label label of storage - * @param dir directory of the database - * @param importConfig import service configuration - * @param login login to connect ot the storage - * @param password password to connect ot the storage - * @param canMigrate flag to allow migration - * @return the instanciate config - */ -//FIXME -// public static H2DataSourceConfig newH2ConfigImportRemoteStorage( -// String label, -// File dir, -// PGDataSourceConfig importConfig, -// String login, -// char[] password, -// boolean canMigrate) { -// H2DataSourceConfig config = newH2Config( -// label, -// CommonDataSourceConfigParam.LOGIN, login, -// CommonDataSourceConfigParam.PASSWORD, password, -// CommonDataSourceConfigParam.CREATION_MODE, CreationMode.IMPORT_REMOTE_STORAGE, -// H2DataSourceConfigParam.DIRECTORY, dir, -// CommonDataSourceConfigParam.IMPORT_CONFIG, importConfig, -// CommonDataSourceConfigParam.CAN_MIGRATE, canMigrate -// ); -// return config; -// } - - /** - * Creates a configuration to connect to a remote dn. - * - * @param dbName storage label - * @param login login to connect remote db - * @param password password to connect remote db - * @param url url of remote db - * @param canMigrate flag to allow migration - * @return the new instanciated configuration - */ -//FIXME -// public static PGDataSourceConfig newPGConfig( -// String dbName, -// String login, -// char[] password, -// String url, -// boolean canMigrate) { -// -// PGDataSourceConfig config = newPGConfig( -// dbName, -// CommonDataSourceConfigParam.LOGIN, login, -// CommonDataSourceConfigParam.PASSWORD, password, -// PGDataSourceConfigParam.URL, url, -// CommonDataSourceConfigParam.CAN_MIGRATE, canMigrate -// ); -// -// return config; -// } -} diff --git a/observe-application-swing/src/main/java/fr/ird/observe/business/db/DataSourceProvider.java b/observe-application-swing/src/main/java/fr/ird/observe/business/db/DataSourceProvider.java deleted file mode 100644 index 405c6ab..0000000 --- a/observe-application-swing/src/main/java/fr/ird/observe/business/db/DataSourceProvider.java +++ /dev/null @@ -1,72 +0,0 @@ -/* - * #%L - * ObServe :: Business - * %% - * Copyright (C) 2008 - 2010 IRD, Codelutin, Tony Chemit - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ -package fr.ird.observe.business.db; - -import org.hibernate.dialect.Dialect; - -import java.sql.Driver; - -/** - * Le contrat d'un provider de source de données. - * - * @author Tony Chemit - chemit@codelutin.com - * @since 1.4 - */ -public interface DataSourceProvider<C extends DataSourceConfig, S extends DataSource> { - - /** @return le type de configuration que le provider peut fournir. */ - Class<C> getConfigClass(); - - /** @return le type de service que le provider peut fournir. */ - Class<S> getServiceClass(); - - /** @return le dialect hibernate utilisé */ - Class<? extends Dialect> getDialectClass(); - - /** @return le driver sql du service */ - Class<? extends Driver> getDriverClass(); - - /** @return la classe de migration */ -// Class<? extends AbstractDataSourceMigration> getMigrationClass(); - - /** @return les paramètres utilisables sur la configuration */ - DataSourceConfigParam[] getParams(); - - /** - * Pour créer une nouvelle configuration. - * - * @param label le libellé du service - * @param params les paramètres de la configuration - * @return la nouvelle configuration instanciée mais non initialisée. - */ - C newConfig(String label, Object... params); - - /** - * Pour créer un nouveau service à partir de sa configuration. - * <p/> - * Note: le service n'est pas ouvert. - * - * @param config la configuration du service - * @return le service instancié non ouvert. - */ - S newService(C config); -} diff --git a/observe-application-swing/src/main/java/fr/ird/observe/business/db/constants/CommonDataSourceConfigParam.java b/observe-application-swing/src/main/java/fr/ird/observe/business/db/constants/CommonDataSourceConfigParam.java deleted file mode 100644 index 3aa71f6..0000000 --- a/observe-application-swing/src/main/java/fr/ird/observe/business/db/constants/CommonDataSourceConfigParam.java +++ /dev/null @@ -1,128 +0,0 @@ -/* - * #%L - * ObServe :: Business - * %% - * Copyright (C) 2008 - 2010 IRD, Codelutin, Tony Chemit - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ -package fr.ird.observe.business.db.constants; - -import fr.ird.observe.business.db.DataSourceConfig; -import fr.ird.observe.business.db.DataSourceConfigParam; -import fr.ird.observe.db.constantes.CreationMode; -import org.hibernate.cfg.Environment; -import org.nuiton.topia.migration.TopiaMigrationEngine; - -import java.util.Set; - -/** - * Les différents parametres communs a tout type de configuration. - * - * @author Tony Chemit - chemit@codelutin.com - * @since 1.0 - */ -public enum CommonDataSourceConfigParam implements DataSourceConfigParam { - - /** le lastName d'utilisateur pour se connecter à la base */ - LOGIN( - "login", - Environment.USER, - String.class - ), - /** le mot de passe de l'utilisateur pour se connecter à la base */ - PASSWORD( - "password", - Environment.PASS, - char[].class - ), - /** un drapeau pour voir les requetes sql lors de la migration. */ - SHOW_MIGRATION_SQL( - TopiaMigrationEngine.MIGRATION_SHOW_SQL, - Boolean.class - ), - /** un drapeau pour voir la progression des requetes sql lors de la migration. */ - SHOW_MIGRATION_PROGRESSION( - TopiaMigrationEngine.MIGRATION_SHOW_PROGRESSION, - Boolean.class - ), - /** un drapeau pour autoriser les migrations. */ - CAN_MIGRATE( - "migrate", - Boolean.class - ), - /** - * le type de création de la base. - * <p/> - * Si on veut juste utiliser une base sans opération de création, on - * n'utilise pas ce paramètre. - */ - CREATION_MODE("creationMode", CreationMode.class), - - /** - * le service de persistance à utiliser en mode création pour importer un - * référentiel. - * <p/> - * Cette donnée sera utilisée uniquement si le mode de création est : - * <p/> - * {@link CreationMode#IMPORT_LOCAL_STORAGE} - * ou {@link CreationMode#IMPORT_REMOTE_STORAGE}. - */ - IMPORT_CONFIG("importConfig", DataSourceConfig.class), - /** - * le service de persistance à utiliser en mode création pour importer - * des données. - */ - IMPORT_DATA_CONFIG("importDataConfig", DataSourceConfig.class), - - /** - * Les ids à importer (si {@code null} alors on import tout). - */ - IMPORT_DATA_IDS("importDataIds", Set.class); - - private final String mapName; - - private final String propertyName; - - private final Class<?> type; - - CommonDataSourceConfigParam(String name, Class<?> type) { - this(name, name, type); - } - - CommonDataSourceConfigParam(String propertyName, - String mapName, - Class<?> type) { - this.mapName = mapName; - this.propertyName = propertyName; - this.type = type; - } - - @Override - public String getMapName() { - return mapName; - } - - @Override - public String getPropertyName() { - return propertyName; - } - - @Override - public Class<?> getType() { - return type; - } -} diff --git a/observe-application-swing/src/main/java/fr/ird/observe/business/report/model/ReportExecute.java b/observe-application-swing/src/main/java/fr/ird/observe/business/report/model/ReportExecute.java index 2451881..8538cbe 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/business/report/model/ReportExecute.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/business/report/model/ReportExecute.java @@ -21,7 +21,6 @@ */ package fr.ird.observe.business.report.model; -import fr.ird.observe.business.db.DataSourceException; import fr.ird.observe.db.ObserveSwingDataSource; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; @@ -82,7 +81,7 @@ public class ReportExecute { } public void populate(Report report, - String tripId) throws DataSourceException { + String tripId) { if (!checkDataSource(source)) { // source de donnee fermée @@ -94,7 +93,7 @@ public class ReportExecute { doPopulateVariables(tripId); } - public DataMatrix execute(Map<String, Object> variables) throws DataSourceException { + public DataMatrix execute(Map<String, Object> variables) { if (report == null) { @@ -208,7 +207,7 @@ public class ReportExecute { return true; } - protected void doPopulateVariables(String tripId) throws DataSourceException { + protected void doPopulateVariables(String tripId) { // on nettoye les univers de variables avant tout variablesUniverse.clear(); @@ -248,7 +247,7 @@ public class ReportExecute { // } } - protected void doPopulateRepeatVariables(Map<String, Object> variables) throws DataSourceException { + protected void doPopulateRepeatVariables(Map<String, Object> variables) { // on nettoye les univers de variables de répétition avant tout repeatVariablesUniverse.clear(); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/business/validation/ObserveValidator.java b/observe-application-swing/src/main/java/fr/ird/observe/business/validation/ObserveValidator.java index 621740d..91f5bde 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/business/validation/ObserveValidator.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/business/validation/ObserveValidator.java @@ -25,7 +25,7 @@ import com.opensymphony.xwork2.ActionContext; import com.opensymphony.xwork2.util.ValueStack; import fr.ird.observe.ObserveServiceHelper; import fr.ird.observe.ObserveSwingApplicationContext; -import fr.ird.observe.business.db.DataSourceFactory; + import jaxx.runtime.validator.swing.SwingValidator; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -117,7 +117,8 @@ public class ObserveValidator<B> extends SwingValidator<B> { throw new IllegalStateException( "pas de context d'application enregistré... utiliser la " + "methode " + - DataSourceFactory.class.getName() + + //FIXME +// DataSourceFactory.class.getName() + "#setApplicationContext(context)"); } dataContext = rootContext.getValidationContext(); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/business/validation/ValidationContext.java b/observe-application-swing/src/main/java/fr/ird/observe/business/validation/ValidationContext.java index 8bd8c2e..8c5f73d 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/business/validation/ValidationContext.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/business/validation/ValidationContext.java @@ -22,7 +22,8 @@ package fr.ird.observe.business.validation; import fr.ird.observe.business.db.DataContext; -import fr.ird.observe.business.db.DataSource; + +import fr.ird.observe.db.ObserveSwingDataSource; import fr.ird.observe.services.dto.AbstractObserveDto; import fr.ird.observe.services.dto.longline.ActivityLonglineDto; import fr.ird.observe.services.dto.longline.SetLonglineDto; @@ -52,7 +53,7 @@ public class ValidationContext { public static final String VALIDATION_TRANSACTION_NAME = "validation"; - protected DataSource dataSource; + protected ObserveSwingDataSource dataSource; //FIXME // protected TopiaContext tx; @@ -76,7 +77,7 @@ public class ValidationContext { cleanTransaction(); } - public DataSource getDataSource() { + public ObserveSwingDataSource getDataSource() { return dataSource; } @@ -134,12 +135,12 @@ public class ValidationContext { return dataContext; } - public void setDataSource(DataSource dataSource) { + public void setDataSource(ObserveSwingDataSource dataSource) { if (this.dataSource != null) { closeDataSource(); } if (log.isDebugEnabled()) { - log.debug("Attach data source " + (dataSource == null ? "null" : dataSource.getShortLabel())); + log.debug("Attach data source " + (dataSource == null ? "null" : dataSource.getLabel())); } this.dataSource = dataSource; } @@ -255,7 +256,7 @@ public class ValidationContext { } //FIXME -// public TopiaContext getTx() throws DataSourceException { +// public TopiaContext getTx() { // if (tx == null) { // if (dataSource != null) { // if (log.isInfoEnabled()) { diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/ShowConfigAction.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/ShowConfigAction.java index a176494..3f26531 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/ShowConfigAction.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/ShowConfigAction.java @@ -23,8 +23,6 @@ package fr.ird.observe.ui.actions; */ import fr.ird.observe.ObserveSwingApplicationContext; -import fr.ird.observe.business.ObserveTechnicalException; -import fr.ird.observe.business.db.DataSourceException; import fr.ird.observe.configuration.ObserveSwingApplicationConfig; import fr.ird.observe.configuration.ObserveSwingApplicationConfigOption; import fr.ird.observe.db.ObserveSwingDataSource; @@ -43,14 +41,8 @@ import org.nuiton.config.ConfigOptionDef; import org.nuiton.decorator.Decorator; import org.nuiton.decorator.JXPathDecorator; -import javax.swing.AbstractAction; -import javax.swing.DefaultCellEditor; -import javax.swing.DefaultListCellRenderer; -import javax.swing.Icon; -import javax.swing.JComboBox; -import javax.swing.JList; -import javax.swing.JTable; -import java.awt.Component; +import javax.swing.*; +import java.awt.*; import java.awt.event.ActionEvent; import java.awt.event.MouseEvent; import java.util.EventObject; @@ -100,11 +92,7 @@ public class ShowConfigAction extends AbstractAction { ObserveConfigUIBuilder helper; - try { - helper = buildUI(config, dataSource); - } catch (DataSourceException e) { - throw new ObserveTechnicalException("Could not load some data", e); - } + helper = buildUI(config, dataSource); helper.buildUI(ui, "observe.config.category.directories"); @@ -114,7 +102,7 @@ public class ShowConfigAction extends AbstractAction { } - protected ObserveConfigUIBuilder buildUI(ObserveSwingApplicationConfig config, ObserveSwingDataSource dataSource) throws DataSourceException { + protected ObserveConfigUIBuilder buildUI(ObserveSwingApplicationConfig config, ObserveSwingDataSource dataSource) { //FIXME // SpeciesListTableCellEditor editor; 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 eec3d9f..763b674 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 @@ -25,8 +25,8 @@ import fr.ird.observe.ObserveRunner; import fr.ird.observe.ObserveSwingApplicationContext; import fr.ird.observe.business.BinderService; import fr.ird.observe.business.SendMessageAble; -import fr.ird.observe.business.db.DataSource; -import fr.ird.observe.business.db.DataSourceException; + + import fr.ird.observe.business.gps.GPSService; import fr.ird.observe.business.validation.ValidationService; import fr.ird.observe.db.ObserveSwingDataSource; @@ -197,9 +197,9 @@ public class AdminTabUIHandler implements SendMessageAble { return WizardState.FAILED; } - protected void replicateData(DataSource source, - DataSource target, - String... tripIds) throws DataSourceException { + protected void replicateData(ObserveSwingDataSource source, + ObserveSwingDataSource target, + String... tripIds) { //FIXME // ReplicationService service = getReplicationService(); // if (tripIds == null || tripIds.length == 0) { @@ -213,31 +213,31 @@ public class AdminTabUIHandler implements SendMessageAble { // } } - protected void replicateReferentiel(DataSource source, - DataSource target) throws DataSourceException { + protected void replicateReferentiel(ObserveSwingDataSource source, + ObserveSwingDataSource target) { //FIXME // getReplicationService().replicateReferentiel(source, target); } //FIXME -// protected TopiaContext beginTransaction(DataSource source, String methodName) throws DataSourceException { +// protected TopiaContext beginTransaction(DataSource source, String methodName) { // TopiaContext ctxt = source.beginTransaction(methodName); // return ctxt; // } //FIXME -// protected void commitTransaction(DataSource source, TopiaContext tx, String methodName) throws DataSourceException { +// protected void commitTransaction(DataSource source, TopiaContext tx, String methodName) { // source.commitTransaction(tx, methodName); // } //FIXME -// protected void closeTransaction(DataSource source, TopiaContext tx, String methodName) throws DataSourceException { +// protected void closeTransaction(DataSource source, TopiaContext tx, String methodName) { // source.closeTransaction(tx, methodName); // } //FIXME -// protected void rollbackTransaction(DataSource source, TopiaContext tx, String methodName) throws DataSourceException { +// protected void rollbackTransaction(DataSource source, TopiaContext tx, String methodName) { // source.rollbackTransaction(tx, methodName); // } @@ -382,7 +382,7 @@ public class AdminTabUIHandler implements SendMessageAble { // } } - protected void removeStorageServiceLogger(DataSource service) { + protected void removeStorageServiceLogger(ObserveSwingDataSource service) { // if (service.containsDataSourceListener(serviceLogger)) { // service.removeDataSourceListener(serviceLogger); // } 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 f22fc0c..e5cbec6 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 @@ -444,7 +444,7 @@ public class ValidateUIHandler extends AdminTabUIHandler { //FIXME // protected void validateReferentiel(ValidationMessageDetector detector, // TopiaContext ctxt, -// DataSelectionModel dataModel) throws DataSourceException, TopiaException { +// DataSelectionModel dataModel), TopiaException { // // DataService dataService = getDataService(); // Set<Class<?>> classes = dataModel.getSelectedReferentiel(); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUI.jaxx index c7106cc..6156c05 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUI.jaxx +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUI.jaxx @@ -35,7 +35,7 @@ <import> fr.ird.observe.business.db.DataContext - fr.ird.observe.business.db.DataSource + fr.ird.observe.db.ObserveSwingDataSource fr.ird.observe.configuration.ObserveSwingApplicationConfig fr.ird.observe.ObserveSwingApplicationContext fr.ird.observe.ui.actions.shared.GoUpUIAction @@ -61,8 +61,8 @@ initializer='getContextValue(SwingValidatorMessageTableModel.class)'/> <!--FIXME a supprimer a la fin de la migration de service --> - <DataSource id='dataSource' - initializer='null'/> + <ObserveSwingDataSource id='dataSource' + initializer='ObserveSwingApplicationContext.get().getDataSource()'/> <DataContext id='dataContext' javaBean='getContextValue(DataContext.class)'/> diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUIInitializer.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUIInitializer.java index 1ae7eee..d524ec4 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUIInitializer.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUIInitializer.java @@ -25,7 +25,7 @@ package fr.ird.observe.ui.content; import com.google.common.base.Predicate; import com.google.common.collect.Lists; import fr.ird.observe.ObserveSwingApplicationContext; -import fr.ird.observe.business.db.DataSourceException; + import fr.ird.observe.business.validation.ObserveValidator; import fr.ird.observe.services.dto.AbstractObserveDto; import fr.ird.observe.services.dto.FormDto; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ObserveContentUI.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ObserveContentUI.java index c33bf06..5a40d9e 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ObserveContentUI.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ObserveContentUI.java @@ -23,7 +23,8 @@ package fr.ird.observe.ui.content; */ import fr.ird.observe.business.db.DataContext; -import fr.ird.observe.business.db.DataSource; + +import fr.ird.observe.db.ObserveSwingDataSource; import fr.ird.observe.services.dto.IdDto; import jaxx.runtime.JAXXObject; import jaxx.runtime.swing.BlockingLayerUI; @@ -49,7 +50,7 @@ public interface ObserveContentUI<E extends IdDto> extends JAXXObject { DataContext getDataContext(); - DataSource getDataSource(); + ObserveSwingDataSource getDataSource(); SwingValidatorMessageTableModel getErrorTableModel(); 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 115c531..8e5aab0 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 @@ -23,7 +23,7 @@ package fr.ird.observe.ui.content.list.impl.longline; */ import fr.ird.observe.business.db.DataContext; -import fr.ird.observe.business.db.DataSource; + import fr.ird.observe.business.db.constants.DataContextType; import fr.ird.observe.db.ObserveSwingDataSource; import fr.ird.observe.services.dto.ReferenceDto; 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 1234c9e..9ff72eb 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 @@ -23,7 +23,7 @@ package fr.ird.observe.ui.content.list.impl.longline; */ import fr.ird.observe.business.db.DataContext; -import fr.ird.observe.business.db.DataSource; + import fr.ird.observe.business.db.constants.DataContextType; import fr.ird.observe.db.ObserveSwingDataSource; import fr.ird.observe.services.dto.ReferenceDto; 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 c858661..5b836c1 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 @@ -22,7 +22,7 @@ package fr.ird.observe.ui.content.list.impl.seine; import fr.ird.observe.business.db.DataContext; -import fr.ird.observe.business.db.DataSource; + import fr.ird.observe.business.db.constants.DataContextType; import fr.ird.observe.db.ObserveSwingDataSource; import fr.ird.observe.services.dto.ReferenceDto; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/ContentOpenableUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/ContentOpenableUIHandler.java index a7ed6e6..a8d8693 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/ContentOpenableUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/ContentOpenableUIHandler.java @@ -277,7 +277,7 @@ public abstract class ContentOpenableUIHandler<E extends OpenableDto> extends Co //FIXME // protected final void obtainChildPosition(E bean, // DataService dataService, -// DataSource dataSource) throws DataSourceException { +// DataSource dataSource) { // // String containerId = getSelectedParentId(); // 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 75c2a3b..e7363b0 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 @@ -24,8 +24,8 @@ package fr.ird.observe.ui.content.open.impl.longline; import fr.ird.observe.business.ObserveTechnicalException; import fr.ird.observe.business.db.DataContext; -import fr.ird.observe.business.db.DataSource; -import fr.ird.observe.business.db.DataSourceException; + + import fr.ird.observe.business.db.constants.DataContextType; import fr.ird.observe.db.ObserveSwingDataSource; import fr.ird.observe.services.dto.longline.ActivityLonglineDto; 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 38cee65..ac2a979 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,7 @@ package fr.ird.observe.ui.content.open.impl.longline; import fr.ird.observe.configuration.ObserveSwingApplicationConfig; import fr.ird.observe.business.db.DataContext; -import fr.ird.observe.business.db.DataSource; + import fr.ird.observe.business.db.constants.DataContextType; import fr.ird.observe.db.ObserveSwingDataSource; import fr.ird.observe.services.dto.longline.TripLonglineDto; 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 4c97d8b..a6435d5 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 @@ -22,8 +22,8 @@ package fr.ird.observe.ui.content.open.impl.seine; import fr.ird.observe.business.db.DataContext; -import fr.ird.observe.business.db.DataSource; -import fr.ird.observe.business.db.DataSourceException; + + import fr.ird.observe.business.db.constants.DataContextType; import fr.ird.observe.db.ObserveSwingDataSource; import fr.ird.observe.services.dto.seine.ActivitySeineDto; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/ContentTableUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/ContentTableUIHandler.java index ab9c77d..9cb4870 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/ContentTableUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/ContentTableUIHandler.java @@ -378,7 +378,7 @@ public abstract class ContentTableUIHandler<E extends IdDto, D extends IdDto> ex // } //FIXME -// protected void doPersist(E bean, DataService dataService, DataSource dataSource) throws DataSourceException { +// protected void doPersist(E bean, DataService dataService, DataSource dataSource) { // // sauvegarde du bean en base // dataService.update(dataSource, null, bean, getUpdateExecutor()); // } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/BranchlinesCompositionUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/BranchlinesCompositionUIHandler.java index fa95c87..7674100 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/BranchlinesCompositionUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/BranchlinesCompositionUIHandler.java @@ -23,7 +23,7 @@ package fr.ird.observe.ui.content.table.impl.longline; */ import fr.ird.observe.business.db.DataContext; -import fr.ird.observe.business.db.DataSource; + import fr.ird.observe.business.db.constants.DataContextType; import fr.ird.observe.services.dto.longline.BranchlinesCompositionDto; import fr.ird.observe.services.dto.longline.SetLonglineDto; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/CatchLonglineContentTableUIInitializer.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/CatchLonglineContentTableUIInitializer.java index 1209507..c753cc2 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/CatchLonglineContentTableUIInitializer.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/CatchLonglineContentTableUIInitializer.java @@ -22,7 +22,7 @@ package fr.ird.observe.ui.content.table.impl.longline; * #L% */ -import fr.ird.observe.business.db.DataSourceException; + import fr.ird.observe.services.dto.longline.CatchLonglineDto; import fr.ird.observe.services.dto.longline.SetLonglineDto; import fr.ird.observe.ui.content.table.ContentTableUIInitializer; 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 d4a00bb..6527e27 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 @@ -505,7 +505,7 @@ public class CatchLonglineUIHandler extends ContentTableUIHandler<SetLonglineDto // protected SetLongline loadEditBean(ContentMode mode, // DataContext dataContext, // DataService dataService, -// DataSource dataSource) throws DataSourceException { +// DataSource dataSource) { // // SetLongline setLongline = super.loadEditBean(mode, dataContext, dataService, dataSource); // diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/FloatlinesCompositionUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/FloatlinesCompositionUIHandler.java index 67846fa..3938140 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/FloatlinesCompositionUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/FloatlinesCompositionUIHandler.java @@ -23,7 +23,7 @@ package fr.ird.observe.ui.content.table.impl.longline; */ import fr.ird.observe.business.db.DataContext; -import fr.ird.observe.business.db.DataSource; + import fr.ird.observe.business.db.constants.DataContextType; import fr.ird.observe.services.dto.longline.FloatlinesCompositionDto; import fr.ird.observe.services.dto.longline.SetLonglineDto; 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 6195071..eb7506c 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 @@ -300,7 +300,7 @@ public class GearUseFeaturesLonglineUIHandler extends ContentTableUIHandler<Trip //FIXME // @Override -// protected TripLongline loadEditBean(ContentMode mode, DataContext dataContext, DataService dataService, DataSource dataSource) throws DataSourceException { +// protected TripLongline loadEditBean(ContentMode mode, DataContext dataContext, DataService dataService, DataSource dataSource) { // // TripLongline tripLongline = super.loadEditBean(mode, dataContext, dataService, dataSource); // diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/HooksCompositionUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/HooksCompositionUIHandler.java index 8af0f4e..aedac82 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/HooksCompositionUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/HooksCompositionUIHandler.java @@ -23,7 +23,7 @@ package fr.ird.observe.ui.content.table.impl.longline; */ import fr.ird.observe.business.db.DataContext; -import fr.ird.observe.business.db.DataSource; + import fr.ird.observe.business.db.constants.DataContextType; import fr.ird.observe.services.dto.longline.HooksCompositionDto; import fr.ird.observe.services.dto.longline.SetLonglineDto; 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 2a2bc0f..a912a46 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 @@ -26,9 +26,9 @@ import com.google.common.base.Predicate; import com.google.common.io.FileWriteMode; import com.google.common.io.Files; import fr.ird.observe.ObserveSwingApplicationContext; -import fr.ird.observe.configuration.ObserveSwingApplicationConfig; import fr.ird.observe.business.ObserveTechnicalException; import fr.ird.observe.business.db.constants.DataContextType; +import fr.ird.observe.configuration.ObserveSwingApplicationConfig; import fr.ird.observe.services.dto.longline.SetLonglineDto; import fr.ird.observe.services.dto.longline.TdrDto; import fr.ird.observe.services.dto.referential.longline.SensorBrandDto; @@ -47,13 +47,11 @@ import org.nuiton.jaxx.runtime.JaxxFileChooser; import org.nuiton.validator.NuitonValidatorScope; import javax.sql.rowset.serial.SerialBlob; -import javax.swing.JComponent; -import javax.swing.JOptionPane; -import javax.swing.JTable; +import javax.swing.*; import javax.swing.event.TableModelEvent; import javax.swing.event.TableModelListener; import javax.swing.table.DefaultTableCellRenderer; -import java.awt.Component; +import java.awt.*; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; import java.io.File; @@ -258,7 +256,7 @@ public class TdrUIHandler extends ContentTableUIHandler<SetLonglineDto, TdrDto> //FIXME // @Override -// protected SetLongline loadEditBean(ContentMode mode, DataContext dataContext, DataService dataService, DataSource dataSource) throws DataSourceException { +// protected SetLongline loadEditBean(ContentMode mode, DataContext dataContext, DataService dataService, DataSource dataSource) { // // SetLongline setLongline = super.loadEditBean(mode, dataContext, dataService, dataSource); // 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 cf26366..979a485 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 @@ -298,7 +298,7 @@ public class GearUseFeaturesSeineUIHandler extends ContentTableUIHandler<TripSei //FIXME // @Override -// protected TripSeine loadEditBean(ContentMode mode, DataContext dataContext, DataService dataService, DataSource dataSource) throws DataSourceException { +// protected TripSeine loadEditBean(ContentMode mode, DataContext dataContext, DataService dataService, DataSource dataSource) { // // TripSeine tripSeine = super.loadEditBean(mode, dataContext, dataService, dataSource); // 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 65bd7ef..2c9f377 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 @@ -204,7 +204,7 @@ public class NonTargetCatchUIHandler extends ContentTableUIHandler<SetSeineDto, // protected SetSeine loadEditBean(ContentMode mode, // DataContext dataContext, // DataService dataService, -// DataSource dataSource) throws DataSourceException { +// DataSource dataSource) { // // List<Species> speciesList; // 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 af2a97d..7eef26e 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,7 @@ package fr.ird.observe.ui.content.table.impl.seine; import fr.ird.observe.business.db.DataContext; -import fr.ird.observe.business.db.DataSourceException; + import fr.ird.observe.business.db.constants.DataContextType; import fr.ird.observe.services.dto.referential.SexDto; import fr.ird.observe.services.dto.referential.SpeciesDto; @@ -123,7 +123,7 @@ public class NonTargetSampleUIHandler extends ContentTableUIHandler<NonTargetSam // protected NonTargetSample loadEditBean(ContentMode mode, // DataContext dataContext, // DataService dataService, -// DataSource dataSource) throws DataSourceException { +// DataSource dataSource) { // // List<Species> speciess; // @@ -172,7 +172,7 @@ public class NonTargetSampleUIHandler extends ContentTableUIHandler<NonTargetSam // } @Override - protected boolean prepareSave(NonTargetSampleDto bean, List<NonTargetLengthDto> objets) throws DataSourceException { + protected boolean prepareSave(NonTargetSampleDto bean, List<NonTargetLengthDto> objets) { boolean withLengths = !objets.isEmpty(); @@ -201,7 +201,7 @@ public class NonTargetSampleUIHandler extends ContentTableUIHandler<NonTargetSam //FIXME // @Override -// protected void doPersist(NonTargetSample bean, DataService dataService, DataSource dataSource) throws DataSourceException { +// protected void doPersist(NonTargetSample bean, DataService dataService, DataSource dataSource) { // // if (bean.getTopiaId() != null && bean.isNonTargetLengthEmpty()) { // 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 98b159b..47bd13e 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 @@ -67,7 +67,7 @@ public class SchoolEstimateUIHandler extends ContentTableUIHandler<SetSeineDto, //FIXME // @Override -// protected SetSeine loadEditBean(ContentMode mode, DataContext dataContext, DataService dataService, DataSource dataSource) throws DataSourceException { +// protected SetSeine loadEditBean(ContentMode mode, DataContext dataContext, DataService dataService, DataSource dataSource) { // // List<Species> speciesList; // 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 60001fd..e59a3da 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 @@ -21,7 +21,7 @@ */ package fr.ird.observe.ui.content.table.impl.seine; -import fr.ird.observe.business.db.DataSourceException; + import fr.ird.observe.business.db.constants.DataContextType; import fr.ird.observe.services.dto.ReferenceDto; import fr.ird.observe.services.dto.referential.SpeciesDto; @@ -133,7 +133,7 @@ public class TargetCatchUIHandler extends ContentTableUIHandler<SetSeineDto, Tar // protected SetSeine loadEditBean(ContentMode mode, // DataContext dataContext, // DataService dataService, -// DataSource dataSource) throws DataSourceException { +// DataSource dataSource) { // // List<Species> speciesList; // List<WeightCategory> categorieList; @@ -227,7 +227,7 @@ public class TargetCatchUIHandler extends ContentTableUIHandler<SetSeineDto, Tar // } @Override - protected boolean prepareSave(SetSeineDto bean, List<TargetCatchDto> objets) throws DataSourceException { + protected boolean prepareSave(SetSeineDto bean, List<TargetCatchDto> objets) { // on recupere les speciess acceptables pour des echantillonnages // i.e une species d'un targetCatch 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 e34db35..1095aed 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 @@ -21,7 +21,7 @@ */ package fr.ird.observe.ui.content.table.impl.seine; -import fr.ird.observe.business.db.DataSourceException; + import fr.ird.observe.business.db.constants.DataContextType; import fr.ird.observe.services.dto.ReferenceDto; import fr.ird.observe.services.dto.referential.SpeciesDto; @@ -189,7 +189,7 @@ public class TargetDiscardCatchUIHandler extends ContentTableUIHandler<SetSeineD // protected SetSeine loadEditBean(ContentMode mode, // DataContext dataContext, // DataService dataService, -// DataSource dataSource) throws DataSourceException { +// DataSource dataSource) { // // List<WeightCategory> categorieList; // List<ReasonForDiscard> reasonForDiscardList; @@ -295,7 +295,7 @@ public class TargetDiscardCatchUIHandler extends ContentTableUIHandler<SetSeineD // } @Override - protected boolean prepareSave(SetSeineDto bean, List<TargetCatchDto> objets) throws DataSourceException { + protected boolean prepareSave(SetSeineDto bean, List<TargetCatchDto> objets) { // on recupere les speciess acceptables pour des echantillonnages // i.e une species d'un targetDiscarded montee sur le pont 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 95c2ae9..5551466 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 @@ -22,8 +22,8 @@ package fr.ird.observe.ui.content.table.impl.seine; import fr.ird.observe.business.db.DataContext; -import fr.ird.observe.business.db.DataSource; -import fr.ird.observe.business.db.DataSourceException; + + import fr.ird.observe.business.db.constants.DataContextType; import fr.ird.observe.services.dto.referential.SpeciesDto; import fr.ird.observe.services.dto.seine.SetSeineDto; @@ -131,7 +131,7 @@ public class TargetSampleUIHandler extends ContentTableUIHandler<TargetSampleDto // protected TargetSample loadEditBean(ContentMode mode, // DataContext dataContext, // DataService dataService, -// DataSource dataSource) throws DataSourceException { +// DataSource dataSource) { // // String setId = dataContext.getSelectedSetId(); // @@ -176,7 +176,7 @@ public class TargetSampleUIHandler extends ContentTableUIHandler<TargetSampleDto // } @Override - protected boolean prepareSave(TargetSampleDto bean, List<TargetLengthDto> objets) throws DataSourceException { + protected boolean prepareSave(TargetSampleDto bean, List<TargetLengthDto> objets) { boolean withLengths = !objets.isEmpty(); @@ -212,7 +212,7 @@ public class TargetSampleUIHandler extends ContentTableUIHandler<TargetSampleDto //FIXME // @Override -// protected void doPersist(TargetSample bean, DataService dataService, DataSource dataSource) throws DataSourceException { +// protected void doPersist(TargetSample bean, DataService dataService, DataSource dataSource) { // // if (bean.getTopiaId() != null && bean.isTargetLengthEmpty()) { // diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/ObstunaAdminAction.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/ObstunaAdminAction.java index d3a23f3..2a3c30a 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/ObstunaAdminAction.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/ObstunaAdminAction.java @@ -63,7 +63,7 @@ public enum ObstunaAdminAction { // super.init(ui); // } // -// protected void checkImportDbVersion(StorageUIModel model, DataSourceConfig dataSourceConfig) throws DataSourceException { +// protected void checkImportDbVersion(StorageUIModel model, DataSourceConfig dataSourceConfig) { // // DataSource importDatasource = DataSourceFactory.newService(dataSourceConfig); // 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 dbdf8db..9fe9260 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 @@ -27,9 +27,11 @@ import com.google.common.collect.Iterables; import fr.ird.observe.ObserveActionExecutor; import fr.ird.observe.ObserveRunner; import fr.ird.observe.ObserveSwingApplicationContext; +import fr.ird.observe.services.service.DatabaseConnexionNotAuthorizedException; +import fr.ird.observe.services.service.DatabaseNotFoundException; import fr.ird.observe.ui.DecoratorService; -import fr.ird.observe.business.db.DataSource; -import fr.ird.observe.business.db.DataSourceException; + + import fr.ird.observe.business.util.SecurityModel; import fr.ird.observe.configuration.ObserveSwingApplicationConfig; import fr.ird.observe.db.ObserveSwingDataSource; @@ -886,11 +888,7 @@ public class StorageUIHandler { break; } - try { - computeImportDataReport(model, sb); - } catch (DataSourceException e) { - throw new RuntimeException("Could not render data to import", e); - } + computeImportDataReport(model, sb); } else { @@ -986,11 +984,7 @@ public class StorageUIHandler { break; } - try { - computeImportDataReport(model, sb); - } catch (DataSourceException e) { - throw new RuntimeException("Could not render data to import", e); - } + computeImportDataReport(model, sb); } else { @@ -1100,7 +1094,7 @@ public class StorageUIHandler { addCloseTag("ul", sb); } - protected void computeImportDataReport(StorageUIModel model, StringBuilder sb) throws DataSourceException { + protected void computeImportDataReport(StorageUIModel model, StringBuilder sb) { //FIXME // DataSelectionModel dataModel = model.getSelectDataModel(); @@ -1258,17 +1252,26 @@ public class StorageUIHandler { } - protected void checkImportDbVersion(StorageUIModel model, DataSource dataSource) throws DataSourceException { + protected void checkImportDbVersion(StorageUIModel model, ObserveSwingDataSource dataSource) { + //FIXME try { - dataSource.doOpen(); + dataSource.open(); - Version importServiceDbVersion = dataSource.getDbVersion(); + Version importServiceDbVersion = dataSource.getVersion(); Version currentDbVersion = model.getModelVersion(); if (importServiceDbVersion.before(currentDbVersion)) { throw new IllegalStateException("Import db version (" + importServiceDbVersion + ") is not compatible with the current database version (" + currentDbVersion + ")"); } + } catch (DatabaseConnexionNotAuthorizedException e) { + if (log.isErrorEnabled()) { + log.error("", e); + } + } catch (DatabaseNotFoundException e) { + if (log.isErrorEnabled()) { + log.error("", e); + } } finally { - dataSource.doClose(false); + dataSource.close(); } } 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 fa83798..17d982d 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 @@ -42,7 +42,7 @@ public class ActivityLonglineNode extends DtoNodeSupport<ActivityLonglineDto> { //FIXME // @Override -// protected ActivityLonglineDto getEntity(DataService dataService, DataSource source) throws DataSourceException { +// protected ActivityLonglineDto getEntity(DataService dataService, DataSource source) { // return dataService.getActivityLonglineStub(source, id); // } 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 c8332da..e4abe09 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 @@ -41,7 +41,7 @@ public class ActivitySeineNode extends DtoNodeSupport<ActivitySeineDto> { } // @Override -// protected ActivitySeine getEntity(DataService dataService, DataSource source) throws DataSourceException { +// protected ActivitySeine getEntity(DataService dataService, DataSource source) { // return dataService.getActivitySeineStub(source, id); // } 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 1067ca8..bf25cce 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 @@ -42,7 +42,7 @@ public class FloatingObjectSeineNode extends DtoNodeSupport<FloatingObjectDto> { //FIXME // @Override -// protected FloatingObjectDto getEntity(DataService dataService, DataSource source) throws DataSourceException { +// protected FloatingObjectDto getEntity(DataService dataService, DataSource source) { // return dataService.getFloatinObjectStub(source, id); // } 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 ecc7df7..83e8a5b 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 @@ -40,7 +40,7 @@ public class RouteSeineNode extends DtoNodeSupport<RouteDto> { } // @Override -// protected Route getEntity(DataService dataService, DataSource source) throws DataSourceException { +// protected Route getEntity(DataService dataService, DataSource source) { // return dataService.getRouteStub(source, id); // } 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 a881387..5827a9d 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 @@ -42,7 +42,7 @@ public class SetLonglineNode extends DtoNodeSupport<SetLonglineDto> { //FIXME // @Override -// protected SetLongline getEntity(DataService dataService, DataSource source) throws DataSourceException { +// protected SetLongline getEntity(DataService dataService, DataSource source) { // return (SetLongline) dataService.loadEntity(source, id, true); // } 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 7c97b8e..3e6e259 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 @@ -42,7 +42,7 @@ public class SetSeineNode extends DtoNodeSupport<SetSeineDto> { //FIXME // @Override -// protected SetSeine getEntity(DataService dataService, DataSource source) throws DataSourceException { +// protected SetSeine getEntity(DataService dataService, DataSource source) { // return (SetSeine) dataService.loadEntity(source, id, true); // } 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 2297ba1..2d4fbc6 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 @@ -41,7 +41,7 @@ public class TripLonglineNode extends DtoNodeSupport<TripLonglineDto> { //FIXME // @Override -// protected TripLongline getEntity(DataService dataService, DataSource source) throws DataSourceException { +// protected TripLongline getEntity(DataService dataService, DataSource source) { // return dataService.getTripLonglineStub(source, id); // } 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 ff3e2f7..b18213c 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 @@ -45,7 +45,7 @@ public class TripSeineNode extends DtoNodeSupport<TripSeineDto> { } // @Override -// protected TripSeine getEntity(DataService dataService, DataSource source) throws DataSourceException { +// protected TripSeine getEntity(DataService dataService, DataSource source) { // return dataService.getTripSeineStub(source, id); // } 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 7ac148c..8e8754a 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 @@ -22,7 +22,8 @@ package fr.ird.observe.ui.tree.actions; * #L% */ -import fr.ird.observe.business.db.DataSource; + +import fr.ird.observe.db.ObserveSwingDataSource; import fr.ird.observe.ui.tree.ObserveNode; import fr.ird.observe.ui.tree.ObserveTreeHelper; import org.apache.commons.logging.Log; @@ -51,13 +52,13 @@ public class ChangeTripProgramActionListener implements ActionListener { //FIXME // private final DataService dataService; - private final DataSource dataSource; + private final ObserveSwingDataSource dataSource; public ChangeTripProgramActionListener(ObserveTreeHelper treeHelper, //FIXME // DataService dataService, Object dataService, - DataSource dataSource, + ObserveSwingDataSource dataSource, String tripId, String programId) { this.tripId = tripId; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ActivityLonglineNodeChildLoador.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ActivityLonglineNodeChildLoador.java index c3e45f0..07f9e3d 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ActivityLonglineNodeChildLoador.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ActivityLonglineNodeChildLoador.java @@ -22,7 +22,6 @@ package fr.ird.observe.ui.tree.loadors; * #L% */ -import fr.ird.observe.business.db.DataSourceException; import fr.ird.observe.services.dto.IdDto; import fr.ird.observe.services.dto.ReferenceDto; import fr.ird.observe.services.dto.longline.SetLonglineDto; @@ -91,7 +90,7 @@ public class ActivityLonglineNodeChildLoador extends AbstractNodeChildLoador<IdD @Override public List<ReferenceDto<IdDto>> getData(Class<?> parentClass, String parentId, - NavDataProvider dataService) throws DataSourceException { + NavDataProvider dataService) { //FIXME // List<String> result = new ArrayList<String>(); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/FloatingObjectNodeChildLoador.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/FloatingObjectNodeChildLoador.java index e90bab7..d299ecc 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/FloatingObjectNodeChildLoador.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/FloatingObjectNodeChildLoador.java @@ -21,7 +21,7 @@ */ package fr.ird.observe.ui.tree.loadors; -import fr.ird.observe.business.db.DataSourceException; + import fr.ird.observe.services.dto.IdDto; import fr.ird.observe.services.dto.ReferenceDto; import fr.ird.observe.ui.tree.ObserveNode; @@ -54,7 +54,7 @@ public class FloatingObjectNodeChildLoador extends AbstractNodeChildLoador<IdDto @Override public List<ReferenceDto<IdDto>> getData(Class<?> parentClass, String parentId, - NavDataProvider dataService) throws DataSourceException { + NavDataProvider dataService) { //FIXME // List<String> result = new ArrayList<String>(); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ReferenceCommonNodeChildLoador.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ReferenceCommonNodeChildLoador.java index d4395cc..8517b48 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ReferenceCommonNodeChildLoador.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ReferenceCommonNodeChildLoador.java @@ -21,7 +21,7 @@ */ package fr.ird.observe.ui.tree.loadors; -import fr.ird.observe.business.db.DataSourceException; + import fr.ird.observe.services.dto.IdDto; import fr.ird.observe.services.dto.ReferenceDto; import fr.ird.observe.ui.tree.ObserveNode; @@ -71,7 +71,7 @@ public class ReferenceCommonNodeChildLoador extends AbstractNodeChildLoador<IdDt @Override public List<ReferenceDto<IdDto>> getData(Class<?> parentClass, String parentId, - NavDataProvider dataProvider) throws DataSourceException { + NavDataProvider dataProvider) { //FIXME // List<Class> result = new ArrayList<Class>(); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ReferenceLonglineNodeChildLoador.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ReferenceLonglineNodeChildLoador.java index 244aa7e..e9f15ba 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ReferenceLonglineNodeChildLoador.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ReferenceLonglineNodeChildLoador.java @@ -21,7 +21,7 @@ */ package fr.ird.observe.ui.tree.loadors; -import fr.ird.observe.business.db.DataSourceException; + import fr.ird.observe.services.dto.IdDto; import fr.ird.observe.services.dto.ReferenceDto; import fr.ird.observe.ui.UIHelper; @@ -79,7 +79,7 @@ public class ReferenceLonglineNodeChildLoador extends AbstractNodeChildLoador<Id @Override public List<ReferenceDto<IdDto>> getData(Class<?> parentClass, String parentId, - NavDataProvider dataProvider) throws DataSourceException { + NavDataProvider dataProvider) { List<Class> result = new ArrayList<Class>(); //FIXME diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ReferenceSeineNodeChildLoador.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ReferenceSeineNodeChildLoador.java index 09c1e67..c6a8377 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ReferenceSeineNodeChildLoador.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ReferenceSeineNodeChildLoador.java @@ -21,7 +21,7 @@ */ package fr.ird.observe.ui.tree.loadors; -import fr.ird.observe.business.db.DataSourceException; + import fr.ird.observe.services.dto.IdDto; import fr.ird.observe.services.dto.ReferenceDto; import fr.ird.observe.ui.UIHelper; @@ -71,7 +71,7 @@ public class ReferenceSeineNodeChildLoador extends AbstractNodeChildLoador<IdDto @Override public List<ReferenceDto<IdDto>> getData(Class<?> parentClass, String parentId, - NavDataProvider dataProvider) throws DataSourceException { + NavDataProvider dataProvider) { List<Class> result = new ArrayList<Class>(); //FIXME diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/SetLonglineNodeChildLoador.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/SetLonglineNodeChildLoador.java index b418489..310874e 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/SetLonglineNodeChildLoador.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/SetLonglineNodeChildLoador.java @@ -22,7 +22,7 @@ package fr.ird.observe.ui.tree.loadors; * #L% */ -import fr.ird.observe.business.db.DataSourceException; + import fr.ird.observe.services.dto.IdDto; import fr.ird.observe.services.dto.ReferenceDto; import fr.ird.observe.ui.tree.ObserveNode; @@ -57,7 +57,7 @@ public class SetLonglineNodeChildLoador extends AbstractNodeChildLoador<IdDto> { @Override public List<ReferenceDto<IdDto>> getData(Class<?> parentClass, String parentId, - NavDataProvider dataProvider) throws DataSourceException { + NavDataProvider dataProvider) { // FIXME // List<String> result = new ArrayList<String>(); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/SetSeineNodeChildLoador.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/SetSeineNodeChildLoador.java index 5a3a559..43f4c03 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/SetSeineNodeChildLoador.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/SetSeineNodeChildLoador.java @@ -21,7 +21,7 @@ */ package fr.ird.observe.ui.tree.loadors; -import fr.ird.observe.business.db.DataSourceException; + import fr.ird.observe.services.dto.IdDto; import fr.ird.observe.services.dto.ReferenceDto; import fr.ird.observe.services.dto.seine.SetSeineDto; @@ -63,7 +63,7 @@ public class SetSeineNodeChildLoador extends AbstractNodeChildLoador<IdDto> {//F @Override public List<ReferenceDto<IdDto>> getData(Class<?> parentClass, String parentId, - NavDataProvider dataProvider) throws DataSourceException { + NavDataProvider dataProvider) { List<String> result = new ArrayList<String>(); result.add(SetSeineSchoolEstimateDto.PROPERTY_SCHOOL_ESTIMATE); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/util/tripMap/TripMapUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/util/tripMap/TripMapUIHandler.java index fa442ba..4ddebb8 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/util/tripMap/TripMapUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/util/tripMap/TripMapUIHandler.java @@ -25,7 +25,8 @@ package fr.ird.observe.ui.util.tripMap; import fr.ird.observe.ObserveSwingApplicationContext; import fr.ird.observe.configuration.ObserveSwingApplicationConfig; import fr.ird.observe.business.ObserveTechnicalException; -import fr.ird.observe.business.db.DataSource; + +import fr.ird.observe.db.ObserveSwingDataSource; import fr.ird.observe.entities.tripMap.TripMapPoint; import fr.ird.observe.services.dto.IdDtos; import fr.ird.observe.ui.UIHelper; @@ -107,7 +108,7 @@ public class TripMapUIHandler { //FIXME // public void doOpenMap(DataSource dataSource, DataService dataService, String tripId) { - public void doOpenMap(DataSource dataSource, Object dataService, String tripId) { + public void doOpenMap(ObserveSwingDataSource dataSource, Object dataService, String tripId) { try { ((CardLayout) view.getLayout()).first(view); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch feature/7553 in repository observe. See http://git.codelutin.com/observe.git commit 747f82772531f39baa75bebabfef8bf6d2ff32f0 Author: Kevin Morin <morin@codelutin.com> Date: Thu Oct 1 11:36:57 2015 +0200 chargement des noeuds des routes (refs #7553) --- .../java/fr/ird/observe/ui/DecoratorService.java | 2 ++ .../list/impl/seine/ActivitySeinesUIHandler.java | 2 +- .../fr/ird/observe/ui/tree/DtoNodeSupport.java | 6 ++-- .../fr/ird/observe/ui/tree/RouteSeineNode.java | 21 ++++++++--- .../java/fr/ird/observe/ui/tree/TripSeineNode.java | 8 ----- .../ui/tree/loadors/AbstractNodeChildLoador.java | 17 +-------- .../loadors/AbstractReferenceDtoChildLoador.java | 15 ++++++++ .../loadors/ActivityLonglineNodeChildLoador.java | 11 +++--- .../loadors/ActivityLonglinesNodeChildLoador.java | 2 +- .../tree/loadors/ActivitySeineNodeChildLoador.java | 2 +- .../loadors/ActivitySeinesNodeChildLoador.java | 18 ++++++---- .../loadors/FloatingObjectNodeChildLoador.java | 17 ++++----- .../loadors/ProgramLonglineNodeChildLoador.java | 2 +- .../tree/loadors/ProgramSeineNodeChildLoador.java | 12 +++---- .../loadors/ReferenceCommonNodeChildLoador.java | 42 ++++++++++------------ .../loadors/ReferenceLonglineNodeChildLoador.java | 25 ++++++------- .../loadors/ReferenceSeineNodeChildLoador.java | 26 ++++++-------- .../ui/tree/loadors/RootNodeChildLoador.java | 2 +- .../ui/tree/loadors/RoutesNodeChildLoador.java | 25 ++++++++----- .../tree/loadors/SetLonglineNodeChildLoador.java | 12 +++---- .../ui/tree/loadors/SetSeineNodeChildLoador.java | 16 ++++----- .../v1/seine/ActivitySeineServiceController.java | 9 +++-- .../v1/seine/RouteServiceController.java | 6 ++-- .../service/seine/ActivitySeineService.java | 6 ++-- .../services/service/seine/RouteService.java | 6 ++-- .../service/seine/ActivitySeineServiceTopia.java | 30 +++++++++++----- .../services/service/seine/RouteServiceTopia.java | 24 ++++++++----- 27 files changed, 190 insertions(+), 174 deletions(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/DecoratorService.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/DecoratorService.java index befb2c8..0722641 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/DecoratorService.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/DecoratorService.java @@ -408,10 +408,12 @@ public class DecoratorService extends DecoratorProvider { registerReferenceDtoDecorator(ProgramDto.class, t("observe.common.program") + " ${label}$s"); registerJXPathDecorator(RouteDto.class, "${date}$td/%1$tm/%1$tY"); + registerReferenceDtoDecorator(RouteDto.class, "${date}$td/%1$tm/%1$tY"); registerMultiJXPathDecorator( ActivitySeineDto.class, "${time}$tH:%1$tM##${vesselActivitySeine/" + libelle + "}$s", "##", " - "); + registerReferenceDtoDecorator(ActivitySeineDto.class, "${time}$tH:%1$tM##${vesselActivitySeine/" + libelle + "}$s"); registerMultiJXPathDecorator( ActivityLonglineDto.class, "${timeStamp}$td/%1$tm/%1$tY %1$tH:%1$tM##${vesselActivityLongline/" + libelle + "}$s", 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 5b836c1..f97d10d 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 @@ -113,7 +113,7 @@ public class ActivitySeinesUIHandler extends ContentListUIHandler<RouteDto, Acti //FIXME // DataService dataService = getDataService(); // -// List<ActivitySeine> list = dataService.getActivitySeineStubByRoute(source, bean.getTopiaId()); +// List<ActivitySeine> list = dataService.getActivitySeineByRoute(source, bean.getTopiaId()); // // if (log.isDebugEnabled()) { // log.debug("Will use " + list.size() + " activities."); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/DtoNodeSupport.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/DtoNodeSupport.java index 24189b2..ae5455f 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/DtoNodeSupport.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/DtoNodeSupport.java @@ -56,7 +56,7 @@ public abstract class DtoNodeSupport<E extends IdDto> extends ObserveNode { private boolean reloadEntity; - //FIXME makle abstratc + //FIXME make abstratc protected ReferenceDto<E> fetchEntity() { return null; } @@ -65,11 +65,11 @@ public abstract class DtoNodeSupport<E extends IdDto> extends ObserveNode { this(internalClass, entity, null); } - protected DtoNodeSupport(Class<E> type, ReferenceDto<E> entity, AbstractNodeChildLoador<?> childLoador) { + protected DtoNodeSupport(Class<E> type, ReferenceDto<E> entity, AbstractNodeChildLoador<?, ?> childLoador) { this(type, entity, null, childLoador); } - protected DtoNodeSupport(Class<E> type, ReferenceDto<E> entity, String context, AbstractNodeChildLoador<?> childLoador) { + protected DtoNodeSupport(Class<E> type, ReferenceDto<E> entity, String context, AbstractNodeChildLoador<?, ?> childLoador) { super(type, entity.getId(), context, childLoador, false); setEntity(entity); } 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 83e8a5b..a9e8b74 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,8 +22,13 @@ package fr.ird.observe.ui.tree; * #L% */ +import com.google.common.collect.Lists; +import fr.ird.observe.ObserveSwingApplicationContext; +import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.ReferenceDto; +import fr.ird.observe.services.dto.ReferenceDtos; import fr.ird.observe.services.dto.seine.RouteDto; +import fr.ird.observe.services.service.seine.RouteService; /** * Created on 4/9/15. @@ -39,9 +44,17 @@ public class RouteSeineNode extends DtoNodeSupport<RouteDto> { super(RouteDto.class, entity); } -// @Override -// protected Route getEntity(DataService dataService, DataSource source) { -// return dataService.getRouteStub(source, id); -// } + @Override + protected ReferenceDto<RouteDto> fetchEntity() { + RouteService routeService = ObserveSwingApplicationContext.get().newService(RouteService.class); + FormDto<RouteDto> formDto = routeService.loadToRead(entity.getId()); + ReferenceDto<RouteDto> referenceDto = + ReferenceDtos.newReferenceDto(RouteDto.class, Lists.newArrayList(RouteDto.PROPERTY_ID, + RouteDto.PROPERTY_DATE)); + referenceDto.setPropertyValue(RouteDto.PROPERTY_ID, formDto.getForm().getId()); + referenceDto.setPropertyValue(RouteDto.PROPERTY_DATE, formDto.getForm().getDate()); + + 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 b18213c..787ad27 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 @@ -44,20 +44,12 @@ public class TripSeineNode extends DtoNodeSupport<TripSeineDto> { super(TripSeineDto.class, entity); } -// @Override -// protected TripSeine getEntity(DataService dataService, DataSource source) { -// return dataService.getTripSeineStub(source, id); -// } - @Override protected ReferenceDto<TripSeineDto> fetchEntity() { TripSeineService tripSeineService = ObserveSwingApplicationContext.get().newService(TripSeineService.class); FormDto<TripSeineDto> formDto = tripSeineService.loadToRead(entity.getId()); -// "${startDate}$td/%1$tm/%1$tY##${endDate}$td/%2$tm/%2$tY##${vessel/" -// + libelle + "}$s##${observerLabel}$s" - ReferenceDto<TripSeineDto> referenceDto = ReferenceDtos.newReferenceDto(TripSeineDto.class, Lists.newArrayList(TripSeineDto.PROPERTY_ID, TripSeineDto.PROPERTY_START_DATE, 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 cd8338e..1194c64 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,8 +22,6 @@ package fr.ird.observe.ui.tree.loadors; import fr.ird.observe.db.ObserveSwingDataSource; -import fr.ird.observe.services.dto.IdDto; -import fr.ird.observe.services.dto.ReferenceDto; import fr.ird.observe.ui.tree.ObserveDataProvider; import fr.ird.observe.ui.tree.ObserveNode; import jaxx.runtime.swing.nav.NavDataProvider; @@ -35,7 +33,7 @@ import jaxx.runtime.swing.nav.tree.NavTreeNodeChildLoador; * @author Tony Chemit - chemit@codelutin.com * @since 1.4 */ -public abstract class AbstractNodeChildLoador<O extends IdDto> extends NavTreeNodeChildLoador<ReferenceDto<O>, O, ObserveNode> { +public abstract class AbstractNodeChildLoador<T, O> extends NavTreeNodeChildLoador<T, O, ObserveNode> { private static final long serialVersionUID = 1L; @@ -56,17 +54,4 @@ public abstract class AbstractNodeChildLoador<O extends IdDto> extends NavTreeNo // return result; // } - //FIXME -// protected DataService getDataService() { -// if (dataService == null) { -// dataService = ObserveContext.get().getDataService(); -// } -// return dataService; -// } - - //FIXME -// protected DecoratorService getDecoratorService() { -// return getDataService().getDecoratorService(); -// } - } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/AbstractReferenceDtoChildLoador.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/AbstractReferenceDtoChildLoador.java new file mode 100644 index 0000000..3b22e6b --- /dev/null +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/AbstractReferenceDtoChildLoador.java @@ -0,0 +1,15 @@ +package fr.ird.observe.ui.tree.loadors; + +import fr.ird.observe.services.dto.IdDto; +import fr.ird.observe.services.dto.ReferenceDto; + +/** + * @author Kevin Morin (Code Lutin) + * @since x.x + */ +public abstract class AbstractReferenceDtoChildLoador<O extends IdDto> extends AbstractNodeChildLoador<ReferenceDto<O>, O> { + + protected AbstractReferenceDtoChildLoador(Class<O> beanType) { + super(beanType); + } +} diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ActivityLonglineNodeChildLoador.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ActivityLonglineNodeChildLoador.java index 07f9e3d..47091aa 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ActivityLonglineNodeChildLoador.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ActivityLonglineNodeChildLoador.java @@ -22,7 +22,6 @@ package fr.ird.observe.ui.tree.loadors; * #L% */ -import fr.ird.observe.services.dto.IdDto; import fr.ird.observe.services.dto.ReferenceDto; import fr.ird.observe.services.dto.longline.SetLonglineDto; import fr.ird.observe.ui.tree.ObserveNode; @@ -42,7 +41,7 @@ import static org.nuiton.i18n.I18n.n; * @since 3.7 */ //FIXME -public class ActivityLonglineNodeChildLoador extends AbstractNodeChildLoador<IdDto> {//AbstractNodeChildLoador<String> { +public class ActivityLonglineNodeChildLoador extends AbstractNodeChildLoador<String, String> { private static final long serialVersionUID = 1L; @@ -53,7 +52,7 @@ public class ActivityLonglineNodeChildLoador extends AbstractNodeChildLoador<IdD } public ActivityLonglineNodeChildLoador() { - super(IdDto.class); + super(String.class); } @Override @@ -88,7 +87,7 @@ public class ActivityLonglineNodeChildLoador extends AbstractNodeChildLoador<IdD } @Override - public List<ReferenceDto<IdDto>> getData(Class<?> parentClass, + public List<String> getData(Class<?> parentClass, String parentId, NavDataProvider dataService) { @@ -103,9 +102,9 @@ public class ActivityLonglineNodeChildLoador extends AbstractNodeChildLoador<IdD } @Override - public ObserveNode createNode(ReferenceDto<IdDto> data, NavDataProvider dataProvider) { + public ObserveNode createNode(String data, NavDataProvider dataProvider) { - ObserveNode result = ObserveTreeHelper.createStringNode(null); + ObserveNode result = ObserveTreeHelper.createStringNode(data); return result; } 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 a58c40f..16cdd2a 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 @@ -38,7 +38,7 @@ import java.util.List; * @author Tony Chemit - chemit@codelutin.com * @since 3.7 */ -public class ActivityLonglinesNodeChildLoador extends AbstractNodeChildLoador<ActivityLonglineDto> { +public class ActivityLonglinesNodeChildLoador extends AbstractReferenceDtoChildLoador<ActivityLonglineDto> { private static final long serialVersionUID = 1L; 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 a6f8dfe..8aa8449 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 @@ -44,7 +44,7 @@ import static org.nuiton.i18n.I18n.n; * @author Tony Chemit - chemit@codelutin.com * @since 1.4 */ -public class ActivitySeineNodeChildLoador extends AbstractNodeChildLoador<FloatingObjectDto> { +public class ActivitySeineNodeChildLoador extends AbstractReferenceDtoChildLoador<FloatingObjectDto> { private static final long serialVersionUID = 1L; 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 81720b3..53a7242 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,14 +21,17 @@ */ package fr.ird.observe.ui.tree.loadors; -import fr.ird.observe.db.ObserveSwingDataSource; +import fr.ird.observe.ObserveSwingApplicationContext; import fr.ird.observe.services.dto.ReferenceDto; +import fr.ird.observe.services.dto.ReferenceDtos; +import fr.ird.observe.services.dto.ReferenceSetDto; import fr.ird.observe.services.dto.seine.ActivitySeineDto; +import fr.ird.observe.services.service.seine.ActivitySeineService; import fr.ird.observe.ui.tree.ActivitySeineNode; -import fr.ird.observe.ui.tree.ObserveDataProvider; import fr.ird.observe.ui.tree.ObserveNode; import jaxx.runtime.swing.nav.NavDataProvider; +import java.util.ArrayList; import java.util.List; /** @@ -37,7 +40,7 @@ import java.util.List; * @author Tony Chemit - chemit@codelutin.com * @since 1.4 */ -public class ActivitySeinesNodeChildLoador extends AbstractNodeChildLoador<ActivitySeineDto> { +public class ActivitySeinesNodeChildLoador extends AbstractReferenceDtoChildLoador<ActivitySeineDto> { private static final long serialVersionUID = 1L; @@ -50,11 +53,14 @@ public class ActivitySeinesNodeChildLoador extends AbstractNodeChildLoador<Activ String parentId, NavDataProvider dataProvider) throws Exception { - ObserveSwingDataSource dataSource = ((ObserveDataProvider) dataProvider).getDataSource(); +// ObserveSwingDataSource dataSource = ((ObserveDataProvider) dataProvider).getDataSource(); //FIXME -// List<ActivitySeineDto> data = getDataService().getActivitySeineStubByRoute(dataSource, parentId); +// List<ActivitySeineDto> data = getDataService().getActivitySeineByRoute(dataSource, parentId); // return data; - return null; + ActivitySeineService activitySeineService = ObserveSwingApplicationContext.get().newService(ActivitySeineService.class); + ReferenceSetDto<ActivitySeineDto> activitySeineStubByRoute = activitySeineService.getActivitySeineByRoute(parentId); + + return new ArrayList<>(ReferenceDtos.castToCollectionOfReferenceDto(activitySeineStubByRoute.getReference())); } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/FloatingObjectNodeChildLoador.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/FloatingObjectNodeChildLoador.java index d299ecc..07bfbb1 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/FloatingObjectNodeChildLoador.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/FloatingObjectNodeChildLoador.java @@ -22,9 +22,8 @@ package fr.ird.observe.ui.tree.loadors; -import fr.ird.observe.services.dto.IdDto; -import fr.ird.observe.services.dto.ReferenceDto; import fr.ird.observe.ui.tree.ObserveNode; +import fr.ird.observe.ui.tree.ObserveTreeHelper; import jaxx.runtime.swing.nav.NavDataProvider; import java.util.List; @@ -37,12 +36,12 @@ import static org.nuiton.i18n.I18n.n; * @author Tony Chemit - chemit@codelutin.com * @since 1.4 */ -public class FloatingObjectNodeChildLoador extends AbstractNodeChildLoador<IdDto> {//FIXMEString> { +public class FloatingObjectNodeChildLoador extends AbstractNodeChildLoador<String, String> { private static final long serialVersionUID = 1L; public FloatingObjectNodeChildLoador() { - super(IdDto.class); + super(String.class); } static { @@ -52,7 +51,7 @@ public class FloatingObjectNodeChildLoador extends AbstractNodeChildLoador<IdDto } @Override - public List<ReferenceDto<IdDto>> getData(Class<?> parentClass, + public List<String> getData(Class<?> parentClass, String parentId, NavDataProvider dataService) { @@ -66,12 +65,10 @@ return null; } @Override - public ObserveNode createNode(ReferenceDto<IdDto> data, NavDataProvider dataProvider) { + public ObserveNode createNode(String data, NavDataProvider dataProvider) { - //FIXME -// ObserveNode result = ObserveTreeHelper.createStringNode(data); -// return result; - return null; + ObserveNode result = ObserveTreeHelper.createStringNode(data); + return result; } 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 8b2b865..19856f8 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 @@ -40,7 +40,7 @@ import static org.nuiton.i18n.I18n.n; * @author Tony Chemit - chemit@codelutin.com * @since 3.7 */ -public class ProgramLonglineNodeChildLoador extends AbstractNodeChildLoador<TripLonglineDto> { +public class ProgramLonglineNodeChildLoador extends AbstractReferenceDtoChildLoador<TripLonglineDto> { private static final long serialVersionUID = 1L; 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 8f3f563..6c38c60 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 @@ -29,6 +29,7 @@ import fr.ird.observe.services.dto.ReferenceSetDto; import fr.ird.observe.services.dto.seine.TripSeineDto; import fr.ird.observe.services.service.seine.TripSeineService; import fr.ird.observe.ui.tree.ObserveNode; +import fr.ird.observe.ui.tree.ObserveTreeHelper; import fr.ird.observe.ui.tree.TripSeineNode; import jaxx.runtime.swing.nav.NavDataProvider; import jaxx.runtime.swing.nav.tree.NavTreeBridge; @@ -44,7 +45,7 @@ import static org.nuiton.i18n.I18n.n; * @author Tony Chemit - chemit@codelutin.com * @since 1.4 */ -public class ProgramSeineNodeChildLoador extends AbstractNodeChildLoador<TripSeineDto> { +public class ProgramSeineNodeChildLoador extends AbstractReferenceDtoChildLoador<TripSeineDto> { private static final long serialVersionUID = 1L; @@ -121,15 +122,14 @@ public class ProgramSeineNodeChildLoador extends AbstractNodeChildLoador<TripSei { // Add gears //FIXME -// ObserveNode child = ObserveTreeHelper.createStringNode(TripSeine.PROPERTY_GEAR_USE_FEATURES_SEINE); -// result.add(child); + ObserveNode child = ObserveTreeHelper.createStringNode("gearUseFeaturesSeine"); + result.add(child); } { // Add routes - //FIXME -// ObserveNode child = ObserveTreeHelper.createStringNode(TripSeine.PROPERTY_ROUTE, RoutesNodeChildLoador.class); -// result.add(child); + ObserveNode child = ObserveTreeHelper.createStringNode("route", RoutesNodeChildLoador.class); + result.add(child); } } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ReferenceCommonNodeChildLoador.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ReferenceCommonNodeChildLoador.java index 8517b48..08e9ae1 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ReferenceCommonNodeChildLoador.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ReferenceCommonNodeChildLoador.java @@ -22,11 +22,11 @@ package fr.ird.observe.ui.tree.loadors; -import fr.ird.observe.services.dto.IdDto; -import fr.ird.observe.services.dto.ReferenceDto; +import fr.ird.observe.ui.UIHelper; import fr.ird.observe.ui.tree.ObserveNode; import jaxx.runtime.swing.nav.NavDataProvider; +import java.util.ArrayList; import java.util.List; import static org.nuiton.i18n.I18n.n; @@ -37,7 +37,7 @@ import static org.nuiton.i18n.I18n.n; * @author Tony Chemit - chemit@codelutin.com * @since 1.4 */ -public class ReferenceCommonNodeChildLoador extends AbstractNodeChildLoador<IdDto> {//FIXME Class> { +public class ReferenceCommonNodeChildLoador extends AbstractNodeChildLoador<Class, Class> { private static final long serialVersionUID = 1L; @@ -65,37 +65,33 @@ public class ReferenceCommonNodeChildLoador extends AbstractNodeChildLoador<IdDt } public ReferenceCommonNodeChildLoador() { - super(IdDto.class); + super(Class.class); } @Override - public List<ReferenceDto<IdDto>> getData(Class<?> parentClass, + public List<Class> getData(Class<?> parentClass, String parentId, NavDataProvider dataProvider) { + List<Class> result = new ArrayList<Class>(); //FIXME -// List<Class> result = new ArrayList<Class>(); -// //FIXME -//// for (ObserveEntityEnum anEnum : Entities.REFERENCE_COMMON_ENTITIES_LIST) { -//// result.add(anEnum.getContract()); -//// } -// UIHelper.sortReferentiel(result); -// return result; - return null; +// for (ObserveEntityEnum anEnum : Entities.REFERENCE_COMMON_ENTITIES_LIST) { +// result.add(anEnum.getContract()); +// } + UIHelper.sortReferentiel(result); + return result; } @Override - public ObserveNode createNode(ReferenceDto<IdDto> data, NavDataProvider dataProvider) { + public ObserveNode createNode(Class data, NavDataProvider dataProvider) { //FIXME -// ObserveNode result = new ObserveNode( -// data, -// data.getSimpleName(), -// null, -// true -// ); -// return result; - - return null; + ObserveNode result = new ObserveNode( + data, + data.getSimpleName(), + null, + true + ); + return result; } } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ReferenceLonglineNodeChildLoador.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ReferenceLonglineNodeChildLoador.java index e9f15ba..91c5968 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ReferenceLonglineNodeChildLoador.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ReferenceLonglineNodeChildLoador.java @@ -22,8 +22,6 @@ package fr.ird.observe.ui.tree.loadors; -import fr.ird.observe.services.dto.IdDto; -import fr.ird.observe.services.dto.ReferenceDto; import fr.ird.observe.ui.UIHelper; import fr.ird.observe.ui.tree.ObserveNode; import jaxx.runtime.swing.nav.NavDataProvider; @@ -39,7 +37,7 @@ import static org.nuiton.i18n.I18n.n; * @author Tony Chemit - chemit@codelutin.com * @since 1.4 */ -public class ReferenceLonglineNodeChildLoador extends AbstractNodeChildLoador<IdDto> {//FIXME Class> { +public class ReferenceLonglineNodeChildLoador extends AbstractNodeChildLoador<Class, Class> { private static final long serialVersionUID = 1L; @@ -73,11 +71,11 @@ public class ReferenceLonglineNodeChildLoador extends AbstractNodeChildLoador<Id } public ReferenceLonglineNodeChildLoador() { - super(IdDto.class); + super(Class.class); } @Override - public List<ReferenceDto<IdDto>> getData(Class<?> parentClass, + public List<Class> getData(Class<?> parentClass, String parentId, NavDataProvider dataProvider) { @@ -91,15 +89,14 @@ public class ReferenceLonglineNodeChildLoador extends AbstractNodeChildLoador<Id } @Override - public ObserveNode createNode(ReferenceDto<IdDto> data, NavDataProvider dataProvider) { + public ObserveNode createNode(Class data, NavDataProvider dataProvider) { -// ObserveNode result = new ObserveNode( -// data, -// data.getSimpleName(), -// null, -// true -// ); -// return result; - return null; + ObserveNode result = new ObserveNode( + data, + data.getSimpleName(), + null, + true + ); + return result; } } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ReferenceSeineNodeChildLoador.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ReferenceSeineNodeChildLoador.java index c6a8377..a6a4b8e 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ReferenceSeineNodeChildLoador.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ReferenceSeineNodeChildLoador.java @@ -22,8 +22,6 @@ package fr.ird.observe.ui.tree.loadors; -import fr.ird.observe.services.dto.IdDto; -import fr.ird.observe.services.dto.ReferenceDto; import fr.ird.observe.ui.UIHelper; import fr.ird.observe.ui.tree.ObserveNode; import jaxx.runtime.swing.nav.NavDataProvider; @@ -39,7 +37,7 @@ import static org.nuiton.i18n.I18n.n; * @author Tony Chemit - chemit@codelutin.com * @since 1.4 */ -public class ReferenceSeineNodeChildLoador extends AbstractNodeChildLoador<IdDto> {//FIXME Class> { +public class ReferenceSeineNodeChildLoador extends AbstractNodeChildLoador<Class, Class> { private static final long serialVersionUID = 1L; @@ -65,11 +63,11 @@ public class ReferenceSeineNodeChildLoador extends AbstractNodeChildLoador<IdDto } public ReferenceSeineNodeChildLoador() { - super(IdDto.class); + super(Class.class); } @Override - public List<ReferenceDto<IdDto>> getData(Class<?> parentClass, + public List<Class> getData(Class<?> parentClass, String parentId, NavDataProvider dataProvider) { @@ -84,15 +82,13 @@ public class ReferenceSeineNodeChildLoador extends AbstractNodeChildLoador<IdDto } @Override - public ObserveNode createNode(ReferenceDto<IdDto> data, NavDataProvider dataProvider) { -//FIXME -// ObserveNode result = new ObserveNode( -// data, -// data.getSimpleName(), -// null, -// true -// ); -// return result; - return null; + public ObserveNode createNode(Class data, NavDataProvider dataProvider) { + ObserveNode result = new ObserveNode( + data, + data.getSimpleName(), + null, + true + ); + return result; } } 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 98da3e2..3f3c48c 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 @@ -47,7 +47,7 @@ import static org.nuiton.i18n.I18n.n; * @author Tony Chemit - chemit@codelutin.com * @since 1.4 */ -public class RootNodeChildLoador extends AbstractNodeChildLoador<ProgramDto> { +public class RootNodeChildLoador extends AbstractReferenceDtoChildLoador<ProgramDto> { private static final long serialVersionUID = 1L; 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 d1f8582..ef1f626 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,14 +21,18 @@ */ package fr.ird.observe.ui.tree.loadors; -import fr.ird.observe.db.ObserveSwingDataSource; +import fr.ird.observe.ObserveSwingApplicationContext; import fr.ird.observe.services.dto.ReferenceDto; +import fr.ird.observe.services.dto.ReferenceDtos; +import fr.ird.observe.services.dto.ReferenceSetDto; import fr.ird.observe.services.dto.seine.RouteDto; -import fr.ird.observe.ui.tree.ObserveDataProvider; +import fr.ird.observe.services.service.seine.RouteService; import fr.ird.observe.ui.tree.ObserveNode; +import fr.ird.observe.ui.tree.ObserveTreeHelper; import fr.ird.observe.ui.tree.RouteSeineNode; import jaxx.runtime.swing.nav.NavDataProvider; +import java.util.ArrayList; import java.util.List; import static org.nuiton.i18n.I18n.n; @@ -39,7 +43,7 @@ import static org.nuiton.i18n.I18n.n; * @author Tony Chemit - chemit@codelutin.com * @since 1.4 */ -public class RoutesNodeChildLoador extends AbstractNodeChildLoador<RouteDto> { +public class RoutesNodeChildLoador extends AbstractReferenceDtoChildLoador<RouteDto> { private static final long serialVersionUID = 1L; @@ -56,14 +60,20 @@ public class RoutesNodeChildLoador extends AbstractNodeChildLoador<RouteDto> { String parentId, NavDataProvider dataProvider) throws Exception { - ObserveSwingDataSource dataSource = ((ObserveDataProvider) dataProvider).getDataSource(); +// ObserveSwingDataSource dataSource = ((ObserveDataProvider) dataProvider).getDataSource(); //FIXME // List<RouteDto> data = getDataService().getRouteStubByTrip(dataSource, parentId); // return data; - return null; + + RouteService routeService = ObserveSwingApplicationContext.get().newService(RouteService.class); + ReferenceSetDto<RouteDto> routeByTripSeine = routeService.getRouteByTripSeine(parentId); + + return new ArrayList<>(ReferenceDtos.castToCollectionOfReferenceDto(routeByTripSeine.getReference())); } + + @Override public ObserveNode createNode(ReferenceDto<RouteDto> data, NavDataProvider dataProvider) { @@ -74,9 +84,8 @@ public class RoutesNodeChildLoador extends AbstractNodeChildLoador<RouteDto> { ObserveNode result = new RouteSeineNode(data); // Creation d'un node activites - //FIXME -// ObserveNode child = ObserveTreeHelper.createStringNode(Route.PROPERTY_ACTIVITY_SEINE, ActivitySeinesNodeChildLoador.class); -// result.add(child); + ObserveNode child = ObserveTreeHelper.createStringNode("activitySeine", ActivitySeinesNodeChildLoador.class); + result.add(child); return result; } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/SetLonglineNodeChildLoador.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/SetLonglineNodeChildLoador.java index 310874e..a6b2415 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/SetLonglineNodeChildLoador.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/SetLonglineNodeChildLoador.java @@ -23,8 +23,6 @@ package fr.ird.observe.ui.tree.loadors; */ -import fr.ird.observe.services.dto.IdDto; -import fr.ird.observe.services.dto.ReferenceDto; import fr.ird.observe.ui.tree.ObserveNode; import fr.ird.observe.ui.tree.ObserveTreeHelper; import jaxx.runtime.swing.nav.NavDataProvider; @@ -39,7 +37,7 @@ import static org.nuiton.i18n.I18n.n; * @author Tony Chemit - chemit@codelutin.com * @since 3.7 */ -public class SetLonglineNodeChildLoador extends AbstractNodeChildLoador<IdDto> {//FIXME String> { +public class SetLonglineNodeChildLoador extends AbstractNodeChildLoador<String, String> { private static final long serialVersionUID = 1L; @@ -51,11 +49,11 @@ public class SetLonglineNodeChildLoador extends AbstractNodeChildLoador<IdDto> { } public SetLonglineNodeChildLoador() { - super(IdDto.class); + super(String.class); } @Override - public List<ReferenceDto<IdDto>> getData(Class<?> parentClass, + public List<String> getData(Class<?> parentClass, String parentId, NavDataProvider dataProvider) { @@ -71,9 +69,9 @@ return null; } @Override - public ObserveNode createNode(ReferenceDto<IdDto> data, NavDataProvider dataProvider) { + public ObserveNode createNode(String data, NavDataProvider dataProvider) { - ObserveNode result = ObserveTreeHelper.createStringNode(null); + ObserveNode result = ObserveTreeHelper.createStringNode(data); return result; } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/SetSeineNodeChildLoador.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/SetSeineNodeChildLoador.java index 43f4c03..1378a00 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/SetSeineNodeChildLoador.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/SetSeineNodeChildLoador.java @@ -22,13 +22,12 @@ package fr.ird.observe.ui.tree.loadors; -import fr.ird.observe.services.dto.IdDto; -import fr.ird.observe.services.dto.ReferenceDto; import fr.ird.observe.services.dto.seine.SetSeineDto; import fr.ird.observe.services.dto.seine.SetSeineNonTargetCatchDto; import fr.ird.observe.services.dto.seine.SetSeineSchoolEstimateDto; import fr.ird.observe.services.dto.seine.SetSeineTargetCatchDto; import fr.ird.observe.ui.tree.ObserveNode; +import fr.ird.observe.ui.tree.ObserveTreeHelper; import jaxx.runtime.swing.nav.NavDataProvider; import java.util.ArrayList; @@ -42,7 +41,7 @@ import static org.nuiton.i18n.I18n.n; * @author Tony Chemit - chemit@codelutin.com * @since 1.4 */ -public class SetSeineNodeChildLoador extends AbstractNodeChildLoador<IdDto> {//FIXME String> { +public class SetSeineNodeChildLoador extends AbstractNodeChildLoador<String, String> { private static final long serialVersionUID = 1L; @@ -57,11 +56,11 @@ public class SetSeineNodeChildLoador extends AbstractNodeChildLoador<IdDto> {//F } public SetSeineNodeChildLoador() { - super(IdDto.class); + super(String.class); } @Override - public List<ReferenceDto<IdDto>> getData(Class<?> parentClass, + public List<String> getData(Class<?> parentClass, String parentId, NavDataProvider dataProvider) { @@ -80,10 +79,9 @@ public class SetSeineNodeChildLoador extends AbstractNodeChildLoador<IdDto> {//F } @Override - public ObserveNode createNode(ReferenceDto<IdDto> data, NavDataProvider dataProvider) { + public ObserveNode createNode(String data, NavDataProvider dataProvider) { -// ObserveNode result = ObserveTreeHelper.createStringNode(data); -// return result; -return null; + ObserveNode result = ObserveTreeHelper.createStringNode(data); + return result; } } diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/ActivitySeineServiceController.java b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/ActivitySeineServiceController.java index daec866..e6e2f45 100644 --- a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/ActivitySeineServiceController.java +++ b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/ActivitySeineServiceController.java @@ -24,12 +24,11 @@ package fr.ird.observe.application.web.controller.v1.seine; import fr.ird.observe.application.web.controller.v1.ObserveAuthenticatedServiceControllerSupport; import fr.ird.observe.services.dto.FormDto; +import fr.ird.observe.services.dto.ReferenceDto; +import fr.ird.observe.services.dto.ReferenceSetDto; import fr.ird.observe.services.dto.seine.ActivitySeineDto; -import fr.ird.observe.services.dto.seine.ActivitySeineStubDto; import fr.ird.observe.services.service.seine.ActivitySeineService; -import java.util.List; - /** * @author Sylvain Bavencoff - bavencoff@codelutin.com */ @@ -40,8 +39,8 @@ public class ActivitySeineServiceController extends ObserveAuthenticatedServiceC } @Override - public List<ActivitySeineStubDto> getActivitySeineStubByRoute(String routeId) { - return service.getActivitySeineStubByRoute(routeId); + public ReferenceSetDto<ActivitySeineDto> getActivitySeineByRoute(String routeId) { + return service.getActivitySeineByRoute(routeId); } @Override diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/RouteServiceController.java b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/RouteServiceController.java index 2dee7f3..5695d29 100644 --- a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/RouteServiceController.java +++ b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/RouteServiceController.java @@ -24,12 +24,10 @@ package fr.ird.observe.application.web.controller.v1.seine; import fr.ird.observe.application.web.controller.v1.ObserveAuthenticatedServiceControllerSupport; import fr.ird.observe.services.dto.FormDto; +import fr.ird.observe.services.dto.ReferenceSetDto; import fr.ird.observe.services.dto.seine.RouteDto; -import fr.ird.observe.services.dto.seine.RouteStubDto; import fr.ird.observe.services.service.seine.RouteService; -import java.util.List; - /** * @author Sylvain Bavencoff - bavencoff@codelutin.com */ @@ -40,7 +38,7 @@ public class RouteServiceController extends ObserveAuthenticatedServiceControlle } @Override - public List<RouteStubDto> getRouteByTripSeine(String tripSeineId) { + public ReferenceSetDto<RouteDto> getRouteByTripSeine(String tripSeineId) { return service.getRouteByTripSeine(tripSeineId); } diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/ActivitySeineService.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/ActivitySeineService.java index 161bd55..64e9b3b 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/ActivitySeineService.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/ActivitySeineService.java @@ -24,23 +24,21 @@ package fr.ird.observe.services.service.seine; import fr.ird.observe.services.ObserveService; import fr.ird.observe.services.dto.FormDto; +import fr.ird.observe.services.dto.ReferenceSetDto; import fr.ird.observe.services.dto.seine.ActivitySeineDto; -import fr.ird.observe.services.dto.seine.ActivitySeineStubDto; import fr.ird.observe.services.spi.DeleteRequest; import fr.ird.observe.services.spi.PostRequest; import fr.ird.observe.services.spi.ReadDataPermission; import fr.ird.observe.services.spi.Write; import fr.ird.observe.services.spi.WriteDataPermission; -import java.util.List; - /** * @author Sylvain Bavencoff - bavencoff@codelutin.com */ public interface ActivitySeineService extends ObserveService { @ReadDataPermission - List<ActivitySeineStubDto> getActivitySeineStubByRoute(String routeId); + ReferenceSetDto<ActivitySeineDto> getActivitySeineByRoute(String routeId); @ReadDataPermission FormDto<ActivitySeineDto> loadToRead(String activitySeineId); diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/RouteService.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/RouteService.java index b18b547..267b126 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/RouteService.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/RouteService.java @@ -24,23 +24,21 @@ package fr.ird.observe.services.service.seine; import fr.ird.observe.services.ObserveService; import fr.ird.observe.services.dto.FormDto; +import fr.ird.observe.services.dto.ReferenceSetDto; import fr.ird.observe.services.dto.seine.RouteDto; -import fr.ird.observe.services.dto.seine.RouteStubDto; import fr.ird.observe.services.spi.DeleteRequest; import fr.ird.observe.services.spi.PostRequest; import fr.ird.observe.services.spi.ReadDataPermission; import fr.ird.observe.services.spi.Write; import fr.ird.observe.services.spi.WriteDataPermission; -import java.util.List; - /** * @author Sylvain Bavencoff - bavencoff@codelutin.com */ public interface RouteService extends ObserveService { @ReadDataPermission - List<RouteStubDto> getRouteByTripSeine(String tripSeineId); + ReferenceSetDto<RouteDto> getRouteByTripSeine(String tripSeineId); @ReadDataPermission FormDto<RouteDto> loadToRead(String routeId); diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/ActivitySeineServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/ActivitySeineServiceTopia.java index 2dc4065..f755193 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/ActivitySeineServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/ActivitySeineServiceTopia.java @@ -24,21 +24,25 @@ package fr.ird.observe.services.service.seine; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; +import com.google.common.collect.Sets; import fr.ird.observe.entities.constants.ReferenceLocale; import fr.ird.observe.entities.referentiel.FpaZone; import fr.ird.observe.entities.seine.ActivitySeine; import fr.ird.observe.entities.seine.Route; import fr.ird.observe.services.ObserveServiceTopia; import fr.ird.observe.services.dto.FormDto; +import fr.ird.observe.services.dto.ReferenceDto; +import fr.ird.observe.services.dto.ReferenceDtos; +import fr.ird.observe.services.dto.ReferenceSetDto; +import fr.ird.observe.services.dto.ReferenceSetDtos; import fr.ird.observe.services.dto.seine.ActivitySeineDto; -import fr.ird.observe.services.dto.seine.ActivitySeineStubDto; import fr.ird.observe.services.dto.seine.RouteDto; import fr.ird.observe.services.service.DataNotFoundException; import fr.ird.type.CoordinateHelper; import org.nuiton.util.DateUtil; import java.util.Date; -import java.util.List; +import java.util.LinkedHashSet; /** * @author Sylvain Bavencoff - bavencoff@codelutin.com @@ -47,25 +51,33 @@ public class ActivitySeineServiceTopia extends ObserveServiceTopia implements Ac @Override - public List<ActivitySeineStubDto> getActivitySeineStubByRoute(String routeId) { + public ReferenceSetDto<ActivitySeineDto> getActivitySeineByRoute(String routeId) { ReferenceLocale referenceLocale = getReferenceLocale(); Route route = loadEntity(RouteDto.class, Route.class, routeId); - List<ActivitySeineStubDto> stubs = Lists.newLinkedList(); + LinkedHashSet<ReferenceDto<ActivitySeineDto>> stubs = Sets.newLinkedHashSet(); for (ActivitySeine activitySeine : route.getActivitySeine()) { - ActivitySeineStubDto stub = new ActivitySeineStubDto(); + ReferenceDto<ActivitySeineDto> stub = ReferenceDtos.newReferenceDto(ActivitySeineDto.class, + Lists.newArrayList(ActivitySeineDto.PROPERTY_ID, + ActivitySeineDto.PROPERTY_TIME, + ActivitySeineDto.PROPERTY_VESSEL_ACTIVITY_SEINE, + //FIXME + "hasSetSeine")); stub.setId(activitySeine.getTopiaId()); - stub.setTime(activitySeine.getTime()); - stub.setVesselActivitySeineLabel(referenceLocale.getLabel(activitySeine.getVesselActivitySeine())); - stub.setHasSetSeine(activitySeine.getSetSeine() != null); + stub.setPropertyValue(ActivitySeineDto.PROPERTY_TIME, activitySeine.getTime()); + stub.setPropertyValue(ActivitySeineDto.PROPERTY_VESSEL_ACTIVITY_SEINE, activitySeine.getVesselActivitySeine()); + stub.setPropertyValue("hasSetSeine",activitySeine.getSetSeine() != null); + + stubs.add(stub); } - return stubs; + ReferenceSetDto<ActivitySeineDto> result = ReferenceSetDtos.newReferenceSetDto(ActivitySeineDto.class, stubs, null); + return result; } @Override diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/RouteServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/RouteServiceTopia.java index 6a0833e..85ccf8a 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/RouteServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/RouteServiceTopia.java @@ -24,19 +24,23 @@ package fr.ird.observe.services.service.seine; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; +import com.google.common.collect.Sets; import fr.ird.observe.entities.seine.Route; import fr.ird.observe.entities.seine.TripSeine; import fr.ird.observe.services.ObserveServiceTopia; import fr.ird.observe.services.dto.FormDto; +import fr.ird.observe.services.dto.ReferenceDto; +import fr.ird.observe.services.dto.ReferenceDtos; +import fr.ird.observe.services.dto.ReferenceSetDto; +import fr.ird.observe.services.dto.ReferenceSetDtos; import fr.ird.observe.services.dto.seine.RouteDto; -import fr.ird.observe.services.dto.seine.RouteStubDto; import fr.ird.observe.services.dto.seine.TripSeineDto; import fr.ird.observe.services.service.DataNotFoundException; import org.apache.commons.lang3.time.DateUtils; import org.nuiton.util.DateUtil; import java.util.Date; -import java.util.List; +import java.util.LinkedHashSet; /** * @author Sylvain Bavencoff - bavencoff@codelutin.com @@ -44,23 +48,27 @@ import java.util.List; public class RouteServiceTopia extends ObserveServiceTopia implements RouteService { @Override - public List<RouteStubDto> getRouteByTripSeine(String tripSeineId) { + public ReferenceSetDto<RouteDto> getRouteByTripSeine(String tripSeineId) { TripSeine tripSeine = loadEntity(TripSeineDto.class, TripSeine.class, tripSeineId); - List<RouteStubDto> stubs = Lists.newLinkedList(); + LinkedHashSet<ReferenceDto<RouteDto>> stubs = Sets.newLinkedHashSet(); for (Route route : tripSeine.getRoute()) { - RouteStubDto stub = new RouteStubDto(); - stub.setId(route.getTopiaId()); - stub.setDate(route.getDate()); + ReferenceDto<RouteDto> stub = ReferenceDtos.newReferenceDto(RouteDto.class, + Lists.newArrayList(RouteDto.PROPERTY_ID, + RouteDto.PROPERTY_DATE)); + stub.setId(tripSeine.getTopiaId()); + stub.setPropertyValue(RouteDto.PROPERTY_DATE, route.getDate()); stubs.add(stub); } - return stubs; + ReferenceSetDto<RouteDto> result = ReferenceSetDtos.newReferenceSetDto(RouteDto.class, stubs, null); + + return result; } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch feature/7553 in repository observe. See http://git.codelutin.com/observe.git commit 53e2380e107c76d5e045cd24f37a7ad3d8fe7879 Author: Kevin Morin <morin@codelutin.com> Date: Thu Oct 1 15:25:50 2015 +0200 affichage des icones des noeuds (refs #7553) --- .../src/main/filters/observe-ui.properties | 72 +-- .../business/db/model/DataSelectionModel.java | 482 +++++++++++++++++++++ .../ui/storage/tabs/StorageTabUIHandler.java | 4 +- .../ui/tree/AbstractObserveTreeCellRenderer.java | 12 +- .../fr/ird/observe/ui/tree/DtoNodeSupport.java | 7 +- .../ird/observe/ui/tree/ObserveDataProvider.java | 24 +- .../fr/ird/observe/ui/tree/ObserveTreeHelper.java | 13 +- .../ui/tree/loadors/AbstractNodeChildLoador.java | 12 +- 8 files changed, 551 insertions(+), 75 deletions(-) diff --git a/observe-application-swing/src/main/filters/observe-ui.properties b/observe-application-swing/src/main/filters/observe-ui.properties index 7a0608a..aaa1d4d 100644 --- a/observe-application-swing/src/main/filters/observe-ui.properties +++ b/observe-application-swing/src/main/filters/observe-ui.properties @@ -25,48 +25,48 @@ icon.navigation.referentiel=navigation/ird/referentiel24.png icon.navigation.sub.referentiel=navigation/ird/sub_referentiel16.png -icon.navigation.fr.ird.observe.entities.referentiel.Program=navigation/ird/program24.png - -icon.navigation.fr.ird.observe.entities.seine.TripSeine=navigation/ird/trip24.png -icon.navigation.fr.ird.observe.entities.seine.Route=navigation/ird/route24.png -icon.navigation.fr.ird.observe.entities.seine.ActivitySeine=navigation/ird/activity24.png -icon.navigation.fr.ird.observe.entities.seine.ActivitySeine.sub=navigation/ird/observedSystem24.png -icon.navigation.fr.ird.observe.entities.seine.FloatingObject=navigation/ird/floatingObject24.png -icon.navigation.fr.ird.observe.entities.seine.FloatingObject.sub=navigation/ird/sub_floatingObject16.png -icon.navigation.fr.ird.observe.entities.seine.SetSeine=navigation/ird/set24.png -icon.navigation.fr.ird.observe.entities.seine.SetSeine.sub=navigation/ird/sub_set16.png - -icon.navigation.fr.ird.observe.entities.Trip=navigation/ird/trip24.png -icon.navigation.fr.ird.observe.entities.Activity=navigation/ird/activity24.png -icon.navigation.fr.ird.observe.entities.Set=navigation/ird/set24.png - -icon.navigation.fr.ird.observe.entities.longline.TripLongline=navigation/ird/trip24.png -icon.navigation.fr.ird.observe.entities.longline.ActivityLongline=navigation/ird/route24.png -icon.navigation.fr.ird.observe.entities.longline.ActivityLongline.sub=navigation/ird/observedSystem24.png -icon.navigation.fr.ird.observe.entities.longline.SetLongline=navigation/ird/set24.png -icon.navigation.fr.ird.observe.entities.longline.SetLongline.sub=navigation/ird/sub_set16.png -icon.navigation.fr.ird.observe.entities.longline.CatchLongline=navigation/ird/floatingObject24.png -icon.navigation.fr.ird.observe.entities.longline.CatchLongline.sub=navigation/ird/sub_floatingObject16.png -icon.navigation.fr.ird.observe.entities.longline.Tdr=navigation/ird/floatingObject24.png -icon.navigation.fr.ird.observe.entities.longline.Tdr.sub=navigation/ird/sub_floatingObject16.png +icon.navigation.fr.ird.observe.services.dto.referential.ProgramDto=navigation/ird/program24.png + +icon.navigation.fr.ird.observe.services.dto.seine.TripSeineDto=navigation/ird/trip24.png +icon.navigation.fr.ird.observe.services.dto.seine.RouteDto=navigation/ird/route24.png +icon.navigation.fr.ird.observe.services.dto.seine.ActivitySeineDto=navigation/ird/activity24.png +icon.navigation.fr.ird.observe.services.dto.seine.ActivitySeineDto.sub=navigation/ird/observedSystem24.png +icon.navigation.fr.ird.observe.services.dto.seine.FloatingObjectDto=navigation/ird/floatingObject24.png +icon.navigation.fr.ird.observe.services.dto.seine.FloatingObjectDto.sub=navigation/ird/sub_floatingObject16.png +icon.navigation.fr.ird.observe.services.dto.seine.SetSeineDto=navigation/ird/set24.png +icon.navigation.fr.ird.observe.services.dto.seine.SetSeineDto.sub=navigation/ird/sub_set16.png + +icon.navigation.fr.ird.observe.services.dto.TripDto=navigation/ird/trip24.png +icon.navigation.fr.ird.observe.services.dto.ActivityDto=navigation/ird/activity24.png +icon.navigation.fr.ird.observe.services.dto.SetDto=navigation/ird/set24.png + +icon.navigation.fr.ird.observe.services.dto.longline.TripLonglineDto=navigation/ird/trip24.png +icon.navigation.fr.ird.observe.services.dto.longline.ActivityLonglineDto=navigation/ird/route24.png +icon.navigation.fr.ird.observe.services.dto.longline.ActivityLonglineDto.sub=navigation/ird/observedSystem24.png +icon.navigation.fr.ird.observe.services.dto.longline.SetLonglineDto=navigation/ird/set24.png +icon.navigation.fr.ird.observe.services.dto.longline.SetLonglineDto.sub=navigation/ird/sub_set16.png +icon.navigation.fr.ird.observe.services.dto.longline.CatchLonglineDto=navigation/ird/floatingObject24.png +icon.navigation.fr.ird.observe.services.dto.longline.CatchLonglineDto.sub=navigation/ird/sub_floatingObject16.png +icon.navigation.fr.ird.observe.services.dto.longline.TdrDto=navigation/ird/floatingObject24.png +icon.navigation.fr.ird.observe.services.dto.longline.TdrDto.sub=navigation/ird/sub_floatingObject16.png icon.navigation.referentiel-16=navigation/ird/referentiel16.png icon.navigation.sub.referentiel-16=navigation/ird/sub_referentiel16.png -icon.navigation.fr.ird.observe.entities.referentiel.Program-16=navigation/ird/program16.png +icon.navigation.fr.ird.observe.services.dto.referential.ProgramDto-16=navigation/ird/program16.png -icon.navigation.fr.ird.observe.entities.seine.TripSeine-16=navigation/ird/trip16.png -icon.navigation.fr.ird.observe.entities.seine.Route-16=navigation/ird/route16.png -icon.navigation.fr.ird.observe.entities.seine.ActivitySeine-16=navigation/ird/activity16.png -icon.navigation.fr.ird.observe.entities.seine.ActivitySeine.sub-16=navigation/ird/observedSystem16.png -icon.navigation.fr.ird.observe.entities.seine.FloatingObject-16=navigation/ird/floatingObject16.png -icon.navigation.fr.ird.observe.entities.seine.SetSeine-16=navigation/ird/set16.png +icon.navigation.fr.ird.observe.services.dto.seine.TripSeineDto-16=navigation/ird/trip16.png +icon.navigation.fr.ird.observe.services.dto.seine.RouteDto-16=navigation/ird/route16.png +icon.navigation.fr.ird.observe.services.dto.seine.ActivitySeineDto-16=navigation/ird/activity16.png +icon.navigation.fr.ird.observe.services.dto.seine.ActivitySeineDto.sub-16=navigation/ird/observedSystem16.png +icon.navigation.fr.ird.observe.services.dto.seine.FloatingObjecDtot-16=navigation/ird/floatingObject16.png +icon.navigation.fr.ird.observe.services.dto.seine.SetSeineDto-16=navigation/ird/set16.png -icon.navigation.fr.ird.observe.entities.longline.TripLongline-16=navigation/ird/trip16.png -icon.navigation.fr.ird.observe.entities.longline.ActivityLongline-16=navigation/ird/route16.png -icon.navigation.fr.ird.observe.entities.longline.SetLongline-16=navigation/ird/set16.png -icon.navigation.fr.ird.observe.entities.longline.CatchLongline-16=navigation/ird/floatingObject16.png -icon.navigation.fr.ird.observe.entities.longline.Tdr-16=navigation/ird/floatingObject16.png +icon.navigation.fr.ird.observe.services.dto.longline.TripLonglineDto-16=navigation/ird/trip16.png +icon.navigation.fr.ird.observe.services.dto.longline.ActivityLonglineDto-16=navigation/ird/route16.png +icon.navigation.fr.ird.observe.services.dto.longline.SetLonglineDto-16=navigation/ird/set16.png +icon.navigation.fr.ird.observe.services.dto.longline.CatchLonglineDto-16=navigation/ird/floatingObject16.png +icon.navigation.fr.ird.observe.services.dto.longline.TdrDto-16=navigation/ird/floatingObject16.png # icones d'action sur les editeurs numeriques #icon.action.numbereditor-showpopup=action-numbereditor-showpopup.png diff --git a/observe-application-swing/src/main/java/fr/ird/observe/business/db/model/DataSelectionModel.java b/observe-application-swing/src/main/java/fr/ird/observe/business/db/model/DataSelectionModel.java new file mode 100644 index 0000000..f51b7f8 --- /dev/null +++ b/observe-application-swing/src/main/java/fr/ird/observe/business/db/model/DataSelectionModel.java @@ -0,0 +1,482 @@ +package fr.ird.observe.business.db.model; + +/** + * @author Kevin Morin (Code Lutin) + * @since x.x + */ + +import fr.ird.observe.services.dto.ReferenceDto; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +import java.beans.PropertyChangeListener; +import java.beans.PropertyChangeSupport; +import java.io.Serializable; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.TreeMap; + +/** + * Un modèle pour représenter la sélection de données. + * + * @author Tony Chemit - chemit@codelutin.com + * @since 1.4 + */ +public class DataSelectionModel implements Serializable { + +// public static void populate(DataSelectionModel model, +// ObserveSwingDataSource source) throws Exception { +// +// Preconditions.checkState(source.isOpen()); +// +// Map<String, List<String>> datas = new HashMap<String, List<String>>(); +// +// List<ProgramDto> programs = service.getAllProgramStub(source); +// for (Program program : programs) { +// +// if (Programs.isProgramSeine(program)) { +// List<TripSeine> trips = service.getTripSeineStubByProgram(source, program.getTopiaId()); +// populate(model, program, trips, datas); +// } +// +// if (Programs.isProgramLongline(program)) { +// List<TripLongline> trips = service.getTripLonglineStubByProgram(source, program.getTopiaId()); +// populate(model, program, trips, datas); +// } +// +// } +// model.setDatas(datas); +// +// } + +// protected static <T extends Trip> void populate(DataSelectionModel model, +// Program program, +// List<T> trips, +// Map<String, List<String>> datas) { +// +// model.cacheEntity(program); +// +// if (!trips.isEmpty()) { +// List<String> tripIds = new ArrayList<String>(); +// +// if (model.isUseOpenData()) { +// +// // ajout de toutes les marées ouvertes ou non +// for (T trip : trips) { +// trip.setProgram(program); +// model.cacheEntity(trip); +// tripIds.add(trip.getTopiaId()); +// } +// +// } else { +// +// // ajout de toutes les marées non ouvertes +// for (T trip : trips) { +// trip.setProgram(program); +// if (!trip.isOpen()) { +// model.cacheEntity(trip); +// tripIds.add(trip.getTopiaId()); +// } +// } +// +// } +// +// if (!tripIds.isEmpty()) { +// +// datas.put(program.getTopiaId(), tripIds); +// if (log.isDebugEnabled()) { +// log.debug("Add program " + program.getLabel1() + " with " + tripIds.size() + " trip(s)."); +// } +// +// } +// +// } +// +// } + + public static final String PROPERTY_USE_REFERENTIEL = "useReferentiel"; + + public static final String PROPERTY_USE_DATA = "useData"; + + public static final String PROPERTY_USE_OPEN_DATA = "useOpenData"; + + public static final String PROPERTY_SELECTED_DATA = "selectedData"; + + public static final String PROPERTY_SELECTED_REFERENTIEL = "selectedReferentiel"; + + public static final String PROPERTY_DATAS = "datas"; + + /** Logger */ + private static final Log log = LogFactory.getLog(DataSelectionModel.class); + + private static final long serialVersionUID = 2L; + + /** un drapeau pour selectionner ou non les donnees observers */ + protected boolean useData; + + /** un drapeau pour selectionner ou non des donnees observers ouvertes */ + protected boolean useOpenData; + + /** un drapeau pour selectionner ou non des donnees observer */ + protected boolean useReferentiel; + + /** la liste des programs utilisables (qui ont des marees) */ + protected transient Map<String, List<String>> datas; + + /** + * Le cache des entités chargées pour construire le modèle de sélection. + * + * Ces entités pourront ensuite être injectées dans les noeuds sans avoir à les recharger. + * + * @since 4.0 + */ + protected final Map<String, ReferenceDto> entityCache; + + /** la liste des marees selectionnee */ + protected transient Set<String> selectedData; + + /** la liste des referentiels possibles */ + protected final Set<Class<?>> referentiel; + + /** la liste des referentiels selectionnes */ + protected final Set<Class<?>> selectedReferentiel; + + /** nb marees */ + protected int nbTrips; + + /** nb referentiels */ + protected final int nbReferentiels; + + protected final PropertyChangeSupport pcs; + + public void populate() throws Exception { + throw new UnsupportedOperationException(); + } + + public DataSelectionModel() { + pcs = new PropertyChangeSupport(this); + //FIXME +// Class<?>[] classes = TopiaEntityHelper.getContracts(Entities.REFERENCE_ENTITIES); +// List<Class<?>> list = Arrays.asList(classes); +// referentiel = new HashSet<Class<?>>(list); + referentiel = new HashSet<Class<?>>(); + selectedReferentiel = new HashSet<Class<?>>(); + nbReferentiels = referentiel.size(); + entityCache = new TreeMap<String, ReferenceDto>(); + } + + public boolean isUseReferentiel() { + return useReferentiel; + } + + public boolean isUseData() { + return useData; + } + + public boolean isUseOpenData() { + return useOpenData; + } + + public boolean isEmpty() { + if (isUseReferentiel()) { + if (!isReferentielEmpty()) { + return false; + } + } + if (isUseData()) { + if (!isDataEmpty()) { + return false; + } + } + return true; + } + + protected void cacheEntity(ReferenceDto entity) { + entityCache.put(entity.getId(), entity); + } + + public ReferenceDto getEntityCache(String id) { + return entityCache.get(id); + } + + public boolean isReferentielEmpty() { + return selectedReferentiel.isEmpty(); + } + +// public boolean isReferentielFull() { +// return selectedReferentiel.size() == nbReferentiels; +// } + + public boolean isDataEmpty() { + return selectedData == null || selectedData.isEmpty(); + } + +// public boolean isDataFull() { +// return selectedData != null && selectedData.size() == nbTrips; +// } + + public Set<Class<?>> getSelectedReferentiel() { + return selectedReferentiel; + } + +// public Map<String, List<String>> getDatas() { +// if (datas == null) { +// datas = new HashMap<String, List<String>>(); +// } +// return datas; +// } + + public Set<String> getSelectedData() { + if (selectedData == null) { + selectedData = new HashSet<String>(); + } + return selectedData; + } + +// public Map<String, List<String>> getSelectedDataByProgram() { +// if (datas == null || selectedData == null || selectedData.isEmpty()) { +// return Collections.emptyMap(); +// } +// Map<String, List<String>> result = +// new HashMap<String, List<String>>(datas.size()); +// +// for (String m : selectedData) { +// +// // on recherche son program +// for (String p : datas.keySet()) { +// if (datas.get(p).contains(m)) { +// List<String> trips = result.get(p); +// if (trips == null) { +// trips = new ArrayList<String>(); +// result.put(p, trips); +// } +// trips.add(m); +// break; +// } +// } +// } +// return result; +// } +// +// public boolean isSelectedData(String id) { +// +// if (Trips.isTripId(id)) { +// +// // recherche directe sur les ids de marees +// return getSelectedData().contains(id); +// } +// +// if (id.startsWith(Program.class.getName())) { +// // on doit verifier que toutes les marees du program sont sélectionnées +// List<String> tripIds = datas.get(id); +// if (CollectionUtils.isEmpty(tripIds)) { +// +// // pas de marées +// return false; +// } +// +// for (String tripId : tripIds) { +// if (!isSelectedData(tripId)) { +// +// // au moins une marée non sélectionnée +// +// return false; +// } +// } +// +// // toutes les marées sont sélectionnée +// return true; +// } +// +// // ne devrait pas arrivée +// return false; +// +// } +// +// public boolean isSelectedReferentiel(Class<?> type) { +// checkReferentielType(type); +// return getSelectedReferentiel().contains(type); +// } +// +// public void setUseReferentiel(boolean useReferentiel) { +// this.useReferentiel = useReferentiel; +// firePropertyChange(PROPERTY_USE_REFERENTIEL, useReferentiel); +// } +// +// public void setUseData(boolean useData) { +// this.useData = useData; +// firePropertyChange(PROPERTY_USE_DATA, useData); +// } +// +// public void setUseOpenData(boolean useOpenData) { +// this.useOpenData = useOpenData; +// firePropertyChange(PROPERTY_USE_OPEN_DATA, useOpenData); +// } +// +// public void addSelectedReferentiel(Class<?> type) { +// checkReferentielType(type); +// if (log.isDebugEnabled()) { +// log.debug("Add referentiel type " + type); +// } +// getSelectedReferentiel().add(type); +// firePropertyChange(PROPERTY_SELECTED_REFERENTIEL, selectedReferentiel); +// } +// +// public void addAllSelectedReferentiel() { +// getSelectedReferentiel().addAll(referentiel); +// firePropertyChange(PROPERTY_SELECTED_REFERENTIEL, selectedReferentiel); +// } +// +// public void removeSelectedReferentiel(Class<?> type) { +// checkReferentielType(type); +// if (log.isDebugEnabled()) { +// log.debug("remove referentiel type " + type); +// } +// getSelectedReferentiel().remove(type); +// firePropertyChange(PROPERTY_SELECTED_REFERENTIEL, selectedReferentiel); +// } + + public void removeAll() { + getSelectedReferentiel().clear(); + getSelectedData().clear(); + firePropertyChange(PROPERTY_SELECTED_REFERENTIEL, selectedReferentiel); + firePropertyChange(PROPERTY_SELECTED_DATA, selectedData); + } + +// public void removeAllSelectedReferentiel() { +// getSelectedReferentiel().clear(); +// firePropertyChange(PROPERTY_SELECTED_REFERENTIEL, selectedReferentiel); +// } +// +// public void setDatas(Map<String, List<String>> datas) { +// this.datas = datas; +// +// // on compte le count de marées totale +// int nbTrips = 0; +// if (datas != null) { +// for (List<String> marees : datas.values()) { +// nbTrips += marees.size(); +// } +// } +// this.nbTrips = nbTrips; +// +// if (log.isDebugEnabled()) { +// log.debug("Nb program registred : " + (datas == null ? 0 : datas.size())); +// log.debug("Nb trip registred : " + this.nbTrips); +// } +// firePropertyChange(PROPERTY_DATAS, datas); +// } +// +// public void addSelectedData(String id) { +// +// if (Trips.isTripId(id)) { +// +// // ajout d'une marée +// if (log.isDebugEnabled()) { +// log.debug("Add Trip " + id); +// } +// getSelectedData().add(id); +// } else if (id.startsWith(Program.class.getName())) { +// +// // ajout de toutes les marées du program +// +// if (log.isDebugEnabled()) { +// log.debug("Add all trips of program " + id); +// } +// getSelectedData().addAll(datas.get(id)); +// } +// +// +// firePropertyChange(PROPERTY_SELECTED_DATA, selectedData); +// } +// +// public void addAllSelectedData() { +// if (log.isDebugEnabled()) { +// log.debug("All all data."); +// } +// for (List<String> p : datas.values()) { +// getSelectedData().addAll(p); +// } +// firePropertyChange(PROPERTY_SELECTED_DATA, selectedData); +// } +// +// public void removeSelectedData(String id) { +// if (Trips.isTripId(id)) { +// +// // ajout d'une marée +// if (log.isDebugEnabled()) { +// log.debug("Remove maree " + id); +// } +// getSelectedData().remove(id); +// } else if (id.startsWith(Program.class.getName())) { +// +// // ajout de toutes les marées du program +// +// if (log.isDebugEnabled()) { +// log.debug("Remove all marees of program " + id); +// } +// getSelectedData().removeAll(datas.get(id)); +// } +// firePropertyChange(PROPERTY_SELECTED_DATA, selectedData); +// } +// +// public void removeAllSelectedData() { +// if (selectedData != null) { +// selectedData.clear(); +// } +// firePropertyChange(PROPERTY_SELECTED_DATA, selectedData); +// } + + public void addPropertyChangeListener(PropertyChangeListener listener) { + pcs.addPropertyChangeListener(listener); + } + + public void addPropertyChangeListener(String propertyName, + PropertyChangeListener listener) { + pcs.addPropertyChangeListener(propertyName, listener); + } + + public void removePropertyChangeListener(PropertyChangeListener listener) { + pcs.removePropertyChangeListener(listener); + } + + public void removePropertyChangeListener(String propertyName, + PropertyChangeListener listener) { + pcs.removePropertyChangeListener(propertyName, listener); + } + + protected void firePropertyChange(String propertyName, Object newValue) { + pcs.firePropertyChange(propertyName, null, newValue); + } + + protected void firePropertyChange(String propertyName, + Object oldValue, + Object newValue) { + pcs.firePropertyChange(propertyName, oldValue, newValue); + } + +// protected void checkReferentielType(Class<?> type) { +// if (!referentiel.contains(type)) { +// throw new IllegalArgumentException( +// "given <" + type + "> is not in referentiel universe : " + +// referentiel); +// } +// } + + public void destroy() { + removeAll(); + // suppression de tous les listeners + PropertyChangeListener[] listeners = pcs.getPropertyChangeListeners(); + for (PropertyChangeListener l : listeners) { + removePropertyChangeListener(l); + } + } + + @Override + protected void finalize() throws Throwable { + super.finalize(); + destroy(); + } +} diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/tabs/StorageTabUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/tabs/StorageTabUIHandler.java index 7dfa946..699e79d 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/tabs/StorageTabUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/tabs/StorageTabUIHandler.java @@ -412,8 +412,8 @@ public class StorageTabUIHandler { JTree tree = ui.selectTree; helper.setUI(tree, false, null); - - tree.setModel(helper.createModel(ui, dataModel, source)); +//FIXME +// tree.setModel(helper.createModel(ui, dataModel, source)); DataSelectionTreeSelectionModel selectionModel = ui.getSelectionModel(); selectionModel.initUI(tree); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/AbstractObserveTreeCellRenderer.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/AbstractObserveTreeCellRenderer.java index eefe5e3..1ce8320 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/AbstractObserveTreeCellRenderer.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/AbstractObserveTreeCellRenderer.java @@ -23,6 +23,7 @@ package fr.ird.observe.ui.tree; import com.google.common.base.Preconditions; import fr.ird.observe.ObserveSwingApplicationContext; +import fr.ird.observe.db.ObserveSwingDataSource; import fr.ird.observe.services.dto.ReferenceDto; import fr.ird.observe.ui.DecoratorService; import fr.ird.observe.business.db.DataContext; @@ -110,12 +111,11 @@ public abstract class AbstractObserveTreeCellRenderer extends AbstractNavTreeCel ObserveDataProvider provider = (ObserveDataProvider) super.getDataProvider(); if (provider == null) { - // FIXME -// DataSource source = ObserveSwingApplicationContext.get().getDataSource(); -// if (source != null) { -// provider = new ObserveDataProvider(source); -// setDataProvider(provider); -// } + ObserveSwingDataSource source = ObserveSwingApplicationContext.get().getDataSource(); + if (source != null) { + provider = new ObserveDataProvider(source); + setDataProvider(provider); + } } return provider; } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/DtoNodeSupport.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/DtoNodeSupport.java index ae5455f..a8eb79e 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/DtoNodeSupport.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/DtoNodeSupport.java @@ -129,14 +129,13 @@ public abstract class DtoNodeSupport<E extends IdDto> extends ObserveNode { protected void loadEntity(ObserveDataProvider oProvider) { //FIXME -// if (oProvider.getSelectionModel() != null) { + if (oProvider.getSelectionModel() != null) { if (log.isDebugEnabled()) { log.debug("try to get entity from selectionModel " + internalClass + " : " + id); } - //FIXME -// entity = (E) oProvider.getSelectionModel().getEntityCache(id); -// } + entity = (ReferenceDto<E>) oProvider.getSelectionModel().getEntityCache(id); + } if (entity == null) { diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/ObserveDataProvider.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/ObserveDataProvider.java index a078a82..96d76f2 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/ObserveDataProvider.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/ObserveDataProvider.java @@ -21,6 +21,7 @@ */ package fr.ird.observe.ui.tree; +import fr.ird.observe.business.db.model.DataSelectionModel; import fr.ird.observe.db.ObserveSwingDataSource; import jaxx.runtime.swing.nav.NavDataProvider; import org.apache.commons.logging.Log; @@ -42,8 +43,7 @@ public class ObserveDataProvider implements NavDataProvider { //FIXME // protected DataService dataService; - //FIXME -// protected DataSelectionModel selectionModel; + protected DataSelectionModel selectionModel; private boolean creating; @@ -55,13 +55,12 @@ public class ObserveDataProvider implements NavDataProvider { this.dataSource = dataSource; } - //FIXME -// public void setSelectionModel(DataSelectionModel selectionModel) { -// if (log.isDebugEnabled()) { -// log.debug("Set selection model : " + selectionModel); -// } -// this.selectionModel = selectionModel; -// } + public void setSelectionModel(DataSelectionModel selectionModel) { + if (log.isDebugEnabled()) { + log.debug("Set selection model : " + selectionModel); + } + this.selectionModel = selectionModel; + } @Override public boolean isEnabled() { @@ -73,10 +72,9 @@ public class ObserveDataProvider implements NavDataProvider { return dataSource; } - //FIXME -// public DataSelectionModel getSelectionModel() { -// return selectionModel; -// } + public DataSelectionModel getSelectionModel() { + return selectionModel; + } //FIXME // protected DataService getDataService() { diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/ObserveTreeHelper.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/ObserveTreeHelper.java index 671fb09..955bb95 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/ObserveTreeHelper.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/ObserveTreeHelper.java @@ -24,6 +24,7 @@ package fr.ird.observe.ui.tree; import com.google.common.base.Preconditions; import fr.ird.observe.ObserveSwingApplicationContext; import fr.ird.observe.business.db.DataContext; +import fr.ird.observe.business.db.model.DataSelectionModel; import fr.ird.observe.db.ObserveSwingDataSource; import fr.ird.observe.services.dto.ReferenceDto; import fr.ird.observe.services.dto.ReferenceSetDto; @@ -172,9 +173,7 @@ public class ObserveTreeHelper extends NavTreeHelper<ObserveNode> { } public DefaultTreeModel createModel(JAXXContext context, - //FIXME -// DataSelectionModel dataModel, - Object dataModel, + DataSelectionModel dataModel, ObserveSwingDataSource source) { setDataSource(source); @@ -185,16 +184,14 @@ public class ObserveTreeHelper extends NavTreeHelper<ObserveNode> { } ObserveDataProvider provider = getDataProvider(); - //FIXME -// provider.setSelectionModel(dataModel); + provider.setSelectionModel(dataModel); provider.setCreating(true); try { RootNodeChildLoador loador = getChildLoador(RootNodeChildLoador.class); - //FIXME -// loador.setAddData(dataModel.isUseData()); -// loador.setAddReferentiel(dataModel.isUseReferentiel()); + loador.setAddData(dataModel.isUseData()); + loador.setAddReferentiel(dataModel.isUseReferentiel()); ObserveNode node = new ObserveNode(String.class, "Root node", loador, false); DefaultTreeModel model = createModel(node); 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 1194c64..a508056 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 @@ -21,6 +21,7 @@ */ package fr.ird.observe.ui.tree.loadors; +import fr.ird.observe.business.db.model.DataSelectionModel; import fr.ird.observe.db.ObserveSwingDataSource; import fr.ird.observe.ui.tree.ObserveDataProvider; import fr.ird.observe.ui.tree.ObserveNode; @@ -47,11 +48,10 @@ public abstract class AbstractNodeChildLoador<T, O> extends NavTreeNodeChildLoad return result; } - //FIXME -// protected DataSelectionModel getSelectionModel(NavDataProvider dataProvider) { -// ObserveDataProvider provider = (ObserveDataProvider) dataProvider; -// DataSelectionModel result = provider.getSelectionModel(); -// return result; -// } + protected DataSelectionModel getSelectionModel(NavDataProvider dataProvider) { + ObserveDataProvider provider = (ObserveDataProvider) dataProvider; + DataSelectionModel result = provider.getSelectionModel(); + return result; + } } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
participants (1)
-
codelutin.com scm