From b299b1ce0500b26803431e4c4e4b87ef5a8cfd7b Mon Sep 17 00:00:00 2001
From: Uwe Stieber
Date: Sat, 20 Oct 2012 09:38:54 +0200
Subject: Target Explorer: Rework editor bindings to unify activeEditorInput
 handling

---
 .../plugins/org.eclipse.tcf.te.tcf.filesystem.ui/plugin.xml          | 5 ++---
 target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.ui/plugin.xml  | 5 ++---
 .../plugins/org.eclipse.tcf.te.tcf.processes.ui/plugin.xml           | 5 ++---
 target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/plugin.xml         | 5 ++---
 4 files changed, 8 insertions(+), 12 deletions(-)

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 bde069ffd..87d222678 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
@@ -112,15 +112,14 @@
             pageId="org.eclipse.tcf.te.tcf.filesystem.FSExplorerEditorPage">
          <enablement>
             <with variable="activeEditorInput">
-               <and>
-                  <instanceof value="org.eclipse.tcf.te.tcf.locator.interfaces.nodes.IPeerModel"/>
+               <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>
-               </and>
+               </adapt>
             </with>
          </enablement>
       </editorPageBinding>
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.ui/plugin.xml b/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.ui/plugin.xml
index 7c8027bc7..4c5364bf3 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.ui/plugin.xml
+++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.ui/plugin.xml
@@ -139,10 +139,9 @@
             insertAfter="last">
          <enablement>
             <with variable="activeEditorInput">
-               <and>
-                  <instanceof value="org.eclipse.tcf.te.tcf.locator.interfaces.nodes.IPeerModel"/>
+               <adapt type="org.eclipse.tcf.te.tcf.locator.interfaces.nodes.IPeerModel">
                   <test property="org.eclipse.tcf.te.tcf.locator.hasRemoteService" value="Processes"/>
-               </and>
+               </adapt>
             </with>
          </enablement>
       </editorPageBinding>
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.processes.ui/plugin.xml b/target_explorer/plugins/org.eclipse.tcf.te.tcf.processes.ui/plugin.xml
index a4112ce18..0a250ef52 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.processes.ui/plugin.xml
+++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.processes.ui/plugin.xml
@@ -120,13 +120,12 @@
             pageId="org.eclipse.tcf.te.tcf.processes.ui.ProcessExplorerEditorPage">
          <enablement>
             <with variable="activeEditorInput">
-               <and>
-                  <instanceof value="org.eclipse.tcf.te.tcf.locator.interfaces.nodes.IPeerModel"/>
+               <adapt type="org.eclipse.tcf.te.tcf.locator.interfaces.nodes.IPeerModel">
                   <and>
                      <test property="org.eclipse.tcf.te.tcf.locator.hasRemoteService" value="Processes"/>
                      <test property="org.eclipse.tcf.te.tcf.locator.hasRemoteService" value="SysMonitor"/>
                   </and>
-               </and>
+               </adapt>
             </with>
          </enablement>
       </editorPageBinding>
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/plugin.xml b/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/plugin.xml
index ce9182442..5b08943a3 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/plugin.xml
+++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/plugin.xml
@@ -227,10 +227,9 @@
             insertBefore="first">
          <enablement>
             <with variable="activeEditorInput">
-               <and>
-                  <instanceof value="org.eclipse.tcf.te.tcf.locator.interfaces.nodes.IPeerModel"/>
+               <adapt type="org.eclipse.tcf.te.tcf.locator.interfaces.nodes.IPeerModel">
                   <test property="org.eclipse.tcf.te.tcf.locator.isOfType" value="null"/>
-               </and>
+               </adapt>
             </with>
          </enablement>
       </editorPageBinding>
-- 
cgit v1.2.3