Reformat and extract duplicates

animatinetpacs · Dec 26, 2024 · b616d49 · b616d49
1 parent e358917
commit b616d49
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 16 deletions.
diff --git a/...dicom/weasis-dicom-viewer2d/src/main/java/org/weasis/dicom/viewer2d/KeyObjectToolBar.java b/...dicom/weasis-dicom-viewer2d/src/main/java/org/weasis/dicom/viewer2d/KeyObjectToolBar.java
@@ -232,11 +232,11 @@ private void editKo(
           dicomModel.removeHiddenSpecialElement(list.getSelectedValue());
           for (ViewCanvas<DicomImageElement> canvas : selectedView2dContainer.getView2ds()) {
             if (canvas instanceof View2d view2d) {
-                boolean needToRepaint = view2d.updateKOSelectedState(view2d.getImage());
-                if (needToRepaint && view2d==selectedView2d) {
-                    evtMgr.updateKeyObjectComponentsListener(selectedView2d);
-                    repaint();
-                }
+              boolean needToRepaint = view2d.updateKOSelectedState(view2d.getImage());
+              if (needToRepaint && view2d == selectedView2d) {
+                evtMgr.updateKeyObjectComponentsListener(selectedView2d);
+                repaint();
+              }
             }
           }
         }

diff --git a/...-dicom/weasis-dicom-viewer2d/src/main/java/org/weasis/dicom/viewer2d/View2dContainer.java b/...-dicom/weasis-dicom-viewer2d/src/main/java/org/weasis/dicom/viewer2d/View2dContainer.java
@@ -687,11 +687,7 @@ private void setKOSpecialElement(
         if (updateAll) {
           List<ViewCanvas<DicomImageElement>> viewList = getImagePanels(true);
           for (ViewCanvas<DicomImageElement> view : viewList) {
-            if (forceUpdate
-                    || updatedKOSelection == view.getActionValue(ActionW.KO_SELECTION.cmd())) {
-              KOManager.updateKOFilter(
-                      view, forceUpdate ? updatedKOSelection : null, enableFilter, -1);
-            }
+            updateKoView(updatedKOSelection, enableFilter, forceUpdate, view);
             ((View2d) view).updateKOButtonVisibleState();
           }
         } else {
@@ -710,12 +706,7 @@ private void setKOSpecialElement(
           if (!(view.getSeries() instanceof DicomSeries dicomSeries) || !(view instanceof View2d)) {
             continue;
           }
-
-          if (forceUpdate
-              || updatedKOSelection == view.getActionValue(ActionW.KO_SELECTION.cmd())) {
-            KOManager.updateKOFilter(
-                view, forceUpdate ? updatedKOSelection : null, enableFilter, -1);
-          }
+          updateKoView(updatedKOSelection, enableFilter, forceUpdate, view);
 
           String seriesInstanceUID =
               TagD.getTagValue(dicomSeries, Tag.SeriesInstanceUID, String.class);
@@ -732,6 +723,16 @@ private void setKOSpecialElement(
     }
   }
 
+  private static void updateKoView(
+      KOSpecialElement updatedKOSelection,
+      Boolean enableFilter,
+      boolean forceUpdate,
+      ViewCanvas<DicomImageElement> view) {
+    if (forceUpdate || updatedKOSelection == view.getActionValue(ActionW.KO_SELECTION.cmd())) {
+      KOManager.updateKOFilter(view, forceUpdate ? updatedKOSelection : null, enableFilter, -1);
+    }
+  }
+
   @Override
   public int getViewTypeNumber(GridBagLayoutModel layout, Class<?> defaultClass) {
     return View2dFactory.getViewTypeNumber(layout, defaultClass);