From db8b02eb349ac61673fb7381403a27df5ea1b273 Mon Sep 17 00:00:00 2001
From: Michael Valenta
Date: Fri, 27 Jan 2006 22:03:24 +0000
Subject: React to Common Navigator fix which allows programmatic binding

---
 bundles/org.eclipse.team.cvs.ui/plugin.xml                        | 7 +------
 bundles/org.eclipse.team.ui/plugin.xml                            | 8 --------
 .../org/eclipse/team/internal/ui/mapping/CommonViewerAdvisor.java | 1 +
 3 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/bundles/org.eclipse.team.cvs.ui/plugin.xml b/bundles/org.eclipse.team.cvs.ui/plugin.xml
index d59151745..31dd143d5 100644
--- a/bundles/org.eclipse.team.cvs.ui/plugin.xml
+++ b/bundles/org.eclipse.team.cvs.ui/plugin.xml
@@ -66,12 +66,7 @@
    <extension
          point="org.eclipse.ui.navigator.viewer">
       <viewerContentBinding 
-         viewerId="org.eclipse.team.cvs.ui.workspaceSynchronization">                     
-         <includes>                     
-            <contentExtension   
-               pattern=".*" 
-               isRoot="true"/>
-         </includes>
+         viewerId="org.eclipse.team.cvs.ui.workspaceSynchronization">
        </viewerContentBinding>
        <viewer
              viewerId="org.eclipse.team.cvs.ui.workspaceSynchronization">
diff --git a/bundles/org.eclipse.team.ui/plugin.xml b/bundles/org.eclipse.team.ui/plugin.xml
index 6d059c1df..d6d073261 100644
--- a/bundles/org.eclipse.team.ui/plugin.xml
+++ b/bundles/org.eclipse.team.ui/plugin.xml
@@ -362,14 +362,6 @@
    </extension>
    <extension
          point="org.eclipse.ui.navigator.viewer">
-      <viewerContentBinding 
-         viewerId="org.eclipse.team.ui.navigatorViewer">                     
-         <includes>                     
-            <contentExtension   
-               pattern=".*" 
-               isRoot="true"/>
-         </includes>
-       </viewerContentBinding>
        <viewer
              viewerId="org.eclipse.team.ui.navigatorViewer">
            <popupMenu
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/CommonViewerAdvisor.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/CommonViewerAdvisor.java
index aaf2e93b8..26f38b847 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/CommonViewerAdvisor.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/CommonViewerAdvisor.java
@@ -75,6 +75,7 @@ public class CommonViewerAdvisor extends AbstractTreeViewerAdvisor implements IN
 	 */
 	private static CommonViewer createViewer(Composite parent, ISynchronizePageConfiguration configuration) {
 		CommonViewer v = new NavigableCommonViewer(configuration.getViewerId(), parent, SWT.NONE);
+		v.getNavigatorContentService().bindExtensions(TeamContentProviderManager.getInstance().getContentProviderIds(), true);
 		v.getNavigatorContentService().activateExtensions(TeamContentProviderManager.getInstance().getContentProviderIds(), true);
 		configuration.getSite().setSelectionProvider(v);
 		return v;
-- 
cgit v1.2.3