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

1) Removed old Chat Preferences and using LocalPreferences now.

Browse Source 
2) Fixed minor group chat bug attempting to load a VCard for a Conference Room.

git-svn-id: http://svn.igniterealtime.org/svn/repos/spark/trunk@4901 b35dd754-fafc-0310-a699-88a17e54d16e
This commit is contained in:
Derek DeMoro
2006-08-14 15:40:37 +00:00
committed by derek
parent cd20cf6b2f
commit f678f06c6f
11 changed files with 75 additions and 241 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/java/org/jivesoftware/spark/ui/TranscriptWindow.java
View File

@ -20,8 +20,8 @@ import org.jivesoftware.spark.plugin.ContextMenuListener;
import org.jivesoftware.spark.preference.PreferenceManager;
import org.jivesoftware.spark.util.ModelUtil;
import org.jivesoftware.spark.util.log.Log;
import org.jivesoftware.sparkimpl.preference.chat.ChatPreference;
import org.jivesoftware.sparkimpl.preference.chat.ChatPreferences;
import org.jivesoftware.sparkimpl.settings.local.LocalPreferences;
import org.jivesoftware.sparkimpl.settings.local.SettingsManager;
import java.awt.Color;
import java.awt.Component;
@ -63,7 +63,7 @@ public class TranscriptWindow extends ChatArea {
private List<TranscriptWindowInterceptor> interceptors = new ArrayList<TranscriptWindowInterceptor>();
private ChatPreferences chatPref;
private Date lastUpdated;
/**
@ -80,7 +80,6 @@ public class TranscriptWindow extends ChatArea {
/* Load Preferences for this instance */
PreferenceManager preferenceManager = SparkManager.getPreferenceManager();
chatPref = (ChatPreferences)preferenceManager.getPreferenceData(ChatPreference.NAMESPACE);
addMouseListener(this);
addMouseMotionListener(this);
@ -383,7 +382,7 @@ public class TranscriptWindow extends ChatArea {
* @return the formatted date.
*/
private String getDate(Date insertDate) {
chatPref = (ChatPreferences)SparkManager.getPreferenceManager().getPreferenceData(ChatPreference.NAMESPACE);
final LocalPreferences pref = SettingsManager.getLocalPreferences();
if (insertDate == null) {
insertDate = new Date();
@ -392,7 +391,7 @@ public class TranscriptWindow extends ChatArea {
StyleConstants.setFontFamily(styles, font.getFontName());
StyleConstants.setFontSize(styles, font.getSize());
if (chatPref.showDatesInChat()) {
if (pref.isTimeDisplayedInChat()) {
final SimpleDateFormat formatter = new SimpleDateFormat("h:mm a");
final String date = formatter.format(insertDate);
@ -471,6 +470,8 @@ public class TranscriptWindow extends ChatArea {
* @see ChatRoom#getTranscripts()
*/
public void saveTranscript(String fileName, List transcript, String headerData) {
final LocalPreferences pref = SettingsManager.getLocalPreferences();
try {
SimpleDateFormat formatter;
@ -495,7 +496,7 @@ public class TranscriptWindow extends ChatArea {
final Message message = (Message)transcripts.next();
String from = message.getFrom();
if (from == null) {
from = chatPref.getNickname();
from = pref.getNickname();
}
if (Message.Type.GROUP_CHAT == message.getType()) {