Remove the storage of inactive rules.

Log a warning, if global rule management is active and not all
rules are being applied.

Author: adangel

net.sourceforge.pmd.eclipse.plugin.test/src/main/java/net/sourceforge/pmd/eclipse/runtime/preferences/impl/PreferencesManagerImplTest.java

@@ -25,11 +25,9 @@ public void storeAndLoadInactiveRules() {
         IPreferences preferences = manager.loadPreferences();
         preferences.isActive(ruleName, false);
         manager.storePreferences(preferences);
-        Assert.assertFalse(preferences.getInactiveRuleNames().isEmpty());
-        Assert.assertTrue(preferences.getInactiveRuleNames().contains(ruleName));
+        Assert.assertFalse(preferences.getActiveRuleNames().contains(ruleName));
 
         preferences = manager.reloadPreferences();
-        Assert.assertFalse(preferences.getInactiveRuleNames().isEmpty());
-        Assert.assertTrue(preferences.getInactiveRuleNames().contains(ruleName));
+        Assert.assertFalse(preferences.getActiveRuleNames().contains(ruleName));
     }
 }

net.sourceforge.pmd.eclipse.plugin/src/main/java/net/sourceforge/pmd/eclipse/plugin/PMDPlugin.java

@@ -416,6 +416,10 @@ public void logInformation(String message) {
         getLog().log(new Status(IStatus.INFO, getBundle().getSymbolicName(), 0, message, null));
     }
 
+    public void logWarn(String message) {
+        getLog().log(new Status(IStatus.WARNING, getBundle().getSymbolicName(), 0, message, null));
+    }
+
     /**
      * @return an instance of an AST writer
      */

net.sourceforge.pmd.eclipse.plugin/src/main/java/net/sourceforge/pmd/eclipse/runtime/cmd/ReviewCodeCmd.java

@@ -463,11 +463,19 @@ private RuleSet filteredRuleSet(IProjectProperties properties) throws CommandExc
 
          final RuleSet ruleSet = properties.getProjectRuleSet();
          IPreferences preferences = PMDPlugin.getDefault().getPreferencesManager().loadPreferences();
-         Set<String> inactiveRuleNames = preferences.getInactiveRuleNames();
+         Set<String> onlyActiveRuleNames = preferences.getActiveRuleNames();
 
          RuleSet filteredRuleSet = RuleSetUtil.newCopyOf(ruleSet);
+         int rulesBefore = filteredRuleSet.size();
          if (preferences.getGlobalRuleManagement()) {
-             RuleSetUtil.remove(filteredRuleSet, inactiveRuleNames);
+             RuleSetUtil.retainOnly(filteredRuleSet, onlyActiveRuleNames);
+             int rulesAfter = filteredRuleSet.size();
+
+             if (rulesAfter < rulesBefore) {
+                 PMDPlugin.getDefault().logWarn("Ruleset has been filtered as Global Rule Management is active. "
+                     + rulesAfter + " of " + rulesBefore + " rules are active and are used. "
+                     + (rulesBefore - rulesAfter) + " rules will be ignored.");
+             }
          }
          filteredRuleSet.addExcludePatterns(preferences.activeExclusionPatterns());
          filteredRuleSet.addIncludePatterns(preferences.activeInclusionPatterns());

net.sourceforge.pmd.eclipse.plugin/src/main/java/net/sourceforge/pmd/eclipse/runtime/preferences/IPreferences.java

@@ -69,7 +69,6 @@ public interface IPreferences {
     String ACTIVE_RENDERERS = "text";
     String ACTIVE_EXCLUSIONS = "";
     String ACTIVE_INCLUSIONS = "";
-    String INACTIVE_RULES = "";
 
     boolean GLOBAL_RULE_MANAGEMENT_DEFAULT = false;
 
@@ -94,12 +93,8 @@ public interface IPreferences {
 
     Set<String> getActiveRuleNames();
 
-    Set<String> getInactiveRuleNames();
-
     void setActiveRuleNames(Set<String> ruleNames);
 
-    void setInactiveRuleNames(Set<String> ruleNames);
-    
     /**
      * Should the Project Build Path be used?
      */

net.sourceforge.pmd.eclipse.plugin/src/main/java/net/sourceforge/pmd/eclipse/runtime/preferences/impl/PreferencesManagerImpl.java

@@ -107,7 +107,6 @@ class PreferencesManagerImpl implements IPreferencesManager {
     private static final String LOG_FILENAME                	= PMDPlugin.PLUGIN_ID + ".log_filename";
     private static final String LOG_LEVEL                   	= PMDPlugin.PLUGIN_ID + ".log_level";
     private static final String GLOBAL_RULE_MANAGEMENT          = PMDPlugin.PLUGIN_ID + ".globalRuleManagement";
-    private static final String INACTIVE_RULES                  = PMDPlugin.PLUGIN_ID + ".inactive_rules";
     private static final String ACTIVE_RULES                	= PMDPlugin.PLUGIN_ID + ".active_rules";
     private static final String ACTIVE_RENDERERS               	= PMDPlugin.PLUGIN_ID + ".active_renderers";
     private static final String ACTIVE_EXCLUSIONS              	= PMDPlugin.PLUGIN_ID + ".active_exclusions";
@@ -171,7 +170,6 @@ public IPreferences reloadPreferences() {
         loadLogFileName();
         loadLogLevel();
         loadGlobalRuleManagement();
-        loadInactiveRules();
         loadActiveRules();
         loadActiveReportRenderers();
         loadActiveExclusions();
@@ -236,7 +234,6 @@ public void storePreferences(IPreferences thePreferences) {
         storeLogFileName();
         storeLogLevel();
         storeGlobalRuleManagement();
-        storeInactiveRules();
         storeActiveRules();
         storeActiveReportRenderers();
         storeActiveExclusions();
@@ -319,11 +316,6 @@ private void loadGlobalRuleManagement() {
         preferences.setGlobalRuleManagement(loadPreferencesStore.getBoolean(GLOBAL_RULE_MANAGEMENT));
     }
 
-    private void loadInactiveRules() {
-        loadPreferencesStore.setDefault(INACTIVE_RULES, IPreferences.INACTIVE_RULES);
-        preferences.setInactiveRuleNames(asStringSet(loadPreferencesStore.getString(INACTIVE_RULES), ","));
-    }
-
     private void loadActiveRules() {
         loadPreferencesStore.setDefault(ACTIVE_RULES, preferences.getDefaultActiveRules());
         preferences.setActiveRuleNames(asStringSet(loadPreferencesStore.getString(ACTIVE_RULES), ","));
@@ -384,9 +376,6 @@ private void storeGlobalRuleManagement() {
         storePreferencesStore.setValue(GLOBAL_RULE_MANAGEMENT, preferences.getGlobalRuleManagement());
     }
 
-    private void storeInactiveRules() {
-        storePreferencesStore.setValue(INACTIVE_RULES, asDelimitedString(preferences.getInactiveRuleNames(), ","));
-    }
     private void storeActiveRules() {
     	storePreferencesStore.setValue(ACTIVE_RULES, asDelimitedString(preferences.getActiveRuleNames(), ","));
     }

net.sourceforge.pmd.eclipse.plugin/src/main/java/net/sourceforge/pmd/eclipse/ui/actions/RuleSetUtil.java

@@ -40,7 +40,7 @@ public static void retainOnly(RuleSet ruleSet, Set<String> wantedRuleNames) {
 		Collection<Rule> rules = ruleSet.getRules();
 		Collection<Rule> ruleCopy = new ArrayList<Rule>(rules.size());
 		ruleCopy.addAll(rules);
-				
+
 		for (Rule rule : ruleCopy) {
 			if (!wantedRuleNames.contains(rule.getName())) {
 				rules.remove(rule);

net.sourceforge.pmd.eclipse.plugin/src/main/java/net/sourceforge/pmd/eclipse/ui/preferences/br/PMDPreferencePage2.java

@@ -1,7 +1,6 @@
 package net.sourceforge.pmd.eclipse.ui.preferences.br;
 
 import java.lang.reflect.InvocationTargetException;
-import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
@@ -522,9 +521,7 @@ private void storeActiveRules() {
 		    activeRules.add(rule.getName());
 		}
 
-		// first remove all inactive rules
-		preferences.setInactiveRuleNames(new HashSet<String>());
-		// then override the active rules
+		// override all the active rules
 		preferences.setActiveRuleNames(activeRules);
 
 //		System.out.println("Active rules: " + preferences.getActiveRuleNames());

net.sourceforge.pmd.eclipse.plugin/src/main/java/net/sourceforge/pmd/eclipse/ui/preferences/br/RuleTableManager.java

@@ -952,9 +952,7 @@ protected void setAllItemsActive() {
             activeRules.add(rulesArray[i].getName());
         }
 
-        // remove first all inactive rules
-	    preferences.setInactiveRuleNames(new HashSet<String>());
-	    // then set all active rules
+	    // set all active rules
 	    preferences.setActiveRuleNames(activeRules);
 
 		treeViewer().setCheckedElements(rulesArray);