Update to current PMD 5.0, fixes issued with RuleSetFactory.getRegisteredRuleSets() due to missing ecmascript ruleset.properties.
Update PreferenceManagerImpl for RuleSetFactory changes. git-svn-id: https://pmd.svn.sourceforge.net/svnroot/pmd/trunk@6765 51baf565-9d33-0410-a72c-fc3788e3496d
This commit is contained in:
Binary file not shown.
@ -51,6 +51,7 @@ import java.util.Set;
|
|||||||
import net.sourceforge.pmd.Rule;
|
import net.sourceforge.pmd.Rule;
|
||||||
import net.sourceforge.pmd.RuleSet;
|
import net.sourceforge.pmd.RuleSet;
|
||||||
import net.sourceforge.pmd.RuleSetFactory;
|
import net.sourceforge.pmd.RuleSetFactory;
|
||||||
|
import net.sourceforge.pmd.RuleSetNotFoundException;
|
||||||
import net.sourceforge.pmd.eclipse.core.IRuleSetManager;
|
import net.sourceforge.pmd.eclipse.core.IRuleSetManager;
|
||||||
import net.sourceforge.pmd.eclipse.plugin.PMDPlugin;
|
import net.sourceforge.pmd.eclipse.plugin.PMDPlugin;
|
||||||
import net.sourceforge.pmd.eclipse.runtime.preferences.IPreferences;
|
import net.sourceforge.pmd.eclipse.runtime.preferences.IPreferences;
|
||||||
@ -344,16 +345,12 @@ class PreferencesManagerImpl implements IPreferencesManager {
|
|||||||
File ruleSetFile = new File(ruleSetLocation.toOSString());
|
File ruleSetFile = new File(ruleSetLocation.toOSString());
|
||||||
if (ruleSetFile.exists()) {
|
if (ruleSetFile.exists()) {
|
||||||
try {
|
try {
|
||||||
FileInputStream in = new FileInputStream(ruleSetLocation.toOSString());
|
preferedRuleSet = factory.createRuleSet(ruleSetLocation.toOSString());
|
||||||
preferedRuleSet = factory.createRuleSet(in);
|
|
||||||
in.close();
|
|
||||||
} catch (FileNotFoundException e) {
|
|
||||||
PMDPlugin.getDefault().logError("File Not Found Exception when loading state ruleset file", e);
|
|
||||||
} catch (IOException e) {
|
|
||||||
PMDPlugin.getDefault().logError("IO Exception when loading state ruleset file", e);
|
|
||||||
} catch (RuntimeException e) {
|
} catch (RuntimeException e) {
|
||||||
PMDPlugin.getDefault().logError("Runtime Exception when loading state ruleset file", e);
|
PMDPlugin.getDefault().logError("Runtime Exception when loading state ruleset file", e);
|
||||||
}
|
} catch (RuleSetNotFoundException e) {
|
||||||
|
PMDPlugin.getDefault().logError("RuleSet Not Found Exception when loading state ruleset file", e);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Finally, build a default ruleset
|
// Finally, build a default ruleset
|
||||||
|
Reference in New Issue
Block a user