[jsword-svn] jsword/java/limbo/org/crosswire/jsword/book/remote s

[jswordcvs at crosswire.org]

Update of /cvs/jsword/jsword/java/limbo/org/crosswire/jsword/book/remote
In directory www.crosswire.org:/tmp/cvs-serv27268/java/limbo/org/crosswire/jsword/book/remote

Modified Files:
	ConverterTest.java Converter.java RemoteBook.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: Converter.java
===================================================================
RCS file: /cvs/jsword/jsword/java/limbo/org/crosswire/jsword/book/remote/Converter.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** Converter.java	17 May 2005 00:43:16 -0000	1.9
--- Converter.java	11 Jun 2005 20:41:05 -0000	1.10
***************
*** 29,34 ****
  
  import org.crosswire.jsword.book.Book;
  import org.crosswire.jsword.book.BookMetaData;
- import org.crosswire.jsword.book.BookType;
  import org.crosswire.jsword.passage.DefaultKeyList;
  import org.crosswire.jsword.passage.Key;
--- 29,34 ----
  
  import org.crosswire.jsword.book.Book;
+ import org.crosswire.jsword.book.BookCategory;
  import org.crosswire.jsword.book.BookMetaData;
  import org.crosswire.jsword.passage.DefaultKeyList;
  import org.crosswire.jsword.passage.Key;
***************
*** 93,97 ****
              String typestr = bmdele.getChildTextTrim(ELEMENT_TYPE);
  
!             BookType type = BookType.fromString(typestr);
  
              Book book = new RemoteBook(remoter, driver, name, type);
--- 93,97 ----
              String typestr = bmdele.getChildTextTrim(ELEMENT_TYPE);
  
!             BookCategory type = BookCategory.fromString(typestr);
  
              Book book = new RemoteBook(remoter, driver, name, type);

Index: RemoteBook.java
===================================================================
RCS file: /cvs/jsword/jsword/java/limbo/org/crosswire/jsword/book/remote/RemoteBook.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** RemoteBook.java	17 May 2005 00:43:16 -0000	1.15
--- RemoteBook.java	11 Jun 2005 20:41:05 -0000	1.16
***************
*** 25,32 ****
  import org.crosswire.common.xml.JDOMSAXEventProvider;
  import org.crosswire.common.xml.SAXEventProvider;
  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.basic.AbstractBook;
  import org.crosswire.jsword.book.basic.DefaultBookMetaData;
--- 25,32 ----
  import org.crosswire.common.xml.JDOMSAXEventProvider;
  import org.crosswire.common.xml.SAXEventProvider;
+ 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.basic.AbstractBook;
  import org.crosswire.jsword.book.basic.DefaultBookMetaData;
***************
*** 55,59 ****
       * Basic constructor for a SerBook
       */
!     public RemoteBook(Remoter remoter, RemoteBookDriver driver, String name, BookType type)
      {
          BookMetaData bmd = new DefaultBookMetaData(driver, name, type);
--- 55,59 ----
       * Basic constructor for a SerBook
       */
!     public RemoteBook(Remoter remoter, RemoteBookDriver driver, String name, BookCategory type)
      {
          BookMetaData bmd = new DefaultBookMetaData(driver, name, type);

Index: ConverterTest.java
===================================================================
RCS file: /cvs/jsword/jsword/java/limbo/org/crosswire/jsword/book/remote/ConverterTest.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** ConverterTest.java	17 May 2005 00:43:16 -0000	1.6
--- ConverterTest.java	11 Jun 2005 20:41:05 -0000	1.7
***************
*** 60,68 ****
          t1 = new BookMetaData[]
          {
!             new DefaultBookMetaData(rbd, null, "v1", BookType.BIBLE), //$NON-NLS-1$
!             new DefaultBookMetaData(rbd, null, "v2", BookType.BIBLE), //$NON-NLS-1$
!             new DefaultBookMetaData(rbd, null, "v3", BookType.BIBLE), //$NON-NLS-1$
!             new DefaultBookMetaData(rbd, null, "test version", BookType.BIBLE), //$NON-NLS-1$
!             new DefaultBookMetaData(rbd, null, "test version", BookType.BIBLE), //$NON-NLS-1$
          };
          uid1 = new String[]
--- 60,68 ----
          t1 = new BookMetaData[]
          {
!             new DefaultBookMetaData(rbd, null, "v1", BookCategory.BIBLE), //$NON-NLS-1$
!             new DefaultBookMetaData(rbd, null, "v2", BookCategory.BIBLE), //$NON-NLS-1$
!             new DefaultBookMetaData(rbd, null, "v3", BookCategory.BIBLE), //$NON-NLS-1$
!             new DefaultBookMetaData(rbd, null, "test version", BookCategory.BIBLE), //$NON-NLS-1$
!             new DefaultBookMetaData(rbd, null, "test version", BookCategory.BIBLE), //$NON-NLS-1$
          };
          uid1 = new String[]