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

Modified Files:
	HttpSwordInstaller.java FtpSwordInstaller.java 
Log Message:
Fixed the Saved sites problem.

Index: HttpSwordInstaller.java
===================================================================
RCS file: /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/book/install/sword/HttpSwordInstaller.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** HttpSwordInstaller.java	26 Jan 2005 00:57:33 -0000	1.15
--- HttpSwordInstaller.java	15 Feb 2005 04:32:34 -0000	1.16
***************
*** 47,51 ****
      public String getURL()
      {
!         return PROTOCOL_WEB + ':' + host + directory;
      }
  
--- 47,51 ----
      public String getURL()
      {
!         return PROTOCOL_WEB + "://" + host + directory; //$NON-NLS-1$
      }
  
***************
*** 148,151 ****
       * We need to be ablee to provide a URL as part of the API
       */
!     private static final String PROTOCOL_WEB = "web"; //$NON-NLS-1$
  }
--- 148,151 ----
       * We need to be ablee to provide a URL as part of the API
       */
!     private static final String PROTOCOL_WEB = "sword-http"; //$NON-NLS-1$
  }

Index: FtpSwordInstaller.java
===================================================================
RCS file: /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/book/install/sword/FtpSwordInstaller.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** FtpSwordInstaller.java	15 Oct 2004 23:28:08 -0000	1.9
--- FtpSwordInstaller.java	15 Feb 2005 04:32:34 -0000	1.10
***************
*** 47,51 ****
      public String getURL()
      {
!         return PROTOCOL_SWORD + ":" + username + ":" + password + "@" + host + directory; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
      }
  
--- 47,51 ----
      public String getURL()
      {
!         return PROTOCOL_SWORD + "://" + username + ":" + password + "@" + host + directory; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
      }
  
***************
*** 198,202 ****
      public String toString()
      {
!         return PROTOCOL_SWORD + ":" + username + "@" + host + directory; //$NON-NLS-1$ //$NON-NLS-2$
      }
  
--- 198,202 ----
      public String toString()
      {
!         return getURL();
      }
  
***************
*** 251,255 ****
       * We need to be ablee to provide a URL as part of the API
       */
!     private static final String PROTOCOL_SWORD = "sword"; //$NON-NLS-1$
  
      /**
--- 251,255 ----
       * We need to be ablee to provide a URL as part of the API
       */
!     private static final String PROTOCOL_SWORD = "sword-ftp"; //$NON-NLS-1$
  
      /**