[Observe-commits] [Git][ultreiaio/ird-observe][develop] Review design of ReferenceSetDefinition and FormRequestDefinition (adapt for ui) (Closes #793)

18 Jul 2017

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


Commits:
69b0281e by Tony Chemit at 2017-07-19T01:32:03+02:00
Review design of ReferenceSetDefinition and FormRequestDefinition (adapt for ui) (Closes #793)

- - - - -


8 changed files:

- application-swing/src/main/java/fr/ird/observe/application/swing/RunObserve.java
- application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIInitializer.java
- application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIModel.java
- application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/SetSeineUI.jaxx
- application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetCatchUI.jaxx
- application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetSampleUIModel.java
- services/src/main/java/fr/ird/observe/services/ObserveDtoInitializer.java
- services/src/test/java/fr/ird/observe/services/FormRequestDefinitionProviderTest.java


Changes:

=====================================
application-swing/src/main/java/fr/ird/observe/application/swing/RunObserve.java
=====================================

--- a/application-swing/src/main/java/fr/ird/observe/application/swing/RunObserve.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/RunObserve.java
@@ -21,14 +21,10 @@
  */
 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.
@@ -57,10 +53,4 @@ public class RunObserve extends ObserveRunner {
         new RunObserve(args).launch();
     }
 
-    static {
-        //TODO Apply this modification in jaxx project
-        n("jaxx.common.latitude");
-    }
-
-
 }


=====================================
application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIInitializer.java
=====================================
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIInitializer.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIInitializer.java
@@ -445,7 +445,7 @@ public class ContentUIInitializer<E extends IdDto, UI extends ContentUI<E, UI>> 
         log.debug("init list for " + beanList.getBeanType());
 
         Class dtoClass = getDtoClass(beanList);
-
+        beanList.setBeanType(dtoClass);
         if (ReferentialDto.class.isAssignableFrom(dtoClass)) {
             prepareReferentialFilterableDoubleList(dtoClass, beanList);
         } else {


=====================================
application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIModel.java
=====================================
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIModel.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIModel.java
@@ -317,9 +317,9 @@ public abstract class ContentUIModel<E extends IdDto> extends AbstractSerializab
     }
 
     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) {


=====================================
application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/SetSeineUI.jaxx
=====================================
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/SetSeineUI.jaxx
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/SetSeineUI.jaxx
@@ -182,7 +182,7 @@
                           <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>


=====================================
application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetCatchUI.jaxx
=====================================
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetCatchUI.jaxx
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetCatchUI.jaxx
@@ -161,7 +161,7 @@
         <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'>


=====================================
application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetSampleUIModel.java
=====================================
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetSampleUIModel.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetSampleUIModel.java
@@ -28,14 +28,17 @@ import fr.ird.observe.application.swing.ui.content.table.ContentTableModel;
 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.
@@ -121,4 +124,14 @@ public class NonTargetSampleUIModel extends ContentTableUIModel<NonTargetSampleD
         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);
+    }
 }


=====================================
services/src/main/java/fr/ird/observe/services/ObserveDtoInitializer.java
=====================================
--- a/services/src/main/java/fr/ird/observe/services/ObserveDtoInitializer.java
+++ b/services/src/main/java/fr/ird/observe/services/ObserveDtoInitializer.java
@@ -1584,19 +1584,19 @@ class ObserveDtoInitializer {
 
         @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
@@ -1642,7 +1642,8 @@ class ObserveDtoInitializer {
                               .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
@@ -1657,7 +1658,8 @@ class ObserveDtoInitializer {
         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
@@ -1732,7 +1734,8 @@ class ObserveDtoInitializer {
                               .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
@@ -1827,7 +1830,8 @@ class ObserveDtoInitializer {
         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
@@ -1835,7 +1839,8 @@ class ObserveDtoInitializer {
             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
@@ -1843,7 +1848,8 @@ class ObserveDtoInitializer {
             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
@@ -1856,7 +1862,8 @@ class ObserveDtoInitializer {
                               .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
@@ -1867,13 +1874,15 @@ class ObserveDtoInitializer {
         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
@@ -1887,7 +1896,8 @@ class ObserveDtoInitializer {
         @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
@@ -1917,7 +1927,8 @@ class ObserveDtoInitializer {
             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
@@ -1925,7 +1936,8 @@ class ObserveDtoInitializer {
             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
@@ -1938,7 +1950,8 @@ class ObserveDtoInitializer {
             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
@@ -1977,10 +1990,12 @@ class ObserveDtoInitializer {
 
         }
 
-        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) {


=====================================
services/src/test/java/fr/ird/observe/services/FormRequestDefinitionProviderTest.java
=====================================
--- a/services/src/test/java/fr/ird/observe/services/FormRequestDefinitionProviderTest.java
+++ b/services/src/test/java/fr/ird/observe/services/FormRequestDefinitionProviderTest.java
@@ -22,7 +22,7 @@ public class FormRequestDefinitionProviderTest {
             provider.getDefinition(referentialType.getName());
         }
 
-        Assert.assertEquals(92, provider.keys().size());
+        Assert.assertEquals(105, provider.keys().size());
 
         for (String referentialType : provider.keys()) {
             provider.getDefinition(referentialType);



View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/69b0281e783f4784df49d922c30d...

---
View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/69b0281e783f4784df49d922c30d...
You're receiving this email because of your account on gitlab.com.

    