bug 198043: [ui] open contacts dialog doesn't recognize users in groups

https://bugs.eclipse.org/bugs/show_bug.cgi?id=198043

1 files changed, 15 insertions, 1 deletions

diff --git a/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/internal/presence/ui/handlers/BrowseDialog.java b/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/internal/presence/ui/handlers/BrowseDialog.java
index 1629120d8..a5994f0ba 100644
--- a/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/internal/presence/ui/handlers/BrowseDialog.java
+++ b/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/internal/presence/ui/handlers/BrowseDialog.java
@@ -30,6 +30,7 @@ import org.eclipse.ecf.presence.IPresence;
 import org.eclipse.ecf.presence.IPresenceContainerAdapter;
 import org.eclipse.ecf.presence.roster.IRoster;
 import org.eclipse.ecf.presence.roster.IRosterEntry;
+import org.eclipse.ecf.presence.roster.IRosterGroup;
 import org.eclipse.ecf.presence.roster.IRosterItem;
 import org.eclipse.ecf.presence.roster.IRosterManager;
 import org.eclipse.ecf.ui.SharedImages;
@@ -120,7 +121,8 @@ public class BrowseDialog extends FilteredItemsSelectionDialog {
 					Collection items = 
 						manager.getRoster().getItems();
 					for(Iterator it = items.iterator(); it.hasNext(); ) {
-						contentProvider.add(it.next(), itemsFilter);
+						IRosterItem item = (IRosterItem) it.next();
+						addRosterItem(item, contentProvider, itemsFilter);
 					}
 				}
 			}
@@ -130,6 +132,18 @@ public class BrowseDialog extends FilteredItemsSelectionDialog {
 			progressMonitor.done();
 	}
 
+	// cycle through all roster items recursively
+	private void addRosterItem(IRosterItem item,
+			AbstractContentProvider contentProvider, ItemsFilter itemsFilter) {
+		if(item instanceof IRosterGroup) {
+			IRosterGroup group = (IRosterGroup) item;	
+			for(Iterator it = group.getEntries().iterator(); it.hasNext();) {
+				addRosterItem((IRosterItem) it.next(), contentProvider, itemsFilter);
+			}
+		}
+		contentProvider.add(item, itemsFilter);
+	}
+
 	/* (non-Javadoc)
 	 * @see org.eclipse.ui.dialogs.FilteredItemsSelectionDialog#getDialogSettings()
 	 */