GitLab

at 2017-08-04T13:41:17+02:00

L'accès aux écrans PS targetSample conservés et targetSample rejetés (See #827)

Amélioration API ContentHandler

 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;

         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);

     }

 }
 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;

 

     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)) {

 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;

     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();

                 // 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)

             // 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)

 

             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());

 

             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());

 

             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));

 

             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));

 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;

     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

                 if (log.isInfoEnabled()) {

                     log.info("Using " + result.size() + " size measure type(s).");

                 }

-                if (result.size() != 2) {

-                    throw new IllegalStateException("WHY???");

-                }

+                checkSizeMeasureTypes((List) result);

             }

         }

 

 

 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()

     }

 

     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) {

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

Commits:

8 changed files:

Changes: