[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-serv27497/java/main/org/crosswire/bibledesktop/book

Modified Files:
	DictionaryPane.java BibleViewPane.java 
	BookListCellRenderer.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: BibleViewPane.java
===================================================================
RCS file: /cvs/jsword/bibledesktop/java/main/org/crosswire/bibledesktop/book/BibleViewPane.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** BibleViewPane.java	17 May 2005 00:44:30 -0000	1.18
--- BibleViewPane.java	11 Jun 2005 20:41:15 -0000	1.19
***************
*** 64,68 ****
       * Simple ctor
       */
!     public BibleViewPane()
      {
          listeners = new EventListenerList();
--- 64,68 ----
       * Simple ctor
       */
!     public BibleViewPane(boolean showSidebar)
      {
          listeners = new EventListenerList();
***************
*** 71,74 ****
--- 71,75 ----
          BookDataDisplay display = new TabbedBookDataDisplay();
          pnlPassg = new SplitBookDataDisplay(sidebar, display);
+         pnlPassg.showSidebar(showSidebar);
          sidebar.addKeyChangeListener(pnlSelect);
          pnlSelect.addCommandListener(sidebar);

Index: BookListCellRenderer.java
===================================================================
RCS file: /cvs/jsword/bibledesktop/java/main/org/crosswire/bibledesktop/book/BookListCellRenderer.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** BookListCellRenderer.java	17 May 2005 00:44:30 -0000	1.11
--- BookListCellRenderer.java	11 Jun 2005 20:41:15 -0000	1.12
***************
*** 34,39 ****
  import org.crosswire.common.swing.GuiUtil;
  import org.crosswire.jsword.book.Book;
  import org.crosswire.jsword.book.BookMetaData;
- import org.crosswire.jsword.book.BookType;
  
  /**
--- 34,39 ----
  import org.crosswire.common.swing.GuiUtil;
  import org.crosswire.jsword.book.Book;
+ import org.crosswire.jsword.book.BookCategory;
  import org.crosswire.jsword.book.BookMetaData;
  
  /**
***************
*** 109,122 ****
              setToolTipText(displayName);
  
!             BookType type = book.getType();
!             if (type.equals(BookType.BIBLE))
              {
                  setIcon(ICON_BIBLE);
              }
!             else if (type.equals(BookType.COMMENTARY))
              {
                  setIcon(ICON_COMNT);
              }
!             else if (type.equals(BookType.DICTIONARY))
              {
                  setIcon(ICON_DICT);
--- 109,122 ----
              setToolTipText(displayName);
  
!             BookCategory type = book.getType();
!             if (type.equals(BookCategory.BIBLE))
              {
                  setIcon(ICON_BIBLE);
              }
!             else if (type.equals(BookCategory.COMMENTARY))
              {
                  setIcon(ICON_COMNT);
              }
!             else if (type.equals(BookCategory.DICTIONARY))
              {
                  setIcon(ICON_DICT);

Index: DictionaryPane.java
===================================================================
RCS file: /cvs/jsword/bibledesktop/java/main/org/crosswire/bibledesktop/book/DictionaryPane.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** DictionaryPane.java	17 May 2005 00:44:30 -0000	1.22
--- DictionaryPane.java	11 Jun 2005 20:41:15 -0000	1.23
***************
*** 46,52 ****
  import org.crosswire.common.util.Reporter;
  import org.crosswire.jsword.book.Book;
  import org.crosswire.jsword.book.BookFilter;
  import org.crosswire.jsword.book.BookFilters;
- import org.crosswire.jsword.book.BookType;
  import org.crosswire.jsword.book.Defaults;
  import org.crosswire.jsword.passage.Key;
--- 46,52 ----
  import org.crosswire.common.util.Reporter;
  import org.crosswire.jsword.book.Book;
+ import org.crosswire.jsword.book.BookCategory;
  import org.crosswire.jsword.book.BookFilter;
  import org.crosswire.jsword.book.BookFilters;
  import org.crosswire.jsword.book.Defaults;
  import org.crosswire.jsword.passage.Key;
***************
*** 291,295 ****
          {
              Book book = (Book) selected;
!             if (book.getType().equals(BookType.DICTIONARY))
              {
                  dict = book;
--- 291,295 ----
          {
              Book book = (Book) selected;
!             if (book.getType().equals(BookCategory.DICTIONARY))
              {
                  dict = book;