From 0c90458a26f8cbb4db77972fc23dec7ea1f40f07 Mon Sep 17 00:00:00 2001 From: Enda O Brien Date: Tue, 24 Sep 2024 14:30:38 +0100 Subject: [PATCH] Bug 578581 - MarkerSupportView custom groupings requires use of internal GroupsContribution #133 Squashed commit of the following: commit 1d2dc6e27e030d8649af192c308b09810efe7bf2 Author: Enda O Brien Date: Fri Sep 20 17:18:06 2024 +0100 Bug 578581 - MarkerSupportView custom groupings requires use of internal GroupsContribution #133 Squashed commit of the following: commit e7a6202cab86928108539e8ceddada3a53fd2523 Author: Enda O Brien Date: Mon Jun 13 11:26:11 2022 +0100 Bug 578581 - MarkerSupportView custom groupings requires use of internal GroupsContribution --- .../org.eclipse.ui.ide/META-INF/MANIFEST.MF | 2 +- .../views/markers/GroupsContribution.java | 2 +- .../markers/MarkerGroupsContribution.java | 18 ++++++++++++++++++ 3 files changed, 20 insertions(+), 2 deletions(-) create mode 100644 bundles/org.eclipse.ui.ide/src/org/eclipse/ui/views/markers/MarkerGroupsContribution.java diff --git a/bundles/org.eclipse.ui.ide/META-INF/MANIFEST.MF b/bundles/org.eclipse.ui.ide/META-INF/MANIFEST.MF index c43ddcf24b9..0b405cf0087 100644 --- 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 index cf0c49550ee..251329ab922 100644 --- 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 new file mode 100644 index 00000000000..f57d40613f7 --- /dev/null +++ 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(); + } +}