diff options
| author | slewis | 2007-07-30 20:56:48 +0000 |
|---|---|---|
| committer | slewis | 2007-07-30 20:56:48 +0000 |
| commit | 8e8b37af484b94bd0b0bd510432932dd5fdeffa3 (patch) | |
| tree | 5c00338672897ee02138219e9e0767190e5162e2 /framework/bundles/org.eclipse.ecf.presence.ui | |
| parent | 3aabd8500b6ad1b33ada10976a3429de5e89ce8f (diff) | |
| download | org.eclipse.ecf-8e8b37af484b94bd0b0bd510432932dd5fdeffa3.tar.gz org.eclipse.ecf-8e8b37af484b94bd0b0bd510432932dd5fdeffa3.tar.xz org.eclipse.ecf-8e8b37af484b94bd0b0bd510432932dd5fdeffa3.zip | |
Change to provide non-null MessageRenderer when no renderer is set. Also adjusted date/time output for messages so that space is presented after right paren
Diffstat (limited to 'framework/bundles/org.eclipse.ecf.presence.ui')
2 files changed, 3 insertions, 1 deletions
diff --git a/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/presence/ui/chatroom/ChatRoomManagerView.java b/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/presence/ui/chatroom/ChatRoomManagerView.java index 358ec5444..735cfd05a 100644 --- a/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/presence/ui/chatroom/ChatRoomManagerView.java +++ b/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/presence/ui/chatroom/ChatRoomManagerView.java @@ -1397,6 +1397,8 @@ public class ChatRoomManagerView extends ViewPart implements originator = text.getOriginator().getNickname(); } + if (messageRenderer == null) messageRenderer = new MessageRenderer(); + String output = messageRenderer.render(text.getText(), originator, localUserName); StyleRange[] ranges = messageRenderer.getStyleRanges(); diff --git a/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/presence/ui/chatroom/MessageRenderer.java b/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/presence/ui/chatroom/MessageRenderer.java index 34d41556a..db6552e40 100644 --- a/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/presence/ui/chatroom/MessageRenderer.java +++ b/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/presence/ui/chatroom/MessageRenderer.java @@ -104,7 +104,7 @@ public class MessageRenderer implements IMessageRenderer { } protected void appendDateTime() { - String message = NLS.bind(Messages.MessageRenderer_DEFAULT_DATETIME_FORMAT, getCurrentDate(DEFAULT_TIME_FORMAT)); + String message = NLS.bind(Messages.MessageRenderer_DEFAULT_DATETIME_FORMAT, getCurrentDate(DEFAULT_TIME_FORMAT)) + " "; append(message, dateColor, null, SWT.NORMAL); } |