Tmf: Add the experiment type to the trace type extension point

[deliverable/tracecompass.git] / org.eclipse.linuxtools.tmf.ui / plugin.xml

diff --git a/org.eclipse.linuxtools.tmf.ui/plugin.xml b/org.eclipse.linuxtools.tmf.ui/plugin.xml
index 12e0b8d476cb255b1c2c6e5fbefefbfab86d3dd8..1859346cbed3f6ecde19bad93d49249d04ef36b0 100644 (file)
--- a/org.eclipse.linuxtools.tmf.ui/plugin.xml
+++ b/org.eclipse.linuxtools.tmf.ui/plugin.xml
@@ -2,7 +2,7 @@
 <?eclipse version="3.4"?>
 <plugin>
    <extension-point id="org.eclipse.linuxtools.tmf.ui.uml2SDLoader" name="TMF UML 2 Sequence Diagram Loader" schema="schema/org.eclipse.linuxtools.tmf.ui.uml2SDLoader.exsd"/>
-   <extension-point id="org.eclipse.linuxtools.tmf.ui.tracetype" name="Tmf Trace Type" schema="schema/org.eclipse.linuxtools.tmf.ui.tracetype.exsd"/>
+   <extension-point id="org.eclipse.linuxtools.tmf.ui.tracetypeui" name="Tmf Trace Type UI Elements" schema="schema/org.eclipse.linuxtools.tmf.ui.tracetypeui.exsd"/>
 
     <extension
          point="org.eclipse.ui.perspectives">
@@ -387,7 +387,7 @@
                visible="true">
          </separator>
          <command
-               commandId="org.eclipse.ui.file.import"
+               commandId="org.eclipse.linuxtools.tmf.ui.import"
                label="%command.import"
                mnemonic="%command.import.mnemonic"
                style="push">
@@ -1068,6 +1068,11 @@
             id="org.eclipse.linuxtools.tmf.ui.views.uml2sd.handlers.MoveSDRight"
             name="%commands.uml2sd.scrollright">
       </command>
+      <command
+            description="%command.import.description"
+            id="org.eclipse.linuxtools.tmf.ui.import"
+            name="%command.import">
+      </command>
       <command
             description="%command.batch_import.description"
             id="org.eclipse.linuxtools.tmf.ui.batch_import"
@@ -1098,21 +1103,7 @@
          point="org.eclipse.ui.handlers">
       <handler
             class="org.eclipse.linuxtools.internal.tmf.ui.project.handlers.ImportTraceHandler"
-            commandId="org.eclipse.ui.file.import">
-         <activeWhen>
-            <and>
-               <count
-                     value="1">
-               </count>
-               <iterate
-                     ifEmpty="false"
-                     operator="and">
-                  <instanceof
-                        value="org.eclipse.linuxtools.tmf.ui.project.model.TmfTraceFolder">
-                  </instanceof>
-               </iterate>
-            </and>
-         </activeWhen>
+            commandId="org.eclipse.linuxtools.tmf.ui.import">
       </handler>
       <handler
             class="org.eclipse.linuxtools.internal.tmf.ui.project.handlers.RefreshHandler"
@@ -1615,21 +1606,6 @@
             type="org.eclipse.linuxtools.tmf.ui.project.model.TmfProjectModelElement">
       </propertyTester>
    </extension>
-   <extension
-         point="org.eclipse.linuxtools.tmf.ui.tracetype">
-      <category
-            id="org.eclipse.linuxtools.tmf.ui.category.ctf"
-            name="%tracetype.category.ctf">
-      </category>
-      <type
-            category="org.eclipse.linuxtools.tmf.ui.category.ctf"
-            event_type="org.eclipse.linuxtools.tmf.core.ctfadaptor.CtfTmfEvent"
-            icon="icons/eview16/events_view.gif"
-            id="org.eclipse.linuxtools.tmf.ui.type.ctf"
-            name="%tracetype.type.ctf"
-            trace_type="org.eclipse.linuxtools.tmf.core.ctfadaptor.CtfTmfTrace">
-      </type>
-   </extension>
    <extension
          point="org.eclipse.ui.navigator.linkHelper">
       <linkHelper
@@ -1677,5 +1653,15 @@
          </tracetype>
       </module>
    </extension>
-
+   <extension
+         point="org.eclipse.linuxtools.tmf.ui.tracetypeui">
+      <type
+            icon="icons/eview16/events_view.gif"
+            tracetype="org.eclipse.linuxtools.tmf.ui.type.ctf">
+      </type>
+      <experiment
+            tracetype="org.eclipse.linuxtools.tmf.core.experiment.generic"
+            icon="icons/elcl16/experiment.gif">
+      </experiment>
+   </extension>
 </plugin>