Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 36e3d849 by Tony Chemit at 2023-03-13T13:44:46+01:00 La supression d'un panier du schéma de palangre supprime toute la section - Closes #2643 - - - - - 3 changed files: - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/composition/basket/BasketTableModel.java - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/composition/branchline/BranchlineTableModel.java - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/composition/section/SectionTableModel.java Changes: ===================================== client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/composition/basket/BasketTableModel.java ===================================== @@ -218,7 +218,7 @@ public class BasketTableModel extends LonglineCompositionTableModel<BasketDto> { BranchlineTableModel tableModel = getModel().getStates().getBranchlinesTableModel(); BranchlineDto newBranchline = tableModel.insert(before); BasketDto selectedBasket = getModel().getStates().getBasketsTableModel().getSelectedRow(); - if (selectedBasket.isBranchlineEmpty()) { + if (Objects.requireNonNull(selectedBasket).isBranchlineEmpty()) { selectedBasket.setBranchline(new LinkedHashSet<>()); } List<BranchlineDto> branchlines = new ArrayList<>(selectedBasket.getBranchline()); @@ -236,7 +236,8 @@ public class BasketTableModel extends LonglineCompositionTableModel<BasketDto> { SetDetailCompositionUIModel model = getModel(); model.getStates().setSkipSavePreviousSelectedBranchline(true); try { - getSelectedRow().getBranchline().remove(selectedBranchline); + BasketDto selectedRow = getSelectedRow(); + Objects.requireNonNull(selectedRow).getBranchline().remove(selectedBranchline); model.getStates().getBranchlinesTableModel().removeSelectedRow(); } finally { model.getStates().setSkipSavePreviousSelectedBranchline(false); ===================================== client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/composition/branchline/BranchlineTableModel.java ===================================== @@ -165,7 +165,7 @@ public class BranchlineTableModel extends LonglineCompositionTableModel<Branchli @Override public BranchlineDto createNewRow() { BranchlineDto branchline = BranchlineDto.newDto(new Date()); - branchline.setTimer(useTimer); + branchline.setTimer(isUseTimer()); branchline.setNotUsed(true); return branchline; } ===================================== client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/composition/section/SectionTableModel.java ===================================== @@ -257,7 +257,7 @@ public class SectionTableModel extends LonglineCompositionTableModel<SectionDto> BasketTableModel tableModel = getModel().getStates().getBasketsTableModel(); BasketDto newBasket = tableModel.insert(before); SectionDto selectedSection = getSelectedRow(); - if (selectedSection.isBasketEmpty()) { + if (Objects.requireNonNull(selectedSection).isBasketEmpty()) { selectedSection.setBasket(new LinkedHashSet<>()); } List<BasketDto> baskets = new ArrayList<>(selectedSection.getBasket()); @@ -274,8 +274,9 @@ public class SectionTableModel extends LonglineCompositionTableModel<SectionDto> validationHelper.setObjectValueAdjusting(true); getModel().getStates().setSkipSavePreviousSelectedBasket(true); try { - getSelectedRow().getBasket().remove(selectedBasket); - removeSelectedRow(); + SectionDto selectedRow = getSelectedRow(); + Objects.requireNonNull(selectedRow).getBasket().remove(selectedBasket); + getModel().getStates().getBasketsTableModel().removeSelectedRow(); } finally { getModel().getStates().setSkipSavePreviousSelectedBasket(false); validationHelper.setObjectValueAdjusting(false); View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/36e3d84980a1c57b9f2ff8b9eb... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/36e3d84980a1c57b9f2ff8b9eb... You're receiving this email because of your account on gitlab.com.