Implement simultaneously opened traces in TMF

[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 09e0b5a7e7a3fe053453f1da15ad46b3d48658ec..7007958fef6034b841708702e8ff3cede6942873 100644 (file)
--- a/org.eclipse.linuxtools.tmf.ui/plugin.xml
+++ b/org.eclipse.linuxtools.tmf.ui/plugin.xml
@@ -19,15 +19,6 @@
             id="org.eclipse.linuxtools.tmf.ui.views.category"
             name="%views.category.name">
       </category>
-      <view
-            allowMultiple="false"
-            category="org.eclipse.linuxtools.tmf.ui.views.category"
-            class="org.eclipse.linuxtools.tmf.ui.views.events.TmfEventsView"
-            icon="icons/eview16/events_view.gif"
-            id="org.eclipse.linuxtools.tmf.ui.views.events"
-            name="%events.view.name"
-            restorable="true">
-      </view>
       <view
             category="org.eclipse.linuxtools.tmf.ui.views.category"
             class="org.eclipse.linuxtools.tmf.ui.views.timechart.TimeChartView"
@@ -102,16 +93,6 @@
                contentTypeId="org.eclipse.linuxtools.tmf.ui.content-type.trace">
          </contentTypeBinding>
       </editor>
-      <editor
-            class="org.eclipse.linuxtools.tmf.ui.editors.EventsViewEditor"
-            default="false"
-            icon="icons/eview16/events_view.gif"
-            id="org.eclipse.linuxtools.tmf.ui.editors.eventsView"
-            name="%eventsview.editor.name">
-         <contentTypeBinding
-               contentTypeId="org.eclipse.linuxtools.tmf.ui.content-type.trace">
-         </contentTypeBinding>
-      </editor>
    </extension>
    <extension
          point="org.eclipse.ui.newWizards">
@@ -327,44 +308,6 @@
                style="push">
          </command>
       </menuContribution>
-      <menuContribution
-            allPopups="false"
-            locationURI="toolbar:org.eclipse.ui.navigator.ProjectExplorer">
-         <command
-               commandId="org.eclipse.linuxtools.tmf.ui.command.clear_views"
-               icon="icons/etool16/clear.gif"
-               label="%command.clear_views"
-               mnemonic="%command.clear_views.mnemonic"
-               style="push">
-            <visibleWhen
-                  checkEnabled="false">
-               <with
-                     variable="selection">
-                  <count
-                        value="1">
-                  </count>
-                  <iterate
-                        ifEmpty="false"
-                        operator="and">
-                     <or>
-                        <and>
-                           <instanceof
-                                 value="org.eclipse.core.resources.IProject">
-                           </instanceof>
-                           <test
-                                 property="org.eclipse.core.resources.projectNature"
-                                 value="org.eclipse.linuxtools.tmf.project.nature">
-                           </test>
-                        </and>
-                        <instanceof
-                              value="org.eclipse.linuxtools.tmf.ui.project.model.ITmfProjectModelElement">
-                        </instanceof>
-                     </or>
-                  </iterate>
-               </with>
-            </visibleWhen>
-         </command>
-      </menuContribution>
       <menuContribution
             locationURI="popup:org.eclipse.ui.popup.any?after=additions">
          <command
@@ -423,6 +366,8 @@
          </command>
          <command
                commandId="org.eclipse.ui.edit.copy"
+               disabledIcon="icons/dtool16/copy_edit.gif"
+               icon="icons/etool16/copy_edit.gif"
                label="%command.copy"
                mnemonic="%command.copy.mnemonic"
                style="push">
@@ -479,6 +424,8 @@
          </command>
          <command
                commandId="org.eclipse.ui.edit.delete"
+               disabledIcon="icons/dtool16/delete.gif"
+               icon="icons/etool16/delete.gif"
                label="%command.delete"
                mnemonic="%command.delete.mnemonic"
                style="push">
@@ -511,6 +458,8 @@
          </command>
          <command
                commandId="org.eclipse.ui.edit.delete"
+               disabledIcon="icons/dtool16/delete.gif"
+               icon="icons/etool16/delete.gif"
                label="%command.remove"
                mnemonic="%command.remove.mnemonic"
                style="push">
@@ -631,7 +580,7 @@
          </separator>
          <command
                commandId="org.eclipse.linuxtools.tmf.ui.command.select_traces"
-               icon="IMG_OBJ_ADD"
+               icon="icons/obj16/add_obj.gif"
                label="%command.select_traces"
                mnemonic="%command.select_traces.mnemonic"
                style="push"
@@ -687,35 +636,6 @@
                </with>
             </visibleWhen>
          </command>
-         <command
-               commandId="org.eclipse.linuxtools.tmf.ui.command.clear_views"
-               icon="icons/etool16/clear.gif"
-               label="%command.clear_views"
-               mnemonic="%command.clear_views.mnemonic"
-               style="push">
-            <visibleWhen
-                  checkEnabled="false">
-               <with
-                     variable="selection">
-                  <count
-                        value="1">
-                  </count>
-                  <iterate
-                        ifEmpty="false"
-                        operator="and">
-                     <and>
-                        <instanceof
-                              value="org.eclipse.core.resources.IProject">
-                        </instanceof>
-                        <test
-                              property="org.eclipse.core.resources.projectNature"
-                              value="org.eclipse.linuxtools.tmf.project.nature">
-                        </test>
-                     </and>
-                  </iterate>
-               </with>
-            </visibleWhen>
-         </command>
       </menuContribution>
    </extension>
    <extension
@@ -763,12 +683,6 @@
             id="org.eclipse.linuxtools.tmf.ui.command.select_traces"
             name="%command.select_traces">
       </command>
-      <command
-            categoryId="org.eclipse.linuxtools.tmf.ui.commands.category"
-            description="%command.clear_views.description"
-            id="org.eclipse.linuxtools.tmf.ui.command.clear_views"
-            name="%command.clear_views">
-      </command>
       <category
             description="%commands.parser.category.description"
             id="org.eclipse.linuxtools.tmf.ui.commands.parser.category"
@@ -838,7 +752,9 @@
                <count
                      value="1">
                </count>
-               <iterate>
+               <iterate
+                     ifEmpty="false"
+                     operator="and">
                   <instanceof
                         value="org.eclipse.linuxtools.tmf.ui.project.model.TmfTraceFolder">
                   </instanceof>
@@ -854,7 +770,9 @@
                <count
                      value="1">
                </count>
-               <iterate>
+               <iterate
+                     ifEmpty="false"
+                     operator="and">
                   <or>
                      <instanceof
                            value="org.eclipse.linuxtools.tmf.ui.project.model.TmfTraceFolder">
@@ -878,7 +796,8 @@
                <count
                      value="1">
                </count>
-               <iterate>
+               <iterate
+                     operator="and">
                   <instanceof
                         value="org.eclipse.linuxtools.tmf.ui.project.model.TmfTraceElement">
                   </instanceof>
@@ -894,7 +813,8 @@
                <count
                      value="1">
                </count>
-               <iterate>
+               <iterate
+                     operator="and">
                   <instanceof
                         value="org.eclipse.linuxtools.tmf.ui.project.model.TmfExperimentElement">
                   </instanceof>
@@ -910,7 +830,8 @@
                <count
                      value="1">
                </count>
-               <iterate>
+               <iterate
+                     operator="and">
                   <instanceof
                         value="org.eclipse.linuxtools.tmf.ui.project.model.TmfTraceElement">
                   </instanceof>
@@ -926,7 +847,8 @@
                <count
                      value="1">
                </count>
-               <iterate>
+               <iterate
+                     operator="and">
                   <instanceof
                         value="org.eclipse.linuxtools.tmf.ui.project.model.TmfExperimentElement">
                   </instanceof>
@@ -942,7 +864,8 @@
                <count
                      value="1">
                </count>
-               <iterate>
+               <iterate
+                     operator="and">
                   <instanceof
                         value="org.eclipse.linuxtools.tmf.ui.project.model.TmfTraceElement">
                   </instanceof>
@@ -958,7 +881,8 @@
                <count
                      value="1">
                </count>
-               <iterate>
+               <iterate
+                     operator="and">
                   <instanceof
                         value="org.eclipse.linuxtools.tmf.ui.project.model.TmfExperimentElement">
                   </instanceof>
@@ -970,26 +894,26 @@
             class="org.eclipse.linuxtools.internal.tmf.ui.project.handlers.DeleteTraceHandler"
             commandId="org.eclipse.ui.edit.delete">
          <activeWhen>
-            <and>
-               <iterate>
-                  <instanceof
-                        value="org.eclipse.linuxtools.tmf.ui.project.model.TmfTraceElement">
-                  </instanceof>
-               </iterate>
-            </and>
+            <iterate
+                  ifEmpty="false"
+                  operator="and">
+               <instanceof
+                     value="org.eclipse.linuxtools.tmf.ui.project.model.TmfTraceElement">
+               </instanceof>
+            </iterate>
          </activeWhen>
       </handler>
       <handler
             class="org.eclipse.linuxtools.internal.tmf.ui.project.handlers.DeleteExperimentHandler"
             commandId="org.eclipse.ui.edit.delete">
          <activeWhen>
-            <and>
-               <iterate>
-                  <instanceof
-                        value="org.eclipse.linuxtools.tmf.ui.project.model.TmfExperimentElement">
-                  </instanceof>
-               </iterate>
-            </and>
+            <iterate
+                  ifEmpty="false"
+                  operator="and">
+               <instanceof
+                     value="org.eclipse.linuxtools.tmf.ui.project.model.TmfExperimentElement">
+               </instanceof>
+            </iterate>
          </activeWhen>
       </handler>
       <handler
@@ -1000,7 +924,8 @@
                <count
                      value="1">
                </count>
-               <iterate>
+               <iterate
+                     operator="and">
                   <instanceof
                         value="org.eclipse.linuxtools.tmf.ui.project.model.TmfTraceElement">
                   </instanceof>
@@ -1016,7 +941,8 @@
                <count
                      value="1">
                </count>
-               <iterate>
+               <iterate
+                     operator="and">
                   <instanceof
                         value="org.eclipse.linuxtools.tmf.ui.project.model.TmfExperimentElement">
                   </instanceof>
@@ -1032,7 +958,8 @@
                <count
                      value="1">
                </count>
-               <iterate>
+               <iterate
+                     operator="and">
                   <instanceof
                         value="org.eclipse.linuxtools.tmf.ui.project.model.TmfExperimentFolder">
                   </instanceof>
@@ -1044,13 +971,13 @@
             class="org.eclipse.linuxtools.internal.tmf.ui.project.handlers.SelectTraceTypeHandler"
             commandId="org.eclipse.linuxtools.tmf.ui.command.select_trace_type">
          <activeWhen>
-            <and>
-               <iterate>
-                  <instanceof
-                        value="org.eclipse.linuxtools.tmf.ui.project.model.TmfTraceElement">
-                  </instanceof>
-               </iterate>
-            </and>
+            <iterate
+                  ifEmpty="false"
+                  operator="and">
+               <instanceof
+                     value="org.eclipse.linuxtools.tmf.ui.project.model.TmfTraceElement">
+               </instanceof>
+            </iterate>
          </activeWhen>
       </handler>
       <handler
@@ -1061,7 +988,8 @@
                <count
                      value="1">
                </count>
-               <iterate>
+               <iterate
+                     operator="and">
                   <instanceof
                         value="org.eclipse.linuxtools.tmf.ui.project.model.TmfExperimentElement">
                   </instanceof>
@@ -1069,10 +997,6 @@
             </and>
          </activeWhen>
       </handler>
-      <handler
-            class="org.eclipse.linuxtools.internal.tmf.ui.project.handlers.ClearViewsHandler"
-            commandId="org.eclipse.linuxtools.tmf.ui.command.clear_views">
-      </handler>
       <handler
             class="org.eclipse.linuxtools.internal.tmf.ui.commands.ManageCustomParsersCommandHandler"
             commandId="org.eclipse.linuxtools.tmf.ui.command.managecustomparsers">
@@ -1162,6 +1086,12 @@
             id="org.eclipse.linuxtools.tmf.ui.views.uml2sd.preferences.SDViewerPage"
             name="%preference.page.uml2sd.name">
       </page>
+      <page
+            category="org.eclipse.linuxtools.tmf.ui.TmfTracingPreferences"
+            class="org.eclipse.linuxtools.tmf.ui.properties.TmfTimestampFormatPage"
+            id="org.eclipse.linuxtools.tmf.ui.preferences.timestamp.format"
+            name="%preferences.page.timestamp.format">
+      </page>
    </extension>
    <extension
          point="org.eclipse.linuxtools.tmf.ui.uml2SDLoader">