[Squirrel-sql-commits] sql12/app/src/net/sourceforge/squirrel_sql/client/update/gui/installer Arti
A Java SQL client for any JDBC compliant database
Brought to you by:
colbell,
gerdwagner
From: Rob M. <man...@us...> - 2008-08-25 22:31:02
|
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-serv15424/app/src/net/sourceforge/squirrel_sql/client/update/gui/installer Modified Files: ArtifactInstallerImpl.java Log Message: Better handling for plugin files that don't exist. 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.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** ArtifactInstallerImpl.java 17 Aug 2008 21:16:23 -0000 1.12 --- ArtifactInstallerImpl.java 25 Aug 2008 22:30:59 -0000 1.13 *************** *** 225,232 **** String pluginDirectory = artifactName.replace(".zip", ""); String pluginJarFilename = artifactName.replace(".zip", ".jar"); ! File[] sourceFiles = new File[2]; ! sourceFiles[0] = _util.getFile(pluginInstallDir, pluginDirectory); ! sourceFiles[1] = _util.getFile(pluginInstallDir, pluginJarFilename); ! _util.createZipFile(pluginBackupFile, sourceFiles); } if (status.isTranslationArtifact()) --- 225,246 ---- String pluginDirectory = artifactName.replace(".zip", ""); String pluginJarFilename = artifactName.replace(".zip", ".jar"); ! ! ArrayList<File> filesToZip = new ArrayList<File>(); ! File pluginDirectoryFile = _util.getFile(pluginInstallDir, pluginDirectory); ! if (pluginDirectoryFile.exists()) { ! filesToZip.add(pluginDirectoryFile); ! } ! File pluginJarFile = _util.getFile(pluginInstallDir, pluginJarFilename); ! if (pluginJarFile.exists()) { ! filesToZip.add(pluginJarFile); ! } ! if (filesToZip.size() > 0) { ! _util.createZipFile(pluginBackupFile, filesToZip.toArray(new File[filesToZip.size()])); ! } else { ! s_log.error("Plugin ("+status.getName()+") was listed as already installed, but it's " + ! "files didn't exist and couldn't be backed up: pluginDirectoryFile="+ ! pluginDirectoryFile.getAbsolutePath()+" pluginJarFile="+ ! pluginJarFile.getAbsolutePath()); ! } } if (status.isTranslationArtifact()) *************** *** 388,392 **** if (status.isCoreArtifact()) { installedFileLocation = ! getCoreArtifactLocation(status.getName(), installRootDir, coreInstallDir); } if (status.isTranslationArtifact()) { --- 402,407 ---- if (status.isCoreArtifact()) { installedFileLocation = ! _util.getFile(getCoreArtifactLocation(status.getName(), installRootDir, coreInstallDir), ! status.getName()); } if (status.isTranslationArtifact()) { |