[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-serv9960/java/jsword/org/crosswire/jsword/book/install/sword

Modified Files:
	HttpSwordInstaller.java AbstractSwordInstaller.java 
Log Message:
changed calls like book.getBookMetaData().xxx() to book.xxx().
Added a "Remove Index" button on the Book Installer.

Index: AbstractSwordInstaller.java
===================================================================
RCS file: /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/book/install/sword/AbstractSwordInstaller.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** AbstractSwordInstaller.java	20 Mar 2005 02:34:45 -0000	1.9
--- AbstractSwordInstaller.java	22 Mar 2005 12:40:03 -0000	1.10
***************
*** 138,142 ****
      {
          // Is the book already installed? Then nothing to do.
!         if (Books.installed().getBook(book.getBookMetaData().getName()) != null)
          {
              return;
--- 138,142 ----
      {
          // Is the book already installed? Then nothing to do.
!         if (Books.installed().getBook(book.getName()) != null)
          {
              return;

Index: HttpSwordInstaller.java
===================================================================
RCS file: /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/book/install/sword/HttpSwordInstaller.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** HttpSwordInstaller.java	19 Mar 2005 18:44:58 -0000	1.20
--- HttpSwordInstaller.java	22 Mar 2005 12:40:03 -0000	1.21
***************
*** 56,60 ****
          try
          {
!             return new URL(NetUtil.PROTOCOL_HTTP, host, directory + '/' + PACKAGE_DIR + '/' + book.getBookMetaData().getInitials() + ZIP_SUFFIX);
          }
          catch (MalformedURLException ex)
--- 56,60 ----
          try
          {
!             return new URL(NetUtil.PROTOCOL_HTTP, host, directory + '/' + PACKAGE_DIR + '/' + book.getInitials() + ZIP_SUFFIX);
          }
          catch (MalformedURLException ex)