diff --git a/pmd-eclipse-plugin/plugins/net.sourceforge.pmd.eclipse.plugin/src/net/sourceforge/pmd/eclipse/ui/preferences/GeneralPreferencesPage.java b/pmd-eclipse-plugin/plugins/net.sourceforge.pmd.eclipse.plugin/src/net/sourceforge/pmd/eclipse/ui/preferences/GeneralPreferencesPage.java index 8fbec5ab6e..082236a146 100644 --- a/pmd-eclipse-plugin/plugins/net.sourceforge.pmd.eclipse.plugin/src/net/sourceforge/pmd/eclipse/ui/preferences/GeneralPreferencesPage.java +++ b/pmd-eclipse-plugin/plugins/net.sourceforge.pmd.eclipse.plugin/src/net/sourceforge/pmd/eclipse/ui/preferences/GeneralPreferencesPage.java @@ -173,6 +173,25 @@ public class GeneralPreferencesPage extends PreferencePage implements IWorkbench return group; } + private Link createPreferenceLink(Composite parent, String label, final String prefPageId) { + + Link link = new Link(parent, SWT.None); + link.setText(label); + link.addSelectionListener (new SelectionAdapter () { + public void widgetSelected(SelectionEvent se) { + PreferenceDialog pref = PreferencesUtil.createPreferenceDialogOn( + getShell(), prefPageId, + new String[] {}, null + ); + if (pref != null) { + pref.open(); + } + } + }); + + return link; + } + /** * Build the group of priority preferences * @param parent the parent composite @@ -184,19 +203,10 @@ public class GeneralPreferencesPage extends PreferencePage implements IWorkbench group.setText(getMessage(StringKeys.MSGKEY_PREF_GENERAL_GROUP_PRIORITIES)); group.setLayout(new GridLayout(1, false)); - Link link = new Link(group, SWT.None); - link.setText("PMD folder annotations can be enabled on the label decorations page"); - link.addSelectionListener (new SelectionAdapter () { - public void widgetSelected(SelectionEvent se) { - PreferenceDialog pref = PreferencesUtil.createPreferenceDialogOn( - getShell(), "org.eclipse.ui.preferencePages.Decorators", - new String[] {}, null - ); - if (pref != null) { - pref.open(); - } - } - }); + createPreferenceLink(group, + "PMD folder annotations can be enabled on the label decorations page", + "org.eclipse.ui.preferencePages.Decorators" + ); IStructuredContentProvider contentProvider = new IStructuredContentProvider() { public void dispose() { } diff --git a/pmd-eclipse-plugin/plugins/net.sourceforge.pmd.eclipse.plugin/src/net/sourceforge/pmd/eclipse/ui/preferences/br/RuleSelection.java b/pmd-eclipse-plugin/plugins/net.sourceforge.pmd.eclipse.plugin/src/net/sourceforge/pmd/eclipse/ui/preferences/br/RuleSelection.java index 0feabed2a7..835679596e 100644 --- a/pmd-eclipse-plugin/plugins/net.sourceforge.pmd.eclipse.plugin/src/net/sourceforge/pmd/eclipse/ui/preferences/br/RuleSelection.java +++ b/pmd-eclipse-plugin/plugins/net.sourceforge.pmd.eclipse.plugin/src/net/sourceforge/pmd/eclipse/ui/preferences/br/RuleSelection.java @@ -141,7 +141,7 @@ public class RuleSelection implements RuleCollection { private static void useDefaultValues(Rule rule) { for (Map.Entry, Object> entry : Configuration.filteredPropertiesOf(rule).entrySet()) { - rule.useDefaultValueFor(entry.getKey()); + //rule.useDefaultValueFor(entry.getKey()); } } diff --git a/pmd-eclipse-plugin/plugins/net.sourceforge.pmd.eclipse.plugin/src/net/sourceforge/pmd/eclipse/ui/priority/PriorityColumnDescriptor.java b/pmd-eclipse-plugin/plugins/net.sourceforge.pmd.eclipse.plugin/src/net/sourceforge/pmd/eclipse/ui/priority/PriorityColumnDescriptor.java index 5307402c97..378ceb99ec 100755 --- a/pmd-eclipse-plugin/plugins/net.sourceforge.pmd.eclipse.plugin/src/net/sourceforge/pmd/eclipse/ui/priority/PriorityColumnDescriptor.java +++ b/pmd-eclipse-plugin/plugins/net.sourceforge.pmd.eclipse.plugin/src/net/sourceforge/pmd/eclipse/ui/priority/PriorityColumnDescriptor.java @@ -13,7 +13,7 @@ import org.eclipse.swt.graphics.Image; */ public class PriorityColumnDescriptor extends AbstractColumnDescriptor { - private PriorityFieldAccessor accessor; + private final PriorityFieldAccessor accessor; public PriorityColumnDescriptor(String theId, String labelKey, int theAlignment, int theWidth, boolean resizableFlag, PriorityFieldAccessor theAccessor) { super(theId, labelKey, theAlignment, theWidth, resizableFlag, null);