[jsword-svn] jsword/java/jsword/org/crosswire/jsword/book/basic s

[jswordcvs at crosswire.org]

Update of /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/book/basic
In directory www.crosswire.org:/tmp/cvs-serv9960/java/jsword/org/crosswire/jsword/book/basic

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

Index: LocalURLBookDriver.java
===================================================================
RCS file: /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/book/basic/LocalURLBookDriver.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** LocalURLBookDriver.java	30 Aug 2004 09:27:07 -0000	1.7
--- LocalURLBookDriver.java	22 Mar 2005 12:40:04 -0000	1.8
***************
*** 85,89 ****
          try
          {
!             String base = source.getBookMetaData().getFullName();
              URL url = createUniqueDirectory(base);
  
--- 85,89 ----
          try
          {
!             String base = source.getFullName();
              URL url = createUniqueDirectory(base);
  

Index: Verifier.java
===================================================================
RCS file: /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/book/basic/Verifier.java,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** Verifier.java	9 Oct 2004 21:45:04 -0000	1.28
--- Verifier.java	22 Mar 2005 12:40:04 -0000	1.29
***************
*** 125,130 ****
                      {
                          out.println(Msg.VERIFY_VERSE.toString() + subkey);
!                         out.println(book1.getBookMetaData().getName() + ": " + text1); //$NON-NLS-1$
!                         out.println(book2.getBookMetaData().getName() + ": " + text2); //$NON-NLS-1$
                          out.println();
                      }
--- 125,130 ----
                      {
                          out.println(Msg.VERIFY_VERSE.toString() + subkey);
!                         out.println(book1.getName() + ": " + text1); //$NON-NLS-1$
!                         out.println(book2.getName() + ": " + text2); //$NON-NLS-1$
                          out.println();
                      }
***************
*** 204,209 ****
          {
              out.println(Msg.WORD.toString() + word);
!             out.println(book1.getBookMetaData().getName() + ": " + ref1); //$NON-NLS-1$
!             out.println(book2.getBookMetaData().getName() + ": " + ref2); //$NON-NLS-1$
              out.println();
          }
--- 204,209 ----
          {
              out.println(Msg.WORD.toString() + word);
!             out.println(book1.getName() + ": " + ref1); //$NON-NLS-1$
!             out.println(book2.getName() + ": " + ref2); //$NON-NLS-1$
              out.println();
          }

Index: LocalURLBook.java
===================================================================
RCS file: /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/book/basic/LocalURLBook.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** LocalURLBook.java	30 Nov 2003 19:58:27 -0000	1.2
--- LocalURLBook.java	22 Mar 2005 12:40:04 -0000	1.3
***************
*** 38,42 ****
          {
              Properties wprop = new Properties();
!             wprop.put("Version", getBookMetaData().getFullName());
  
              URL prop_url = NetUtil.lengthenURL(getURL(), "bible.properties");
--- 38,42 ----
          {
              Properties wprop = new Properties();
!             wprop.put("Version", getFullName());
  
              URL prop_url = NetUtil.lengthenURL(getURL(), "bible.properties");