Revision: 7777
http://languagetool.svn.sourceforge.net/languagetool/?rev=7777&view=rev
Author: dnaber
Date: 2012-07-29 17:56:45 +0000 (Sun, 29 Jul 2012)
Log Message:
-----------
update to Lucene 3.6.1 (not relevant for runtime); also requires a junit update
to 4.10
Modified Paths:
--------------
trunk/JLanguageTool/build.properties
trunk/JLanguageTool/libs/build/junit.jar
trunk/JLanguageTool/src/dev/org/languagetool/dev/index/RigidNearSpansOrdered.java
trunk/JLanguageTool/src/dev/org/languagetool/dev/index/Searcher.java
Added Paths:
-----------
trunk/JLanguageTool/libs/lucene-core-3.6.1.jar
trunk/JLanguageTool/libs/lucene-queries-3.6.1.jar
trunk/JLanguageTool/libs/lucene-test-framework-3.6.1.jar
Removed Paths:
-------------
trunk/JLanguageTool/libs/lucene-core-3.1.0.jar
trunk/JLanguageTool/libs/lucene-queries-3.1.0.jar
trunk/JLanguageTool/libs/lucene-test-framework-3.1.0.jar
Modified: trunk/JLanguageTool/build.properties
===================================================================
--- trunk/JLanguageTool/build.properties 2012-07-29 13:27:15 UTC (rev
7776)
+++ trunk/JLanguageTool/build.properties 2012-07-29 17:56:45 UTC (rev
7777)
@@ -46,9 +46,9 @@
jna.lib = jna.jar
ext.jna.lib = ${ext.dir}/${jna.lib}
-ext.lucene-core.lib = ${ext.dir}/lucene-core-3.1.0.jar
-ext.lucene-queries.lib = ${ext.dir}/lucene-queries-3.1.0.jar
-ext.lucene-test-framework.lib = ${ext.dir}/lucene-test-framework-3.1.0.jar
+ext.lucene-core.lib = ${ext.dir}/lucene-core-3.6.1.jar
+ext.lucene-queries.lib = ${ext.dir}/lucene-queries-3.6.1.jar
+ext.lucene-test-framework.lib = ${ext.dir}/lucene-test-framework-3.6.1.jar
ext.jakarta-regex.lib = ${ext.dir}/jakarta-regexp-1.4.jar
ext.sweble.engine =
${ext.dir}/swc-engine-1.0.1-SNAPSHOT-jar-with-dependencies.jar
Modified: trunk/JLanguageTool/libs/build/junit.jar
===================================================================
(Binary files differ)
Deleted: trunk/JLanguageTool/libs/lucene-core-3.1.0.jar
===================================================================
(Binary files differ)
Added: trunk/JLanguageTool/libs/lucene-core-3.6.1.jar
===================================================================
(Binary files differ)
Property changes on: trunk/JLanguageTool/libs/lucene-core-3.6.1.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Deleted: trunk/JLanguageTool/libs/lucene-queries-3.1.0.jar
===================================================================
(Binary files differ)
Added: trunk/JLanguageTool/libs/lucene-queries-3.6.1.jar
===================================================================
(Binary files differ)
Property changes on: trunk/JLanguageTool/libs/lucene-queries-3.6.1.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Deleted: trunk/JLanguageTool/libs/lucene-test-framework-3.1.0.jar
===================================================================
(Binary files differ)
Added: trunk/JLanguageTool/libs/lucene-test-framework-3.6.1.jar
===================================================================
(Binary files differ)
Property changes on: trunk/JLanguageTool/libs/lucene-test-framework-3.6.1.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified:
trunk/JLanguageTool/src/dev/org/languagetool/dev/index/RigidNearSpansOrdered.java
===================================================================
---
trunk/JLanguageTool/src/dev/org/languagetool/dev/index/RigidNearSpansOrdered.java
2012-07-29 13:27:15 UTC (rev 7776)
+++
trunk/JLanguageTool/src/dev/org/languagetool/dev/index/RigidNearSpansOrdered.java
2012-07-29 17:56:45 UTC (rev 7777)
@@ -50,7 +50,7 @@
private int matchStart = -1;
private int matchEnd = -1;
- private List<byte[]> matchPayload;
+ private final List<byte[]> matchPayload;
private final Spans[] subSpansByDoc;
@@ -60,7 +60,7 @@
}
};
- private RigidSpanNearQuery query;
+ private final RigidSpanNearQuery query;
private boolean collectPayloads = true;
@@ -215,7 +215,7 @@
* @return true iff spans1 starts before spans2 or the spans start at the
same position, and
* spans1 ends before spans2.
*/
- static final boolean docSpansOrdered(Spans spans1, Spans spans2, int
allowedSlop) {
+ static boolean docSpansOrdered(Spans spans1, Spans spans2, int allowedSlop) {
assert spans1.doc() == spans2.doc() : "doc1 " + spans1.doc() + " != doc2 "
+ spans2.doc();
final int start1 = spans1.start();
final int start2 = spans2.start();
@@ -229,9 +229,9 @@
}
/**
- * Like {@link #docSpansOrdered(Spans,Spans)}, but use the spans starts and
ends as parameters.
+ * Like {@link #docSpansOrdered(Spans,Spans,int)}, but use the spans starts
and ends as parameters.
*/
- private static final boolean docSpansOrdered(int start1, int end1, int
start2, int end2,
+ private static boolean docSpansOrdered(int start1, int end1, int start2, int
end2,
int allowedSlop) {
if (allowedSlop == 0) {
return (start1 == start2) ? (end1 <= end2) : (start1 < start2);
Modified: trunk/JLanguageTool/src/dev/org/languagetool/dev/index/Searcher.java
===================================================================
--- trunk/JLanguageTool/src/dev/org/languagetool/dev/index/Searcher.java
2012-07-29 13:27:15 UTC (rev 7776)
+++ trunk/JLanguageTool/src/dev/org/languagetool/dev/index/Searcher.java
2012-07-29 17:56:45 UTC (rev 7777)
@@ -33,6 +33,7 @@
import org.apache.lucene.search.TopDocs;
import org.apache.lucene.search.TopFieldCollector;
import org.apache.lucene.store.FSDirectory;
+import org.apache.lucene.util.Counter;
import org.languagetool.JLanguageTool;
import org.languagetool.Language;
import org.languagetool.rules.Rule;
@@ -99,7 +100,7 @@
private PossiblyLimitedTopDocs getTopDocs(IndexSearcher indexSearcher,
PossiblyRelaxedQuery query, Sort sort) throws IOException {
final TopFieldCollector topCollector = TopFieldCollector.create(sort,
maxHits, true, false, false, false);
- final TimeLimitingCollector collector = new
TimeLimitingCollector(topCollector, maxSearchTimeMillis);
+ final TimeLimitingCollector collector = new
TimeLimitingCollector(topCollector, Counter.newCounter(), maxSearchTimeMillis);
boolean timeLimitActivated = false;
try {
indexSearcher.search(query.query, collector);
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
Languagetool-cvs mailing list
Languagetool-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/languagetool-cvs
