Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: ab383dfb by Tony CHEMIT at 2017-08-04T13:41:17+02:00 L'accès aux écrans PS targetSample conservés et targetSample rejetés (See #827) - - - - - 36e81ad3 by Tony CHEMIT at 2017-08-04T13:41:44+02:00 Amélioration API ContentHandler - - - - - 8 changed files: - client/src/main/java/fr/ird/observe/client/ui/content/ContentUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/open/impl/seine/ActivitySeineUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/ref/ContentReferenceUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/table/impl/longline/CatchLonglineUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/table/impl/longline/GearUseFeaturesLonglineUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/table/impl/seine/GearUseFeaturesSeineUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/table/impl/seine/TargetSampleUIHandler.java - services/src/main/java/fr/ird/observe/services/dto/referential/SizeMeasureTypeHelper.java Changes: ===================================== client/src/main/java/fr/ird/observe/client/ui/content/ContentUIHandler.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/ContentUIHandler.java +++ b/client/src/main/java/fr/ird/observe/client/ui/content/ContentUIHandler.java @@ -49,7 +49,6 @@ import fr.ird.observe.services.dto.form.Form; import fr.ird.observe.services.dto.form.FormRequestDefinition; import fr.ird.observe.services.dto.form.FormRequestKeyDefinition; import fr.ird.observe.services.dto.reference.DataReference; -import fr.ird.observe.services.dto.reference.ReferenceSetDefinition; import fr.ird.observe.services.dto.reference.ReferentialReference; import fr.ird.observe.services.dto.reference.ReferentialReferenceSet; import fr.ird.observe.services.dto.reference.ReferentialReferences; @@ -1189,19 +1188,15 @@ public abstract class ContentUIHandler<E extends IdDto, U extends ContentUI<E, U return ObserveSwingDataSource.MAIN; } - protected <D extends ReferentialDto> ReferenceSetDefinition<D> getReferentialReferenceSet(Class<D> type) { - return ObserveSwingApplicationContext.get().getReferenceSetDefinitionProvider().getReferentialDefinition(type); - } - protected <D extends ReferentialDto> FormRequestDefinition<D> getReferentialFormRequest(Class<D> type) { return ObserveSwingApplicationContext.get().getFormRequestDefinitionProvider().getDefinition(type); } - protected <D extends ReferentialDto> FormRequestDefinition<D> getFormRequest(String type) { - return ObserveSwingApplicationContext.get().getFormRequestDefinitionProvider().getDefinition(type); + protected <D extends ReferentialDto> List<ReferentialReference<D>> getReferentialReferences(Class<D> type) { + return new LinkedList<>(getDataSource().getReferentialReferences(type)); } - protected <D extends ReferentialDto> Set<ReferentialReference<D>> getReferentialReferences(Class<D> type) { - return getDataSource().getReferentialReferences(type); + private <D extends ReferentialDto> FormRequestDefinition<D> getFormRequest(String type) { + return ObserveSwingApplicationContext.get().getFormRequestDefinitionProvider().getDefinition(type); } } ===================================== client/src/main/java/fr/ird/observe/client/ui/content/open/impl/seine/ActivitySeineUIHandler.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/open/impl/seine/ActivitySeineUIHandler.java +++ b/client/src/main/java/fr/ird/observe/client/ui/content/open/impl/seine/ActivitySeineUIHandler.java @@ -40,6 +40,7 @@ import fr.ird.observe.services.dto.seine.RouteDto; import fr.ird.observe.services.dto.seine.TripSeineDto; import fr.ird.observe.services.service.data.seine.ActivitySeineService; import java.util.HashSet; +import java.util.List; import java.util.Optional; import java.util.Set; import javax.swing.SwingUtilities; @@ -338,7 +339,7 @@ class ActivitySeineUIHandler extends ContentOpenableUIHandler<ActivitySeineDto, private String getActivity6Label() { - Set<ReferentialReference<VesselActivitySeineDto>> activities = getReferentialReferences(VesselActivitySeineDto.class); + List<ReferentialReference<VesselActivitySeineDto>> activities = getReferentialReferences(VesselActivitySeineDto.class); for (ReferentialReference<VesselActivitySeineDto> vesselActivity : activities) { if (VesselActivitySeineHelper.isActivityPeche(vesselActivity)) { ===================================== client/src/main/java/fr/ird/observe/client/ui/content/ref/ContentReferenceUIHandler.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/ref/ContentReferenceUIHandler.java +++ b/client/src/main/java/fr/ird/observe/client/ui/content/ref/ContentReferenceUIHandler.java @@ -57,7 +57,6 @@ import java.util.Collection; import java.util.Collections; import java.util.LinkedList; import java.util.List; -import java.util.Set; import java.util.stream.Collectors; import javax.swing.JButton; import javax.swing.JComponent; @@ -277,7 +276,7 @@ public class ContentReferenceUIHandler<E extends ReferentialDto, U extends Conte void showUniqueKeys(JButton button) { Class<E> beanType = getBeanType(); - Set<ReferentialReference<E>> entities = getReferentialReferences(beanType); + List<ReferentialReference<E>> entities = getReferentialReferences(beanType); List<Object[]> datas = new ArrayList<>(entities.size()); String[] naturalIds = getModel().getNaturalIds(); @@ -674,7 +673,7 @@ public class ContentReferenceUIHandler<E extends ReferentialDto, U extends Conte // some usages were found // get replacements - Set<ReferentialReference<E>> referentialReferences = getReferentialReferences(getBeanType()); + List<ReferentialReference<E>> referentialReferences = getReferentialReferences(getBeanType()); List<ReferentialReference<E>> referenceList = referentialReferences .stream() .filter(ReferentialReference::isEnabled) @@ -746,7 +745,7 @@ public class ContentReferenceUIHandler<E extends ReferentialDto, U extends Conte // some usages were found // get replacements - Set<ReferentialReference<E>> referentialReferences = getReferentialReferences(getBeanType()); + List<ReferentialReference<E>> referentialReferences = getReferentialReferences(getBeanType()); List<ReferentialReference<E>> referenceList = referentialReferences .stream() .filter(ReferentialReference::isEnabled) ===================================== client/src/main/java/fr/ird/observe/client/ui/content/table/impl/longline/CatchLonglineUIHandler.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/table/impl/longline/CatchLonglineUIHandler.java +++ b/client/src/main/java/fr/ird/observe/client/ui/content/table/impl/longline/CatchLonglineUIHandler.java @@ -553,8 +553,7 @@ public class CatchLonglineUIHandler extends ContentTableUIHandler<SetLonglineCat ReferentialReferenceDecorator<SizeMeasureTypeDto> decorator = getReferentialReferenceDecorator(SizeMeasureTypeDto.class); - List<ReferentialReference<SizeMeasureTypeDto>> sizeMeasureTypes = - Lists.newArrayList(getReferentialReferences(SizeMeasureTypeDto.class)); + List<ReferentialReference<SizeMeasureTypeDto>> sizeMeasureTypes = getReferentialReferences(SizeMeasureTypeDto.class); UIHelper.setTableColumnEditor(table, 0, ContentUIInitializer.newDataColumnEditor(sizeMeasureTypes, decorator)); UIHelper.setTableColumnEditor(table, 1, ContentUIInitializer.newFloatColumnEditor()); @@ -584,8 +583,7 @@ public class CatchLonglineUIHandler extends ContentTableUIHandler<SetLonglineCat ReferentialReferenceDecorator<WeightMeasureTypeDto> decorator = getReferentialReferenceDecorator(WeightMeasureTypeDto.class); - List<ReferentialReference<WeightMeasureTypeDto>> weightMeasureTypes = - Lists.newArrayList(getReferentialReferences(WeightMeasureTypeDto.class)); + List<ReferentialReference<WeightMeasureTypeDto>> weightMeasureTypes = getReferentialReferences(WeightMeasureTypeDto.class); UIHelper.setTableColumnEditor(table, 0, ContentUIInitializer.newDataColumnEditor(weightMeasureTypes, decorator)); UIHelper.setTableColumnEditor(table, 1, ContentUIInitializer.newFloatColumnEditor()); ===================================== client/src/main/java/fr/ird/observe/client/ui/content/table/impl/longline/GearUseFeaturesLonglineUIHandler.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/table/impl/longline/GearUseFeaturesLonglineUIHandler.java +++ b/client/src/main/java/fr/ird/observe/client/ui/content/table/impl/longline/GearUseFeaturesLonglineUIHandler.java @@ -329,7 +329,7 @@ public class GearUseFeaturesLonglineUIHandler extends ContentTableUIHandler<Trip ReferentialReferenceDecorator<GearCaracteristicDto> decorator = getReferentialReferenceDecorator(GearCaracteristicDto.class); - List<ReferentialReference<GearCaracteristicDto>> caracteristics = Lists.newArrayList(getReferentialReferences(GearCaracteristicDto.class)); + List<ReferentialReference<GearCaracteristicDto>> caracteristics = getReferentialReferences(GearCaracteristicDto.class); UIHelper.setTableColumnEditor(table, 0, ContentUIInitializer.newDataColumnEditor(caracteristics, decorator)); UIHelper.setTableColumnEditor(table, 1, new GearUseFeatureMeasurementCellEditor(0)); ===================================== client/src/main/java/fr/ird/observe/client/ui/content/table/impl/seine/GearUseFeaturesSeineUIHandler.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/table/impl/seine/GearUseFeaturesSeineUIHandler.java +++ b/client/src/main/java/fr/ird/observe/client/ui/content/table/impl/seine/GearUseFeaturesSeineUIHandler.java @@ -328,7 +328,7 @@ public class GearUseFeaturesSeineUIHandler extends ContentTableUIHandler<TripSei ReferentialReferenceDecorator<GearCaracteristicDto> decorator = getReferentialReferenceDecorator(GearCaracteristicDto.class); - List<ReferentialReference<GearCaracteristicDto>> caracteristics = Lists.newArrayList(getReferentialReferences(GearCaracteristicDto.class)); + List<ReferentialReference<GearCaracteristicDto>> caracteristics = getReferentialReferences(GearCaracteristicDto.class); UIHelper.setTableColumnEditor(table, 0, ContentUIInitializer.newDataColumnEditor(caracteristics, decorator)); UIHelper.setTableColumnEditor(table, 1, new GearUseFeatureMeasurementCellEditor(0)); ===================================== client/src/main/java/fr/ird/observe/client/ui/content/table/impl/seine/TargetSampleUIHandler.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/table/impl/seine/TargetSampleUIHandler.java +++ b/client/src/main/java/fr/ird/observe/client/ui/content/table/impl/seine/TargetSampleUIHandler.java @@ -39,7 +39,6 @@ import fr.ird.observe.services.dto.seine.TargetLengthDto; import fr.ird.observe.services.dto.seine.TargetSampleDto; import fr.ird.observe.services.dto.seine.TargetSampleHelper; import fr.ird.observe.services.service.data.seine.TargetSampleService; -import java.util.ArrayList; import java.util.Collection; import java.util.LinkedList; import java.util.List; @@ -200,16 +199,19 @@ public class TargetSampleUIHandler<U extends ContentTableUI<TargetSampleDto, Tar public void openUI() { super.openUI(); - List<ReferentialReference<SizeMeasureTypeDto>> sizeMeasureTypes = new ArrayList<>(getReferentialReferences(SizeMeasureTypeDto.class)); + List<ReferentialReference<SizeMeasureTypeDto>> sizeMeasureTypes = getReferentialReferences(SizeMeasureTypeDto.class); List<ReferentialReference<SizeMeasureTypeDto>> data = SizeMeasureTypeHelper.filterForSeine(sizeMeasureTypes); if (log.isInfoEnabled()) { log.info("Using " + data.size() + " size measure type(s)."); } - if (data.size() != 2) { - throw new IllegalStateException("WHY???"); - } + checkSizeMeasureTypes(data); ((TargetSampleUI) getUi()).getSizeMeasureType().setData(data); + } + private void checkSizeMeasureTypes(List<ReferentialReference<SizeMeasureTypeDto>> data) { + if (data.size() != 2) { + throw new IllegalStateException("Can't find *Predorsal Length* or *Fork Length* size measure type(s) in database."); + } } @Override @@ -377,9 +379,7 @@ public class TargetSampleUIHandler<U extends ContentTableUI<TargetSampleDto, Tar if (log.isInfoEnabled()) { log.info("Using " + result.size() + " size measure type(s)."); } - if (result.size() != 2) { - throw new IllegalStateException("WHY???"); - } + checkSizeMeasureTypes((List) result); } } ===================================== services/src/main/java/fr/ird/observe/services/dto/referential/SizeMeasureTypeHelper.java ===================================== --- a/services/src/main/java/fr/ird/observe/services/dto/referential/SizeMeasureTypeHelper.java +++ b/services/src/main/java/fr/ird/observe/services/dto/referential/SizeMeasureTypeHelper.java @@ -30,8 +30,8 @@ import java.util.stream.Collectors; public class SizeMeasureTypeHelper extends GeneratedSizeMeasureTypeHelper { - public static final ImmutableSet<String> SEINE_LD1_SIZE_MEASURE_TYPE_ID = ImmutableSet.of("PDL", "LD1"); - public static final ImmutableSet<String> SEINE_LF_SIZE_MEASURE_TYPE_ID = ImmutableSet.of("FL", "LF"); + public static final ImmutableSet<String> SEINE_LD1_SIZE_MEASURE_TYPE_ID = ImmutableSet.of("fr.ird.observe.entities.referentiel.SizeMeasureType#1433499466774#0.529249255312607", "LD1"); + public static final ImmutableSet<String> SEINE_LF_SIZE_MEASURE_TYPE_ID = ImmutableSet.of("fr.ird.observe.entities.referentiel.SizeMeasureType#1433499465700#0.0902433863375336", "LF"); public static List<ReferentialReference<SizeMeasureTypeDto>> filterForSeine(Collection<ReferentialReference<SizeMeasureTypeDto>> incoming) { return incoming.stream() @@ -40,11 +40,11 @@ public class SizeMeasureTypeHelper extends GeneratedSizeMeasureTypeHelper { } public static boolean isLd1(ReferentialReference<SizeMeasureTypeDto> incoming) { - return SEINE_LD1_SIZE_MEASURE_TYPE_ID.contains(incoming.getCode()); + return SEINE_LD1_SIZE_MEASURE_TYPE_ID.contains(incoming.getId()); } public static boolean isLf(ReferentialReference<SizeMeasureTypeDto> incoming) { - return SEINE_LF_SIZE_MEASURE_TYPE_ID.contains(incoming.getCode()); + return SEINE_LF_SIZE_MEASURE_TYPE_ID.contains(incoming.getId()); } public static ReferentialReference<SizeMeasureTypeDto> getLd1(Collection<ReferentialReference<SizeMeasureTypeDto>> incoming) { View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/81b4f46df7e2c8eb95b1f09f972... --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/81b4f46df7e2c8eb95b1f09f972... You're receiving this email because of your account on gitlab.com.