Changeset 17265 in josm for trunk/src/org

Timestamp:

2020-10-25T17:07:27+01:00 (4 years ago)

Author:

GerdP

Message:

see #7548: Re-organize the preference dialog
Apply 7548-no-empty.patch to avoid empty top panel

• make sure that a panel is selected when selectPreviouslySelectedPreferences() is called and nothing was previously selected
• reverts r17097

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/PreferencesAction.java (modified) (2 diffs)
• gui/preferences/PreferenceDialog.java (modified) (1 diff)
• gui/preferences/PreferenceTabbedPane.java (modified) (1 diff)

trunk/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;
@@ -108 +106 @@
     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);
     }

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

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

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

@@ -559 +559 @@
             }
         }
+        setSelectedIndex(-1);
     }