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

Cleaning this up so it doesn't use the deprecated methods... they will go away soon

Browse Source 
git-svn-id: https://pmd.svn.sourceforge.net/svnroot/pmd/trunk@4485 51baf565-9d33-0410-a72c-fc3788e3496d
This commit is contained in:
Tom Copeland
2006-08-09 04:14:22 +00:00
parent e8e04d79b6
commit 07376a9373
1 changed files with 5 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
pmd/src/net/sourceforge/pmd/RuleSetFactory.java
View File

@@ -22,6 +22,8 @@ import java.util.List;
import java.util.Properties;
import java.util.Set;
import java.util.StringTokenizer;
import java.util.Collection;
import java.util.Collections;
// Note that ruleset parsing may fail on JDK 1.6 beta
// due to this bug - http://www.netbeans.org/issues/show_bug.cgi?id=63257
@@ -80,15 +82,9 @@ public class RuleSetFactory {
public Iterator getRegisteredRuleSets() throws RuleSetNotFoundException {
try {
Properties props = new Properties();
props.load(ResourceLoader
.loadResourceAsStream("rulesets/rulesets.properties"));
props.load(ResourceLoader.loadResourceAsStream("rulesets/rulesets.properties"));
String rulesetFilenames = props.getProperty("rulesets.filenames");
List ruleSets = new ArrayList();
for (StringTokenizer st = new StringTokenizer(rulesetFilenames, ","); st
.hasMoreTokens();) {
ruleSets.add(createRuleSet(st.nextToken()));
}
return ruleSets.iterator();
return createRuleSets(rulesetFilenames).getRuleSetsIterator();
} catch (IOException ioe) {
throw new RuntimeException("Couldn't find rulesets.properties; please ensure that the rulesets directory is on the classpath. Here's the current classpath: "
+ System.getProperty("java.class.path"));
@@ -137,16 +133,13 @@ public class RuleSetFactory {
* single RuleSet object, and thus removes name and language of the
* originating rule set files.
*/
public RuleSet createRuleSet(String name, ClassLoader classLoader)
throws RuleSetNotFoundException {
public RuleSet createRuleSet(String name, ClassLoader classLoader) throws RuleSetNotFoundException {
RuleSets ruleSets = createRuleSets(name, classLoader);
RuleSet result = new RuleSet();
RuleSet[] allRuleSets = ruleSets.getAllRuleSets();
for (int i = 0; i < allRuleSets.length; i++) {
result.addRuleSet(allRuleSets[i]);
}
return result;
}