mirror/Spark
3
0
Fork 0
mirror of https://github.com/igniterealtime/Spark.git synced 2025-12-01 12:27:58 +00:00
Code Issues Projects Releases Wiki Activity

Move update directory.

Browse Source 
git-svn-id: http://svn.igniterealtime.org/svn/repos/spark/trunk@9078 b35dd754-fafc-0310-a699-88a17e54d16e
This commit is contained in:
Derek DeMoro
2007-09-07 18:03:31 +00:00
committed by derek
parent 91c5b1c49f
commit 6e13ce3615
1 changed files with 20 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/java/org/jivesoftware/sparkimpl/updater/CheckUpdates.java
View File

@ -40,6 +40,13 @@ import org.jivesoftware.sparkimpl.settings.JiveInfo;
import org.jivesoftware.sparkimpl.settings.local.LocalPreferences; import org.jivesoftware.sparkimpl.settings.local.LocalPreferences;
import org.jivesoftware.sparkimpl.settings.local.SettingsManager; import org.jivesoftware.sparkimpl.settings.local.SettingsManager;
import javax.swing.JEditorPane;
import javax.swing.JFrame;
import javax.swing.JOptionPane;
import javax.swing.JProgressBar;
import javax.swing.JScrollPane;
import javax.swing.text.html.HTMLEditorKit;
import java.awt.Color; import java.awt.Color;
import java.awt.GridBagConstraints; import java.awt.GridBagConstraints;
import java.awt.GridBagLayout; import java.awt.GridBagLayout;
@ -56,13 +63,6 @@ import java.util.Date;
import java.util.Iterator; import java.util.Iterator;
import java.util.TimerTask; import java.util.TimerTask;
import javax.swing.JEditorPane;
import javax.swing.JFrame;
import javax.swing.JOptionPane;
import javax.swing.JProgressBar;
import javax.swing.JScrollPane;
import javax.swing.text.html.HTMLEditorKit;
public class CheckUpdates { public class CheckUpdates {
private String mainUpdateURL; private String mainUpdateURL;
private JProgressBar bar; private JProgressBar bar;
@ -406,15 +406,20 @@ public class CheckUpdates {
filename = filename.substring(filename.indexOf('=') + 1); filename = filename.substring(filename.indexOf('=') + 1);
} }
final File downloadFile = new File(Spark.getBinDirectory(), filename); // Set Download Directory
if (downloadFile.exists()) { final File downloadDir = new File(Spark.getSparkUserHome(), "updates");
downloadFile.delete(); downloadDir.mkdirs();
// Set file to download.
final File fileToDownload = new File(downloadDir, filename);
if (fileToDownload.exists()) {
fileToDownload.delete();
} }
ConfirmDialog confirm = new ConfirmDialog(); ConfirmDialog confirm = new ConfirmDialog();
confirm.showConfirmDialog(SparkManager.getMainWindow(), Res.getString("title.new.version.available"), confirm.showConfirmDialog(SparkManager.getMainWindow(), Res.getString("title.new.version.available"),
Res.getString("message.new.spark.available", filename), Res.getString("yes"), Res.getString("no"), Res.getString("message.new.spark.available", filename), Res.getString("yes"), Res.getString("no"),
null); null);
confirm.setDialogSize(400, 300); confirm.setDialogSize(400, 300);
confirm.setConfirmListener(new ConfirmListener() { confirm.setConfirmListener(new ConfirmListener() {
public void yesOption() { public void yesOption() {
@ -431,7 +436,7 @@ public class CheckUpdates {
public void finished() { public void finished() {
if (Spark.isWindows()) { if (Spark.isWindows()) {
downloadUpdate(downloadFile, serverVersion); downloadUpdate(fileToDownload, serverVersion);
} }
else { else {
// Launch browser to download page. // Launch browser to download page.
@ -591,8 +596,8 @@ public class CheckUpdates {
private void promptForInstallation(final File downloadedFile, String title, String message) { private void promptForInstallation(final File downloadedFile, String title, String message) {
ConfirmDialog confirm = new ConfirmDialog(); ConfirmDialog confirm = new ConfirmDialog();
confirm.showConfirmDialog(SparkManager.getMainWindow(), title, confirm.showConfirmDialog(SparkManager.getMainWindow(), title,
message, Res.getString("yes"), Res.getString("no"), message, Res.getString("yes"), Res.getString("no"),
null); null);
confirm.setConfirmListener(new ConfirmListener() { confirm.setConfirmListener(new ConfirmListener() {
public void yesOption() { public void yesOption() {
try { try {