From f02b03ca0ec5b1055c5896cbadb9f2b2ece2b0bb Mon Sep 17 00:00:00 2001
From: Uwe Stieber
Date: Wed, 10 Jul 2013 10:48:26 +0200
Subject: Target Explorer: Fix remote file system issues

---
 .../plugin.xml                                     | 54 ++++++----------------
 1 file changed, 13 insertions(+), 41 deletions(-)

(limited to 'target_explorer/plugins/org.eclipse.tcf.te.tcf.filesystem.ui/plugin.xml')

diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.filesystem.ui/plugin.xml b/target_explorer/plugins/org.eclipse.tcf.te.tcf.filesystem.ui/plugin.xml
index 7074626fd..a621432cc 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.filesystem.ui/plugin.xml
+++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.filesystem.ui/plugin.xml
@@ -95,21 +95,6 @@
       </commonFilter>
    </extension>
 
-<!-- Service contributions -->
-   <extension point="org.eclipse.tcf.te.runtime.services.services">
-      <service
-            class="org.eclipse.tcf.te.tcf.filesystem.ui.services.UIService"
-            id="org.eclipse.tcf.te.tcf.filesytsem.uiservice">
-         <serviceType class="org.eclipse.tcf.te.runtime.services.interfaces.IUIService"/>
-         <enablement>
-            <or>
-               <instanceof value="org.eclipse.tcf.te.tcf.filesystem.core.model.FSTreeNode"/>
-               <instanceof value="org.eclipse.tcf.te.tcf.filesystem.core.model.FSModel"/>
-            </or>
-         </enablement>
-      </service>
-   </extension>
-   
 <!-- Editor page contributions -->
    <extension point="org.eclipse.tcf.te.ui.views.editorPages">
       <editorPage
@@ -127,14 +112,13 @@
             pageId="org.eclipse.tcf.te.tcf.filesystem.FSExplorerEditorPage">
          <enablement>
             <with variable="activeEditorInput">
-               <adapt type="org.eclipse.tcf.te.tcf.locator.interfaces.nodes.IPeerModel">
-                  <test property="org.eclipse.tcf.te.tcf.locator.hasRemoteService" value="FileSystem"/>
-                  <test
-                        property="org.eclipse.tcf.te.runtime.preference"
-                        args="bundleId=org.eclipse.tcf.te.tcf.filesystem.ui,key=te.tcf.filesystem.core.feature.editor.content.enable"
-                        value="true">
-                  </test>
-               </adapt>
+               <instanceof value="org.eclipse.tcf.te.tcf.locator.interfaces.nodes.IPeerModel"/>
+               <test property="org.eclipse.tcf.te.tcf.locator.hasRemoteService" value="FileSystem"/>
+               <test
+                     property="org.eclipse.tcf.te.runtime.preference"
+                     args="bundleId=org.eclipse.tcf.te.tcf.filesystem.ui,key=te.tcf.filesystem.core.feature.editor.content.enable"
+                     value="true">
+               </test>
             </with>
          </enablement>
       </editorPageBinding>
@@ -1691,24 +1675,12 @@
       <factory
             adaptableType="org.eclipse.tcf.te.tcf.filesystem.core.model.FSTreeNode"
             class="org.eclipse.tcf.te.tcf.filesystem.ui.internal.adapters.FSTreeNodeAdapterFactory">
-         <adapter
-               type="org.eclipse.ui.IActionFilter">
-         </adapter>
-         <adapter
-               type="org.eclipse.jface.viewers.ILabelProvider">
-         </adapter>
-         <adapter
-               type="org.eclipse.ui.IPersistableElement">
-         </adapter>
-         <adapter
-               type="org.eclipse.tcf.te.ui.interfaces.ILazyLoader">
-         </adapter>
-         <adapter
-               type="org.eclipse.tcf.te.tcf.locator.interfaces.nodes.IPeerModel">
-         </adapter>
-         <adapter
-               type="org.eclipse.tcf.te.ui.interfaces.ISearchable">
-         </adapter>
+         <adapter type="org.eclipse.ui.IActionFilter"/>
+         <adapter type="org.eclipse.jface.viewers.ILabelProvider"/>
+         <adapter type="org.eclipse.ui.IPersistableElement"/>
+         <adapter type="org.eclipse.tcf.te.ui.interfaces.ILazyLoader"/>
+         <adapter type="org.eclipse.tcf.te.ui.interfaces.ISearchable"/>
+         <adapter type="org.eclipse.tcf.te.tcf.locator.interfaces.nodes.IPeerModelProvider"/>
       </factory>
       <factory
             adaptableType="org.eclipse.tcf.te.tcf.locator.interfaces.nodes.IPeerModel"
-- 
cgit v1.2.3