Fixed for spurious error log messages and UI handling of carriage return line feed

2 files changed, 3 insertions, 2 deletions

diff --git a/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/ui/views/RosterView.java b/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/ui/views/RosterView.java
index 404d64d84..878a1735a 100644
--- a/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/ui/views/RosterView.java
+++ b/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/ui/views/RosterView.java
@@ -1324,6 +1324,7 @@ public class RosterView extends ViewPart implements IChatRoomViewCloseListener {
 	public void handleMessage(ID groupID, ID fromID, ID toID,
 			IMessageListener.Type type, String subject, String message) {
 		ChatWindow window = openChatWindowForTarget(fromID);
+		System.out.println("handleMessage("+groupID+","+fromID+","+toID+","+type+","+subject+","+message+")");
 		// finally, show message
 		if (window != null) {
 			window.handleMessage(fromID, toID, type, subject, message);
diff --git a/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/ui/views/TextChatComposite.java b/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/ui/views/TextChatComposite.java
index 90ee9e782..a83d03518 100644
--- a/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/ui/views/TextChatComposite.java
+++ b/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/ui/views/TextChatComposite.java
@@ -324,7 +324,7 @@ public class TextChatComposite extends Composite {
         
         int beforeMessageIndex = st.getText().length();
         
-        st.append(text.getText());
+        st.append(text.getText().trim());
         
         if (text.getOriginator() == null) {
             StyleRange sr = new StyleRange();
@@ -353,7 +353,7 @@ public class TextChatComposite extends Composite {
 
     protected void handleEnter() {
         String text = textinput.getText().trim();
-        if(text.length() > 0) sendTextLineInput(text);
+        if(text != null) sendTextLineInput(text);
         
         clearInput();
         isTyping = false;