GitLab

at 2023-03-13T13:43:40+01:00

La supression d'un panier du schéma de palangre supprime toute la section - Closes #2643

             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());

         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);

     @Override

     public BranchlineDto createNewRow() {

         BranchlineDto branchline = BranchlineDto.newDto(new Date());

-        branchline.setTimer(useTimer);

+        branchline.setTimer(isUseTimer());

         branchline.setNotUsed(true);

         return branchline;

     }

             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());

         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);

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

Commits:

3 changed files:

Changes: