Merge branch '578581_GroupsContributionOld2' into 578581_GroupsContri…

…bution
eclipse-platform · Sep 24, 2024 · 5062936 · 5062936
2 parents 0986115 + 1d2dc6e
commit 5062936
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 2 deletions.
diff --git a/bundles/org.eclipse.ui.ide/META-INF/MANIFEST.MF b/bundles/org.eclipse.ui.ide/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Plugin.name
 Bundle-SymbolicName: org.eclipse.ui.ide; singleton:=true
-Bundle-Version: 3.22.400.qualifier
+Bundle-Version: 3.23.0.qualifier
 Bundle-Activator: org.eclipse.ui.internal.ide.IDEWorkbenchPlugin
 Bundle-ActivationPolicy: lazy
 Bundle-Vendor: %Plugin.providerName

diff --git a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/views/markers/GroupsContribution.java b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/views/markers/GroupsContribution.java
@@ -40,7 +40,7 @@ public GroupsContribution() {
 	}
 
 	@Override
-	protected IContributionItem[] getContributionItems() {
+	public IContributionItem[] getContributionItems() {
 		ExtendedMarkersView view = getView();
 		if (view == null) {
 			return new IContributionItem[0];

diff --git a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/views/markers/MarkerGroupsContribution.java b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/views/markers/MarkerGroupsContribution.java
@@ -0,0 +1,18 @@
+package org.eclipse.ui.views.markers;
+
+import org.eclipse.jface.action.IContributionItem;
+import org.eclipse.ui.actions.CompoundContributionItem;
+import org.eclipse.ui.internal.views.markers.GroupsContribution;
+
+/**
+ * @since 3.23
+ *
+ */
+public class MarkerGroupsContribution extends CompoundContributionItem {
+
+	@Override
+	protected IContributionItem[] getContributionItems() {
+		GroupsContribution gc = new GroupsContribution();
+		return gc.getContributionItems();
+	}
+}