Changeset 16096 in josm

Timestamp:

2020-03-08T21:33:06+01:00 (5 years ago)

Author:

Don-vip

Message:

fix #18649 - imagery menu: Do not create category submenu with only one entry

File:

• trunk/src/org/openstreetmap/josm/gui/ImageryMenu.java (modified) (4 diffs)

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

@@ -163 +163 @@
         removeDynamicItems();
 
-        addDynamic(offsetMenuItem, null);
+        addDynamic(offsetMenuItem);
         addDynamicSeparator();
 
@@ -195 +195 @@
                 for (Entry<ImageryCategory, List<JMenuItem>> e : dynamicNonPhotoItems.entrySet()) {
                     ImageryCategory cat = e.getKey();
-                    JMenuItem categoryMenu = new JMenu(cat.getDescription());
-                    categoryMenu.setIcon(cat.getIcon(ImageSizes.MENU));
-                    for (JMenuItem it : e.getValue()) {
-                        categoryMenu.add(it);
+                    List<JMenuItem> list = e.getValue();
+                    if (list.size() > 1) {
+                        JMenuItem categoryMenu = new JMenu(cat.getDescription());
+                        categoryMenu.setIcon(cat.getIcon(ImageSizes.MENU));
+                        for (JMenuItem it : list) {
+                            categoryMenu.add(it);
+                        }
+                        dynamicNonPhotoMenus.add(add(categoryMenu));
+                    } else if (!list.isEmpty()) {
+                        dynamicNonPhotoMenus.add(add(list.get(0)));
                     }
-                    dynamicNonPhotoMenus.add(add(categoryMenu));
                 }
             }
@@ -216 +221 @@
         } else {
             // or add the submenu itself
-            addDynamic(subMenu, null);
+            addDynamic(subMenu);
         }
     }
@@ -322 +327 @@
     }
 
-    private void addDynamic(JMenuItem it, ImageryCategory category) {
-        doAddDynamic(it, category);
+    private void addDynamic(JMenuItem it) {
+        doAddDynamic(it, null);
     }