1.1 --- a/cmdline/lib/test/unit/src/org/netbeans/modules/jackpot30/cmdline/lib/CreateStandaloneJar.java	Sun Aug 02 22:43:11 2015 +0200
     1.2 +++ b/cmdline/lib/test/unit/src/org/netbeans/modules/jackpot30/cmdline/lib/CreateStandaloneJar.java	Mon Aug 03 20:43:34 2015 +0200
     1.3 @@ -81,6 +81,7 @@
     1.4  import org.netbeans.modules.jackpot30.cmdline.lib.StandaloneTools.RepositoryImpl;
     1.5  import org.netbeans.modules.jackpot30.common.api.IndexAccess;
     1.6  import org.netbeans.modules.java.classpath.DefaultGlobalPathRegistryImplementation;
     1.7 +import org.netbeans.modules.java.hints.StandardJavacWarnings.CompilerSettingsImpl;
     1.8  import org.netbeans.modules.java.hints.declarative.DeclarativeHintRegistry;
     1.9  import org.netbeans.modules.java.hints.providers.code.CodeHintProviderImpl;
    1.10  import org.netbeans.modules.java.hints.providers.code.FSWrapper;
    1.11 @@ -92,6 +93,7 @@
    1.12  import org.netbeans.modules.java.hints.spiimpl.Utilities.SPI;
    1.13  import org.netbeans.modules.java.source.DefaultPositionRefProvider;
    1.14  import org.netbeans.modules.java.source.PositionRefProvider;
    1.15 +import org.netbeans.modules.java.source.tasklist.CompilerSettings;
    1.16  import org.netbeans.modules.parsing.impl.indexing.implspi.ActiveDocumentProvider;
    1.17  import org.netbeans.modules.parsing.implspi.EnvironmentFactory;
    1.18  import org.netbeans.modules.parsing.nb.DataObjectEnvFactory;
    1.19 @@ -281,6 +283,7 @@
    1.20          registrations.add(new MetaInfRegistration(ActiveDocumentProvider.class.getName(), ActiveDocumentProviderImpl.class.getName()));
    1.21          registrations.add(new MetaInfRegistration(EditorMimeTypesImplementation.class.getName(), EditorMimeTypesImplementationImpl.class.getName()));
    1.22          registrations.add(new MetaInfRegistration(PositionRefProvider.Factory.class.getName(), DefaultPositionRefProvider.FactoryImpl.class.getName()));
    1.23 +        registrations.add(new MetaInfRegistration(CompilerSettings.class.getName(), CompilerSettingsImpl.class.getName()));
    1.24          registrations.addAll(info.metaInf);
    1.25  
    1.26          Map<String, Collection<MetaInfRegistration>> api2Registrations = new HashMap<String, Collection<MetaInfRegistration>>();
    1.27 @@ -494,7 +497,8 @@
    1.28              DataObjectEnvFactory.class.getName(),
    1.29              NbProjectManager.class.getName(),
    1.30              DefaultGlobalPathRegistryImplementation.class.getName(),
    1.31 -            DefaultPositionRefProvider.FactoryImpl.class.getName()
    1.32 +            DefaultPositionRefProvider.FactoryImpl.class.getName(),
    1.33 +            CompilerSettingsImpl.class.getName()
    1.34          ));
    1.35  
    1.36      private static final Set<String> COPY_REGISTRATION = new HashSet<String>(Arrays.<String>asList(

     2.1 --- a/java.hints/spi.java.hints/test/unit/src/org/netbeans/modules/java/hints/spiimpl/processor/JavaHintsAnnotationProcessorTest.java	Sun Aug 02 22:43:11 2015 +0200
     2.2 +++ b/java.hints/spi.java.hints/test/unit/src/org/netbeans/modules/java/hints/spiimpl/processor/JavaHintsAnnotationProcessorTest.java	Mon Aug 03 20:43:34 2015 +0200
     2.3 @@ -63,7 +63,7 @@
     2.4          AnnotationProcessorTestUtils.makeSource(src, "p.H",
     2.5                  "import org.netbeans.spi.java.hints.*;\n",
     2.6                  "import org.netbeans.spi.editor.hints.*;\n",
     2.7 -                "@Hint(category=\"general\")\n",
     2.8 +                "@Hint(displayName=\"\", description=\"\", category=\"general\")\n",
     2.9                  "public class H {\n",
    2.10                  "    @TriggerPattern(\"$1.$2\")\n",
    2.11                  "    public static String h1(HintContext ctx) { return null;}\n",