Take the priority filter for rule label decorations into account

Author: adangel

net.sourceforge.pmd.eclipse.plugin/src/main/java/net/sourceforge/pmd/eclipse/plugin/PMDPlugin.java

@@ -654,8 +654,7 @@ private void registerAdditionalRuleSets() {
 
     public RuleLabelDecorator ruleLabelDecorator() {
         IDecoratorManager mgr = getWorkbench().getDecoratorManager();
-        // TODO don't use a raw string...urgh
-        return (RuleLabelDecorator) mgr.getBaseLabelProvider("net.sourceforge.pmd.eclipse.plugin.RuleLabelDecorator");
+        return (RuleLabelDecorator) mgr.getBaseLabelProvider(RuleLabelDecorator.ID);
     }
 
     public void changedFiles(Collection<IFile> changedFiles) {

net.sourceforge.pmd.eclipse.plugin/src/main/java/net/sourceforge/pmd/eclipse/ui/RuleLabelDecorator.java

@@ -5,8 +5,8 @@
 package net.sourceforge.pmd.eclipse.ui;
 
 import java.util.Collection;
-import java.util.HashSet;
 import java.util.Set;
+import java.util.concurrent.CopyOnWriteArraySet;
 
 import org.eclipse.core.resources.IResource;
 import org.eclipse.core.runtime.CoreException;
@@ -21,18 +21,18 @@
 import net.sourceforge.pmd.eclipse.runtime.PMDRuntimeConstants;
 import net.sourceforge.pmd.eclipse.runtime.builder.MarkerUtil;
 import net.sourceforge.pmd.eclipse.ui.priority.PriorityDescriptorCache;
+import net.sourceforge.pmd.eclipse.ui.views.PriorityFilter;
 
 /**
  * 
  * @author Brian Remedios
  */
 public class RuleLabelDecorator implements ILightweightLabelDecorator {
-    private Collection<ILabelProviderListener> listeners;
+    public static final String ID = "net.sourceforge.pmd.eclipse.plugin.RuleLabelDecorator";
+
+    private Set<ILabelProviderListener> listeners = new CopyOnWriteArraySet<>();
 
     public void addListener(ILabelProviderListener listener) {
-        if (listeners == null) {
-            listeners = new HashSet<ILabelProviderListener>();
-        }
         listeners.add(listener);
     }
 
@@ -41,16 +41,11 @@ public void dispose() {
     }
 
     public void changed(Collection<IResource> resources) {
-        if (listeners == null) {
-            return;
-        }
-
         LabelProviderChangedEvent lpce = new LabelProviderChangedEvent(this, resources.toArray());
 
         for (ILabelProviderListener listener : listeners) {
             listener.labelProviderChanged(lpce);
         }
-
     }
 
     /**
@@ -65,9 +60,6 @@ public boolean isLabelProperty(Object element, String property) {
     }
 
     public void removeListener(ILabelProviderListener listener) {
-        if (listeners == null) {
-            return;
-        }
         listeners.remove(listener);
     }
 
@@ -89,8 +81,21 @@ public void decorate(Object element, IDecoration decoration) {
             return;
         }
 
-        Integer first = range.iterator().next();
-        ImageDescriptor overlay = PriorityDescriptorCache.INSTANCE.descriptorFor(RulePriority.valueOf(first)).getAnnotationImageDescriptor();
+        // consider only the priorities, that are not filtered
+        Integer highestPriority = null;
+        for (Integer priority : range) {
+            if (PriorityFilter.getInstance().isPriorityEnabled(RulePriority.valueOf(priority))) {
+                if (highestPriority == null || highestPriority > priority) {
+                    highestPriority = priority;
+                }
+            }
+        }
+
+        if (highestPriority == null) {
+            return;
+        }
+
+        ImageDescriptor overlay = PriorityDescriptorCache.INSTANCE.descriptorFor(RulePriority.valueOf(highestPriority)).getAnnotationImageDescriptor();
 
         try {
             boolean hasMarkers = MarkerUtil.hasAnyRuleMarkers(resource);

net.sourceforge.pmd.eclipse.plugin/src/main/java/net/sourceforge/pmd/eclipse/ui/views/actions/PriorityFilterAction.java

@@ -4,12 +4,19 @@
 
 package net.sourceforge.pmd.eclipse.ui.views.actions;
 
+import java.util.Set;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.jface.action.Action;
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.jface.viewers.ViewerFilter;
 
 import net.sourceforge.pmd.RulePriority;
+import net.sourceforge.pmd.eclipse.plugin.PMDPlugin;
 import net.sourceforge.pmd.eclipse.plugin.UISettings;
+import net.sourceforge.pmd.eclipse.runtime.builder.MarkerUtil;
+import net.sourceforge.pmd.eclipse.ui.model.RootRecord;
 import net.sourceforge.pmd.eclipse.ui.priority.PriorityDescriptor;
 import net.sourceforge.pmd.eclipse.ui.priority.PriorityDescriptorCache;
 import net.sourceforge.pmd.eclipse.ui.views.PriorityFilter;
@@ -40,10 +47,8 @@ private PriorityFilterAction(ViewerFilter[] filters, RulePriority thePriority) {
     /**
      * Constructor, used for Violations Outline only
      * 
-     * @param prio,
-     *            the Priority to filter
-     * @param view,
-     *            the ViolationOutline
+     * @param prio the Priority to filter
+     * @param view the ViolationOutline
      */
     public PriorityFilterAction(RulePriority prio, ViolationOutline view) {
         this(view.getFilters(), prio);
@@ -53,10 +58,8 @@ public PriorityFilterAction(RulePriority prio, ViolationOutline view) {
     /**
      * Constructor, used for Violations Overview only
      * 
-     * @param prio,
-     *            the Priority to filter
-     * @param view,
-     *            the violations Overview
+     * @param prio the Priority to filter
+     * @param view the violations Overview
      */
     public PriorityFilterAction(RulePriority prio, ViolationOverview view) {
         this(view.getViewer().getFilters(), prio);
@@ -110,6 +113,11 @@ private void refreshView() {
         } else if (overviewView != null) {
             overviewView.refresh();
         }
+
+        // refresh all resources to update the rule label decorator
+        RootRecord root = new RootRecord(ResourcesPlugin.getWorkspace().getRoot());
+        Set<IFile> files = MarkerUtil.allMarkedFiles(root);
+        PMDPlugin.getDefault().changedFiles(files);
     }
 
     @Override