Changeset 2749 in josm for trunk/src/org/openstreetmap/josm/gui/dialogs/DialogsPanel.java

Timestamp:

2010-01-07T07:58:44+01:00 (14 years ago)

Author:

jttt

Message:

Workaround division by zero exception when geoimage layer is added as first layer

File:

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

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

@@ -40 +40 @@
         allDialogs = new ArrayList<ToggleDialog>();
 
-        for (Integer i=0; i < pAllDialogs.size(); ++i) {
-            add(pAllDialogs.get(i), false);
+        for (ToggleDialog dialog: pAllDialogs) {
+            add(dialog, false);
         }
 
@@ -106 +106 @@
         /*  INVISIBLE_TO_COLLAPSED,    does not happen */
         ELEMENT_SHRINKS         /* else. (Remaining elements have more space.) */
-    };
+    }
     /**
      * Reconstruct the view, if the configurations of dialogs has changed.
@@ -119 +119 @@
          * reset the panels
          */
-        for (int i=0; i < N; ++i) {
-            final JPanel p = panels.get(i);
+        for (JPanel p: panels) {
             p.removeAll();
             p.setVisible(false);
@@ -180 +179 @@
             int sumC = 0;   // sum of heights of all collapsed dialogs (triggering dialog is never collapsed)
 
-            for (int i=0; i<N; ++i) {
-                final ToggleDialog dlg = allDialogs.get(i);
+            for (ToggleDialog dlg: allDialogs) {
                 if (dlg.isDialogInDefaultView()) {
                     if (dlg != triggeredBy) {
                         final int ph = dlg.getPreferredHeight();
-                        final int ah = dlg.getSize().height;
+                        final int ah = dlg.getHeight();
                         sumP += ph;
                         sumA += ah;
                     }
-                }
-                else if (dlg.isDialogInCollapsedView()) {
-                    sumC += dlg.getSize().height;
+                } else if (dlg.isDialogInCollapsedView()) {
+                    sumC += dlg.getHeight();
                 }
             }
@@ -234 +231 @@
                 final ToggleDialog dlg = allDialogs.get(i);
                 if (dlg.isDialogInDefaultView() && dlg != triggeredBy) {
-                    final int ha = dlg.getSize().height;
+                    final int ha = dlg.getHeight();
                     final int h0 = ha * R / sumA;
                     final int he = dlg.getPreferredHeight() * s2 / (sumP + hp_trig);
@@ -246 +243 @@
                         } catch (ArithmeticException e) { /* D_p may be zero - nothing wrong with that. */
                             d = 0;
-                        };
+                        }
                         dlg.setPreferredSize(new Dimension(Integer.MAX_VALUE, h0 - d));
                     }