Changeset 17229 in josm for trunk/src

Timestamp:

2020-10-18T12:03:26+02:00 (4 years ago)

Author:

simon04

Message:

see #7548 - Re-organize the preference dialog (hide empty tabs)

Location:

trunk/src/org/openstreetmap/josm/gui/preferences

Files:

• DefaultTabPreferenceSetting.java (modified) (1 diff)
• PreferenceTabbedPane.java (modified) (3 diffs)
• display/DisplayPreference.java (modified) (1 diff)
• map/MapPreference.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/preferences/DefaultTabPreferenceSetting.java

@@ -149 +149 @@
     }
 
+    /**
+     * Determines whether this tab may be hidden (since it does not contain any relevant content)
+     * @return whether this tab may be hidden
+     */
+    protected boolean canBeHidden() {
+        return false;
+    }
+
     @Override
     public String getHelpContext() {

trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java

@@ -20 +20 @@
 import java.util.NoSuchElementException;
 import java.util.Objects;
+import java.util.OptionalInt;
 import java.util.Set;
 import java.util.function.Predicate;
@@ -318 +319 @@
     }
 
-    private void selectTabBy(Predicate<TabPreferenceSetting> predicate) {
-        IntStream.range(0, getTabCount())
+    private OptionalInt indexOfTab(Predicate<TabPreferenceSetting> predicate) {
+        return IntStream.range(0, getTabCount())
                 .filter(i -> getComponentAt(i) instanceof PreferenceTab
                         && predicate.test(((PreferenceTab) getComponentAt(i)).getTabPreferenceSetting()))
-                .findFirst()
-                .ifPresent(this::setSelectedIndex);
+                .findFirst();
+    }
+
+    private void selectTabBy(Predicate<TabPreferenceSetting> predicate) {
+        indexOfTab(predicate).ifPresent(this::setSelectedIndex);
     }
 
@@ -537 +541 @@
                 Logging.warn("Ignoring preferences "+setting);
             }
+        }
+        // Hide empty TabPreferenceSetting (only present for plugins)
+        for (DefaultTabPreferenceSetting tps : Utils.filteredCollection(settings, DefaultTabPreferenceSetting.class)) {
+            if (!tps.canBeHidden() || Utils.filteredCollection(settings, SubPreferenceSetting.class).stream()
+                    .anyMatch(s -> s.getTabPreferenceSetting(this) == tps)) {
+                continue;
+            }
+            indexOfTab(tps::equals).ifPresent(index -> {
+                remove(index);
+                Logging.debug("{0}: hiding empty {1}", getClass().getSimpleName(), tps);
+            });
         }
         if (sel != null) {

trunk/src/org/openstreetmap/josm/gui/preferences/display/DisplayPreference.java

@@ -48 +48 @@
         return HelpUtil.ht("/Preferences/Display");
     }
+
+    @Override
+    protected boolean canBeHidden() {
+        return true;
+    }
 }

trunk/src/org/openstreetmap/josm/gui/preferences/map/MapPreference.java

@@ -47 +47 @@
         return HelpUtil.ht("/Preferences/Map");
     }
+
+    @Override
+    protected boolean canBeHidden() {
+        return true;
+    }
 }