[Squirrel-sql-commits] sql12/app/src/net/sourceforge/squirrel_sql/client/update/gui/installer ArtifactInstallerImpl.java, 1.14, 1.15

[Rob M. <man...@us...>]

Update of /cvsroot/squirrel-sql/sql12/app/src/net/sourceforge/squirrel_sql/client/update/gui/installer
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv7021/app/src/net/sourceforge/squirrel_sql/client/update/gui/installer

Modified Files:
	ArtifactInstallerImpl.java 
Log Message:
Fixed a bug which was caused by the downloadsDirFile field not being populated.  Changed getLocalReleaseFile to return an actual file since this seems a more common need.  Removed useless fileExists API method as it adds no value now that mocks are being used for actual files.

Index: ArtifactInstallerImpl.java
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/app/src/net/sourceforge/squirrel_sql/client/update/gui/installer/ArtifactInstallerImpl.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** ArtifactInstallerImpl.java	26 Aug 2008 15:10:17 -0000	1.14
--- ArtifactInstallerImpl.java	26 Aug 2008 19:29:04 -0000	1.15
***************
*** 137,141 ****
  		updateDir = _util.getSquirrelUpdateDir();
  		backupRootDir = _util.checkDir(updateDir, UpdateUtil.BACKUP_ROOT_DIR_NAME);
! 
  		coreBackupDir = _util.checkDir(backupRootDir, UpdateUtil.CORE_ARTIFACT_ID);
  		pluginBackupDir = _util.checkDir(backupRootDir, UpdateUtil.PLUGIN_ARTIFACT_ID);
--- 137,142 ----
  		updateDir = _util.getSquirrelUpdateDir();
  		backupRootDir = _util.checkDir(updateDir, UpdateUtil.BACKUP_ROOT_DIR_NAME);
! 		downloadsRootDir = _util.checkDir(updateDir, UpdateUtil.DOWNLOADS_DIR_NAME);
! 		
  		coreBackupDir = _util.checkDir(backupRootDir, UpdateUtil.CORE_ARTIFACT_ID);
  		pluginBackupDir = _util.checkDir(backupRootDir, UpdateUtil.PLUGIN_ARTIFACT_ID);
***************
*** 197,201 ****
  		sendBackupStarted();
  
! 		File localReleaseFile = new File(_util.getLocalReleaseFile());
  		_util.copyFile(localReleaseFile, _util.getBackupDir());
  		
--- 198,202 ----
  		sendBackupStarted();
  
! 		File localReleaseFile = _util.getLocalReleaseFile();
  		_util.copyFile(localReleaseFile, _util.getBackupDir());
  		
***************
*** 248,252 ****
  				File translationFile = _util.getFile(i18nInstallDir, artifactName);
  				File backupFile = _util.getFile(translationBackupDir, artifactName);
! 				if (_util.fileExists(translationFile))
  				{
  					_util.copyFile(translationFile, backupFile);
--- 249,253 ----
  				File translationFile = _util.getFile(i18nInstallDir, artifactName);
  				File backupFile = _util.getFile(translationBackupDir, artifactName);
! 				if (translationFile.exists())
  				{
  					_util.copyFile(translationFile, backupFile);
***************
*** 365,369 ****
  			}			
  		}
! 		if (!_util.deleteFile(new File(_util.getLocalReleaseFile()))) {
  			return false;
  		} else {
--- 366,370 ----
  			}			
  		}
! 		if (!_util.deleteFile(_util.getLocalReleaseFile())) {
  			return false;
  		} else {
***************
*** 475,480 ****
  		try
  		{
! 			final String localReleaseFile = _util.getLocalReleaseFile();
! 			_util.deleteFile(new File(localReleaseFile));
  		}
  		catch (FileNotFoundException e)
--- 476,480 ----
  		try
  		{
! 			_util.deleteFile(_util.getLocalReleaseFile());
  		}
  		catch (FileNotFoundException e)