Merge branch 'pr-92'

Author: adangel

ReleaseNotes.md

@@ -29,6 +29,7 @@ This is a minor release.
 *   [#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
 *   [#78](https://github.com/pmd/pmd-eclipse-plugin/issues/78): Project properties cannot be loaded anymore
+*   [#83](https://github.com/pmd/pmd-eclipse-plugin/issues/83): "Restore defaults" button in PMD prefences is always deactivated
 *   [#86](https://github.com/pmd/pmd-eclipse-plugin/issues/86): Add Markers next to Scroll bar
 *   [#88](https://github.com/pmd/pmd-eclipse-plugin/issues/88): PMD is executed for all file types regardless of active rules
 *   [#89](https://github.com/pmd/pmd-eclipse-plugin/issues/89): Upgrade to PMD 6.12.0

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

@@ -45,7 +45,12 @@ public interface IPreferencesManager {
      * Get the configured rule set
      */
     RuleSet getRuleSet();
-    
+
+    /**
+     * Gets the default rule set. This means, all rules, that the Plugin is aware of.
+     */
+    RuleSet getDefaultRuleSet();
+
     /**
      * Set the rule set and store it in the preferences
      */

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

@@ -577,19 +577,25 @@ private RuleSet getRuleSetFromStateLocation() {
 
         // Finally, build a default ruleset
         if (preferredRuleSet == null) {
-            preferredRuleSet = RuleSetUtil.newEmpty(RuleSetUtil.DEFAULT_RULESET_NAME,
-                    RuleSetUtil.DEFAULT_RULESET_DESCRIPTION);
-
-            IRuleSetManager ruleSetManager = PMDPlugin.getDefault().getRuleSetManager();
-            for (RuleSet ruleSet : ruleSetManager.getDefaultRuleSets()) {
-                preferredRuleSet = RuleSetUtil.addRuleSetByReference(preferredRuleSet, ruleSet, false);
-            }
+            preferredRuleSet = getDefaultRuleSet();
         }
 
         return preferredRuleSet;
 
     }
 
+    @Override
+    public RuleSet getDefaultRuleSet() {
+        RuleSet defaultRuleSet = RuleSetUtil.newEmpty(RuleSetUtil.DEFAULT_RULESET_NAME,
+                RuleSetUtil.DEFAULT_RULESET_DESCRIPTION);
+
+        IRuleSetManager ruleSetManager = PMDPlugin.getDefault().getRuleSetManager();
+        for (RuleSet ruleSet : ruleSetManager.getDefaultRuleSets()) {
+            defaultRuleSet = RuleSetUtil.addRuleSetByReference(defaultRuleSet, ruleSet, false);
+        }
+        return defaultRuleSet;
+    }
+
     /**
      * Find if rules has been added
      */

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

@@ -20,7 +20,6 @@
 import net.sourceforge.pmd.eclipse.plugin.PMDPlugin;
 import net.sourceforge.pmd.eclipse.runtime.preferences.IPreferences;
 import net.sourceforge.pmd.eclipse.ui.nls.StringKeys;
-import net.sourceforge.pmd.eclipse.ui.preferences.editors.SWTUtil;
 
 public abstract class AbstractPMDPreferencePage extends PreferencePage implements IWorkbenchPreferencePage {
 
@@ -52,9 +51,6 @@ public void setModified() {
      */
     public void setModified(boolean isModified) {
         modified = isModified;
-
-        SWTUtil.setEnabled(getApplyButton(), modified);
-        SWTUtil.setEnabled(getDefaultsButton(), !modified);
     }
 
     /**

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

@@ -34,6 +34,7 @@
 import net.sourceforge.pmd.Rule;
 import net.sourceforge.pmd.RuleSet;
 import net.sourceforge.pmd.eclipse.plugin.PMDPlugin;
+import net.sourceforge.pmd.eclipse.runtime.preferences.IPreferences;
 import net.sourceforge.pmd.eclipse.runtime.preferences.impl.PreferenceUIStore;
 import net.sourceforge.pmd.eclipse.ui.ModifyListener;
 import net.sourceforge.pmd.eclipse.ui.actions.RuleSetUtil;
@@ -62,6 +63,7 @@ public class PMDPreferencePage2 extends AbstractPMDPreferencePage
     private RulePropertyManager[] rulePropertyManagers;
     private RuleTableManager tableManager;
     private Button globalRuleManagementCheckButton;
+    private Composite contentPanel;
 
     // columns shown in the rule treetable in the desired order
     public static final RuleColumnDescriptor[] AVAILABLE_COLUMNS = new RuleColumnDescriptor[] { RuleTableColumns.NAME,
@@ -133,13 +135,9 @@ protected Control createContents(Composite parent) {
         int i = PreferenceUIStore.INSTANCE.selectedPropertyTab();
         tabFolder.setSelection(i);
 
-        return composite;
-    }
-
-    public void createControl(Composite parent) {
-        super.createControl(parent);
-
         setModified(false);
+
+        return composite;
     }
 
     /**
@@ -421,7 +419,7 @@ private void layoutControls(Composite parent) {
         final Button checkButton = new Button(checkboxPanel, SWT.CHECK);
         globalRuleManagementCheckButton = checkButton;
 
-        final Composite contentPanel = new Composite(parent, 0);
+        contentPanel = new Composite(parent, 0);
         contentPanel.setLayout(new FormLayout());
         contentPanel.setLayoutData(new GridData(GridData.FILL_BOTH));
 
@@ -490,8 +488,8 @@ public boolean performOk() {
         if (isModified()) {
             preferences.setGlobalRuleManagement(globalRuleManagementCheckButton.getSelection());
             updateRuleSet();
-            rebuildProjects();
             storeActiveRules();
+            rebuildProjects();
         }
         saveUIState();
 
@@ -504,12 +502,16 @@ public boolean performCancel() {
         return super.performCancel();
     }
 
-    /**
-     * @see org.eclipse.jface.preference.PreferencePage#performDefaults()
-     */
     @Override
     protected void performDefaults() {
+        globalRuleManagementCheckButton.setSelection(IPreferences.GLOBAL_RULE_MANAGEMENT_DEFAULT);
+        SWTUtil.setEnabledRecursive(contentPanel.getChildren(), globalRuleManagementCheckButton.getSelection());
+
+        RuleSet defaultRuleSet = plugin.getPreferencesManager().getDefaultRuleSet();
+        tableManager.useRuleSet(defaultRuleSet);
+        tableManager.setAllItemsActive();
         tableManager.populateRuleTable();
+
         super.performDefaults();
     }