# This patch file was generated by NetBeans IDE
# Following Index: paths are relative to: E:\NB_HG\main
# This patch can be applied using context Tools: Patch action on respective folder.
# It uses platform neutral UTF-8 encoding and \n newlines.
# Above lines and this line are ignored by the patching process.
Index: o.openidex.util/manifest.mf
--- o.openidex.util/manifest.mf Base (BASE)
+++ o.openidex.util/manifest.mf Locally Modified (Based On LOCAL)
@@ -1,5 +1,5 @@
 Manifest-Version: 1.0
 OpenIDE-Module: org.openidex.util/3
 OpenIDE-Module-Localizing-Bundle: org/openidex/resources/Bundle.properties
-OpenIDE-Module-Specification-Version: 3.16
+OpenIDE-Module-Specification-Version: 3.20
 AutoUpdate-Essential-Module: true
Index: o.openidex.util/src/org/openidex/search/CompoundSearchInfo.java
--- o.openidex.util/src/org/openidex/search/CompoundSearchInfo.java Base (BASE)
+++ o.openidex.util/src/org/openidex/search/CompoundSearchInfo.java Locally Modified (Based On LOCAL)
@@ -45,13 +45,14 @@
 import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
+import org.openide.filesystems.FileObject;
 import org.openide.loaders.DataObject;
 
 /**
  *
  * @author  Marian Petras
  */
-class CompoundSearchInfo implements SearchInfo {
+class CompoundSearchInfo implements SearchInfo.Files {
 
     /** */
     private final SearchInfo[] elements;
@@ -88,8 +89,14 @@
     /**
      */
     public Iterator<DataObject> objectsToSearch() {
+        return Utils.toDataObjectIterator(filesToSearch());
+    }
+
+    /**
+     */
+    public Iterator<FileObject> filesToSearch() {
         if (elements == null) {
-            return Collections.<DataObject>emptyList().iterator();
+            return Collections.<FileObject>emptyList().iterator();
         }
         
         List<SearchInfo> searchableElements = new ArrayList<SearchInfo>(elements.length);
Index: o.openidex.util/src/org/openidex/search/CompoundSearchIterator.java
--- o.openidex.util/src/org/openidex/search/CompoundSearchIterator.java Base (BASE)
+++ o.openidex.util/src/org/openidex/search/CompoundSearchIterator.java Locally Modified (Based On LOCAL)
@@ -43,22 +43,22 @@
 
 import java.util.Iterator;
 import java.util.NoSuchElementException;
-import org.openide.loaders.DataObject;
+import org.openide.filesystems.FileObject;
 
 /**
  *
  * @author  Marian Petras
  */
-class CompoundSearchIterator implements Iterator<DataObject> {
+class CompoundSearchIterator implements Iterator<FileObject> {
 
     /** */
     private final SearchInfo[] elements;
     /** */
     private int elementIndex;
     /** */
-    private Iterator<DataObject> elementIterator;
+    private Iterator<FileObject> elementIterator;
     /** */
-    private DataObject nextObject;
+    private FileObject nextObject;
     /** */
     private boolean upToDate;
 
@@ -80,7 +80,7 @@
             upToDate = true;                //hasNext() returns always false
         } else {
             this.elements = elements;
-            elementIterator = elements[elementIndex = 0].objectsToSearch();
+            elementIterator = Utils.getFileObjectsIterator(elements[elementIndex = 0]);
             upToDate = false;
         }
     }
@@ -96,7 +96,7 @@
 
     /**
      */
-    public DataObject next() {
+    public FileObject next() {
         if (!hasNext()) {
             throw new NoSuchElementException();
         }
@@ -117,7 +117,7 @@
                 break;
             }
             
-            elementIterator = elements[elementIndex].objectsToSearch();
+            elementIterator = Utils.getFileObjectsIterator(elements[elementIndex]);
         }
         
         if (elementIndex < elements.length) {
Index: o.openidex.util/src/org/openidex/search/SearchInfo.java
--- o.openidex.util/src/org/openidex/search/SearchInfo.java Base (BASE)
+++ o.openidex.util/src/org/openidex/search/SearchInfo.java Locally Modified (Based On LOCAL)
@@ -42,6 +42,7 @@
 package org.openidex.search;
 
 import java.util.Iterator;
+import org.openide.filesystems.FileObject;
 import org.openide.loaders.DataObject;
 
 /**
@@ -98,4 +99,17 @@
      */
     public Iterator<DataObject> objectsToSearch();
     
+    public interface Files extends SearchInfo{
+        /**
+         * Specifies which <code>FileObject</code>s should be searched.
+         * The returned <code>Iterator</code> needn't implement method
+         * {@link java.util.Iterator#remove remove()} (i.e. it may throw
+         * <code>UnsupportedOperationException</code> instead of actual
+         * implementation).
+         *
+         * @return  iterator which iterates over <code>FileObject</code>s
+         *          to be searched
+         */
+        public Iterator<FileObject> filesToSearch();
 }
+}
Index: o.openidex.util/src/org/openidex/search/SimpleSearchInfo.java
--- o.openidex.util/src/org/openidex/search/SimpleSearchInfo.java Base (BASE)
+++ o.openidex.util/src/org/openidex/search/SimpleSearchInfo.java Locally Modified (Based On LOCAL)
@@ -52,7 +52,7 @@
  *
  * @author  Marian Petras
  */
-class SimpleSearchInfo implements SearchInfo {
+class SimpleSearchInfo implements SearchInfo.Files {
 
     /**
      * Empty search info object.
@@ -61,14 +61,18 @@
      * (returned by method
      * {@link SearchInfo#objectsToSearch objectsToSearch()}) has no elements.
      */
-    static final SearchInfo EMPTY_SEARCH_INFO
-        = new SearchInfo() {
+    static final SearchInfo.Files EMPTY_SEARCH_INFO
+        = new SearchInfo.Files() {
             public boolean canSearch() {
                 return true;
             }
             public Iterator<DataObject> objectsToSearch() {
                 return Collections.<DataObject>emptyList().iterator();
             }
+
+            public Iterator<FileObject> filesToSearch() {
+                return Collections.<FileObject>emptyList().iterator();
+            }
         };
         
     /** */
@@ -112,6 +116,12 @@
     /**
      */
     public Iterator<DataObject> objectsToSearch() {
+        return Utils.toDataObjectIterator(filesToSearch());
+    }
+
+    /**
+     */
+    public Iterator<FileObject> filesToSearch() {
         return new SimpleSearchIterator(rootFolder,
                                         recursive,
                                         filters != null ? Arrays.asList(filters)
Index: o.openidex.util/src/org/openidex/search/SimpleSearchIterator.java
--- o.openidex.util/src/org/openidex/search/SimpleSearchIterator.java Base (BASE)
+++ o.openidex.util/src/org/openidex/search/SimpleSearchIterator.java Locally Modified (Based On LOCAL)
@@ -48,16 +48,15 @@
 import java.util.NoSuchElementException;
 import org.openide.filesystems.FileObject;
 import org.openide.loaders.DataFolder;
-import org.openide.loaders.DataObject;
 
 /**
  *
  * @author  Marian Petras
  */
-class SimpleSearchIterator implements Iterator<DataObject> {
+class SimpleSearchIterator implements Iterator<FileObject> {
 
     /** current enumeration of children */
-    private Enumeration<DataObject> childrenEnum;
+    private Enumeration<? extends FileObject> childrenEnum;
     /**
      * filters to be applied on the current enumeration of children
      * ({@link #childrenEnum})
@@ -70,8 +69,8 @@
     /** */
     private final boolean recursive;
     /** stack of the ancestor folders' children enumerations */
-    private final List<Enumeration<DataObject>> enums
-            = new ArrayList<Enumeration<DataObject>>();            //unsynced stack
+    private final List<Enumeration<? extends FileObject>> enums
+            = new ArrayList<Enumeration<? extends FileObject>>();            //unsynced stack
     /**
      * stack of filter lists to be applied on children of the ancestor folders
      * ({@link #enums})
@@ -84,14 +83,14 @@
      * <code>DataObject</code> to be returned the next time method
      * {@link #next()} is called
      */
-    private DataObject nextObject;
+    private FileObject nextObject;
 
     /**
      */
     SimpleSearchIterator(DataFolder folder,
                          boolean recursive,
                          List<FileObjectFilter> filters) {
-        this.childrenEnum = folder.children(false);
+        this.childrenEnum = folder.getPrimaryFile().getChildren(false);
         this.recursive = recursive;
         this.filters = (filters != null) ? new ArrayList<FileObjectFilter>(filters)
                                          : null;
@@ -108,7 +107,7 @@
 
     /** 
      */
-    public DataObject next() {
+    public FileObject next() {
         if (!hasNext()) {
             throw new NoSuchElementException();
         }
@@ -124,8 +123,7 @@
         assert childrenEnum != null;
         do {
             if (childrenEnum.hasMoreElements()) {
-                DataObject dataObject = childrenEnum.nextElement();
-                FileObject file = dataObject.getPrimaryFile();
+                FileObject file = childrenEnum.nextElement();
                 if (file.isFolder()) {
                     if (!recursive) {
                         continue;
@@ -147,13 +145,13 @@
                         filterLists.add(null);
                     }
                     enums.add(childrenEnum);
-                    childrenEnum = ((DataFolder) dataObject).children(false);
+                    childrenEnum = file.getChildren(false);
                 } else {
                     if ((filters != null) && !checkFileFilters(file)) {
                         continue;
                     }
                     
-                    nextObject = dataObject;
+                    nextObject = file;
                     break;
                 }
             } else {
Index: o.openidex.util/src/org/openidex/search/SubnodesSearchInfo.java
--- o.openidex.util/src/org/openidex/search/SubnodesSearchInfo.java Base (BASE)
+++ o.openidex.util/src/org/openidex/search/SubnodesSearchInfo.java Locally Modified (Based On LOCAL)
@@ -45,6 +45,7 @@
 import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
+import org.openide.filesystems.FileObject;
 import org.openide.loaders.DataObject;
 import org.openide.nodes.Node;
 
@@ -52,7 +53,7 @@
  *
  * @author  Marian Petras
  */
-final class SubnodesSearchInfo implements SearchInfo {
+final class SubnodesSearchInfo implements SearchInfo.Files {
 
     /** */
     private final Node node;
@@ -80,28 +81,34 @@
     /**
      */
     public Iterator<DataObject> objectsToSearch() {
+        return Utils.toDataObjectIterator(filesToSearch());
+    }
+
+    /**
+     */
+    public Iterator<FileObject> filesToSearch() {
         final Node[] nodes = node.getChildren().getNodes(true);
         if (nodes.length == 0) {
-            return SimpleSearchInfo.EMPTY_SEARCH_INFO.objectsToSearch();
+            return Collections.<FileObject>emptyList().iterator();
         }
         
-        List<SearchInfo> searchInfoElements = new ArrayList<SearchInfo>(nodes.length);
+        List<SearchInfo.Files> searchInfoElements = new ArrayList<SearchInfo.Files>(nodes.length);
         for (int i = 0; i < nodes.length; i++) {
             SearchInfo subInfo = Utils.getSearchInfo(nodes[i]);
             if (subInfo != null && subInfo.canSearch()) {
-                searchInfoElements.add(subInfo);
+                searchInfoElements.add((SearchInfo.Files)subInfo);
             }
         }
         
         final int size = searchInfoElements.size();
         switch (size) {
             case 0:
-                return Collections.<DataObject>emptyList().iterator();
+                return Collections.<FileObject>emptyList().iterator();
             case 1:
-                return searchInfoElements.get(0).objectsToSearch();
+                return searchInfoElements.get(0).filesToSearch();
             default:
                 return new CompoundSearchIterator(
-                        searchInfoElements.toArray(new SearchInfo[size]));
+                        searchInfoElements.toArray(new SearchInfo.Files[size]));
         }
     }
 
Index: o.openidex.util/src/org/openidex/search/Utils.java
--- o.openidex.util/src/org/openidex/search/Utils.java Base (BASE)
+++ o.openidex.util/src/org/openidex/search/Utils.java Locally Modified (Based On LOCAL)
@@ -41,14 +41,22 @@
 
 package org.openidex.search;
 
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Set;
+import org.openide.filesystems.FileObject;
 import org.openide.loaders.DataFolder;
+import org.openide.loaders.DataObject;
+import org.openide.loaders.DataObjectNotFoundException;
 import org.openide.nodes.Node;
+import org.openide.util.Exceptions;
 
 /**
  *
  * @author  Marian Petras
+ * @author  kaktus
  */
-final class Utils {
+public final class Utils {
 
     /**
      */
@@ -72,4 +80,26 @@
         }
     }
     
+    public static Iterator<FileObject> getFileObjectsIterator(SearchInfo si){
+        if (si instanceof SearchInfo.Files){
+            return ((SearchInfo.Files)si).filesToSearch();
+        }else{
+            Set<FileObject> set = new HashSet<FileObject>();
+            for(Iterator<DataObject> iter = si.objectsToSearch(); iter.hasNext();){
+                set.add(iter.next().getPrimaryFile());
 }
+            return set.iterator();
+        }
+    }
+
+    static Iterator<DataObject> toDataObjectIterator(Iterator<FileObject> itFO){
+        Set<DataObject> set = new HashSet<DataObject>();
+        while(itFO.hasNext()){
+            try {
+                set.add(DataObject.find(itFO.next()));
+            } catch (DataObjectNotFoundException ex){}
+        }
+        return set.iterator();
+    }
+
+}
Index: utilities/nbproject/project.xml
--- utilities/nbproject/project.xml Base (BASE)
+++ utilities/nbproject/project.xml Locally Modified (Based On LOCAL)
@@ -183,7 +183,7 @@
                     <compile-dependency/>
                     <run-dependency>
                         <release-version>3</release-version>
-                        <specification-version>3.3</specification-version>
+                        <specification-version>3.20</specification-version>
                     </run-dependency>
                 </dependency>
             </module-dependencies>
Index: utilities/src/org/netbeans/modules/search/BasicSearchCriteria.java
--- utilities/src/org/netbeans/modules/search/BasicSearchCriteria.java Base (BASE)
+++ utilities/src/org/netbeans/modules/search/BasicSearchCriteria.java Locally Modified (Based On LOCAL)
@@ -561,13 +561,16 @@
      *          criteria, {@code false} otherwise
      */
     boolean matches(DataObject dataObj) {
+        return matches(dataObj.getPrimaryFile());
+    }
+
+    boolean matches(FileObject fileObj) {
         lastCharset = null;
 
-        if (!dataObj.isValid()) {
+        if (!fileObj.isValid()) {
             return false;
         }
         
-        FileObject fileObj = dataObj.getPrimaryFile();
         if (fileObj.isFolder() || !fileObj.isValid() || (isFullText() && !isTextFile(fileObj))) {
             return false;
         }
@@ -580,7 +583,7 @@
         
         /* Check the file's content: */
         if (textPatternValid
-                && !checkFileContent(fileObj, dataObj)) {
+                && !checkFileContent(fileObj)) {
             return false;
         }
         
@@ -639,10 +642,11 @@
      * @return  {@code true} if the file contains at least one substring
      *          matching the pattern, {@code false} otherwise
      */
-    private boolean checkFileContent(FileObject fileObj, DataObject dataObj) {
+    private boolean checkFileContent(FileObject fileObj) {
         boolean firstMatch = true;
         SearchPattern searchPattern = null;
         ArrayList<TextDetail> txtDetails = null;
+        DataObject dObj = null;
 
         LineNumberReader reader = null;
         try {
@@ -656,8 +660,9 @@
                         searchPattern = createSearchPattern();
                         txtDetails = new ArrayList<TextDetail>(5);
                         firstMatch = false;
+                        dObj = DataObject.find(fileObj);
                     }
-                    TextDetail det = new TextDetail(dataObj, searchPattern);
+                    TextDetail det = new TextDetail(dObj, searchPattern);
                     det.setLine(reader.getLineNumber());
                     det.setLineText(line);
                     int start = matcher.start();
@@ -669,7 +674,7 @@
             }
             if (txtDetails != null) {
                 txtDetails.trimToSize();
-                getDetailsMap().put(dataObj, txtDetails);
+                getDetailsMap().put(dObj, txtDetails);
                 return true;
             } else {
                 return false;
Index: utilities/src/org/netbeans/modules/search/SpecialSearchGroup.java
--- utilities/src/org/netbeans/modules/search/SpecialSearchGroup.java Base (BASE)
+++ utilities/src/org/netbeans/modules/search/SpecialSearchGroup.java Locally Modified (Based On LOCAL)
@@ -44,15 +44,20 @@
 import java.nio.charset.Charset;
 import java.util.Collection;
 import java.util.Iterator;
+import org.openide.filesystems.FileObject;
 import org.openide.loaders.DataObject;
-import org.openidex.search.DataObjectSearchGroup;
+import org.openide.loaders.DataObjectNotFoundException;
+import org.openide.util.Exceptions;
+import org.openidex.search.FileObjectSearchGroup;
+import org.openidex.search.SearchInfo;
 import org.openidex.search.SearchType;
 
 /**
  *
  * @author  Marian Petras
+ * @author  kaktus
  */
-final class SpecialSearchGroup extends DataObjectSearchGroup {
+final class SpecialSearchGroup extends FileObjectSearchGroup {
 
     final BasicSearchCriteria basicCriteria;
     final boolean hasExtraSearchTypes;
@@ -81,13 +86,23 @@
     
     @Override
     public void doSearch() {
-        for (Iterator j = searchScope.getSearchInfo().objectsToSearch(); j.hasNext(); ) {
+        SearchInfo sInfo = searchScope.getSearchInfo();
+        if (sInfo instanceof SearchInfo.Files){
+            for (Iterator j = ((SearchInfo.Files)sInfo).filesToSearch(); j.hasNext(); ) {
             if (stopped) {
                 return;
             }
+                processSearchObject(/*FileObject*/ j.next());
+            }
+        }else{
+            for (Iterator j = sInfo.objectsToSearch(); j.hasNext(); ) {
+                if (stopped) {
+                    return;
+                }
             processSearchObject(/*DataObject*/ j.next());
         }
     }
+    }
 
     /**
      * Provides search on one search object instance. The object is added to
@@ -104,10 +119,21 @@
     protected void processSearchObject(Object searchObject) {
         if (!hasExtraSearchTypes) {
             assert basicCriteria != null;
+            if (searchObject instanceof DataObject){
             DataObject dataObj = (DataObject) searchObject;
             if (basicCriteria.matches(dataObj)) {
                 notifyMatchingObjectFound(dataObj);
             }
+            } else if (searchObject instanceof FileObject){
+                FileObject fileObj = (FileObject) searchObject;
+                if (basicCriteria.matches(fileObj)) {
+                    try {
+                        notifyMatchingObjectFound(DataObject.find(fileObj));
+                    } catch (DataObjectNotFoundException ex) {
+                        Exceptions.printStackTrace(ex);
+                    }
+                }
+            }
             return;
         }