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

Modified Files:
	DefaultBookMetaData.java AbstractBook.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: DefaultBookMetaData.java
===================================================================
RCS file: /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/book/basic/DefaultBookMetaData.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** DefaultBookMetaData.java	17 May 2005 00:43:16 -0000	1.22
--- DefaultBookMetaData.java	11 Jun 2005 20:41:05 -0000	1.23
***************
*** 27,33 ****
  import org.crosswire.common.xml.XMLUtil;
  import org.crosswire.jsword.book.Book;
  import org.crosswire.jsword.book.BookDriver;
  import org.crosswire.jsword.book.BookMetaData;
- import org.crosswire.jsword.book.BookType;
  import org.crosswire.jsword.book.IndexStatus;
  import org.crosswire.jsword.book.OSISUtil;
--- 27,33 ----
  import org.crosswire.common.xml.XMLUtil;
  import org.crosswire.jsword.book.Book;
+ import org.crosswire.jsword.book.BookCategory;
  import org.crosswire.jsword.book.BookDriver;
  import org.crosswire.jsword.book.BookMetaData;
  import org.crosswire.jsword.book.IndexStatus;
  import org.crosswire.jsword.book.OSISUtil;
***************
*** 78,82 ****
       * A call to setBook() is still required after this ctor is called
       */
!     public DefaultBookMetaData(BookDriver driver, String name, BookType type)
      {
          setDriver(driver);
--- 78,82 ----
       * A call to setBook() is still required after this ctor is called
       */
!     public DefaultBookMetaData(BookDriver driver, String name, BookCategory type)
      {
          setDriver(driver);
***************
*** 89,93 ****
       * @see org.crosswire.jsword.book.BookMetaData#getType()
       */
!     public BookType getType()
      {
          return type;
--- 89,93 ----
       * @see org.crosswire.jsword.book.BookMetaData#getType()
       */
!     public BookCategory getType()
      {
          return type;
***************
*** 172,181 ****
       * @param aType The type to set.
       */
!     public void setType(BookType aType)
      {
!         BookType t = aType;
          if (t == null)
          {
!             t = BookType.BIBLE;
          }
          type = t;
--- 172,181 ----
       * @param aType The type to set.
       */
!     public void setType(BookCategory aType)
      {
!         BookCategory t = aType;
          if (t == null)
          {
!             t = BookCategory.BIBLE;
          }
          type = t;
***************
*** 189,196 ****
      public void setType(String typestr)
      {
!         BookType newType = null;
          if (typestr != null)
          {
!             newType = BookType.fromString(typestr);
          }
  
--- 189,196 ----
      public void setType(String typestr)
      {
!         BookCategory newType = null;
          if (typestr != null)
          {
!             newType = BookCategory.fromString(typestr);
          }
  
***************
*** 240,244 ****
      }
  
!     private BookType type;
      private String name;
      private String initials;
--- 240,244 ----
      }
  
!     private BookCategory type;
      private String name;
      private String initials;

Index: AbstractBook.java
===================================================================
RCS file: /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/book/basic/AbstractBook.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** AbstractBook.java	17 May 2005 00:43:16 -0000	1.17
--- AbstractBook.java	11 Jun 2005 20:41:05 -0000	1.18
***************
*** 27,34 ****
  import org.crosswire.common.activate.Lock;
  import org.crosswire.jsword.book.Book;
  import org.crosswire.jsword.book.BookDriver;
  import org.crosswire.jsword.book.BookException;
  import org.crosswire.jsword.book.BookMetaData;
- import org.crosswire.jsword.book.BookType;
  import org.crosswire.jsword.book.FeatureType;
  import org.crosswire.jsword.book.IndexStatus;
--- 27,34 ----
  import org.crosswire.common.activate.Lock;
  import org.crosswire.jsword.book.Book;
+ import org.crosswire.jsword.book.BookCategory;
  import org.crosswire.jsword.book.BookDriver;
  import org.crosswire.jsword.book.BookException;
  import org.crosswire.jsword.book.BookMetaData;
  import org.crosswire.jsword.book.FeatureType;
  import org.crosswire.jsword.book.IndexStatus;
***************
*** 200,204 ****
       * @see org.crosswire.jsword.book.BookMetaData#getType()
       */
!     public BookType getType()
      {
          return bmd.getType();
--- 200,204 ----
       * @see org.crosswire.jsword.book.BookMetaData#getType()
       */
!     public BookCategory getType()
      {
          return bmd.getType();