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

Commits:

3 changed files:

Changes:

  • client-core/src/main/java/fr/ird/observe/client/ui/content/table/GearUseFeatureMeasurementCellEditor.java
    ... ... @@ -159,7 +159,7 @@ public class GearUseFeatureMeasurementCellEditor implements TableCellEditor {
    159 159 
                 Map<String, TableCellEditor> editors = getEditorsByGearCaracteristicId(table);
    160 160 
                 editor = editors.get(gearCaracteristicTypeId);
    161 161
    162 
    -            value = GearCaracteristicTypeHelper.getTypeValue(gearCaracteristicTypeId, value);
    162 
    +            value = GearCaracteristicTypeHelper.getOptionalTypeValue(gearCaracteristicTypeId, value).orElse(null);
    163 163
    164 164 
             }
    165 165

  • client-core/src/main/java/fr/ird/observe/client/ui/content/table/GearUseFeatureMeasurementCellRenderer.java
    ... ... @@ -93,7 +93,7 @@ public class GearUseFeatureMeasurementCellRenderer implements TableCellRenderer
    93 93
    94 94 
                 tableCellRenderer = renderersByCaracteristicTypeId.get(gearCaracteristicTypeId);
    95 95
    96 
    -            value = GearCaracteristicTypeHelper.getTypeValue(gearCaracteristicTypeId, value);
    96 
    +            value = GearCaracteristicTypeHelper.getOptionalTypeValue(gearCaracteristicTypeId, value).orElse(null);
    97 97
    98 98 
             }
    99 99

  • dto/src/main/java/fr/ird/observe/dto/referential/GearCaracteristicTypeHelper.java
    ... ... @@ -23,11 +23,16 @@ package fr.ird.observe.dto.referential;
    23 23 
      */
    24 24
    25 25 
     import com.google.common.collect.Sets;
    26 
    +import org.apache.logging.log4j.LogManager;
    27 
    +import org.apache.logging.log4j.Logger;
    26 28
    29 
    +import java.util.Optional;
    27 30 
     import java.util.Set;
    28 31
    29 32 
     public class GearCaracteristicTypeHelper extends GeneratedGearCaracteristicTypeHelper {
    30 33
    34 
    +    private static final Logger log = LogManager.getLogger(GearCaracteristicTypeHelper.class);
    35 
    +
    31 36 
         private static final Set<String> INTEGER_IDS = Sets.newHashSet(
    32 37 
                 "fr.ird.observe.entities.referentiel.GearCaracteristicType#1239832686123#0.3",
    33 38 
                 "fr.ird.observe.entities.referentiel.GearCaracteristicType#1239832686123#0.5"
    ... ... @@ -67,6 +72,14 @@ public class GearCaracteristicTypeHelper extends GeneratedGearCaracteristicTypeH
    67 72 
             return FLOAT_IDS.contains(gearCaracteristicTypeId);
    68 73 
         }
    69 74
    75 
    +    public static Optional<Object> getOptionalTypeValue(String gearCaracteristicTypeId, Object value) {
    76 
    +        try {
    77 
    +            return Optional.ofNullable(getTypeValue(gearCaracteristicTypeId, value));
    78 
    +        } catch (Exception e) {
    79 
    +            log.error(String.format("Could not get editor value from: %s", value), e);
    80 
    +            return Optional.empty();
    81 
    +        }
    82 
    +    }
    70 83
    71 84 
         public static Object getTypeValue(String gearCaracteristicTypeId, Object value) {
    72 85

    • —
    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.