Ticket #19997: patch_mappaint_empty_submenu.patch

core/src/org/openstreetmap/josm/gui/mappaint/StyleSettingGroupGui.java

@@ -43 +43 @@
         final JMenu submenu = new JMenu();
         submenu.setText(group.label);
         submenu.setIcon(group.icon);
-        // Add the "toggle all settings" action
-        if (settings.size() >= 2) {
-            JMenuItem item = new JMenuItem(new AbstractAction(tr("Toggle all settings")) {
-                @Override
-                public void actionPerformed(ActionEvent e) {
-                    List<BooleanStyleSettingCheckBoxMenuItem> items = Arrays.stream(submenu.getMenuComponents())
-                            .filter(c -> c instanceof BooleanStyleSettingCheckBoxMenuItem)
-                            .map(c -> (BooleanStyleSettingCheckBoxMenuItem) c)
-                            .collect(Collectors.toList());
-                    final boolean select = items.stream().anyMatch(cbi -> !cbi.isSelected());
-                    items.stream().filter(cbi -> select != cbi.isSelected()).forEach(cbi -> cbi.doClickWithoutRepaint(0));
-                    MainApplication.worker.submit(new MapPaintStyleLoader(Arrays.asList(group.parentStyle)));
-                }
-            });
-            item.setUI(new StayOpenCheckBoxMenuItemUI());
-            submenu.add(item);
-            submenu.addSeparator();
+        // Disable submenu if settings is empty
+        if (settings.isEmpty()) {
+            submenu.setEnabled(false);
+        } else {
+            // Add the "toggle all settings" action
+            if (settings.size() >= 2) {
+                JMenuItem item = new JMenuItem(new AbstractAction(tr("Toggle all settings")) {
+                    @Override
+                    public void actionPerformed(ActionEvent e) {
+                        List<BooleanStyleSettingCheckBoxMenuItem> items = Arrays.stream(submenu.getMenuComponents())
+                                .filter(c -> c instanceof BooleanStyleSettingCheckBoxMenuItem)
+                                .map(c -> (BooleanStyleSettingCheckBoxMenuItem) c)
+                                .collect(Collectors.toList());
+                        final boolean select = items.stream().anyMatch(cbi -> !cbi.isSelected());
+                        items.stream().filter(cbi -> select != cbi.isSelected()).forEach(cbi -> cbi.doClickWithoutRepaint(0));
+                        MainApplication.worker.submit(new MapPaintStyleLoader(Arrays.asList(group.parentStyle)));
+                    }
+                });
+                item.setUI(new StayOpenCheckBoxMenuItemUI());
+                submenu.add(item);
+                submenu.addSeparator();
+            }
         }
         // Add individual settings
         for (StyleSetting s : settings) {