tmf: Improve Delete Supplementary Files command

[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 9688e349b80535f089c0494ad347853fc87482f0..5500c4c7253da14ef1b217fff065328a3008d656 100644 (file)
--- a/org.eclipse.linuxtools.tmf.ui/plugin.xml
+++ b/org.eclipse.linuxtools.tmf.ui/plugin.xml
@@ -665,26 +665,25 @@
                <with
                      variable="selection">
                   <and>
-                     <count
-                           value="1">
-                     </count>
                      <iterate
                            ifEmpty="false"
                            operator="and">
-                        <and>
-                           <or>
-                              <instanceof
-                                    value="org.eclipse.linuxtools.tmf.ui.project.model.TmfTraceElement">
-                              </instanceof>
-                              <instanceof
-                                    value="org.eclipse.linuxtools.tmf.ui.project.model.TmfExperimentElement">
-                              </instanceof>
-                           </or>
-                           <test
-                                 forcePluginActivation="true"
-                                 property="org.eclipse.linuxtools.tmf.ui.hasSupplementaryFiles">
-                           </test>
-                        </and>
+                        <or>
+                           <instanceof
+                                 value="org.eclipse.linuxtools.tmf.ui.project.model.TmfTraceElement">
+                           </instanceof>
+                           <instanceof
+                                 value="org.eclipse.linuxtools.tmf.ui.project.model.TmfExperimentElement">
+                           </instanceof>
+                        </or>
+                     </iterate>
+                     <iterate
+                           ifEmpty="false"
+                           operator="or">
+                        <test
+                              forcePluginActivation="true"
+                              property="org.eclipse.linuxtools.tmf.ui.hasSupplementaryFiles">
+                        </test>
                      </iterate>
                   </and>
                </with>
@@ -1419,19 +1418,6 @@
       <handler
             class="org.eclipse.linuxtools.internal.tmf.ui.project.handlers.DeleteTraceSupplementaryFilesHandler"
             commandId="org.eclipse.linuxtools.tmf.ui.command.delete_suppl_files">
-         <activeWhen>
-            <and>
-               <count
-                     value="1">
-               </count>
-               <iterate
-                     operator="and">
-                  <instanceof
-                        value="org.eclipse.linuxtools.tmf.ui.project.model.TmfTraceElement">
-                  </instanceof>
-               </iterate>
-            </and>
-         </activeWhen>
       </handler>
       <handler
             class="org.eclipse.linuxtools.internal.tmf.ui.project.wizards.tracepkg.importexport.ExportTracePackageHandler"
@@ -1454,23 +1440,6 @@
             </and>
          </activeWhen>
       </handler>
-      <handler
-            class="org.eclipse.linuxtools.internal.tmf.ui.project.handlers.DeleteExperimentSupplementaryFilesHandler"
-            commandId="org.eclipse.linuxtools.tmf.ui.command.delete_suppl_files">
-         <activeWhen>
-            <and>
-               <count
-                     value="1">
-               </count>
-               <iterate
-                     operator="and">
-                  <instanceof
-                        value="org.eclipse.linuxtools.tmf.ui.project.model.TmfExperimentElement">
-                  </instanceof>
-               </iterate>
-            </and>
-         </activeWhen>
-      </handler>
       <handler
             class="org.eclipse.linuxtools.internal.tmf.ui.project.handlers.NewExperimentHandler"
             commandId="org.eclipse.linuxtools.tmf.ui.command.new_experiment">