Resolving more deprecations and warnings

Author: adangel

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

@@ -36,9 +36,7 @@
 import net.sourceforge.pmd.Report.ConfigurationError;
 import net.sourceforge.pmd.Report.ProcessingError;
 import net.sourceforge.pmd.Rule;
-import net.sourceforge.pmd.RuleContext;
 import net.sourceforge.pmd.RuleSet;
-import net.sourceforge.pmd.RuleSetFactory;
 import net.sourceforge.pmd.RuleSets;
 import net.sourceforge.pmd.RuleViolation;
 import net.sourceforge.pmd.eclipse.plugin.PMDPlugin;
@@ -51,7 +49,6 @@
 import net.sourceforge.pmd.lang.LanguageVersion;
 import net.sourceforge.pmd.lang.LanguageVersionDiscoverer;
 import net.sourceforge.pmd.lang.java.JavaLanguageModule;
-import net.sourceforge.pmd.processor.MonoThreadProcessor;
 import net.sourceforge.pmd.renderers.AbstractRenderer;
 import net.sourceforge.pmd.renderers.Renderer;
 import net.sourceforge.pmd.util.datasource.DataSource;
@@ -326,16 +323,12 @@ protected final void reviewResource(IResource resource) {
 
                 long start = System.currentTimeMillis();
 
-                RuleContext context = PMD.newRuleContext(file.getName(), sourceCodeFile);
-                context.setLanguageVersion(languageVersion);
-
                 input = new InputStreamReader(file.getContents(), file.getCharset());
                 // getPmdEngine().processFile(input, getRuleSet(), context);
                 // getPmdEngine().processFile(sourceCodeFile, getRuleSet(),
                 // context);
 
                 DataSource dataSource = new ReaderDataSource(input, file.getRawLocation().toFile().getPath());
-                RuleSetFactory ruleSetFactory = InternalRuleSetUtil.createFactoryFromRuleSets(ruleSets);
                 // 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
@@ -383,11 +376,7 @@ public String defaultFileExtension() {
                     }
                 };
 
-                // PMD.processFiles(configuration(), ruleSetFactory,
-                // Arrays.asList(dataSource), context,
-                // Arrays.asList(collectingRenderer));
-                new MonoThreadProcessor(configuration()).processFiles(ruleSetFactory, Arrays.asList(dataSource),
-                        context, Arrays.asList(collectingRenderer));
+                PMD.processFiles(configuration(), ruleSets, Arrays.asList(dataSource), Arrays.asList(collectingRenderer));
                 LOG.debug("PMD run finished.");
 
                 pmdDuration += System.currentTimeMillis() - start;

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

@@ -7,6 +7,8 @@
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.Reader;
 import java.lang.reflect.InvocationTargetException;
 import java.util.Iterator;
 
@@ -35,10 +37,13 @@
 import net.sourceforge.pmd.eclipse.runtime.writer.WriterException;
 import net.sourceforge.pmd.eclipse.ui.nls.StringKeys;
 import net.sourceforge.pmd.eclipse.util.IOUtil;
-import net.sourceforge.pmd.lang.ast.JavaCharStream;
+import net.sourceforge.pmd.lang.Language;
+import net.sourceforge.pmd.lang.LanguageRegistry;
+import net.sourceforge.pmd.lang.LanguageVersionHandler;
+import net.sourceforge.pmd.lang.Parser;
+import net.sourceforge.pmd.lang.ast.ParseException;
+import net.sourceforge.pmd.lang.java.JavaLanguageModule;
 import net.sourceforge.pmd.lang.java.ast.ASTCompilationUnit;
-import net.sourceforge.pmd.lang.java.ast.JavaParser;
-import net.sourceforge.pmd.lang.java.ast.ParseException;
 
 /**
  * Process PMDGenerateAST action menu. Generate a AST from the selected file.
@@ -55,6 +60,7 @@ public class PMDGenerateASTAction extends AbstractUIAction implements IRunnableW
     /**
      * @see org.eclipse.ui.IActionDelegate#run(IAction)
      */
+    @Override
     public void run(IAction action) {
         LOG.info("Generation AST action requested");
 
@@ -94,6 +100,7 @@ public void run(IAction action) {
     /**
      * @see org.eclipse.ui.IActionDelegate#selectionChanged(IAction, ISelection)
      */
+    @Override
     public void selectionChanged(IAction action, ISelection selection) {
     }
 
@@ -107,10 +114,11 @@ private void generateAST(IFile file) {
         LOG.info("Generating AST for file " + file.getName());
         ByteArrayOutputStream byteArrayOutputStream = null;
         ByteArrayInputStream astInputStream = null;
-        try {
-            JavaParser parser = new JavaParser(new JavaCharStream(file.getContents()));
-            parser.setJdkVersion(Integer.MAX_VALUE);
-            ASTCompilationUnit compilationUnit = parser.CompilationUnit();
+        try (Reader reader = new InputStreamReader(file.getContents(), file.getCharset())) {
+            Language javaLanguage = LanguageRegistry.getLanguage(JavaLanguageModule.NAME);
+            LanguageVersionHandler languageVersionHandler = javaLanguage.getDefaultVersion().getLanguageVersionHandler();
+            Parser parser = languageVersionHandler.getParser(languageVersionHandler.getDefaultParserOptions());
+            ASTCompilationUnit compilationUnit = (ASTCompilationUnit) parser.parse(file.getName(), reader);
             byteArrayOutputStream = new ByteArrayOutputStream();
             IAstWriter astWriter = PMDPlugin.getDefault().getAstWriter();
             astWriter.write(byteArrayOutputStream, compilationUnit);
@@ -158,13 +166,13 @@ private static String astNameFor(IFile file) {
 
         String name = file.getName();
         int dotPosition = name.indexOf('.');
-        String astName = name.substring(0, dotPosition) + ".ast";
-        return astName;
+        return name.substring(0, dotPosition) + ".ast";
     }
 
     /**
      * @see org.eclipse.jface.operation.IRunnableWithProgress#run(org.eclipse.core.runtime.IProgressMonitor)
      */
+    @Override
     public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
         monitor.beginTask("", structuredSelection.size());
         for (Iterator<?> i = structuredSelection.iterator(); i.hasNext();) {