[pmd-devel] SF.net SVN: pmd:[6765] trunk/pmd-eclipse-plugin/plugins/net.sourceforge.pmd .eclipse.plugin

[<rg...@us...>]

Revision: 6765
          http://pmd.svn.sourceforge.net/pmd/?rev=6765&view=rev
Author:   rgustav
Date:     2008-12-31 08:01:24 +0000 (Wed, 31 Dec 2008)

Log Message:
-----------
Update to current PMD 5.0, fixes issued with RuleSetFactory.getRegisteredRuleSets() due to missing ecmascript ruleset.properties.

Update PreferenceManagerImpl for RuleSetFactory changes.

Modified Paths:
--------------
    trunk/pmd-eclipse-plugin/plugins/net.sourceforge.pmd.eclipse.plugin/lib/pmd-5.0.jar
    trunk/pmd-eclipse-plugin/plugins/net.sourceforge.pmd.eclipse.plugin/src/net/sourceforge/pmd/eclipse/runtime/preferences/impl/PreferencesManagerImpl.java

Modified: trunk/pmd-eclipse-plugin/plugins/net.sourceforge.pmd.eclipse.plugin/lib/pmd-5.0.jar
===================================================================
(Binary files differ)

Modified: trunk/pmd-eclipse-plugin/plugins/net.sourceforge.pmd.eclipse.plugin/src/net/sourceforge/pmd/eclipse/runtime/preferences/impl/PreferencesManagerImpl.java
===================================================================
--- trunk/pmd-eclipse-plugin/plugins/net.sourceforge.pmd.eclipse.plugin/src/net/sourceforge/pmd/eclipse/runtime/preferences/impl/PreferencesManagerImpl.java	2008-12-31 07:43:18 UTC (rev 6764)
+++ trunk/pmd-eclipse-plugin/plugins/net.sourceforge.pmd.eclipse.plugin/src/net/sourceforge/pmd/eclipse/runtime/preferences/impl/PreferencesManagerImpl.java	2008-12-31 08:01:24 UTC (rev 6765)
@@ -51,6 +51,7 @@
 import net.sourceforge.pmd.Rule;
 import net.sourceforge.pmd.RuleSet;
 import net.sourceforge.pmd.RuleSetFactory;
+import net.sourceforge.pmd.RuleSetNotFoundException;
 import net.sourceforge.pmd.eclipse.core.IRuleSetManager;
 import net.sourceforge.pmd.eclipse.plugin.PMDPlugin;
 import net.sourceforge.pmd.eclipse.runtime.preferences.IPreferences;
@@ -344,16 +345,12 @@
         File ruleSetFile = new File(ruleSetLocation.toOSString());
         if (ruleSetFile.exists()) {
             try {
-                FileInputStream in = new FileInputStream(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);
+                preferedRuleSet = factory.createRuleSet(ruleSetLocation.toOSString());
             } catch (RuntimeException 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


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.