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

[jswordcvs at crosswire.org]

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

Modified Files:
	ReadingsBook.java ReadingsBookDriver.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: ReadingsBook.java
===================================================================
RCS file: /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/book/readings/ReadingsBook.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** ReadingsBook.java	5 Oct 2004 22:03:09 -0000	1.22
--- ReadingsBook.java	19 Mar 2005 01:56:47 -0000	1.23
***************
*** 64,68 ****
      public ReadingsBook(ReadingsBookDriver driver, String name, BookType type)
      {
!         BookMetaData bmd = new DefaultBookMetaData(driver, this, name, type);
          setBookMetaData(bmd);
  
--- 64,68 ----
      public ReadingsBook(ReadingsBookDriver driver, String name, BookType type)
      {
!         BookMetaData bmd = new DefaultBookMetaData(driver, name, type);
          setBookMetaData(bmd);
  

Index: ReadingsBookDriver.java
===================================================================
RCS file: /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/book/readings/ReadingsBookDriver.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** ReadingsBookDriver.java	5 Oct 2004 22:03:09 -0000	1.12
--- ReadingsBookDriver.java	19 Mar 2005 01:56:47 -0000	1.13
***************
*** 8,12 ****
  import org.crosswire.common.util.URLFilter;
  import org.crosswire.jsword.book.Book;
- import org.crosswire.jsword.book.BookMetaData;
  import org.crosswire.jsword.book.BookType;
  import org.crosswire.jsword.book.basic.AbstractBookDriver;
--- 8,11 ----
***************
*** 43,57 ****
      public ReadingsBookDriver()
      {
!         Book[] books = new Book[]
          {
              new ReadingsBook(this, Msg.TITLE.toString(), BookType.DICTIONARY),
          };
- 
-         bmds = new BookMetaData[books.length];
- 
-         for (int i = 0; i < books.length; i++)
-         {
-             bmds[i] = books[i].getBookMetaData();
-         }
      }
  
--- 42,49 ----
      public ReadingsBookDriver()
      {
!         books = new Book[]
          {
              new ReadingsBook(this, Msg.TITLE.toString(), BookType.DICTIONARY),
          };
      }
  
***************
*** 59,65 ****
       * @see org.crosswire.jsword.book.BookDriver#getBooks()
       */
!     public BookMetaData[] getBookMetaDatas()
      {
!         return bmds;
      }
  
--- 51,57 ----
       * @see org.crosswire.jsword.book.BookDriver#getBooks()
       */
!     public Book[] getBooks()
      {
!         return books;
      }
  
***************
*** 75,79 ****
       * The meta data array
       */
!     private BookMetaData[] bmds;
  
      /**
--- 67,71 ----
       * The meta data array
       */
!     private Book[] books;
  
      /**