1.1 --- a/javahints.generate/nbproject/project.xml	Fri Mar 23 16:07:40 2012 -0400
     1.2 +++ b/javahints.generate/nbproject/project.xml	Sun Mar 25 21:26:36 2012 +0200
     1.3 @@ -6,11 +6,18 @@
     1.4              <code-name-base>org.netbeans.modules.javahints.generate</code-name-base>
     1.5              <module-dependencies>
     1.6                  <dependency>
     1.7 -                    <code-name-base>org.netbeans.modules.java.hints</code-name-base>
     1.8 +                    <code-name-base>org.netbeans.modules.java.source</code-name-base>
     1.9                      <build-prerequisite/>
    1.10                      <compile-dependency/>
    1.11                      <run-dependency>
    1.12 -                        <release-version>1</release-version>
    1.13 +                        <specification-version>0.99</specification-version>
    1.14 +                    </run-dependency>
    1.15 +                </dependency>
    1.16 +                <dependency>
    1.17 +                    <code-name-base>org.netbeans.spi.java.hints</code-name-base>
    1.18 +                    <build-prerequisite/>
    1.19 +                    <compile-dependency/>
    1.20 +                    <run-dependency>
    1.21                          <implementation-version/>
    1.22                      </run-dependency>
    1.23                  </dependency>

     2.1 --- a/javahints.generate/src/org/netbeans/modules/javahints/generate/GenerateHintWiki.java	Fri Mar 23 16:07:40 2012 -0400
     2.2 +++ b/javahints.generate/src/org/netbeans/modules/javahints/generate/GenerateHintWiki.java	Sun Mar 25 21:26:36 2012 +0200
     2.3 @@ -48,8 +48,8 @@
     2.4  import java.io.StringWriter;
     2.5  import java.util.*;
     2.6  import java.util.Map.Entry;
     2.7 -import org.netbeans.modules.java.hints.jackpot.impl.RulesManager;
     2.8 -import org.netbeans.modules.java.hints.jackpot.spi.HintMetadata;
     2.9 +import org.netbeans.modules.java.hints.providers.spi.HintMetadata;
    2.10 +import org.netbeans.modules.java.hints.spiimpl.RulesManager;
    2.11  import org.openide.awt.ActionRegistration;
    2.12  import org.openide.awt.ActionReference;
    2.13  import org.openide.awt.ActionReferences;
    2.14 @@ -74,7 +74,7 @@
    2.15          Map<String, String> since = readSinceData();
    2.16          Map<String, List<HintMetadata>> category2Hint = new TreeMap<String, List<HintMetadata>>();
    2.17  
    2.18 -        for (HintMetadata hm : RulesManager.getInstance().allHints.keySet()) {
    2.19 +        for (HintMetadata hm : RulesManager.getInstance().readHints(null, null, null).keySet()) {
    2.20              FileObject catFO = FileUtil.getConfigFile(HINTS_FOLDER + hm.category);
    2.21              String categoryDisplayName = catFO != null ? getFileObjectLocalizedName(catFO) : hm.category;
    2.22              List<HintMetadata> categorized = category2Hint.get(categoryDisplayName);