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

Modified Files:
	Msg.java Msg.properties HttpSwordInstaller.java 
Log Message:
Fixed BD-39. The install w/ search calls now IndexResolver, which handles exceptions.

Index: Msg.properties
===================================================================
RCS file: /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/book/install/sword/Msg.properties,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Msg.properties	14 Jun 2004 05:27:22 -0000	1.1
--- Msg.properties	17 Feb 2005 12:28:18 -0000	1.2
***************
*** 23,24 ****
--- 23,25 ----
  SwordInstallerFactory.URLAtCount=Too many @ symbols in url: {0}
  SwordInstallerFactory.URLColonCount=Wrong number of : symbols in url: {0}
+ HttpSwordInstaller.MissingFile=Unable to find module
\ No newline at end of file

Index: HttpSwordInstaller.java
===================================================================
RCS file: /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/book/install/sword/HttpSwordInstaller.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** HttpSwordInstaller.java	15 Feb 2005 04:32:34 -0000	1.16
--- HttpSwordInstaller.java	17 Feb 2005 12:28:18 -0000	1.17
***************
*** 95,99 ****
       * @throws IOException
       */
!     private void copy(Job job, URL url, URL dest) throws IOException
      {
          InputStream in = null;
--- 95,99 ----
       * @throws IOException
       */
!     private void copy(Job job, URL url, URL dest) throws IOException, InstallException
      {
          InputStream in = null;
***************
*** 111,116 ****
  
              URLConnection urlConnection = url.openConnection();
!             in = urlConnection.getInputStream();
! 
              byte[] buf = new byte[4096];
              for (int count = 0; -1 != (count = in.read(buf)); )
--- 111,123 ----
  
              URLConnection urlConnection = url.openConnection();
!             try
!             {
!                 in = urlConnection.getInputStream();
!             }
!             catch (Exception exception)
!             {
!                 throw new InstallException(Msg.MISSING_FILE, exception);
!             }
!             
              byte[] buf = new byte[4096];
              for (int count = 0; -1 != (count = in.read(buf)); )

Index: Msg.java
===================================================================
RCS file: /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/book/install/sword/Msg.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** Msg.java	13 Jun 2004 22:12:33 -0000	1.7
--- Msg.java	17 Feb 2005 12:28:18 -0000	1.8
***************
*** 46,49 ****
--- 46,50 ----
      static final Msg URL_AT_COUNT = new Msg("SwordInstallerFactory.URLAtCount"); //$NON-NLS-1$
      static final Msg URL_COLON_COUNT = new Msg("SwordInstallerFactory.URLColonCount"); //$NON-NLS-1$
+     static final Msg MISSING_FILE = new Msg("HttpSwordInstaller.MissingFile"); //$NON-NLS-1$
  
      /**