aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeorg Breitschopf2014-04-18 09:13:11 (EDT)
committerPaul Webster2014-04-22 10:19:36 (EDT)
commite1a872d4dcf51b4bebc10ca25c20aec1348e253d (patch)
treee0e52ea2854f71e09d82ad3eab9af5d31590ca12
parentb246817e772936999394dadaff7130d1206ec423 (diff)
downloadeclipse.platform.ui-e1a872d4dcf51b4bebc10ca25c20aec1348e253d.zip
eclipse.platform.ui-e1a872d4dcf51b4bebc10ca25c20aec1348e253d.tar.gz
eclipse.platform.ui-e1a872d4dcf51b4bebc10ca25c20aec1348e253d.tar.bz2
Bug 399065 - FORCE_TEXT is ignored on view toolbarsrefs/changes/71/25271/2
Change-Id: I60721717acf17004f79ceba02bfbe15c1a02eeb4 Signed-off-by: Georg Breitschopf <georg.breitschopf@gmail.com>
-rw-r--r--bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/menus/MenuAdditionCacheEntry.java7
1 files changed, 7 insertions, 0 deletions
diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/menus/MenuAdditionCacheEntry.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/menus/MenuAdditionCacheEntry.java
index 13ac2ed..5acb59c 100644
--- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/menus/MenuAdditionCacheEntry.java
+++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/menus/MenuAdditionCacheEntry.java
@@ -50,6 +50,7 @@ import org.eclipse.ui.commands.ICommandImageService;
import org.eclipse.ui.internal.WorkbenchPlugin;
import org.eclipse.ui.internal.registry.IWorkbenchRegistryConstants;
import org.eclipse.ui.internal.services.ServiceLocator;
+import org.eclipse.ui.menus.CommandContributionItem;
public class MenuAdditionCacheEntry {
final static String MAIN_TOOLBAR = "org.eclipse.ui.main.toolbar"; //$NON-NLS-1$
@@ -510,6 +511,12 @@ public class MenuAdditionCacheEntry {
item.setMenu(element);
}
item.setVisibleWhen(MenuHelper.getVisibleWhen(commandAddition));
+
+ if (MenuHelper.getMode(commandAddition) == CommandContributionItem.MODE_FORCE_TEXT) {
+ item.getTags().add("FORCE_TEXT"); //$NON-NLS-1$
+ item.setLabel(MenuHelper.getLabel(commandAddition));
+ }
+
createIdentifierTracker(item);
return item;
}