X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=org.eclipse.linuxtools.tmf.ui%2Fplugin.xml;h=5fd3f9d1f1755ed034fbe4a90f2b89c73a7c883f;hb=d04ec5a723064f4f1b26100362491b7f07e27cca;hp=12cfe6ba8244d5fbe2d26cec00e6289d8f4fcb0a;hpb=be222f56a3ba9b24e29a53c38a6d43db300bf880;p=deliverable%2Ftracecompass.git

diff --git a/org.eclipse.linuxtools.tmf.ui/plugin.xml b/org.eclipse.linuxtools.tmf.ui/plugin.xml
index 12cfe6ba82..5fd3f9d1f1 100644
--- 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"
@@ -45,6 +36,15 @@
             name="%environment.view.name"
             restorable="true">
       </view>
+      <view
+            allowMultiple="false"
+            category="org.eclipse.linuxtools.tmf.ui.views.category"
+            class="org.eclipse.linuxtools.tmf.ui.views.statesystem.TmfStateSystemExplorer"
+            icon="icons/eview16/events_view.gif"
+            id="org.eclipse.linuxtools.tmf.ui.views.ssvisualizer"
+            name="%ssvisualizer.view.name"
+            restorable="true">
+      </view>
       <view
             allowMultiple="false"
             category="org.eclipse.linuxtools.tmf.ui.views.category"
@@ -89,6 +89,14 @@
             name="%histogram.view.name"
             restorable="true">
       </view>
+      <view
+            category="org.eclipse.linuxtools.tmf.ui.views.category"
+            class="org.eclipse.linuxtools.tmf.ui.views.callstack.CallStackView"
+            icon="icons/eview16/callstack_view.gif"
+            id="org.eclipse.linuxtools.tmf.ui.views.callstack"
+            name="%callstack.view.name"
+            restorable="true">
+      </view>
    </extension>
    <extension
          point="org.eclipse.ui.editors">
@@ -102,16 +110,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">
@@ -154,11 +152,18 @@
       </category>
       <wizard
             category="org.eclipse.linuxtools.tmf.import.category"
-            class="org.eclipse.linuxtools.tmf.ui.project.wizards.ImportTraceWizard"
+            class="org.eclipse.linuxtools.tmf.ui.project.wizards.importtrace.ImportTraceWizard"
             icon="icons/etool16/import.gif"
             id="org.eclipse.linuxtools.tmf.ui.trace.import.wizard"
             name="%project.import.wizard.name">
       </wizard>
+      <wizard
+            category="org.eclipse.linuxtools.tmf.import.category"
+            class="org.eclipse.linuxtools.tmf.ui.project.wizards.importtrace.BatchImportTraceWizard"
+            icon="icons/etool16/import.gif"
+            id="org.eclipse.linuxtools.tmf.ui.batch_import"
+            name="%project.import.wizard.name.batch">
+      </wizard>
    </extension>
    <extension
          id="org.eclipse.linuxtools.tmf.project.nature"
@@ -266,6 +271,9 @@
             <contentExtension
                   pattern="org.eclipse.ui.navigator.resources.filters.*">
             </contentExtension>
+            <contentExtension
+                  pattern="org.eclipse.linuxtools.internal.tmf.ui.project.model.TmfEditorLinkHelper">
+            </contentExtension>
          </includes>
       </viewerContentBinding>
    </extension>
@@ -319,24 +327,13 @@
    </extension>
    <extension
          point="org.eclipse.ui.menus">
-      <menuContribution
-            locationURI="menu:org.eclipse.ui.navigator.ProjectExplorer">
-         <command
-               commandId="org.eclipse.linuxtools.tmf.ui.command.managecustomparsers"
-               id="org.eclipse.linuxtools.tmf.ui.menu.managecustomparsers"
-               style="push">
-         </command>
-      </menuContribution>
       <menuContribution
             locationURI="popup:org.eclipse.ui.popup.any?after=additions">
          <command
-               commandId="org.eclipse.linuxtools.tmf.ui.command.project.trace.import"
-               disabledIcon="icons/dtool16/import.gif"
-               icon="icons/etool16/import.gif"
-               label="%commands.trace_folder.import"
-               mnemonic="%commands.trace_folder.import.mnemonic"
-               style="push"
-               tooltip="%commands.trace_folder.import.description">
+               commandId="org.eclipse.ui.file.import"
+               label="%command.import"
+               mnemonic="%command.import.mnemonic"
+               style="push">
             <visibleWhen
                   checkEnabled="false">
                <with
@@ -353,18 +350,11 @@
                </with>
             </visibleWhen>
          </command>
-         <separator
-               name="org.eclipse.linuxtools.tmf.ui.separator1"
-               visible="true">
-         </separator>
          <command
-               commandId="org.eclipse.linuxtools.tmf.ui.command.project.trace.refresh"
-               disabledIcon="icons/dlcl16/refresh.gif"
-               icon="icons/elcl16/refresh.gif"
-               label="%commands.trace_folder.refresh"
-               mnemonic="%commands.trace_folder.refresh.mnemonic"
-               style="push"
-               tooltip="%commands.trace_folder.refresh.description">
+               commandId="org.eclipse.linuxtools.tmf.ui.batch_import"
+               label="%command.batch_import"
+               mnemonic="%command.batch_import.mnemonic"
+               style="push">
             <visibleWhen
                   checkEnabled="false">
                <with
@@ -373,7 +363,6 @@
                         value="1">
                   </count>
                   <iterate
-                        ifEmpty="false"
                         operator="and">
                      <instanceof
                            value="org.eclipse.linuxtools.tmf.ui.project.model.TmfTraceFolder">
@@ -382,14 +371,17 @@
                </with>
             </visibleWhen>
          </command>
+         <separator
+               name="org.eclipse.linuxtools.tmf.ui.separator1"
+               visible="true">
+         </separator>
          <command
-               commandId="org.eclipse.linuxtools.tmf.ui.command.project.trace.open"
-               disabledIcon="icons/dlcl16/open.gif"
-               icon="icons/elcl16/open.gif"
-               label="%commands.trace.open"
-               mnemonic="%commands.trace.open.mnemonic"
-               style="push"
-               tooltip="%commands.trace.open.descritption">
+               commandId="org.eclipse.ui.navigate.openResource"
+               disabledIcon="/icons/dlcl16/open.gif"
+               icon="/icons/elcl16/open.gif"
+               label="%command.open"
+               mnemonic="%command.open.mnemonic"
+               style="push">
             <visibleWhen
                   checkEnabled="false">
                <with
@@ -400,21 +392,25 @@
                   <iterate
                         ifEmpty="false"
                         operator="and">
-                     <instanceof
-                           value="org.eclipse.linuxtools.tmf.ui.project.model.TmfTraceElement">
-                     </instanceof>
+                     <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>
                </with>
             </visibleWhen>
          </command>
          <command
-               commandId="org.eclipse.linuxtools.tmf.ui.command.project.trace.copy"
-               disabledIcon="IMG_TOOL_COPY_DISABLED"
-               icon="IMG_TOOL_COPY"
-               label="%commands.trace.copy"
-               mnemonic="%commands.trace.copy.mnemonic"
-               style="push"
-               tooltip="%commands.trace.copy.description">
+               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">
             <visibleWhen
                   checkEnabled="false">
                <with
@@ -425,21 +421,25 @@
                   <iterate
                         ifEmpty="false"
                         operator="and">
-                     <instanceof
-                           value="org.eclipse.linuxtools.tmf.ui.project.model.TmfTraceElement">
-                     </instanceof>
+                     <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>
                </with>
             </visibleWhen>
          </command>
          <command
-               commandId="org.eclipse.linuxtools.tmf.ui.command.project.trace.rename"
-               disabledIcon="icons/dlcl16/rename.gif"
-               icon="icons/elcl16/rename.gif"
-               label="%commands.trace.rename"
-               mnemonic="%commands.trace.rename.mnemonic"
-               style="push"
-               tooltip="%commands.trace.rename.description">
+               commandId="org.eclipse.ui.edit.rename"
+               disabledIcon="/icons/dlcl16/rename.gif"
+               icon="/icons/elcl16/rename.gif"
+               label="%command.rename"
+               mnemonic="%command.rename.mnemonic"
+               style="push">
             <visibleWhen
                   checkEnabled="false">
                <with
@@ -450,21 +450,25 @@
                   <iterate
                         ifEmpty="false"
                         operator="and">
-                     <instanceof
-                           value="org.eclipse.linuxtools.tmf.ui.project.model.TmfTraceElement">
-                     </instanceof>
+                     <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>
                </with>
             </visibleWhen>
          </command>
          <command
-               commandId="org.eclipse.linuxtools.tmf.ui.command.project.trace.delete"
-               disabledIcon="IMG_ETOOL_DELETE_DISABLED"
-               icon="IMG_ETOOL_DELETE"
-               label="%commands.trace.delete"
-               mnemonic="%commands.trace.delete.mnemonic"
-               style="push"
-               tooltip="%commands.trace.delete.description">
+               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">
             <visibleWhen
                   checkEnabled="false">
                <with
@@ -472,29 +476,33 @@
                   <iterate
                         ifEmpty="false"
                         operator="and">
-                     <and>
+                     <or>
+                        <and>
+                           <instanceof
+                                 value="org.eclipse.linuxtools.tmf.ui.project.model.TmfTraceElement">
+                           </instanceof>
+                           <not>
+                              <test
+                                    forcePluginActivation="true"
+                                    property="org.eclipse.linuxtools.tmf.ui.isExperimentTrace">
+                              </test>
+                           </not>
+                        </and>
                         <instanceof
-                              value="org.eclipse.linuxtools.tmf.ui.project.model.TmfTraceElement">
+                              value="org.eclipse.linuxtools.tmf.ui.project.model.TmfExperimentElement">
                         </instanceof>
-                        <not>
-                           <test
-                                 forcePluginActivation="true"
-                                 property="org.eclipse.linuxtools.tmf.ui.isExperimentTrace">
-                           </test>
-                        </not>
-                     </and>
+                     </or>
                   </iterate>
                </with>
             </visibleWhen>
          </command>
          <command
-               commandId="org.eclipse.linuxtools.tmf.ui.command.project.trace.delete"
-               disabledIcon="IMG_ETOOL_DELETE_DISABLED"
-               icon="IMG_ETOOL_DELETE"
-               label="%commands.trace.remove"
-               mnemonic="%commands.trace.remove.mnemonic"
-               style="push"
-               tooltip="%commands.trace.remove.description">
+               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">
             <visibleWhen
                   checkEnabled="false">
                <with
@@ -520,94 +528,13 @@
                visible="true">
          </separator>
          <command
-               commandId="org.eclipse.linuxtools.tmf.ui.command.project.trace.deleteSupplementaryFiles"
-               label="%commands.trace.deleteSupplementaryFiles"
-               mnemonic="%commands.trace.deleteSupplementaryFiles.mnemonic"
-               style="push"
-               tooltip="%commands.trace.deleteSupplementaryFiles.description">
-            <visibleWhen
-                  checkEnabled="false">
-               <with
-                     variable="selection">
-                  <iterate
-                       ifEmpty="false"
-                       operator="and">
-                     <and>
-                        <instanceof
-                              value="org.eclipse.linuxtools.tmf.ui.project.model.TmfTraceElement">
-                        </instanceof>
-                        <test
-                              forcePluginActivation="true"
-                              property="org.eclipse.linuxtools.tmf.ui.hasSupplementaryFiles">
-                        </test>
-                     </and>
-                  </iterate>
-               </with>
-            </visibleWhen>
-         </command>
-         <separator
-               name="org.eclipse.linuxtools.tmf.ui.separator3"
-               visible="true">
-         </separator>
-         <menu
-               label="%commands.trace.select_trace_type"
-               mnemonic="%commands.trace.select_trace_type.mnemonic"
-               tooltip="%commands.trace.select_trace_type.description">
-            <dynamic
-                  class="org.eclipse.linuxtools.internal.tmf.ui.project.handlers.SelectTraceTypeContributionItem"
-                  id="org.eclipse.linuxtools.tmf.ui.command.project.trace.select_trace_type.dynamic">
-            </dynamic>
-            <visibleWhen
-                  checkEnabled="false">
-               <with
-                     variable="selection">
-                  <iterate
-                        ifEmpty="false"
-                        operator="and">
-                     <instanceof
-                           value="org.eclipse.linuxtools.tmf.ui.project.model.TmfTraceElement">
-                     </instanceof>
-                  </iterate>
-               </with>
-            </visibleWhen>
-         </menu>
-         <command
-               commandId="org.eclipse.linuxtools.tmf.ui.command.project.experiment_folder.new"
+               commandId="org.eclipse.linuxtools.tmf.ui.command.new_experiment"
                disabledIcon="icons/dtool16/new.gif"
                icon="icons/etool16/new.gif"
-               label="%commands.experiment_folder.new"
-               mnemonic="%commands.experiment_folder.new.mnemonic"
-               style="push"
-               tooltip="%commands.trace.select_trace_type">
-            <visibleWhen
-                  checkEnabled="false">
-               <with
-                     variable="selection">
-                  <count
-                        value="1">
-                  </count>
-                  <iterate
-                        ifEmpty="false"
-                        operator="and">
-                     <instanceof
-                           value="org.eclipse.linuxtools.tmf.ui.project.model.TmfExperimentFolder">
-                     </instanceof>
-                  </iterate>
-               </with>
-            </visibleWhen>
-         </command>
-         <separator
-               name="org.eclipse.linuxtools.tmf.ui.separator4"
-               visible="true">
-         </separator>
-         <command
-               commandId="org.eclipse.linuxtools.tmf.ui.command.project.experiment_folder.refresh"
-               disabledIcon="icons/dlcl16/refresh.gif"
-               icon="icons/elcl16/refresh.gif"
-               label="%commands.experiment_folder.refresh"
-               mnemonic="%commands.experiment_folder.refresh.mnemonic"
+               label="%command.new_experiment"
+               mnemonic="%command.new_experiment.mnemonic"
                style="push"
-               tooltip="%commands.experiment_folder.refresh.description">
+               tooltip="%command.new_experiment.description">
             <visibleWhen
                   checkEnabled="false">
                <with
@@ -626,40 +553,50 @@
             </visibleWhen>
          </command>
          <command
-               commandId="org.eclipse.linuxtools.tmf.ui.command.project.experiment.select"
-               icon="IMG_OBJ_ADD"
-               label="%commands.experiment.selecttraces"
-               mnemonic="%commands.experiment.selecttraces.mnemonic"
+               commandId="org.eclipse.linuxtools.tmf.ui.command.delete_suppl_files"
+               label="%command.delete_suppl_files"
+               mnemonic="%command.delete_suppl_files.mnemonic"
                style="push"
-               tooltip="%commands.experiment.selecttraces.description">
+               tooltip="%command.delete_suppl_files.description">
             <visibleWhen
                   checkEnabled="false">
                <with
                      variable="selection">
-                  <count
-                        value="1">
-                  </count>
-                  <iterate
-                        ifEmpty="false"
-                        operator="and">
-                     <instanceof
-                           value="org.eclipse.linuxtools.tmf.ui.project.model.TmfExperimentElement">
-                     </instanceof>
-                  </iterate>
+                  <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>
+                     </iterate>
+                  </and>
                </with>
             </visibleWhen>
          </command>
          <separator
-               name="org.eclipse.linuxtools.tmf.ui.separator5"
+               name="org.eclipse.linuxtools.tmf.ui.separator3"
                visible="true">
          </separator>
          <command
-               commandId="org.eclipse.linuxtools.tmf.ui.command.project.experiment.open"
-               icon="icons/elcl16/open.gif"
-               label="%commands.experiment.open"
-               mnemonic="%commands.experiment.open.mnemonic"
-               style="push"
-               tooltip="%commands.experiment.open.description">
+               commandId="org.eclipse.linuxtools.tmf.ui.command.managecustomparsers"
+               icon="icons/etool16/customparser_wizard.gif"
+               id="org.eclipse.linuxtools.tmf.ui.menu.managecustomparsers"
+               style="push">
             <visibleWhen
                   checkEnabled="false">
                <with
@@ -668,47 +605,56 @@
                         value="1">
                   </count>
                   <iterate
-                        ifEmpty="false"
                         operator="and">
                      <instanceof
-                           value="org.eclipse.linuxtools.tmf.ui.project.model.TmfExperimentElement">
+                           value="org.eclipse.linuxtools.tmf.ui.project.model.TmfTraceFolder">
                      </instanceof>
                   </iterate>
                </with>
             </visibleWhen>
          </command>
-         <command
-               commandId="org.eclipse.linuxtools.tmf.ui.command.project.experiment.copy"
-               disabledIcon="IMG_TOOL_COPY_DISABLED"
-               icon="IMG_TOOL_COPY"
-               label="%commands.experiment.copy"
-               mnemonic="%commands.experiment.copy.mnemonic"
-               style="push"
-               tooltip="%commands.experiment.copy.description">
+         <menu
+               label="%command.select_trace_type"
+               mnemonic="%command.select_trace_type.mnemonic"
+               tooltip="%command.select_trace_type.description">
+            <dynamic
+                  class="org.eclipse.linuxtools.internal.tmf.ui.project.handlers.SelectTraceTypeContributionItem"
+                  id="org.eclipse.linuxtools.tmf.ui.command.select_trace_type.dynamic">
+            </dynamic>
+            <separator
+                  name="org.eclipse.linuxtools.tmf.ui.separator6"
+                  visible="true">
+            </separator>
+            <command
+                  commandId="org.eclipse.linuxtools.tmf.ui.command.managecustomparsers"
+                  icon="icons/etool16/customparser_wizard.gif"
+                  style="push">
+            </command>
             <visibleWhen
                   checkEnabled="false">
                <with
                      variable="selection">
-                  <count
-                        value="1">
-                  </count>
                   <iterate
                         ifEmpty="false"
                         operator="and">
                      <instanceof
-                           value="org.eclipse.linuxtools.tmf.ui.project.model.TmfExperimentElement">
+                           value="org.eclipse.linuxtools.tmf.ui.project.model.TmfTraceElement">
                      </instanceof>
                   </iterate>
                </with>
             </visibleWhen>
-         </command>
+         </menu>
+         <separator
+               name="org.eclipse.linuxtools.tmf.ui.separator4"
+               visible="true">
+         </separator>
          <command
-               commandId="org.eclipse.linuxtools.tmf.ui.command.project.experiment.rename"
-               icon="icons/elcl16/rename.gif"
-               label="%commands.experiment.rename"
-               mnemonic="%commands.experiment.rename.mnemonic"
+               commandId="org.eclipse.linuxtools.tmf.ui.command.select_traces"
+               icon="icons/obj16/add_obj.gif"
+               label="%command.select_traces"
+               mnemonic="%command.select_traces.mnemonic"
                style="push"
-               tooltip="%commands.experiment.rename.description">
+               tooltip="%commands.select_traces.description">
             <visibleWhen
                   checkEnabled="false">
                <with
@@ -726,70 +672,15 @@
                </with>
             </visibleWhen>
          </command>
-         <command
-               commandId="org.eclipse.linuxtools.tmf.ui.command.project.experiment.delete"
-               disabledIcon="IMG_ETOOL_DELETE_DISABLED"
-               icon="IMG_ETOOL_DELETE"
-               label="%commands.experiment.delete"
-               mnemonic="%commands.experiment.delete.mnemonic"
-               style="push"
-               tooltip="%commands.experiment.delete.description">
-            <visibleWhen
-                  checkEnabled="false">
-               <with
-                     variable="selection">
-                  <iterate
-                        ifEmpty="false"
-                        operator="and">
-                     <instanceof
-                           value="org.eclipse.linuxtools.tmf.ui.project.model.TmfExperimentElement">
-                     </instanceof>
-                  </iterate>
-               </with>
-            </visibleWhen>
-         </command>
          <separator
-               name="org.eclipse.linuxtools.tmf.ui.separator6"
-               visible="true">
-         </separator>
-         <command
-               commandId="org.eclipse.linuxtools.tmf.ui.command.project.experiment.deleteSupplementaryFiles"
-               label="%commands.experiment.deleteSupplementaryFiles"
-               mnemonic="%commands.experiment.deleteSupplementaryFiles.mnemonic"
-               style="push"
-               tooltip="%commands.experiment.deleteSupplementaryFiles.description">
-            <visibleWhen
-                  checkEnabled="false">
-               <with
-                     variable="selection">
-                  <iterate
-                       ifEmpty="false"
-                       operator="and">
-                     <and>
-                        <instanceof
-                              value="org.eclipse.linuxtools.tmf.ui.project.model.TmfExperimentElement">
-                        </instanceof>
-                        <test
-                              forcePluginActivation="true"
-                              property="org.eclipse.linuxtools.tmf.ui.hasSupplementaryFiles">
-                        </test>
-                     </and>
-                  </iterate>
-               </with>
-            </visibleWhen>
-         </command>
-         <separator
-               name="org.eclipse.linuxtools.tmf.ui.separator7"
+               name="org.eclipse.linuxtools.tmf.ui.separator5"
                visible="true">
          </separator>
          <command
-               commandId="org.eclipse.linuxtools.tmf.ui.command.project.experiment.refresh"
-               disabledIcon="icons/dlcl16/refresh.gif"
-               icon="icons/elcl16/refresh.gif"
-               label="%commands.experiment.refresh"
-               mnemonic="%commands.experiment.refresh.mnemonic"
-               style="push"
-               tooltip="%commands.experiment.refresh.description">
+               commandId="org.eclipse.ui.file.refresh"
+               label="%command.refresh"
+               mnemonic="%command.refresh.mnemonic"
+               style="push">
             <visibleWhen
                   checkEnabled="false">
                <with
@@ -800,9 +691,17 @@
                   <iterate
                         ifEmpty="false"
                         operator="and">
-                     <instanceof
-                           value="org.eclipse.linuxtools.tmf.ui.project.model.TmfExperimentElement">
-                     </instanceof>
+                     <or>
+                        <instanceof
+                              value="org.eclipse.linuxtools.tmf.ui.project.model.TmfTraceFolder">
+                        </instanceof>
+                        <instanceof
+                              value="org.eclipse.linuxtools.tmf.ui.project.model.TmfExperimentFolder">
+                        </instanceof>
+                        <instanceof
+                              value="org.eclipse.linuxtools.tmf.ui.project.model.TmfExperimentElement">
+                        </instanceof>
+                     </or>
                   </iterate>
                </with>
             </visibleWhen>
@@ -812,141 +711,47 @@
    <extension
          point="org.eclipse.ui.commands">
       <category
-            description="%commands.trace_folder.category.description"
-            id="org.eclipse.linuxtools.tmf.ui.commands.trace_folder.category"
-            name="%commands.trace_folder.category.name">
-      </category>
-      <command
-            categoryId="org.eclipse.linuxtools.tmf.ui.commands.trace_folder.category"
-            description="%commands.trace_folder.import.description"
-            id="org.eclipse.linuxtools.tmf.ui.command.project.trace.import"
-            name="%commands.trace_folder.import">
-      </command>
-      <command
-            categoryId="org.eclipse.linuxtools.tmf.ui.commands.trace_folder.category"
-            description="%commands.trace_folder.refresh.description"
-            id="org.eclipse.linuxtools.tmf.ui.command.project.trace.refresh"
-            name="%commands.trace_folder.refresh">
-      </command>
-      <category
-            description="%commands.trace.category.description"
-            id="org.eclipse.linuxtools.tmf.ui.commands.trace.category"
-            name="%commands.trace.category.name">
-      </category>
-      <command
-            categoryId="org.eclipse.linuxtools.tmf.ui.commands.trace.category"
-            description="%commands.trace.open.description"
-            id="org.eclipse.linuxtools.tmf.ui.command.project.trace.open"
-            name="%commands.trace.open">
-      </command>
-      <command
-            categoryId="org.eclipse.linuxtools.tmf.ui.commands.trace.category"
-            description="%commands.trace.copy.description"
-            id="org.eclipse.linuxtools.tmf.ui.command.project.trace.copy"
-            name="%commands.trace.copy">
-      </command>
-      <command
-            categoryId="org.eclipse.linuxtools.tmf.ui.commands.trace.category"
-            description="%commands.trace.rename.description"
-            id="org.eclipse.linuxtools.tmf.ui.command.project.trace.rename"
-            name="%commands.trace.rename">
-      </command>
-      <command
-            categoryId="org.eclipse.linuxtools.tmf.ui.commands.trace.category"
-            description="%commands.trace.deleteSupplementaryFiles.description"
-            id="org.eclipse.linuxtools.tmf.ui.command.project.trace.deleteSupplementaryFiles"
-            name="%commands.trace.deleteSupplementaryFiles">
-      </command>
-      <category
-            description="%commands.experiment_folder.category.description"
-            id="org.eclipse.linuxtools.tmf.ui.commands.experiment_folder.category"
-            name="%commands.experiment_folder.category.name">
+            description="%commands.category.description"
+            id="org.eclipse.linuxtools.tmf.ui.commands.category"
+            name="%commands.category.name">
       </category>
       <command
-            categoryId="org.eclipse.linuxtools.tmf.ui.commands.experiment_folder.category"
-            description="%commands.experiment_folder.new.description"
-            id="org.eclipse.linuxtools.tmf.ui.command.project.experiment_folder.new"
-            name="%commands.experiment_folder.new">
-      </command>
-      <command
-            categoryId="org.eclipse.linuxtools.tmf.ui.commands.experiment_folder.category"
-            description="%commands.experiment_folder.refresh.description"
-            id="org.eclipse.linuxtools.tmf.ui.command.project.experiment_folder.refresh"
-            name="%commands.experiment_folder.refresh">
+            categoryId="org.eclipse.linuxtools.tmf.ui.commands.category"
+            description="%command.new_experiment.description"
+            id="org.eclipse.linuxtools.tmf.ui.command.new_experiment"
+            name="%command.new_experiment">
       </command>
       <command
-            categoryId="org.eclipse.linuxtools.tmf.ui.commands.trace.category"
-            description="%commands.trace.select_trace_type.description"
-            id="org.eclipse.linuxtools.tmf.ui.command.project.trace.select_trace_type"
-            name="%commands.trace.select_trace_type">
+            categoryId="org.eclipse.linuxtools.tmf.ui.commands.category"
+            description="%command.select_trace_type.description"
+            id="org.eclipse.linuxtools.tmf.ui.command.select_trace_type"
+            name="%command.select_trace_type">
          <commandParameter
-               id="org.eclipse.linuxtools.tmf.ui.commandparameter.project.trace.select_trace_type.bundle"
+               id="org.eclipse.linuxtools.tmf.ui.commandparameter.select_trace_type.bundle"
                name="%commands.trace.select_trace_type.bundle"
                optional="false">
          </commandParameter>
          <commandParameter
-               id="org.eclipse.linuxtools.tmf.ui.commandparameter.project.trace.select_trace_type.type"
+               id="org.eclipse.linuxtools.tmf.ui.commandparameter.select_trace_type.type"
                name="%commands.trace.select_trace_type.type"
                optional="false">
          </commandParameter>
          <commandParameter
-               id="org.eclipse.linuxtools.tmf.ui.commandparameter.project.trace.select_trace_type.icon"
+               id="org.eclipse.linuxtools.tmf.ui.commandparameter.select_trace_type.icon"
                name="%commands.trace.select_trace_type.icon"
                optional="false">
          </commandParameter>
       </command>
       <command
-            categoryId="org.eclipse.linuxtools.tmf.ui.commands.trace.category"
-            description="%commands.trace.delete.description"
-            id="org.eclipse.linuxtools.tmf.ui.command.project.trace.delete"
-            name="%commands.trace.delete">
-      </command>
-      <category
-            description="%commands.experiment.category.description"
-            id="org.eclipse.linuxtools.tmf.ui.commands.experiment.category"
-            name="%commands.experiment.category.name">
-      </category>
-      <command
-            categoryId="org.eclipse.linuxtools.tmf.ui.commands.experiment.category"
-            description="%commands.experiment.selecttraces.description"
-            id="org.eclipse.linuxtools.tmf.ui.command.project.experiment.select"
-            name="%commands.experiment.selecttraces">
-      </command>
-      <command
-            categoryId="org.eclipse.linuxtools.tmf.ui.commands.experiment.category"
-            description="%commands.experiment.open.description"
-            id="org.eclipse.linuxtools.tmf.ui.command.project.experiment.open"
-            name="%commands.experiment.open">
-      </command>
-       <command
-             categoryId="org.eclipse.linuxtools.tmf.ui.commands.experiment.category"
-            description="%commands.experiment.copy.description"
-            id="org.eclipse.linuxtools.tmf.ui.command.project.experiment.copy"
-            name="%commands.experiment.copy">
-      </command>
-      <command
-            categoryId="org.eclipse.linuxtools.tmf.ui.commands.experiment.category"
-            description="%commands.experiment.rename.description"
-            id="org.eclipse.linuxtools.tmf.ui.command.project.experiment.rename"
-            name="%commands.experiment.rename">
+            categoryId="org.eclipse.linuxtools.tmf.ui.commands.category"
+            id="org.eclipse.linuxtools.tmf.ui.command.delete_suppl_files"
+            name="%command.delete_suppl_files">
       </command>
       <command
-            categoryId="org.eclipse.linuxtools.tmf.ui.commands.experiment.category"
-            description="%commands.experiment.delete.description"
-            id="org.eclipse.linuxtools.tmf.ui.command.project.experiment.delete"
-            name="%commands.experiment.delete">
-      </command>
-      <command
-            categoryId="org.eclipse.linuxtools.tmf.ui.commands.experiment.category"
-            description="%commands.experiment.deleteSupplementaryFiles.description"
-            id="org.eclipse.linuxtools.tmf.ui.command.project.experiment.deleteSupplementaryFiles"
-            name="%commands.experiment.deleteSupplementaryFiles">
-      </command>
-      <command
-            categoryId="org.eclipse.linuxtools.tmf.ui.commands.experiment.category"
-            description="%commands.experiment.refresh.description"
-            id="org.eclipse.linuxtools.tmf.ui.command.project.experiment.refresh"
-            name="%commands.experiment.refresh">
+            categoryId="org.eclipse.linuxtools.tmf.ui.commands.category"
+            description="%command.select_traces.description"
+            id="org.eclipse.linuxtools.tmf.ui.command.select_traces"
+            name="%command.select_traces">
       </command>
       <category
             description="%commands.parser.category.description"
@@ -1006,120 +811,266 @@
             id="org.eclipse.linuxtools.tmf.ui.views.uml2sd.handlers.MoveSDRight"
             name="%commands.uml2sd.scrollright">
       </command>
-   </extension>
-   <extension point="org.eclipse.ui.bindings">
-      <key
-            sequence="ALT+R"
-            contextId="org.eclipse.linuxtools.tmf.ui.view.uml2sd.context"
-            commandId="org.eclipse.linuxtools.tmf.ui.views.uml2sd.handlers.GoToMessage"
-            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration">
-      </key>   
-      <key
-            sequence="SHIFT+ALT+END"
-            contextId="org.eclipse.linuxtools.tmf.ui.view.uml2sd.context"
-            commandId="org.eclipse.linuxtools.tmf.ui.views.uml2sd.handlers.ShowNodeEnd"
-            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration">
-      </key>   
-      <key
-            sequence="SHIFT+ALT+HOME"
-            contextId="org.eclipse.linuxtools.tmf.ui.view.uml2sd.context"
-            commandId="org.eclipse.linuxtools.tmf.ui.views.uml2sd.handlers.ShowNodeStart"
-            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration">
-      </key>    
-      <key
-            sequence="SHIFT+ALT+ARROW_UP"
-            contextId="org.eclipse.linuxtools.tmf.ui.view.uml2sd.context"
-            commandId="org.eclipse.linuxtools.tmf.ui.views.uml2sd.handlers.MoveSDUp"
-            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration">
-      </key>  
-      <key
-            sequence="SHIFT+ALT+ARROW_DOWN"
-            contextId="org.eclipse.linuxtools.tmf.ui.view.uml2sd.context"
-            commandId="org.eclipse.linuxtools.tmf.ui.views.uml2sd.handlers.MoveSDDown"
-            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration">
-      </key>
-      <key
-            sequence="SHIFT+ALT+ARROW_LEFT"
-            contextId="org.eclipse.linuxtools.tmf.ui.view.uml2sd.context"
-            commandId="org.eclipse.linuxtools.tmf.ui.views.uml2sd.handlers.MoveSDLeft"
-            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration">
-      </key>
-      <key
-            sequence="SHIFT+ALT+ARROW_RIGHT"
-            contextId="org.eclipse.linuxtools.tmf.ui.view.uml2sd.context"
-            commandId="org.eclipse.linuxtools.tmf.ui.views.uml2sd.handlers.MoveSDRight"
-            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration">
-      </key>
+      <command
+            description="%command.batch_import.description"
+            id="org.eclipse.linuxtools.tmf.ui.batch_import"
+            name="%command.batch_import">
+      </command>
    </extension>
    <extension
          point="org.eclipse.ui.handlers">
       <handler
             class="org.eclipse.linuxtools.internal.tmf.ui.project.handlers.ImportTraceHandler"
-            commandId="org.eclipse.linuxtools.tmf.ui.command.project.trace.import">
+            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>
       </handler>
       <handler
             class="org.eclipse.linuxtools.internal.tmf.ui.project.handlers.RefreshHandler"
-            commandId="org.eclipse.linuxtools.tmf.ui.command.project.trace.refresh">
+            commandId="org.eclipse.ui.file.refresh">
+         <activeWhen>
+            <and>
+               <count
+                     value="1">
+               </count>
+               <iterate
+                     ifEmpty="false"
+                     operator="and">
+                  <or>
+                     <instanceof
+                           value="org.eclipse.linuxtools.tmf.ui.project.model.TmfTraceFolder">
+                     </instanceof>
+                     <instanceof
+                           value="org.eclipse.linuxtools.tmf.ui.project.model.TmfExperimentFolder">
+                     </instanceof>
+                     <instanceof
+                           value="org.eclipse.linuxtools.tmf.ui.project.model.TmfExperimentElement">
+                     </instanceof>
+                  </or>
+               </iterate>
+            </and>
+         </activeWhen>
       </handler>
       <handler
             class="org.eclipse.linuxtools.internal.tmf.ui.project.handlers.OpenTraceHandler"
-            commandId="org.eclipse.linuxtools.tmf.ui.command.project.trace.open">
-      </handler>
-      <handler
-            class="org.eclipse.linuxtools.internal.tmf.ui.project.handlers.CopyTraceHandler"
-            commandId="org.eclipse.linuxtools.tmf.ui.command.project.trace.copy">
-      </handler>
-      <handler
-            class="org.eclipse.linuxtools.internal.tmf.ui.project.handlers.RenameTraceHandler"
-            commandId="org.eclipse.linuxtools.tmf.ui.command.project.trace.rename">
+            commandId="org.eclipse.ui.navigate.openResource">
+         <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.handlers.DeleteTraceHandler"
-            commandId="org.eclipse.linuxtools.tmf.ui.command.project.trace.delete">
+            class="org.eclipse.linuxtools.internal.tmf.ui.project.handlers.OpenExperimentHandler"
+            commandId="org.eclipse.ui.navigate.openResource">
+         <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.DeleteTraceSupplementaryFilesHandler"
-            commandId="org.eclipse.linuxtools.tmf.ui.command.project.trace.deleteSupplementaryFiles">
+            class="org.eclipse.linuxtools.internal.tmf.ui.project.handlers.CopyTraceHandler"
+            commandId="org.eclipse.ui.edit.copy">
+         <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.handlers.SelectTraceTypeHandler"
-            commandId="org.eclipse.linuxtools.tmf.ui.command.project.trace.select_trace_type">
+            class="org.eclipse.linuxtools.internal.tmf.ui.project.handlers.CopyExperimentHandler"
+            commandId="org.eclipse.ui.edit.copy">
+         <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.project.experiment_folder.new">
+            class="org.eclipse.linuxtools.internal.tmf.ui.project.handlers.RenameTraceHandler"
+            commandId="org.eclipse.ui.edit.rename">
+         <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.handlers.RefreshHandler"
-            commandId="org.eclipse.linuxtools.tmf.ui.command.project.experiment_folder.refresh">
+            class="org.eclipse.linuxtools.internal.tmf.ui.project.handlers.RenameExperimentHandler"
+            commandId="org.eclipse.ui.edit.rename">
+         <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.SelectTracesHandler"
-            commandId="org.eclipse.linuxtools.tmf.ui.command.project.experiment.select">
+            class="org.eclipse.linuxtools.internal.tmf.ui.project.handlers.DeleteTraceHandler"
+            commandId="org.eclipse.ui.edit.delete">
+         <activeWhen>
+            <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.OpenExperimentHandler"
-            commandId="org.eclipse.linuxtools.tmf.ui.command.project.experiment.open">
+            class="org.eclipse.linuxtools.internal.tmf.ui.project.handlers.DeleteExperimentHandler"
+            commandId="org.eclipse.ui.edit.delete">
+         <activeWhen>
+            <iterate
+                  ifEmpty="false"
+                  operator="and">
+               <instanceof
+                     value="org.eclipse.linuxtools.tmf.ui.project.model.TmfExperimentElement">
+               </instanceof>
+            </iterate>
+         </activeWhen>
       </handler>
       <handler
-            class="org.eclipse.linuxtools.internal.tmf.ui.project.handlers.CopyExperimentHandler"
-            commandId="org.eclipse.linuxtools.tmf.ui.command.project.experiment.copy">
+            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.handlers.RenameExperimentHandler"
-            commandId="org.eclipse.linuxtools.tmf.ui.command.project.experiment.rename">
+            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.DeleteExperimentHandler"
-            commandId="org.eclipse.linuxtools.tmf.ui.command.project.experiment.delete">
+            class="org.eclipse.linuxtools.internal.tmf.ui.project.handlers.NewExperimentHandler"
+            commandId="org.eclipse.linuxtools.tmf.ui.command.new_experiment">
+         <activeWhen>
+            <and>
+               <count
+                     value="1">
+               </count>
+               <iterate
+                     operator="and">
+                  <instanceof
+                        value="org.eclipse.linuxtools.tmf.ui.project.model.TmfExperimentFolder">
+                  </instanceof>
+               </iterate>
+            </and>
+         </activeWhen>
       </handler>
       <handler
-            class="org.eclipse.linuxtools.internal.tmf.ui.project.handlers.DeleteExperimentSupplementaryFilesHandler"
-            commandId="org.eclipse.linuxtools.tmf.ui.command.project.experiment.deleteSupplementaryFiles">
+            class="org.eclipse.linuxtools.internal.tmf.ui.project.handlers.SelectTraceTypeHandler"
+            commandId="org.eclipse.linuxtools.tmf.ui.command.select_trace_type">
+         <activeWhen>
+            <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.RefreshHandler"
-            commandId="org.eclipse.linuxtools.tmf.ui.command.project.experiment.refresh">
+            class="org.eclipse.linuxtools.internal.tmf.ui.project.handlers.SelectTracesHandler"
+            commandId="org.eclipse.linuxtools.tmf.ui.command.select_traces">
+         <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.commands.ManageCustomParsersCommandHandler"
@@ -1137,6 +1088,68 @@
             </with>
          </activeWhen>
       </handler>
+      <handler
+            class="org.eclipse.linuxtools.internal.tmf.ui.project.handlers.BatchImportTraceHandler"
+            commandId="org.eclipse.linuxtools.tmf.ui.batch_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>
+      </handler>
+   </extension>
+   <extension point="org.eclipse.ui.bindings">
+      <key
+            sequence="ALT+R"
+            contextId="org.eclipse.linuxtools.tmf.ui.view.uml2sd.context"
+            commandId="org.eclipse.linuxtools.tmf.ui.views.uml2sd.handlers.GoToMessage"
+            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration">
+      </key>   
+      <key
+            sequence="SHIFT+ALT+END"
+            contextId="org.eclipse.linuxtools.tmf.ui.view.uml2sd.context"
+            commandId="org.eclipse.linuxtools.tmf.ui.views.uml2sd.handlers.ShowNodeEnd"
+            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration">
+      </key>   
+      <key
+            sequence="SHIFT+ALT+HOME"
+            contextId="org.eclipse.linuxtools.tmf.ui.view.uml2sd.context"
+            commandId="org.eclipse.linuxtools.tmf.ui.views.uml2sd.handlers.ShowNodeStart"
+            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration">
+      </key>    
+      <key
+            sequence="SHIFT+ALT+ARROW_UP"
+            contextId="org.eclipse.linuxtools.tmf.ui.view.uml2sd.context"
+            commandId="org.eclipse.linuxtools.tmf.ui.views.uml2sd.handlers.MoveSDUp"
+            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration">
+      </key>  
+      <key
+            sequence="SHIFT+ALT+ARROW_DOWN"
+            contextId="org.eclipse.linuxtools.tmf.ui.view.uml2sd.context"
+            commandId="org.eclipse.linuxtools.tmf.ui.views.uml2sd.handlers.MoveSDDown"
+            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration">
+      </key>
+      <key
+            sequence="SHIFT+ALT+ARROW_LEFT"
+            contextId="org.eclipse.linuxtools.tmf.ui.view.uml2sd.context"
+            commandId="org.eclipse.linuxtools.tmf.ui.views.uml2sd.handlers.MoveSDLeft"
+            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration">
+      </key>
+      <key
+            sequence="SHIFT+ALT+ARROW_RIGHT"
+            contextId="org.eclipse.linuxtools.tmf.ui.view.uml2sd.context"
+            commandId="org.eclipse.linuxtools.tmf.ui.views.uml2sd.handlers.MoveSDRight"
+            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration">
+      </key>
    </extension>
    <extension
          point="org.eclipse.core.contenttype.contentTypes">
@@ -1166,6 +1179,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">
@@ -1193,7 +1212,7 @@
             class="org.eclipse.linuxtools.internal.tmf.ui.project.handlers.TracePropertyTester"
             id="org.eclipse.linuxtools.tmf.ui.tracePropertyTester"
             namespace="org.eclipse.linuxtools.tmf.ui"
-            properties="isExperimentTrace,hasSupplementaryFiles"
+            properties="isExperimentTrace,hasSupplementaryFiles,traceType"
             type="org.eclipse.linuxtools.tmf.ui.project.model.TmfProjectModelElement">
       </propertyTester>
    </extension>
@@ -1212,5 +1231,25 @@
             trace_type="org.eclipse.linuxtools.tmf.core.ctfadaptor.CtfTmfTrace">
       </type>
    </extension>
+   <extension
+         point="org.eclipse.ui.navigator.linkHelper">
+      <linkHelper
+            class="org.eclipse.linuxtools.internal.tmf.ui.project.model.TmfEditorLinkHelper"
+            id="org.eclipse.linuxtools.internal.tmf.ui.project.model.TmfEditorLinkHelper">
+         <editorInputEnablement>
+             <instanceof value="org.eclipse.ui.IFileEditorInput"/>
+         </editorInputEnablement>
+         <selectionEnablement>
+             <or>
+                <instanceof
+                      value="org.eclipse.linuxtools.tmf.ui.project.model.TmfTraceElement">
+                </instanceof>
+                <instanceof
+                      value="org.eclipse.linuxtools.tmf.ui.project.model.TmfExperimentElement">
+                </instanceof>
+             </or>
+         </selectionEnablement>
+      </linkHelper>
+   </extension>
 
 </plugin>