Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: 24c70bef by tchemit at 2020-04-01T11:14:00+02:00 Erreur sur changement de caractéristique d'équipement de type de donnée différent - Closes #1437 - - - - - 3 changed files: - client-core/src/main/java/fr/ird/observe/client/ui/content/table/GearUseFeatureMeasurementCellEditor.java - client-core/src/main/java/fr/ird/observe/client/ui/content/table/GearUseFeatureMeasurementCellRenderer.java - dto/src/main/java/fr/ird/observe/dto/referential/GearCaracteristicTypeHelper.java Changes: ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/table/GearUseFeatureMeasurementCellEditor.java ===================================== @@ -159,7 +159,7 @@ public class GearUseFeatureMeasurementCellEditor implements TableCellEditor { Map<String, TableCellEditor> editors = getEditorsByGearCaracteristicId(table); editor = editors.get(gearCaracteristicTypeId); - value = GearCaracteristicTypeHelper.getTypeValue(gearCaracteristicTypeId, value); + value = GearCaracteristicTypeHelper.getOptionalTypeValue(gearCaracteristicTypeId, value).orElse(null); } ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/table/GearUseFeatureMeasurementCellRenderer.java ===================================== @@ -93,7 +93,7 @@ public class GearUseFeatureMeasurementCellRenderer implements TableCellRenderer tableCellRenderer = renderersByCaracteristicTypeId.get(gearCaracteristicTypeId); - value = GearCaracteristicTypeHelper.getTypeValue(gearCaracteristicTypeId, value); + value = GearCaracteristicTypeHelper.getOptionalTypeValue(gearCaracteristicTypeId, value).orElse(null); } ===================================== dto/src/main/java/fr/ird/observe/dto/referential/GearCaracteristicTypeHelper.java ===================================== @@ -23,11 +23,16 @@ package fr.ird.observe.dto.referential; */ import com.google.common.collect.Sets; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import java.util.Optional; import java.util.Set; public class GearCaracteristicTypeHelper extends GeneratedGearCaracteristicTypeHelper { + private static final Logger log = LogManager.getLogger(GearCaracteristicTypeHelper.class); + private static final Set<String> INTEGER_IDS = Sets.newHashSet( "fr.ird.observe.entities.referentiel.GearCaracteristicType#1239832686123#0.3", "fr.ird.observe.entities.referentiel.GearCaracteristicType#1239832686123#0.5" @@ -67,6 +72,14 @@ public class GearCaracteristicTypeHelper extends GeneratedGearCaracteristicTypeH return FLOAT_IDS.contains(gearCaracteristicTypeId); } + public static Optional<Object> getOptionalTypeValue(String gearCaracteristicTypeId, Object value) { + try { + return Optional.ofNullable(getTypeValue(gearCaracteristicTypeId, value)); + } catch (Exception e) { + log.error(String.format("Could not get editor value from: %s", value), e); + return Optional.empty(); + } + } public static Object getTypeValue(String gearCaracteristicTypeId, Object value) { View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/24c70befbebc8a52911c1f44ec... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/24c70befbebc8a52911c1f44ec... You're receiving this email because of your account on gitlab.com.