From 09eea87216c530735a81228b95c4b3ae4cbf8862 Mon Sep 17 00:00:00 2001 From: jkozlov Date: Thu, 31 Oct 2024 13:46:59 +0500 Subject: [PATCH 1/3] Avoid "null" in "Show In" menu when there is no key binding --- .../navigator/resources/actions/ShowInActionProvider.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bundles/org.eclipse.ui.navigator.resources/src/org/eclipse/ui/internal/navigator/resources/actions/ShowInActionProvider.java b/bundles/org.eclipse.ui.navigator.resources/src/org/eclipse/ui/internal/navigator/resources/actions/ShowInActionProvider.java index a0ad694a86a..c52d79e2d13 100644 --- a/bundles/org.eclipse.ui.navigator.resources/src/org/eclipse/ui/internal/navigator/resources/actions/ShowInActionProvider.java +++ b/bundles/org.eclipse.ui.navigator.resources/src/org/eclipse/ui/internal/navigator/resources/actions/ShowInActionProvider.java @@ -45,6 +45,6 @@ private String getShowInMenuLabel() { ? bindingService .getBestActiveBindingFormattedFor(IWorkbenchCommandConstants.NAVIGATE_SHOW_IN_QUICK_MENU) : ""; //$NON-NLS-1$ - return WorkbenchNavigatorMessages.ShowInActionProvider_showInAction_label + '\t' + keyBinding; + return WorkbenchNavigatorMessages.ShowInActionProvider_showInAction_label + (keyBinding != null ? '\t' + keyBinding : ""); //$NON-NLS-2$ } -} \ No newline at end of file +} From 1ed742373cba139176e5f690ebce93184b7849fa Mon Sep 17 00:00:00 2001 From: jkozlov Date: Thu, 31 Oct 2024 14:16:33 +0500 Subject: [PATCH 2/3] Fixed errors --- .../navigator/resources/actions/ShowInActionProvider.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bundles/org.eclipse.ui.navigator.resources/src/org/eclipse/ui/internal/navigator/resources/actions/ShowInActionProvider.java b/bundles/org.eclipse.ui.navigator.resources/src/org/eclipse/ui/internal/navigator/resources/actions/ShowInActionProvider.java index c52d79e2d13..4afc73e5b12 100644 --- a/bundles/org.eclipse.ui.navigator.resources/src/org/eclipse/ui/internal/navigator/resources/actions/ShowInActionProvider.java +++ b/bundles/org.eclipse.ui.navigator.resources/src/org/eclipse/ui/internal/navigator/resources/actions/ShowInActionProvider.java @@ -45,6 +45,6 @@ private String getShowInMenuLabel() { ? bindingService .getBestActiveBindingFormattedFor(IWorkbenchCommandConstants.NAVIGATE_SHOW_IN_QUICK_MENU) : ""; //$NON-NLS-1$ - return WorkbenchNavigatorMessages.ShowInActionProvider_showInAction_label + (keyBinding != null ? '\t' + keyBinding : ""); //$NON-NLS-2$ + return WorkbenchNavigatorMessages.ShowInActionProvider_showInAction_label + (keyBinding != null ? "\t" + keyBinding : ""); //$NON-NLS-1$ //$NON-NLS-2$ } } From bf85c6ea57c734656feb9bad08f826821a8ce2d8 Mon Sep 17 00:00:00 2001 From: Eclipse Platform Bot Date: Tue, 26 Nov 2024 20:28:05 +0000 Subject: [PATCH 3/3] Version bump(s) for 4.35 stream --- bundles/org.eclipse.ui.navigator.resources/META-INF/MANIFEST.MF | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bundles/org.eclipse.ui.navigator.resources/META-INF/MANIFEST.MF b/bundles/org.eclipse.ui.navigator.resources/META-INF/MANIFEST.MF index 5e9f968e313..52eee57bc2d 100644 --- a/bundles/org.eclipse.ui.navigator.resources/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.ui.navigator.resources/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Plugin.name Bundle-SymbolicName: org.eclipse.ui.navigator.resources; singleton:=true -Bundle-Version: 3.9.500.qualifier +Bundle-Version: 3.9.600.qualifier Bundle-Activator: org.eclipse.ui.internal.navigator.resources.plugin.WorkbenchNavigatorPlugin Bundle-Vendor: %Plugin.providerName Bundle-Localization: plugin