From 593f2c08824187e1fc8923e08cf31076a50dcd34 Mon Sep 17 00:00:00 2001 From: Eclipse Platform Bot Date: Sun, 6 Apr 2025 18:20:49 +0000 Subject: [PATCH 1/2] In Project Explorer view,added a separator after the 'Refresh' command Fixes https://github.com/eclipse-platform/eclipse.platform.ui/issues/267 --- .../resources/actions/ResourceMgmtActionProvider.java | 4 +++- .../navigator/resources/ResourceMgmtActionProviderTests.java | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/bundles/org.eclipse.ui.navigator.resources/src/org/eclipse/ui/internal/navigator/resources/actions/ResourceMgmtActionProvider.java b/bundles/org.eclipse.ui.navigator.resources/src/org/eclipse/ui/internal/navigator/resources/actions/ResourceMgmtActionProvider.java index df0b7ce6151..ad945504331 100644 --- a/bundles/org.eclipse.ui.navigator.resources/src/org/eclipse/ui/internal/navigator/resources/actions/ResourceMgmtActionProvider.java +++ b/bundles/org.eclipse.ui.navigator.resources/src/org/eclipse/ui/internal/navigator/resources/actions/ResourceMgmtActionProvider.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2006, 2018 IBM Corporation and others. + * Copyright (c) 2006, 2025 IBM Corporation and others. * * This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 @@ -32,6 +32,7 @@ import org.eclipse.core.runtime.Status; import org.eclipse.core.runtime.jobs.ISchedulingRule; import org.eclipse.jface.action.IMenuManager; +import org.eclipse.jface.action.Separator; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.viewers.StructuredViewer; @@ -147,6 +148,7 @@ public void fillContextMenu(IMenuManager menu) { if (hasOpenProjects || selectionContainsNonProject) { refreshAction.selectionChanged(selection); menu.appendToGroup(ICommonMenuConstants.GROUP_BUILD, refreshAction); + menu.appendToGroup(ICommonMenuConstants.GROUP_BUILD, new Separator()); } if (hasClosedProjects) { openProjectAction.selectionChanged(selection); diff --git a/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/resources/ResourceMgmtActionProviderTests.java b/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/resources/ResourceMgmtActionProviderTests.java index ca4e49f0cbb..cd2ab37ee5d 100644 --- a/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/resources/ResourceMgmtActionProviderTests.java +++ b/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/resources/ResourceMgmtActionProviderTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2024 Dave Carpeneto and others. + * Copyright (c) 2025 Dave Carpeneto and others. * * This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 @@ -211,7 +211,7 @@ private void checkMenuHasCorrectContributions(boolean... actions) { */ private boolean menuHasContribution(String contribution) { for (IContributionItem thisItem : manager.getItems()) { - if (thisItem.getId().equals(contribution)) { + if (thisItem.getId() != null && thisItem.getId().equals(contribution)) { return true; } } From a227d4d4c2a4ae38e674f291ea1e89bc88c2070c Mon Sep 17 00:00:00 2001 From: Eclipse Platform Bot Date: Mon, 28 Apr 2025 09:10:21 +0000 Subject: [PATCH 2/2] Version bump(s) for 4.36 stream --- tests/org.eclipse.ui.tests.navigator/META-INF/MANIFEST.MF | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/org.eclipse.ui.tests.navigator/META-INF/MANIFEST.MF b/tests/org.eclipse.ui.tests.navigator/META-INF/MANIFEST.MF index 133d49280f0..84f1f570db6 100644 --- a/tests/org.eclipse.ui.tests.navigator/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.ui.tests.navigator/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %bundlename Bundle-SymbolicName: org.eclipse.ui.tests.navigator;singleton:=true -Bundle-Version: 3.8.0.qualifier +Bundle-Version: 3.8.100.qualifier Bundle-Localization: plugin Require-Bundle: org.eclipse.core.resources, org.eclipse.core.runtime;bundle-version="[3.29.0,4.0.0)",