1.1 --- a/language/ide/indexing/src/org/netbeans/modules/jackpot30/indexing/batch/EnhancedScopes.java	Sat Apr 20 11:49:56 2013 +0200
     1.2 +++ b/language/ide/indexing/src/org/netbeans/modules/jackpot30/indexing/batch/EnhancedScopes.java	Sat Apr 27 09:44:00 2013 +0200
     1.3 @@ -90,6 +90,7 @@
     1.4  import org.netbeans.modules.java.hints.spiimpl.batch.BatchSearch.VerifiedSpansCallBack;
     1.5  import org.netbeans.modules.java.hints.spiimpl.batch.ProgressHandleWrapper;
     1.6  import org.netbeans.modules.java.hints.spiimpl.batch.Scopes;
     1.7 +import org.netbeans.modules.java.hints.spiimpl.options.HintsSettings;
     1.8  import org.netbeans.modules.java.hints.spiimpl.pm.BulkSearch.BulkPattern;
     1.9  import org.netbeans.modules.java.preprocessorbridge.spi.JavaIndexerPlugin;
    1.10  import org.netbeans.modules.parsing.impl.indexing.FileObjectIndexable;
    1.11 @@ -325,6 +326,8 @@
    1.12      }
    1.13  
    1.14      private static IndexEnquirer enquirerForRemoteIndex(FileObject src, RemoteIndex remoteIndex, Iterable<? extends HintDescription> hints) {
    1.15 +        if (hints == null) return null;
    1.16 +        
    1.17          boolean fullySupported = isAttributedIndexWithSpans(remoteIndex);
    1.18          StringBuilder textualRepresentation = new StringBuilder();
    1.19  
    1.20 @@ -365,7 +368,7 @@
    1.21              super(src);
    1.22              this.idx = idx;
    1.23          }
    1.24 -        public Collection<? extends Resource> findResources(final Iterable<? extends HintDescription> hints, ProgressHandleWrapper progress, final Callable<BulkPattern> bulkPattern, final Collection<? super MessageImpl> problems) {
    1.25 +        public Collection<? extends Resource> findResources(final Iterable<? extends HintDescription> hints, ProgressHandleWrapper progress, final Callable<BulkPattern> bulkPattern, final Collection<? super MessageImpl> problems, HintsSettings settingsProvider) {
    1.26              final Collection<Resource> result = new ArrayList<Resource>();
    1.27  
    1.28              progress.startNextPart(1);
    1.29 @@ -374,7 +377,7 @@
    1.30                  BulkPattern bp = bulkPattern.call();
    1.31  
    1.32                  for (String candidate : idx.findCandidates(bp)) {
    1.33 -                    result.add(new Resource(this, candidate, hints, bp));
    1.34 +                    result.add(new Resource(this, candidate, hints, bp, settingsProvider));
    1.35                  }
    1.36              } catch (Exception ex) {
    1.37                  Exceptions.printStackTrace(ex);
    1.38 @@ -394,7 +397,7 @@
    1.39              this.remoteIndex = remoteIndex;
    1.40              this.textualHintRepresentation = textualHintRepresentation;
    1.41          }
    1.42 -        public Collection<? extends Resource> findResources(final Iterable<? extends HintDescription> hints, ProgressHandleWrapper progress, final Callable<BulkPattern> bulkPattern, final Collection<? super MessageImpl> problems) {
    1.43 +        public Collection<? extends Resource> findResources(final Iterable<? extends HintDescription> hints, ProgressHandleWrapper progress, final Callable<BulkPattern> bulkPattern, final Collection<? super MessageImpl> problems, HintsSettings settingsProvider) {
    1.44              final Collection<Resource> result = new ArrayList<Resource>();
    1.45  
    1.46              progress.startNextPart(1);
    1.47 @@ -405,7 +408,7 @@
    1.48                  for (String occurrence : new ArrayList<String>(WebUtilities.requestStringArrayResponse(u))) {
    1.49                      try {
    1.50                          BulkPattern bp = bulkPattern.call();
    1.51 -                        result.add(new Resource(this, occurrence, hints, bp));
    1.52 +                        result.add(new Resource(this, occurrence, hints, bp, settingsProvider));
    1.53                      } catch (Exception ex) {
    1.54                          //from bulkPattern.call()? should not happen.
    1.55                          Exceptions.printStackTrace(ex);