Removing dependency on org.netbeans.modules.parsing.lucene, so that borrowedtests are compilable again.
1.1 --- a/borrowedtests/nbproject/genfiles.properties Sun Apr 24 19:55:34 2011 +0200
1.2 +++ b/borrowedtests/nbproject/genfiles.properties Mon Apr 25 16:15:35 2011 +0200
1.3 @@ -3,6 +3,6 @@
1.4 build.xml.stylesheet.CRC32=79c3b980@1.28.0.7
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=4bf510a9
1.8 +nbproject/build-impl.xml.data.CRC32=7b8d1111
1.9 nbproject/build-impl.xml.script.CRC32=c6833bcb
1.10 -nbproject/build-impl.xml.stylesheet.CRC32=238281d1@1.44
1.11 +nbproject/build-impl.xml.stylesheet.CRC32=238281d1@1.46
2.1 --- a/borrowedtests/nbproject/project.xml Sun Apr 24 19:55:34 2011 +0200
2.2 +++ b/borrowedtests/nbproject/project.xml Mon Apr 25 16:15:35 2011 +0200
2.3 @@ -166,14 +166,6 @@
2.4 </run-dependency>
2.5 </dependency>
2.6 <dependency>
2.7 - <code-name-base>org.netbeans.modules.parsing.lucene</code-name-base>
2.8 - <build-prerequisite/>
2.9 - <compile-dependency/>
2.10 - <run-dependency>
2.11 - <implementation-version/>
2.12 - </run-dependency>
2.13 - </dependency>
2.14 - <dependency>
2.15 <code-name-base>org.netbeans.modules.projectapi</code-name-base>
2.16 <build-prerequisite/>
2.17 <compile-dependency/>
3.1 --- a/borrowedtests/src/org/netbeans/api/java/source/TestUtilities.java Sun Apr 24 19:55:34 2011 +0200
3.2 +++ b/borrowedtests/src/org/netbeans/api/java/source/TestUtilities.java Mon Apr 25 16:15:35 2011 +0200
3.3 @@ -65,7 +65,7 @@
3.4 import org.netbeans.modules.java.source.usages.ClassIndexImpl;
3.5 import org.netbeans.modules.java.source.usages.ClassIndexManager;
3.6 import org.netbeans.modules.java.source.usages.IndexUtil;
3.7 -import org.netbeans.modules.parsing.lucene.support.IndexManager.Action;
3.8 +//import org.netbeans.modules.parsing.lucene.support.IndexManager.Action;
3.9 import org.netbeans.spi.java.classpath.support.ClassPathSupport;
3.10 import org.openide.filesystems.FileObject;
3.11 import org.openide.filesystems.FileUtil;
3.12 @@ -234,30 +234,30 @@
3.13
3.14 private static final ClassPath EMPTY = ClassPathSupport.createClassPath(new URL[0]);
3.15
3.16 - /**
3.17 - * Prepare Java caches for given binary roots.
3.18 - *
3.19 - * @param urls to analyze
3.20 - */
3.21 - public final static void analyzeBinaries(final Collection<URL> urls) throws IOException {
3.22 - final ClasspathInfo cpInfo = ClasspathInfo.create(EMPTY, EMPTY, EMPTY);
3.23 - final ClassIndexManager mgr = ClassIndexManager.getDefault();
3.24 - final JavaSource js = JavaSource.create(cpInfo);
3.25 - js.runUserActionTask(new Task<CompilationController>() {
3.26 - public void run(CompilationController parameter) throws Exception {
3.27 - for (final URL url : urls) {
3.28 - final ClassIndexImpl cii = mgr.createUsagesQuery(url, false);
3.29 - ClassIndexManager.getDefault().writeLock(new Action<Void>() {
3.30 - public Void run() throws IOException, InterruptedException {
3.31 - BinaryAnalyser ba = cii.getBinaryAnalyser();
3.32 - ba.start(url, new AtomicBoolean(false), new AtomicBoolean(false));
3.33 - ba.finish();
3.34 - return null;
3.35 - }
3.36 - });
3.37 - }
3.38 - }
3.39 - }, true);
3.40 - }
3.41 +// /**
3.42 +// * Prepare Java caches for given binary roots.
3.43 +// *
3.44 +// * @param urls to analyze
3.45 +// */
3.46 +// public final static void analyzeBinaries(final Collection<URL> urls) throws IOException {
3.47 +// final ClasspathInfo cpInfo = ClasspathInfo.create(EMPTY, EMPTY, EMPTY);
3.48 +// final ClassIndexManager mgr = ClassIndexManager.getDefault();
3.49 +// final JavaSource js = JavaSource.create(cpInfo);
3.50 +// js.runUserActionTask(new Task<CompilationController>() {
3.51 +// public void run(CompilationController parameter) throws Exception {
3.52 +// for (final URL url : urls) {
3.53 +// final ClassIndexImpl cii = mgr.createUsagesQuery(url, false);
3.54 +// ClassIndexManager.getDefault().writeLock(new Action<Void>() {
3.55 +// public Void run() throws IOException, InterruptedException {
3.56 +// BinaryAnalyser ba = cii.getBinaryAnalyser();
3.57 +// ba.start(url, new AtomicBoolean(false), new AtomicBoolean(false));
3.58 +// ba.finish();
3.59 +// return null;
3.60 +// }
3.61 +// });
3.62 +// }
3.63 +// }
3.64 +// }, true);
3.65 +// }
3.66
3.67 }