Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 5108e2da by Tony Chemit at 2022-10-24T22:24:54+02:00 Formulaire équipements - Closes #2494 - - - - - 1582f292 by Tony Chemit at 2022-10-24T22:25:06+02:00 Problème de time zone le retour - Closes #2016 - - - - - 5 changed files: - client/core/src/main/java/fr/ird/observe/client/util/table/JXTableUtil.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/GearUseFeatureMeasurementCellEditor.java - model/src/main/models/Observe/dto/class/decorator.properties - pom.xml - toolkit/api/src/main/java/fr/ird/observe/spi/decoration/DefaultDecoratorRenderer.java Changes: ===================================== client/core/src/main/java/fr/ird/observe/client/util/table/JXTableUtil.java ===================================== @@ -30,14 +30,18 @@ import io.ultreia.java4all.decoration.Decorator; import org.jdesktop.swingx.JXTable; import org.jdesktop.swingx.renderer.DefaultTableRenderer; import org.jdesktop.swingx.renderer.StringValue; +import org.nuiton.jaxx.runtime.swing.SwingUtil; +import org.nuiton.jaxx.widgets.number.NumberCellEditor; import javax.swing.JComponent; import javax.swing.JScrollPane; import javax.swing.JTable; +import javax.swing.border.LineBorder; import javax.swing.table.TableCellEditor; import javax.swing.table.TableCellRenderer; import javax.swing.table.TableColumn; import javax.swing.table.TableColumnModel; +import java.awt.Color; import java.awt.Component; import java.awt.Dimension; import java.util.Collection; @@ -190,6 +194,16 @@ public class JXTableUtil { return getDefaultTableRenderer(sv, true); } + //FIXME Move this back to JAXX (NumberCellEditor) + public static TableCellEditor newInteger4ColumnEditor(boolean useSign) { + NumberCellEditor<Integer> editor = new NumberCellEditor<>(Integer.class, useSign); + editor.getNumberEditor().setSelectAllTextOnError(true); + editor.getNumberEditor().getTextField().setBorder(new LineBorder(Color.GRAY, 2)); + editor.getNumberEditor().setNumberPattern(SwingUtil.INT_4_DIGITS_PATTERN); + return editor; + + } + private static DefaultTableRenderer getDefaultTableRenderer(StringValue sv, boolean useStringValue) { return new DefaultTableRenderer(sv) { @Override ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/GearUseFeatureMeasurementCellEditor.java ===================================== @@ -22,6 +22,7 @@ package fr.ird.observe.client.datasource.editor.api.content.data; * #L% */ +import fr.ird.observe.client.util.table.JXTableUtil; import fr.ird.observe.dto.ProtectedIdsCommon; import fr.ird.observe.dto.referential.common.GearCharacteristicReference; import fr.ird.observe.dto.referential.common.GearCharacteristicTypeReference; @@ -86,9 +87,9 @@ public class GearUseFeatureMeasurementCellEditor implements TableCellEditor { editorsByGearCharacteristicId = new TreeMap<>(); editorsByGearCharacteristicId.put(ProtectedIdsCommon.COMMON_GEAR_CHARACTERISTIC_TYPE_TEXT, table.getDefaultEditor(Object.class)); editorsByGearCharacteristicId.put(ProtectedIdsCommon.COMMON_GEAR_CHARACTERISTIC_TYPE_BOOLEAN, table.getDefaultEditor(Boolean.class)); - editorsByGearCharacteristicId.put(ProtectedIdsCommon.COMMON_GEAR_CHARACTERISTIC_TYPE_INTEGER_SIGNED, NumberCellEditor.newIntegerColumnEditor(true)); + editorsByGearCharacteristicId.put(ProtectedIdsCommon.COMMON_GEAR_CHARACTERISTIC_TYPE_INTEGER_SIGNED, JXTableUtil.newInteger4ColumnEditor(true)); editorsByGearCharacteristicId.put(ProtectedIdsCommon.COMMON_GEAR_CHARACTERISTIC_TYPE_FLOAT_SIGNED, NumberCellEditor.newFloatColumnEditor(true)); - editorsByGearCharacteristicId.put(ProtectedIdsCommon.COMMON_GEAR_CHARACTERISTIC_TYPE_INTEGER_UNSIGNED, NumberCellEditor.newIntegerColumnEditor(false)); + editorsByGearCharacteristicId.put(ProtectedIdsCommon.COMMON_GEAR_CHARACTERISTIC_TYPE_INTEGER_UNSIGNED, JXTableUtil.newInteger4ColumnEditor(false)); editorsByGearCharacteristicId.put(ProtectedIdsCommon.COMMON_GEAR_CHARACTERISTIC_TYPE_FLOAT_UNSIGNED, NumberCellEditor.newFloatColumnEditor(false)); } return editorsByGearCharacteristicId; ===================================== model/src/main/models/Observe/dto/class/decorator.properties ===================================== @@ -101,6 +101,7 @@ data.ps.pairing.ActivityPairingResultItem=${observationActivity}##$(observe.data presets.RemoteDataSourceConfiguration=${name} presets.ServerDataSourceConfiguration=${name} referential.common.FpaZone=${code}##${this::label} +referential.common.GearCharacteristic=${code}##${this::label}##${unit::onUnit} referential.common.Harbour=${this::label}##${code}##${locode} referential.common.LengthLengthParameter=${speciesFaoCode}##${speciesLabel::speciesSimpleLabel}##$(observe.Common.ocean) ${ocean::labelOrUnknown}##$(observe.Common.sex) ${sex::label}##${this::validityRangeLabel}##${inputSizeMeasureType::labelOrUnknown}##${outputSizeMeasureType::labelOrUnknown} referential.common.LengthWeightParameter=${speciesFaoCode}##${speciesLabel::speciesSimpleLabel}##$(observe.Common.ocean) ${ocean::labelOrUnknown}##$(observe.Common.sex) ${sex::label}##${this::validityRangeLabel}##${sizeMeasureType::labelOrUnknown} ===================================== pom.xml ===================================== @@ -114,6 +114,7 @@ <!-- build timestamp configuration --> <maven.build.timestamp.format>dd/MM/yyyy HH:mm z</maven.build.timestamp.format> <buildDate>${maven.build.timestamp}</buildDate> + <lib.version.java4all.java-util>1.1.6</lib.version.java4all.java-util> <lib.version.ognl>3.1.29</lib.version.ognl> <!-- FIXME <lib.version.ognl>3.3.2</lib.version.ognl>--> <lib.version.h2>1.4.196</lib.version.h2> ===================================== toolkit/api/src/main/java/fr/ird/observe/spi/decoration/DefaultDecoratorRenderer.java ===================================== @@ -32,8 +32,6 @@ import io.ultreia.java4all.i18n.I18n; import java.util.Date; import java.util.Locale; -import static io.ultreia.java4all.i18n.I18n.t; - /** * Created on 20/07/2021. * @@ -49,9 +47,6 @@ public class DefaultDecoratorRenderer<O> extends DecoratorRenderer<O> { @Override public String onNullValue(String propertyName, Locale locale, Object value) { if (value == null) { - if (propertyName.equals("unit")) { - return t("observe.Common.no.unit"); - } return I18n.l(locale, "observe.Common.none"); } if (propertyName.equals(WithStartEndDate.PROPERTY_VALIDITY_RANGE_LABEL)) { @@ -60,6 +55,13 @@ public class DefaultDecoratorRenderer<O> extends DecoratorRenderer<O> { return value.toString(); } + public String onUnit(Locale locale, String value) { + if (value == null) { + return I18n.l(locale, "observe.Common.no.unit"); + } + return value; + } + @Override public String onNullValue(Locale locale, Object value) { if (value == null) return I18n.l(locale, "observe.Common.none"); View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/0068d0bd3eec85ca26cf8d92b... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/0068d0bd3eec85ca26cf8d92b... You're receiving this email because of your account on gitlab.com.