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

SPARK-221 Sparkplugs not stick on restart on the Mac.

Browse Source 
SPARK-293  	 Cancel of Spark Manager download does not actually close the inputstream.
SPARK-88  	 Updater should check for downloaded version of file in cases where the user does not want to restart.
SPARK-323  	 auto-away should change presence priority to 0
SPARK-324  	 Add presence status change on exit of Spark

git-svn-id: http://svn.igniterealtime.org/svn/repos/spark/trunk@4750 b35dd754-fafc-0310-a699-88a17e54d16e
This commit is contained in:
Derek DeMoro
2006-08-01 14:41:22 +00:00
committed by derek
parent 997a4bd14b
commit dff79629ed
8 changed files with 206 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

77
src/java/org/jivesoftware/MainWindow.java
View File

@ -13,12 +13,14 @@ package org.jivesoftware;
import org.jivesoftware.resource.Default;
import org.jivesoftware.resource.SparkRes;
import org.jivesoftware.smack.XMPPConnection;
import org.jivesoftware.smack.packet.Presence;
import org.jivesoftware.smackx.debugger.EnhancedDebuggerWindow;
import org.jivesoftware.spark.SparkManager;
import org.jivesoftware.spark.util.BrowserLauncher;
import org.jivesoftware.spark.util.ResourceUtils;
import org.jivesoftware.spark.util.SwingWorker;
import org.jivesoftware.spark.util.log.Log;
import org.jivesoftware.sparkimpl.plugin.alerts.InputTextAreaDialog;
import org.jivesoftware.sparkimpl.settings.JiveInfo;
import org.jivesoftware.sparkimpl.settings.local.SettingsManager;
import org.jivesoftware.sparkimpl.updater.CheckUpdates;
@ -240,39 +242,76 @@ public final class MainWindow extends JFrame implements ActionListener {
* setting the Agent to be offline.
*/
public void logout() {
// Set auto-login to false;
final XMPPConnection con = SparkManager.getConnection();
if (con.isConnected()) {
final InputTextAreaDialog inputTextDialog = new InputTextAreaDialog();
String status = inputTextDialog.getInput("Status Message", "Let others know your current status or activity.",
SparkRes.getImageIcon(SparkRes.USER1_MESSAGE_24x24), this);
if (status != null) {
Presence presence = new Presence(Presence.Type.UNAVAILABLE);
presence.setStatus(status);
con.sendPacket(presence);
}
}
// Set auto-login to false
SettingsManager.getLocalPreferences().setAutoLogin(false);
// Notify all MainWindowListeners
try {
fireWindowShutdown();
final XMPPConnection con = SparkManager.getConnection();
if (con.isConnected()) {
con.close();
}
setVisible(false);
}
finally {
try {
String command = "";
if (Spark.isWindows()) {
command = Spark.getBinDirectory().getParentFile().getCanonicalPath() + "\\Spark.exe";
}
else if (Spark.isMac()) {
command = "open -a Spark";
final SwingWorker shutdownThread = new SwingWorker() {
public Object construct() {
try {
Thread.sleep(10);
}
catch (InterruptedException e) {
Log.error(e);
}
return true;
}
Runtime.getRuntime().exec(command);
}
catch (IOException e) {
Log.error("Error starting Spark", e);
}
public void finished() {
closeConnectionAndInvoke();
}
};
shutdownThread.start();
System.exit(1);
}
}
private void closeConnectionAndInvoke() {
final XMPPConnection con = SparkManager.getConnection();
if (con.isConnected()) {
con.close();
}
try {
String command = "";
if (Spark.isWindows()) {
command = Spark.getBinDirectory().getParentFile().getCanonicalPath() + "\\Spark.exe";
}
else if (Spark.isMac()) {
command = "open -a Spark";
}
Runtime.getRuntime().exec(command);
}
catch (IOException e) {
Log.error("Error starting Spark", e);
}
System.exit(1);
}
/**
* Setup the Main Toolbar with File, Tools and Help.
*/