NEW - bug 220314: [patch] double click on repository attachment does not respect default workbench editor

https://bugs.eclipse.org/bugs/show_bug.cgi?id=220314

1 files changed, 20 insertions, 22 deletions

diff --git a/org.eclipse.mylyn.tasks.ui/plugin.xml b/org.eclipse.mylyn.tasks.ui/plugin.xml
index 717070611..79d368bf7 100644
--- a/org.eclipse.mylyn.tasks.ui/plugin.xml
+++ b/org.eclipse.mylyn.tasks.ui/plugin.xml
@@ -1224,8 +1224,8 @@
       </command>
       <command
             categoryId="org.eclipse.mylyn.tasks.ui.category.editor"
-            id="org.eclipse.mylyn.tasks.ui.command.attachment.openInBrowser"
-            name="%command.attachment.openInBrowser.name">
+            id="org.eclipse.mylyn.tasks.ui.command.attachment.open"
+            name="%command.attachment.open.name">
       </command>
       <category
             id="org.eclipse.mylyn.tasks.ui.category.editor"
@@ -1233,11 +1233,6 @@
       </category>
       <command
             categoryId="org.eclipse.mylyn.tasks.ui.category.editor"
-            id="org.eclipse.mylyn.tasks.ui.command.attachment.openInDefaultEditor"
-            name="%command.attachment.openInDefaultEditor.name">
-      </command>
-      <command
-            categoryId="org.eclipse.mylyn.tasks.ui.category.editor"
             defaultHandler="org.eclipse.mylyn.internal.tasks.ui.commands.SubmitTaskHandler"
             description="%command.submitTask.description"
             id="org.eclipse.mylyn.tasks.ui.command.submitTask"
@@ -1473,12 +1468,8 @@
          </enabledWhen>
       </handler>
       <handler
-            class="org.eclipse.mylyn.internal.tasks.ui.commands.OpenTaskAttachmentInBrowserHandler"
-            commandId="org.eclipse.mylyn.tasks.ui.command.attachment.openInBrowser">
-      </handler>
-      <handler
-            class="org.eclipse.mylyn.internal.tasks.ui.commands.OpenTaskAttachmentInDefaultEditorHandler"
-            commandId="org.eclipse.mylyn.tasks.ui.command.attachment.openInDefaultEditor">
+            class="org.eclipse.mylyn.internal.tasks.ui.commands.OpenTaskAttachmentHandler"
+            commandId="org.eclipse.mylyn.tasks.ui.command.attachment.open">
       </handler>
       <handler
             class="org.eclipse.mylyn.internal.tasks.ui.commands.MarkTaskHandler$MarkTaskCompleteHandler"
@@ -1599,20 +1590,27 @@
       <menuContribution
             locationURI="popup:org.eclipse.mylyn.tasks.ui.editor.menu.attachments?after=group.open">
          <command
-               commandId="org.eclipse.mylyn.tasks.ui.command.attachment.openInBrowser"
-               label="%command.attachment.openInBrowser.label"
+               commandId="org.eclipse.mylyn.tasks.ui.command.attachment.open"
+               label="%command.attachment.open.label"
                mnemonic="O"
                style="push">
          </command>
          <menu
-               label="%command.attachment.openInDefaultEditor.menu.label"
+               label="%command.attachment.openWith.menu.label"
                mnemonic="H">
-            <command
-                  commandId="org.eclipse.mylyn.tasks.ui.command.attachment.openInDefaultEditor"
-                  label="%command.attachment.openInDefaultEditor.label"
-                  mnemonic="D"
-                  style="push">
-            </command>
+            <dynamic
+                  class="org.eclipse.mylyn.internal.tasks.ui.commands.OpenTaskAttachmentWithMenu"
+                  id="org.eclipse.mylyn.tasks.ui.command.attachment.openTaskAttachmentWithMenu">
+                  <visibleWhen
+                        checkEnabled="false">
+                     <with
+                           variable="selection">
+                        <count
+                              value="1">
+                        </count>
+                     </with>
+                  </visibleWhen>
+            </dynamic>
          </menu>
       </menuContribution>
       <menuContribution