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

Modified Files:
	HttpSwordInstaller.java FtpSwordInstaller.java 
	AbstractSwordInstaller.java 
Log Message:
Changes to satisfy CheckStyle

Index: AbstractSwordInstaller.java
===================================================================
RCS file: /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/book/install/sword/AbstractSwordInstaller.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** AbstractSwordInstaller.java	28 Feb 2005 02:21:40 -0000	1.5
--- AbstractSwordInstaller.java	6 Mar 2005 20:21:47 -0000	1.6
***************
*** 39,43 ****
  /**
   * .
!  * 
   * <p><table border='1' cellPadding='3' cellSpacing='0'>
   * <tr><td bgColor='white' class='TableRowColor'><font size='-7'>
--- 39,43 ----
  /**
   * .
!  *
   * <p><table border='1' cellPadding='3' cellSpacing='0'>
   * <tr><td bgColor='white' class='TableRowColor'><font size='-7'>
***************
*** 87,91 ****
          {
              configurl = new URL(NetUtil.PROTOCOL_FILE, null, conf.getAbsolutePath());
!     
          }
          catch (MalformedURLException ex)
--- 87,91 ----
          {
              configurl = new URL(NetUtil.PROTOCOL_FILE, null, conf.getAbsolutePath());
! 
          }
          catch (MalformedURLException ex)
***************
*** 230,234 ****
          {
              job.done();
!         }                
      }
  
--- 230,234 ----
          {
              job.done();
!         }
      }
  

Index: HttpSwordInstaller.java
===================================================================
RCS file: /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/book/install/sword/HttpSwordInstaller.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** HttpSwordInstaller.java	17 Feb 2005 12:28:18 -0000	1.17
--- HttpSwordInstaller.java	6 Mar 2005 20:21:47 -0000	1.18
***************
*** 119,123 ****
                  throw new InstallException(Msg.MISSING_FILE, exception);
              }
!             
              byte[] buf = new byte[4096];
              for (int count = 0; -1 != (count = in.read(buf)); )
--- 119,123 ----
                  throw new InstallException(Msg.MISSING_FILE, exception);
              }
! 
              byte[] buf = new byte[4096];
              for (int count = 0; -1 != (count = in.read(buf)); )

Index: FtpSwordInstaller.java
===================================================================
RCS file: /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/book/install/sword/FtpSwordInstaller.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** FtpSwordInstaller.java	15 Feb 2005 04:32:34 -0000	1.10
--- FtpSwordInstaller.java	6 Mar 2005 20:21:47 -0000	1.11
***************
*** 18,22 ****
  /**
   * An implementation of Installer for reading data from Sword FTP sites.
!  * 
   * <p><table border='1' cellPadding='3' cellSpacing='0'>
   * <tr><td bgColor='white' class='TableRowColor'><font size='-7'>
--- 18,22 ----
  /**
   * An implementation of Installer for reading data from Sword FTP sites.
!  *
   * <p><table border='1' cellPadding='3' cellSpacing='0'>
   * <tr><td bgColor='white' class='TableRowColor'><font size='-7'>
***************
*** 83,91 ****
          {
              log.info("Connecting to site=" + host + " dir=" + dir); //$NON-NLS-1$ //$NON-NLS-2$
!             
              // First connect
              ftp.connect(host);
              Thread.yield();
!             
              log.info(ftp.getReplyString());
              int reply1 = ftp.getReplyCode();
--- 83,91 ----
          {
              log.info("Connecting to site=" + host + " dir=" + dir); //$NON-NLS-1$ //$NON-NLS-2$
! 
              // First connect
              ftp.connect(host);
              Thread.yield();
! 
              log.info(ftp.getReplyString());
              int reply1 = ftp.getReplyCode();
***************
*** 95,103 ****
                  throw new InstallException(Msg.CONNECT_REFUSED, new Object[] { host, new Integer(reply1), text1 });
              }
!             
              // Authenticate
              ftp.login(username, password);
              Thread.yield();
!             
              log.info(ftp.getReplyString());
              reply1 = ftp.getReplyCode();
--- 95,103 ----
                  throw new InstallException(Msg.CONNECT_REFUSED, new Object[] { host, new Integer(reply1), text1 });
              }
! 
              // Authenticate
              ftp.login(username, password);
              Thread.yield();
! 
              log.info(ftp.getReplyString());
              reply1 = ftp.getReplyCode();
***************
*** 107,115 ****
                  throw new InstallException(Msg.AUTH_REFUSED, new Object[] { username, new Integer(reply1), text2 });
              }
!             
              // Change directory
              ftp.changeWorkingDirectory(dir);
              Thread.yield();
!             
              log.info(ftp.getReplyString());
              reply1 = ftp.getReplyCode();
--- 107,115 ----
                  throw new InstallException(Msg.AUTH_REFUSED, new Object[] { username, new Integer(reply1), text2 });
              }
! 
              // Change directory
              ftp.changeWorkingDirectory(dir);
              Thread.yield();
! 
              log.info(ftp.getReplyString());
              reply1 = ftp.getReplyCode();
***************
*** 119,123 ****
                  throw new InstallException(Msg.CWD_REFUSED, new Object[] { dir, new Integer(reply1), text3 });
              }
!             
              ftp.setFileType(FTP.BINARY_FILE_TYPE);
              Thread.yield();
--- 119,123 ----
                  throw new InstallException(Msg.CWD_REFUSED, new Object[] { dir, new Integer(reply1), text3 });
              }
! 
              ftp.setFileType(FTP.BINARY_FILE_TYPE);
              Thread.yield();