Ticket #7548: 7548-no-empty.patch

src/org/openstreetmap/josm/actions/PreferencesAction.java

@@ -7 +7 @@
 import java.awt.event.ActionEvent;
 import java.awt.event.KeyEvent;
 
-import javax.swing.SwingUtilities;
-
 import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.preferences.PreferenceDialog;
 import org.openstreetmap.josm.gui.preferences.SubPreferenceSetting;
@@ -107 +105 @@
     @Override
     public void run() {
         final PreferenceDialog p = new PreferenceDialog(MainApplication.getMainFrame());
-        SwingUtilities.invokeLater(() -> {
-            if (tab != null) {
-                p.selectPreferencesTabByClass(tab);
-            } else if (subTab != null) {
-                p.selectSubPreferencesTabByClass(subTab);
-            } else {
-                p.selectPreviouslySelectedPreferences();
-            }
-        });
+        if (tab != null) {
+            p.selectPreferencesTabByClass(tab);
+        } else if (subTab != null) {
+            p.selectSubPreferencesTabByClass(subTab);
+        } else {
+            p.selectPreviouslySelectedPreferences();
+        }
         p.setVisible(true);
     }
 }

src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java

@@ -153 +153 @@
             tpPreferences.selectSubTabByPref(previouslySelected.b);
         } else if (previouslySelected != null && previouslySelected.a != null) {
             tpPreferences.selectTabByPref(previouslySelected.a);
+        } else {
+            tpPreferences.setSelectedIndex(0);
         }
     }
 

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

@@ -558 +558 @@
                 setSelectedIndex(index);
             }
         }
+        setSelectedIndex(-1);
     }
 
     @Override