Context menu in "Git Repositories" window shows only "show in" entry

with EasyShell installed #195

Signed-off-by: Andre Bossert <[email protected]>

Author: anb0s

plugin/src/de/anbos/eclipse/easyshell/plugin/misc/ResourceUtils.java

@@ -101,7 +101,7 @@ private static ISelection getSelectionFromText(Resource partFile, String text) {
         return selection;
     }
 
-    static public Resource getResource(Object myObj) {
+    static private Resource getResourceInternal(Object myObj) {
         Object object = null;
 
         // handle IEditorPart
@@ -165,15 +165,24 @@ static public Resource getResource(Object myObj) {
             // optional org.eclipse.jdt.core
             Bundle bundle = Platform.getBundle("org.eclipse.jdt.core");
             if (bundle != null) {
-                Resource res = ResourceUtilsJDT.getResource(adaptable);
+                Resource res = ResourceUtilsJDTCore.getResource(adaptable);
                 if (res != null) {
                     return res;
                 }
             }
             // optional org.eclipse.cdt.core
             bundle = Platform.getBundle("org.eclipse.cdt.core");
             if (bundle != null) {
-                Resource res = ResourceUtilsCDT.getResource(adaptable);
+                Resource res = null;
+                // optional org.eclipse.cdt.ui
+                bundle = Platform.getBundle("org.eclipse.cdt.ui");
+                if (bundle != null) {
+                    res = ResourceUtilsCDTUI.getResource(adaptable);
+                }
+                if (res != null) {
+                    return res;
+                }
+                res = ResourceUtilsCDTCore.getResource(adaptable);
                 if (res != null) {
                     return res;
                 }
@@ -187,17 +196,26 @@ static public Resource getResource(Object myObj) {
         return null;
     }
 
+    static public Resource getResource(Object myObj) {
+        try {
+            return getResourceInternal(myObj);
+        } catch(Exception e) {
+            // no op
+        }
+        return null;
+    }
+
     static public String getFullQualifiedName(IResource resource) {
         Bundle bundle = Platform.getBundle("org.eclipse.jdt.core");
         if (bundle != null) {
-            String res = ResourceUtilsJDT.getFullQualifiedName(resource);
+            String res = ResourceUtilsJDTCore.getFullQualifiedName(resource);
             if (res != null) {
                 return res;
             }
         }
         bundle = Platform.getBundle("org.eclipse.cdt.core");
         if (bundle != null) {
-            String res = ResourceUtilsCDT.getFullQualifiedName(resource);
+            String res = ResourceUtilsCDTCore.getFullQualifiedName(resource);
             if (res != null) {
                 return res;
             }

plugin/src/de/anbos/eclipse/easyshell/plugin/misc/ResourceUtilsCDT.java renamed to plugin/src/de/anbos/eclipse/easyshell/plugin/misc/ResourceUtilsCDTCore.java

@@ -13,32 +13,25 @@
 
 package de.anbos.eclipse.easyshell.plugin.misc;
 
-import org.eclipse.cdt.core.model.IIncludeReference;
-import org.eclipse.cdt.internal.core.model.ExternalTranslationUnit;
-import org.eclipse.cdt.internal.core.model.IncludeReference;
-import org.eclipse.cdt.internal.ui.cview.IncludeReferenceProxy;
-import org.eclipse.cdt.internal.ui.includebrowser.IBNode;
 import org.eclipse.core.resources.IResource;
 import org.eclipse.core.runtime.IAdaptable;
 import org.eclipse.core.runtime.IPath;
+import org.eclipse.cdt.core.model.IIncludeReference;
+import org.eclipse.cdt.internal.core.model.ExternalTranslationUnit;
+import org.eclipse.cdt.internal.core.model.IncludeReference;
 
 import de.anbos.eclipse.easyshell.plugin.types.Resource;
 
 @SuppressWarnings("restriction")
-public class ResourceUtilsCDT {
+public class ResourceUtilsCDTCore {
 
     static public Resource getResource(IAdaptable adaptable) {
         IPath path = null;
-        if (adaptable instanceof IncludeReferenceProxy) {
-            IIncludeReference includeRef = ((IncludeReferenceProxy) adaptable).getReference();
-            path = includeRef.getPath();
-        } else if (adaptable instanceof IncludeReference) {
+        if (adaptable instanceof IncludeReference) {
             IIncludeReference includeRef = ((IncludeReference) adaptable);
             path = includeRef.getPath();
         } else if (adaptable instanceof ExternalTranslationUnit) {
             path = ((ExternalTranslationUnit) adaptable).getLocation();
-        } else if (adaptable instanceof IBNode) {
-            path = ((IBNode) adaptable).getRepresentedPath();
         }
         if (path != null) {
             return new Resource(path.toFile());

plugin/src/de/anbos/eclipse/easyshell/plugin/misc/ResourceUtilsCDTUI.java

@@ -0,0 +1,41 @@
+/**
+ * Copyright (c) 2014-2021 Andre Bossert <[email protected]>.
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+
+package de.anbos.eclipse.easyshell.plugin.misc;
+
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.cdt.core.model.IIncludeReference;
+import org.eclipse.cdt.internal.ui.cview.IncludeReferenceProxy;
+import org.eclipse.cdt.internal.ui.includebrowser.IBNode;
+
+import de.anbos.eclipse.easyshell.plugin.types.Resource;
+
+@SuppressWarnings("restriction")
+public class ResourceUtilsCDTUI {
+
+    static public Resource getResource(IAdaptable adaptable) {
+        IPath path = null;
+        if (adaptable instanceof IncludeReferenceProxy) {
+            IIncludeReference includeRef = ((IncludeReferenceProxy) adaptable).getReference();
+            path = includeRef.getPath();
+        } else if (adaptable instanceof IBNode) {
+            path = ((IBNode) adaptable).getRepresentedPath();
+        }
+        if (path != null) {
+            return new Resource(path.toFile());
+        }
+        return null;
+    }
+
+}

plugin/src/de/anbos/eclipse/easyshell/plugin/misc/ResourceUtilsJDT.java renamed to plugin/src/de/anbos/eclipse/easyshell/plugin/misc/ResourceUtilsJDTCore.java

@@ -28,7 +28,7 @@
 import de.anbos.eclipse.easyshell.plugin.types.Resource;
 
 @SuppressWarnings("restriction")
-public class ResourceUtilsJDT {
+public class ResourceUtilsJDTCore {
 
     static private File getJarFile(IAdaptable adaptable) {
         JarPackageFragmentRoot jpfr = (JarPackageFragmentRoot) adaptable;

site/updates/testing/2.2/2.2.1.v20210607-1525/artifacts.jar

@@ -0,0 +1,4 @@
+#Mon Jun 07 17:25:47 CEST 2021
+artifact.repository.factory.order=artifacts.xml.xz,artifacts.xml,\!
+version=1
+metadata.repository.factory.order=content.xml.xz,content.xml,\!