1.1 --- a/bridges/refactoring/nbproject/genfiles.properties	Mon Oct 17 15:25:39 2011 +0200
     1.2 +++ b/bridges/refactoring/nbproject/genfiles.properties	Thu Oct 20 22:05:03 2011 +0200
     1.3 @@ -3,6 +3,6 @@
     1.4  build.xml.stylesheet.CRC32=79c3b980@1.39
     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=2812ae4f
     1.8 +nbproject/build-impl.xml.data.CRC32=91e5a28b
     1.9  nbproject/build-impl.xml.script.CRC32=fd9920c9
    1.10 -nbproject/build-impl.xml.stylesheet.CRC32=238281d1@1.47
    1.11 +nbproject/build-impl.xml.stylesheet.CRC32=238281d1@2.47

     2.1 --- a/bridges/refactoring/nbproject/project.xml	Mon Oct 17 15:25:39 2011 +0200
     2.2 +++ b/bridges/refactoring/nbproject/project.xml	Thu Oct 20 22:05:03 2011 +0200
     2.3 @@ -162,11 +162,11 @@
     2.4                          <test/>
     2.5                      </test-dependency>
     2.6                      <test-dependency>
     2.7 -                        <code-name-base>org.netbeans.modules.jackpot30.file</code-name-base>
     2.8 +                        <code-name-base>org.netbeans.modules.jackpot30.test.borrowed</code-name-base>
     2.9                          <compile-dependency/>
    2.10                      </test-dependency>
    2.11                      <test-dependency>
    2.12 -                        <code-name-base>org.netbeans.modules.jackpot30.test.borrowed</code-name-base>
    2.13 +                        <code-name-base>org.netbeans.modules.java.hints.declarative</code-name-base>
    2.14                          <compile-dependency/>
    2.15                      </test-dependency>
    2.16                      <test-dependency>

     3.1 --- a/cmdline/compiler/nbproject/genfiles.properties	Mon Oct 17 15:25:39 2011 +0200
     3.2 +++ b/cmdline/compiler/nbproject/genfiles.properties	Thu Oct 20 22:05:03 2011 +0200
     3.3 @@ -3,6 +3,6 @@
     3.4  build.xml.stylesheet.CRC32=79c3b980@1.33
     3.5  # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
     3.6  # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
     3.7 -nbproject/build-impl.xml.data.CRC32=360ca097
     3.8 +nbproject/build-impl.xml.data.CRC32=1f9fc92c
     3.9  nbproject/build-impl.xml.script.CRC32=64f6fe95
    3.10 -nbproject/build-impl.xml.stylesheet.CRC32=238281d1@1.47
    3.11 +nbproject/build-impl.xml.stylesheet.CRC32=238281d1@2.47

     4.1 --- a/cmdline/compiler/nbproject/project.xml	Mon Oct 17 15:25:39 2011 +0200
     4.2 +++ b/cmdline/compiler/nbproject/project.xml	Thu Oct 20 22:05:03 2011 +0200
     4.3 @@ -68,14 +68,6 @@
     4.4                      </run-dependency>
     4.5                  </dependency>
     4.6                  <dependency>
     4.7 -                    <code-name-base>org.netbeans.modules.jackpot30.file</code-name-base>
     4.8 -                    <build-prerequisite/>
     4.9 -                    <compile-dependency/>
    4.10 -                    <run-dependency>
    4.11 -                        <implementation-version/>
    4.12 -                    </run-dependency>
    4.13 -                </dependency>
    4.14 -                <dependency>
    4.15                      <code-name-base>org.netbeans.modules.jackpot30.remoting.api</code-name-base>
    4.16                      <build-prerequisite/>
    4.17                      <compile-dependency/>
    4.18 @@ -93,6 +85,15 @@
    4.19                      </run-dependency>
    4.20                  </dependency>
    4.21                  <dependency>
    4.22 +                    <code-name-base>org.netbeans.modules.java.hints.declarative</code-name-base>
    4.23 +                    <build-prerequisite/>
    4.24 +                    <compile-dependency/>
    4.25 +                    <run-dependency>
    4.26 +                        <release-version>1</release-version>
    4.27 +                        <implementation-version/>
    4.28 +                    </run-dependency>
    4.29 +                </dependency>
    4.30 +                <dependency>
    4.31                      <code-name-base>org.netbeans.modules.java.lexer</code-name-base>
    4.32                      <build-prerequisite/>
    4.33                      <compile-dependency/>
    4.34 @@ -203,10 +204,6 @@
    4.35                          <test/>
    4.36                      </test-dependency>
    4.37                      <test-dependency>
    4.38 -                        <code-name-base>org.netbeans.modules.jackpot30.file</code-name-base>
    4.39 -                        <compile-dependency/>
    4.40 -                    </test-dependency>
    4.41 -                    <test-dependency>
    4.42                          <code-name-base>org.netbeans.modules.jackpot30.test.borrowed</code-name-base>
    4.43                          <recursive/>
    4.44                          <compile-dependency/>

     5.1 --- a/cmdline/compiler/src/org/netbeans/modules/jackpot30/compiler/HintsAnnotationProcessing.java	Mon Oct 17 15:25:39 2011 +0200
     5.2 +++ b/cmdline/compiler/src/org/netbeans/modules/jackpot30/compiler/HintsAnnotationProcessing.java	Thu Oct 20 22:05:03 2011 +0200
     5.3 @@ -64,8 +64,8 @@
     5.4  import org.netbeans.api.java.source.ClasspathInfo.PathKind;
     5.5  import org.netbeans.api.java.source.CompilationInfoHack;
     5.6  import org.netbeans.api.java.source.ModificationResult;
     5.7 -import org.netbeans.modules.jackpot30.file.DeclarativeHintRegistry;
     5.8  import org.netbeans.modules.jackpot30.impl.batch.BatchUtilities;
     5.9 +import org.netbeans.modules.java.hints.declarative.DeclarativeHintRegistry;
    5.10  import org.netbeans.modules.java.hints.jackpot.impl.JavaFixImpl;
    5.11  import org.netbeans.modules.java.hints.jackpot.impl.RulesManager;
    5.12  import org.netbeans.modules.java.hints.jackpot.impl.Utilities;

     6.1 --- a/cmdline/compiler/test/unit/src/org/netbeans/modules/jackpot30/compiler/IndexingAnnotationProcessorTest.java	Mon Oct 17 15:25:39 2011 +0200
     6.2 +++ b/cmdline/compiler/test/unit/src/org/netbeans/modules/jackpot30/compiler/IndexingAnnotationProcessorTest.java	Thu Oct 20 22:05:03 2011 +0200
     6.3 @@ -48,7 +48,7 @@
     6.4  import org.netbeans.api.java.source.Task;
     6.5  import org.netbeans.modules.jackpot30.impl.indexing.Cache;
     6.6  import org.netbeans.modules.jackpot30.impl.indexing.FileBasedIndex;
     6.7 -import org.netbeans.modules.jackpot30.file.Hacks;
     6.8 +import org.netbeans.modules.java.hints.declarative.Hacks;
     6.9  import org.netbeans.modules.java.hints.jackpot.impl.pm.BulkSearch;
    6.10  
    6.11  /**

     7.1 --- a/cmdline/lib/nbproject/project.xml	Mon Oct 17 15:25:39 2011 +0200
     7.2 +++ b/cmdline/lib/nbproject/project.xml	Thu Oct 20 22:05:03 2011 +0200
     7.3 @@ -68,14 +68,6 @@
     7.4                      </run-dependency>
     7.5                  </dependency>
     7.6                  <dependency>
     7.7 -                    <code-name-base>org.netbeans.modules.jackpot30.file</code-name-base>
     7.8 -                    <build-prerequisite/>
     7.9 -                    <compile-dependency/>
    7.10 -                    <run-dependency>
    7.11 -                        <implementation-version/>
    7.12 -                    </run-dependency>
    7.13 -                </dependency>
    7.14 -                <dependency>
    7.15                      <code-name-base>org.netbeans.modules.jackpot30.remoting.api</code-name-base>
    7.16                      <build-prerequisite/>
    7.17                      <compile-dependency/>
    7.18 @@ -197,10 +189,6 @@
    7.19                          <compile-dependency/>
    7.20                      </test-dependency>
    7.21                      <test-dependency>
    7.22 -                        <code-name-base>org.netbeans.modules.jackpot30.file</code-name-base>
    7.23 -                        <compile-dependency/>
    7.24 -                    </test-dependency>
    7.25 -                    <test-dependency>
    7.26                          <code-name-base>org.netbeans.modules.jackpot30.test.borrowed</code-name-base>
    7.27                          <recursive/>
    7.28                          <compile-dependency/>