1.1 --- a/remoting/server/indexer/source/nbproject/genfiles.properties Thu Jul 14 23:05:45 2011 +0200
1.2 +++ b/remoting/server/indexer/source/nbproject/genfiles.properties Tue Jul 19 14:19:05 2011 +0200
1.3 @@ -1,8 +1,8 @@
1.4 -build.xml.data.CRC32=f5dffe4b
1.5 +build.xml.data.CRC32=006ca2fd
1.6 build.xml.script.CRC32=aab17f8c
1.7 -build.xml.stylesheet.CRC32=a56c6a5b@1.47
1.8 +build.xml.stylesheet.CRC32=a56c6a5b@2.45
1.9 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
1.10 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
1.11 -nbproject/build-impl.xml.data.CRC32=f5dffe4b
1.12 +nbproject/build-impl.xml.data.CRC32=006ca2fd
1.13 nbproject/build-impl.xml.script.CRC32=279e9fd9
1.14 -nbproject/build-impl.xml.stylesheet.CRC32=238281d1@1.47
1.15 +nbproject/build-impl.xml.stylesheet.CRC32=238281d1@2.45
2.1 --- a/remoting/server/indexer/source/nbproject/project.xml Thu Jul 14 23:05:45 2011 +0200
2.2 +++ b/remoting/server/indexer/source/nbproject/project.xml Tue Jul 19 14:19:05 2011 +0200
2.3 @@ -42,15 +42,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 - <release-version>2</release-version>
2.12 - <implementation-version/>
2.13 - </run-dependency>
2.14 - </dependency>
2.15 - <dependency>
2.16 <code-name-base>org.openide.filesystems</code-name-base>
2.17 <build-prerequisite/>
2.18 <compile-dependency/>
3.1 --- a/remoting/server/indexer/source/src/org/netbeans/modules/jackpot30/indexer/source/SourceIndexer.java Thu Jul 14 23:05:45 2011 +0200
3.2 +++ b/remoting/server/indexer/source/src/org/netbeans/modules/jackpot30/indexer/source/SourceIndexer.java Tue Jul 19 14:19:05 2011 +0200
3.3 @@ -55,14 +55,11 @@
3.4 import org.apache.lucene.document.Field.Store;
3.5 import org.netbeans.api.editor.mimelookup.MimeRegistration;
3.6 import org.netbeans.modules.jackpot30.backend.impl.spi.IndexAccessor;
3.7 -import org.netbeans.modules.parsing.lucene.support.DocumentIndex;
3.8 -import org.netbeans.modules.parsing.lucene.support.IndexManager;
3.9 import org.netbeans.modules.parsing.spi.indexing.Context;
3.10 import org.netbeans.modules.parsing.spi.indexing.CustomIndexer;
3.11 import org.netbeans.modules.parsing.spi.indexing.CustomIndexerFactory;
3.12 import org.netbeans.modules.parsing.spi.indexing.Indexable;
3.13 import org.openide.filesystems.FileObject;
3.14 -import org.openide.filesystems.FileUtil;
3.15 import org.openide.filesystems.URLMapper;
3.16
3.17 /**
3.18 @@ -137,17 +134,19 @@
3.19
3.20 @Override
3.21 public void filesDeleted(Iterable<? extends Indexable> deleted, Context context) {
3.22 - try {
3.23 - DocumentIndex idx = IndexManager.createDocumentIndex(FileUtil.toFile(context.getIndexFolder()));
3.24 -
3.25 - for (Indexable i : deleted) {
3.26 - idx.removeDocument(i.getRelativePath());
3.27 - }
3.28 -
3.29 - idx.close();
3.30 - } catch (IOException ex) {
3.31 - Logger.getLogger(SourceIndexer.class.getName()).log(Level.SEVERE, null, ex);
3.32 - }
3.33 + assert !deleted.iterator().hasNext();
3.34 + //TODO: ability to delete from the index:
3.35 +// try {
3.36 +// DocumentIndex idx = IndexManager.createDocumentIndex(FileUtil.toFile(context.getIndexFolder()));
3.37 +//
3.38 +// for (Indexable i : deleted) {
3.39 +// idx.removeDocument(i.getRelativePath());
3.40 +// }
3.41 +//
3.42 +// idx.close();
3.43 +// } catch (IOException ex) {
3.44 +// Logger.getLogger(SourceIndexer.class.getName()).log(Level.SEVERE, null, ex);
3.45 +// }
3.46 }
3.47
3.48 @Override
4.1 --- a/remoting/server/indexer/usages/nbproject/genfiles.properties Thu Jul 14 23:05:45 2011 +0200
4.2 +++ b/remoting/server/indexer/usages/nbproject/genfiles.properties Tue Jul 19 14:19:05 2011 +0200
4.3 @@ -1,8 +1,8 @@
4.4 -build.xml.data.CRC32=615c50ac
4.5 +build.xml.data.CRC32=81ab83b5
4.6 build.xml.script.CRC32=4ae79e41
4.7 -build.xml.stylesheet.CRC32=a56c6a5b@1.47
4.8 +build.xml.stylesheet.CRC32=a56c6a5b@2.45
4.9 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
4.10 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
4.11 -nbproject/build-impl.xml.data.CRC32=615c50ac
4.12 +nbproject/build-impl.xml.data.CRC32=81ab83b5
4.13 nbproject/build-impl.xml.script.CRC32=16d3b827
4.14 -nbproject/build-impl.xml.stylesheet.CRC32=238281d1@1.47
4.15 +nbproject/build-impl.xml.stylesheet.CRC32=238281d1@2.45
5.1 --- a/remoting/server/indexer/usages/nbproject/project.xml Thu Jul 14 23:05:45 2011 +0200
5.2 +++ b/remoting/server/indexer/usages/nbproject/project.xml Tue Jul 19 14:19:05 2011 +0200
5.3 @@ -67,15 +67,6 @@
5.4 </run-dependency>
5.5 </dependency>
5.6 <dependency>
5.7 - <code-name-base>org.netbeans.modules.parsing.lucene</code-name-base>
5.8 - <build-prerequisite/>
5.9 - <compile-dependency/>
5.10 - <run-dependency>
5.11 - <release-version>2</release-version>
5.12 - <implementation-version/>
5.13 - </run-dependency>
5.14 - </dependency>
5.15 - <dependency>
5.16 <code-name-base>org.openide.filesystems</code-name-base>
5.17 <build-prerequisite/>
5.18 <compile-dependency/>