Fix FileCollector#addSourceFile calls

Author: adangel

net.sourceforge.pmd.eclipse.plugin.test/src/main/java/net/sourceforge/pmd/eclipse/BasicPMDTest.java

@@ -76,7 +76,7 @@ private void runPmd(String javaVersion) {
         final String sourceCode = "public class Foo {\n public void foo() {\nreturn;\n}}";
 
         try (PmdAnalysis pmd = PmdAnalysis.create(configuration)) {
-            pmd.files().addSourceFile("Foo.java", sourceCode);
+            pmd.files().addSourceFile(sourceCode, "Foo.java");
             Report result = pmd.performAnalysisAndCollectReport();
 
             Assert.assertFalse("There should be at least one violation", result.getViolations().isEmpty());

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

@@ -308,7 +308,7 @@ protected final void reviewResource(IResource resource) {
                      PmdAnalysis pmdAnalysis = PmdAnalysis.create(configuration());) {
 
                     String sourceContents = IOUtil.toString(input);
-                    pmdAnalysis.files().addSourceFile(sourceCodeFile.getAbsolutePath(), sourceContents);
+                    pmdAnalysis.files().addSourceFile(sourceContents, sourceCodeFile.getAbsolutePath());
 
                     pmdAnalysis.addRuleSets(getRuleSetList());
 

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

@@ -94,7 +94,7 @@ public void execute() {
                      PmdAnalysis pmdAnalysis = PmdAnalysis.create(configuration)) {
 
                     pmdAnalysis.addRuleSet(ruleSet);
-                    pmdAnalysis.files().addSourceFile(sourceCodeFile.getAbsolutePath(), IOUtil.toString(input));
+                    pmdAnalysis.files().addSourceFile(IOUtil.toString(input), sourceCodeFile.getAbsolutePath());
 
                     report = pmdAnalysis.performAnalysisAndCollectReport();
                 } catch (Exception e) {

net.sourceforge.pmd.eclipse.plugin/src/main/java/net/sourceforge/pmd/eclipse/ui/views/ast/XPathEvaluator.java

@@ -25,6 +25,7 @@
  * @author Brian Remedios
  */
 public final class XPathEvaluator {
+    private static final String SNIPPET_FILENAME = "snippet.java";
 
     public static final XPathEvaluator INSTANCE = new XPathEvaluator();
 
@@ -42,15 +43,15 @@ public Node getCompilationUnit(String source) {
 
         try (PmdAnalysis pmd = PmdAnalysis.create(configuration)) {
             pmd.addRuleSet(ruleset);
-            pmd.files().addSourceFile("snippet.java", source);
+            pmd.files().addSourceFile(source, SNIPPET_FILENAME);
             pmd.performAnalysis();
         }
 
         return rule.getRootNode();
     }
 
     private LanguageVersion getLanguageVersion() {
-        return LanguageRegistry.getLanguage(JavaLanguageModule.NAME).getDefaultVersion();
+        return LanguageRegistry.PMD.getLanguageByFullName(JavaLanguageModule.NAME).getDefaultVersion();
     }
 
     /**
@@ -72,7 +73,7 @@ public List<RuleViolation> evaluate(String source, String xpathQuery, String xpa
         configuration.setForceLanguageVersion(getLanguageVersion());
         try (PmdAnalysis pmd = PmdAnalysis.create(configuration)) {
             pmd.addRuleSet(ruleSet);
-            pmd.files().addSourceFile("snippet.java", source);
+            pmd.files().addSourceFile(source, SNIPPET_FILENAME);
             Report report = pmd.performAnalysisAndCollectReport();
             return report.getViolations();
         }