# HG changeset patch
# User Ralph Benjamin Ruijs <ralphbenjamin@netbeans.org>
# Parent  a99b02f09b186dcbde1beb31cb3a5d0878e3a8fc
[mq]: 248250.diff

diff --git a/refactoring.java/apichanges.xml b/refactoring.java/apichanges.xml
--- a/refactoring.java/apichanges.xml
+++ b/refactoring.java/apichanges.xml
@@ -49,6 +49,22 @@
         <apidef name="JavaRefactoringAPI">Java Refactoring API</apidef>
     </apidefs>
     <changes>
+        <change id="FilterSourcePackages">
+            <api name="JavaRefactoringAPI"/>
+            <summary>Added SOURCEFILE constant to JavaWhereUsedFilters.</summary>
+            <version major="1" minor="54"/>
+            <date day="27" month="11" year="2014"/>
+            <author login="ralphbenjamin"/>
+            <compatibility addition="yes"/>
+            <description>
+                <p>
+                    To support filtering the opposite of test sources, the constant
+                    SOURCEFILE is added to the enum JavaWhereUsedFilters.
+                </p>    
+            </description>
+            <class package="org.netbeans.modules.refactoring.java.spi" name="JavaWhereUsedFilters"/>
+            <issue number="248250"/>
+        </change>
         <change id="DocTrees">
             <api name="JavaRefactoringAPI"/>
             <summary>RefactoringVisitor has support for visiting DocTrees</summary>
diff --git a/refactoring.java/nbproject/project.properties b/refactoring.java/nbproject/project.properties
--- a/refactoring.java/nbproject/project.properties
+++ b/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
diff --git a/refactoring.java/src/org/netbeans/modules/refactoring/java/plugins/JavaWhereUsedQueryPlugin.java b/refactoring.java/src/org/netbeans/modules/refactoring/java/plugins/JavaWhereUsedQueryPlugin.java
--- a/refactoring.java/src/org/netbeans/modules/refactoring/java/plugins/JavaWhereUsedQueryPlugin.java
+++ b/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<TreePath> 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());
             }
diff --git a/refactoring.java/src/org/netbeans/modules/refactoring/java/resources/found_item_source.png b/refactoring.java/src/org/netbeans/modules/refactoring/java/resources/found_item_source.png
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..a2b0f2e4a0ee9082f50024085afedcbe83c8fa08
GIT binary patch
literal 552
zc$@(!0@wYCP)<h;3K|Lk000e1NJLTq000pH000pP1^@s6J8eh$00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru-U|{86EevHkc<ET0kug)
zK~y-)-IB{{Q&AL#zqR*1xoD+$0V^d3MdyN}&Kx-_eE>nhiO=ABICUUSor&l`1Qih!
z#i<A-A{0%N+NMcPa`x3hb7}&|xwv4%V)66swSIp1S4yhp^`lKgb|$ma-dRDk00}T!
z<3so(6v1e%uHSyztwyG5VoV+F$M^EJwYxDviXN>rd!q^GSK6eMDjj>n!=(j|A+yrO
zc00S1U)dmd4<rV?ZQ9P0U%Ez&0RR^wyPsbzowEQ5h|DtE|A-F}Q5pSxPky0;bZ(-f
z1=XPZavv8`J*1d9L<CV9q995kqDU!WvNkDbM7QvxZM>%*GT1Mz(HX7Pizw$25mfIR
z#x!x=hjW{S*6L+S`@XD&q!b$6o#B%gZ{KajSeY2v`S}AxmVO>hY_k?Jnv|S7y|Q&<
z<0_?dh-kik-z8sPrzz88koTTvZ$ACSlfqFnOKj1{x_~G{Ob|lE+5w0<f`o{3u^uv>
z+HmqjgM;x5YmXpB5z=rp5#!3^ScI6EmcBl*0Jk>t2a~CtkCOnuNbwY+%|c++!J&Kp
q^26Y9Eo5=C%I_KtK%Bq-v3>*IPSNnOV2rK+0000<MNUMnLSTYzbMT!2

diff --git a/refactoring.java/src/org/netbeans/modules/refactoring/java/spi/JavaWhereUsedFilters.java b/refactoring.java/src/org/netbeans/modules/refactoring/java/spi/JavaWhereUsedFilters.java
--- a/refactoring.java/src/org/netbeans/modules/refactoring/java/spi/JavaWhereUsedFilters.java
+++ b/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) {