1.1 --- a/api/nbproject/genfiles.properties Sun Jan 23 16:49:34 2011 +0100
1.2 +++ b/api/nbproject/genfiles.properties Tue Jan 25 19:49:03 2011 +0100
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=d6395e19
1.8 +nbproject/build-impl.xml.data.CRC32=d3577afd
1.9 nbproject/build-impl.xml.script.CRC32=c4574e66
1.10 nbproject/build-impl.xml.stylesheet.CRC32=238281d1@1.44
2.1 --- a/api/nbproject/project.xml Sun Jan 23 16:49:34 2011 +0100
2.2 +++ b/api/nbproject/project.xml Tue Jan 25 19:49:03 2011 +0100
2.3 @@ -64,8 +64,8 @@
2.4 <build-prerequisite/>
2.5 <compile-dependency/>
2.6 <run-dependency>
2.7 - <release-version>1</release-version>
2.8 - <specification-version>2.6.0.232</specification-version>
2.9 + <release-version>1-3</release-version>
2.10 + <specification-version>2.13</specification-version>
2.11 </run-dependency>
2.12 </dependency>
2.13 <dependency>
3.1 --- a/api/src/org/netbeans/modules/jackpot30/impl/indexing/AbstractLuceneIndex.java Sun Jan 23 16:49:34 2011 +0100
3.2 +++ b/api/src/org/netbeans/modules/jackpot30/impl/indexing/AbstractLuceneIndex.java Tue Jan 25 19:49:03 2011 +0100
3.3 @@ -62,6 +62,7 @@
3.4 import javax.lang.model.type.TypeMirror;
3.5 import org.apache.lucene.analysis.Token;
3.6 import org.apache.lucene.analysis.TokenStream;
3.7 +import org.apache.lucene.analysis.tokenattributes.TermAttribute;
3.8 import org.apache.lucene.document.CompressionTools;
3.9 import org.apache.lucene.document.Document;
3.10 import org.apache.lucene.document.Field;
3.11 @@ -351,19 +352,23 @@
3.12 public static final class TokenStreamImpl extends TokenStream {
3.13
3.14 private final Iterator<? extends String> tokens;
3.15 + private final TermAttribute termAtt;
3.16
3.17 public TokenStreamImpl(Iterable<? extends String> tokens) {
3.18 this.tokens = tokens != null ? tokens.iterator() : /*???*/Collections.<String>emptyList().iterator();
3.19 + this.termAtt = addAttribute(TermAttribute.class);
3.20 }
3.21
3.22 @Override
3.23 - public Token next() throws IOException {
3.24 + public boolean incrementToken() throws IOException {
3.25 if (!tokens.hasNext())
3.26 - return null;
3.27 + return false;
3.28
3.29 String t = tokens.next();
3.30
3.31 - return new Token(t, 0, t.length());
3.32 + termAtt.setTermBuffer(t);
3.33 +
3.34 + return true;
3.35 }
3.36 }
3.37
4.1 --- a/borrowedtests/nbproject/genfiles.properties Sun Jan 23 16:49:34 2011 +0100
4.2 +++ b/borrowedtests/nbproject/genfiles.properties Tue Jan 25 19:49:03 2011 +0100
4.3 @@ -3,6 +3,6 @@
4.4 build.xml.stylesheet.CRC32=79c3b980@1.28.0.7
4.5 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
4.6 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
4.7 -nbproject/build-impl.xml.data.CRC32=71327745
4.8 +nbproject/build-impl.xml.data.CRC32=174274f8
4.9 nbproject/build-impl.xml.script.CRC32=c6833bcb
4.10 nbproject/build-impl.xml.stylesheet.CRC32=238281d1@1.44
5.1 --- a/borrowedtests/nbproject/project.xml Sun Jan 23 16:49:34 2011 +0100
5.2 +++ b/borrowedtests/nbproject/project.xml Tue Jan 25 19:49:03 2011 +0100
5.3 @@ -72,8 +72,8 @@
5.4 <build-prerequisite/>
5.5 <compile-dependency/>
5.6 <run-dependency>
5.7 - <release-version>1</release-version>
5.8 - <specification-version>2.13.0.232</specification-version>
5.9 + <release-version>1-3</release-version>
5.10 + <specification-version>2.13</specification-version>
5.11 </run-dependency>
5.12 </dependency>
5.13 <dependency>
6.1 --- a/borrowedtests/src/org/netbeans/api/java/source/SourceUtilsTestUtil2.java Sun Jan 23 16:49:34 2011 +0100
6.2 +++ b/borrowedtests/src/org/netbeans/api/java/source/SourceUtilsTestUtil2.java Tue Jan 25 19:49:03 2011 +0100
6.3 @@ -74,7 +74,7 @@
6.4 }
6.5
6.6 public static void disableLocks() {
6.7 - FSDirectory.setDisableLocks(true);
6.8 +// FSDirectory.setDisableLocks(true);
6.9 }
6.10
6.11 }
7.1 --- a/libs.jerig/nbproject/genfiles.properties Sun Jan 23 16:49:34 2011 +0100
7.2 +++ b/libs.jerig/nbproject/genfiles.properties Tue Jan 25 19:49:03 2011 +0100
7.3 @@ -3,6 +3,6 @@
7.4 build.xml.stylesheet.CRC32=79c3b980@1.29.0.7
7.5 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
7.6 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
7.7 -nbproject/build-impl.xml.data.CRC32=82ad5887
7.8 +nbproject/build-impl.xml.data.CRC32=ae0e6070
7.9 nbproject/build-impl.xml.script.CRC32=0184319b
7.10 -nbproject/build-impl.xml.stylesheet.CRC32=238281d1@1.43
7.11 +nbproject/build-impl.xml.stylesheet.CRC32=238281d1@1.44
8.1 --- a/libs.jerig/nbproject/project.xml Sun Jan 23 16:49:34 2011 +0100
8.2 +++ b/libs.jerig/nbproject/project.xml Tue Jan 25 19:49:03 2011 +0100
8.3 @@ -11,8 +11,8 @@
8.4 <build-prerequisite/>
8.5 <compile-dependency/>
8.6 <run-dependency>
8.7 - <release-version>1</release-version>
8.8 - <specification-version>2.6.0.232</specification-version>
8.9 + <release-version>1-3</release-version>
8.10 + <specification-version>2.13</specification-version>
8.11 </run-dependency>
8.12 </dependency>
8.13 </module-dependencies>