Changeset 17784 in josm for trunk

Timestamp:

2021-04-14T21:21:31+02:00 (4 years ago)

Author:

simon04

Message:

fix #20720 - Filtering in plugins list in preferences is slow (patch by ygramul)

Location:

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

Files:

• PluginListPanel.java (modified) (6 diffs)
• PluginPreference.java (modified) (2 diffs)

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

@@ -10 +10 @@
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
+import java.util.ArrayList;
+import java.util.HashSet;
 import java.util.List;
-
+import java.util.Set;
+
+import javax.swing.JComponent;
 import javax.swing.JLabel;
 import javax.swing.SwingConstants;
@@ -38 +42 @@
 
     private final transient PluginPreferencesModel model;
+
+    /** Whether the plugin list has been built up already in the UI. */
+    private boolean pluginListInitialized = false;
 
     /**
@@ -105 +112 @@
                 + "</html>"
         );
+        hint.putClientProperty("plugin", "empty");
         add(hint, gbc);
     }
@@ -142 +150 @@
             gbc.weighty = 0.0;
             gbc.weightx = 0.0;
+            cbPlugin.putClientProperty("plugin", pi);
             add(cbPlugin, gbc);
 
             gbc.gridx = 1;
             gbc.weightx = 1.0;
+            lblPlugin.putClientProperty("plugin", pi);
             add(lblPlugin, gbc);
 
@@ -157 +167 @@
             gbc.insets = new Insets(3, 25, 5, 5);
             gbc.weighty = 1.0;
+            description.putClientProperty("plugin", pi);
             add(description, gbc);
         }
+
+        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();
@@ -179 +198 @@
     }
 
+    /**
+     * 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) {
+        // Remove the empty plugin list warning if it's there
+        synchronized (getTreeLock()) {
+            for (int i = 0; i < getComponentCount(); i++) {
+                JComponent component = (JComponent) getComponent(i);
+                if ("empty".equals(component.getClientProperty("plugin"))) {
+                    remove(component);
+                }
+            }
+        }
+
+        Set<PluginInformation> displayedPluginsSet = new HashSet<>(displayedPlugins);
+        synchronized (getTreeLock()) {
+            for (int i = 0; i < getComponentCount(); i++) {
+                JComponent component = (JComponent) getComponent(i);
+                Object plugin = component.getClientProperty("plugin");
+                component.setVisible(displayedPluginsSet.contains(plugin));
+            }
+        }
+    }
+
+    /**
+     * 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;
+    }
+
     @Override
     public int getScrollableUnitIncrement(Rectangle visibleRect, int orientation, int direction) {

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

@@ -323 +323 @@
                 SwingUtilities.invokeLater(() -> {
                     model.setAvailablePlugins(task.getAvailablePlugins());
+                    pnlPluginPreferences.resetDisplayedComponents();
                     pnlPluginPreferences.refreshView();
                 });
@@ -356 +357 @@
                     SwingUtilities.invokeLater(() -> {
                         model.updateAvailablePlugins(task.getAvailablePlugins());
+                        pnlPluginPreferences.resetDisplayedComponents();
                         pnlPluginPreferences.refreshView();
                         Config.getPref().putInt("pluginmanager.version", Version.getInstance().getVersion()); // fix #7030