Changeset 14766 in josm for trunk/src

Timestamp:

2019-02-06T11:07:19+01:00 (6 years ago)

Author:

GerdP

Message:

fix sonar issue: "parent" is the name of a field in "Component"
Simpify code in reconstruct()

File:

• trunk/src/org/openstreetmap/josm/gui/dialogs/DialogsPanel.java (modified) (5 diffs)

trunk/src/org/openstreetmap/josm/gui/dialogs/DialogsPanel.java

@@ -38 +38 @@
     public boolean initialized;
 
-    private final JSplitPane parent;
+    private final JSplitPane myParent;
 
     /**
@@ -45 +45 @@
      */
     public DialogsPanel(JSplitPane parent) {
-        this.parent = parent;
+        this.myParent = parent;
     }
 
@@ -192 +192 @@
          * Determine the panel geometry
          */
-        if (action == Action.RESTORE_SAVED) {
+        if (action == Action.RESTORE_SAVED || action == Action.ELEMENT_SHRINKS) {
             for (int i = 0; i < n; ++i) {
                 final ToggleDialog dlg = allDialogs.get(i);
                 if (dlg.isDialogInDefaultView()) {
-                    final int ph = dlg.getLastHeight();
-                    final int ah = dlg.getSize().height;
-                    dlg.setPreferredSize(new Dimension(Integer.MAX_VALUE, ah < 20 ? ph : ah));
-                }
-            }
-
-        } else if (action == Action.ELEMENT_SHRINKS) {
-            for (int i = 0; i < n; ++i) {
-                final ToggleDialog dlg = allDialogs.get(i);
-                if (dlg.isDialogInDefaultView()) {
-                    final int ph = dlg.getPreferredHeight();
+                    final int ph = action == Action.RESTORE_SAVED ? dlg.getLastHeight() : dlg.getPreferredHeight();
                     final int ah = dlg.getSize().height;
                     dlg.setPreferredSize(new Dimension(Integer.MAX_VALUE, ah < 20 ? ph : ah));
@@ -324 +314 @@
          */
         if (numPanels == 1 && panels.get(n-1).getComponents().length == 0) {
-            parent.setDividerSize(0);
+            myParent.setDividerSize(0);
             this.setVisible(false);
         } else {
@@ -331 +321 @@
             }
             this.setVisible(true);
-            parent.setDividerSize(5);
-            parent.resetToPreferredSizes();
+            myParent.setDividerSize(5);
+            myParent.resetToPreferredSizes();
         }
     }