Adjust aspect bindings to code move from Bug 508777
diff --git a/plugins/org.eclipse.objectteams.otdt.jdt.ui/plugin.xml b/plugins/org.eclipse.objectteams.otdt.jdt.ui/plugin.xml
index d1f6717..fc81349 100644
--- a/plugins/org.eclipse.objectteams.otdt.jdt.ui/plugin.xml
+++ b/plugins/org.eclipse.objectteams.otdt.jdt.ui/plugin.xml
@@ -72,14 +72,6 @@
                icon="platform:/plugin/org.eclipse.objectteams.otdt.ui/icons/ot/team_obj.gif"/>
          <team
                activation="ALL_THREADS"
-               class="org.eclipse.objectteams.otdt.internal.corext.RoleFileAdaptor"
-               icon="platform:/plugin/org.eclipse.objectteams.otdt.ui/icons/ot/team_obj.gif"/>
-         <team
-               activation="ALL_THREADS"
-               class="org.eclipse.objectteams.otdt.internal.corext.BindingHierarchyAdaptor"
-               icon="platform:/plugin/org.eclipse.objectteams.otdt.ui/icons/ot/team_obj.gif"/>
-         <team
-               activation="ALL_THREADS"
                class="org.eclipse.objectteams.otdt.internal.corext.DOMAdaptor"
                icon="platform:/plugin/org.eclipse.objectteams.otdt.ui/icons/ot/team_obj.gif"/>
          <team
@@ -174,6 +166,23 @@
      <aspectBinding icon="platform:/plugin/org.eclipse.objectteams.otdt.ui/icons/ot/calloutbinding_obj.gif">
 	     <basePlugin 
               icon="platform:/plugin/org.eclipse.pde.ui/icons/obj16/plugin_obj.png"
+              id="org.eclipse.jdt.core.manipulation" />
+         <team
+               activation="ALL_THREADS"
+               class="org.eclipse.objectteams.otdt.internal.corext.BindingHierarchyAdaptor"
+               icon="platform:/plugin/org.eclipse.objectteams.otdt.ui/icons/ot/team_obj.gif"/>
+         <team
+               activation="ALL_THREADS"
+               class="org.eclipse.objectteams.otdt.internal.corext.RoleFileAdaptor"
+               icon="platform:/plugin/org.eclipse.objectteams.otdt.ui/icons/ot/team_obj.gif"/>
+         <team
+               activation="NONE"
+               class="org.eclipse.objectteams.otdt.internal.ui.assist.OTQuickFixes"
+               icon="platform:/plugin/org.eclipse.objectteams.otdt.ui/icons/ot/team_obj.gif"/>
+     </aspectBinding>
+     <aspectBinding icon="platform:/plugin/org.eclipse.objectteams.otdt.ui/icons/ot/calloutbinding_obj.gif">
+	     <basePlugin 
+              icon="platform:/plugin/org.eclipse.pde.ui/icons/obj16/plugin_obj.png"
               id="org.eclipse.ui.workbench" />
      	 <team
              activation="ALL_THREADS"
diff --git a/plugins/org.eclipse.objectteams.otdt.refactoring/plugin.xml b/plugins/org.eclipse.objectteams.otdt.refactoring/plugin.xml
index 7def47c..af90de0 100644
--- a/plugins/org.eclipse.objectteams.otdt.refactoring/plugin.xml
+++ b/plugins/org.eclipse.objectteams.otdt.refactoring/plugin.xml
@@ -118,6 +118,17 @@
             icon="platform:/plugin/org.eclipse.objectteams.otdt.ui/icons/ot/calloutbinding_obj.gif">
          <basePlugin
                icon="platform:/plugin/org.eclipse.pde.ui/icons/obj16/plugin_obj.png"
+               id="org.eclipse.jdt.core.manipulation">
+         </basePlugin>
+         <team
+               activation="ALL_THREADS"
+               class="org.eclipse.objectteams.otdt.internal.refactoring.adaptor.ExtractInterfaceAdaptor"
+               icon="platform:/plugin/org.eclipse.objectteams.otdt.ui/icons/ot/team_obj.gif">
+      </aspectBinding>
+      <aspectBinding
+            icon="platform:/plugin/org.eclipse.objectteams.otdt.ui/icons/ot/calloutbinding_obj.gif">
+         <basePlugin
+               icon="platform:/plugin/org.eclipse.pde.ui/icons/obj16/plugin_obj.png"
                id="org.eclipse.jdt.core">
          </basePlugin>
          <team