Ticket #20720: 20720-2021-04-12.patch

src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java

@@ -3 +3 @@
 
 import static org.openstreetmap.josm.tools.I18n.tr;
 
+import java.awt.Component;
 import java.awt.GridBagConstraints;
 import java.awt.GridBagLayout;
 import java.awt.Insets;
 import java.awt.Rectangle;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Map;
+import java.util.Set;
 
 import javax.swing.JLabel;
 import javax.swing.SwingConstants;
@@ -38 +44 @@
 
     private final transient PluginPreferencesModel model;
 
+    /** Whether the plugin list has been built up already in the UI. */
+    private boolean pluginListInitialized = false;
+
     /**
+     * A map from the plugin information to the UI components that are used to display that information.
+     *
+     * Used to selectively hide filtered elements without the filtering code having to
+     * know about the exact number and order of components belonging to a particular plugin.
+     */
+    private final Map<PluginInformation, List<Component>> componentsForPlugin = new HashMap<>();
+
+    /**
      * Constructs a new {@code PluginListPanel} with a default model.
      */
     public PluginListPanel() {
@@ -104 +121 @@
                         tr("The filter returned no results."))
                 + "</html>"
         );
+        List<Component> components = new ArrayList<>(1);
+        components.add(hint);
+        componentsForPlugin.put(null, components);
         add(hint, gbc);
     }
 
@@ -121 +141 @@
 
         int row = -1;
         for (final PluginInformation pi : displayedPlugins) {
+            List<Component> components = new ArrayList<>(3);
             boolean selected = model.isSelectedPlugin(pi.getName());
             String remoteversion = formatPluginRemoteVersion(pi);
             String localversion = formatPluginLocalVersion(model.getPluginInformation(pi.getName()));
@@ -141 +162 @@
             gbc.insets = new Insets(5, 5, 0, 5);
             gbc.weighty = 0.0;
             gbc.weightx = 0.0;
+            components.add(cbPlugin);
             add(cbPlugin, gbc);
 
             gbc.gridx = 1;
             gbc.weightx = 1.0;
+            components.add(lblPlugin);
             add(lblPlugin, gbc);
 
             HtmlPanel description = new HtmlPanel();
@@ -156 +179 @@
             gbc.gridy = ++row;
             gbc.insets = new Insets(3, 25, 5, 5);
             gbc.weighty = 1.0;
+            components.add(description);
             add(description, gbc);
+            componentsForPlugin.put(pi, components);
         }
+
+        pluginListInitialized = true;
     }
 
     /**
      * Refreshes the list.
+     *
+     * If the list has been changed completely (i.e. not just filtered),
+     * call {@link #resetDisplayedComponents()} prior to calling this method.
      */
     public void refreshView() {
         final Rectangle visibleRect = getVisibleRect();
         List<PluginInformation> displayedPlugins = model.getDisplayedPlugins();
-        removeAll();
 
         if (displayedPlugins.isEmpty()) {
+            hidePluginsNotInList(new ArrayList<>());
             displayEmptyPluginListInformation();
+        } else if (!pluginListInitialized) {
+            removeAll();
+            displayPluginList(displayedPlugins);
         } else {
-            displayPluginList(displayedPlugins);
+            hidePluginsNotInList(displayedPlugins);
         }
         revalidate();
         repaint();
         SwingUtilities.invokeLater(() -> scrollRectToVisible(visibleRect));
     }
 
+    /**
+     * Hides components in the list for plugins that are currently filtered away.
+     *
+     * Since those components are relatively heavyweight rebuilding them every time
+     * when the filter changes is fairly slow, so we build them once and just hide
+     * those that shouldn't be visible.
+     *
+     * @param displayedPlugins A collection of plugins that are currently visible.
+     */
+    private void hidePluginsNotInList(List<PluginInformation> displayedPlugins) {
+        Set<PluginInformation> displayedPluginsSet = new HashSet<>(displayedPlugins);
+        componentsForPlugin.forEach((pi, components) -> {
+            if (displayedPluginsSet.contains(pi)) {
+                for (Component component : components) {
+                    component.setVisible(true);
+                }
+            } else {
+                for (Component component : components) {
+                    component.setVisible(false);
+                }
+            }
+        });
+    }
+
+    /**
+     * Causes the components for the list items to be rebuilt from scratch.
+     *
+     * Should be called before calling {@link #refreshView()} whenever the
+     * underlying list changes to display a completely different set of
+     * plugins instead of merely hiding plugins by a filter.
+     */
+    public void resetDisplayedComponents() {
+        pluginListInitialized = false;
+        componentsForPlugin.clear();
+    }
+
     @Override
     public int getScrollableUnitIncrement(Rectangle visibleRect, int orientation, int direction) {
         return visibleRect.height / 4;

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

@@ -339 +339 @@
             if (!task.isCanceled()) {
                 SwingUtilities.invokeLater(() -> {
                     model.setAvailablePlugins(task.getAvailablePlugins());
+                    pnlPluginPreferences.resetDisplayedComponents();
                     pnlPluginPreferences.refreshView();
                 });
             }
@@ -372 +373 @@
                 if (!task.isCanceled()) {
                     SwingUtilities.invokeLater(() -> {
                         model.updateAvailablePlugins(task.getAvailablePlugins());
+                        pnlPluginPreferences.resetDisplayedComponents();
                         pnlPluginPreferences.refreshView();
                         Config.getPref().putInt("pluginmanager.version", Version.getInstance().getVersion()); // fix #7030
                     });