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

[jswordcvs at crosswire.org]

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

Modified Files:
	FtpSwordInstaller.java FtpSwordInstallerFactory.java 
Log Message:
Willie Thean's laf changes.
Added ability to specify proxy for http download.
Changed default logging to INFO.

Index: FtpSwordInstaller.java
===================================================================
RCS file: /cvs/jsword/jsword/java/limbo/org/crosswire/jsword/book/install/sword/FtpSwordInstaller.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** FtpSwordInstaller.java	27 Jul 2005 23:25:47 -0000	1.6
--- FtpSwordInstaller.java	21 Aug 2005 20:37:56 -0000	1.7
***************
*** 48,54 ****
  {
      /* (non-Javadoc)
       * @see org.crosswire.jsword.book.install.Installer#getURL()
       */
!     public String getURL()
      {
          return PROTOCOL_SWORD + "://" + username + ":" + password + "@" + host + directory; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
--- 48,71 ----
  {
      /* (non-Javadoc)
+      * @see org.crosswire.jsword.book.install.Installer#getType()
+      */
+     public String getType()
+     {
+         return "sword-ftp"; //$NON-NLS-1$
+     }
+ 
+     /* (non-Javadoc)
+      * @see org.crosswire.jsword.book.install.Installer#getSize(org.crosswire.jsword.book.Book)
+      */
+     public int getSize(Book book)
+     {
+         // not implemented
+         return 0;
+     }
+ 
+     /* (non-Javadoc)
       * @see org.crosswire.jsword.book.install.Installer#getURL()
       */
!     public String getInstallerDefinition()
      {
          return PROTOCOL_SWORD + "://" + username + ":" + password + "@" + host + directory; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
***************
*** 199,208 ****
      /**
       * Like getURL() except that we skip the password for display purposes.
!      * @see FtpSwordInstaller#getURL()
       * @see java.lang.Object#toString()
       */
      public String toString()
      {
!         return getURL();
      }
  
--- 216,225 ----
      /**
       * Like getURL() except that we skip the password for display purposes.
!      * @see FtpSwordInstaller#getInstallerDefinition()
       * @see java.lang.Object#toString()
       */
      public String toString()
      {
!         return getInstallerDefinition();
      }
  

Index: FtpSwordInstallerFactory.java
===================================================================
RCS file: /cvs/jsword/jsword/java/limbo/org/crosswire/jsword/book/install/sword/FtpSwordInstallerFactory.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** FtpSwordInstallerFactory.java	27 Jul 2005 23:25:47 -0000	1.6
--- FtpSwordInstallerFactory.java	21 Aug 2005 20:37:56 -0000	1.7
***************
*** 51,55 ****
          if (parts.length < 4)
          {
!             throw new IllegalArgumentException(Msg.INVALID_URL.toString(url));
          }
  
--- 51,55 ----
          if (parts.length < 4)
          {
!             throw new IllegalArgumentException(Msg.INVALID_DEFINITION.toString(url));
          }