More refactoring

- Avoid using ParametricRuleViolation
- Delete unused code (taskmarker)
- Use generics

Author: adangel

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/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;
     }
 
     /**

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

@@ -5,9 +5,7 @@
 package net.sourceforge.pmd.eclipse.runtime.cmd;
 
 import net.sourceforge.pmd.Rule;
-import net.sourceforge.pmd.RuleContext;
-import net.sourceforge.pmd.lang.ast.Node;
-import net.sourceforge.pmd.lang.rule.ParametricRuleViolation;
+import net.sourceforge.pmd.RuleViolation;
 
 /**
  * This is an implementation of IRuleViolation. It is meant to rebuild a
@@ -18,11 +16,21 @@
  * @author Brian Remedios
  */
 
-class FakeRuleViolation extends ParametricRuleViolation<Node> {
+class FakeRuleViolation implements RuleViolation {
+    private int beginLine;
+    private int beginColumn;
+    private int endLine;
+    private int endColumn;
 
-    private String description = "";
+    private String filename;
+    private String packageName;
+    private String className;
+    private String methodName;
+    private String variableName;
+
+    private Rule rule;
 
-    private static final RuleContext DUMMY_CONTEXT = new RuleContext();
+    private String description = "";
 
     /**
      * Default constructor take a rule object to initialize. All other variables
@@ -31,7 +39,7 @@ class FakeRuleViolation extends ParametricRuleViolation<Node> {
      * @param rule
      */
     FakeRuleViolation(Rule theRule) {
-        super(theRule, DUMMY_CONTEXT, null, null);
+        this.rule = theRule;
     }
 
     @Override
@@ -119,4 +127,58 @@ public void setVariableName(String variableName) {
         this.variableName = variableName;
     }
 
+    @Override
+    public Rule getRule() {
+        return rule;
+    }
+
+    @Override
+    public boolean isSuppressed() {
+        return false;
+    }
+
+    @Override
+    public String getFilename() {
+        return filename;
+    }
+
+    @Override
+    public int getBeginLine() {
+        return beginLine;
+    }
+
+    @Override
+    public int getBeginColumn() {
+        return beginColumn;
+    }
+
+    @Override
+    public int getEndLine() {
+        return endLine;
+    }
+
+    @Override
+    public int getEndColumn() {
+        return endColumn;
+    }
+
+    @Override
+    public String getPackageName() {
+        return packageName;
+    }
+
+    @Override
+    public String getClassName() {
+        return className;
+    }
+
+    @Override
+    public String getMethodName() {
+        return methodName;
+    }
+
+    @Override
+    public String getVariableName() {
+        return variableName;
+    }
 }

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

@@ -75,7 +75,6 @@ public class ReviewCodeCmd extends AbstractDefaultCommand {
     private final List<IResource> resources = new ArrayList<>();
     private IResourceDelta resourceDelta;
     private Map<IFile, Set<MarkerInfo2>> markersByFile = new HashMap<>();
-    private boolean taskMarker;
     private boolean openPmdPerspective;
     private boolean openPmdViolationsOverviewView;
     private boolean openPmdViolationsOutlineView;
@@ -407,8 +406,12 @@ public void setResourceDelta(IResourceDelta resourceDelta) {
         this.resourceDelta = resourceDelta;
     }
 
+    /**
+     * @deprecated not used, never implemented
+     */
+    @Deprecated
     public void setTaskMarker(boolean taskMarker) {
-        this.taskMarker = taskMarker;
+        // the flag was never used
     }
 
     public void setRunAlways(boolean runAlways) {
@@ -538,9 +541,7 @@ private void processResource(IResource resource) {
                     visitor.setMonitor(getMonitor());
                     visitor.setRuleSetList(ruleSets);
                     visitor.setFileExtensions(fileExtensions);
-                    // visitor.setPmdEngine(pmdEngine);
                     visitor.setAccumulator(markersByFile);
-                    visitor.setUseTaskMarker(taskMarker);
                     visitor.setProjectProperties(properties);
                     resource.accept(visitor);
 
@@ -712,9 +713,7 @@ private void processResourceDelta() {
                 visitor.setMonitor(getMonitor());
                 visitor.setRuleSetList(ruleSets);
                 visitor.setFileExtensions(fileExtensions);
-                // visitor.setPmdEngine(pmdEngine);
                 visitor.setAccumulator(markersByFile);
-                visitor.setUseTaskMarker(taskMarker);
                 visitor.setProjectProperties(properties);
                 resourceDelta.accept(visitor);
 

net.sourceforge.pmd.eclipse.plugin/src/main/java/net/sourceforge/pmd/eclipse/runtime/properties/IProjectProperties.java

@@ -12,7 +12,6 @@
 import org.eclipse.ui.IWorkingSet;
 
 import net.sourceforge.pmd.RuleSet;
-import net.sourceforge.pmd.RuleSets;
 
 /**
  * This interface specifies what is the model for the PMD related project
@@ -59,7 +58,7 @@ public interface IProjectProperties {
      * @deprecated Use {@link #setProjectRuleSetList(List)}
      */
     @Deprecated
-    void setProjectRuleSets(RuleSets projectRuleSets) throws PropertiesException;
+    void setProjectRuleSets(net.sourceforge.pmd.RuleSets projectRuleSets) throws PropertiesException;
 
     void setProjectRuleSetList(List<RuleSet> rulesets) throws PropertiesException;
 
@@ -68,7 +67,7 @@ public interface IProjectProperties {
      * @deprecated Use {@link #getProjectRuleSetList()}
      */
     @Deprecated
-    RuleSets getProjectRuleSets() throws PropertiesException;
+    net.sourceforge.pmd.RuleSets getProjectRuleSets() throws PropertiesException;
 
     List<RuleSet> getProjectRuleSetList() throws PropertiesException;
 

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

@@ -12,7 +12,6 @@
 import java.io.StringWriter;
 import java.lang.reflect.InvocationTargetException;
 import java.util.Iterator;
-import java.util.Locale;
 
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IFolder;
@@ -35,7 +34,6 @@
 import org.slf4j.LoggerFactory;
 
 import net.sourceforge.pmd.eclipse.runtime.PMDRuntimeConstants;
-import net.sourceforge.pmd.eclipse.runtime.cmd.AbstractDefaultCommand;
 import net.sourceforge.pmd.eclipse.ui.nls.StringKeys;
 
 /**
@@ -170,14 +168,6 @@ private void clearReviews(IFile file) {
         monitorWorked();
     }
 
-    private static boolean isReviewable(IFile file) {
-
-        if (AbstractDefaultCommand.isJavaFile(file)) {
-            return true;
-        }
-        return file.getName().toLowerCase(Locale.ROOT).endsWith(".jsp");
-    }
-
     /**
      * remove reviews from file content
      *
@@ -186,10 +176,6 @@ private static boolean isReviewable(IFile file) {
      */
     private String removeReviews(IFile file) {
 
-        if (!isReviewable(file)) {
-            return null;
-        }
-
         StringWriter modified = new StringWriter();
         boolean noChange = true;
         try (BufferedReader reader = new BufferedReader(new InputStreamReader(file.getContents(), file.getCharset()));
@@ -200,7 +186,7 @@ private String removeReviews(IFile file) {
                 String origLine = reader.readLine();
                 String line = origLine.trim();
                 if (line == null) {
-                    break;
+                    continue;
                 }
                 int index = origLine.indexOf(PMDRuntimeConstants.PMD_STYLE_REVIEW_COMMENT);
                 int quoteIndex = origLine.indexOf('"');

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

@@ -56,7 +56,6 @@ public void run(IAction action) {
     }
 
     private void setupAndExecute(ReviewCodeCmd cmd) {
-        cmd.setTaskMarker(true);
         cmd.setOpenPmdPerspective(PMDPlugin.getDefault().loadPreferences().isPmdPerspectiveEnabled());
         cmd.setOpenPmdViolationsOverviewView(PMDPlugin.getDefault().loadPreferences().isPmdViolationsOverviewEnabled());
         cmd.setOpenPmdViolationsOutlineView(PMDPlugin.getDefault().loadPreferences().isPmdViolationsOutlineEnabled());

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

@@ -108,18 +108,18 @@ protected final void computeSelectedResources() {
         ISelection selection = getSelection();
         if (selection instanceof IStructuredSelection) {
             IStructuredSelection structuredSelection = (IStructuredSelection) selection;
-            List resources = new ArrayList(structuredSelection.size());
+            List<IResource> resources = new ArrayList<>(structuredSelection.size());
 
             Iterator<?> e = structuredSelection.iterator();
             while (e.hasNext()) {
                 Object element = e.next();
                 if (element instanceof IResource) {
-                    resources.add(element);
+                    resources.add((IResource) element);
                 } else if (element instanceof IAdaptable) {
                     IAdaptable adaptable = (IAdaptable) element;
                     Object adapter = adaptable.getAdapter(IResource.class);
                     if (adapter instanceof IResource) {
-                        resources.add(adapter);
+                        resources.add((IResource) adapter);
                     }
                 }
             }

net.sourceforge.pmd.eclipse.plugin/src/main/java/net/sourceforge/pmd/eclipse/ui/preferences/GeneralPreferencesPage.java

@@ -96,7 +96,7 @@ public class GeneralPreferencesPage extends PreferencePage implements IWorkbench
     private Label logLevelValueLabel;
     private TableViewer tableViewer;
     private IPreferences preferences;
-    private BasicTableManager priorityTableMgr;
+    private BasicTableManager<?> priorityTableMgr;
     private Button determineFiletypesAutomatically;
 
     private Control[] nameFields;
@@ -254,7 +254,7 @@ public Object[] getElements(Object inputElement) {
         };
         BasicTableLabelProvider labelProvider = new BasicTableLabelProvider(PriorityColumnUI.VISIBLE_COLUMNS);
 
-        priorityTableMgr = new BasicTableManager("prio", null, PriorityColumnUI.VISIBLE_COLUMNS);
+        priorityTableMgr = new BasicTableManager<>("prio", null, PriorityColumnUI.VISIBLE_COLUMNS);
         tableViewer = priorityTableMgr.buildTableViewer(group);
         priorityTableMgr.setupColumns(PriorityColumnUI.VISIBLE_COLUMNS);