--- a/refactoring.java/apichanges.xml +++ a/refactoring.java/apichanges.xml @@ -49,6 +49,22 @@ Java Refactoring API + + + Added SOURCEFILE constant to JavaWhereUsedFilters. + + + + + +

+ To support filtering the opposite of test sources, the constant + SOURCEFILE is added to the enum JavaWhereUsedFilters. +

+
+ + +
RefactoringVisitor has support for visiting DocTrees --- a/refactoring.java/nbproject/project.properties +++ a/refactoring.java/nbproject/project.properties @@ -2,7 +2,7 @@ javadoc.arch=${basedir}/arch.xml javadoc.apichanges=${basedir}/apichanges.xml -spec.version.base=1.53.0 +spec.version.base=1.54.0 #test configs test.config.find.includes=\ **/FindUsagesSuite.class --- a/refactoring.java/src/org/netbeans/modules/refactoring/java/plugins/JavaWhereUsedQueryPlugin.java +++ a/refactoring.java/src/org/netbeans/modules/refactoring/java/plugins/JavaWhereUsedQueryPlugin.java @@ -484,6 +484,8 @@ ImageUtilities.loadImageIcon("org/netbeans/modules/refactoring/java/resources/found_item_import.png", false)); filtersDescription.addFilter(JavaWhereUsedFilters.COMMENT.getKey(), "Comment filter", true, ImageUtilities.loadImageIcon("org/netbeans/modules/refactoring/java/resources/found_item_comment.png", false)); + filtersDescription.addFilter(JavaWhereUsedFilters.SOURCEFILE.getKey(), "Source filter", true, + ImageUtilities.loadImageIcon("org/netbeans/modules/refactoring/java/resources/found_item_source.png", false)); filtersDescription.addFilter(JavaWhereUsedFilters.TESTFILE.getKey(), "Test filter", true, ImageUtilities.loadImageIcon("org/netbeans/modules/refactoring/java/resources/found_item_test.png", false)); } @@ -549,11 +551,16 @@ } elements.add(refactoring, el); } - if(fromTestRoot && !foundElements.isEmpty()) { - usedFilters.add(JavaWhereUsedFilters.TESTFILE.getKey()); - } - if(!foundElements.isEmpty() && findVisitor.usagesInComments()) { - usedFilters.add(JavaWhereUsedFilters.COMMENT.getKey()); + if(!foundElements.isEmpty()) { + if(fromTestRoot) { + usedFilters.add(JavaWhereUsedFilters.TESTFILE.getKey()); + } + if(!fromTestRoot) { + usedFilters.add(JavaWhereUsedFilters.SOURCEFILE.getKey()); + } + if(findVisitor.usagesInComments()) { + usedFilters.add(JavaWhereUsedFilters.COMMENT.getKey()); + } } } Collection result = new ArrayList<>(); @@ -573,6 +580,9 @@ if(fromTestRoot && !result.isEmpty()) { usedFilters.add(JavaWhereUsedFilters.TESTFILE.getKey()); } + if(!fromTestRoot && !result.isEmpty()) { + usedFilters.add(JavaWhereUsedFilters.SOURCEFILE.getKey()); + } if(inImport.get()) { usedFilters.add(JavaWhereUsedFilters.IMPORT.getKey()); } --- a/refactoring.java/src/org/netbeans/modules/refactoring/java/spi/JavaWhereUsedFilters.java +++ a/refactoring.java/src/org/netbeans/modules/refactoring/java/spi/JavaWhereUsedFilters.java @@ -51,7 +51,11 @@ IMPORT("filter-import"), COMMENT("filter-comment"), - TESTFILE("filter-testfile"); + TESTFILE("filter-testfile"), + /** + * @since 1.54 + */ + SOURCEFILE("filter-sourcefile"); private final String key; private JavaWhereUsedFilters(String key) {