1.1 --- a/cmdline/compiler/test/unit/src/org/netbeans/modules/jackpot30/compiler/IndexingAnnotationProcessorTest.java Wed Nov 21 17:08:33 2012 +0100
1.2 +++ b/cmdline/compiler/test/unit/src/org/netbeans/modules/jackpot30/compiler/IndexingAnnotationProcessorTest.java Wed Nov 21 18:42:06 2012 +0100
1.3 @@ -42,6 +42,7 @@
1.4 import java.util.Arrays;
1.5 import java.util.HashSet;
1.6 import java.util.Set;
1.7 +import java.util.concurrent.atomic.AtomicBoolean;
1.8 import org.netbeans.api.java.source.ClasspathInfo;
1.9 import org.netbeans.api.java.source.CompilationController;
1.10 import org.netbeans.api.java.source.JavaSource;
1.11 @@ -110,7 +111,7 @@
1.12
1.13 JavaSource.create(cpInfo).runUserActionTask(new Task<CompilationController>() {
1.14 public void run(CompilationController parameter) throws Exception {
1.15 - real.addAll(IndexQuery.open(src.toURI().toURL()).findCandidates(BulkSearch.getDefault().create(parameter, patterns)));
1.16 + real.addAll(IndexQuery.open(src.toURI().toURL()).findCandidates(BulkSearch.getDefault().create(parameter, new AtomicBoolean(), patterns)));
1.17 }
1.18 }, true);
1.19
2.1 --- a/language/ide/indexing/src/org/netbeans/modules/jackpot30/indexing/index/IndexQuery.java Wed Nov 21 17:08:33 2012 +0100
2.2 +++ b/language/ide/indexing/src/org/netbeans/modules/jackpot30/indexing/index/IndexQuery.java Wed Nov 21 18:42:06 2012 +0100
2.3 @@ -51,6 +51,7 @@
2.4 import java.util.HashMap;
2.5 import java.util.List;
2.6 import java.util.Map;
2.7 +import java.util.concurrent.atomic.AtomicBoolean;
2.8 import java.util.zip.DataFormatException;
2.9 import org.apache.lucene.analysis.KeywordAnalyzer;
2.10 import org.apache.lucene.document.CompressionTools;
2.11 @@ -101,11 +102,11 @@
2.12 boolean matches;
2.13
2.14 if (withFrequencies) {
2.15 - freqs = BulkSearch.getDefault().matchesWithFrequencies(in, pattern);
2.16 + freqs = BulkSearch.getDefault().matchesWithFrequencies(in, pattern, new AtomicBoolean());
2.17 matches = !freqs.isEmpty();
2.18 } else {
2.19 freqs = null;
2.20 - matches = BulkSearch.getDefault().matches(in, pattern);
2.21 + matches = BulkSearch.getDefault().matches(in, new AtomicBoolean(), pattern);
2.22 }
2.23
2.24 if (matches) {
3.1 --- a/language/ide/indexing/src/org/netbeans/modules/jackpot30/indexing/index/Indexer.java Wed Nov 21 17:08:33 2012 +0100
3.2 +++ b/language/ide/indexing/src/org/netbeans/modules/jackpot30/indexing/index/Indexer.java Wed Nov 21 18:42:06 2012 +0100
3.3 @@ -52,6 +52,7 @@
3.4 import java.util.HashSet;
3.5 import java.util.Iterator;
3.6 import java.util.Set;
3.7 +import java.util.concurrent.atomic.AtomicBoolean;
3.8 import java.util.logging.Level;
3.9 import java.util.logging.Logger;
3.10 import javax.lang.model.type.ArrayType;
3.11 @@ -108,7 +109,7 @@
3.12
3.13 ec = new EncodingContext(out, false);
3.14
3.15 - BulkSearch.getDefault().encode(toProcess, ec);
3.16 + BulkSearch.getDefault().encode(toProcess, ec, new AtomicBoolean());
3.17
3.18 luceneWriter.deleteDocuments(new Term("languagePath", relative));
3.19
4.1 --- a/language/ide/indexing/test/unit/src/org/netbeans/modules/jackpot30/indexing/index/IndexerTest.java Wed Nov 21 17:08:33 2012 +0100
4.2 +++ b/language/ide/indexing/test/unit/src/org/netbeans/modules/jackpot30/indexing/index/IndexerTest.java Wed Nov 21 18:42:06 2012 +0100
4.3 @@ -46,6 +46,7 @@
4.4 import java.util.HashSet;
4.5 import java.util.Map;
4.6 import java.util.Set;
4.7 +import java.util.concurrent.atomic.AtomicBoolean;
4.8 import org.netbeans.api.editor.mimelookup.MimePath;
4.9 import org.netbeans.api.java.classpath.ClassPath;
4.10 import org.netbeans.api.java.source.ClasspathInfo;
4.11 @@ -217,7 +218,7 @@
4.12
4.13 JavaSource.create(cpInfo).runUserActionTask(new Task<CompilationController>() {
4.14 public void run(CompilationController parameter) throws Exception {
4.15 - real.addAll(IndexQuery.open(src.toURL()).findCandidates(BulkSearch.getDefault().create(parameter, patterns)));
4.16 + real.addAll(IndexQuery.open(src.toURL()).findCandidates(BulkSearch.getDefault().create(parameter, new AtomicBoolean(), patterns)));
4.17 }
4.18 }, true);
4.19
4.20 @@ -238,7 +239,8 @@
4.21 public void run(CompilationController parameter) throws Exception {
4.22 BulkPattern bulkPattern = BulkSearch.getDefault().create(Collections.singletonList(pattern),
4.23 Collections.singletonList(Utilities.parseAndAttribute(parameter, pattern, null)),
4.24 - Collections.singletonList(additionalConstraints));
4.25 + Collections.singletonList(additionalConstraints),
4.26 + new AtomicBoolean());
4.27
4.28 real.addAll(IndexQuery.open(src.toURL()).findCandidates(bulkPattern));
4.29 }
4.30 @@ -259,7 +261,7 @@
4.31
4.32 JavaSource.create(cpInfo).runUserActionTask(new Task<CompilationController>() {
4.33 public void run(CompilationController parameter) throws Exception {
4.34 - real.putAll(IndexQuery.open(src.toURL()).findCandidatesWithFrequencies(BulkSearch.getDefault().create(parameter, patterns)));
4.35 + real.putAll(IndexQuery.open(src.toURL()).findCandidatesWithFrequencies(BulkSearch.getDefault().create(parameter, new AtomicBoolean(), patterns)));
4.36 }
4.37 }, true);
4.38
4.39 @@ -276,7 +278,7 @@
4.40
4.41 JavaSource.create(cpInfo).runUserActionTask(new Task<CompilationController>() {
4.42 public void run(CompilationController parameter) throws Exception {
4.43 - real.addAll(IndexQuery.open(src.toURL()).findCandidates(BulkSearch.getDefault().create(parameter, pattern)));
4.44 + real.addAll(IndexQuery.open(src.toURL()).findCandidates(BulkSearch.getDefault().create(parameter, new AtomicBoolean(), pattern)));
4.45 }
4.46 }, true);
4.47
5.1 --- a/language/server/web/language.web.api/src/org/netbeans/modules/jackpot30/backend/language/api/API.java Wed Nov 21 17:08:33 2012 +0100
5.2 +++ b/language/server/web/language.web.api/src/org/netbeans/modules/jackpot30/backend/language/api/API.java Wed Nov 21 18:42:06 2012 +0100
5.3 @@ -50,6 +50,7 @@
5.4 import java.util.Collection;
5.5 import java.util.Collections;
5.6 import java.util.LinkedList;
5.7 +import java.util.concurrent.atomic.AtomicBoolean;
5.8 import javax.tools.Diagnostic;
5.9 import javax.tools.JavaCompiler;
5.10 import javax.tools.JavaFileObject;
5.11 @@ -108,7 +109,7 @@
5.12 CompilationUnitTree cut = jti.parse(new JFOImpl(source)).iterator().next();
5.13 Collection<TreePath> paths = new LinkedList<TreePath>();
5.14
5.15 - for (Collection<TreePath> c : BulkSearch.getDefault().match(null, new TreePath(cut), bulkPattern).values()) {
5.16 + for (Collection<TreePath> c : BulkSearch.getDefault().match(null, new AtomicBoolean(), new TreePath(cut), bulkPattern).values()) {
5.17 paths.addAll(c);
5.18 }
5.19
5.20 @@ -164,7 +165,7 @@
5.21 additionalConstraints.add(pattern.getAdditionalConstraints());
5.22 }
5.23
5.24 - return BulkSearch.getDefault().create(code, trees, additionalConstraints);
5.25 + return BulkSearch.getDefault().create(code, trees, additionalConstraints, new AtomicBoolean());
5.26 }
5.27
5.28 private static JavacTaskImpl prepareJavacTaskImpl() {