[jsword-svn] jsword/java/jswordtest s

[jswordcvs at crosswire.org]

Update of /cvs/jsword/jsword/java/jswordtest
In directory www.crosswire.org:/tmp/cvs-serv10359/java/jswordtest

Modified Files:
	Bench.java 
Log Message:
Made Book the primary interface to a module and put BookMetaData within it. All of BookMetaData is accessible through the Book interface.

Index: Bench.java
===================================================================
RCS file: /cvs/jsword/jsword/java/jswordtest/Bench.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** Bench.java	9 Apr 2004 13:39:42 -0000	1.10
--- Bench.java	19 Mar 2005 01:56:47 -0000	1.11
***************
*** 5,9 ****
  import org.crosswire.jsword.book.Book;
  import org.crosswire.jsword.book.BookFilters;
- import org.crosswire.jsword.book.BookMetaData;
  import org.crosswire.jsword.book.Books;
  import org.crosswire.jsword.book.test.Speed;
--- 5,8 ----
***************
*** 51,57 ****
          try
          {
!             List dicts = Books.installed().getBookMetaDatas(BookFilters.getBibles());
!             BookMetaData bmd = (BookMetaData) dicts.get(0);
!             version = bmd.getBook();
          }
          catch (Exception ex)
--- 50,55 ----
          try
          {
!             List dicts = Books.installed().getBooks(BookFilters.getBibles());
!             version = (Book) dicts.get(0);
          }
          catch (Exception ex)
***************
*** 97,105 ****
      {
          System.out.println("  Available versions:"); //$NON-NLS-1$
!         List lbmds = Books.installed().getBookMetaDatas();
          for (Iterator it = lbmds.iterator(); it.hasNext();)
          {
!             BookMetaData bmd = (BookMetaData) it.next();
!             System.out.println("    " + bmd.getName()); //$NON-NLS-1$
          }
      }
--- 95,103 ----
      {
          System.out.println("  Available versions:"); //$NON-NLS-1$
!         List lbmds = Books.installed().getBooks();
          for (Iterator it = lbmds.iterator(); it.hasNext();)
          {
!             Book book = (Book) it.next();
!             System.out.println("    " + book.getName()); //$NON-NLS-1$
          }
      }