Ticket #7541: 7541.patch

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

@@ -5 +5 @@
 import static org.openstreetmap.josm.tools.I18n.trn;
 
 import java.awt.BorderLayout;
-import java.awt.Component;
 import java.awt.GridBagConstraints;
 import java.awt.GridBagLayout;
 import java.awt.GridLayout;
@@ -33 +32 @@
 import javax.swing.JTextField;
 import javax.swing.SwingUtilities;
 import javax.swing.UIManager;
-import javax.swing.event.ChangeEvent;
-import javax.swing.event.ChangeListener;
 import javax.swing.event.DocumentEvent;
 import javax.swing.event.DocumentListener;
 
@@ -60 +57 @@
             return new PluginPreference();
         }
     }
-    
+
     private PluginPreference() {
         super("plugin", tr("Plugins"), tr("Configure available plugins."));
     }
@@ -184 +181 @@
         gc.fill = GridBagConstraints.BOTH;
         PreferencePanel plugins = gui.createPreferenceTab(this);
         plugins.add(buildContentPanel(), gc);
-        //pnlPluginPreferences.refreshView(); // fix #7541, refreshView() will be called when the first tab will be selected
-        gui.addChangeListener(new PluginPreferenceActivationListener(plugins));
+        readLocalPluginInformation();
+        pluginPreferencesActivated = true;
+        pnlPluginPreferences.refreshView();
     }
 
     private void configureSites() {
@@ -409 +407 @@
     }
 
     /**
-     * Listens to the activation of the plugin preferences tab. On activation it
-     * reloads plugin information from the local file system.
-     *
-     */
-    class PluginPreferenceActivationListener implements ChangeListener {
-        private Component pane;
-        public PluginPreferenceActivationListener(Component preferencesPane) {
-            pane = preferencesPane;
-        }
-
-        public void stateChanged(ChangeEvent e) {
-            JTabbedPane tp = (JTabbedPane)e.getSource();
-            if (tp.getSelectedComponent() == pane && !pluginPreferencesActivated) {
-                readLocalPluginInformation();
-                pluginPreferencesActivated = true;
-            }
-        }
-    }
-
-    /**
      * Applies the current filter condition in the filter text field to the
      * model
      */