Inspections settings ui: tools not initialized if no necessity to apply inspections filter

This commit is contained in:
Dmitry Batkovich
2014-07-22 17:04:11 +04:00
parent da81c5d0b6
commit 04518cd5a9
2 changed files with 6 additions and 1 deletions
@@ -661,12 +661,13 @@ public class SingleInspectionProfilePanel extends JPanel {
keySetList.addAll(SearchUtil.findKeys(filter, quoted));
}
Project project = myProjectProfileManager.getProject();
final boolean emptyFilter = myInspectionsFilter.isEmptyFilter();
for (ToolDescriptors toolDescriptors : myInitialToolDescriptors) {
final Descriptor descriptor = toolDescriptors.getDefaultDescriptor();
if (filter != null && !filter.isEmpty() && !isDescriptorAccepted(descriptor, filter, forceInclude, keySetList, quoted)) {
continue;
}
if (!myInspectionsFilter.matches(mySelectedProfile.getTools(toolDescriptors.getDefaultDescriptor().getKey().toString(), project))) {
if (!emptyFilter && !myInspectionsFilter.matches(mySelectedProfile.getTools(toolDescriptors.getDefaultDescriptor().getKey().toString(), project))) {
continue;
}
final InspectionConfigTreeNode node = new InspectionConfigTreeNode(toolDescriptors);
@@ -66,6 +66,10 @@ public abstract class InspectionsFilter {
filterChanged();
}
public boolean isEmptyFilter() {
return mySuitableInspectionsStates == null && !myAvailableOnlyForAnalyze && mySuitableSeverities.isEmpty();
}
public boolean matches(final Tools tools) {
if (mySuitableInspectionsStates != null && mySuitableInspectionsStates != tools.isEnabled()) {
return false;