Merge pull request #162 from adangel:fix-deprecations

Fix deprecations #162

Author: adangel

ReleaseNotes.md

@@ -15,6 +15,8 @@ This is a minor release.
 
 ### Fixed Issues
 
+*   [#162](https://github.com/pmd/pmd-eclipse-plugin/pull/162): Fix deprecations
+
 ### API Changes
 
 ### External Contributions

net.sourceforge.pmd.eclipse.p2updatesite/category.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <site>
-   <feature id="net.sourceforge.pmd.eclipse" version="4.35.0.qualifier">
+   <feature id="net.sourceforge.pmd.eclipse" version="0.0.0">
       <category name="pmdForEclipse"/>
    </feature>
    <category-def name="pmdForEclipse" label="PMD for Eclipse">

net.sourceforge.pmd.eclipse.p2updatesite/src/main/resources/category.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <site>
-   <feature id="net.sourceforge.pmd.eclipse" version="${unqualifiedVersion}.qualifier">
+   <feature id="net.sourceforge.pmd.eclipse" version="0.0.0">
       <category name="pmdForEclipse"/>
    </feature>
    <category-def name="pmdForEclipse" label="PMD for Eclipse">

net.sourceforge.pmd.eclipse.plugin.test/src/main/java/net/sourceforge/pmd/eclipse/ui/preferences/br/RuleUIUtilTest.java

@@ -11,6 +11,7 @@
 import net.sourceforge.pmd.Rule;
 import net.sourceforge.pmd.eclipse.ui.IndexedString;
 import net.sourceforge.pmd.lang.rule.XPathRule;
+import net.sourceforge.pmd.lang.rule.xpath.XPathVersion;
 
 public class RuleUIUtilTest {
 
@@ -19,7 +20,7 @@ public class RuleUIUtilTest {
      */
     @Test
     public void testTndexedPropertyStringFromRule() {
-        Rule rule = new XPathRule();
+        Rule rule = new XPathRule(XPathVersion.XPATH_2_0, "");
         IndexedString s = RuleUIUtil.indexedPropertyStringFrom(rule);
         assertNotNull(s);
     }

net.sourceforge.pmd.eclipse.plugin.test/src/main/java/net/sourceforge/pmd/eclipse/util/internal/StringUtilTest.java

@@ -0,0 +1,28 @@
+/*
+ * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
+ */
+
+package net.sourceforge.pmd.eclipse.util.internal;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+public class StringUtilTest {
+
+    @Test
+    public void testMaxCommonLeadingWhitespaceForAll() {
+        Assert.assertEquals(4, StringUtil.maxCommonLeadingWhitespaceForAll(new String[] { "    a", "    b" }));
+        Assert.assertEquals(0, StringUtil.maxCommonLeadingWhitespaceForAll(new String[] { "    a", "b" }));
+        Assert.assertEquals(4, StringUtil.maxCommonLeadingWhitespaceForAll(new String[] { "    a", "        b" }));
+    }
+
+    @Test
+    public void testTrimStartOn() {
+        Assert.assertArrayEquals(new String[] { "a", "b" },
+                StringUtil.trimStartOn(new String[] { "    a", "    b" }, 4));
+        Assert.assertArrayEquals(new String[] { "a", "  b" },
+                StringUtil.trimStartOn(new String[] { "  a", "    b" }, 2));
+        Assert.assertArrayEquals(new String[] { "    a", "    b" },
+                StringUtil.trimStartOn(new String[] { "    a", "    b" }, 0));
+    }
+}

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

@@ -158,9 +158,11 @@ Export-Package: ch.qos.logback.classic;x-friends:="net.sourceforge.pmd.eclipse.p
    net.sourceforge.pmd.eclipse.ui.model,
    org.eclipse.jface.viewers,
    org.eclipse.swt.widgets",
+ net.sourceforge.pmd.eclipse.util.internal;x-friends:="net.sourceforge.pmd.eclipse.plugin.test",
  net.sourceforge.pmd.lang,
  net.sourceforge.pmd.lang.java.rule,
  net.sourceforge.pmd.lang.rule,
+ net.sourceforge.pmd.lang.rule.xpath,
  net.sourceforge.pmd.properties,
  net.sourceforge.pmd.properties.builders,
  net.sourceforge.pmd.renderers,

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

@@ -5,7 +5,6 @@
 package net.sourceforge.pmd.eclipse.runtime;
 
 import net.sourceforge.pmd.eclipse.plugin.PMDPlugin;
-import net.sourceforge.pmd.properties.IntegerProperty;
 
 /**
  * This interface groups all plugin constants
@@ -36,7 +35,8 @@ public final class PMDRuntimeConstants {
      *             which was 1000 violations.
      */
     @Deprecated
-    public static final IntegerProperty MAX_VIOLATIONS_DESCRIPTOR = new IntegerProperty("maxviolations",
+    public static final net.sourceforge.pmd.properties.IntegerProperty MAX_VIOLATIONS_DESCRIPTOR =
+        new net.sourceforge.pmd.properties.IntegerProperty("maxviolations",
             "Max allowable violations", 1, Integer.MAX_VALUE - 1, 1000, 0f);
 
     public static final String ID_PERSPECTIVE = "net.sourceforge.pmd.eclipse.ui.views.pmdPerspective";

net.sourceforge.pmd.eclipse.plugin/src/main/java/net/sourceforge/pmd/eclipse/runtime/builder/PMDBuilder.java

@@ -98,7 +98,6 @@ private void buildIncremental(IProject project, IProgressMonitor monitor) {
         if (resourceDelta != null && resourceDelta.getAffectedChildren().length != 0) {
             ReviewCodeCmd cmd = new ReviewCodeCmd();
             cmd.setResourceDelta(resourceDelta);
-            cmd.setTaskMarker(false);
             cmd.setMonitor(monitor);
             // a builder is always asynchronous;
             // execute a command synchronously
@@ -118,7 +117,6 @@ private void buildIncremental(IProject project, IProgressMonitor monitor) {
     private void processProjectFiles(IProject project, IProgressMonitor monitor) {
         ReviewCodeCmd cmd = new ReviewCodeCmd();
         cmd.addResource(project);
-        cmd.setTaskMarker(false);
         cmd.setMonitor(monitor);
         // a builder is always asynchronous; execute a command synchronously whatever its processor
         cmd.performExecute(); 

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

@@ -11,14 +11,14 @@
 import java.io.Reader;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 import java.util.Set;
 import java.util.Stack;
 
+import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IMarker;
@@ -30,15 +30,13 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import net.sourceforge.pmd.PMD;
 import net.sourceforge.pmd.PMDConfiguration;
-import net.sourceforge.pmd.PMDException;
+import net.sourceforge.pmd.PmdAnalysis;
 import net.sourceforge.pmd.Report;
 import net.sourceforge.pmd.Report.ConfigurationError;
 import net.sourceforge.pmd.Report.ProcessingError;
 import net.sourceforge.pmd.Rule;
 import net.sourceforge.pmd.RuleSet;
-import net.sourceforge.pmd.RuleSets;
 import net.sourceforge.pmd.RuleViolation;
 import net.sourceforge.pmd.eclipse.plugin.PMDPlugin;
 import net.sourceforge.pmd.eclipse.runtime.PMDRuntimeConstants;
@@ -49,9 +47,6 @@
 import net.sourceforge.pmd.lang.LanguageVersion;
 import net.sourceforge.pmd.lang.LanguageVersionDiscoverer;
 import net.sourceforge.pmd.lang.java.JavaLanguageModule;
-import net.sourceforge.pmd.renderers.Renderer;
-import net.sourceforge.pmd.util.datasource.DataSource;
-import net.sourceforge.pmd.util.datasource.ReaderDataSource;
 
 /**
  * Factor some useful features for visitors
@@ -167,27 +162,12 @@ public void worked(final int work) {
         }
     }
 
-    // /**
-    // * @return Returns the pmdEngine.
-    // */
-    // public PMDEngine getPmdEngine() {
-    // return pmdEngine;
-    // }
-    //
-    // /**
-    // * @param pmdEngine
-    // * The pmdEngine to set.
-    // */
-    // public void setPmdEngine(final PMDEngine pmdEngine) {
-    // this.pmdEngine = pmdEngine;
-    // }
-
     /**
      * @return Returns all the ruleSets.
      * @deprecated Use {@link #getRuleSetList()}
      */
     @Deprecated
-    public RuleSets getRuleSets() {
+    public net.sourceforge.pmd.RuleSets getRuleSets() {
         return InternalRuleSetUtil.toRuleSets(this.ruleSets);
     }
 
@@ -217,7 +197,7 @@ public void setRuleSet(RuleSet ruleSet) {
      * @deprecated Use {@link #setRuleSetList(List)}
      */
     @Deprecated
-    public void setRuleSets(final RuleSets ruleSets) {
+    public void setRuleSets(final net.sourceforge.pmd.RuleSets ruleSets) {
         setRuleSetList(Arrays.asList(ruleSets.getAllRuleSets()));
     }
 
@@ -316,24 +296,24 @@ protected final void reviewResource(IResource resource) {
 
                 long start = System.currentTimeMillis();
 
+                // need to disable multi threading, as the ruleset is
+                // not recreated and shared between threads...
+                // but as we anyway have only one file to process, it won't hurt
+                // here.
+                configuration().setThreads(0);
+
                 Report collectingReport = null;
 
                 try (Reader input = new InputStreamReader(file.getContents(), file.getCharset());
-                     DataSource dataSource = new ReaderDataSource(input, file.getRawLocation().toFile().getPath());) {
-                    
-                    // getPmdEngine().processFile(input, getRuleSet(), context);
-                    // getPmdEngine().processFile(sourceCodeFile, getRuleSet(),
-                    // context);
-                    
-                    
-                    // need to disable multi threading, as the ruleset is
-                    // not recreated and shared between threads...
-                    // but as we anyway have only one file to process, it won't hurt
-                    // here.
-                    configuration().setThreads(0);
+                     PmdAnalysis pmdAnalysis = PmdAnalysis.create(configuration());) {
+
+                    String sourceContents = IOUtils.toString(input);
+                    pmdAnalysis.files().addSourceFile(sourceContents, sourceCodeFile.getAbsolutePath());
+
+                    pmdAnalysis.addRuleSets(getRuleSetList());
+
                     LOG.debug("PMD running on file {}", file.getName());
-                    collectingReport = PMD.processFiles(configuration(), ruleSets, Arrays.asList(dataSource),
-                            Collections.<Renderer>emptyList());
+                    collectingReport = pmdAnalysis.performAnalysisAndCollectReport();
                     LOG.debug("PMD run finished.");
                 }
 
@@ -356,7 +336,7 @@ protected final void reviewResource(IResource resource) {
                         .append("\n");
                     }
                     PMDPlugin.getDefault().logWarn(message.toString());
-                    throw new PMDException(message.toString());
+                    throw new RuntimeException(message.toString());
                 }
 
                 updateMarkers(file, collectingReport.getViolations());
@@ -370,17 +350,16 @@ protected final void reviewResource(IResource resource) {
         } catch (CoreException e) {
             // TODO: complete message
             LOG.error("Core exception visiting " + file.getName(), e);
-        } catch (PMDException e) {
-            // TODO: complete message
-            LOG.error("PMD exception visiting " + file.getName(), e);
         } catch (IOException e) {
             // TODO: complete message
             LOG.error("IO exception visiting " + file.getName(), e);
         } catch (PropertiesException e) {
             // TODO: complete message
-            LOG.error("Properties exception visiting " + file.getName(), e);
+            LOG.error("Properties exception visiting {}", file.getName(), e);
         } catch (IllegalArgumentException e) {
             LOG.error("Illegal argument: {}", e.toString(), e);
+        } catch (RuntimeException e) {
+            LOG.error("Runtime exception visiting {}", file.getName(), e);
         }
 
     }

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

@@ -30,7 +30,6 @@
 import net.sourceforge.pmd.cpd.Language;
 import net.sourceforge.pmd.cpd.LanguageFactory;
 import net.sourceforge.pmd.cpd.Match;
-import net.sourceforge.pmd.cpd.Renderer;
 import net.sourceforge.pmd.cpd.renderer.CPDRenderer;
 import net.sourceforge.pmd.eclipse.plugin.PMDPlugin;
 import net.sourceforge.pmd.eclipse.runtime.PMDRuntimeConstants;
@@ -146,29 +145,25 @@ public void setMinTileSize(final int tilesize) {
      * @deprecated Use {@link #setCPDRenderer(CPDRenderer)} instead.
      */
     @Deprecated
-    public void setRenderer(final Renderer renderer) {
-        if (renderer != null) {
+    public void setRenderer(final net.sourceforge.pmd.cpd.Renderer theRenderer) {
+        if (theRenderer != null) {
             this.setCPDRenderer(new CPDRenderer() {
                 @Override
                 public void render(Iterator<Match> matches, Writer writer) throws IOException {
-                    writer.write(renderer.render(matches));
+                    writer.write(theRenderer.render(matches));
                 }
             });
         } else {
             this.setCPDRenderer(null);
         }
     }
 
-    public void setCPDRenderer(CPDRenderer renderer) {
-        this.renderer = renderer;
+    public void setCPDRenderer(CPDRenderer theRenderer) {
+        this.renderer = theRenderer;
     }
 
-    /**
-     * @param reportName
-     *            The reportName to set.
-     */
-    public void setReportName(final String reportName) {
-        this.reportName = reportName;
+    public void setReportName(final String theReportName) {
+        this.reportName = theReportName;
     }
 
     /**