hiifong/pmd
1
0
Fork 0
forked from phoedos/pmd
Code Pull Requests Activity

Allow the ClassLoader used by PMD for Type Resolution to be specified.

Browse Source 
Forgot to handle PMDRunnable case, which is a subclass of PMD.  ClassLoader is now passed, along with the existing instance specific values (e.g. excludeMarker, sourceType).

git-svn-id: https://pmd.svn.sourceforge.net/svnroot/pmd/trunk@5824 51baf565-9d33-0410-a72c-fc3788e3496d
This commit is contained in:
Ryan Gustafson
2008-02-28 20:17:02 +00:00
parent 2d33b4d457
commit c5af5fb7ce
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
pmd/src/net/sourceforge/pmd/PMD.java
View File

@@ -332,7 +332,7 @@ public class PMD {
processFiles(opts.getCpus(), ruleSetFactory, sourceType, files, ctx, renderers,
opts.stressTestEnabled(),
opts.getRulesets(), opts.shortNamesEnabled(),
opts.getInputPath(), opts.getEncoding(), opts.getExcludeMarker());
opts.getInputPath(), opts.getEncoding(), opts.getExcludeMarker(), PMD.class.getClassLoader());
} catch (RuleSetNotFoundException rsnfe) {
LOG.log(Level.SEVERE, "Ruleset not found", rsnfe);
System.out.println(opts.usage());
@@ -401,7 +401,7 @@ public class PMD {
private final List<Renderer> renderers;
public PmdRunnable(ExecutorService executor, DataSource dataSource, String fileName, SourceType sourceType,
List<Renderer> renderers, String encoding, String rulesets, String excludeMarker) {
List<Renderer> renderers, String encoding, String rulesets, String excludeMarker, ClassLoader classLoader) {
this.executor = executor;
this.dataSource = dataSource;
this.fileName = fileName;
@@ -411,6 +411,7 @@ public class PMD {
setJavaVersion(sourceType);
setExcludeMarker(excludeMarker);
setClassLoader(classLoader);
}
public Report call() {
@@ -548,10 +549,10 @@ public class PMD {
*/
public static void processFiles(int threadCount, RuleSetFactory ruleSetFactory, SourceType sourceType, List<DataSource> files, RuleContext ctx,
List<Renderer> renderers, String rulesets, final boolean shortNamesEnabled, final String inputPath,
String encoding, String excludeMarker) {
String encoding, String excludeMarker, ClassLoader classLoader) {
processFiles(threadCount, ruleSetFactory, sourceType, files, ctx,
renderers, false, rulesets, shortNamesEnabled, inputPath,
encoding, excludeMarker);
encoding, excludeMarker, classLoader);
}
/**
* Run PMD on a list of files using multiple threads.
@@ -560,7 +561,7 @@ public class PMD {
*/
public static void processFiles(int threadCount, RuleSetFactory ruleSetFactory, SourceType sourceType, List<DataSource> files, RuleContext ctx,
List<Renderer> renderers, boolean stressTestEnabled, String rulesets, final boolean shortNamesEnabled, final String inputPath,
String encoding, String excludeMarker) {
String encoding, String excludeMarker, ClassLoader classLoader) {
/*
* Check if multithreaded is supported.
@@ -600,7 +601,7 @@ public class PMD {
inputPath);
PmdRunnable r = new PmdRunnable(executor, dataSource, niceFileName, sourceType, renderers,
encoding, rulesets, excludeMarker);
encoding, rulesets, excludeMarker, classLoader);
Future<Report> future = executor.submit(r);
tasks.add(future);

2
pmd/src/net/sourceforge/pmd/ant/PMDTask.java
View File

@@ -226,7 +226,7 @@ public class PMDTask extends Task {
PMD.processFiles(cpus, ruleSetFactory, sourceType, files, ctx,
renderers, ruleSetFiles,
shortFilenames, inputPath,
encoding, excludeMarker);
encoding, excludeMarker, getClass().getClassLoader());
} catch (RuntimeException pmde) {
pmde.printStackTrace();
log(pmde.toString(), Project.MSG_VERBOSE);