Add back backwards compatible IProjectPRoperties.getResolvedRuleSetFile()

Author: adangel

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

@@ -106,8 +106,16 @@ public interface IProjectProperties {
     /**
      * @return Returns the resolved RuleSet File suitable for loading a rule
      *         set.
+     * @deprecated use {@link #getResolvedRuleSetFiles()} instead
      */
-    List<File> getResolvedRuleSetFile() throws PropertiesException;
+    @Deprecated
+    File getResolvedRuleSetFile() throws PropertiesException;
+
+    /**
+     * @return Returns the resolved RuleSet Files suitable for loading multiple
+     * rulesets.
+     */
+    List<File> getResolvedRuleSetFiles() throws PropertiesException;
 
     /**
      * @return Returns the project Working Set.

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

@@ -189,7 +189,7 @@ public void setProjectRuleSet(final RuleSet projectRuleSet) throws PropertiesExc
         this.needRebuild |= !this.projectRuleSet.getRules().equals(projectRuleSet.getRules());
         this.projectRuleSet = projectRuleSet;
         if (this.ruleSetStoredInProject) {
-            for (File f : getResolvedRuleSetFile()) {
+            for (File f : getResolvedRuleSetFiles()) {
                 if (f != null) {
                     if (projectRuleFileLastModified < f.lastModified()) {
                         projectRuleFileLastModified = f.lastModified();
@@ -220,7 +220,7 @@ public void setRuleSetStoredInProject(final boolean ruleSetStoredInProject) thro
                 throw new PropertiesException(
                         "The project ruleset file cannot be found for project " + this.project.getName());
             }
-            for (File f : getResolvedRuleSetFile()) {
+            for (File f : getResolvedRuleSetFiles()) {
                 if (f != null) {
                     if (projectRuleFileLastModified < f.lastModified()) {
                         projectRuleFileLastModified = f.lastModified();
@@ -251,7 +251,7 @@ public void setRuleSetFile(String ruleSetFile) throws PropertiesException {
                 throw new PropertiesException(
                         "The project ruleset file cannot be found for project " + project.getName());
             }
-            for (File f : getResolvedRuleSetFile()) {
+            for (File f : getResolvedRuleSetFiles()) {
                 if (f != null) {
                     if (projectRuleFileLastModified < f.lastModified()) {
                         projectRuleFileLastModified = f.lastModified();
@@ -283,12 +283,13 @@ public void setProjectWorkingSet(final IWorkingSet projectWorkingSet) {
     /**
      * @see net.sourceforge.pmd.eclipse.runtime.properties.IProjectProperties#isNeedRebuild()
      */
+    @Override
     public boolean isNeedRebuild() {
         LOG.debug("Query if project " + project.getName() + " need rebuild : " + (pmdEnabled && needRebuild));
         LOG.debug("   PMD Enabled = " + pmdEnabled);
         LOG.debug("   Project need rebuild = " + needRebuild);
         if (ruleSetStoredInProject) {
-            for (File f : getResolvedRuleSetFile()) {
+            for (File f : getResolvedRuleSetFiles()) {
                 if (f != null) {
                     needRebuild |= f.lastModified() > projectRuleFileLastModified;
                 }
@@ -310,18 +311,28 @@ public void setNeedRebuild(final boolean needRebuild) {
      */
     public final boolean isRuleSetFileExist() {
         boolean ret = true;
-        for (File f : getResolvedRuleSetFile()) {
+        for (File f : getResolvedRuleSetFiles()) {
             if (!f.exists()) {
                 ret = false;
             }
         }
         return ret;
     }
 
+    @Deprecated
+    @Override
+    public File getResolvedRuleSetFile() throws PropertiesException {
+        if (isRuleSetFileExist()) {
+            return getResolvedRuleSetFiles().get(0);
+        }
+        return null;
+    }
+
     /**
-     * @see net.sourceforge.pmd.eclipse.runtime.properties.IProjectProperties#getResolvedRuleSetFile()
+     * @see net.sourceforge.pmd.eclipse.runtime.properties.IProjectProperties#getResolvedRuleSetFiles()
      */
-    public List<File> getResolvedRuleSetFile() {
+    @Override
+    public List<File> getResolvedRuleSetFiles() {
         // Check as project-relative path
         List<File> files = new ArrayList<File>();
         for (String ruleSetFile : getRuleSetFile().split(",")) {

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

@@ -173,7 +173,7 @@ private void loadRuleSetFromProject(IProjectProperties projectProperties) throws
             try {
                 final RuleSetFactory factory = new RuleSetFactory();
                 RuleSet allRuleSets = null;
-                for (final File ruleSetFile : projectProperties.getResolvedRuleSetFile()) {
+                for (final File ruleSetFile : projectProperties.getResolvedRuleSetFiles()) {
                     RuleSet rs = factory.createRuleSets(ruleSetFile.getPath()).getAllRuleSets()[0];
                     if (allRuleSets == null) {
                         /* The first ruleset file */