[Arianne-commits] stendhal/src/games/stendhal/client/update UpdateManager.java, 1.49, 1.50

[Hendrik B. <nh...@us...>]

Update of /cvsroot/arianne/stendhal/src/games/stendhal/client/update
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv22087/src/games/stendhal/client/update

Modified Files:
	UpdateManager.java 
Log Message:
refactored downloadFile out of downloadFiles

Index: UpdateManager.java
===================================================================
RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/client/update/UpdateManager.java,v
retrieving revision 1.49
retrieving revision 1.50
diff -C2 -d -r1.49 -r1.50
*** UpdateManager.java	21 Oct 2009 19:03:13 -0000	1.49
--- UpdateManager.java	30 Oct 2009 19:11:21 -0000	1.50
***************
*** 245,277 ****
  		updateProgressBar.setVisible(true);
  		for (final String file : files) {
! 			System.out.println("Downloading " + file + " ...");
! 			final HttpClient httpClient = new HttpClient(serverFolder + file, true);
! 			httpClient.setProgressListener(updateProgressBar);
! 			if (!httpClient.fetchFile(jarFolder + file)) {
! 				UpdateGUIDialogs.messageBox("Sorry, an error occurred while downloading the update at file "
! 						+ file);
  				return false;
  			}
! 			try {
! 				final File fileObj = new File(jarFolder + file);
! 				final int shouldSize = Integer.parseInt(updateProp.getProperty(
! 						"file-size." + file, ""));
! 				if (fileObj.length() != shouldSize) {
! 					UpdateGUIDialogs.messageBox("Sorry, an error occurred while downloading the update. File size of "
! 							+ file
! 							+ " does not match. We got "
! 							+ fileObj.length()
! 							+ " but it should be "
! 							+ shouldSize);
! 					updateProgressBar.dispose();
! 					return false;
! 				}
! 			} catch (final NumberFormatException e) {
! 				e.printStackTrace(System.err);
  				updateProgressBar.dispose();
  				return false;
  			}
  		}
- 		updateProgressBar.dispose();
  		return true;
  	}
--- 245,291 ----
  		updateProgressBar.setVisible(true);
  		for (final String file : files) {
! 			boolean res = downloadFile(file);
! 			if (!res) {
  				return false;
  			}
! 		}
! 		updateProgressBar.dispose();
! 		return true;
! 	}
! 
! 	/**
! 	 * Downloads the specified file
! 	 *
! 	 * @param file name of file
! 	 * @return true, if the download was succesful, false otherwise
! 	 */
! 	private boolean downloadFile(final String file) {
! 		System.out.println("Downloading " + file + " ...");
! 		final HttpClient httpClient = new HttpClient(serverFolder + file, true);
! 		httpClient.setProgressListener(updateProgressBar);
! 		if (!httpClient.fetchFile(jarFolder + file)) {
! 			UpdateGUIDialogs.messageBox("Sorry, an error occurred while downloading the update at file "
! 					+ file);
! 			return false;
! 		}
! 		try {
! 			final File fileObj = new File(jarFolder + file);
! 			final int shouldSize = Integer.parseInt(updateProp.getProperty(
! 					"file-size." + file, ""));
! 			if (fileObj.length() != shouldSize) {
! 				UpdateGUIDialogs.messageBox("Sorry, an error occurred while downloading the update. File size of "
! 						+ file
! 						+ " does not match. We got "
! 						+ fileObj.length()
! 						+ " but it should be "
! 						+ shouldSize);
  				updateProgressBar.dispose();
  				return false;
  			}
+ 		} catch (final NumberFormatException e) {
+ 			e.printStackTrace(System.err);
+ 			updateProgressBar.dispose();
+ 			return false;
  		}
  		return true;
  	}