1.1 --- a/cmdline/compiler/nbproject/genfiles.properties Sat Mar 10 20:57:35 2012 +0100
1.2 +++ b/cmdline/compiler/nbproject/genfiles.properties Sat Mar 10 21:14:34 2012 +0100
1.3 @@ -3,6 +3,6 @@
1.4 build.xml.stylesheet.CRC32=79c3b980@1.33
1.5 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
1.6 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
1.7 -nbproject/build-impl.xml.data.CRC32=87d969e3
1.8 +nbproject/build-impl.xml.data.CRC32=2ffedfaa
1.9 nbproject/build-impl.xml.script.CRC32=64f6fe95
1.10 nbproject/build-impl.xml.stylesheet.CRC32=238281d1@2.49
2.1 --- a/cmdline/compiler/nbproject/project.xml Sat Mar 10 20:57:35 2012 +0100
2.2 +++ b/cmdline/compiler/nbproject/project.xml Sat Mar 10 21:14:34 2012 +0100
2.3 @@ -154,6 +154,14 @@
2.4 </run-dependency>
2.5 </dependency>
2.6 <dependency>
2.7 + <code-name-base>org.netbeans.spi.java.hints</code-name-base>
2.8 + <build-prerequisite/>
2.9 + <compile-dependency/>
2.10 + <run-dependency>
2.11 + <specification-version>1.0.1.18.9.20.6</specification-version>
2.12 + </run-dependency>
2.13 + </dependency>
2.14 + <dependency>
2.15 <code-name-base>org.openide.filesystems</code-name-base>
2.16 <build-prerequisite/>
2.17 <compile-dependency/>
3.1 --- a/cmdline/compiler/src/org/netbeans/modules/jackpot30/compiler/HintsAnnotationProcessing.java Sat Mar 10 20:57:35 2012 +0100
3.2 +++ b/cmdline/compiler/src/org/netbeans/modules/jackpot30/compiler/HintsAnnotationProcessing.java Sat Mar 10 21:14:34 2012 +0100
3.3 @@ -66,18 +66,20 @@
3.4 import org.netbeans.api.java.source.ModificationResult;
3.5 import org.netbeans.modules.jackpot30.indexing.batch.BatchUtilities;
3.6 import org.netbeans.modules.java.hints.declarative.DeclarativeHintRegistry;
3.7 -import org.netbeans.modules.java.hints.jackpot.impl.JavaFixImpl;
3.8 -import org.netbeans.modules.java.hints.jackpot.impl.RulesManager;
3.9 -import org.netbeans.modules.java.hints.jackpot.impl.Utilities;
3.10 -import org.netbeans.modules.java.hints.jackpot.spi.HintDescription;
3.11 -import org.netbeans.modules.java.hints.jackpot.spi.HintMetadata;
3.12 import org.netbeans.modules.java.hints.jackpot.spi.HintsRunner;
3.13 -import org.netbeans.modules.java.hints.options.HintsSettings;
3.14 -import org.netbeans.modules.java.hints.spi.AbstractHint.HintSeverity;
3.15 +import org.netbeans.modules.java.hints.providers.spi.HintDescription;
3.16 +import org.netbeans.modules.java.hints.providers.spi.HintMetadata;
3.17 +import org.netbeans.modules.java.hints.spiimpl.JavaFixImpl;
3.18 +import org.netbeans.modules.java.hints.spiimpl.RulesManager;
3.19 +import org.netbeans.modules.java.hints.spiimpl.Utilities;
3.20 +import org.netbeans.modules.java.hints.spiimpl.options.HintsSettings;
3.21 import org.netbeans.modules.parsing.impl.indexing.CacheFolder;
3.22 import org.netbeans.modules.refactoring.spi.RefactoringElementImplementation;
3.23 import org.netbeans.spi.editor.hints.ErrorDescription;
3.24 import org.netbeans.spi.editor.hints.Fix;
3.25 +import org.netbeans.spi.editor.hints.Severity;
3.26 +import org.netbeans.spi.java.hints.Hint;
3.27 +import org.netbeans.spi.java.hints.HintSeverity;
3.28 import org.openide.filesystems.FileUtil;
3.29 import org.openide.util.Exceptions;
3.30 import org.openide.util.lookup.ServiceProvider;
3.31 @@ -134,7 +136,7 @@
3.32 protected void doProcess(CompilationInfoHack info, ProcessingEnvironment processingEnv, Reporter reporter) {
3.33 Set<HintDescription> hardCodedHints = new LinkedHashSet<HintDescription>();
3.34
3.35 - for (Collection<? extends HintDescription> v : RulesManager.getInstance().allHints.values()) {
3.36 + for (Collection<? extends HintDescription> v : RulesManager.getInstance().readHints(null, null, null).values()) {
3.37 hardCodedHints.addAll(v);
3.38 }
3.39
3.40 @@ -143,7 +145,7 @@
3.41 for (Iterator<HintDescription> it = hardCodedHints.iterator(); it.hasNext(); ) {
3.42 HintMetadata current = it.next().getMetadata();
3.43
3.44 - if ( (current.kind == HintMetadata.Kind.HINT)
3.45 + if ( (current.kind == Hint.Kind.INSPECTION)
3.46 && enabledHints.contains(current.id)) {
3.47 continue;
3.48 }
3.49 @@ -188,7 +190,7 @@
3.50 JavaFixImpl jfi = (JavaFixImpl) f;
3.51
3.52 try {
3.53 - JavaFixImpl.Accessor.INSTANCE.process(jfi.jf, info, false, new ArrayList<RefactoringElementImplementation>());
3.54 + JavaFixImpl.Accessor.INSTANCE.process(jfi.jf, info, false, null, new ArrayList<RefactoringElementImplementation>());
3.55 } catch (Exception ex) {
3.56 Exceptions.printStackTrace(ex);
3.57 }
3.58 @@ -302,9 +304,9 @@
3.59 private static final class SettingsBasedChecker implements ContainsChecker<String> {
3.60 private static final Set<String> enabled = new HashSet<String>();
3.61 public SettingsBasedChecker() {
3.62 - for (HintMetadata hm : RulesManager.getInstance().allHints.keySet()) {
3.63 + for (HintMetadata hm : RulesManager.getInstance().readHints(null, null, null).keySet()) {
3.64 if ( HintsSettings.isEnabled(hm)
3.65 - && HintsSettings.getSeverity(hm, RulesManager.getPreferences(hm.id, HintsSettings.getCurrentProfileId())) != HintSeverity.CURRENT_LINE_WARNING) {
3.66 + && HintsSettings.getSeverity(hm, HintsSettings.getPreferences(hm.id, HintsSettings.getCurrentProfileId())) != Severity.HINT) {
3.67 enabled.add(hm.id);
3.68 }
3.69 }
4.1 --- a/cmdline/compiler/test/unit/src/org/netbeans/modules/jackpot30/compiler/CreateStandaloneCompilerJar.java Sat Mar 10 20:57:35 2012 +0100
4.2 +++ b/cmdline/compiler/test/unit/src/org/netbeans/modules/jackpot30/compiler/CreateStandaloneCompilerJar.java Sat Mar 10 21:14:34 2012 +0100
4.3 @@ -41,7 +41,7 @@
4.4 import org.netbeans.modules.jackpot30.cmdline.lib.CreateStandaloneJar;
4.5 import javax.annotation.processing.Processor;
4.6 import org.netbeans.modules.jackpot30.cmdline.lib.StandaloneTools.UtilitiesSPIImpl;
4.7 -import org.netbeans.modules.java.hints.jackpot.impl.Utilities;
4.8 +import org.netbeans.modules.java.hints.spiimpl.Utilities;
4.9
4.10 /**
4.11 *
5.1 --- a/cmdline/compiler/test/unit/src/org/netbeans/modules/jackpot30/compiler/HintsAnnotationProcessingTest.java Sat Mar 10 20:57:35 2012 +0100
5.2 +++ b/cmdline/compiler/test/unit/src/org/netbeans/modules/jackpot30/compiler/HintsAnnotationProcessingTest.java Sat Mar 10 21:14:34 2012 +0100
5.3 @@ -41,13 +41,13 @@
5.4 import java.io.File;
5.5 import java.util.Collections;
5.6 import javax.lang.model.type.TypeMirror;
5.7 -import org.netbeans.modules.java.hints.jackpot.code.spi.Hint;
5.8 -import org.netbeans.modules.java.hints.jackpot.code.spi.TriggerCompileTime;
5.9 -import org.netbeans.modules.java.hints.jackpot.code.spi.TriggerPattern;
5.10 -import org.netbeans.modules.java.hints.jackpot.spi.HintContext;
5.11 -import org.netbeans.modules.java.hints.jackpot.spi.JavaFix;
5.12 -import org.netbeans.modules.java.hints.jackpot.spi.support.ErrorDescriptionFactory;
5.13 import org.netbeans.spi.editor.hints.ErrorDescription;
5.14 +import org.netbeans.spi.java.hints.ErrorDescriptionFactory;
5.15 +import org.netbeans.spi.java.hints.Hint;
5.16 +import org.netbeans.spi.java.hints.HintContext;
5.17 +import org.netbeans.spi.java.hints.JavaFix;
5.18 +import org.netbeans.spi.java.hints.JavaFixUtilities;
5.19 +import org.netbeans.spi.java.hints.TriggerPattern;
5.20
5.21 /**
5.22 *
5.23 @@ -247,11 +247,10 @@
5.24 assertEquals(goldenDiff, diffText);
5.25 }
5.26
5.27 - @Hint(category="general")
5.28 + @Hint(displayName="test", description="test", category="general")
5.29 @TriggerPattern("$1 == null && null == $1")
5.30 - @TriggerCompileTime //XXX: currently not really used
5.31 public static ErrorDescription codeHint(HintContext ctx) {
5.32 - return ErrorDescriptionFactory.forName(ctx, ctx.getPath(), "test", JavaFix.rewriteFix(ctx.getInfo(), "test", ctx.getPath(), "$1 == null", ctx.getVariables(), ctx.getMultiVariables(), ctx.getVariableNames(), Collections.<String, TypeMirror>emptyMap()));
5.33 + return ErrorDescriptionFactory.forName(ctx, ctx.getPath(), "test", JavaFixUtilities.rewriteFix(ctx, "test", ctx.getPath(), "$1 == null"));
5.34 }
5.35
5.36 }
6.1 --- a/cmdline/compiler/test/unit/src/org/netbeans/modules/jackpot30/compiler/IndexingAnnotationProcessorTest.java Sat Mar 10 20:57:35 2012 +0100
6.2 +++ b/cmdline/compiler/test/unit/src/org/netbeans/modules/jackpot30/compiler/IndexingAnnotationProcessorTest.java Sat Mar 10 21:14:34 2012 +0100
6.3 @@ -48,7 +48,7 @@
6.4 import org.netbeans.api.java.source.Task;
6.5 import org.netbeans.modules.jackpot30.indexing.index.IndexQuery;
6.6 import org.netbeans.modules.java.hints.declarative.Hacks;
6.7 -import org.netbeans.modules.java.hints.jackpot.impl.pm.BulkSearch;
6.8 +import org.netbeans.modules.java.hints.spiimpl.pm.BulkSearch;
6.9 import org.netbeans.modules.parsing.impl.indexing.CacheFolder;
6.10 import org.openide.filesystems.FileUtil;
6.11
7.1 --- a/cmdline/lib/nbproject/project.xml Sat Mar 10 20:57:35 2012 +0100
7.2 +++ b/cmdline/lib/nbproject/project.xml Sat Mar 10 21:14:34 2012 +0100
7.3 @@ -69,11 +69,9 @@
7.4 </dependency>
7.5 <dependency>
7.6 <code-name-base>org.netbeans.modules.java.hints</code-name-base>
7.7 - <build-prerequisite/>
7.8 - <compile-dependency/>
7.9 <run-dependency>
7.10 <release-version>1</release-version>
7.11 - <implementation-version/>
7.12 + <specification-version>1.64.0.13.9.1.20.6.1.1</specification-version>
7.13 </run-dependency>
7.14 </dependency>
7.15 <dependency>
7.16 @@ -121,6 +119,14 @@
7.17 </run-dependency>
7.18 </dependency>
7.19 <dependency>
7.20 + <code-name-base>org.netbeans.spi.java.hints</code-name-base>
7.21 + <build-prerequisite/>
7.22 + <compile-dependency/>
7.23 + <run-dependency>
7.24 + <implementation-version/>
7.25 + </run-dependency>
7.26 + </dependency>
7.27 + <dependency>
7.28 <code-name-base>org.openide.filesystems</code-name-base>
7.29 <build-prerequisite/>
7.30 <compile-dependency/>
8.1 --- a/cmdline/lib/src/org/netbeans/modules/jackpot30/cmdline/lib/DumpHints.java Sat Mar 10 20:57:35 2012 +0100
8.2 +++ b/cmdline/lib/src/org/netbeans/modules/jackpot30/cmdline/lib/DumpHints.java Sat Mar 10 21:14:34 2012 +0100
8.3 @@ -43,8 +43,8 @@
8.4 import java.util.List;
8.5 import java.util.Map;
8.6 import org.codeviation.pojson.Pojson;
8.7 -import org.netbeans.modules.java.hints.jackpot.impl.RulesManager;
8.8 -import org.netbeans.modules.java.hints.jackpot.spi.HintMetadata;
8.9 +import org.netbeans.modules.java.hints.providers.spi.HintMetadata;
8.10 +import org.netbeans.modules.java.hints.spiimpl.RulesManager;
8.11
8.12 /**
8.13 *
8.14 @@ -55,7 +55,7 @@
8.15 public static String dumpHints() {
8.16 List<Map<String, String>> data = new LinkedList<Map<String, String>>();
8.17
8.18 - for (HintMetadata hm : RulesManager.getInstance().allHints.keySet()) {
8.19 + for (HintMetadata hm : RulesManager.getInstance().readHints(null, null, null).keySet()) {
8.20 Map<String, String> hintData = new HashMap<String, String>();
8.21
8.22 hintData.put("id", hm.id);
9.1 --- a/cmdline/lib/src/org/netbeans/modules/jackpot30/cmdline/lib/NonNBComputer.java Sat Mar 10 20:57:35 2012 +0100
9.2 +++ b/cmdline/lib/src/org/netbeans/modules/jackpot30/cmdline/lib/NonNBComputer.java Sat Mar 10 21:14:34 2012 +0100
9.3 @@ -56,7 +56,7 @@
9.4 import org.netbeans.api.java.source.CompilationController;
9.5 import org.netbeans.api.java.source.JavaSource;
9.6 import org.netbeans.api.java.source.Task;
9.7 -import org.netbeans.modules.java.hints.jackpot.impl.hints.HintsInvoker;
9.8 +import org.netbeans.modules.java.hints.spiimpl.hints.HintsInvoker;
9.9 import org.netbeans.modules.parsing.impl.indexing.CacheFolder;
9.10 import org.netbeans.spi.editor.hints.ErrorDescription;
9.11 import org.netbeans.spi.java.classpath.support.ClassPathSupport;
10.1 --- a/cmdline/lib/src/org/netbeans/modules/jackpot30/cmdline/lib/StandaloneTools.java Sat Mar 10 20:57:35 2012 +0100
10.2 +++ b/cmdline/lib/src/org/netbeans/modules/jackpot30/cmdline/lib/StandaloneTools.java Sat Mar 10 21:14:34 2012 +0100
10.3 @@ -58,7 +58,7 @@
10.4 import org.netbeans.api.java.classpath.ClassPath;
10.5 import org.netbeans.api.java.queries.SourceForBinaryQuery;
10.6 import org.netbeans.api.java.source.ClasspathInfo;
10.7 -import org.netbeans.modules.java.hints.jackpot.impl.Utilities.SPI;
10.8 +import org.netbeans.modules.java.hints.spiimpl.Utilities.SPI;
10.9 import org.netbeans.modules.java.source.indexing.JavaCustomIndexer;
10.10 import org.netbeans.modules.java.source.parsing.JavacParser;
10.11 import org.netbeans.modules.java.source.parsing.JavacParserFactory;
11.1 --- a/cmdline/lib/test/unit/src/org/netbeans/modules/jackpot30/cmdline/lib/CreateStandaloneJar.java Sat Mar 10 20:57:35 2012 +0100
11.2 +++ b/cmdline/lib/test/unit/src/org/netbeans/modules/jackpot30/cmdline/lib/CreateStandaloneJar.java Sat Mar 10 21:14:34 2012 +0100
11.3 @@ -77,12 +77,12 @@
11.4 import org.netbeans.modules.jackpot30.cmdline.lib.StandaloneTools.RepositoryImpl;
11.5 import org.netbeans.modules.jackpot30.common.api.IndexAccess;
11.6 import org.netbeans.modules.java.hints.declarative.DeclarativeHintRegistry;
11.7 -import org.netbeans.modules.java.hints.jackpot.code.CodeHintProviderImpl;
11.8 -import org.netbeans.modules.java.hints.jackpot.code.FSWrapper;
11.9 -import org.netbeans.modules.java.hints.jackpot.impl.Utilities.SPI;
11.10 import org.netbeans.modules.java.hints.jackpot.refactoring.Hacks.HintPreferencesProvider;
11.11 -import org.netbeans.modules.java.hints.jackpot.spi.ClassPathBasedHintProvider;
11.12 -import org.netbeans.modules.java.hints.jackpot.spi.HintProvider;
11.13 +import org.netbeans.modules.java.hints.providers.code.CodeHintProviderImpl;
11.14 +import org.netbeans.modules.java.hints.providers.code.FSWrapper;
11.15 +import org.netbeans.modules.java.hints.providers.spi.ClassPathBasedHintProvider;
11.16 +import org.netbeans.modules.java.hints.providers.spi.HintProvider;
11.17 +import org.netbeans.modules.java.hints.spiimpl.Utilities.SPI;
11.18 import org.netbeans.spi.editor.mimelookup.MimeDataProvider;
11.19 import org.openide.util.NbPreferences.Provider;
11.20 import org.openide.xml.EntityCatalog;
12.1 --- a/cmdline/tool/nbproject/genfiles.properties Sat Mar 10 20:57:35 2012 +0100
12.2 +++ b/cmdline/tool/nbproject/genfiles.properties Sat Mar 10 21:14:34 2012 +0100
12.3 @@ -3,6 +3,6 @@
12.4 build.xml.stylesheet.CRC32=a56c6a5b@1.44
12.5 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
12.6 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
12.7 -nbproject/build-impl.xml.data.CRC32=063de067
12.8 +nbproject/build-impl.xml.data.CRC32=d1f6cef0
12.9 nbproject/build-impl.xml.script.CRC32=08f1fb11
12.10 nbproject/build-impl.xml.stylesheet.CRC32=238281d1@2.49
13.1 --- a/cmdline/tool/nbproject/project.xml Sat Mar 10 20:57:35 2012 +0100
13.2 +++ b/cmdline/tool/nbproject/project.xml Sat Mar 10 21:14:34 2012 +0100
13.3 @@ -70,11 +70,9 @@
13.4 </dependency>
13.5 <dependency>
13.6 <code-name-base>org.netbeans.modules.java.hints</code-name-base>
13.7 - <build-prerequisite/>
13.8 - <compile-dependency/>
13.9 <run-dependency>
13.10 <release-version>1</release-version>
13.11 - <implementation-version/>
13.12 + <specification-version>1.64.0.13.9.1.20.6.1.1</specification-version>
13.13 </run-dependency>
13.14 </dependency>
13.15 <dependency>
13.16 @@ -174,6 +172,14 @@
13.17 </run-dependency>
13.18 </dependency>
13.19 <dependency>
13.20 + <code-name-base>org.netbeans.spi.java.hints</code-name-base>
13.21 + <build-prerequisite/>
13.22 + <compile-dependency/>
13.23 + <run-dependency>
13.24 + <implementation-version/>
13.25 + </run-dependency>
13.26 + </dependency>
13.27 + <dependency>
13.28 <code-name-base>org.openide.filesystems</code-name-base>
13.29 <build-prerequisite/>
13.30 <compile-dependency/>
14.1 --- a/cmdline/tool/src/org/netbeans/modules/jackpot30/cmdline/Main.java Sat Mar 10 20:57:35 2012 +0100
14.2 +++ b/cmdline/tool/src/org/netbeans/modules/jackpot30/cmdline/Main.java Sat Mar 10 21:14:34 2012 +0100
14.3 @@ -48,8 +48,8 @@
14.4 import java.io.Writer;
14.5 import java.net.URL;
14.6 import java.util.ArrayList;
14.7 +import java.util.Arrays;
14.8 import java.util.Collection;
14.9 -import java.util.Collections;
14.10 import java.util.HashMap;
14.11 import java.util.Iterator;
14.12 import java.util.LinkedList;
14.13 @@ -72,28 +72,27 @@
14.14 import org.netbeans.api.java.source.CompilationController;
14.15 import org.netbeans.api.java.source.ModificationResult;
14.16 import org.netbeans.core.startup.MainLookup;
14.17 -import org.netbeans.modules.java.hints.jackpot.impl.MessageImpl;
14.18 -import org.netbeans.modules.java.hints.jackpot.impl.RulesManager;
14.19 -import org.netbeans.modules.java.hints.jackpot.impl.Utilities;
14.20 -import org.netbeans.modules.java.hints.jackpot.impl.batch.BatchSearch;
14.21 -import org.netbeans.modules.java.hints.jackpot.impl.batch.BatchSearch.BatchResult;
14.22 -import org.netbeans.modules.java.hints.jackpot.impl.batch.BatchSearch.Folder;
14.23 -import org.netbeans.modules.java.hints.jackpot.impl.batch.BatchSearch.Resource;
14.24 -import org.netbeans.modules.java.hints.jackpot.impl.batch.BatchSearch.VerifiedSpansCallBack;
14.25 -import org.netbeans.modules.java.hints.jackpot.impl.batch.BatchUtilities;
14.26 -import org.netbeans.modules.java.hints.jackpot.impl.batch.ProgressHandleWrapper;
14.27 -import org.netbeans.modules.java.hints.jackpot.impl.batch.ProgressHandleWrapper.ProgressHandleAbstraction;
14.28 -import org.netbeans.modules.java.hints.jackpot.impl.batch.Scopes;
14.29 -import org.netbeans.modules.java.hints.jackpot.spi.HintDescription;
14.30 -import org.netbeans.modules.java.hints.jackpot.spi.HintMetadata;
14.31 -import org.netbeans.modules.java.hints.jackpot.spi.HintMetadata.Kind;
14.32 -import org.netbeans.modules.java.hints.options.HintsSettings;
14.33 +import org.netbeans.modules.java.hints.providers.spi.HintDescription;
14.34 +import org.netbeans.modules.java.hints.providers.spi.HintMetadata;
14.35 +import org.netbeans.modules.java.hints.spiimpl.MessageImpl;
14.36 +import org.netbeans.modules.java.hints.spiimpl.RulesManager;
14.37 +import org.netbeans.modules.java.hints.spiimpl.batch.BatchSearch;
14.38 +import org.netbeans.modules.java.hints.spiimpl.batch.BatchSearch.BatchResult;
14.39 +import org.netbeans.modules.java.hints.spiimpl.batch.BatchSearch.Folder;
14.40 +import org.netbeans.modules.java.hints.spiimpl.batch.BatchSearch.Resource;
14.41 +import org.netbeans.modules.java.hints.spiimpl.batch.BatchSearch.VerifiedSpansCallBack;
14.42 +import org.netbeans.modules.java.hints.spiimpl.batch.BatchUtilities;
14.43 +import org.netbeans.modules.java.hints.spiimpl.batch.ProgressHandleWrapper;
14.44 +import org.netbeans.modules.java.hints.spiimpl.batch.ProgressHandleWrapper.ProgressHandleAbstraction;
14.45 +import org.netbeans.modules.java.hints.spiimpl.batch.Scopes;
14.46 +import org.netbeans.modules.java.hints.spiimpl.options.HintsSettings;
14.47 import org.netbeans.modules.java.source.parsing.JavaPathRecognizer;
14.48 import org.netbeans.modules.parsing.impl.indexing.CacheFolder;
14.49 import org.netbeans.modules.parsing.impl.indexing.RepositoryUpdater;
14.50 import org.netbeans.spi.editor.hints.ErrorDescription;
14.51 import org.netbeans.spi.java.classpath.ClassPathProvider;
14.52 import org.netbeans.spi.java.classpath.support.ClassPathSupport;
14.53 +import org.netbeans.spi.java.hints.Hint.Kind;
14.54 import org.netbeans.spi.java.queries.SourceLevelQueryImplementation2;
14.55 import org.openide.filesystems.FileObject;
14.56 import org.openide.filesystems.FileStateInvalidException;
14.57 @@ -242,7 +241,7 @@
14.58 return 1;
14.59 }
14.60
14.61 - Preferences prefs = RulesManager.getPreferences(hd.getMetadata().id, HintsSettings.getCurrentProfileId());
14.62 + Preferences prefs = HintsSettings.getPreferences(hd.getMetadata().id, HintsSettings.getCurrentProfileId());
14.63
14.64 if (prefs == null) {
14.65 System.err.println("hint '" + parsed.valueOf(hint) + "' cannot be configured");
14.66 @@ -300,11 +299,7 @@
14.67 private static Map<HintMetadata, Collection<? extends HintDescription>> listHints(ClassPath sourceFrom, ClassPath binaryFrom) {
14.68 Map<HintMetadata, Collection<? extends HintDescription>> result = new HashMap<HintMetadata, Collection<? extends HintDescription>>();
14.69
14.70 - for (Map.Entry<HintMetadata, Collection<? extends HintDescription>> entry: RulesManager.getInstance().allHints.entrySet()) {
14.71 - result.put(entry.getKey(), entry.getValue());
14.72 - }
14.73 -
14.74 - for (Map.Entry<? extends HintMetadata, ? extends Collection<? extends HintDescription>> entry: org.netbeans.modules.java.hints.jackpot.impl.refactoring.Utilities.sortByMetadata(Utilities.listClassPathHints(Collections.singleton(sourceFrom), Collections.singleton(binaryFrom))).entrySet()) {
14.75 + for (Entry<HintMetadata, ? extends Collection<? extends HintDescription>> entry: RulesManager.getInstance().readHints(null, Arrays.asList(sourceFrom, binaryFrom), null).entrySet()) {
14.76 result.put(entry.getKey(), entry.getValue());
14.77 }
14.78
14.79 @@ -327,7 +322,7 @@
14.80 List<HintDescription> descs = new LinkedList<HintDescription>();
14.81
14.82 for (Entry<HintMetadata, Collection<? extends HintDescription>> e : listHints(sourceFrom, binaryFrom).entrySet()) {
14.83 - if (e.getKey().kind != Kind.HINT) continue;
14.84 + if (e.getKey().kind != Kind.INSPECTION) continue;
14.85 if (!e.getKey().enabled) continue;
14.86 descs.addAll(e.getValue());
14.87 }
15.1 --- a/duplicates/ide/impl/nbproject/genfiles.properties Sat Mar 10 20:57:35 2012 +0100
15.2 +++ b/duplicates/ide/impl/nbproject/genfiles.properties Sat Mar 10 21:14:34 2012 +0100
15.3 @@ -3,6 +3,6 @@
15.4 build.xml.stylesheet.CRC32=a56c6a5b@2.49
15.5 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
15.6 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
15.7 -nbproject/build-impl.xml.data.CRC32=f3f3f30d
15.8 +nbproject/build-impl.xml.data.CRC32=113fe8ad
15.9 nbproject/build-impl.xml.script.CRC32=5fd8da83
15.10 nbproject/build-impl.xml.stylesheet.CRC32=238281d1@2.49
16.1 --- a/duplicates/ide/impl/nbproject/project.xml Sat Mar 10 20:57:35 2012 +0100
16.2 +++ b/duplicates/ide/impl/nbproject/project.xml Sat Mar 10 21:14:34 2012 +0100
16.3 @@ -148,15 +148,6 @@
16.4 </run-dependency>
16.5 </dependency>
16.6 <dependency>
16.7 - <code-name-base>org.netbeans.modules.java.hints</code-name-base>
16.8 - <build-prerequisite/>
16.9 - <compile-dependency/>
16.10 - <run-dependency>
16.11 - <release-version>1</release-version>
16.12 - <implementation-version/>
16.13 - </run-dependency>
16.14 - </dependency>
16.15 - <dependency>
16.16 <code-name-base>org.netbeans.modules.java.lexer</code-name-base>
16.17 <build-prerequisite/>
16.18 <compile-dependency/>
16.19 @@ -280,6 +271,14 @@
16.20 </run-dependency>
16.21 </dependency>
16.22 <dependency>
16.23 + <code-name-base>org.netbeans.spi.java.hints</code-name-base>
16.24 + <build-prerequisite/>
16.25 + <compile-dependency/>
16.26 + <run-dependency>
16.27 + <implementation-version/>
16.28 + </run-dependency>
16.29 + </dependency>
16.30 + <dependency>
16.31 <code-name-base>org.openide.awt</code-name-base>
16.32 <build-prerequisite/>
16.33 <compile-dependency/>
17.1 --- a/duplicates/ide/impl/src/org/netbeans/modules/jackpot30/impl/duplicates/ComputeDuplicates.java Sat Mar 10 20:57:35 2012 +0100
17.2 +++ b/duplicates/ide/impl/src/org/netbeans/modules/jackpot30/impl/duplicates/ComputeDuplicates.java Sat Mar 10 21:14:34 2012 +0100
17.3 @@ -89,9 +89,9 @@
17.4 import org.netbeans.modules.jackpot30.common.api.LuceneHelpers.BitSetCollector;
17.5 import org.netbeans.modules.jackpot30.impl.duplicates.indexing.DuplicatesCustomIndexerImpl;
17.6 import org.netbeans.modules.jackpot30.impl.duplicates.indexing.DuplicatesIndex;
17.7 -import org.netbeans.modules.java.hints.jackpot.impl.Utilities;
17.8 -import org.netbeans.modules.java.hints.jackpot.impl.pm.BulkSearch;
17.9 -import org.netbeans.modules.java.hints.jackpot.impl.pm.BulkSearch.EncodingContext;
17.10 +import org.netbeans.modules.java.hints.spiimpl.Utilities;
17.11 +import org.netbeans.modules.java.hints.spiimpl.pm.BulkSearch;
17.12 +import org.netbeans.modules.java.hints.spiimpl.pm.BulkSearch.EncodingContext;
17.13 import org.netbeans.modules.java.source.JavaSourceAccessor;
17.14 import org.netbeans.modules.parsing.impl.indexing.CacheFolder;
17.15 import org.openide.filesystems.FileObject;
18.1 --- a/language/ide/indexing/nbproject/genfiles.properties Sat Mar 10 20:57:35 2012 +0100
18.2 +++ b/language/ide/indexing/nbproject/genfiles.properties Sat Mar 10 21:14:34 2012 +0100
18.3 @@ -3,6 +3,6 @@
18.4 build.xml.stylesheet.CRC32=a56c6a5b@2.49
18.5 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
18.6 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
18.7 -nbproject/build-impl.xml.data.CRC32=27490bcc
18.8 +nbproject/build-impl.xml.data.CRC32=e26fc52c
18.9 nbproject/build-impl.xml.script.CRC32=d49586b3
18.10 nbproject/build-impl.xml.stylesheet.CRC32=238281d1@2.49
19.1 --- a/language/ide/indexing/nbproject/project.xml Sat Mar 10 20:57:35 2012 +0100
19.2 +++ b/language/ide/indexing/nbproject/project.xml Sat Mar 10 21:14:34 2012 +0100
19.3 @@ -148,15 +148,6 @@
19.4 </run-dependency>
19.5 </dependency>
19.6 <dependency>
19.7 - <code-name-base>org.netbeans.modules.java.hints</code-name-base>
19.8 - <build-prerequisite/>
19.9 - <compile-dependency/>
19.10 - <run-dependency>
19.11 - <release-version>1</release-version>
19.12 - <implementation-version/>
19.13 - </run-dependency>
19.14 - </dependency>
19.15 - <dependency>
19.16 <code-name-base>org.netbeans.modules.java.lexer</code-name-base>
19.17 <build-prerequisite/>
19.18 <compile-dependency/>
19.19 @@ -280,6 +271,14 @@
19.20 </run-dependency>
19.21 </dependency>
19.22 <dependency>
19.23 + <code-name-base>org.netbeans.spi.java.hints</code-name-base>
19.24 + <build-prerequisite/>
19.25 + <compile-dependency/>
19.26 + <run-dependency>
19.27 + <implementation-version/>
19.28 + </run-dependency>
19.29 + </dependency>
19.30 + <dependency>
19.31 <code-name-base>org.openide.awt</code-name-base>
19.32 <build-prerequisite/>
19.33 <compile-dependency/>
20.1 --- a/language/ide/indexing/src/org/netbeans/modules/jackpot30/indexing/batch/EnhancedScopes.java Sat Mar 10 20:57:35 2012 +0100
20.2 +++ b/language/ide/indexing/src/org/netbeans/modules/jackpot30/indexing/batch/EnhancedScopes.java Sat Mar 10 21:14:34 2012 +0100
20.3 @@ -78,19 +78,19 @@
20.4 import org.netbeans.modules.jackpot30.remoting.api.RemoteIndex;
20.5 import org.netbeans.modules.jackpot30.remoting.api.WebUtilities;
20.6 import static org.netbeans.modules.jackpot30.remoting.api.WebUtilities.escapeForQuery;
20.7 -import org.netbeans.modules.java.hints.jackpot.impl.MessageImpl;
20.8 -import org.netbeans.modules.java.hints.jackpot.impl.batch.BatchSearch.Folder;
20.9 -import org.netbeans.modules.java.hints.jackpot.impl.batch.BatchSearch.IndexEnquirer;
20.10 -import org.netbeans.modules.java.hints.jackpot.impl.batch.BatchSearch.LocalIndexEnquirer;
20.11 -import org.netbeans.modules.java.hints.jackpot.impl.batch.BatchSearch.MapIndices;
20.12 -import org.netbeans.modules.java.hints.jackpot.impl.batch.BatchSearch.Resource;
20.13 -import org.netbeans.modules.java.hints.jackpot.impl.batch.BatchSearch.Scope;
20.14 -import org.netbeans.modules.java.hints.jackpot.impl.batch.BatchSearch.VerifiedSpansCallBack;
20.15 -import org.netbeans.modules.java.hints.jackpot.impl.batch.ProgressHandleWrapper;
20.16 -import org.netbeans.modules.java.hints.jackpot.impl.batch.Scopes;
20.17 -import org.netbeans.modules.java.hints.jackpot.impl.pm.BulkSearch.BulkPattern;
20.18 -import org.netbeans.modules.java.hints.jackpot.spi.HintDescription;
20.19 -import org.netbeans.modules.java.hints.jackpot.spi.Trigger.PatternDescription;
20.20 +import org.netbeans.modules.java.hints.providers.spi.HintDescription;
20.21 +import org.netbeans.modules.java.hints.providers.spi.Trigger.PatternDescription;
20.22 +import org.netbeans.modules.java.hints.spiimpl.MessageImpl;
20.23 +import org.netbeans.modules.java.hints.spiimpl.batch.BatchSearch.Folder;
20.24 +import org.netbeans.modules.java.hints.spiimpl.batch.BatchSearch.IndexEnquirer;
20.25 +import org.netbeans.modules.java.hints.spiimpl.batch.BatchSearch.LocalIndexEnquirer;
20.26 +import org.netbeans.modules.java.hints.spiimpl.batch.BatchSearch.MapIndices;
20.27 +import org.netbeans.modules.java.hints.spiimpl.batch.BatchSearch.Resource;
20.28 +import org.netbeans.modules.java.hints.spiimpl.batch.BatchSearch.Scope;
20.29 +import org.netbeans.modules.java.hints.spiimpl.batch.BatchSearch.VerifiedSpansCallBack;
20.30 +import org.netbeans.modules.java.hints.spiimpl.batch.ProgressHandleWrapper;
20.31 +import org.netbeans.modules.java.hints.spiimpl.batch.Scopes;
20.32 +import org.netbeans.modules.java.hints.spiimpl.pm.BulkSearch.BulkPattern;
20.33 import org.netbeans.modules.java.preprocessorbridge.spi.JavaIndexerPlugin;
20.34 import org.netbeans.modules.parsing.impl.indexing.FileObjectIndexable;
20.35 import org.netbeans.modules.parsing.impl.indexing.IndexableImpl;
20.36 @@ -247,7 +247,7 @@
20.37 Collection<FileObject> collected = new LinkedList<FileObject>();
20.38 Set<String> removed = new HashSet<String>(timeStamps.stringPropertyNames());
20.39
20.40 - org.netbeans.modules.java.hints.jackpot.impl.batch.BatchUtilities.recursive(src, src, collected, progress, 0, timeStamps, removed, recursive);
20.41 + org.netbeans.modules.java.hints.spiimpl.batch.BatchUtilities.recursive(src, src, collected, progress, 0, timeStamps, removed, recursive);
20.42
20.43 for (String r : removed) {
20.44 index.delete(SPIAccessor.getInstance().create(new FakeIndexableImpl(r)));
21.1 --- a/language/ide/indexing/src/org/netbeans/modules/jackpot30/indexing/batch/OptionProcessorImpl.java Sat Mar 10 20:57:35 2012 +0100
21.2 +++ b/language/ide/indexing/src/org/netbeans/modules/jackpot30/indexing/batch/OptionProcessorImpl.java Sat Mar 10 21:14:34 2012 +0100
21.3 @@ -60,17 +60,17 @@
21.4 import org.netbeans.api.project.SourceGroup;
21.5 import org.netbeans.api.project.ui.OpenProjects;
21.6 import org.netbeans.api.sendopts.CommandException;
21.7 -import org.netbeans.modules.java.hints.jackpot.impl.MessageImpl;
21.8 -import org.netbeans.modules.java.hints.jackpot.impl.Utilities;
21.9 -import org.netbeans.modules.java.hints.jackpot.impl.batch.BatchSearch;
21.10 -import org.netbeans.modules.java.hints.jackpot.impl.batch.BatchSearch.BatchResult;
21.11 -import org.netbeans.modules.java.hints.jackpot.impl.batch.BatchSearch.Folder;
21.12 -import org.netbeans.modules.java.hints.jackpot.impl.batch.BatchUtilities;
21.13 -import org.netbeans.modules.java.hints.jackpot.impl.batch.ProgressHandleWrapper;
21.14 -import org.netbeans.modules.java.hints.jackpot.impl.batch.Scopes;
21.15 -import org.netbeans.modules.java.hints.jackpot.spi.HintContext.MessageKind;
21.16 -import org.netbeans.modules.java.hints.jackpot.spi.HintDescription;
21.17 +import org.netbeans.modules.java.hints.providers.spi.HintDescription;
21.18 +import org.netbeans.modules.java.hints.spiimpl.MessageImpl;
21.19 +import org.netbeans.modules.java.hints.spiimpl.Utilities;
21.20 +import org.netbeans.modules.java.hints.spiimpl.batch.BatchSearch;
21.21 +import org.netbeans.modules.java.hints.spiimpl.batch.BatchSearch.BatchResult;
21.22 +import org.netbeans.modules.java.hints.spiimpl.batch.BatchSearch.Folder;
21.23 +import org.netbeans.modules.java.hints.spiimpl.batch.BatchUtilities;
21.24 +import org.netbeans.modules.java.hints.spiimpl.batch.ProgressHandleWrapper;
21.25 +import org.netbeans.modules.java.hints.spiimpl.batch.Scopes;
21.26 import org.netbeans.spi.java.classpath.support.ClassPathSupport;
21.27 +import org.netbeans.spi.java.hints.HintContext.MessageKind;
21.28 import org.netbeans.spi.sendopts.Env;
21.29 import org.netbeans.spi.sendopts.Option;
21.30 import org.netbeans.spi.sendopts.OptionProcessor;
22.1 --- a/language/ide/indexing/src/org/netbeans/modules/jackpot30/indexing/index/IndexQuery.java Sat Mar 10 20:57:35 2012 +0100
22.2 +++ b/language/ide/indexing/src/org/netbeans/modules/jackpot30/indexing/index/IndexQuery.java Sat Mar 10 21:14:34 2012 +0100
22.3 @@ -69,17 +69,13 @@
22.4 import org.apache.lucene.search.Searcher;
22.5 import org.apache.lucene.search.TermQuery;
22.6 import org.apache.lucene.store.FSDirectory;
22.7 -import org.codeviation.pojson.Pojson;
22.8 -import org.netbeans.api.annotations.common.NonNull;
22.9 import org.netbeans.api.annotations.common.NullAllowed;
22.10 import org.netbeans.modules.jackpot30.common.api.LuceneHelpers.BitSetCollector;
22.11 import org.netbeans.modules.jackpot30.remoting.api.RemoteIndex;
22.12 import org.netbeans.modules.jackpot30.remoting.api.WebUtilities;
22.13 -import org.netbeans.modules.java.hints.jackpot.impl.pm.BulkSearch;
22.14 -import org.netbeans.modules.java.hints.jackpot.impl.pm.BulkSearch.BulkPattern;
22.15 -import org.netbeans.modules.java.hints.jackpot.spi.HintDescription.AdditionalQueryConstraints;
22.16 -import org.netbeans.modules.java.source.indexing.JavaIndex;
22.17 -import org.netbeans.modules.parsing.impl.indexing.CacheFolder;
22.18 +import org.netbeans.modules.java.hints.providers.spi.HintDescription.AdditionalQueryConstraints;
22.19 +import org.netbeans.modules.java.hints.spiimpl.pm.BulkSearch;
22.20 +import org.netbeans.modules.java.hints.spiimpl.pm.BulkSearch.BulkPattern;
22.21 import org.openide.filesystems.FileObject;
22.22 import org.openide.filesystems.FileUtil;
22.23 import org.openide.util.Exceptions;
23.1 --- a/language/ide/indexing/src/org/netbeans/modules/jackpot30/indexing/index/Indexer.java Sat Mar 10 20:57:35 2012 +0100
23.2 +++ b/language/ide/indexing/src/org/netbeans/modules/jackpot30/indexing/index/Indexer.java Sat Mar 10 21:14:34 2012 +0100
23.3 @@ -68,8 +68,8 @@
23.4 import org.apache.lucene.index.Term;
23.5 import org.netbeans.api.annotations.common.NonNull;
23.6 import org.netbeans.api.editor.mimelookup.MimeRegistration;
23.7 -import org.netbeans.modules.java.hints.jackpot.impl.pm.BulkSearch;
23.8 -import org.netbeans.modules.java.hints.jackpot.impl.pm.BulkSearch.EncodingContext;
23.9 +import org.netbeans.modules.java.hints.spiimpl.pm.BulkSearch;
23.10 +import org.netbeans.modules.java.hints.spiimpl.pm.BulkSearch.EncodingContext;
23.11 import org.netbeans.modules.java.preprocessorbridge.spi.JavaIndexerPlugin;
23.12 import org.netbeans.modules.java.source.indexing.JavaIndex;
23.13 import org.netbeans.modules.parsing.impl.indexing.CacheFolder;
24.1 --- a/language/ide/indexing/test/unit/src/org/netbeans/modules/jackpot30/indexing/index/IndexerTest.java Sat Mar 10 20:57:35 2012 +0100
24.2 +++ b/language/ide/indexing/test/unit/src/org/netbeans/modules/jackpot30/indexing/index/IndexerTest.java Sat Mar 10 21:14:34 2012 +0100
24.3 @@ -55,10 +55,10 @@
24.4 import org.netbeans.api.java.source.Task;
24.5 import org.netbeans.api.java.source.TestUtilities;
24.6 import org.netbeans.modules.jackpot30.common.test.IndexTestBase;
24.7 -import org.netbeans.modules.java.hints.jackpot.impl.Utilities;
24.8 -import org.netbeans.modules.java.hints.jackpot.impl.pm.BulkSearch;
24.9 -import org.netbeans.modules.java.hints.jackpot.impl.pm.BulkSearch.BulkPattern;
24.10 -import org.netbeans.modules.java.hints.jackpot.spi.HintDescription.AdditionalQueryConstraints;
24.11 +import org.netbeans.modules.java.hints.providers.spi.HintDescription.AdditionalQueryConstraints;
24.12 +import org.netbeans.modules.java.hints.spiimpl.Utilities;
24.13 +import org.netbeans.modules.java.hints.spiimpl.pm.BulkSearch;
24.14 +import org.netbeans.modules.java.hints.spiimpl.pm.BulkSearch.BulkPattern;
24.15 import org.netbeans.modules.parsing.api.indexing.IndexingManager;
24.16 import org.netbeans.spi.editor.mimelookup.MimeDataProvider;
24.17 import org.netbeans.spi.java.classpath.support.ClassPathSupport;
25.1 --- a/remoting/common/borrowedtests/nbproject/genfiles.properties Sat Mar 10 20:57:35 2012 +0100
25.2 +++ b/remoting/common/borrowedtests/nbproject/genfiles.properties Sat Mar 10 21:14:34 2012 +0100
25.3 @@ -3,6 +3,6 @@
25.4 build.xml.stylesheet.CRC32=79c3b980@1.28.0.7
25.5 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
25.6 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
25.7 -nbproject/build-impl.xml.data.CRC32=6ddec023
25.8 +nbproject/build-impl.xml.data.CRC32=ca7a8f66
25.9 nbproject/build-impl.xml.script.CRC32=cb5fccc2
25.10 nbproject/build-impl.xml.stylesheet.CRC32=238281d1@2.49
26.1 --- a/remoting/common/borrowedtests/nbproject/project.xml Sat Mar 10 20:57:35 2012 +0100
26.2 +++ b/remoting/common/borrowedtests/nbproject/project.xml Sat Mar 10 21:14:34 2012 +0100
26.3 @@ -219,6 +219,14 @@
26.4 </run-dependency>
26.5 </dependency>
26.6 <dependency>
26.7 + <code-name-base>org.netbeans.spi.java.hints</code-name-base>
26.8 + <build-prerequisite/>
26.9 + <compile-dependency/>
26.10 + <run-dependency>
26.11 + <implementation-version/>
26.12 + </run-dependency>
26.13 + </dependency>
26.14 + <dependency>
26.15 <code-name-base>org.openide.actions</code-name-base>
26.16 <build-prerequisite/>
26.17 <compile-dependency/>
27.1 --- a/remoting/common/borrowedtests/src/org/netbeans/modules/java/hints/jackpot/code/spi/TestBase.java Sat Mar 10 20:57:35 2012 +0100
27.2 +++ b/remoting/common/borrowedtests/src/org/netbeans/modules/java/hints/jackpot/code/spi/TestBase.java Sat Mar 10 21:14:34 2012 +0100
27.3 @@ -69,12 +69,12 @@
27.4 import org.netbeans.api.java.source.support.CaretAwareJavaSourceTaskFactory;
27.5 import org.netbeans.api.lexer.Language;
27.6 import org.netbeans.junit.NbTestCase;
27.7 -import org.netbeans.modules.java.hints.jackpot.code.CodeHintProviderImpl;
27.8 -import org.netbeans.modules.java.hints.jackpot.code.FSWrapper;
27.9 -import org.netbeans.modules.java.hints.jackpot.code.FSWrapper.ClassWrapper;
27.10 -import org.netbeans.modules.java.hints.jackpot.spi.HintDescription;
27.11 -import org.netbeans.modules.java.hints.jackpot.spi.HintMetadata;
27.12 import org.netbeans.modules.java.hints.jackpot.spi.HintsRunner;
27.13 +import org.netbeans.modules.java.hints.providers.code.CodeHintProviderImpl;
27.14 +import org.netbeans.modules.java.hints.providers.code.FSWrapper;
27.15 +import org.netbeans.modules.java.hints.providers.code.FSWrapper.ClassWrapper;
27.16 +import org.netbeans.modules.java.hints.providers.spi.HintDescription;
27.17 +import org.netbeans.modules.java.hints.providers.spi.HintMetadata;
27.18 import org.netbeans.modules.java.source.TreeLoader;
27.19 import org.netbeans.spi.editor.hints.ErrorDescription;
27.20 import org.netbeans.spi.editor.hints.Fix;
28.1 --- a/remoting/common/borrowedtests/src/org/netbeans/modules/java/hints/jackpot/impl/pm/BulkSearchTestPerformer.java Sat Mar 10 20:57:35 2012 +0100
28.2 +++ b/remoting/common/borrowedtests/src/org/netbeans/modules/java/hints/jackpot/impl/pm/BulkSearchTestPerformer.java Sat Mar 10 21:14:34 2012 +0100
28.3 @@ -42,8 +42,6 @@
28.4
28.5 package org.netbeans.modules.java.hints.jackpot.impl.pm;
28.6
28.7 -import org.netbeans.modules.java.hints.jackpot.impl.pm.BulkSearch.BulkPattern;
28.8 -import org.netbeans.modules.java.hints.jackpot.impl.pm.BulkSearch.EncodingContext;
28.9 import com.sun.source.util.TreePath;
28.10 import java.io.ByteArrayInputStream;
28.11 import java.io.ByteArrayOutputStream;
28.12 @@ -75,6 +73,9 @@
28.13 import org.openide.filesystems.FileUtil;
28.14 import org.openide.loaders.DataObject;
28.15 import static org.junit.Assert.*;
28.16 +import org.netbeans.modules.java.hints.spiimpl.pm.BulkSearch;
28.17 +import org.netbeans.modules.java.hints.spiimpl.pm.BulkSearch.BulkPattern;
28.18 +import org.netbeans.modules.java.hints.spiimpl.pm.BulkSearch.EncodingContext;
28.19
28.20 /**
28.21 *