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

Commits:

2 changed files:

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
    372 372
         }
    
    373 373
     
    
    374 374
         private void selectCell(GearUseFeaturesLonglineUI ui, int selectedColumn, int selectedRow) {
    
    375
    +        if (selectedRow >= ui.getMeasurementsTableModel().getRowCount()) {
    
    376
    +            return;
    
    377
    +        }
    
    375 378
             SwingUtilities.invokeLater(() -> {
    
    376 379
                 cellEditorAdjusting = true;
    
    377 380
                 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
    144 144
             });
    
    145 145
         }
    
    146 146
     
    
    147
    -    private void selectCell(GearUseFeaturesSeineUI ui, int selectedColumn, int selectedRow) {
    
    148
    -        SwingUtilities.invokeLater(() -> {
    
    149
    -            cellEditorAdjusting = true;
    
    150
    -            try {
    
    151
    -                JTables.doSelectCell(ui.getMeasurementsTable(), selectedRow, selectedColumn);
    
    152
    -            } finally {
    
    153
    -                cellEditorAdjusting = false;
    
    154
    -            }
    
    155
    -        });
    
    156
    -    }
    
    157
    -
    
    158 147
         @Override
    
    159 148
         public void startEditUI() {
    
    160 149
             getModel().getMeasurementsTableModel().setEditable(true);
    
    ... ... @@ -361,21 +350,6 @@ public class GearUseFeaturesSeineUIHandler extends ContentTableUIHandler<TripSei
    361 350
             return (GearUseFeaturesSeineTableModel) super.getTableModel();
    
    362 351
         }
    
    363 352
     
    
    364
    -    private void setTableModelEditable(Boolean newValue) {
    
    365
    -        getModel().getMeasurementsTableModel().setEditable(newValue);
    
    366
    -    }
    
    367
    -
    
    368
    -    private void onMeasurementsTableModelModified(Boolean newValue) {
    
    369
    -        if (newValue) {
    
    370
    -            // modify the validator, since this is the best way to prevent table edit form actions
    
    371
    -            // that something was modified on the form
    
    372
    -            ui.getValidatorTable().setChanged(true);
    
    373
    -        }
    
    374
    -        // recompute table model valid state
    
    375
    -        getModel().getMeasurementsTableModel().validate();
    
    376
    -    }
    
    377
    -
    
    378
    -
    
    379 353
         @Override
    
    380 354
         public boolean prepareSave(TripSeineGearUseDto editBean, List<GearUseFeaturesSeineDto> objects) throws Exception {
    
    381 355
             // On ne persiste pas les measurements qui sont vides
    
    ... ... @@ -427,4 +401,32 @@ public class GearUseFeaturesSeineUIHandler extends ContentTableUIHandler<TripSei
    427 401
     
    
    428 402
             };
    
    429 403
         }
    
    404
    +
    
    405
    +    private void selectCell(GearUseFeaturesSeineUI ui, int selectedColumn, int selectedRow) {
    
    406
    +        if (selectedRow >= ui.getMeasurementsTableModel().getRowCount()) {
    
    407
    +            return;
    
    408
    +        }
    
    409
    +        SwingUtilities.invokeLater(() -> {
    
    410
    +            cellEditorAdjusting = true;
    
    411
    +            try {
    
    412
    +                JTables.doSelectCell(ui.getMeasurementsTable(), selectedRow, selectedColumn);
    
    413
    +            } finally {
    
    414
    +                cellEditorAdjusting = false;
    
    415
    +            }
    
    416
    +        });
    
    417
    +    }
    
    418
    +
    
    419
    +    private void setTableModelEditable(Boolean newValue) {
    
    420
    +        getModel().getMeasurementsTableModel().setEditable(newValue);
    
    421
    +    }
    
    422
    +
    
    423
    +    private void onMeasurementsTableModelModified(Boolean newValue) {
    
    424
    +        if (newValue) {
    
    425
    +            // modify the validator, since this is the best way to prevent table edit form actions
    
    426
    +            // that something was modified on the form
    
    427
    +            ui.getValidatorTable().setChanged(true);
    
    428
    +        }
    
    429
    +        // recompute table model valid state
    
    430
    +        getModel().getMeasurementsTableModel().validate();
    
    431
    +    }
    
    430 432
     }