[jsword-svn] jsword/java/jsword/org/crosswire/jsword/book/install/sword s

[jswordcvs at crosswire.org]

Update of /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/book/install/sword
In directory www.crosswire.org:/tmp/cvs-serv4965/java/jsword/org/crosswire/jsword/book/install/sword

Modified Files:
	AbstractSwordInstaller.java 
Log Message:
install bug fixes

Index: AbstractSwordInstaller.java
===================================================================
RCS file: /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/book/install/sword/AbstractSwordInstaller.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** AbstractSwordInstaller.java	15 Oct 2004 23:28:08 -0000	1.1
--- AbstractSwordInstaller.java	16 Oct 2004 09:07:43 -0000	1.2
***************
*** 22,25 ****
--- 22,26 ----
  import org.crosswire.common.util.NetUtil;
  import org.crosswire.common.util.Reporter;
+ import org.crosswire.jsword.book.BookDriver;
  import org.crosswire.jsword.book.BookMetaData;
  import org.crosswire.jsword.book.Books;
***************
*** 116,119 ****
--- 117,122 ----
              }
  
+             // We need to create a List from the Set returned by
+             // entries.values() so we can create an unmodifiable list from it.
              List mutable = new ArrayList();
              mutable.addAll(entries.values());
***************
*** 249,252 ****
--- 252,259 ----
      private void loadCachedIndex() throws InstallException
      {
+         // We need a sword book driver so the installer can use the driver
+         // name to use in deciding where to put the index.
+         BookDriver fake = new SwordBookDriver();
+ 
          entries.clear();
  
***************
*** 292,295 ****
--- 299,303 ----
                          Reader rin = new InputStreamReader(new ByteArrayInputStream(buffer));
                          SwordBookMetaData sbmd = new SwordBookMetaData(rin, internal);
+                         sbmd.setDriver(fake);
  
                          if (sbmd.isSupported())