[jsword-svn] jsword/java/limbo/org/crosswire/jsword/book/stub s

[jswordcvs at crosswire.org]

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

Modified Files:
	StubDictionary.java StubBookDriver.java StubBook.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: StubBook.java
===================================================================
RCS file: /cvs/jsword/jsword/java/limbo/org/crosswire/jsword/book/stub/StubBook.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** StubBook.java	5 Oct 2004 22:03:09 -0000	1.4
--- StubBook.java	19 Mar 2005 01:56:47 -0000	1.5
***************
*** 43,47 ****
      public StubBook(StubBookDriver driver, String name, BookType type)
      {
!         BookMetaData bmd = new DefaultBookMetaData(driver, this, name, type);
          setBookMetaData(bmd);
      }
--- 43,47 ----
      public StubBook(StubBookDriver driver, String name, BookType type)
      {
!         BookMetaData bmd = new DefaultBookMetaData(driver, name, type);
          setBookMetaData(bmd);
      }

Index: StubDictionary.java
===================================================================
RCS file: /cvs/jsword/jsword/java/limbo/org/crosswire/jsword/book/stub/StubDictionary.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** StubDictionary.java	5 Mar 2005 22:08:06 -0000	1.8
--- StubDictionary.java	19 Mar 2005 01:56:47 -0000	1.9
***************
*** 48,52 ****
      public StubDictionary(StubBookDriver driver, String name, BookType type)
      {
!         BookMetaData bmd = new DefaultBookMetaData(driver, this, name, type);
          setBookMetaData(bmd);
      }
--- 48,52 ----
      public StubDictionary(StubBookDriver driver, String name, BookType type)
      {
!         BookMetaData bmd = new DefaultBookMetaData(driver, name, type);
          setBookMetaData(bmd);
      }

Index: StubBookDriver.java
===================================================================
RCS file: /cvs/jsword/jsword/java/limbo/org/crosswire/jsword/book/stub/StubBookDriver.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** StubBookDriver.java	5 Oct 2004 22:03:09 -0000	1.3
--- StubBookDriver.java	19 Mar 2005 01:56:47 -0000	1.4
***************
*** 2,6 ****
  
  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;
--- 2,5 ----
***************
*** 39,43 ****
      public StubBookDriver()
      {
!         Book[] books = new Book[]
          {
              new StubBook(this, "Stub Version", BookType.BIBLE), //$NON-NLS-1$
--- 38,42 ----
      public StubBookDriver()
      {
!         books = new Book[]
          {
              new StubBook(this, "Stub Version", BookType.BIBLE), //$NON-NLS-1$
***************
*** 46,56 ****
              new StubDictionary(this, "Stub Dict", BookType.DICTIONARY), //$NON-NLS-1$
          };
- 
-         bmds = new BookMetaData[books.length];
- 
-         for (int i = 0; i < books.length; i++)
-         {
-             bmds[i] = books[i].getBookMetaData();
-         }
      }
  
--- 45,48 ----
***************
*** 58,64 ****
       * @see org.crosswire.jsword.book.BookDriver#getBooks()
       */
!     public BookMetaData[] getBookMetaDatas()
      {
!         return bmds;
      }
  
--- 50,56 ----
       * @see org.crosswire.jsword.book.BookDriver#getBooks()
       */
!     public Book[] getBooks()
      {
!         return books;
      }
  
***************
*** 74,77 ****
       * The meta data array
       */
!     private BookMetaData[] bmds = null;
  }
\ No newline at end of file
--- 66,69 ----
       * The meta data array
       */
!     private Book[] books;
  }
\ No newline at end of file