Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 017569cd by tchemit at 2019-02-16T12:55:01Z Equipement bateau, bug sur suppression de caractéristique - Closes #1232 - - - - - 2 changed files: - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/common/GearUseFeaturesLonglineUIHandler.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/common/GearUseFeaturesSeineUIHandler.java Changes: ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/common/GearUseFeaturesLonglineUIHandler.java ===================================== @@ -372,6 +372,9 @@ public class GearUseFeaturesLonglineUIHandler extends ContentTableUIHandler<Trip } private void selectCell(GearUseFeaturesLonglineUI ui, int selectedColumn, int selectedRow) { + if (selectedRow >= ui.getMeasurementsTableModel().getRowCount()) { + return; + } SwingUtilities.invokeLater(() -> { cellEditorAdjusting = true; try { ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/common/GearUseFeaturesSeineUIHandler.java ===================================== @@ -144,17 +144,6 @@ public class GearUseFeaturesSeineUIHandler extends ContentTableUIHandler<TripSei }); } - private void selectCell(GearUseFeaturesSeineUI ui, int selectedColumn, int selectedRow) { - SwingUtilities.invokeLater(() -> { - cellEditorAdjusting = true; - try { - JTables.doSelectCell(ui.getMeasurementsTable(), selectedRow, selectedColumn); - } finally { - cellEditorAdjusting = false; - } - }); - } - @Override public void startEditUI() { getModel().getMeasurementsTableModel().setEditable(true); @@ -361,21 +350,6 @@ public class GearUseFeaturesSeineUIHandler extends ContentTableUIHandler<TripSei return (GearUseFeaturesSeineTableModel) super.getTableModel(); } - private void setTableModelEditable(Boolean newValue) { - getModel().getMeasurementsTableModel().setEditable(newValue); - } - - private void onMeasurementsTableModelModified(Boolean newValue) { - if (newValue) { - // modify the validator, since this is the best way to prevent table edit form actions - // that something was modified on the form - ui.getValidatorTable().setChanged(true); - } - // recompute table model valid state - getModel().getMeasurementsTableModel().validate(); - } - - @Override public boolean prepareSave(TripSeineGearUseDto editBean, List<GearUseFeaturesSeineDto> objects) throws Exception { // On ne persiste pas les measurements qui sont vides @@ -427,4 +401,32 @@ public class GearUseFeaturesSeineUIHandler extends ContentTableUIHandler<TripSei }; } + + private void selectCell(GearUseFeaturesSeineUI ui, int selectedColumn, int selectedRow) { + if (selectedRow >= ui.getMeasurementsTableModel().getRowCount()) { + return; + } + SwingUtilities.invokeLater(() -> { + cellEditorAdjusting = true; + try { + JTables.doSelectCell(ui.getMeasurementsTable(), selectedRow, selectedColumn); + } finally { + cellEditorAdjusting = false; + } + }); + } + + private void setTableModelEditable(Boolean newValue) { + getModel().getMeasurementsTableModel().setEditable(newValue); + } + + private void onMeasurementsTableModelModified(Boolean newValue) { + if (newValue) { + // modify the validator, since this is the best way to prevent table edit form actions + // that something was modified on the form + ui.getValidatorTable().setChanged(true); + } + // recompute table model valid state + getModel().getMeasurementsTableModel().validate(); + } } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/017569cd5262a9b8a4a6f69788e7... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/017569cd5262a9b8a4a6f69788e7... You're receiving this email because of your account on gitlab.com.