Changeset 13802 in josm for trunk/src/org

Timestamp:

2018-05-21T13:43:38+02:00 (6 years ago)

Author:

Don-vip

Message:

fix #16220 - fix plugin filter

File:

• trunk/src/org/openstreetmap/josm/gui/preferences/plugin/PluginPreferencesModel.java (modified) (2 diffs)

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

@@ -50 +50 @@
      */
     public void filterDisplayedPlugins(PluginInstallation status) {
-        if (status == null) {
-            displayedPlugins.clear();
-            displayedPlugins.addAll(availablePlugins);
-            this.filterStatus = null;
-            return;
-        }
-        displayedPlugins.clear();
-        for (PluginInformation pi: availablePlugins) {
-            boolean installed = currentActivePlugins.contains(pi.getName());
-            if (PluginInstallation.ALL == status
-            || (PluginInstallation.INSTALLED == status && installed)
-            || (PluginInstallation.AVAILABLE == status && !installed)) {
-                displayedPlugins.add(pi);
-            }
-        }
         filterStatus = status;
-        fireStateChanged();
+        doFilter();
     }
 
@@ -74 +59 @@
      */
     public void filterDisplayedPlugins(String filter) {
-        if (filter == null) {
-            displayedPlugins.clear();
-            displayedPlugins.addAll(availablePlugins);
-            this.filterExpression = null;
-            return;
-        }
+        filterExpression = filter;
+        doFilter();
+    }
+
+    private void doFilter() {
         displayedPlugins.clear();
         for (PluginInformation pi: availablePlugins) {
-            if (pi.matches(filter)) {
+            if ((filterStatus == null || matchesInstallationStatus(pi))
+             && (filterExpression == null || pi.matches(filterExpression))) {
                 displayedPlugins.add(pi);
             }
         }
-        filterExpression = filter;
         fireStateChanged();
+    }
+
+    private boolean matchesInstallationStatus(PluginInformation pi) {
+        boolean installed = currentActivePlugins.contains(pi.getName());
+        return PluginInstallation.ALL == filterStatus
+           || (PluginInstallation.INSTALLED == filterStatus && installed)
+           || (PluginInstallation.AVAILABLE == filterStatus && !installed);
     }