[jsword-svn] bibledesktop/java/main/org/crosswire/bibledesktop/book s

[jswordcvs at crosswire.org]

Update of /cvs/jsword/bibledesktop/java/main/org/crosswire/bibledesktop/book
In directory www.crosswire.org:/tmp/cvs-serv25565/java/main/org/crosswire/bibledesktop/book

Modified Files:
	BookListCellRenderer.java DictionaryPane.java 
Log Message:
A mostly complete implementation of daily devotion as a separate book type.

Index: BookListCellRenderer.java
===================================================================
RCS file: /cvs/jsword/bibledesktop/java/main/org/crosswire/bibledesktop/book/BookListCellRenderer.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** BookListCellRenderer.java	22 Jun 2005 03:50:49 -0000	1.13
--- BookListCellRenderer.java	2 Jan 2006 03:40:02 -0000	1.14
***************
*** 109,113 ****
              setToolTipText(displayName);
  
!             BookCategory type = book.getType();
              if (type.equals(BookCategory.BIBLE))
              {
--- 109,113 ----
              setToolTipText(displayName);
  
!             BookCategory type = book.getBookCategory();
              if (type.equals(BookCategory.BIBLE))
              {
***************
*** 122,125 ****
--- 122,133 ----
                  setIcon(ICON_DICT);
              }
+             else if (type.equals(BookCategory.GLOSSARY))
+             {
+                 setIcon(ICON_DICT);
+             }
+             else if (type.equals(BookCategory.DAILY_DEVOTIONS))
+             {
+                 setIcon(ICON_DICT);
+             }
  
              setEnabled(list.isEnabled());

Index: DictionaryPane.java
===================================================================
RCS file: /cvs/jsword/bibledesktop/java/main/org/crosswire/bibledesktop/book/DictionaryPane.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** DictionaryPane.java	21 Aug 2005 20:38:04 -0000	1.25
--- DictionaryPane.java	2 Jan 2006 03:40:02 -0000	1.26
***************
*** 302,306 ****
          {
              Book book = (Book) selected;
!             if (book.getType().equals(BookCategory.DICTIONARY))
              {
                  dict = book;
--- 302,309 ----
          {
              Book book = (Book) selected;
!             BookCategory category = book.getBookCategory();
!             if (category.equals(BookCategory.DICTIONARY)
!                 || category.equals(BookCategory.GLOSSARY)
!                 || category.equals(BookCategory.DAILY_DEVOTIONS))
              {
                  dict = book;