#1248 global rule management persistence broken

Author: adangel

ReleaseNotes.md

@@ -7,7 +7,8 @@ Eclipse Update Site: <https://sourceforge.net/projects/pmd/files/pmd-eclipse/upd
 ## ????: 4.0.6.v????
 
 * Updated PMD to 5.2.3 ([pull request #4](https://github.com/pmd/pmd-eclipse-plugin/pull/4))
-* Some performance improvments when using a BUNCH of projects with pmd settings ([pull request #3](https://github.com/pmd/pmd-eclipse-plugin/pull/3))
+* Some performance improvements when using a BUNCH of projects with pmd settings ([pull request #3](https://github.com/pmd/pmd-eclipse-plugin/pull/3))
+* Fixed global rule management persistence broken ([bug #1248](https://sourceforge.net/p/pmd/bugs/1248))
 
 
 ## 05-November-2014: 4.0.5.v20141105-1906

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

@@ -1,7 +1,10 @@
 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;
 
 import net.sourceforge.pmd.PropertyDescriptor;
 import net.sourceforge.pmd.PropertySource;
@@ -511,14 +514,19 @@ private void saveUIState() {
 		PreferenceUIStore.instance.save();
 	}
 
-
 	private void storeActiveRules() {
 
 		List<Rule> chosenRules = tableManager.activeRules();
+		Set<String> activeRules = new HashSet<String>();
 		for (Rule rule : chosenRules) {
-			preferences.isActive(rule.getName(), true);
+		    activeRules.add(rule.getName());
 		}
 
+		// first remove all inactive rules
+		preferences.setInactiveRuleNames(new HashSet<String>());
+		// then override 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

@@ -6,6 +6,8 @@
 import java.io.IOException;
 import java.io.OutputStream;
 import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Set;
@@ -289,15 +291,21 @@ protected void removeSelectedItems() {
 	    int removeCount = ruleSelection.removeAllFrom(ruleSet);
 	    if (removeCount == 0) return;
 
-	    removed(ruleSelection.allRules());
-	    
+	    List<Rule> removedRules = ruleSelection.allRules();
+	    for (Rule r : removedRules) {
+	        preferences.isActive(r.getName(), false);
+	    }
+        removed(removedRules);
+
         setModified();
 
         try {
             refresh();
         } catch (Throwable t) {
             treeViewer.setSelection(null);
         }
+
+        updateCheckControls();
 	}
 
 	/**
@@ -936,11 +944,20 @@ private SelectionStats selectionRatioIn(Rule[] rules) {
 	}
 
 	protected void setAllItemsActive() {
-		for (Rule rule : ruleSet.getRules()) {
-			isActive(rule.getName(), true);
-		}
+	    Collection<Rule> rules = ruleSet.getRules();
+	    Rule[] rulesArray = rules.toArray(new Rule[rules.size()]);
+
+	    Set<String> activeRules = new HashSet<String>();
+	    for (int i = 0; i < rulesArray.length; i++) {
+            activeRules.add(rulesArray[i].getName());
+        }
+
+        // remove first all inactive rules
+	    preferences.setInactiveRuleNames(new HashSet<String>());
+	    // then set all active rules
+	    preferences.setActiveRuleNames(activeRules);
 
-		treeViewer().setCheckedElements(ruleSet.getRules().toArray());
+		treeViewer().setCheckedElements(rulesArray);
 
 		updateCheckControls();
 		setModified();

net.sourceforge.pmd.eclipse.plugin/src/main/java/net/sourceforge/pmd/eclipse/ui/views/rules/RuleEditorView.java

@@ -1,6 +1,8 @@
 package net.sourceforge.pmd.eclipse.ui.views.rules;
 
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 
 import net.sourceforge.pmd.PropertyDescriptor;
 import net.sourceforge.pmd.PropertySource;
@@ -285,17 +287,6 @@ private void saveUIState() {
 		PreferenceUIStore.instance.save();
 	}
 
-
-	private void storeActiveRules() {
-
-		List<Rule> chosenRules = tableManager.activeRules();
-		for (Rule rule : chosenRules) {
-			preferences.isActive(rule.getName(), true);
-		}
-
-		System.out.println("Active rules: " + preferences.getActiveRuleNames());
-	}
-
 	/**
 	 * Update the configured rule set
 	 * Update also all configured projects