Merge branch 'pr-80'

Author: adangel

ReleaseNotes.md

@@ -14,12 +14,18 @@ This is a minor release.
 ### New and noteworthy
 
 *   The package `name.herlin` is deprecated and will be removed with the next major version of the plugin.
+*   PMD markers are now problem markers again. This means, that rule violations appear in the Problem View.
+    The project property "Handle high priority violations as Eclipse errors" now works again.
+*   The PMD markers are now also visible on the overview ruler. They can be customized or disabled via
+    workspace preferences, General, Editors, Text Editors, Annotations.
 
 ### Fixed Issues
 
+*   [#54](https://github.com/pmd/pmd-eclipse-plugin/issues/54): "violationsAsErrors" is completely ineffective
 *   [#70](https://github.com/pmd/pmd-eclipse-plugin/issues/70): UnsupportedOperationException opening Rule Configuration
 *   [#76](https://github.com/pmd/pmd-eclipse-plugin/issues/76): Global rule management is saved even if cancelled
 *   [#78](https://github.com/pmd/pmd-eclipse-plugin/issues/78): Project properties cannot be loaded anymore
+*   [#1359](https://sourceforge.net/p/pmd/bugs/1359/): PMD violations in eclipse should be shown on editor by scrollbar
 
 ### External Contributions
 

net.sourceforge.pmd.eclipse.plugin.test/src/main/java/net/sourceforge/pmd/eclipse/runtime/cmd/ReviewCmdTest.java

@@ -5,10 +5,14 @@
 package net.sourceforge.pmd.eclipse.runtime.cmd;
 
 import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
 import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IMarker;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.IResource;
 import org.eclipse.core.resources.IncrementalProjectBuilder;
@@ -22,6 +26,7 @@
 import net.sourceforge.pmd.RuleSet;
 import net.sourceforge.pmd.eclipse.EclipseUtils;
 import net.sourceforge.pmd.eclipse.plugin.PMDPlugin;
+import net.sourceforge.pmd.eclipse.runtime.PMDRuntimeConstants;
 import net.sourceforge.pmd.eclipse.runtime.properties.IProjectProperties;
 import net.sourceforge.pmd.eclipse.ui.actions.RuleSetUtil;
 
@@ -91,6 +96,17 @@ public void testReviewCmdBasic() throws CoreException {
         // We do not test PMD, only a non-empty report is enough
         Assert.assertNotNull(markers);
         Assert.assertTrue("Report size = " + markers.size(), markers.size() > 0);
+
+        // test the marker types - they should be problem markers...
+        final IFile sourceFile = this.testProject.getFile("/src/Test.java");
+        List<IMarker> imarkers = new ArrayList<>();
+        for (String markerType : PMDRuntimeConstants.RULE_MARKER_TYPES) {
+            imarkers.addAll(Arrays.asList(sourceFile.findMarkers(markerType, false, IResource.DEPTH_ONE)));
+        }
+        Assert.assertEquals(markers.get(sourceFile).size(), imarkers.size());
+        for (IMarker marker : imarkers) {
+            Assert.assertTrue(marker.isSubtypeOf(IMarker.PROBLEM));
+        }
     }
 
     /**

net.sourceforge.pmd.eclipse.plugin/META-INF/MANIFEST.MF

@@ -16,7 +16,8 @@ Require-Bundle: org.apache.commons.logging;bundle-version="1.0.4",
  org.eclipse.search,
  org.eclipse.help,
  org.eclipse.help.ui,
- org.eclipse.wst.xml.core
+ org.eclipse.wst.xml.core,
+ org.eclipse.ui.workbench.texteditor
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Bundle-Vendor: %plugin.provider

net.sourceforge.pmd.eclipse.plugin/plugin.properties

@@ -1,6 +1,12 @@
 # PMD Eclipse Plugin externalized strings
 
+marker.category = PMD Markers
 marker.pmd = PMD Marker
+marker.pmd.prio1 = PMD Marker (Prio 1)
+marker.pmd.prio2 = PMD Marker (Prio 2)
+marker.pmd.prio3 = PMD Marker (Prio 3)
+marker.pmd.prio4 = PMD Marker (Prio 4)
+marker.pmd.prio5 = PMD Marker (Prio 5)
 marker.task = PMD Task Marker
 marker.dfa = PMD DFA Marker
 

net.sourceforge.pmd.eclipse.plugin/plugin.xml

@@ -391,7 +391,7 @@ public static PMDPlugin getDefault() {
      * @return the image descriptor
      */
     public static ImageDescriptor getImageDescriptor(String path) {
-        return AbstractUIPlugin.imageDescriptorFromPlugin("net.sourceforge.pmd.eclipse.plugin", path);
+        return AbstractUIPlugin.imageDescriptorFromPlugin(PLUGIN_ID, path);
     }
 
     /**

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

@@ -15,7 +15,8 @@
  */
 public class PMDRuntimeConstants {
 
-    public static final String PMD_MARKER = PMDPlugin.PLUGIN_ID + ".pmdMarker"; // obsolete
+    /** This marker type is the super type for all PMD markers (for rules, task, and dfa). */
+    public static final String PMD_MARKER = PMDPlugin.PLUGIN_ID + ".pmdMarker";
 
     public static final String PMD_MARKER_1 = PMDPlugin.PLUGIN_ID + ".pmdMarker1";
     public static final String PMD_MARKER_2 = PMDPlugin.PLUGIN_ID + ".pmdMarker2";
@@ -25,7 +26,7 @@ public class PMDRuntimeConstants {
 
     public static final String PMD_DFA_MARKER = PMDPlugin.PLUGIN_ID + ".pmdDFAMarker";
     public static final String PMD_TASKMARKER = PMDPlugin.PLUGIN_ID + ".pmdTaskMarker";
-    public static final String[] RULE_MARKER_TYPES = new String[] { PMD_MARKER, PMD_MARKER_1, PMD_MARKER_2,
+    public static final String[] RULE_MARKER_TYPES = new String[] { PMD_MARKER_1, PMD_MARKER_2,
         PMD_MARKER_3, PMD_MARKER_4, PMD_MARKER_5 };
     public static final String[] ALL_MARKER_TYPES = new String[] { PMD_MARKER, PMD_DFA_MARKER, PMD_TASKMARKER,
         PMD_MARKER_1, PMD_MARKER_2, PMD_MARKER_3, PMD_MARKER_4, PMD_MARKER_5 };

net.sourceforge.pmd.eclipse.plugin/src/main/java/net/sourceforge/pmd/eclipse/runtime/PMDRuntimeConstants.java

@@ -460,19 +460,16 @@ private int maxAllowableViolationsFor(Rule rule) {
     }
 
     public static String markerTypeFor(RuleViolation violation) {
-
-        int priorityId = violation.getRule().getPriority().getPriority();
-
-        switch (priorityId) {
-        case 1:
+        switch (violation.getRule().getPriority()) {
+        case HIGH:
             return PMDRuntimeConstants.PMD_MARKER_1;
-        case 2:
+        case MEDIUM_HIGH:
             return PMDRuntimeConstants.PMD_MARKER_2;
-        case 3:
+        case MEDIUM:
             return PMDRuntimeConstants.PMD_MARKER_3;
-        case 4:
+        case MEDIUM_LOW:
             return PMDRuntimeConstants.PMD_MARKER_4;
-        case 5:
+        case LOW:
             return PMDRuntimeConstants.PMD_MARKER_5;
         default:
             return PMDRuntimeConstants.PMD_MARKER;
@@ -625,35 +622,23 @@ private MarkerInfo2 getMarkerInfo(RuleViolation violation, String type) throws P
         info.add(PMDRuntimeConstants.KEY_MARKERATT_LINE2, violation.getEndLine());
         info.add(PMDRuntimeConstants.KEY_MARKERATT_RULENAME, rule.getName());
         info.add(PMDRuntimeConstants.KEY_MARKERATT_PRIORITY, rule.getPriority().getPriority());
+        info.add(IMarker.PRIORITY, IMarker.PRIORITY_NORMAL);
 
-        switch (rule.getPriority().getPriority()) {
-        case 1:
-            info.add(IMarker.PRIORITY, IMarker.PRIORITY_HIGH);
+        switch (rule.getPriority()) {
+        case HIGH:
+        case MEDIUM_HIGH:
             info.add(IMarker.SEVERITY,
                     projectProperties.violationsAsErrors() ? IMarker.SEVERITY_ERROR : IMarker.SEVERITY_WARNING);
             break;
-        case 2:
-            if (projectProperties.violationsAsErrors()) {
-                info.add(IMarker.SEVERITY, IMarker.SEVERITY_ERROR);
-            } else {
-                info.add(IMarker.SEVERITY, IMarker.SEVERITY_WARNING);
-                info.add(IMarker.PRIORITY, IMarker.PRIORITY_HIGH);
-            }
-            break;
 
-        case 5:
-            info.add(IMarker.SEVERITY, IMarker.SEVERITY_INFO);
-            break;
-
-        case 3:
-            info.add(IMarker.PRIORITY, IMarker.PRIORITY_HIGH);
+        case MEDIUM:
+        case MEDIUM_LOW:
             info.add(IMarker.SEVERITY, IMarker.SEVERITY_WARNING);
             break;
 
-        case 4:
+        case LOW:
         default:
-            info.add(IMarker.PRIORITY, IMarker.PRIORITY_HIGH);
-            info.add(IMarker.SEVERITY, IMarker.SEVERITY_WARNING);
+            info.add(IMarker.SEVERITY, IMarker.SEVERITY_INFO);
             break;
         }
 

net.sourceforge.pmd.eclipse.plugin/src/main/java/net/sourceforge/pmd/eclipse/runtime/cmd/BaseVisitor.java

@@ -0,0 +1,40 @@
+
+package net.sourceforge.pmd.eclipse.ui;
+
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.jface.text.source.Annotation;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.ui.texteditor.IAnnotationImageProvider;
+
+import net.sourceforge.pmd.eclipse.plugin.PMDPlugin;
+
+public class PMDMarkerImageProvider implements IAnnotationImageProvider {
+
+    @Override
+    public ImageDescriptor getImageDescriptor(String imageDescriptorId) {
+        return null;
+    }
+
+    @Override
+    public String getImageDescriptorId(Annotation annotation) {
+        return null;
+    }
+
+    @Override
+    public Image getManagedImage(Annotation annotation) {
+        PMDPlugin plugin = PMDPlugin.getDefault();
+        String type = annotation.getType();
+        if ("net.sourceforge.pmd.eclipse.plugin.annotation.prio1".equals(type)) {
+            return plugin.getImage(type, "icons/markerP1.png");
+        } else if ("net.sourceforge.pmd.eclipse.plugin.annotation.prio2".equals(type)) {
+            return plugin.getImage(type, "icons/markerP2.png");
+        } else if ("net.sourceforge.pmd.eclipse.plugin.annotation.prio3".equals(type)) {
+            return plugin.getImage(type, "icons/markerP3.png");
+        } else if ("net.sourceforge.pmd.eclipse.plugin.annotation.prio4".equals(type)) {
+            return plugin.getImage(type, "icons/markerP4.png");
+        } else if ("net.sourceforge.pmd.eclipse.plugin.annotation.prio5".equals(type)) {
+            return plugin.getImage(type, "icons/markerP5.png");
+        }
+        return null;
+    }
+}