Cache and reuse project's aux classpath classloader

Author: adangel

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

@@ -138,6 +138,7 @@ public Color colorFor(RGB rgb) {
         return color;
     }
 
+    @Deprecated // use IProjectProperties#getAuxclasspath() instead
     public static void setJavaClassLoader(PMDConfiguration config, IProject project) {
 
         IPreferences preferences = getDefault().loadPreferences();

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

@@ -288,7 +288,9 @@ protected final void reviewResource(IResource resource) {
             }
             LOG.debug("discovered language: " + languageVersion);
 
-            PMDPlugin.setJavaClassLoader(configuration(), resource.getProject());
+            if (PMDPlugin.getDefault().loadPreferences().isProjectBuildPathEnabled()) {
+                configuration().setClassLoader(projectProperties.getAuxClasspath());
+            }
 
             final File sourceCodeFile = file.getRawLocation().toFile();
             if (included && getRuleSet().applies(sourceCodeFile) && isFileInWorkingSet(file)

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

@@ -198,4 +198,13 @@ public interface IProjectProperties {
      * @return include patterns
      */
     Set<String> getBuildPathIncludePatterns();
+
+    /**
+     * Determines the auxiliary classpath needed for type resolution.
+     * The classloader is cached and used for all PMD executions for the same project.
+     * The classloader is not stored to the project properties file.
+     * 
+     * @return the classpath or <code>null</code> if the project is not a java project
+     */
+    ClassLoader getAuxClasspath();
 }

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

@@ -51,10 +51,13 @@
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.Path;
 import org.eclipse.jdt.core.IClasspathEntry;
+import org.eclipse.jdt.core.JavaCore;
 import org.eclipse.ui.IWorkingSet;
 
+import net.sourceforge.pmd.PMD;
 import net.sourceforge.pmd.RuleSet;
 import net.sourceforge.pmd.eclipse.plugin.PMDPlugin;
+import net.sourceforge.pmd.eclipse.runtime.cmd.JavaProjectClassLoader;
 import net.sourceforge.pmd.eclipse.runtime.properties.IProjectProperties;
 import net.sourceforge.pmd.eclipse.runtime.properties.IProjectPropertiesManager;
 import net.sourceforge.pmd.eclipse.runtime.properties.PropertiesException;
@@ -89,6 +92,7 @@ public class ProjectPropertiesImpl implements IProjectProperties {
     private boolean fullBuildEnabled = true; // default in case didn't come from properties
     private Set<String> buildPathExcludePatterns = new HashSet<String>();
     private Set<String> buildPathIncludePatterns = new HashSet<String>();
+    private ClassLoader auxclasspath;
 
     /**
      * The default constructor takes a project as an argument
@@ -452,4 +456,21 @@ public Set<String> getBuildPathExcludePatterns() {
     public Set<String> getBuildPathIncludePatterns() {
         return buildPathIncludePatterns;
     }
+
+    @Override
+    public ClassLoader getAuxClasspath() {
+        try {
+            if (project != null && project.hasNature(JavaCore.NATURE_ID)) {
+                if (auxclasspath == null) {
+                    LOG.debug("Creating new auxclaspath class loader for project " + project.getName());
+                    auxclasspath = new JavaProjectClassLoader(PMD.class.getClassLoader(), project);
+                }
+                return auxclasspath;
+            }
+        } catch (CoreException e) {
+            LOG.error("Error determining aux classpath", e);
+            PMDPlugin.getDefault().logError("Error determining aux classpath", e);
+        }
+        return null;
+    }
 }