Fix for bug 194975.v20080421-0800

3 files changed, 39 insertions, 17 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 56df1fd42..26be6b8dc 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
@@ -17,7 +17,7 @@ import org.eclipse.osgi.util.NLS;
 public class Messages extends NLS {
 
 	private static final String BUNDLE_NAME = "org.eclipse.ecf.internal.presence.ui.messages"; //$NON-NLS-1$
-	
+
 	public static String ChangePasswordDialog_1;
 
 	public static String ChangePasswordDialog_CHANGE_PASSWORD;
@@ -38,13 +38,13 @@ public class Messages extends NLS {
 	public static String ChatRoomManagerView_CLEAR_TEXT;
 
 	public static String ChatRoomManagerView_CLEAR_TOOLTIP;
-	
+
 	public static String ChatRoomManagerView_PASTE_TEXT;
-	
+
 	public static String ChatRoomManagerView_PASTE_TOOLTIP;
-	
+
 	public static String ChatRoomManagerView_CLEAR_CONFIRM_TITLE;
-	
+
 	public static String ChatRoomManagerView_CLEAR_CONFIRM_MESSAGE;
 
 	public static String ChatRoomManagerView_CLOSE_CHAT_ROOM_MESSAGE;
@@ -68,11 +68,11 @@ public class Messages extends NLS {
 	public static String ChatRoomManagerView_DEFAULT_USER;
 
 	public static String ChatRoomManagerView_ENTERED_MESSAGE;
-	
+
 	public static String ChatRoomManagerView_LEFT_MESSAGE;
 
 	public static String ChatRoomManagerView_JOIN_COMMAND;
-	
+
 	public static String ChatRoomManagerView_MESSAGE;
 
 	public static String ChatRoomManagerView_NOT_CONNECTED_MESSAGE;
@@ -80,7 +80,7 @@ public class Messages extends NLS {
 	public static String ChatRoomManagerView_NOT_CONNECTED_TITLE;
 
 	public static String ChatRoomManagerView_QUIT_COMMAND;
-	
+
 	public static String ChatRoomManagerView_PART_COMMAND;
 
 	public static String ChatRoomManagerView_SELECT_ALL_TEXT;
@@ -179,6 +179,8 @@ public class Messages extends NLS {
 
 	public static String MultiRosterView_ROSTER_VIEW_EXT_POINT_ERROR_MESSAGE;
 
+	public static String MultiRosterView_HELP_MESSAGE;
+
 	public static String MultiRosterView_SendIM;
 	public static String MultiRosterView_Remove;
 	public static String MultiRosterView_SetStatusAs;
@@ -201,7 +203,7 @@ public class Messages extends NLS {
 	public static String MessagesView_TypingNotification;
 	public static String MessagesView_Copy;
 	public static String MessagesView_SelectAll;
-	
+
 	public static String AddContactDialog_DialogTitle;
 	public static String AddContactDialog_UserID;
 	public static String AddContactDialog_Alias;
@@ -220,27 +222,27 @@ public class Messages extends NLS {
 	public static String ReceiveAuthorizeRequestDialog_TO_BUDDY_LIST;
 
 	public static String ReceiveAuthorizeRequestDialog_WOULD_LIKE_TO_ADD;
-	
+
 	public static String RosterWorkbenchAdapterFactory_Mode;
 	public static String RosterWorkbenchAdapterFactory_Type;
 	public static String RosterWorkbenchAdapterFactory_Account;
 	public static String RosterWorkbenchAdapterFactory_Disconnected;
 	public static String RosterWorkbenchAdapterFactory_GroupLabel;
-	
+
 	public static String BrowseDialog_title;
 	public static String BrowseDialog_scanning;
 	public static String BrowseDialog_message;
-	
+
 	public static String ToggleOnlineOnlyAction_title;
 
 	public static String MessageRenderer_DEFAULT_DATE_FORMAT;
 	public static String MessageRenderer_DEFAULT_DATETIME_FORMAT;
 	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 04d07dfa2..42e83142e 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
@@ -86,6 +86,7 @@ MultiRosterView_DISCONNECT_ALL_ACCOUNTS_ACTION_TEXT=Disconnect all accounts
 MultiRosterView_DISCONNECT_ACCOUNT_QUESTION_MESSAGE=Disconnect account {0}?
 MultiRosterView_ROSTER_VIEW_EXT_POINT_ERROR_MESSAGE=Error in loading rosterViewerDropTargetExtension
 MultiRosterView_EXCEPTION_JOIN_ROOM_INVALID_ACCOUNT=Invalid account
+MultiRosterView_HELP_MESSAGE=No accounts connected\n\nTo connect to an account, click on "Connect to Provider" icon in toolbar.
 ChatRoomSelectionDialog_MESSAGE=Select a Chat Room to Enter
 ChatRoomManagerView_DEFAULT_USER=<user>
 ChatRoomManagerView_DEFAULT_HOST=<host>
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 f02ef32a4..9a7866042 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
@@ -113,6 +113,10 @@ public class MultiRosterView extends ViewPart implements IMultiRosterViewPart {
 
 	private RosterViewerDropAdapter dropAdapter;
 
+	private PageBook pageBook;
+
+	private Label helpMessageLabel;
+
 	private ViewerFilter hideOfflineFilter = new ViewerFilter() {
 		public boolean select(Viewer viewer, Object parentElement, Object element) {
 			if (element instanceof IRosterEntry) {
@@ -141,7 +145,19 @@ public class MultiRosterView extends ViewPart implements IMultiRosterViewPart {
 	 * @see org.eclipse.ui.part.WorkbenchPart#createPartControl(org.eclipse.swt.widgets.Composite)
 	 */
 	public void createPartControl(Composite parent) {
-		setupTreeViewer(parent);
+		pageBook = new PageBook(parent, SWT.NONE);
+
+		createHelpMessage(pageBook);
+		setupTreeViewer(pageBook);
+
+		pageBook.showPage(helpMessageLabel);
+	}
+
+	private void createHelpMessage(Composite parent) {
+		if (!parent.isDisposed()) {
+			helpMessageLabel = new Label(parent, SWT.TOP + SWT.LEFT + SWT.WRAP);
+			helpMessageLabel.setText(Messages.MultiRosterView_HELP_MESSAGE);
+		}
 	}
 
 	protected void setupTreeViewer(Composite parent) {
@@ -747,8 +763,10 @@ public class MultiRosterView extends ViewPart implements IMultiRosterViewPart {
 			treeViewer.remove(account.getRoster());
 		// Remove account
 		rosterAccounts.remove(account);
-		// Disable local pull down window if no more accounts
-		setLocalPullDownEnabled(rosterAccounts.size() > 0);
+		if (rosterAccounts.size() == 0) {
+			setLocalPullDownEnabled(false);
+			pageBook.showPage(helpMessageLabel);
+		}
 		account.dispose();
 		refreshTreeViewer(null, true);
 	}
@@ -837,6 +855,7 @@ public class MultiRosterView extends ViewPart implements IMultiRosterViewPart {
 		setStatusMenu.setVisible(true);
 		getViewSite().getActionBars().getMenuManager().update(true);
 		treeViewer.add(treeViewer.getInput(), account.getRoster());
+		pageBook.showPage(treeViewer.getControl());
 		return true;
 	}