Fixes to view and menus

3 files changed, 11 insertions, 7 deletions

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 66a8eb6c8..2c231a043 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
@@ -64,8 +64,8 @@ ChangePasswordDialog_PASSWORDS_NO_MATCH_TITLE=Passwords do not match
 ChangePasswordDialog_PASSWORDS_NO_MATCH_MESSAGE=Passwords do not match.  Please try again
 ChatRoomManagerUI_EXCEPTION_CHAT_ROOM_VIEW_INITIALIZATION=Exception in chat room view initialization for 
 MultiRosterView_NO_IDENTIFIER_FOR_ROOM_MESSAGE=Could not create proper identifier for chat room {0}
-MultiRosterView_DISCONNECT_ACCOUNT_ACTION_TEXT=Disconnect account
-MultiRosterView_SHOW_CHAT_ROOMS_FOR_ACCOUNT_ACTION_TEXT=Show chat rooms for account
+MultiRosterView_DISCONNECT_ACCOUNT_ACTION_TEXT=Disconnect
+MultiRosterView_SHOW_CHAT_ROOMS_FOR_ACCOUNT_ACTION_TEXT=Show chat rooms
 MultiRosterView_DISCONNECT_ALL_ACCOUNTS_QUESTION_MESSAGE=Disconnect all accounts?
 MultiRosterView_DISCONNECT_ALL_ACCOUNTS_ACTION_TEXT=Disconnect all accounts
 MultiRosterView_DISCONNECT_ACCOUNT_QUESTION_MESSAGE=Disconnect account {0}?
diff --git a/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/presence/ui/MultiRosterView.java b/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/presence/ui/MultiRosterView.java
index e509d9ab8..c1fa0db55 100644
--- a/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/presence/ui/MultiRosterView.java
+++ b/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/presence/ui/MultiRosterView.java
@@ -528,13 +528,16 @@ public class MultiRosterView extends ViewPart implements IMultiRosterViewPart {
 			// if the person is not online, we'll disable the action
 			imAction
 					.setEnabled(entry.getPresence().getType() == IPresence.Type.AVAILABLE);
+			manager.add(new Separator());
 			manager.add(new Separator(IWorkbenchActionConstants.MB_ADDITIONS));
+			manager.add(new Separator());
 			manager.add(removeAction);
 		} else if (element instanceof IRoster) {
 			manager.add(openAccountChatRoomAction);
 			manager.add(new Separator());
-			manager.add(disconnectAccountAction);
 			manager.add(new Separator(IWorkbenchActionConstants.MB_ADDITIONS));
+			manager.add(new Separator());
+			manager.add(disconnectAccountAction);
 		} else {
 			manager.add(new Separator(IWorkbenchActionConstants.MB_ADDITIONS));
 		}
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 ec97c5ff2..6bee8caad 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
@@ -81,6 +81,7 @@ import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Menu;
 import org.eclipse.swt.widgets.Text;
 import org.eclipse.ui.ISharedImages;
+import org.eclipse.ui.IWorkbenchActionConstants;
 import org.eclipse.ui.IWorkbenchPreferenceConstants;
 import org.eclipse.ui.PlatformUI;
 import org.eclipse.ui.editors.text.EditorsUI;
@@ -266,11 +267,11 @@ public class ChatRoomManagerView extends ViewPart implements
 			manager.add(outputClear);
 			manager.add(new Separator());
 			manager.add(outputSelectAll);
-			manager.add(new Separator("#additions")); //$NON-NLS-1$
+			manager.add(new Separator(IWorkbenchActionConstants.MB_ADDITIONS)); //$NON-NLS-1$
 		}
 
 		private void hookContextMenu() {
-			MenuManager menuMgr = new MenuManager("#PopupMenu"); //$NON-NLS-1$
+			MenuManager menuMgr = new MenuManager(); 
 			menuMgr.setRemoveAllWhenShown(true);
 			menuMgr.addMenuListener(new IMenuListener() {
 				public void menuAboutToShow(IMenuManager manager) {
@@ -1465,11 +1466,11 @@ public class ChatRoomManagerView extends ViewPart implements
 		manager.add(outputClear);
 		manager.add(new Separator());
 		manager.add(outputSelectAll);
-		manager.add(new Separator("#Additions")); //$NON-NLS-1$
+		manager.add(new Separator(IWorkbenchActionConstants.MB_ADDITIONS)); //$NON-NLS-1$
 	}
 
 	private void hookContextMenu() {
-		MenuManager menuMgr = new MenuManager("#PopupMenu"); //$NON-NLS-1$
+		MenuManager menuMgr = new MenuManager(); 
 		menuMgr.setRemoveAllWhenShown(true);
 		menuMgr.addMenuListener(new IMenuListener() {
 			public void menuAboutToShow(IMenuManager manager) {