1.1 --- a/bridges/apisupport/nbproject/genfiles.properties	Thu Jul 21 15:57:25 2011 +0200
     1.2 +++ b/bridges/apisupport/nbproject/genfiles.properties	Thu Jul 21 15:59:06 2011 +0200
     1.3 @@ -3,6 +3,6 @@
     1.4  build.xml.stylesheet.CRC32=79c3b980@1.40
     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=92948d50
     1.8 +nbproject/build-impl.xml.data.CRC32=6dd26dc2
     1.9  nbproject/build-impl.xml.script.CRC32=83dd2c27
    1.10  nbproject/build-impl.xml.stylesheet.CRC32=238281d1@2.45

     2.1 --- a/file/src/org/netbeans/modules/jackpot30/file/DeclarativeHintRegistry.java	Thu Jul 21 15:57:25 2011 +0200
     2.2 +++ b/file/src/org/netbeans/modules/jackpot30/file/DeclarativeHintRegistry.java	Thu Jul 21 15:59:06 2011 +0200
     2.3 @@ -233,7 +233,7 @@
     2.4  
     2.5              String[] w = suppressWarnings(parsed.options);
     2.6  
     2.7 -            meta = HintMetadata.create(id, bundle, cat, true, HintSeverity.WARNING, Kind.HINT, null, w);
     2.8 +            meta = HintMetadata.Builder.create(id).setBundle(bundle).setCategory(cat).addSuppressWarnings(w).build();
     2.9              primarySuppressWarningsKey = w.length > 0 ? w[0] : null;
    2.10          } else {
    2.11              meta = null;
    2.12 @@ -286,10 +286,10 @@
    2.13                  }
    2.14  
    2.15                  if (currentId != null) {
    2.16 -                    currentMeta = HintMetadata.create(currentId, bundle, cat, true, HintSeverity.WARNING, Kind.HINT, null, w);
    2.17 +                    currentMeta = HintMetadata.Builder.create(currentId).setBundle(bundle).setCategory(cat).addSuppressWarnings(w).build();
    2.18                  } else {
    2.19                      currentId = file != null ? file.getNameExt() + "-" + count : String.valueOf(count);
    2.20 -                    currentMeta = HintMetadata.create(currentId, displayName, "No Description", cat, true, HintMetadata.Kind.HINT, HintSeverity.WARNING, null, Arrays.asList(w));
    2.21 +                    currentMeta = HintMetadata.Builder.create(currentId).setDescription(displayName, "No Description").setCategory(cat).addSuppressWarnings(w).build();
    2.22                  }
    2.23  
    2.24                  primarySuppressWarningsKey = w.length > 0 ? w[0] : null;

     3.1 --- a/hintsimpl/src/org/netbeans/modules/jackpot30/hintsimpl/jdk7/ConvertToDiamondBulkHint.java	Thu Jul 21 15:57:25 2011 +0200
     3.2 +++ b/hintsimpl/src/org/netbeans/modules/jackpot30/hintsimpl/jdk7/ConvertToDiamondBulkHint.java	Thu Jul 21 15:59:06 2011 +0200
     3.3 @@ -56,6 +56,7 @@
     3.4  import org.netbeans.modules.java.hints.jackpot.code.spi.TriggerPatterns;
     3.5  import org.netbeans.modules.java.hints.jackpot.spi.HintContext;
     3.6  import org.netbeans.modules.java.hints.jackpot.spi.HintMetadata.Kind;
     3.7 +import org.netbeans.modules.java.hints.jackpot.spi.HintMetadata.Options;
     3.8  import org.netbeans.modules.java.hints.jackpot.spi.MatcherUtilities;
     3.9  import org.netbeans.modules.java.hints.spi.ErrorRule;
    3.10  import org.netbeans.spi.editor.hints.ErrorDescription;
    3.11 @@ -67,7 +68,7 @@
    3.12   *
    3.13   * @author lahvac
    3.14   */
    3.15 -@Hint(category="rules15",enabled=false, hintKind=Kind.HINT_NON_GUI)
    3.16 +@Hint(category="rules15",enabled=false, options=Options.NON_GUI)
    3.17  public class ConvertToDiamondBulkHint {
    3.18  
    3.19      private static final Map<String, Collection<String>> key2Pattern = new LinkedHashMap<String, Collection<String>>();

     4.1 --- a/hintsimpl/src/org/netbeans/modules/jackpot30/hintsimpl/jdk7/SafeConvertToSwitchString.java	Thu Jul 21 15:57:25 2011 +0200
     4.2 +++ b/hintsimpl/src/org/netbeans/modules/jackpot30/hintsimpl/jdk7/SafeConvertToSwitchString.java	Thu Jul 21 15:59:06 2011 +0200
     4.3 @@ -48,7 +48,7 @@
     4.4  import org.netbeans.modules.java.hints.jackpot.code.spi.TriggerPattern;
     4.5  import org.netbeans.modules.java.hints.jackpot.impl.RulesManager;
     4.6  import org.netbeans.modules.java.hints.jackpot.spi.HintContext;
     4.7 -import org.netbeans.modules.java.hints.jackpot.spi.HintMetadata.Kind;
     4.8 +import org.netbeans.modules.java.hints.jackpot.spi.HintMetadata.Options;
     4.9  import org.netbeans.modules.java.hints.jdk.ConvertToStringSwitch;
    4.10  import org.netbeans.modules.java.hints.options.HintsSettings;
    4.11  import org.netbeans.spi.editor.hints.ErrorDescription;
    4.12 @@ -57,7 +57,7 @@
    4.13   *
    4.14   * @author lahvac
    4.15   */
    4.16 -@Hint(category="rules15",enabled=false, hintKind=Kind.HINT_NON_GUI)
    4.17 +@Hint(category="rules15",enabled=false, options=Options.NON_GUI)
    4.18  public class SafeConvertToSwitchString {
    4.19  
    4.20      static final String KEY_ALSO_EQ = "also-equals";

     5.1 --- a/transformer/src/org/netbeans/modules/jackpot30/transformers/TransformationHintProviderImpl.java	Thu Jul 21 15:57:25 2011 +0200
     5.2 +++ b/transformer/src/org/netbeans/modules/jackpot30/transformers/TransformationHintProviderImpl.java	Thu Jul 21 15:59:06 2011 +0200
     5.3 @@ -346,7 +346,7 @@
     5.4              return null;//XXX
     5.5          }
     5.6  
     5.7 -        HintMetadata hm = HintMetadata.create(id, displayName, displayName, CATEGORY, true, HintMetadata.Kind.HINT, HintSeverity.WARNING, Collections.<String>emptyList());
     5.8 +        HintMetadata hm = HintMetadata.Builder.create(id).setDescription(displayName, displayName).setCategory(CATEGORY).build();
     5.9  
    5.10          return HintDescriptionFactory.create()
    5.11                                       .setMetadata(hm)