Fix for bug 194981v20080418-1632

6 files changed, 12 insertions, 5 deletions

diff --git a/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/internal/presence/ui/Messages.java b/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/internal/presence/ui/Messages.java
index 42f3389b6..56df1fd42 100644
--- a/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/internal/presence/ui/Messages.java
+++ b/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/internal/presence/ui/Messages.java
@@ -238,6 +238,8 @@ public class Messages extends NLS {
 	public static String MessageRenderer_DEFAULT_TIME_FORMAT;
 	
 	public static String ChatRoomPreferencePage_CHATROOM_SHOW_USER_PRESENCE_TEXT;
+
+	public static String ChatRoomPreferencePage_SCROLL_OUTPUT_ON_INPUT;
 	
 	static {
 		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
diff --git a/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/internal/presence/ui/messages.properties b/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/internal/presence/ui/messages.properties
index 5d52fa30d..04d07dfa2 100644
--- a/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/internal/presence/ui/messages.properties
+++ b/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/internal/presence/ui/messages.properties
@@ -144,5 +144,6 @@ MessageRenderer_DEFAULT_TIME_FORMAT=HH:mm:ss
 MessageRenderer_DEFAULT_DATE_FORMAT=yyyy-MM-dd
 MessageRenderer_DEFAULT_DATETIME_FORMAT=({0})
 
-ChatRoomPreferencePage_CHATROOM_SHOW_USER_PRESENCE_TEXT=&Show user entry messages
- 
\ No newline at end of file
+ChatRoomPreferencePage_CHATROOM_SHOW_USER_PRESENCE_TEXT=&Show user entry and exit messages
+ 
+ChatRoomPreferencePage_SCROLL_OUTPUT_ON_INPUT=Scroll &output to bottom on user input
diff --git a/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/internal/presence/ui/preferences/ChatRoomPreferencePage.java b/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/internal/presence/ui/preferences/ChatRoomPreferencePage.java
index b26d597e5..ac0b0a6b2 100644
--- a/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/internal/presence/ui/preferences/ChatRoomPreferencePage.java
+++ b/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/internal/presence/ui/preferences/ChatRoomPreferencePage.java
@@ -30,6 +30,7 @@ public class ChatRoomPreferencePage extends FieldEditorPreferencePage implements
 	 */
 	public void createFieldEditors() {
 		addField(new BooleanFieldEditor(PreferenceConstants.CHATROOM_SHOW_USER_PRESENCE, Messages.ChatRoomPreferencePage_CHATROOM_SHOW_USER_PRESENCE_TEXT, getFieldEditorParent()));
+		addField(new BooleanFieldEditor(PreferenceConstants.PREFERENCES_SCROLLONINPUT, Messages.ChatRoomPreferencePage_SCROLL_OUTPUT_ON_INPUT, getFieldEditorParent()));
 	}
 
 	/*
diff --git a/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/internal/presence/ui/preferences/PreferenceConstants.java b/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/internal/presence/ui/preferences/PreferenceConstants.java
index b9db89b28..2104f0496 100644
--- a/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/internal/presence/ui/preferences/PreferenceConstants.java
+++ b/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/internal/presence/ui/preferences/PreferenceConstants.java
@@ -16,4 +16,6 @@ package org.eclipse.ecf.internal.presence.ui.preferences;
  */
 public class PreferenceConstants {
 	public static final String CHATROOM_SHOW_USER_PRESENCE = "chatroom.user.presence.visible"; //$NON-NLS-1$
+	public static final String PREFERENCES_SCROLLONINPUT = "chatroom.scrollonuserinput"; //$NON-NLS-1$
+
 }
diff --git a/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/internal/presence/ui/preferences/PreferenceInitializer.java b/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/internal/presence/ui/preferences/PreferenceInitializer.java
index 5d13ac59b..7152c7d12 100644
--- a/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/internal/presence/ui/preferences/PreferenceInitializer.java
+++ b/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/internal/presence/ui/preferences/PreferenceInitializer.java
@@ -12,9 +12,8 @@
 package org.eclipse.ecf.internal.presence.ui.preferences;
 
 import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer;
-import org.eclipse.jface.preference.IPreferenceStore;
-
 import org.eclipse.ecf.internal.presence.ui.Activator;
+import org.eclipse.jface.preference.IPreferenceStore;
 
 /**
  * Class used to initialize default preference values.
@@ -27,6 +26,7 @@ public class PreferenceInitializer extends AbstractPreferenceInitializer {
 	public void initializeDefaultPreferences() {
 		IPreferenceStore store = Activator.getDefault().getPreferenceStore();
 		store.setDefault(PreferenceConstants.CHATROOM_SHOW_USER_PRESENCE, false);
+		store.setDefault(PreferenceConstants.PREFERENCES_SCROLLONINPUT, false);
 	}
 
 }
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 40b97c87a..f8e1c43a8 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
@@ -856,7 +856,8 @@ public class ChatRoomManagerView extends ViewPart implements IChatRoomInvitation
 					handleTextInput(inputText.getText());
 				clearInput();
 				makeTabItemNormal();
-				scrollToEnd(getOutputText());
+				if (Activator.getDefault().getPreferenceStore().getBoolean(PreferenceConstants.PREFERENCES_SCROLLONINPUT))
+					scrollToEnd(getOutputText());
 				evt.doit = false;
 				isCycling = false;
 			} else if (evt.character == SWT.TAB) {