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

Updated version string to 2.6.0.

Browse Source 
[SPARK-969] and [SPARK-937] File transfer notifications now reflect transfer itself, not message before it.


git-svn-id: http://svn.igniterealtime.org/svn/repos/spark/trunk@10360 b35dd754-fafc-0310-a699-88a17e54d16e
This commit is contained in:
Daniel Henninger
2008-05-08 15:25:48 +00:00
committed by dhenninger
parent a82d33ed0a
commit 88636eff1f
7 changed files with 56 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/java/org/jivesoftware/spark/filetransfer/SparkTransferManager.java
View File

@ -54,6 +54,7 @@ import org.jivesoftware.sparkimpl.plugin.manager.Enterprise;
import java.awt.AWTException;
import java.awt.Component;
import java.awt.Color;
import java.awt.Cursor;
import java.awt.FileDialog;
import java.awt.Frame;
@ -246,6 +247,7 @@ public class SparkTransferManager {
String requestor = request.getRequestor();
String bareJID = StringUtils.parseBareAddress(requestor);
String fileName = request.getFileName();
ContactItem contactItem = contactList.getContactItemByJID(bareJID);
@ -260,7 +262,8 @@ public class SparkTransferManager {
TranscriptWindow transcriptWindow = chatRoom.getTranscriptWindow();
StyledDocument doc = (StyledDocument)transcriptWindow.getDocument();
transcriptWindow.insertCustomText(Res.getString("message.file.transfer.chat.window"), true, false, Color.BLACK);
// The image must first be wrapped in a style
Style style = doc.addStyle("StyleName", null);
@ -288,7 +291,7 @@ public class SparkTransferManager {
chatRoom.scrollToBottom();
SparkManager.getChatManager().getChatContainer().fireNotifyOnMessage(chatRoom);
SparkManager.getChatManager().getChatContainer().fireNotifyOnMessage(chatRoom, true, fileName);
}