Removing filtering code as it appears to not be working at the moment.

3 files changed, 5 insertions, 25 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 94974ea46..f3c64e89c 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
@@ -28,7 +28,6 @@ public class Messages extends NLS {
 	public static String MultiRosterView_SetDoNotDisturb;
 	public static String MultiRosterView_SetInvisible;
 	public static String MultiRosterView_SetOffline;
-	public static String MultiRosterView_ShowOffline;
 	public static String MultiRosterView_AddContact;
 
 	public static String MessagesView_ShowTimestamps;
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 9d03ae3e5..2f32ea3bd 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
@@ -15,7 +15,6 @@
 
 MultiRosterView_SendIM = Send &IM
 MultiRosterView_Remove = &Remove
-MultiRosterView_ShowOffline = Show &Offline Contacts
 MultiRosterView_SetStatusAs = Set Status As...
 MultiRosterView_SetAvailable = &Available
 MultiRosterView_SetAway = A&way
@@ -28,6 +27,11 @@ MessagesView_ShowTimestamps = &Show Timestamps
 MessagesView_CouldNotSendMessage = The message could not be sent: {0}
 MessagesView_TypingNotification = {0} is typing a message...
 
+AddContactDialog_DialogTitle = Add Contact
+AddContactDialog_UserID = User ID:
+AddContactDialog_Alias = Alias:
+AddContactDialog_Account = Account:
+
 RosterWorkbenchAdapterFactory_Mode = Mode: {0} 
 RosterWorkbenchAdapterFactory_Type = Type: {0} 
 RosterWorkbenchAdapterFactory_Account = 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 5d497be71..97a455f62 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
@@ -362,29 +362,6 @@ public class MultiRosterView extends ViewPart implements IMultiRosterViewPart {
 		setStatusMenu.add(setOfflineAction);
 		setStatusMenu.setVisible(false);
 		manager.add(setStatusMenu);
-
-		manager.add(new Separator());
-		final ViewerFilter filter = new ViewerFilter() {
-			public boolean select(Viewer viewer, Object parentElement,
-					Object element) {
-				if (element instanceof IRosterEntry) {
-					return ((IRosterEntry) element).getPresence().getType() == IPresence.Type.AVAILABLE;
-				} else {
-					return true;
-				}
-			}
-		};
-		manager.add(new Action(Messages.MultiRosterView_ShowOffline,
-				IAction.AS_CHECK_BOX) {
-			public void run() {
-				if (isChecked()) {
-					treeViewer.addFilter(filter);
-				} else {
-					treeViewer.removeFilter(filter);
-				}
-			}
-		});
-
 		manager.add(new Separator());
 		manager.add(new Action(Messages.MultiRosterView_AddContact) {
 			public void run() {