Changeset 16438 in josm for trunk/src/org/openstreetmap/josm/gui/MenuScroller.java

Timestamp:

2020-05-17T14:18:22+02:00 (4 years ago)

Author:

simon04

Message:

see #19251 - Java 8: use Stream

File:

• trunk/src/org/openstreetmap/josm/gui/MenuScroller.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/MenuScroller.java

@@ -306 +306 @@
         if (menuItems != null && menuItems.length > 0) {
 
-            int allItemsHeight = 0;
-            for (Component item : menuItems) {
-                allItemsHeight += item.getPreferredSize().height;
-            }
-
+            int allItemsHeight = Arrays.stream(menuItems).mapToInt(item -> item.getPreferredSize().height).sum();
             int allowedHeight = WindowGeometry.getMaxDimensionOnScreen(menu).height - MainApplication.getMainFrame().getInsets().top;
-
-            boolean mustSCroll = allItemsHeight > allowedHeight;
-
-            if (mustSCroll) {
+            boolean mustScroll = allItemsHeight > allowedHeight;
+            if (mustScroll) {
                 firstIndex = Math.min(menuItems.length-1, Math.max(topFixedCount, firstIndex));
                 int scrollCount = computeScrollCount(firstIndex);