[jsword-svn] jsword/java/jsword/org/crosswire/jsword/book s
jswordcvs at crosswire.org
jswordcvs at crosswire.org
Fri Apr 1 10:09:48 MST 2005
Update of /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/book
In directory www.crosswire.org:/tmp/cvs-serv5088/java/jsword/org/crosswire/jsword/book
Modified Files:
Books.java Book.java OSISUtil.java
Removed Files:
Openness.java Strongs.java Translation.java StudyTool.java
Log Message:
Improved ranking, bible display and fixed a few bugs.
Index: OSISUtil.java
===================================================================
RCS file: /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/book/OSISUtil.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** OSISUtil.java 4 Mar 2005 04:04:47 -0000 1.11
--- OSISUtil.java 1 Apr 2005 17:09:46 -0000 1.12
***************
*** 132,136 ****
public static final String ATTRIBUTE_DIV_OSISID = "osisID"; //$NON-NLS-1$
public static final String ATTRIBUTE_W_LEMMA = "lemma"; //$NON-NLS-1$
! public static final String ATTRIBUTE_HI_REND = "rend"; //$NON-NLS-1$
public static final String ATTRIBUTE_SEG_TYPE = "type"; //$NON-NLS-1$
public static final String ATTRIBUTE_REFERENCE_OSISREF = "osisRef"; //$NON-NLS-1$
--- 132,136 ----
public static final String ATTRIBUTE_DIV_OSISID = "osisID"; //$NON-NLS-1$
public static final String ATTRIBUTE_W_LEMMA = "lemma"; //$NON-NLS-1$
! public static final String ATTRIBUTE_HI_TYPE = "rend"; //$NON-NLS-1$
public static final String ATTRIBUTE_SEG_TYPE = "type"; //$NON-NLS-1$
public static final String ATTRIBUTE_REFERENCE_OSISREF = "osisRef"; //$NON-NLS-1$
--- Strongs.java DELETED ---
--- StudyTool.java DELETED ---
Index: Book.java
===================================================================
RCS file: /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/book/Book.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** Book.java 19 Mar 2005 01:56:47 -0000 1.22
--- Book.java 1 Apr 2005 17:09:46 -0000 1.23
***************
*** 2,5 ****
--- 2,6 ----
import org.crosswire.common.activate.Activatable;
+ import org.crosswire.jsword.book.search.SearchRequest;
import org.crosswire.jsword.passage.Key;
import org.crosswire.jsword.passage.KeyFactory;
***************
*** 9,13 ****
* either as an XML document or as plain text - It uses Keys to refer
* to parts of itself, and can search for words (returning Keys).
! *
* <p><table border='1' cellPadding='3' cellSpacing='0'>
* <tr><td bgColor='white' class='TableRowColor'><font size='-7'>
--- 10,14 ----
* either as an XML document or as plain text - It uses Keys to refer
* to parts of itself, and can search for words (returning Keys).
! *
* <p><table border='1' cellPadding='3' cellSpacing='0'>
* <tr><td bgColor='white' class='TableRowColor'><font size='-7'>
***************
*** 65,71 ****
* If there are no matches then null should be returned, otherwise a valid
* Key.
! * @param search The search spec.
* @throws BookException If anything goes wrong with this method
*/
! public Key find(String search) throws BookException;
}
--- 66,81 ----
* If there are no matches then null should be returned, otherwise a valid
* Key.
! * @param request The search spec.
* @throws BookException If anything goes wrong with this method
*/
! public Key find(SearchRequest request) throws BookException;
!
! /**
! * Retrieval: For a given search spec find a list of references to it.
! * If there are no matches then null should be returned, otherwise a valid
! * Key.
! * @param request The search spec.
! * @throws BookException If anything goes wrong with this method
! */
! public Key find(String request) throws BookException;
}
--- Translation.java DELETED ---
Index: Books.java
===================================================================
RCS file: /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/book/Books.java,v
retrieving revision 1.41
retrieving revision 1.42
diff -C2 -d -r1.41 -r1.42
*** Books.java 23 Mar 2005 02:05:38 -0000 1.41
--- Books.java 1 Apr 2005 17:09:46 -0000 1.42
***************
*** 19,23 ****
* The Bibles class (along with Bible) is the central point of contact
* between the rest of the world and this set of packages.
! *
* <p><table border='1' cellPadding='3' cellSpacing='0'>
* <tr><td bgColor='white' class='TableRowColor'><font size='-7'>
--- 19,23 ----
* The Bibles class (along with Bible) is the central point of contact
* between the rest of the world and this set of packages.
! *
* <p><table border='1' cellPadding='3' cellSpacing='0'>
* <tr><td bgColor='white' class='TableRowColor'><font size='-7'>
***************
*** 256,260 ****
}
}
!
// Remove the books from the previous version of the driver
// that are not in this version.
--- 256,260 ----
}
}
!
// Remove the books from the previous version of the driver
// that are not in this version.
***************
*** 262,266 ****
while (iter.hasNext())
{
! removeBook((Book)iter.next());
}
--- 262,266 ----
while (iter.hasNext())
{
! removeBook((Book) iter.next());
}
***************
*** 398,403 ****
{
Method driverInstance = types[i].getMethod("instance", new Class[0]); //$NON-NLS-1$
! // Object retval = driverInstance.invoke(null, new Object[0]);
! BookDriver driver = (BookDriver) driverInstance.invoke(null, new Object[0]);//types[i].newInstance();
registerDriver(driver);
}
--- 398,403 ----
{
Method driverInstance = types[i].getMethod("instance", new Class[0]); //$NON-NLS-1$
! // Object retval = driverInstance.invoke(null, new Object[0]);
! BookDriver driver = (BookDriver) driverInstance.invoke(null, new Object[0]); //types[i].newInstance();
registerDriver(driver);
}
--- Openness.java DELETED ---
More information about the jsword-svn
mailing list