phoedos/pmd
1
1
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

File include/exclude filters now working

Browse Source 
git-svn-id: https://pmd.svn.sourceforge.net/svnroot/pmd/trunk@7597 51baf565-9d33-0410-a72c-fc3788e3496d
This commit is contained in:
Brian Remedios
2011-12-19 21:38:24 +00:00
parent 5f739ad7a8
commit 400612d0c7
4 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
pmd-eclipse-plugin/plugins/net.sourceforge.pmd.eclipse.plugin/lib/pmd-5.0.jar
View File

Binary file not shown.

4
pmd-eclipse-plugin/plugins/net.sourceforge.pmd.eclipse.plugin/src/net/sourceforge/pmd/eclipse/runtime/cmd/ReviewCodeCmd.java
View File

@ -445,11 +445,13 @@ public class ReviewCodeCmd extends AbstractDefaultCommand {
RuleSet filteredRuleSet = RuleSetUtil.newCopyOf(ruleSet);
RuleSetUtil.retainOnly(filteredRuleSet, activeRuleNames);
filteredRuleSet.setExcludePatterns(preferences.activeExclusionPatterns());
filteredRuleSet.setIncludePatterns(preferences.activeInclusionPatterns());
taskScope(filteredRuleSet.getRules().size(), ruleSet.getRules().size());
return filteredRuleSet;
}
private RuleSet rulesetFromResourceDelta() throws PropertiesException, CommandException{
IResource resource = resourceDelta.getResource();

3
pmd-eclipse-plugin/plugins/net.sourceforge.pmd.eclipse.plugin/src/net/sourceforge/pmd/eclipse/ui/actions/RuleSetUtil.java
View File

@ -33,7 +33,7 @@ public class RuleSetUtil {
* internal container....oops! :)
*
* @param ruleSet
* @param unwantedRuleNames
* @param wantedRuleNames
*/
public static void retainOnly(RuleSet ruleSet, Set<String> wantedRuleNames) {
@ -46,6 +46,5 @@ public class RuleSetUtil {
rules.remove(rule);
}
}
}
}

11
pmd-eclipse-plugin/plugins/net.sourceforge.pmd.eclipse.plugin/src/net/sourceforge/pmd/eclipse/ui/filters/FilterPreferencesPage.java
View File

@ -189,7 +189,6 @@ public class FilterPreferencesPage extends AbstractPMDPreferencePage implements
tableViewer.setLabelProvider(labelProvider);
tableViewer.setContentProvider(contentProvider);
table.setHeaderVisible(true);
// labelProvider.addColumnsTo(table);
tableViewer.setInput( currentFilters() );
@ -528,7 +527,8 @@ public class FilterPreferencesPage extends AbstractPMDPreferencePage implements
FilterHolder[] holders = tableFiltersWith(newHolder);
tableViewer.setInput( holders );
tableViewer.getTable().select(holders.length-1);
tableViewer.getTable().setSelection(holders.length-1);
patternsSelected();
patternField.selectAll();
patternField.forceFocus();
@ -559,7 +559,7 @@ public class FilterPreferencesPage extends AbstractPMDPreferencePage implements
Object[] selections = sel.toArray();
tableViewer.remove(selections);
}
/**
* @return boolean
* @see org.eclipse.jface.preference.IPreferencePage#performOk() */
@ -570,11 +570,12 @@ public class FilterPreferencesPage extends AbstractPMDPreferencePage implements
RuleSet ruleSet = ipMgr.getRuleSet();
ruleSet.setExcludePatterns( tableFilters(false) );
ruleSet.setIncludePatterns( tableFilters(true) );
ipMgr.setRuleSet(ruleSet);
Set<FilterHolder> filters = currentCheckedFilters();
preferences.activeExclusionPatterns( patternsIn(filters, false) );
preferences.activeInclusionPatterns( patternsIn(filters, true) );
preferences.sync();
return super.performOk();