[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-serv27268/java/limbo/org/crosswire/jsword/book/stub

Modified Files:
	StubDictionary.java StubBookDriver.java StubBook.java 
Log Message:
Made showing the sidebar a default and set it to no.
Cleaned up the code to consistently use "book" to refer to "module"

Index: StubBook.java
===================================================================
RCS file: /cvs/jsword/jsword/java/limbo/org/crosswire/jsword/book/stub/StubBook.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** StubBook.java	17 May 2005 00:43:14 -0000	1.9
--- StubBook.java	11 Jun 2005 20:41:04 -0000	1.10
***************
*** 22,30 ****
  package org.crosswire.jsword.book.stub;
  
  import org.crosswire.jsword.book.BookException;
  import org.crosswire.jsword.book.BookMetaData;
- import org.crosswire.jsword.book.BookType;
- import org.crosswire.jsword.book.basic.DefaultBookMetaData;
  import org.crosswire.jsword.book.basic.AbstractPassageBook;
  import org.crosswire.jsword.book.filter.Filter;
  import org.crosswire.jsword.book.filter.FilterFactory;
--- 22,30 ----
  package org.crosswire.jsword.book.stub;
  
+ import org.crosswire.jsword.book.BookCategory;
  import org.crosswire.jsword.book.BookException;
  import org.crosswire.jsword.book.BookMetaData;
  import org.crosswire.jsword.book.basic.AbstractPassageBook;
+ import org.crosswire.jsword.book.basic.DefaultBookMetaData;
  import org.crosswire.jsword.book.filter.Filter;
  import org.crosswire.jsword.book.filter.FilterFactory;
***************
*** 45,49 ****
       * Basic constructor for a StubBook
       */
!     public StubBook(StubBookDriver driver, String name, BookType type)
      {
          BookMetaData bmd = new DefaultBookMetaData(driver, name, type);
--- 45,49 ----
       * Basic constructor for a StubBook
       */
!     public StubBook(StubBookDriver driver, String name, BookCategory type)
      {
          BookMetaData bmd = new DefaultBookMetaData(driver, name, type);

Index: StubDictionary.java
===================================================================
RCS file: /cvs/jsword/jsword/java/limbo/org/crosswire/jsword/book/stub/StubDictionary.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** StubDictionary.java	17 May 2005 00:43:14 -0000	1.12
--- StubDictionary.java	11 Jun 2005 20:41:04 -0000	1.13
***************
*** 24,31 ****
  import java.util.List;
  
  import org.crosswire.jsword.book.BookData;
  import org.crosswire.jsword.book.BookException;
  import org.crosswire.jsword.book.BookMetaData;
- import org.crosswire.jsword.book.BookType;
  import org.crosswire.jsword.book.OSISUtil;
  import org.crosswire.jsword.book.basic.AbstractBook;
--- 24,31 ----
  import java.util.List;
  
+ import org.crosswire.jsword.book.BookCategory;
  import org.crosswire.jsword.book.BookData;
  import org.crosswire.jsword.book.BookException;
  import org.crosswire.jsword.book.BookMetaData;
  import org.crosswire.jsword.book.OSISUtil;
  import org.crosswire.jsword.book.basic.AbstractBook;
***************
*** 50,54 ****
       * Basic constructor for a StubBook
       */
!     public StubDictionary(StubBookDriver driver, String name, BookType type)
      {
          BookMetaData bmd = new DefaultBookMetaData(driver, name, type);
--- 50,54 ----
       * Basic constructor for a StubBook
       */
!     public StubDictionary(StubBookDriver driver, String name, BookCategory type)
      {
          BookMetaData bmd = new DefaultBookMetaData(driver, name, type);

Index: StubBookDriver.java
===================================================================
RCS file: /cvs/jsword/jsword/java/limbo/org/crosswire/jsword/book/stub/StubBookDriver.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** StubBookDriver.java	17 May 2005 00:43:14 -0000	1.7
--- StubBookDriver.java	11 Jun 2005 20:41:04 -0000	1.8
***************
*** 23,27 ****
  
  import org.crosswire.jsword.book.Book;
! import org.crosswire.jsword.book.BookType;
  import org.crosswire.jsword.book.basic.AbstractBookDriver;
  
--- 23,27 ----
  
  import org.crosswire.jsword.book.Book;
! import org.crosswire.jsword.book.BookCategory;
  import org.crosswire.jsword.book.basic.AbstractBookDriver;
  
***************
*** 44,51 ****
          books = new Book[]
          {
!             new StubBook(this, "Stub Version", BookType.BIBLE), //$NON-NLS-1$
!             new StubBook(this, "New Stub Version", BookType.BIBLE), //$NON-NLS-1$
!             new StubBook(this, "Stub Comments", BookType.COMMENTARY), //$NON-NLS-1$
!             new StubDictionary(this, "Stub Dict", BookType.DICTIONARY), //$NON-NLS-1$
          };
      }
--- 44,51 ----
          books = new Book[]
          {
!             new StubBook(this, "Stub Version", BookCategory.BIBLE), //$NON-NLS-1$
!             new StubBook(this, "New Stub Version", BookCategory.BIBLE), //$NON-NLS-1$
!             new StubBook(this, "Stub Comments", BookCategory.COMMENTARY), //$NON-NLS-1$
!             new StubDictionary(this, "Stub Dict", BookCategory.DICTIONARY), //$NON-NLS-1$
          };
      }