[jsword-svn] jsword/java/jsword/org/crosswire/jsword/book/basic s

[jswordcvs at crosswire.org]

Update of /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/book/basic
In directory www.crosswire.org:/tmp/cvs-serv5088/java/jsword/org/crosswire/jsword/book/basic

Modified Files:
	DefaultBookMetaData.java AbstractBook.java 
Removed Files:
	Verifier.java 
Log Message:
Improved ranking, bible display and fixed a few bugs.

Index: DefaultBookMetaData.java
===================================================================
RCS file: /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/book/basic/DefaultBookMetaData.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** DefaultBookMetaData.java	20 Mar 2005 02:34:45 -0000	1.18
--- DefaultBookMetaData.java	1 Apr 2005 17:09:46 -0000	1.19
***************
*** 220,224 ****
          Element nameEle = factory.createCell();
          Element hiEle = factory.createHI();
!         hiEle.setAttribute("rend", "bold"); //$NON-NLS-1$ //$NON-NLS-2$
          nameEle.addContent(hiEle);
          Element valueElement = factory.createCell();
--- 220,224 ----
          Element nameEle = factory.createCell();
          Element hiEle = factory.createHI();
!         hiEle.setAttribute(OSISUtil.ATTRIBUTE_HI_TYPE, OSISUtil.HI_BOLD);
          nameEle.addContent(hiEle);
          Element valueElement = factory.createCell();

Index: AbstractBook.java
===================================================================
RCS file: /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/book/basic/AbstractBook.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** AbstractBook.java	21 Mar 2005 02:37:28 -0000	1.13
--- AbstractBook.java	1 Apr 2005 17:09:46 -0000	1.14
***************
*** 12,17 ****
--- 12,19 ----
  import org.crosswire.jsword.book.FeatureType;
  import org.crosswire.jsword.book.IndexStatus;
+ import org.crosswire.jsword.book.search.SearchRequest;
  import org.crosswire.jsword.book.search.Searcher;
  import org.crosswire.jsword.book.search.SearcherFactory;
+ import org.crosswire.jsword.book.search.basic.DefaultSearchRequest;
  import org.crosswire.jsword.passage.Key;
  import org.jdom.Document;
***************
*** 78,82 ****
       * @see org.crosswire.jsword.book.Book#find(java.lang.String)
       */
!     public Key find(String search) throws BookException
      {
          if (searcher == null)
--- 80,92 ----
       * @see org.crosswire.jsword.book.Book#find(java.lang.String)
       */
!     public Key find(String request) throws BookException
!     {
!         return find(new DefaultSearchRequest(request));
!     }
! 
!     /* (non-Javadoc)
!      * @see org.crosswire.jsword.book.Book#find(org.crosswire.jsword.book.search.SearchRequest)
!      */
!     public Key find(SearchRequest request) throws BookException
      {
          if (searcher == null)
***************
*** 92,96 ****
          }
  
!         return searcher.search(search);
      }
  
--- 102,106 ----
          }
  
!         return searcher.search(request);
      }
  

--- Verifier.java DELETED ---