[Xapian-commits] 7866: branches/0.9/xapian-bindings/ branches/0.9/xapian-bindings/java/ branches/0.9/xapian-bindings/java/native/ branches/0.9/xapian-bindings/java/org/xapian/

olly xapian-commits at lists.xapian.org
Sun Mar 4 17:26:23 GMT 2007


SVN root:       svn://svn.xapian.org/xapian
Changes by:     olly
Revision:       7866
Date:           2007-03-04 17:26:22 +0000 (Sun, 04 Mar 2007)

Log message (34 lines):
Backport lots of java fixes from trunk:
java/SmokeTest.java,java/org/xapian/RSet.java: Add missing default
constructor for RSet class - it's not much use without this!
java/SmokeTest.java,java/native/Enquire.cc,
java/org/xapian/Enquire.java: Fit Enquire.getESet() to be callable.
java/org/xapian/ESetIterator.java: Fix bug in ESetIterator.hasNext()
reported by Alex Kushkuley.
java/SmokeTest.java: Add regression test.
java/native/Enquire.cc: Fix MatchDecider and ExpandDecider to look
for an "accept" method with the correct signature (bool return value
not int).  Reported by Alex Kushkuley.
java/native/Enquire.cc: Fix MatchDecider to work.
java/SmokeTest.java: Add feature/regression test for MatchDecider
subclassing.
java/SmokeTest.java: Add feature/regression test for ExpandDecider
which also now works thanks to the last checkin.
java/Makefile.am: "make clean" now needs to remove
MyMatchDecider.class and MyExpandDecider.class which are generated
from SmokeTest.java.
java/SmokeTest.java: Check getData() on the document in
MyMatchDecider returns a non-empty string to make sure we are really
getting the right document and not an empty document.
java/native/Query.cc: Release the array in the "Query from array"
ctor to avoid a memory leak.  Partly fixes bug#105.
java/native/Enquire.cc,java/native/org_xapian_XapianJNI.h,
java/org/xapian/Enquire.java,java/org/xapian/XapianJNI.java:
Enquire::getQuery() is implemented entirely in Java, so strip out
the unused MyQuery mechanism, and so fix a memory link which it
caused.  Fixes the rest of bug#105.
java/SmokeTest.java: Add feature test for Enquire::getQuery().
java/native/org_xapian_XapianJNI.h,java/native/xapian_jni.h:
Move header guards to surround the entire non-comment contents
of the header files, which allows the compiler to optimise
multiple inclusion (at least GCC does this).

Modified files:
U   branches/0.9/xapian-bindings/ChangeLog
U   branches/0.9/xapian-bindings/java/Makefile.am
U   branches/0.9/xapian-bindings/java/SmokeTest.java
U   branches/0.9/xapian-bindings/java/native/Enquire.cc
U   branches/0.9/xapian-bindings/java/native/Query.cc
U   branches/0.9/xapian-bindings/java/native/org_xapian_XapianJNI.h
U   branches/0.9/xapian-bindings/java/native/xapian_jni.h
U   branches/0.9/xapian-bindings/java/org/xapian/ESetIterator.java
U   branches/0.9/xapian-bindings/java/org/xapian/Enquire.java
U   branches/0.9/xapian-bindings/java/org/xapian/RSet.java
U   branches/0.9/xapian-bindings/java/org/xapian/XapianJNI.java

Links:
http://xapian.org/C?7866
http://xapian.org/C?7866?branches/0.9/xapian-bindings/ChangeLog
http://xapian.org/C?7866?branches/0.9/xapian-bindings/java/Makefile.am
http://xapian.org/C?7866?branches/0.9/xapian-bindings/java/SmokeTest.java
http://xapian.org/C?7866?branches/0.9/xapian-bindings/java/native/Enquire.cc
http://xapian.org/C?7866?branches/0.9/xapian-bindings/java/native/Query.cc
http://xapian.org/C?7866?branches/0.9/xapian-bindings/java/native/org_xapian_XapianJNI.h
http://xapian.org/C?7866?branches/0.9/xapian-bindings/java/native/xapian_jni.h
http://xapian.org/C?7866?branches/0.9/xapian-bindings/java/org/xapian/ESetIterator.java
http://xapian.org/C?7866?branches/0.9/xapian-bindings/java/org/xapian/Enquire.java
http://xapian.org/C?7866?branches/0.9/xapian-bindings/java/org/xapian/RSet.java
http://xapian.org/C?7866?branches/0.9/xapian-bindings/java/org/xapian/XapianJNI.java



More information about the Xapian-commits mailing list