Bug 78315 org.eclipes.team.ui plugin's startup code forces compare to be loadedRoot_branch_20041208_CommitWizard_FileTypesRoot_branch_20041208_CVSTopLevelMenu

2 files changed, 14 insertions, 5 deletions

diff --git a/bundles/org.eclipse.team.ui/plugin.xml b/bundles/org.eclipse.team.ui/plugin.xml
index 4b60173d0..098f39640 100644
--- a/bundles/org.eclipse.team.ui/plugin.xml
+++ b/bundles/org.eclipse.team.ui/plugin.xml
@@ -281,9 +281,23 @@
                id="org.eclipse.team.ui.ConfigureProject"/>
       </actionSet>
    </extension>
+   
+ <!-- file modification validator -->
+   
    <extension
          point="org.eclipse.team.core.defaultFileModificationValidator">
       <validator class="org.eclipse.team.internal.ui.DefaultUIFileModificationValidator"/>
    </extension>
+   
+    <!-- adapter factory -->
+    
+   <extension
+         point="org.eclipse.core.runtime.adapters">
+      <factory
+            adaptableType="org.eclipse.compare.structuremergeviewer.DiffNode"
+            class="org.eclipse.team.internal.ui.TeamAdapterFactory">
+         <adapter type="org.eclipse.ui.model.IWorkbenchAdapter"/>
+      </factory>
+   </extension>
 
 </plugin>
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/TeamUIPlugin.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/TeamUIPlugin.java
index 4f1877517..9e6916230 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/TeamUIPlugin.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/TeamUIPlugin.java
@@ -15,8 +15,6 @@ import java.lang.reflect.InvocationTargetException;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.*;
-
-import org.eclipse.compare.structuremergeviewer.DiffNode;
 import org.eclipse.core.runtime.*;
 import org.eclipse.core.runtime.jobs.Job;
 import org.eclipse.jface.dialogs.MessageDialogWithToggle;
@@ -182,9 +180,6 @@ public class TeamUIPlugin extends AbstractUIPlugin {
 		
 		initializeImages(this);
 		initializePreferences();
-	
-		IAdapterFactory factory = new TeamAdapterFactory();
-		Platform.getAdapterManager().registerAdapters(factory, DiffNode.class);
 
 		// This is a backwards compatibility check to ensure that repository
 		// provider capability are enabled automatically if an old workspace is