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

Modified Files:
	AbstractBook.java DefaultBookMetaData.java 
	AbstractBookMetaData.java 
Log Message:
A mostly complete implementation of daily devotion as a separate book type.

Index: AbstractBookMetaData.java
===================================================================
RCS file: /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/book/basic/AbstractBookMetaData.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** AbstractBookMetaData.java	27 Jul 2005 23:25:46 -0000	1.25
--- AbstractBookMetaData.java	2 Jan 2006 03:40:08 -0000	1.26
***************
*** 84,88 ****
      public String getOsisID()
      {
!         return getType().toString() + '.' + getInitials();
      }
  
--- 84,88 ----
      public String getOsisID()
      {
!         return getBookCategory().toString() + '.' + getInitials();
      }
  

Index: DefaultBookMetaData.java
===================================================================
RCS file: /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/book/basic/DefaultBookMetaData.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** DefaultBookMetaData.java	27 Jul 2005 23:25:46 -0000	1.24
--- DefaultBookMetaData.java	2 Jan 2006 03:40:08 -0000	1.25
***************
*** 60,64 ****
          setProperties(prop);
          setName(prop.getProperty(BookMetaData.KEY_NAME));
!         setType(prop.getProperty(BookMetaData.KEY_TYPE));
          setLanguage(prop.getProperty(BookMetaData.KEY_LANGUAGE));
  
--- 60,64 ----
          setProperties(prop);
          setName(prop.getProperty(BookMetaData.KEY_NAME));
!         setType(prop.getProperty(BookMetaData.KEY_CATEGORY));
          setLanguage(prop.getProperty(BookMetaData.KEY_LANGUAGE));
  
***************
*** 82,86 ****
          setDriver(driver);
          setName(name);
!         setType(type);
          setLanguage(null); // Default language
      }
--- 82,86 ----
          setDriver(driver);
          setName(name);
!         setBookCategory(type);
          setLanguage(null); // Default language
      }
***************
*** 89,93 ****
       * @see org.crosswire.jsword.book.BookMetaData#getType()
       */
!     public BookCategory getType()
      {
          return type;
--- 89,93 ----
       * @see org.crosswire.jsword.book.BookMetaData#getType()
       */
!     public BookCategory getBookCategory()
      {
          return type;
***************
*** 172,176 ****
       * @param aType The type to set.
       */
!     public void setType(BookCategory aType)
      {
          BookCategory t = aType;
--- 172,176 ----
       * @param aType The type to set.
       */
!     public void setBookCategory(BookCategory aType)
      {
          BookCategory t = aType;
***************
*** 181,185 ****
          type = t;
  
!         putProperty(KEY_TYPE, type.toString());
      }
  
--- 181,185 ----
          type = t;
  
!         putProperty(KEY_CATEGORY, type.toString());
      }
  
***************
*** 195,199 ****
          }
  
!         setType(newType);
      }
  
--- 195,199 ----
          }
  
!         setBookCategory(newType);
      }
  
***************
*** 207,211 ****
          addRow(ele, "Initials", getInitials()); //$NON-NLS-1$
          addRow(ele, "Description", getFullName()); //$NON-NLS-1$
!         addRow(ele, "Key", getType().toString()); //$NON-NLS-1$
          addRow(ele, "Language", getLanguage()); //$NON-NLS-1$
          return new Document(ele);
--- 207,211 ----
          addRow(ele, "Initials", getInitials()); //$NON-NLS-1$
          addRow(ele, "Description", getFullName()); //$NON-NLS-1$
!         addRow(ele, "Key", getBookCategory().toString()); //$NON-NLS-1$
          addRow(ele, "Language", getLanguage()); //$NON-NLS-1$
          return new Document(ele);

Index: AbstractBook.java
===================================================================
RCS file: /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/book/basic/AbstractBook.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** AbstractBook.java	27 Jul 2005 23:25:46 -0000	1.20
--- AbstractBook.java	2 Jan 2006 03:40:08 -0000	1.21
***************
*** 200,206 ****
       * @see org.crosswire.jsword.book.BookMetaData#getType()
       */
!     public BookCategory getType()
      {
!         return bmd.getType();
      }
  
--- 200,206 ----
       * @see org.crosswire.jsword.book.BookMetaData#getType()
       */
!     public BookCategory getBookCategory()
      {
!         return bmd.getBookCategory();
      }