# HG changeset patch # Parent 50a3ba9f4e87b0d3b014cafc5f1296cdf8bb672d # User Jesse Glick # Date 1394123533 28800 Bug #234603: option to suppress FindBugs editor warnings in test roots. diff --git a/findbugs/nbproject/project.xml b/findbugs/nbproject/project.xml --- a/findbugs/nbproject/project.xml +++ b/findbugs/nbproject/project.xml @@ -15,6 +15,15 @@ + org.netbeans.api.java + + + + 1 + 1.52 + + + org.netbeans.api.java.classpath diff --git a/findbugs/src/org/netbeans/modules/findbugs/AnalyzerImpl.java b/findbugs/src/org/netbeans/modules/findbugs/AnalyzerImpl.java --- a/findbugs/src/org/netbeans/modules/findbugs/AnalyzerImpl.java +++ b/findbugs/src/org/netbeans/modules/findbugs/AnalyzerImpl.java @@ -358,6 +358,7 @@ @Override public void warningOpened(ErrorDescription warning) { + // TODO but if it is in a test root, maybe do not skip it (though would ideally ignore test source root if scope includes whole projects) if (NbPreferences.forModule(RunInEditor.class).getBoolean(RunInEditor.RUN_IN_EDITOR, RunInEditor.RUN_IN_EDITOR_DEFAULT)) return; FileObject file = warning.getFile(); diff --git a/findbugs/src/org/netbeans/modules/findbugs/RunInEditor.java b/findbugs/src/org/netbeans/modules/findbugs/RunInEditor.java --- a/findbugs/src/org/netbeans/modules/findbugs/RunInEditor.java +++ b/findbugs/src/org/netbeans/modules/findbugs/RunInEditor.java @@ -56,6 +56,7 @@ import javax.lang.model.element.TypeElement; import javax.swing.text.Document; import org.netbeans.api.java.classpath.ClassPath; +import org.netbeans.api.java.queries.UnitTestForSourceQuery; import org.netbeans.api.java.source.CancellableTask; import org.netbeans.api.java.source.ClasspathInfo.PathKind; import org.netbeans.api.java.source.CompilationInfo; @@ -122,6 +123,11 @@ return; } + if (UnitTestForSourceQuery.findSources(sourceRoot).length > 0) { + // TODO introduce an option for this in FindBugsPanel akin to RUN_IN_EDITOR + return; + } + final Set classNames = new HashSet(); new TreePathScanner() {