Ticket #20537: 20537.patch

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

@@ -6 +6 @@
  * @since 13799
  */
 public enum PluginInstallation {
+    /** Plugins installed but not loaded **/
+    INSTALLED,
     /** Plugins installed and loaded **/
-    INSTALLED,
+    LOADED,
     /** Plugins not loaded **/
     AVAILABLE,
     /** All plugins **/

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

@@ -170 +170 @@
         JPanel radios = new JPanel();
         addRadioButton(bg, radios, new JRadioButton(trc("plugins", "All"), true), PluginInstallation.ALL);
         addRadioButton(bg, radios, new JRadioButton(trc("plugins", "Installed")), PluginInstallation.INSTALLED);
+        addRadioButton(bg, radios, new JRadioButton(trc("plugins", "Loaded")), PluginInstallation.LOADED);
         addRadioButton(bg, radios, new JRadioButton(trc("plugins", "Available")), PluginInstallation.AVAILABLE);
         pnl.add(radios, GBC.eol().fill(HORIZONTAL));
 
@@ -373 +374 @@
      */
     class UpdateSelectedPluginsAction extends AbstractAction {
         UpdateSelectedPluginsAction() {
-            putValue(NAME, tr("Update plugins"));
+            putValue(NAME, tr("Update selected"));
             putValue(SHORT_DESCRIPTION, tr("Update the selected plugins"));
             new ImageProvider("dialogs", "refresh").getResource().attachImageIcon(this);
         }

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

@@ -76 +76 @@
     }
 
     private boolean matchesInstallationStatus(PluginInformation pi) {
-        boolean installed = currentActivePlugins.contains(pi.getName());
+        boolean loaded = currentActivePlugins.contains(pi.getName());
         return PluginInstallation.ALL == filterStatus
-           || (PluginInstallation.INSTALLED == filterStatus && installed)
-           || (PluginInstallation.AVAILABLE == filterStatus && !installed);
+                || (PluginInstallation.INSTALLED == filterStatus && pi.file != null)
+                || (PluginInstallation.LOADED == filterStatus && loaded)
+                || (PluginInstallation.AVAILABLE == filterStatus && !loaded);
     }
 
     /**