Rationalize the TMF commands

- Simplify commands categories
- Re-use the platform command id:s where reasonable
- Adjust context menu order
- Adjust shortcuts and accelerators

Change-Id: I6f2e71239dd1bd8392452792bf3868aa6e6dbdf4
Signed-off-by: Francois Chouinard <fchouinard@gmail.com>
Reviewed-on: https://git.eclipse.org/r/7916
Tested-by: Hudson CI
Reviewed-by: Bernd Hufmann <bhufmann@gmail.com>
IP-Clean: Bernd Hufmann <bhufmann@gmail.com>
Tested-by: Bernd Hufmann <bhufmann@gmail.com>

diff --git a/org.eclipse.linuxtools.tmf.ui/plugin.properties b/org.eclipse.linuxtools.tmf.ui/plugin.properties
index 883a590dea73af9b156e8196e1a191abc88c2733..17367f2fb2dd0a6a4c3622537a5aacf1338378f7 100644 (file)
--- a/org.eclipse.linuxtools.tmf.ui/plugin.properties
+++ b/org.eclipse.linuxtools.tmf.ui/plugin.properties
@@ -1,8 +1,8 @@
-#Properties file for org.eclipse.linuxtools.tmf.ui
+# Properties file for org.eclipse.linuxtools.tmf.ui
 Bundle-Vendor = Eclipse Linux Tools
 Bundle-Name = TMF UI
 
-#Properties file for org.eclipse.linuxtools.tmf.ui (plugin.xml)
+# Perspective and Views names
 perspective.category.name = Tracing
 
 views.category.name = Tracing
@@ -17,6 +17,7 @@ uml2sd.view.name = Sequence Diagram
 histogram.view.name = Histogram
 environment.view.name = Environment Variables
 
+# Tracing wizards
 project.new.category.name = Tracing
 project.new.wizard.name = Tracing Project
 project.new.wizard.description = Create a new Tracing project
@@ -25,6 +26,7 @@ project.new.wizard.custom.xml.parser = Custom XML Parser
 
 project.import.wizard.name = Trace Import
 
+# Preference page
 preference.page.trace.name = Tracing
 preference.page.uml2sd.name = UML2 Sequence Diagram
 
@@ -34,97 +36,69 @@ binding.scheme = Tracing
 binding.scheme.description = Default key binding for tracing
 binding.context = Tracing
 
-# Trace folder
-commands.trace_folder.category.name = Trace Folder Commands
-commands.trace_folder.category.description = Trace Folder Commands
+## Tracing commands
+commands.category.name = Tracing
+commands.category.description = Tracing Commands
 
-commands.trace_folder.import = Import...
-commands.trace_folder.import.mnemonic = I
-commands.trace_folder.import.description = Import traces in the project
+## Common (re-used by multiple sub-menus)
 
-commands.trace_folder.refresh = Refresh
-commands.trace_folder.refresh.mnemonic = F
-commands.trace_folder.refresh.description = Refresh Traces Folder
+command.open = Open
+command.open.mnemonic = O
+command.open.description = Open element
 
-# Trace
-commands.trace.category.name = Trace Commands
-commands.trace.category.description = Trace Commands
+command.copy = Copy...
+command.copy.mnemonic = C
+command.copy.description = Copy element
 
-commands.trace.open = Open
-commands.trace.open.mnemonic = O
-commands.trace.open.description = Open a Trace
+command.rename = Rename...
+command.rename.mnemonic = m
+command.rename.description = Rename element
 
-commands.trace.copy = Copy...
-commands.trace.copy.mnemonic = C
-commands.trace.copy.description = Copy a Trace
+command.delete = Delete
+command.delete.mnemonic = D
+command.delete.description = Delete element
 
-commands.trace.rename = Rename...
-commands.trace.rename.mnemonic = R
-commands.trace.rename.description = Rename a Trace
+command.refresh = Refresh
+command.refresh.mnemonic = f
+command.refresh.description = Refresh project structure
 
-commands.trace.delete = Delete
-commands.trace.delete.mnemonic = D
-commands.trace.delete.description = Delete a Trace
+command.delete_suppl_files = Delete Supplementary Files...
+command.delete_suppl_files.mnemonic = S
+command.delete_suppl_files.description = Delete Supplementary Files
 
-commands.trace.remove = Remove
-commands.trace.remove.mnemonic = D
-commands.trace.remove.description = Remove a Trace from Experiment
+command.select_trace_type = Select Trace Type...
+command.select_trace_type.mnemonic = T
+command.select_trace_type.description = Select a trace type
+command.select_trace_type.bundle = Bundle
+command.select_trace_type.type = Trace Type
+command.select_trace_type.icon = Icon
 
-commands.trace.deleteSupplementaryFiles = Delete Supplementary Files...
-commands.trace.deleteSupplementaryFiles.mnemonic = S
-commands.trace.deleteSupplementaryFiles.description = Delete Supplementary Files
+## Trace menu
+#  Open, Copy, Rename, Delete, Delete Supplementary Files, Select Trace Type
 
-commands.trace.select_trace_type = Select Trace Type...
-commands.trace.select_trace_type.mnemonic = T
-commands.trace.select_trace_type.description = Select a trace type
-commands.trace.select_trace_type.bundle = Bundle
-commands.trace.select_trace_type.type = Trace Type
-commands.trace.select_trace_type.icon = Icon
+## Trace folder menu
+#  Import, Refresh
 
-# Experiment folder
-commands.experiment_folder.category.name = Experiment Folder Commands
-commands.experiment_folder.category.description = Experiment Folder Commands
+command.import = Import...
+command.import.mnemonic = I
+command.import.description = Import traces into project
 
-commands.experiment_folder.new = New...
-commands.experiment_folder.new.mnemonic = N
-commands.experiment_folder.new.description = Create Tracing Experiment
+## Experiment menu
+#  Open, Copy, Rename, Remove, Delete Supplementary Files, Select Traces, Refresh
 
-commands.experiment_folder.refresh = Refresh
-commands.experiment_folder.refresh.mnemonic = F
-commands.experiment_folder.refresh.description = Refresh Experiments Folder
+command.select_traces = Select Traces...
+command.select_traces.mnemonic = T
+command.select_traces.description = Select Traces
 
-# Experiment
-commands.experiment.category.name = Experiment Commands
-commands.experiment.category.description = Experiment Commands
-
-commands.experiment.selecttraces = Select Traces...
-commands.experiment.selecttraces.mnemonic = S
-commands.experiment.selecttraces.description = Select Traces
-
-commands.experiment.open = Open
-commands.experiment.open.mnemonic = O
-commands.experiment.open.description = Open a Tracing Experiment
-
-commands.experiment.copy = Copy...
-commands.experiment.copy.mnemonic = C
-commands.experiment.copy.description = Copy a Tracing Experiment
-
-commands.experiment.rename = Rename...
-commands.experiment.rename.mnemonic = R
-commands.experiment.rename.description = Rename a Tracing Experiment
-
-commands.experiment.delete = Delete
-commands.experiment.delete.mnemonic = D
-commands.experiment.delete.description = Delete a Tracing Experiment
-
-commands.experiment.refresh = Refresh
-commands.experiment.refresh.mnemonic = F
-commands.experiment.refresh.description = Refresh the Experiment
-
-commands.experiment.deleteSupplementaryFiles = Delete Supplementary Files...
-commands.experiment.deleteSupplementaryFiles.mnemonic = S
-commands.experiment.deleteSupplementaryFiles.description = Delete Supplementary Files of Each Trace
+command.remove = Remove
+command.remove.mnemonic = v
+command.remove.description = Remove trace from experiment
 
+## Experiment folder menu
+#  New, Refresh
+command.new_experiment = New...
+command.new_experiment.mnemonic = N
+command.new_experiment.description = Create Tracing Experiment
 
 # Custom parsers
 commands.parser.category.name = Parser Commands

diff --git a/org.eclipse.linuxtools.tmf.ui/plugin.xml b/org.eclipse.linuxtools.tmf.ui/plugin.xml
index 2952adc4eafe0ddaeb7bbe33a7974a6aaf721463..30ef6ed482a7b65123e6d1c97570e5ff79dc5b2b 100644 (file)
--- a/org.eclipse.linuxtools.tmf.ui/plugin.xml
+++ b/org.eclipse.linuxtools.tmf.ui/plugin.xml
@@ -330,13 +330,10 @@
       <menuContribution\r
             locationURI="popup:org.eclipse.ui.popup.any?after=additions">\r
          <command\r
-               commandId="org.eclipse.linuxtools.tmf.ui.command.project.trace.import"\r
-               disabledIcon="icons/dtool16/import.gif"\r
-               icon="icons/etool16/import.gif"\r
-               label="%commands.trace_folder.import"\r
-               mnemonic="%commands.trace_folder.import.mnemonic"\r
-               style="push"\r
-               tooltip="%commands.trace_folder.import.description">\r
+               commandId="org.eclipse.ui.file.import"\r
+               label="%command.import"\r
+               mnemonic="%command.import.mnemonic"\r
+               style="push">\r
             <visibleWhen\r
                   checkEnabled="false">\r
                <with\r
@@ -358,38 +355,12 @@
                visible="true">\r
          </separator>\r
          <command\r
-               commandId="org.eclipse.linuxtools.tmf.ui.command.project.trace.refresh"\r
-               disabledIcon="icons/dlcl16/refresh.gif"\r
-               icon="icons/elcl16/refresh.gif"\r
-               label="%commands.trace_folder.refresh"\r
-               mnemonic="%commands.trace_folder.refresh.mnemonic"\r
-               style="push"\r
-               tooltip="%commands.trace_folder.refresh.description">\r
-            <visibleWhen\r
-                  checkEnabled="false">\r
-               <with\r
-                     variable="selection">\r
-                  <count\r
-                        value="1">\r
-                  </count>\r
-                  <iterate\r
-                        ifEmpty="false"\r
-                        operator="and">\r
-                     <instanceof\r
-                           value="org.eclipse.linuxtools.tmf.ui.project.model.TmfTraceFolder">\r
-                     </instanceof>\r
-                  </iterate>\r
-               </with>\r
-            </visibleWhen>\r
-         </command>\r
-         <command\r
-               commandId="org.eclipse.linuxtools.tmf.ui.command.project.trace.open"\r
-               disabledIcon="icons/dlcl16/open.gif"\r
-               icon="icons/elcl16/open.gif"\r
-               label="%commands.trace.open"\r
-               mnemonic="%commands.trace.open.mnemonic"\r
-               style="push"\r
-               tooltip="%commands.trace.open.descritption">\r
+               commandId="org.eclipse.ui.navigate.openResource"\r
+               disabledIcon="/icons/dlcl16/open.gif"\r
+               icon="/icons/elcl16/open.gif"\r
+               label="%command.open"\r
+               mnemonic="%command.open.mnemonic"\r
+               style="push">\r
             <visibleWhen\r
                   checkEnabled="false">\r
                <with\r
@@ -400,21 +371,23 @@
                   <iterate\r
                         ifEmpty="false"\r
                         operator="and">\r
-                     <instanceof\r
-                           value="org.eclipse.linuxtools.tmf.ui.project.model.TmfTraceElement">\r
-                     </instanceof>\r
+                     <or>\r
+                        <instanceof\r
+                              value="org.eclipse.linuxtools.tmf.ui.project.model.TmfTraceElement">\r
+                        </instanceof>\r
+                        <instanceof\r
+                              value="org.eclipse.linuxtools.tmf.ui.project.model.TmfExperimentElement">\r
+                        </instanceof>\r
+                     </or>\r
                   </iterate>\r
                </with>\r
             </visibleWhen>\r
          </command>\r
          <command\r
-               commandId="org.eclipse.linuxtools.tmf.ui.command.project.trace.copy"\r
-               disabledIcon="IMG_TOOL_COPY_DISABLED"\r
-               icon="IMG_TOOL_COPY"\r
-               label="%commands.trace.copy"\r
-               mnemonic="%commands.trace.copy.mnemonic"\r
-               style="push"\r
-               tooltip="%commands.trace.copy.description">\r
+               commandId="org.eclipse.ui.edit.copy"\r
+               label="%command.copy"\r
+               mnemonic="%command.copy.mnemonic"\r
+               style="push">\r
             <visibleWhen\r
                   checkEnabled="false">\r
                <with\r
@@ -425,21 +398,25 @@
                   <iterate\r
                         ifEmpty="false"\r
                         operator="and">\r
-                     <instanceof\r
-                           value="org.eclipse.linuxtools.tmf.ui.project.model.TmfTraceElement">\r
-                     </instanceof>\r
+                     <or>\r
+                        <instanceof\r
+                              value="org.eclipse.linuxtools.tmf.ui.project.model.TmfTraceElement">\r
+                        </instanceof>\r
+                        <instanceof\r
+                              value="org.eclipse.linuxtools.tmf.ui.project.model.TmfExperimentElement">\r
+                        </instanceof>\r
+                     </or>\r
                   </iterate>\r
                </with>\r
             </visibleWhen>\r
          </command>\r
          <command\r
-               commandId="org.eclipse.linuxtools.tmf.ui.command.project.trace.rename"\r
-               disabledIcon="icons/dlcl16/rename.gif"\r
-               icon="icons/elcl16/rename.gif"\r
-               label="%commands.trace.rename"\r
-               mnemonic="%commands.trace.rename.mnemonic"\r
-               style="push"\r
-               tooltip="%commands.trace.rename.description">\r
+               commandId="org.eclipse.ui.edit.rename"\r
+               disabledIcon="/icons/dlcl16/rename.gif"\r
+               icon="/icons/elcl16/rename.gif"\r
+               label="%command.rename"\r
+               mnemonic="%command.rename.mnemonic"\r
+               style="push">\r
             <visibleWhen\r
                   checkEnabled="false">\r
                <with\r
@@ -450,21 +427,23 @@
                   <iterate\r
                         ifEmpty="false"\r
                         operator="and">\r
-                     <instanceof\r
-                           value="org.eclipse.linuxtools.tmf.ui.project.model.TmfTraceElement">\r
-                     </instanceof>\r
+                     <or>\r
+                        <instanceof\r
+                              value="org.eclipse.linuxtools.tmf.ui.project.model.TmfTraceElement">\r
+                        </instanceof>\r
+                        <instanceof\r
+                              value="org.eclipse.linuxtools.tmf.ui.project.model.TmfExperimentElement">\r
+                        </instanceof>\r
+                     </or>\r
                   </iterate>\r
                </with>\r
             </visibleWhen>\r
          </command>\r
          <command\r
-               commandId="org.eclipse.linuxtools.tmf.ui.command.project.trace.delete"\r
-               disabledIcon="IMG_ETOOL_DELETE_DISABLED"\r
-               icon="IMG_ETOOL_DELETE"\r
-               label="%commands.trace.delete"\r
-               mnemonic="%commands.trace.delete.mnemonic"\r
-               style="push"\r
-               tooltip="%commands.trace.delete.description">\r
+               commandId="org.eclipse.ui.edit.delete"\r
+               label="%command.delete"\r
+               mnemonic="%command.delete.mnemonic"\r
+               style="push">\r
             <visibleWhen\r
                   checkEnabled="false">\r
                <with\r
@@ -472,29 +451,31 @@
                   <iterate\r
                         ifEmpty="false"\r
                         operator="and">\r
-                     <and>\r
+                     <or>\r
+                        <and>\r
+                           <instanceof\r
+                                 value="org.eclipse.linuxtools.tmf.ui.project.model.TmfTraceElement">\r
+                           </instanceof>\r
+                           <not>\r
+                              <test\r
+                                    forcePluginActivation="true"\r
+                                    property="org.eclipse.linuxtools.tmf.ui.isExperimentTrace">\r
+                              </test>\r
+                           </not>\r
+                        </and>\r
                         <instanceof\r
-                              value="org.eclipse.linuxtools.tmf.ui.project.model.TmfTraceElement">\r
+                              value="org.eclipse.linuxtools.tmf.ui.project.model.TmfExperimentElement">\r
                         </instanceof>\r
-                        <not>\r
-                           <test\r
-                                 forcePluginActivation="true"\r
-                                 property="org.eclipse.linuxtools.tmf.ui.isExperimentTrace">\r
-                           </test>\r
-                        </not>\r
-                     </and>\r
+                     </or>\r
                   </iterate>\r
                </with>\r
             </visibleWhen>\r
          </command>\r
          <command\r
-               commandId="org.eclipse.linuxtools.tmf.ui.command.project.trace.delete"\r
-               disabledIcon="IMG_ETOOL_DELETE_DISABLED"\r
-               icon="IMG_ETOOL_DELETE"\r
-               label="%commands.trace.remove"\r
-               mnemonic="%commands.trace.remove.mnemonic"\r
-               style="push"\r
-               tooltip="%commands.trace.remove.description">\r
+               commandId="org.eclipse.ui.edit.delete"\r
+               label="%command.remove"\r
+               mnemonic="%command.remove.mnemonic"\r
+               style="push">\r
             <visibleWhen\r
                   checkEnabled="false">\r
                <with\r
@@ -520,65 +501,13 @@
                visible="true">\r
          </separator>\r
          <command\r
-               commandId="org.eclipse.linuxtools.tmf.ui.command.project.trace.deleteSupplementaryFiles"\r
-               label="%commands.trace.deleteSupplementaryFiles"\r
-               mnemonic="%commands.trace.deleteSupplementaryFiles.mnemonic"\r
-               style="push"\r
-               tooltip="%commands.trace.deleteSupplementaryFiles.description">\r
-            <visibleWhen\r
-                  checkEnabled="false">\r
-               <with\r
-                     variable="selection">\r
-                  <iterate\r
-                       ifEmpty="false"\r
-                       operator="and">\r
-                     <and>\r
-                        <instanceof\r
-                              value="org.eclipse.linuxtools.tmf.ui.project.model.TmfTraceElement">\r
-                        </instanceof>\r
-                        <test\r
-                              forcePluginActivation="true"\r
-                              property="org.eclipse.linuxtools.tmf.ui.hasSupplementaryFiles">\r
-                        </test>\r
-                     </and>\r
-                  </iterate>\r
-               </with>\r
-            </visibleWhen>\r
-         </command>\r
-         <separator\r
-               name="org.eclipse.linuxtools.tmf.ui.separator3"\r
-               visible="true">\r
-         </separator>\r
-         <menu\r
-               label="%commands.trace.select_trace_type"\r
-               mnemonic="%commands.trace.select_trace_type.mnemonic"\r
-               tooltip="%commands.trace.select_trace_type.description">\r
-            <dynamic\r
-                  class="org.eclipse.linuxtools.internal.tmf.ui.project.handlers.SelectTraceTypeContributionItem"\r
-                  id="org.eclipse.linuxtools.tmf.ui.command.project.trace.select_trace_type.dynamic">\r
-            </dynamic>\r
-            <visibleWhen\r
-                  checkEnabled="false">\r
-               <with\r
-                     variable="selection">\r
-                  <iterate\r
-                        ifEmpty="false"\r
-                        operator="and">\r
-                     <instanceof\r
-                           value="org.eclipse.linuxtools.tmf.ui.project.model.TmfTraceElement">\r
-                     </instanceof>\r
-                  </iterate>\r
-               </with>\r
-            </visibleWhen>\r
-         </menu>\r
-         <command\r
-               commandId="org.eclipse.linuxtools.tmf.ui.command.project.experiment_folder.new"\r
+               commandId="org.eclipse.linuxtools.tmf.ui.command.new_experiment"\r
                disabledIcon="icons/dtool16/new.gif"\r
                icon="icons/etool16/new.gif"\r
-               label="%commands.experiment_folder.new"\r
-               mnemonic="%commands.experiment_folder.new.mnemonic"\r
+               label="%command.new_experiment"\r
+               mnemonic="%command.new_experiment.mnemonic"\r
                style="push"\r
-               tooltip="%commands.trace.select_trace_type">\r
+               tooltip="%command.new_experiment.description">\r
             <visibleWhen\r
                   checkEnabled="false">\r
                <with\r
@@ -596,119 +525,79 @@
                </with>\r
             </visibleWhen>\r
          </command>\r
-         <separator\r
-               name="org.eclipse.linuxtools.tmf.ui.separator4"\r
-               visible="true">\r
-         </separator>\r
          <command\r
-               commandId="org.eclipse.linuxtools.tmf.ui.command.project.experiment_folder.refresh"\r
-               disabledIcon="icons/dlcl16/refresh.gif"\r
-               icon="icons/elcl16/refresh.gif"\r
-               label="%commands.experiment_folder.refresh"\r
-               mnemonic="%commands.experiment_folder.refresh.mnemonic"\r
+               commandId="org.eclipse.linuxtools.tmf.ui.command.delete_suppl_files"\r
+               label="%command.delete_suppl_files"\r
+               mnemonic="%command.delete_suppl_files.mnemonic"\r
                style="push"\r
-               tooltip="%commands.experiment_folder.refresh.description">\r
+               tooltip="%command.delete_suppl_files.description">\r
             <visibleWhen\r
                   checkEnabled="false">\r
                <with\r
                      variable="selection">\r
-                  <count\r
-                        value="1">\r
-                  </count>\r
-                  <iterate\r
-                        ifEmpty="false"\r
-                        operator="and">\r
-                     <instanceof\r
-                           value="org.eclipse.linuxtools.tmf.ui.project.model.TmfExperimentFolder">\r
-                     </instanceof>\r
-                  </iterate>\r
-               </with>\r
-            </visibleWhen>\r
-         </command>\r
-         <command\r
-               commandId="org.eclipse.linuxtools.tmf.ui.command.project.experiment.select"\r
-               icon="IMG_OBJ_ADD"\r
-               label="%commands.experiment.selecttraces"\r
-               mnemonic="%commands.experiment.selecttraces.mnemonic"\r
-               style="push"\r
-               tooltip="%commands.experiment.selecttraces.description">\r
-            <visibleWhen\r
-                  checkEnabled="false">\r
-               <with\r
-                     variable="selection">\r
-                  <count\r
-                        value="1">\r
-                  </count>\r
-                  <iterate\r
-                        ifEmpty="false"\r
-                        operator="and">\r
-                     <instanceof\r
-                           value="org.eclipse.linuxtools.tmf.ui.project.model.TmfExperimentElement">\r
-                     </instanceof>\r
-                  </iterate>\r
+                  <and>\r
+                     <count\r
+                           value="1">\r
+                     </count>\r
+                     <iterate\r
+                           ifEmpty="false"\r
+                           operator="and">\r
+                        <and>\r
+                           <or>\r
+                              <instanceof\r
+                                    value="org.eclipse.linuxtools.tmf.ui.project.model.TmfTraceElement">\r
+                              </instanceof>\r
+                              <instanceof\r
+                                    value="org.eclipse.linuxtools.tmf.ui.project.model.TmfExperimentElement">\r
+                              </instanceof>\r
+                           </or>\r
+                           <test\r
+                                 forcePluginActivation="true"\r
+                                 property="org.eclipse.linuxtools.tmf.ui.hasSupplementaryFiles">\r
+                           </test>\r
+                        </and>\r
+                     </iterate>\r
+                  </and>\r
                </with>\r
             </visibleWhen>\r
          </command>\r
          <separator\r
-               name="org.eclipse.linuxtools.tmf.ui.separator5"\r
+               name="org.eclipse.linuxtools.tmf.ui.separator3"\r
                visible="true">\r
          </separator>\r
-         <command\r
-               commandId="org.eclipse.linuxtools.tmf.ui.command.project.experiment.open"\r
-               icon="icons/elcl16/open.gif"\r
-               label="%commands.experiment.open"\r
-               mnemonic="%commands.experiment.open.mnemonic"\r
-               style="push"\r
-               tooltip="%commands.experiment.open.description">\r
-            <visibleWhen\r
-                  checkEnabled="false">\r
-               <with\r
-                     variable="selection">\r
-                  <count\r
-                        value="1">\r
-                  </count>\r
-                  <iterate\r
-                        ifEmpty="false"\r
-                        operator="and">\r
-                     <instanceof\r
-                           value="org.eclipse.linuxtools.tmf.ui.project.model.TmfExperimentElement">\r
-                     </instanceof>\r
-                  </iterate>\r
-               </with>\r
-            </visibleWhen>\r
-         </command>\r
-         <command\r
-               commandId="org.eclipse.linuxtools.tmf.ui.command.project.experiment.copy"\r
-               disabledIcon="IMG_TOOL_COPY_DISABLED"\r
-               icon="IMG_TOOL_COPY"\r
-               label="%commands.experiment.copy"\r
-               mnemonic="%commands.experiment.copy.mnemonic"\r
-               style="push"\r
-               tooltip="%commands.experiment.copy.description">\r
+         <menu\r
+               label="%command.select_trace_type"\r
+               mnemonic="%command.select_trace_type.mnemonic"\r
+               tooltip="%command.select_trace_type.description">\r
+            <dynamic\r
+                  class="org.eclipse.linuxtools.internal.tmf.ui.project.handlers.SelectTraceTypeContributionItem"\r
+                  id="org.eclipse.linuxtools.tmf.ui.command.select_trace_type.dynamic">\r
+            </dynamic>\r
             <visibleWhen\r
                   checkEnabled="false">\r
                <with\r
                      variable="selection">\r
-                  <count\r
-                        value="1">\r
-                  </count>\r
                   <iterate\r
                         ifEmpty="false"\r
                         operator="and">\r
                      <instanceof\r
-                           value="org.eclipse.linuxtools.tmf.ui.project.model.TmfExperimentElement">\r
+                           value="org.eclipse.linuxtools.tmf.ui.project.model.TmfTraceElement">\r
                      </instanceof>\r
                   </iterate>\r
                </with>\r
             </visibleWhen>\r
-         </command>\r
+         </menu>\r
+         <separator\r
+               name="org.eclipse.linuxtools.tmf.ui.separator4"\r
+               visible="true">\r
+         </separator>\r
          <command\r
-               commandId="org.eclipse.linuxtools.tmf.ui.command.project.experiment.rename"\r
-               icon="icons/elcl16/rename.gif"\r
-               label="%commands.experiment.rename"\r
-               mnemonic="%commands.experiment.rename.mnemonic"\r
+               commandId="org.eclipse.linuxtools.tmf.ui.command.select_traces"\r
+               icon="IMG_OBJ_ADD"\r
+               label="%command.select_traces"\r
+               mnemonic="%command.select_traces.mnemonic"\r
                style="push"\r
-               tooltip="%commands.experiment.rename.description">\r
+               tooltip="%commands.select_traces.description">\r
             <visibleWhen\r
                   checkEnabled="false">\r
                <with\r
@@ -726,70 +615,15 @@
                </with>\r
             </visibleWhen>\r
          </command>\r
-         <command\r
-               commandId="org.eclipse.linuxtools.tmf.ui.command.project.experiment.delete"\r
-               disabledIcon="IMG_ETOOL_DELETE_DISABLED"\r
-               icon="IMG_ETOOL_DELETE"\r
-               label="%commands.experiment.delete"\r
-               mnemonic="%commands.experiment.delete.mnemonic"\r
-               style="push"\r
-               tooltip="%commands.experiment.delete.description">\r
-            <visibleWhen\r
-                  checkEnabled="false">\r
-               <with\r
-                     variable="selection">\r
-                  <iterate\r
-                        ifEmpty="false"\r
-                        operator="and">\r
-                     <instanceof\r
-                           value="org.eclipse.linuxtools.tmf.ui.project.model.TmfExperimentElement">\r
-                     </instanceof>\r
-                  </iterate>\r
-               </with>\r
-            </visibleWhen>\r
-         </command>\r
-         <separator\r
-               name="org.eclipse.linuxtools.tmf.ui.separator6"\r
-               visible="true">\r
-         </separator>\r
-         <command\r
-               commandId="org.eclipse.linuxtools.tmf.ui.command.project.experiment.deleteSupplementaryFiles"\r
-               label="%commands.experiment.deleteSupplementaryFiles"\r
-               mnemonic="%commands.experiment.deleteSupplementaryFiles.mnemonic"\r
-               style="push"\r
-               tooltip="%commands.experiment.deleteSupplementaryFiles.description">\r
-            <visibleWhen\r
-                  checkEnabled="false">\r
-               <with\r
-                     variable="selection">\r
-                  <iterate\r
-                       ifEmpty="false"\r
-                       operator="and">\r
-                     <and>\r
-                        <instanceof\r
-                              value="org.eclipse.linuxtools.tmf.ui.project.model.TmfExperimentElement">\r
-                        </instanceof>\r
-                        <test\r
-                              forcePluginActivation="true"\r
-                              property="org.eclipse.linuxtools.tmf.ui.hasSupplementaryFiles">\r
-                        </test>\r
-                     </and>\r
-                  </iterate>\r
-               </with>\r
-            </visibleWhen>\r
-         </command>\r
          <separator\r
-               name="org.eclipse.linuxtools.tmf.ui.separator7"\r
+               name="org.eclipse.linuxtools.tmf.ui.separator5"\r
                visible="true">\r
          </separator>\r
          <command\r
-               commandId="org.eclipse.linuxtools.tmf.ui.command.project.experiment.refresh"\r
-               disabledIcon="icons/dlcl16/refresh.gif"\r
-               icon="icons/elcl16/refresh.gif"\r
-               label="%commands.experiment.refresh"\r
-               mnemonic="%commands.experiment.refresh.mnemonic"\r
-               style="push"\r
-               tooltip="%commands.experiment.refresh.description">\r
+               commandId="org.eclipse.ui.file.refresh"\r
+               label="%command.refresh"\r
+               mnemonic="%command.refresh.mnemonic"\r
+               style="push">\r
             <visibleWhen\r
                   checkEnabled="false">\r
                <with\r
@@ -800,9 +634,17 @@
                   <iterate\r
                         ifEmpty="false"\r
                         operator="and">\r
-                     <instanceof\r
-                           value="org.eclipse.linuxtools.tmf.ui.project.model.TmfExperimentElement">\r
-                     </instanceof>\r
+                     <or>\r
+                        <instanceof\r
+                              value="org.eclipse.linuxtools.tmf.ui.project.model.TmfTraceFolder">\r
+                        </instanceof>\r
+                        <instanceof\r
+                              value="org.eclipse.linuxtools.tmf.ui.project.model.TmfExperimentFolder">\r
+                        </instanceof>\r
+                        <instanceof\r
+                              value="org.eclipse.linuxtools.tmf.ui.project.model.TmfExperimentElement">\r
+                        </instanceof>\r
+                     </or>\r
                   </iterate>\r
                </with>\r
             </visibleWhen>\r
@@ -812,141 +654,47 @@
    <extension\r
          point="org.eclipse.ui.commands">\r
       <category\r
-            description="%commands.trace_folder.category.description"\r
-            id="org.eclipse.linuxtools.tmf.ui.commands.trace_folder.category"\r
-            name="%commands.trace_folder.category.name">\r
-      </category>\r
-      <command\r
-            categoryId="org.eclipse.linuxtools.tmf.ui.commands.trace_folder.category"\r
-            description="%commands.trace_folder.import.description"\r
-            id="org.eclipse.linuxtools.tmf.ui.command.project.trace.import"\r
-            name="%commands.trace_folder.import">\r
-      </command>\r
-      <command\r
-            categoryId="org.eclipse.linuxtools.tmf.ui.commands.trace_folder.category"\r
-            description="%commands.trace_folder.refresh.description"\r
-            id="org.eclipse.linuxtools.tmf.ui.command.project.trace.refresh"\r
-            name="%commands.trace_folder.refresh">\r
-      </command>\r
-      <category\r
-            description="%commands.trace.category.description"\r
-            id="org.eclipse.linuxtools.tmf.ui.commands.trace.category"\r
-            name="%commands.trace.category.name">\r
+            description="%commands.category.description"\r
+            id="org.eclipse.linuxtools.tmf.ui.commands.category"\r
+            name="%commands.category.name">\r
       </category>\r
       <command\r
-            categoryId="org.eclipse.linuxtools.tmf.ui.commands.trace.category"\r
-            description="%commands.trace.open.description"\r
-            id="org.eclipse.linuxtools.tmf.ui.command.project.trace.open"\r
-            name="%commands.trace.open">\r
+            categoryId="org.eclipse.linuxtools.tmf.ui.commands.category"\r
+            description="%command.new_experiment.description"\r
+            id="org.eclipse.linuxtools.tmf.ui.command.new_experiment"\r
+            name="%command.new_experiment">\r
       </command>\r
       <command\r
-            categoryId="org.eclipse.linuxtools.tmf.ui.commands.trace.category"\r
-            description="%commands.trace.copy.description"\r
-            id="org.eclipse.linuxtools.tmf.ui.command.project.trace.copy"\r
-            name="%commands.trace.copy">\r
-      </command>\r
-      <command\r
-            categoryId="org.eclipse.linuxtools.tmf.ui.commands.trace.category"\r
-            description="%commands.trace.rename.description"\r
-            id="org.eclipse.linuxtools.tmf.ui.command.project.trace.rename"\r
-            name="%commands.trace.rename">\r
-      </command>\r
-      <command\r
-            categoryId="org.eclipse.linuxtools.tmf.ui.commands.trace.category"\r
-            description="%commands.trace.deleteSupplementaryFiles.description"\r
-            id="org.eclipse.linuxtools.tmf.ui.command.project.trace.deleteSupplementaryFiles"\r
-            name="%commands.trace.deleteSupplementaryFiles">\r
-      </command>\r
-      <category\r
-            description="%commands.experiment_folder.category.description"\r
-            id="org.eclipse.linuxtools.tmf.ui.commands.experiment_folder.category"\r
-            name="%commands.experiment_folder.category.name">\r
-      </category>\r
-      <command\r
-            categoryId="org.eclipse.linuxtools.tmf.ui.commands.experiment_folder.category"\r
-            description="%commands.experiment_folder.new.description"\r
-            id="org.eclipse.linuxtools.tmf.ui.command.project.experiment_folder.new"\r
-            name="%commands.experiment_folder.new">\r
-      </command>\r
-      <command\r
-            categoryId="org.eclipse.linuxtools.tmf.ui.commands.experiment_folder.category"\r
-            description="%commands.experiment_folder.refresh.description"\r
-            id="org.eclipse.linuxtools.tmf.ui.command.project.experiment_folder.refresh"\r
-            name="%commands.experiment_folder.refresh">\r
-      </command>\r
-      <command\r
-            categoryId="org.eclipse.linuxtools.tmf.ui.commands.trace.category"\r
-            description="%commands.trace.select_trace_type.description"\r
-            id="org.eclipse.linuxtools.tmf.ui.command.project.trace.select_trace_type"\r
-            name="%commands.trace.select_trace_type">\r
+            categoryId="org.eclipse.linuxtools.tmf.ui.commands.category"\r
+            description="%command.select_trace_type.description"\r
+            id="org.eclipse.linuxtools.tmf.ui.command.select_trace_type"\r
+            name="%command.select_trace_type">\r
          <commandParameter\r
-               id="org.eclipse.linuxtools.tmf.ui.commandparameter.project.trace.select_trace_type.bundle"\r
+               id="org.eclipse.linuxtools.tmf.ui.commandparameter.select_trace_type.bundle"\r
                name="%commands.trace.select_trace_type.bundle"\r
                optional="false">\r
          </commandParameter>\r
          <commandParameter\r
-               id="org.eclipse.linuxtools.tmf.ui.commandparameter.project.trace.select_trace_type.type"\r
+               id="org.eclipse.linuxtools.tmf.ui.commandparameter.select_trace_type.type"\r
                name="%commands.trace.select_trace_type.type"\r
                optional="false">\r
          </commandParameter>\r
          <commandParameter\r
-               id="org.eclipse.linuxtools.tmf.ui.commandparameter.project.trace.select_trace_type.icon"\r
+               id="org.eclipse.linuxtools.tmf.ui.commandparameter.select_trace_type.icon"\r
                name="%commands.trace.select_trace_type.icon"\r
                optional="false">\r
          </commandParameter>\r
       </command>\r
       <command\r
-            categoryId="org.eclipse.linuxtools.tmf.ui.commands.trace.category"\r
-            description="%commands.trace.delete.description"\r
-            id="org.eclipse.linuxtools.tmf.ui.command.project.trace.delete"\r
-            name="%commands.trace.delete">\r
-      </command>\r
-      <category\r
-            description="%commands.experiment.category.description"\r
-            id="org.eclipse.linuxtools.tmf.ui.commands.experiment.category"\r
-            name="%commands.experiment.category.name">\r
-      </category>\r
-      <command\r
-            categoryId="org.eclipse.linuxtools.tmf.ui.commands.experiment.category"\r
-            description="%commands.experiment.selecttraces.description"\r
-            id="org.eclipse.linuxtools.tmf.ui.command.project.experiment.select"\r
-            name="%commands.experiment.selecttraces">\r
-      </command>\r
-      <command\r
-            categoryId="org.eclipse.linuxtools.tmf.ui.commands.experiment.category"\r
-            description="%commands.experiment.open.description"\r
-            id="org.eclipse.linuxtools.tmf.ui.command.project.experiment.open"\r
-            name="%commands.experiment.open">\r
-      </command>\r
-       <command\r
-             categoryId="org.eclipse.linuxtools.tmf.ui.commands.experiment.category"\r
-            description="%commands.experiment.copy.description"\r
-            id="org.eclipse.linuxtools.tmf.ui.command.project.experiment.copy"\r
-            name="%commands.experiment.copy">\r
-      </command>\r
-      <command\r
-            categoryId="org.eclipse.linuxtools.tmf.ui.commands.experiment.category"\r
-            description="%commands.experiment.rename.description"\r
-            id="org.eclipse.linuxtools.tmf.ui.command.project.experiment.rename"\r
-            name="%commands.experiment.rename">\r
-      </command>\r
-      <command\r
-            categoryId="org.eclipse.linuxtools.tmf.ui.commands.experiment.category"\r
-            description="%commands.experiment.delete.description"\r
-            id="org.eclipse.linuxtools.tmf.ui.command.project.experiment.delete"\r
-            name="%commands.experiment.delete">\r
+            categoryId="org.eclipse.linuxtools.tmf.ui.commands.category"\r
+            id="org.eclipse.linuxtools.tmf.ui.command.delete_suppl_files"\r
+            name="%command.delete_suppl_files">\r
       </command>\r
       <command\r
-            categoryId="org.eclipse.linuxtools.tmf.ui.commands.experiment.category"\r
-            description="%commands.experiment.deleteSupplementaryFiles.description"\r
-            id="org.eclipse.linuxtools.tmf.ui.command.project.experiment.deleteSupplementaryFiles"\r
-            name="%commands.experiment.deleteSupplementaryFiles">\r
-      </command>\r
-      <command\r
-            categoryId="org.eclipse.linuxtools.tmf.ui.commands.experiment.category"\r
-            description="%commands.experiment.refresh.description"\r
-            id="org.eclipse.linuxtools.tmf.ui.command.project.experiment.refresh"\r
-            name="%commands.experiment.refresh">\r
+            categoryId="org.eclipse.linuxtools.tmf.ui.commands.category"\r
+            description="%command.select_traces.description"\r
+            id="org.eclipse.linuxtools.tmf.ui.command.select_traces"\r
+            name="%command.select_traces">\r
       </command>\r
       <category\r
             description="%commands.parser.category.description"\r
@@ -1007,119 +755,252 @@
             name="%commands.uml2sd.scrollright">\r
       </command>\r
    </extension>\r
-   <extension point="org.eclipse.ui.bindings">\r
-      <key\r
-            sequence="ALT+R"\r
-            contextId="org.eclipse.linuxtools.tmf.ui.view.uml2sd.context"\r
-            commandId="org.eclipse.linuxtools.tmf.ui.views.uml2sd.handlers.GoToMessage"\r
-            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration">\r
-      </key>   \r
-      <key\r
-            sequence="SHIFT+ALT+END"\r
-            contextId="org.eclipse.linuxtools.tmf.ui.view.uml2sd.context"\r
-            commandId="org.eclipse.linuxtools.tmf.ui.views.uml2sd.handlers.ShowNodeEnd"\r
-            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration">\r
-      </key>   \r
-      <key\r
-            sequence="SHIFT+ALT+HOME"\r
-            contextId="org.eclipse.linuxtools.tmf.ui.view.uml2sd.context"\r
-            commandId="org.eclipse.linuxtools.tmf.ui.views.uml2sd.handlers.ShowNodeStart"\r
-            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration">\r
-      </key>    \r
-      <key\r
-            sequence="SHIFT+ALT+ARROW_UP"\r
-            contextId="org.eclipse.linuxtools.tmf.ui.view.uml2sd.context"\r
-            commandId="org.eclipse.linuxtools.tmf.ui.views.uml2sd.handlers.MoveSDUp"\r
-            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration">\r
-      </key>  \r
-      <key\r
-            sequence="SHIFT+ALT+ARROW_DOWN"\r
-            contextId="org.eclipse.linuxtools.tmf.ui.view.uml2sd.context"\r
-            commandId="org.eclipse.linuxtools.tmf.ui.views.uml2sd.handlers.MoveSDDown"\r
-            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration">\r
-      </key>\r
-      <key\r
-            sequence="SHIFT+ALT+ARROW_LEFT"\r
-            contextId="org.eclipse.linuxtools.tmf.ui.view.uml2sd.context"\r
-            commandId="org.eclipse.linuxtools.tmf.ui.views.uml2sd.handlers.MoveSDLeft"\r
-            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration">\r
-      </key>\r
-      <key\r
-            sequence="SHIFT+ALT+ARROW_RIGHT"\r
-            contextId="org.eclipse.linuxtools.tmf.ui.view.uml2sd.context"\r
-            commandId="org.eclipse.linuxtools.tmf.ui.views.uml2sd.handlers.MoveSDRight"\r
-            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration">\r
-      </key>\r
-   </extension>\r
    <extension\r
          point="org.eclipse.ui.handlers">\r
       <handler\r
             class="org.eclipse.linuxtools.internal.tmf.ui.project.handlers.ImportTraceHandler"\r
-            commandId="org.eclipse.linuxtools.tmf.ui.command.project.trace.import">\r
+            commandId="org.eclipse.ui.file.import">\r
+         <activeWhen>\r
+            <and>\r
+               <count\r
+                     value="1">\r
+               </count>\r
+               <iterate>\r
+                  <instanceof\r
+                        value="org.eclipse.linuxtools.tmf.ui.project.model.TmfTraceFolder">\r
+                  </instanceof>\r
+               </iterate>\r
+            </and>\r
+         </activeWhen>\r
       </handler>\r
       <handler\r
             class="org.eclipse.linuxtools.internal.tmf.ui.project.handlers.RefreshHandler"\r
-            commandId="org.eclipse.linuxtools.tmf.ui.command.project.trace.refresh">\r
+            commandId="org.eclipse.ui.file.refresh">\r
+         <activeWhen>\r
+            <and>\r
+               <count\r
+                     value="1">\r
+               </count>\r
+               <iterate>\r
+                  <or>\r
+                     <instanceof\r
+                           value="org.eclipse.linuxtools.tmf.ui.project.model.TmfTraceFolder">\r
+                     </instanceof>\r
+                     <instanceof\r
+                           value="org.eclipse.linuxtools.tmf.ui.project.model.TmfExperimentFolder">\r
+                     </instanceof>\r
+                     <instanceof\r
+                           value="org.eclipse.linuxtools.tmf.ui.project.model.TmfExperimentElement">\r
+                     </instanceof>\r
+                  </or>\r
+               </iterate>\r
+            </and>\r
+         </activeWhen>\r
       </handler>\r
       <handler\r
             class="org.eclipse.linuxtools.internal.tmf.ui.project.handlers.OpenTraceHandler"\r
-            commandId="org.eclipse.linuxtools.tmf.ui.command.project.trace.open">\r
-      </handler>\r
-      <handler\r
-            class="org.eclipse.linuxtools.internal.tmf.ui.project.handlers.CopyTraceHandler"\r
-            commandId="org.eclipse.linuxtools.tmf.ui.command.project.trace.copy">\r
-      </handler>\r
-      <handler\r
-            class="org.eclipse.linuxtools.internal.tmf.ui.project.handlers.RenameTraceHandler"\r
-            commandId="org.eclipse.linuxtools.tmf.ui.command.project.trace.rename">\r
+            commandId="org.eclipse.ui.navigate.openResource">\r
+         <activeWhen>\r
+            <and>\r
+               <count\r
+                     value="1">\r
+               </count>\r
+               <iterate>\r
+                  <instanceof\r
+                        value="org.eclipse.linuxtools.tmf.ui.project.model.TmfTraceElement">\r
+                  </instanceof>\r
+               </iterate>\r
+            </and>\r
+         </activeWhen>\r
       </handler>\r
       <handler\r
-            class="org.eclipse.linuxtools.internal.tmf.ui.project.handlers.DeleteTraceHandler"\r
-            commandId="org.eclipse.linuxtools.tmf.ui.command.project.trace.delete">\r
+            class="org.eclipse.linuxtools.internal.tmf.ui.project.handlers.OpenExperimentHandler"\r
+            commandId="org.eclipse.ui.navigate.openResource">\r
+         <activeWhen>\r
+            <and>\r
+               <count\r
+                     value="1">\r
+               </count>\r
+               <iterate>\r
+                  <instanceof\r
+                        value="org.eclipse.linuxtools.tmf.ui.project.model.TmfExperimentElement">\r
+                  </instanceof>\r
+               </iterate>\r
+            </and>\r
+         </activeWhen>\r
       </handler>\r
       <handler\r
-            class="org.eclipse.linuxtools.internal.tmf.ui.project.handlers.DeleteTraceSupplementaryFilesHandler"\r
-            commandId="org.eclipse.linuxtools.tmf.ui.command.project.trace.deleteSupplementaryFiles">\r
+            class="org.eclipse.linuxtools.internal.tmf.ui.project.handlers.CopyTraceHandler"\r
+            commandId="org.eclipse.ui.edit.copy">\r
+         <activeWhen>\r
+            <and>\r
+               <count\r
+                     value="1">\r
+               </count>\r
+               <iterate>\r
+                  <instanceof\r
+                        value="org.eclipse.linuxtools.tmf.ui.project.model.TmfTraceElement">\r
+                  </instanceof>\r
+               </iterate>\r
+            </and>\r
+         </activeWhen>\r
       </handler>\r
       <handler\r
-            class="org.eclipse.linuxtools.internal.tmf.ui.project.handlers.SelectTraceTypeHandler"\r
-            commandId="org.eclipse.linuxtools.tmf.ui.command.project.trace.select_trace_type">\r
+            class="org.eclipse.linuxtools.internal.tmf.ui.project.handlers.CopyExperimentHandler"\r
+            commandId="org.eclipse.ui.edit.copy">\r
+         <activeWhen>\r
+            <and>\r
+               <count\r
+                     value="1">\r
+               </count>\r
+               <iterate>\r
+                  <instanceof\r
+                        value="org.eclipse.linuxtools.tmf.ui.project.model.TmfExperimentElement">\r
+                  </instanceof>\r
+               </iterate>\r
+            </and>\r
+         </activeWhen>\r
       </handler>\r
       <handler\r
-            class="org.eclipse.linuxtools.internal.tmf.ui.project.handlers.NewExperimentHandler"\r
-            commandId="org.eclipse.linuxtools.tmf.ui.command.project.experiment_folder.new">\r
+            class="org.eclipse.linuxtools.internal.tmf.ui.project.handlers.RenameTraceHandler"\r
+            commandId="org.eclipse.ui.edit.rename">\r
+         <activeWhen>\r
+            <and>\r
+               <count\r
+                     value="1">\r
+               </count>\r
+               <iterate>\r
+                  <instanceof\r
+                        value="org.eclipse.linuxtools.tmf.ui.project.model.TmfTraceElement">\r
+                  </instanceof>\r
+               </iterate>\r
+            </and>\r
+         </activeWhen>\r
       </handler>\r
       <handler\r
-            class="org.eclipse.linuxtools.internal.tmf.ui.project.handlers.RefreshHandler"\r
-            commandId="org.eclipse.linuxtools.tmf.ui.command.project.experiment_folder.refresh">\r
+            class="org.eclipse.linuxtools.internal.tmf.ui.project.handlers.RenameExperimentHandler"\r
+            commandId="org.eclipse.ui.edit.rename">\r
+         <activeWhen>\r
+            <and>\r
+               <count\r
+                     value="1">\r
+               </count>\r
+               <iterate>\r
+                  <instanceof\r
+                        value="org.eclipse.linuxtools.tmf.ui.project.model.TmfExperimentElement">\r
+                  </instanceof>\r
+               </iterate>\r
+            </and>\r
+         </activeWhen>\r
       </handler>\r
       <handler\r
-            class="org.eclipse.linuxtools.internal.tmf.ui.project.handlers.SelectTracesHandler"\r
-            commandId="org.eclipse.linuxtools.tmf.ui.command.project.experiment.select">\r
+            class="org.eclipse.linuxtools.internal.tmf.ui.project.handlers.DeleteTraceHandler"\r
+            commandId="org.eclipse.ui.edit.delete">\r
+         <activeWhen>\r
+            <and>\r
+               <count\r
+                     value="1">\r
+               </count>\r
+               <iterate>\r
+                  <instanceof\r
+                        value="org.eclipse.linuxtools.tmf.ui.project.model.TmfTraceElement">\r
+                  </instanceof>\r
+               </iterate>\r
+            </and>\r
+         </activeWhen>\r
       </handler>\r
       <handler\r
-            class="org.eclipse.linuxtools.internal.tmf.ui.project.handlers.OpenExperimentHandler"\r
-            commandId="org.eclipse.linuxtools.tmf.ui.command.project.experiment.open">\r
+            class="org.eclipse.linuxtools.internal.tmf.ui.project.handlers.DeleteExperimentHandler"\r
+            commandId="org.eclipse.ui.edit.delete">\r
+         <activeWhen>\r
+            <and>\r
+               <count\r
+                     value="1">\r
+               </count>\r
+               <iterate>\r
+                  <instanceof\r
+                        value="org.eclipse.linuxtools.tmf.ui.project.model.TmfExperimentElement">\r
+                  </instanceof>\r
+               </iterate>\r
+            </and>\r
+         </activeWhen>\r
       </handler>\r
       <handler\r
-            class="org.eclipse.linuxtools.internal.tmf.ui.project.handlers.CopyExperimentHandler"\r
-            commandId="org.eclipse.linuxtools.tmf.ui.command.project.experiment.copy">\r
+            class="org.eclipse.linuxtools.internal.tmf.ui.project.handlers.DeleteTraceSupplementaryFilesHandler"\r
+            commandId="org.eclipse.linuxtools.tmf.ui.command.delete_suppl_files">\r
+         <activeWhen>\r
+            <and>\r
+               <count\r
+                     value="1">\r
+               </count>\r
+               <iterate>\r
+                  <instanceof\r
+                        value="org.eclipse.linuxtools.tmf.ui.project.model.TmfTraceElement">\r
+                  </instanceof>\r
+               </iterate>\r
+            </and>\r
+         </activeWhen>\r
       </handler>\r
       <handler\r
-            class="org.eclipse.linuxtools.internal.tmf.ui.project.handlers.RenameExperimentHandler"\r
-            commandId="org.eclipse.linuxtools.tmf.ui.command.project.experiment.rename">\r
+            class="org.eclipse.linuxtools.internal.tmf.ui.project.handlers.DeleteExperimentSupplementaryFilesHandler"\r
+            commandId="org.eclipse.linuxtools.tmf.ui.command.delete_suppl_files">\r
+         <activeWhen>\r
+            <and>\r
+               <count\r
+                     value="1">\r
+               </count>\r
+               <iterate>\r
+                  <instanceof\r
+                        value="org.eclipse.linuxtools.tmf.ui.project.model.TmfExperimentElement">\r
+                  </instanceof>\r
+               </iterate>\r
+            </and>\r
+         </activeWhen>\r
       </handler>\r
       <handler\r
-            class="org.eclipse.linuxtools.internal.tmf.ui.project.handlers.DeleteExperimentHandler"\r
-            commandId="org.eclipse.linuxtools.tmf.ui.command.project.experiment.delete">\r
+            class="org.eclipse.linuxtools.internal.tmf.ui.project.handlers.NewExperimentHandler"\r
+            commandId="org.eclipse.linuxtools.tmf.ui.command.new_experiment">\r
+         <activeWhen>\r
+            <and>\r
+               <count\r
+                     value="1">\r
+               </count>\r
+               <iterate>\r
+                  <instanceof\r
+                        value="org.eclipse.linuxtools.tmf.ui.project.model.TmfExperimentFolder">\r
+                  </instanceof>\r
+               </iterate>\r
+            </and>\r
+         </activeWhen>\r
       </handler>\r
       <handler\r
-            class="org.eclipse.linuxtools.internal.tmf.ui.project.handlers.DeleteExperimentSupplementaryFilesHandler"\r
-            commandId="org.eclipse.linuxtools.tmf.ui.command.project.experiment.deleteSupplementaryFiles">\r
+            class="org.eclipse.linuxtools.internal.tmf.ui.project.handlers.SelectTraceTypeHandler"\r
+            commandId="org.eclipse.linuxtools.tmf.ui.command.select_trace_type">\r
+         <activeWhen>\r
+            <and>\r
+               <iterate>\r
+                  <instanceof\r
+                        value="org.eclipse.linuxtools.tmf.ui.project.model.TmfTraceElement">\r
+                  </instanceof>\r
+               </iterate>\r
+            </and>\r
+         </activeWhen>\r
       </handler>\r
       <handler\r
-            class="org.eclipse.linuxtools.internal.tmf.ui.project.handlers.RefreshHandler"\r
-            commandId="org.eclipse.linuxtools.tmf.ui.command.project.experiment.refresh">\r
+            class="org.eclipse.linuxtools.internal.tmf.ui.project.handlers.SelectTracesHandler"\r
+            commandId="org.eclipse.linuxtools.tmf.ui.command.select_traces">\r
+         <activeWhen>\r
+            <and>\r
+               <count\r
+                     value="1">\r
+               </count>\r
+               <iterate>\r
+                  <instanceof\r
+                        value="org.eclipse.linuxtools.tmf.ui.project.model.TmfExperimentElement">\r
+                  </instanceof>\r
+               </iterate>\r
+            </and>\r
+         </activeWhen>\r
       </handler>\r
       <handler\r
             class="org.eclipse.linuxtools.internal.tmf.ui.commands.ManageCustomParsersCommandHandler"\r
@@ -1138,6 +1019,50 @@
          </activeWhen>\r
       </handler>\r
    </extension>\r
+   <extension point="org.eclipse.ui.bindings">\r
+      <key\r
+            sequence="ALT+R"\r
+            contextId="org.eclipse.linuxtools.tmf.ui.view.uml2sd.context"\r
+            commandId="org.eclipse.linuxtools.tmf.ui.views.uml2sd.handlers.GoToMessage"\r
+            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration">\r
+      </key>   \r
+      <key\r
+            sequence="SHIFT+ALT+END"\r
+            contextId="org.eclipse.linuxtools.tmf.ui.view.uml2sd.context"\r
+            commandId="org.eclipse.linuxtools.tmf.ui.views.uml2sd.handlers.ShowNodeEnd"\r
+            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration">\r
+      </key>   \r
+      <key\r
+            sequence="SHIFT+ALT+HOME"\r
+            contextId="org.eclipse.linuxtools.tmf.ui.view.uml2sd.context"\r
+            commandId="org.eclipse.linuxtools.tmf.ui.views.uml2sd.handlers.ShowNodeStart"\r
+            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration">\r
+      </key>    \r
+      <key\r
+            sequence="SHIFT+ALT+ARROW_UP"\r
+            contextId="org.eclipse.linuxtools.tmf.ui.view.uml2sd.context"\r
+            commandId="org.eclipse.linuxtools.tmf.ui.views.uml2sd.handlers.MoveSDUp"\r
+            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration">\r
+      </key>  \r
+      <key\r
+            sequence="SHIFT+ALT+ARROW_DOWN"\r
+            contextId="org.eclipse.linuxtools.tmf.ui.view.uml2sd.context"\r
+            commandId="org.eclipse.linuxtools.tmf.ui.views.uml2sd.handlers.MoveSDDown"\r
+            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration">\r
+      </key>\r
+      <key\r
+            sequence="SHIFT+ALT+ARROW_LEFT"\r
+            contextId="org.eclipse.linuxtools.tmf.ui.view.uml2sd.context"\r
+            commandId="org.eclipse.linuxtools.tmf.ui.views.uml2sd.handlers.MoveSDLeft"\r
+            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration">\r
+      </key>\r
+      <key\r
+            sequence="SHIFT+ALT+ARROW_RIGHT"\r
+            contextId="org.eclipse.linuxtools.tmf.ui.view.uml2sd.context"\r
+            commandId="org.eclipse.linuxtools.tmf.ui.views.uml2sd.handlers.MoveSDRight"\r
+            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration">\r
+      </key>\r
+   </extension>\r
    <extension\r
          point="org.eclipse.core.contenttype.contentTypes">\r
       <content-type\r

diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/project/handlers/ImportTraceHandler.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/project/handlers/ImportTraceHandler.java
index e3b7a01cc2ee4b777f68b558077cf5d040aec7b3..703d6c8f5fc98301a1b5d28aa9f33f9f89e8ad5d 100644 (file)
--- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/project/handlers/ImportTraceHandler.java
+++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/project/handlers/ImportTraceHandler.java
@@ -1,11 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2010, 2011 Ericsson
- * 
+ *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v1.0 which
  * accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
- * 
+ *
  * Contributors:
  *   Francois Chouinard - Initial API and implementation
  *******************************************************************************/
@@ -45,15 +45,17 @@ public class ImportTraceHandler extends AbstractHandler {
 
         // Check if we are closing down
         IWorkbenchWindow window = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
-        if (window == null)
+        if (window == null) {
             return null;
+        }
 
        // Get the selection
         IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
         IWorkbenchPart part = page.getActivePart();
         ISelectionProvider selectionProvider = part.getSite().getSelectionProvider();
-        if (selectionProvider == null)
+        if (selectionProvider == null) {
             return false;
+        }
         ISelection selection = selectionProvider.getSelection();
 
         TmfTraceFolder traceFolder = null;
@@ -65,8 +67,9 @@ public class ImportTraceHandler extends AbstractHandler {
                 traceFolder = (TmfTraceFolder) element;
             }
         }
-        if (traceFolder == null)
+        if (traceFolder == null) {
             return null;
+        }
 
         // Fire the Import Trace Wizard
         IWorkbench workbench = PlatformUI.getWorkbench();
@@ -78,7 +81,7 @@ public class ImportTraceHandler extends AbstractHandler {
         dialog.open();
 
         traceFolder.refresh();
-        
+
         return null;
     }
 

diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/project/handlers/OpenAction.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/project/handlers/OpenAction.java
index 507923f7dabf181ffbe944981cf310b271803dcf..883c827a9c1229628168a5680ba19e862f45c8de 100644 (file)
--- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/project/handlers/OpenAction.java
+++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/project/handlers/OpenAction.java
@@ -27,10 +27,15 @@ import org.eclipse.linuxtools.tmf.ui.project.model.TmfTraceElement;
 import org.eclipse.ui.IWorkbenchPage;
 import org.eclipse.ui.handlers.IHandlerService;
 
+/**
+ * <b><u>OpenAction</u></b>
+ * <p>
+ * Implement me. Please.
+ * <p>
+ */
 public class OpenAction extends Action {
 
-    private static final String OPEN_TRACE_COMMAND_ID = "org.eclipse.linuxtools.tmf.ui.command.project.trace.open"; //$NON-NLS-1$
-    private static final String OPEN_EXPERIMENT_COMMAND_ID = "org.eclipse.linuxtools.tmf.ui.command.project.experiment.open"; //$NON-NLS-1$
+    private static final String OPEN_COMMAND_ID = "org.eclipse.ui.navigate.openResource"; //$NON-NLS-1$
 
     private final IWorkbenchPage page;
     private final ISelectionProvider selectionProvider;
@@ -74,10 +79,8 @@ public class OpenAction extends Action {
     public void run() {
         try {
             IHandlerService handlerService = (IHandlerService) page.getActivePart().getSite().getService(IHandlerService.class);
-            if (element instanceof TmfTraceElement) {
-                handlerService.executeCommand(OPEN_TRACE_COMMAND_ID, null);
-            } else if (element instanceof TmfExperimentElement) {
-                handlerService.executeCommand(OPEN_EXPERIMENT_COMMAND_ID, null);
+            if (element instanceof TmfTraceElement || element instanceof TmfExperimentElement) {
+                handlerService.executeCommand(OPEN_COMMAND_ID, null);
             }
         } catch (ExecutionException e) {
             Activator.getDefault().logError("Error opening resource " + element.getName(), e); //$NON-NLS-1$

diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/project/handlers/SelectTraceTypeContributionItem.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/project/handlers/SelectTraceTypeContributionItem.java
index 7adb4c201d190dd486976d57655f6f50bc8cbefb..a7cd34f262676b12f9b45967a78a5558a22a6e19 100644 (file)
--- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/project/handlers/SelectTraceTypeContributionItem.java
+++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/project/handlers/SelectTraceTypeContributionItem.java
@@ -45,10 +45,10 @@ public class SelectTraceTypeContributionItem extends CompoundContributionItem {
     //private static final ImageDescriptor SELECTED_ICON = ImageDescriptor.createFromImage(TmfUiPlugin.getDefault().getImageFromPath("icons/elcl16/bullet.gif")); //$NON-NLS-1$
     private static final ImageDescriptor SELECTED_ICON = Activator.getDefault().getImageDescripterFromPath(
             "icons/elcl16/bullet.gif"); //$NON-NLS-1$
-    private static final String BUNDLE_PARAMETER = "org.eclipse.linuxtools.tmf.ui.commandparameter.project.trace.select_trace_type.bundle"; //$NON-NLS-1$
-    private static final String TYPE_PARAMETER = "org.eclipse.linuxtools.tmf.ui.commandparameter.project.trace.select_trace_type.type"; //$NON-NLS-1$
-    private static final String ICON_PARAMETER = "org.eclipse.linuxtools.tmf.ui.commandparameter.project.trace.select_trace_type.icon"; //$NON-NLS-1$
-    private static final String SELECT_TRACE_TYPE_COMMAND_ID = "org.eclipse.linuxtools.tmf.ui.command.project.trace.select_trace_type"; //$NON-NLS-1$
+    private static final String BUNDLE_PARAMETER = "org.eclipse.linuxtools.tmf.ui.commandparameter.select_trace_type.bundle"; //$NON-NLS-1$
+    private static final String TYPE_PARAMETER = "org.eclipse.linuxtools.tmf.ui.commandparameter.select_trace_type.type"; //$NON-NLS-1$
+    private static final String ICON_PARAMETER = "org.eclipse.linuxtools.tmf.ui.commandparameter.select_trace_type.icon"; //$NON-NLS-1$
+    private static final String SELECT_TRACE_TYPE_COMMAND_ID = "org.eclipse.linuxtools.tmf.ui.command.select_trace_type"; //$NON-NLS-1$
     private static final String CUSTOM_TXT_CATEGORY = "Custom Text"; //$NON-NLS-1$
     private static final String CUSTOM_XML_CATEGORY = "Custom XML"; //$NON-NLS-1$
     private static final String DEFAULT_TRACE_ICON_PATH = "icons/elcl16/trace.gif"; //$NON-NLS-1$

diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/project/handlers/SelectTraceTypeHandler.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/project/handlers/SelectTraceTypeHandler.java
index bdd57c7e6f8c730105f47de130e9fc4d83617651..e549157e53cae95c68eeb3a34eccfb3dc16140ee 100644 (file)
--- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/project/handlers/SelectTraceTypeHandler.java
+++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/project/handlers/SelectTraceTypeHandler.java
@@ -47,9 +47,9 @@ public class SelectTraceTypeHandler extends AbstractHandler {
     // Constants
     // ------------------------------------------------------------------------
 
-    private static final String BUNDLE_PARAMETER = "org.eclipse.linuxtools.tmf.ui.commandparameter.project.trace.select_trace_type.bundle"; //$NON-NLS-1$
-    private static final String TYPE_PARAMETER = "org.eclipse.linuxtools.tmf.ui.commandparameter.project.trace.select_trace_type.type"; //$NON-NLS-1$
-    private static final String ICON_PARAMETER = "org.eclipse.linuxtools.tmf.ui.commandparameter.project.trace.select_trace_type.icon"; //$NON-NLS-1$
+    private static final String BUNDLE_PARAMETER = "org.eclipse.linuxtools.tmf.ui.commandparameter.select_trace_type.bundle"; //$NON-NLS-1$
+    private static final String TYPE_PARAMETER = "org.eclipse.linuxtools.tmf.ui.commandparameter.select_trace_type.type"; //$NON-NLS-1$
+    private static final String ICON_PARAMETER = "org.eclipse.linuxtools.tmf.ui.commandparameter.select_trace_type.icon"; //$NON-NLS-1$
 
     // ------------------------------------------------------------------------
     // Attributes