GitLab

at 2017-07-19T01:32:03+02:00

Review design of ReferenceSetDefinition and FormRequestDefinition (adapt for ui) (Closes #793)

  */

 package fr.ird.observe.application.swing;

-import org.apache.commons.logging.Log;

-import org.apache.commons.logging.LogFactory;

-

 import java.util.Arrays;

 import java.util.Date;

-

-

-import static org.nuiton.i18n.I18n.n;

+import org.apache.commons.logging.Log;

+import org.apache.commons.logging.LogFactory;

 /**

  * Pour lancer le client swing {@code ObServe} en mode administrateur.

         new RunObserve(args).launch();

     }

-    static {

-        //TODO Apply this modification in jaxx project

-        n("jaxx.common.latitude");

-    }

-

-

 }
         log.debug("init list for " + beanList.getBeanType());

         Class dtoClass = getDtoClass(beanList);

-

+        beanList.setBeanType(dtoClass);

         if (ReferentialDto.class.isAssignableFrom(dtoClass)) {

             prepareReferentialFilterableDoubleList(dtoClass, beanList);

         } else {

     }

     private <R extends ReferentialDto> ReferentialReferenceSet<R> getReferentialReferenceSet(String propertyName) {

-        ImmutableMap<String, ReferentialReferenceSet<?>> referenceSet = this.referentialReferenceSetsByPropertyName;

+        ReferentialReferenceSet<?> referenceSet = this.referentialReferenceSetsByPropertyName.get(propertyName);

         Objects.requireNonNull(referenceSet, "Could not find referantialRefenceSet named " + propertyName);

-        return (ReferentialReferenceSet<R>) referenceSet.get(propertyName);

+        return (ReferentialReferenceSet<R>) referenceSet;

     }

     public <R extends DataDto> DataReferenceSet<R> getDataReferenceSet(String propertyName) {

                           <JLabel id='currentDirectionLabel'/>

                         </cell>

                         <cell anchor='east' weightx="1" fill="both">

-                          <NumberEditor id='currentDirection' constructorParams='this' styleClass="float3"/>

+                          <NumberEditor id='currentDirection' constructorParams='this' styleClass="int6"/>

                         </cell>

                       </row>

                       <row>

         <JLabel id='meanLengthLabel'/>

       </cell>

       <cell weightx='1'>

-        <NumberEditor id='meanLength' constructorParams='this' styleClass="int6"/>

+        <NumberEditor id='meanLength' constructorParams='this' styleClass="float2"/>

       </cell>

       <cell anchor='east'>

         <JToolBar id='meanLengthComputedAction'>

 import fr.ird.observe.application.swing.ui.content.table.ContentTableUIModel;

 import fr.ird.observe.application.swing.ui.content.table.ObserveContentTableUI;

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

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

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

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

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

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

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

-

 import java.util.Arrays;

 import java.util.Collection;

 import java.util.List;

+import java.util.Optional;

+import java.util.Set;

 /**

  * Created on 9/26/14.

         this.defaultSizeMeasureType = defaultSizeMeasureType;

         firePropertyChange(PROPERTY_DEFAULT_SIZE_MEASURE_TYPE, oldValue, defaultSizeMeasureType);

     }

+

+    @Override

+    public <R extends ReferentialDto> Optional<Set<ReferentialReference<R>>> tryToGetReferentialReferenceSet(String propertyName) {

+        ReferentialReferenceSet<R> referenceSet = (ReferentialReferenceSet) this.referentialReferenceSetsByPropertyName.get(propertyName);

+        Set<ReferentialReference<R>> references = null;

+        if (referenceSet != null) {

+            references = referenceSet.getReferences();

+        }

+        return Optional.ofNullable(references);

+    }

 }

         @Override

         public void initActivityLonglineEncounterDto() {

-            FormRequestDefinition<EncounterDto> definition = flushData(formBuilder(EncounterDto.class)

-                                                                               .addKey(EncounterDto.PROPERTY_ENCOUNTER_TYPE, referenceSetDefinition(EncounterTypeDto.class))

-                                                                               .addKey(EncounterDto.PROPERTY_SPECIES, referenceSetDefinition(SpeciesDto.class)));

-            formDefinitionBuilder.put(ActivityLonglineEncounterDto.class.getName(), definition);

+            flushData(formBuilder(EncounterDto.class)

+                              .addKey(EncounterDto.PROPERTY_ENCOUNTER_TYPE, referenceSetDefinition(EncounterTypeDto.class))

+                              .addKey(EncounterDto.PROPERTY_SPECIES, referenceSetDefinition(SpeciesDto.class)),

+                      ActivityLonglineEncounterDto.class);

         }

         @Override

         public void initActivityLonglineSensorUsedDto() {

-            FormRequestDefinition<SensorUsedDto> definition = flushData(formBuilder(SensorUsedDto.class)

-                                                                                .addKey(SensorUsedDto.PROPERTY_SENSOR_TYPE, referenceSetDefinition(SensorTypeDto.class))

-                                                                                .addKey(SensorUsedDto.PROPERTY_SENSOR_BRAND, referenceSetDefinition(SensorBrandDto.class))

-                                                                                .addKey(SensorUsedDto.PROPERTY_SENSOR_DATA_FORMAT, referenceSetDefinition(SensorDataFormatDto.class)));

-            formDefinitionBuilder.put(ActivityLonglineSensorUsedDto.class.getName(), definition);

+            flushData(formBuilder(SensorUsedDto.class)

+                              .addKey(SensorUsedDto.PROPERTY_SENSOR_TYPE, referenceSetDefinition(SensorTypeDto.class))

+                              .addKey(SensorUsedDto.PROPERTY_SENSOR_BRAND, referenceSetDefinition(SensorBrandDto.class))

+                              .addKey(SensorUsedDto.PROPERTY_SENSOR_DATA_FORMAT, referenceSetDefinition(SensorDataFormatDto.class)),

+                      ActivityLonglineSensorUsedDto.class);

         }

         @Override

                               .addKey(CatchLonglineDto.PROPERTY_MATURITY_STATUS, referenceSetDefinition(MaturityStatusDto.class))

                               .addKey(SizeMeasureDto.PROPERTY_SIZE_MEASURE_TYPE, referenceSetDefinition(SizeMeasureTypeDto.class))

                               .addKey(WeightMeasureDto.PROPERTY_WEIGHT_MEASURE_TYPE, referenceSetDefinition(WeightMeasureTypeDto.class))

-                              .addKey(BranchlineDto.PROPERTY_BAIT_HAULING_STATUS, referenceSetDefinition(BaitHaulingStatusDto.class)));

+                              .addKey(BranchlineDto.PROPERTY_BAIT_HAULING_STATUS, referenceSetDefinition(BaitHaulingStatusDto.class)),

+                      SetLonglineCatchDto.class);

         }

         @Override

         public void initGearUseFeaturesLonglineDto() {

             flushData(formBuilder(GearUseFeaturesLonglineDto.class)

                               .addKey(GearUseFeaturesLonglineDto.PROPERTY_GEAR, referenceSetDefinition(GearDto.class))

-                              .addKey(GearUseFeaturesMeasurementLonglineDto.PROPERTY_GEAR_CARACTERISTIC, referenceSetDefinition(GearCaracteristicDto.class)));

+                              .addKey(GearUseFeaturesMeasurementLonglineDto.PROPERTY_GEAR_CARACTERISTIC, referenceSetDefinition(GearCaracteristicDto.class)),

+                      TripLonglineGearUseDto.class);

         }

         @Override

                               .addKey(TdrDto.PROPERTY_SENSOR_BRAND, referenceSetDefinition(SensorBrandDto.class))

                               .addKey(TdrDto.PROPERTY_ITEM_HORIZONTAL_POSITION, referenceSetDefinition(ItemHorizontalPositionDto.class))

                               .addKey(TdrDto.PROPERTY_ITEM_VERTICAL_POSITION, referenceSetDefinition(ItemVerticalPositionDto.class))

-                              .addKey(TdrDto.PROPERTY_SPECIES, referenceSetDefinition(SpeciesDto.class)));

+                              .addKey(TdrDto.PROPERTY_SPECIES, referenceSetDefinition(SpeciesDto.class)),

+                      SetLonglineTdrDto.class);

         }

         @Override

         public void initGearUseFeaturesSeineDto() {

             flushData(formBuilder(GearUseFeaturesSeineDto.class)

                               .addKey(GearUseFeaturesSeineDto.PROPERTY_GEAR, referenceSetDefinition(GearDto.class))

-                              .addKey(GearUseFeaturesMeasurementSeineDto.PROPERTY_GEAR_CARACTERISTIC, referenceSetDefinition(GearCaracteristicDto.class)));

+                              .addKey(GearUseFeaturesMeasurementSeineDto.PROPERTY_GEAR_CARACTERISTIC, referenceSetDefinition(GearCaracteristicDto.class)),

+                      TripSeineGearUseDto.class);

         }

         @Override

             flushData(formBuilder(NonTargetCatchDto.class)

                               .addKey(NonTargetCatchDto.PROPERTY_SPECIES, referenceSetDefinition(SpeciesDto.class))

                               .addKey(NonTargetCatchDto.PROPERTY_SPECIES_FATE, referenceSetDefinition(SpeciesFateDto.class))

-                              .addKey(NonTargetCatchDto.PROPERTY_REASON_FOR_DISCARD, referenceSetDefinition(ReasonForDiscardDto.class)));

+                              .addKey(NonTargetCatchDto.PROPERTY_REASON_FOR_DISCARD, referenceSetDefinition(ReasonForDiscardDto.class)),

+                      SetSeineNonTargetCatchDto.class);

         }

         @Override

             flushData(formBuilder(NonTargetCatchReleaseDto.class)

                               .addKey(NonTargetCatchReleaseDto.PROPERTY_SPECIES, referenceSetDefinition(SpeciesDto.class))

                               .addKey(NonTargetCatchReleaseDto.PROPERTY_SEX, referenceSetDefinition(SexDto.class))

-                              .addKey(NonTargetCatchReleaseDto.PROPERTY_SPECIES_GROUP_RELEASE_MODE, referenceSetDefinition(SpeciesGroupReleaseModeDto.class)));

+                              .addKey(NonTargetCatchReleaseDto.PROPERTY_SPECIES_GROUP_RELEASE_MODE, referenceSetDefinition(SpeciesGroupReleaseModeDto.class)),

+                      SetSeineNonTargetCatchReleaseDto.class);

         }

         @Override

                               .addKey(NonTargetLengthDto.PROPERTY_SPECIES, referenceSetDefinition(SpeciesDto.class))

                               .addKey(NonTargetLengthDto.PROPERTY_SPECIES_FATE, referenceSetDefinition(SpeciesFateDto.class))

                               .addKey(NonTargetLengthDto.PROPERTY_SEX, referenceSetDefinition(SexDto.class))

-                              .addKey(TargetLengthDto.PROPERTY_SIZE_MEASURE_TYPE, referenceSetDefinition(SizeMeasureTypeDto.class)));

+                              .addKey(TargetLengthDto.PROPERTY_SIZE_MEASURE_TYPE, referenceSetDefinition(SizeMeasureTypeDto.class)),

+                      NonTargetSampleDto.class);

         }

         @Override

         public void initObjectObservedSpeciesDto() {

             flushData(formBuilder(ObjectObservedSpeciesDto.class)

                               .addKey(ObjectObservedSpeciesDto.PROPERTY_SPECIES, referenceSetDefinition(SpeciesDto.class))

-                              .addKey(ObjectObservedSpeciesDto.PROPERTY_SPECIES_STATUS, referenceSetDefinition(SpeciesStatusDto.class)));

+                              .addKey(ObjectObservedSpeciesDto.PROPERTY_SPECIES_STATUS, referenceSetDefinition(SpeciesStatusDto.class)),

+                      FloatingObjectObservedSpeciesDto.class);

         }

         @Override

         public void initObjectSchoolEstimateDto() {

             flushData(formBuilder(ObjectSchoolEstimateDto.class)

-                              .addKey(ObjectObservedSpeciesDto.PROPERTY_SPECIES, referenceSetDefinition(SpeciesDto.class)));

+                              .addKey(ObjectObservedSpeciesDto.PROPERTY_SPECIES, referenceSetDefinition(SpeciesDto.class)),

+                      FloatingObjectSchoolEstimateDto.class);

         }

         @Override

         @Override

         public void initSchoolEstimateDto() {

             flushData(formBuilder(SchoolEstimateDto.class)

-                              .addKey(SchoolEstimateDto.PROPERTY_SPECIES, referenceSetDefinition(SpeciesDto.class)));

+                              .addKey(SchoolEstimateDto.PROPERTY_SPECIES, referenceSetDefinition(SpeciesDto.class)),

+                      SetSeineSchoolEstimateDto.class);

         }

         @Override

             flushData(formBuilder(TargetCatchDto.class)

                               .addKey(TargetCatchDto.PROPERTY_SPECIES, referenceSetDefinition(SpeciesDto.class))

                               .addKey(TargetCatchDto.PROPERTY_REASON_FOR_DISCARD, referenceSetDefinition(ReasonForDiscardDto.class))

-                              .addKey(TargetCatchDto.PROPERTY_WEIGHT_CATEGORY, referenceSetDefinition(WeightCategoryDto.class)));

+                              .addKey(TargetCatchDto.PROPERTY_WEIGHT_CATEGORY, referenceSetDefinition(WeightCategoryDto.class)),

+                      SetSeineTargetCatchDto.class);

         }

         @Override

             flushData(formBuilder(TargetLengthDto.class)

                               .addKey(TargetLengthDto.PROPERTY_SPECIES, referenceSetDefinition(SpeciesDto.class))

                               .addKey(TargetLengthDto.PROPERTY_SEX, referenceSetDefinition(SexDto.class))

-                              .addKey(TargetLengthDto.PROPERTY_SIZE_MEASURE_TYPE, referenceSetDefinition(SizeMeasureTypeDto.class)));

+                              .addKey(TargetLengthDto.PROPERTY_SIZE_MEASURE_TYPE, referenceSetDefinition(SizeMeasureTypeDto.class)),

+                      TargetSampleDto.class);

         }

         @Override

             flushData(formBuilder(TransmittingBuoyDto.class)

                               .addKey(TransmittingBuoyDto.PROPERTY_TRANSMITTING_BUOY_OPERATION, referenceSetDefinition(TransmittingBuoyOperationDto.class))

                               .addKey(TransmittingBuoyDto.PROPERTY_TRANSMITTING_BUOY_TYPE, referenceSetDefinition(TransmittingBuoyTypeDto.class))

-                              .addKey(TransmittingBuoyDto.PROPERTY_COUNTRY, referenceSetDefinition(CountryDto.class)));

+                              .addKey(TransmittingBuoyDto.PROPERTY_COUNTRY, referenceSetDefinition(CountryDto.class)),

+                      FloatingObjectTransmittingBuoyDto.class);

         }

         @Override

         }

-        private <D extends DataDto> FormRequestDefinition<D> flushData(FormRequestDefinition.Builder<D> form) {

+        private <D extends DataDto> void flushData(FormRequestDefinition.Builder<D> form, Class<?>... extraMapping) {

             FormRequestDefinition<D> build = form.build();

             formDefinitionBuilder.put(build.getType().getName(), build);

-            return build;

+            for (Class<?> aClass : extraMapping) {

+                formDefinitionBuilder.put(aClass.getName(), build);

+            }

         }

         private <D extends ReferentialDto> void flushReferential(FormRequestDefinition.Builder<D> form) {

             provider.getDefinition(referentialType.getName());

         }

-        Assert.assertEquals(92, provider.keys().size());

+        Assert.assertEquals(105, provider.keys().size());

         for (String referentialType : provider.keys()) {

             provider.getDefinition(referentialType);

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

Commits:

8 changed files:

Changes: