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

[jswordcvs at crosswire.org]

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

Modified Files:
	Desktop.java 
Log Message:
Made Book the primary interface to a module and put BookMetaData within it. All of BookMetaData is accessible through the Book interface.

Index: Desktop.java
===================================================================
RCS file: /cvs/jsword/bibledesktop/java/main/org/crosswire/bibledesktop/desktop/Desktop.java,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -d -r1.36 -r1.37
*** Desktop.java	6 Mar 2005 20:21:36 -0000	1.36
--- Desktop.java	19 Mar 2005 01:57:09 -0000	1.37
***************
*** 61,65 ****
  import org.crosswire.jsword.book.BookFilter;
  import org.crosswire.jsword.book.BookFilters;
- import org.crosswire.jsword.book.BookMetaData;
  import org.crosswire.jsword.book.Books;
  import org.crosswire.jsword.book.BooksEvent;
--- 61,64 ----
***************
*** 213,217 ****
          // News users probably wont have any Bibles installedso we give them a
          // hand getting to the installation diallog.
!         List bibles = Books.installed().getBookMetaDatas(BookFilters.getBibles());
          if (bibles.size() == 0)
          {
--- 212,216 ----
          // News users probably wont have any Bibles installedso we give them a
          // hand getting to the installation diallog.
!         List bibles = Books.installed().getBooks(BookFilters.getBibles());
          if (bibles.size() == 0)
          {
***************
*** 752,762 ****
      private String[] getFullNameArray(BookFilter filter)
      {
!         List bmds = Books.installed().getBookMetaDatas(filter);
          List names = new ArrayList();
  
!         for (Iterator it = bmds.iterator(); it.hasNext(); )
          {
!             BookMetaData bmd = (BookMetaData) it.next();
!             names.add(bmd.getFullName());
          }
  
--- 751,761 ----
      private String[] getFullNameArray(BookFilter filter)
      {
!         List books = Books.installed().getBooks(filter);
          List names = new ArrayList();
  
!         for (Iterator it = books.iterator(); it.hasNext(); )
          {
!             Book book = (Book) it.next();
!             names.add(book.getBookMetaData().getFullName());
          }