Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe
Commits:
3 changed files:
- client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/data/table/ContentTableUIHandler.java
- client-datasource-editor-common/src/main/java/fr/ird/observe/client/datasource/editor/content/data/TripUIHelper.java
- client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/observation/actions/BranchlineUIReset.java
Changes:
| ... | ... | @@ -204,7 +204,10 @@ public abstract class ContentTableUIHandler<D extends DataDto, C extends DataDto |
| 204 | 204 |
if (selectedRow == -1) {
|
| 205 | 205 |
selectedRow = 0;
|
| 206 | 206 |
}
|
| 207 |
- log.info("Select row: " + selectedRow);
|
|
| 207 |
+ if (selectedRow >= tableModel.getRowCount()) {
|
|
| 208 |
+ selectedRow = 0;
|
|
| 209 |
+ }
|
|
| 210 |
+ log.info(String.format("Select row: %d", selectedRow));
|
|
| 208 | 211 |
tableModel.changeSelectedRow(-1);
|
| 209 | 212 |
tableModel.changeSelectedRow(selectedRow);
|
| 210 | 213 |
}
|
| ... | ... | @@ -71,7 +71,7 @@ public abstract class TripUIHelper<U extends ContentOpenableUI & TripUI> impleme |
| 71 | 71 |
}
|
| 72 | 72 |
|
| 73 | 73 |
public void onOpenAfterOpenModel() {
|
| 74 |
- ui.getMainTabbedPane().setSelectedIndex(0);
|
|
| 74 |
+// ui.getMainTabbedPane().setSelectedIndex(0);
|
|
| 75 | 75 |
closeMap();
|
| 76 | 76 |
}
|
| 77 | 77 |
|
| ... | ... | @@ -37,6 +37,7 @@ public class BranchlineUIReset extends Reset<BranchlineUI> { |
| 37 | 37 |
@Override
|
| 38 | 38 |
public void doReset() {
|
| 39 | 39 |
super.doReset();
|
| 40 |
+ ui.getModel().setResetEdit(true);
|
|
| 40 | 41 |
BranchlineUIHandler handler = ui.getHandler();
|
| 41 | 42 |
try {
|
| 42 | 43 |
BranchlineDto branchline = ui.getModel().getBranchline();
|