Support creating Gist from files selected in Package Explorer

This required updating the 'visibleWhen' to check for a selection
that adapts to IResource but not to IContainer as a check for
IFile does not match selected compilation units

Change-Id: I26c5393ec23adb6108004510c640d5cd123663ce

2 files changed, 44 insertions, 24 deletions

diff --git a/org.eclipse.mylyn.github.ui/plugin.xml b/org.eclipse.mylyn.github.ui/plugin.xml
index 85796a37..2dd024ea 100644
--- a/org.eclipse.mylyn.github.ui/plugin.xml
+++ b/org.eclipse.mylyn.github.ui/plugin.xml
@@ -115,7 +115,6 @@
          </menu>
       </menuContribution>
       <menuContribution
-            allPopups="false"
             locationURI="popup:org.eclipse.ui.popup.any?after=additions">
          <menu
                icon="icons/obj16/github.png"
@@ -127,15 +126,23 @@
                   style="push">
                <visibleWhen
                      checkEnabled="false">
-                  <with
-                        variable="activeMenuSelection">
-                     <iterate
-                           ifEmpty="false">
-                        <adapt
-                              type="org.eclipse.core.resources.IFile">
-                        </adapt>
+                  <and>
+                     <count
+                           value="1">
+                     </count>
+                     <iterate>
+                        <and>
+                           <adapt
+                                 type="org.eclipse.core.resources.IResource">
+                           </adapt>
+                           <not>
+                              <adapt
+                                 type="org.eclipse.core.resources.IContainer">
+                              </adapt>
+                           </not>
+                        </and>
                      </iterate>
-                  </with>
+                  </and>
                </visibleWhen>
                <parameter
                      name="publicGist"
@@ -149,15 +156,23 @@
                   style="push">
                <visibleWhen
                      checkEnabled="false">
-                  <with
-                        variable="activeMenuSelection">
-                     <iterate
-                           ifEmpty="false">
-                        <adapt
-                              type="org.eclipse.core.resources.IFile">
-                        </adapt>
+                  <and>
+                     <count
+                           value="1">
+                     </count>
+                     <iterate>
+                        <and>
+                           <adapt
+                                 type="org.eclipse.core.resources.IResource">
+                           </adapt>
+                           <not>
+                              <adapt
+                                 type="org.eclipse.core.resources.IContainer">
+                              </adapt>
+                           </not>
+                        </and>
                      </iterate>
-                  </with>
+                  </and>
                </visibleWhen>
                <parameter
                      name="publicGist"
diff --git a/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/gist/CreateGistHandler.java b/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/gist/CreateGistHandler.java
index 5b4c937a..836d0a56 100644
--- a/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/gist/CreateGistHandler.java
+++ b/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/gist/CreateGistHandler.java
@@ -21,6 +21,7 @@ import org.eclipse.core.commands.AbstractHandler;
 import org.eclipse.core.commands.ExecutionEvent;
 import org.eclipse.core.commands.ExecutionException;
 import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IResource;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IAdaptable;
 import org.eclipse.core.runtime.IPath;
@@ -143,13 +144,17 @@ public class CreateGistHandler extends AbstractHandler {
 		} else if (selection instanceof IStructuredSelection) {
 			IStructuredSelection structuredSelection = (IStructuredSelection) selection;
 			Object obj = structuredSelection.getFirstElement();
-			IFile file = null;
-			if (obj instanceof IFile)
-				file = (IFile) obj;
-			else if (obj instanceof IAdaptable)
-				file = (IFile) ((IAdaptable) obj).getAdapter(IFile.class);
-			if (file != null)
-				createGistJob(event, file, isPublic);
+			IResource file = null;
+			if (obj instanceof IResource)
+				file = (IResource) obj;
+			else if (obj instanceof IAdaptable) {
+				file = (IResource) ((IAdaptable) obj)
+						.getAdapter(IResource.class);
+				if (file == null)
+					file = (IFile) ((IAdaptable) obj).getAdapter(IFile.class);
+			}
+			if (file instanceof IFile)
+				createGistJob(event, (IFile) file, isPublic);
 		}
 		return null;
 	}