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

Commits:

19 changed files:

Changes:

  • client/src/main/java/fr/ird/observe/client/ui/actions/main/menu/storage/ChangeStorageAction.java
    ... ... @@ -58,7 +58,7 @@ public class ChangeStorageAction extends MenuActionSupport {
    58 58 
         private final String title;
    59 59
    60 60 
         public ChangeStorageAction(ObserveMainUI ui) {
    61 
    -        this(ui, (Set<DbMode>)null, null);
    61 
    +        this(ui, null, null);
    62 62 
         }
    63 63
    64 64 
         public ChangeStorageAction(ObserveMainUI ui, String actionName,char keyStroke) {

  • client/src/main/java/fr/ird/observe/client/ui/content/ContentUIHandler.java
    ... ... @@ -1193,7 +1193,7 @@ public abstract class ContentUIHandler<E extends IdDto, U extends ContentUI<E, U
    1193 1193 
             boolean isReferential = ReferentialDto.class.isAssignableFrom(getBeanType());
    1194 1194 
             if (isReferential) {
    1195 1195 
                 content.add(new JLabel(t("observe.common.Dto.topiaCreateDate")));
    1196 
    -            JTextField comp = new JTextField(dateFormat.format(((ReferentialDto) bean).getCreateDate()));
    1196 
    +            JTextField comp =(JTextField) new JTextField(dateFormat.format(bean.getCreateDate()));
    1197 1197 
                 comp.setEditable(false);
    1198 1198 
                 comp.addFocusListener(l);
    1199 1199 
                 content.add(comp);
    ... ... @@ -1209,7 +1209,7 @@ public abstract class ContentUIHandler<E extends IdDto, U extends ContentUI<E, U
    1209 1209
    1210 1210 
             if (isReferential) {
    1211 1211 
                 content.add(new JLabel(t("observe.common.Dto.topiaVersion")));
    1212 
    -            JTextField comp = new JTextField(String.valueOf(((ReferentialDto) bean).getVersion()));
    1212 
    +            JTextField comp = new JTextField(String.valueOf(bean.getVersion()));
    1213 1213 
                 comp.setEditable(false);
    1214 1214 
                 comp.addFocusListener(l);
    1215 1215 
                 content.add(comp);

  • client/src/main/java/fr/ird/observe/client/ui/content/data/longline/CatchLonglineUIHandler.java
    ... ... @@ -440,7 +440,7 @@ public class CatchLonglineUIHandler extends ContentTableUIHandler<SetLonglineCat
    440 440 
                     selectedNode = selectedNode.getParent();
    441 441 
                 }
    442 442 
                 TripLonglineReference tripReference = ((TripLonglineNavigationTreeNode) selectedNode).getData();
    443 
    -            String tripTypeId = (String) tripReference.getTripTypeId();
    443 
    +            String tripTypeId = tripReference.getTripTypeId();
    444 444 
                 if (log.isInfoEnabled()) {
    445 445 
                     log.info("Use tripId: " + tripTypeId);
    446 446 
                 }

  • client/src/main/java/fr/ird/observe/client/ui/content/data/longline/GearUseFeaturesLonglineUIHandler.java
    ... ... @@ -199,7 +199,7 @@ public class GearUseFeaturesLonglineUIHandler extends ContentTableUIHandler<Trip
    199 199 
                     .map(input -> {
    200 200 
                         GearUseFeaturesMeasurementLonglineDto measurementLonglineDto = new GearUseFeaturesMeasurementLonglineDto();
    201 201 
                         measurementLonglineDto.setGearCaracteristic(input);
    202 
    -                    String gearCaracterisiticTypeId = (String) input.getGearCaracteristicTypeId();
    202 
    +                    String gearCaracterisiticTypeId = input.getGearCaracteristicTypeId();
    203 203 
                         if (GearCaracteristicTypeHelper.isBoolean(gearCaracterisiticTypeId)) {
    204 204 
                             measurementLonglineDto.setMeasurementValue(Boolean.FALSE.toString());
    205 205 
                         }

  • client/src/main/java/fr/ird/observe/client/ui/content/data/longline/GearUseFeaturesMeasurementLonglinesTableModel.java
    ... ... @@ -101,7 +101,7 @@ public class GearUseFeaturesMeasurementLonglinesTableModel extends EditableTable
    101 101 
             switch (columnIndex) {
    102 102 
                 case 0:
    103 103 
                     measure.setGearCaracteristic((GearCaracteristicReference) aValue);
    104 
    -                String gearCaracteristicTypeId = (String) measure.getGearCaracteristic().getGearCaracteristicTypeId();
    104 
    +                String gearCaracteristicTypeId = measure.getGearCaracteristic().getGearCaracteristicTypeId();
    105 105 
                     if (GearCaracteristicTypeHelper.isBoolean(gearCaracteristicTypeId)) {
    106 106 
                         // on force à avoir false par défaut
    107 107 
                         measure.setMeasurementValue("false");

  • client/src/main/java/fr/ird/observe/client/ui/content/data/longline/LonglinePositionHelper.java
    ... ... @@ -270,7 +270,7 @@ public class LonglinePositionHelper<D extends LonglinePositionAwareDto> {
    270 270
    271 271 
         protected SectionReference getSection(BasketReference basket) {
    272 272
    273 
    -        String sectionId = (String) ((BasketWithSectionIdReference) basket).getSectionId();
    273 
    +        String sectionId = ((BasketWithSectionIdReference) basket).getSectionId();
    274 274
    275 275 
             return sectionUniverse.stream()
    276 276 
                     .filter(s -> sectionId.equals(s.getId()))
    ... ... @@ -281,7 +281,7 @@ public class LonglinePositionHelper<D extends LonglinePositionAwareDto> {
    281 281
    282 282 
         protected BasketReference getBasket(BranchlineReference branchline) {
    283 283
    284 
    -        String basketId = (String) ((BranchlineWithBasketIdReference) branchline).getBasketId();
    284 
    +        String basketId = ((BranchlineWithBasketIdReference) branchline).getBasketId();
    285 285
    286 286 
             return basketUniverse.stream()
    287 287 
                     .filter(b -> basketId.equals(b.getId()))

  • client/src/main/java/fr/ird/observe/client/ui/content/data/seine/FloatingObjectUIHandler.java
    ... ... @@ -210,9 +210,9 @@ public class FloatingObjectUIHandler extends ContentUIHandler<FloatingObjectDto,
    210 210
    211 211 
             FloatingObjectUIModel model = getModel();
    212 212 
             for (FloatingObjectPartReference p : partsSet) {
    213 
    -            String objectMaterialId = (String) p.getObjectMaterialId();
    214 
    -            String whenArriving = (String) p.getWhenArriving();
    215 
    -            String whenLeaving = (String) p.getWhenLeaving();
    213 
    +            String objectMaterialId = p.getObjectMaterialId();
    214 
    +            String whenArriving = p.getWhenArriving();
    215 
    +            String whenLeaving = p.getWhenLeaving();
    216 216 
                 if (whenArriving != null && !Objects.equals("false", whenArriving)) {
    217 217 
                     model.setWhenArriving(objectMaterialId, whenArriving);
    218 218 
                 }
    ... ... @@ -360,8 +360,8 @@ public class FloatingObjectUIHandler extends ContentUIHandler<FloatingObjectDto,
    360 360 
                 getModel().setArriving(false);
    361 361 
                 getModel().setLeaving(false);
    362 362 
             } else {
    363 
    -            getModel().setArriving((Boolean) operation.isWhenArriving());
    364 
    -            getModel().setLeaving((Boolean) operation.isWhenLeaving());
    363 
    +            getModel().setArriving(operation.isWhenArriving());
    364 
    +            getModel().setLeaving(operation.isWhenLeaving());
    365 365 
             }
    366 366 
             FloatingObjectPartsTreeTableModel treeModel = (FloatingObjectPartsTreeTableModel) getUi().getTable().getTreeTableModel();
    367 367 
             treeModel.reset();

  • client/src/main/java/fr/ird/observe/client/ui/content/data/seine/GearUseFeaturesMeasurementSeinesTableModel.java
    ... ... @@ -101,7 +101,7 @@ public class GearUseFeaturesMeasurementSeinesTableModel extends EditableTableWit
    101 101 
             switch (columnIndex) {
    102 102 
                 case 0:
    103 103 
                     measure.setGearCaracteristic((GearCaracteristicReference) aValue);
    104 
    -                String gearCaracteristicTypeId = (String) measure.getGearCaracteristic().getGearCaracteristicTypeId();
    104 
    +                String gearCaracteristicTypeId = measure.getGearCaracteristic().getGearCaracteristicTypeId();
    105 105 
                     if (GearCaracteristicTypeHelper.isBoolean(gearCaracteristicTypeId)) {
    106 106 
                         // on force à avoir false par défaut
    107 107 
                         measure.setMeasurementValue("false");

  • client/src/main/java/fr/ird/observe/client/ui/content/data/seine/GearUseFeaturesSeineUIHandler.java
    ... ... @@ -198,7 +198,7 @@ public class GearUseFeaturesSeineUIHandler extends ContentTableUIHandler<TripSei
    198 198 
             return gearDto.getGearCaracteristic().stream()
    199 199 
                     .map(input -> {
    200 200 
                         GearUseFeaturesMeasurementSeineDto measurementSeineDto = new GearUseFeaturesMeasurementSeineDto();
    201 
    -                    String gearCaracterisiticTypeId = (String) input.getGearCaracteristicTypeId();
    201 
    +                    String gearCaracterisiticTypeId = input.getGearCaracteristicTypeId();
    202 202 
                         if (GearCaracteristicTypeHelper.isBoolean(gearCaracterisiticTypeId)) {
    203 203 
                             measurementSeineDto.setMeasurementValue(Boolean.FALSE.toString());
    204 204 
                         }

  • client/src/main/java/fr/ird/observe/client/ui/content/data/seine/NonTargetCatchReleaseUI.jaxx
    ... ... @@ -84,6 +84,8 @@
    84 84 
       <ButtonGroup id='acquisitionModeGroup'
    85 85 
                    onStateChanged='getHandler().updateModeSaisie((AcquisitionMode) acquisitionModeGroup.getSelectedValue())'/>
    86 86
    87 
    +  <JLabel id='hideFormInformation' styleClass="skipI18n"/>
    88 
    +
    87 89 
       <Table id='editorPanel' fill='both' insets='1' onFocusGained='species.requestFocus()'>
    88 90
    89 91 
         <!-- mode de saisie -->

  • client/src/main/java/fr/ird/observe/client/ui/content/data/seine/NonTargetCatchReleaseUIHandler.java
    ... ... @@ -101,7 +101,7 @@ public class NonTargetCatchReleaseUIHandler extends ContentTableUIHandler<SetSei
    101 101 
                 UIHelper.askFocus(getUi().getSpecies());
    102 102 
                 return;
    103 103 
             }
    104 
    -        String speciesGroupId = (String) species.getSpeciesGroupId();
    104 
    +        String speciesGroupId = species.getSpeciesGroupId();
    105 105 
             SpeciesGroupDto speciesGroupDto = speciesGroupDtoMap.get(speciesGroupId);
    106 106 
             Objects.requireNonNull(speciesGroupDto);
    107 107 
             log.info("Will use speciesGroup: " + speciesGroupDto.getLabel2());

  • client/src/main/java/fr/ird/observe/client/ui/content/data/seine/NonTargetSampleUIHandler.java
    ... ... @@ -340,7 +340,7 @@ public class NonTargetSampleUIHandler extends AbstractSampleUIHandler<NonTargetS
    340 340 
             Optional<SizeMeasureTypeReference> result = Optional.empty();
    341 341 
             if (species != null) {
    342 342
    343 
    -            String sizeMeasureId = (String) species.getSizeMeasureTypeId();
    343 
    +            String sizeMeasureId = species.getSizeMeasureTypeId();
    344 344 
                 result = getUi().getSizeMeasureType().getData().stream()
    345 345 
                         .filter(s -> s.getId().equals(sizeMeasureId)).findFirst();
    346 346 
             }

  • client/src/main/java/fr/ird/observe/client/ui/content/table/ContentTableUIHandler.java
    ... ... @@ -356,7 +356,7 @@ public abstract class ContentTableUIHandler<E extends IdDto, D extends IdDto, U
    356 356 
          */
    357 357 
         protected Optional<SpeciesReference> getWeightCategorySpecies(WeightCategoryReference weightCategory) {
    358 358
    359 
    -        String speciesId = (String) weightCategory.getSpeciesId();
    359 
    +        String speciesId = weightCategory.getSpeciesId();
    360 360
    361 361 
             return getModel().tryGetReferentialReferenceById(TargetCatchDto.PROPERTY_SPECIES, speciesId);
    362 362 
         }

  • client/src/main/java/fr/ird/observe/client/ui/content/table/GearUseFeatureMeasurementCellRenderer.java
    ... ... @@ -90,7 +90,7 @@ public class GearUseFeatureMeasurementCellRenderer implements TableCellRenderer
    90 90 
                 tableCellRenderer = table.getDefaultRenderer(Object.class);
    91 91
    92 92 
             } else {
    93 
    -            String gearCaracteristicTypeId = (String) caracteristicRef.getPropertyValue(GearCaracteristicDto.PROPERTY_GEAR_CARACTERISTIC_TYPE);
    93 
    +            String gearCaracteristicTypeId = caracteristicRef.getPropertyValue(GearCaracteristicDto.PROPERTY_GEAR_CARACTERISTIC_TYPE);
    94 94
    95 95 
                 tableCellRenderer = renderersByCaracteristicTypeId.get(gearCaracteristicTypeId);
    96 96

  • dto/src/main/java/fr/ird/observe/dto/data/seine/FloatingObjectTransmittingBuoyDto.java
    ... ... @@ -49,7 +49,7 @@ public class FloatingObjectTransmittingBuoyDto extends GeneratedFloatingObjectTr
    49 49 
                 // - pose d'une nouvelle balise
    50 50 
                 TransmittingBuoyDto balise = Iterables.get(transmittingBuoy, 0);
    51 51 
                 TransmittingBuoyOperationReference objectOperation = balise.getTransmittingBuoyOperation();
    52 
    -            String code = (String) objectOperation.getCode();
    52 
    +            String code = objectOperation.getCode();
    53 53 
                 switch (Integer.valueOf(code)) {
    54 54 
                     case 1:
    55 55

  • dto/src/main/java/fr/ird/observe/dto/decoration/decorators/ObserveDecorator.java
    ... ... @@ -114,7 +114,7 @@ public class ObserveDecorator<E> extends MultiJXPathDecorator<E> implements Clon
    114 114
    115 115 
             String lastToken = tokens[tokens.length - 1];
    116 116 
             if (referenceBean.getPropertyNames().contains(lastToken)) {
    117 
    -            value = (Comparable<Comparable<?>>) referenceBean.getPropertyValue(lastToken);
    117 
    +            value = referenceBean.getPropertyValue(lastToken);
    118 118 
             }
    119 119
    120 120 
             return value;

  • dto/src/main/java/fr/ird/observe/dto/referential/seine/VesselActivitySeineHelper.java
    ... ... @@ -43,7 +43,7 @@ public class VesselActivitySeineHelper extends GeneratedVesselActivitySeineHelpe
    43 43 
         public static boolean isDcpOperation(VesselActivitySeineReference reference) {
    44 44 
             boolean result = reference != null;
    45 45 
             if (result) {
    46 
    -            result = (boolean) reference.isAllowFad();
    46 
    +            result = reference.isAllowFad();
    47 47 
             }
    48 48 
             return result;
    49 49 
         }

  • dto/src/main/java/fr/ird/observe/dto/referential/seine/WeightCategoryHelper.java
    ... ... @@ -59,7 +59,7 @@ public class WeightCategoryHelper extends GeneratedWeightCategoryHelper {
    59 59
    60 60 
             @Override
    61 61 
             public boolean test(WeightCategoryReference input) {
    62 
    -            String inputSpeciesId = (String) input.getSpeciesId();
    62 
    +            String inputSpeciesId = input.getSpeciesId();
    63 63 
                 return speciesId.equals(inputSpeciesId);
    64 64 
             }
    65 65

  • services/src/main/java/fr/ird/observe/services/validation/validators/QuadrantFieldDtoValidator.java
    ... ... @@ -57,7 +57,7 @@ public class QuadrantFieldDtoValidator extends FieldValidatorSupport {
    57 57 
                 return;
    58 58 
             }
    59 59
    60 
    -        Integer code = Integer.valueOf((String) ocean.getCode());
    60 
    +        Integer code = Integer.valueOf(ocean.getCode());
    61 61 
             boolean valid = code == 3
    62 62 
                     || (code == 1 && (quadrant == 1 || quadrant == 2 || quadrant == 3 || quadrant == 4))
    63 63 
                     || (code == 2 && (quadrant == 1 || quadrant == 2));

    • —
    View it on GitLab.
    You're receiving this email because of your account on gitlab.com. If you'd like to receive fewer emails, you can adjust your notification settings.