Fixes #76: Global rule management is saved even if cancelled

Author: adangel

ReleaseNotes.md

@@ -14,6 +14,7 @@ Eclipse Update Site:
 ### Fixed Issues
 
 *   [#70](https://github.com/pmd/pmd-eclipse-plugin/issues/70): UnsupportedOperationException opening Rule Configuration
+*   [#76](https://github.com/pmd/pmd-eclipse-plugin/issues/76): Global rule management is saved even if cancelled
 
 ### External Contributions
 

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

@@ -484,21 +484,19 @@ public void widgetSelected(SelectionEvent event) {
      */
     @Override
     public boolean performOk() {
-
-        saveUIState();
-
         if (isModified()) {
+            preferences.setGlobalRuleManagement(globalRuleManagementCheckButton.getSelection());
             updateRuleSet();
             rebuildProjects();
             storeActiveRules();
         }
+        saveUIState();
 
         return super.performOk();
     }
 
     @Override
     public boolean performCancel() {
-
         saveUIState();
         return super.performCancel();
     }
@@ -536,8 +534,6 @@ private void saveUIState() {
         tableManager.saveUIState();
         int i = tabFolder.getSelectionIndex();
         PreferenceUIStore.INSTANCE.selectedPropertyTab(i);
-        PreferenceUIStore.INSTANCE.globalRuleManagement(globalRuleManagementCheckButton.getSelection());
-        preferences.setGlobalRuleManagement(globalRuleManagementCheckButton.getSelection());
         PreferenceUIStore.INSTANCE.save();
     }