summaryrefslogtreecommitdiffstatsabout
diff options
context:
space:
mode:
authorPaul Elder2013-02-28 13:40:16 (EST)
committer Paul Webster2013-02-28 13:40:16 (EST)
commit4ef1441f1d61e51bef4eecdd88f0ecb608a4b105 (patch)
tree4bb29f6c45569ad96afdc429fb023a08121cf225
parent927225bc26a1d2b28da586879c9bae3141ecef44 (diff)
downloadeclipse.platform.ui-4ef1441f1d61e51bef4eecdd88f0ecb608a4b105.zip
eclipse.platform.ui-4ef1441f1d61e51bef4eecdd88f0ecb608a4b105.tar.gz
eclipse.platform.ui-4ef1441f1d61e51bef4eecdd88f0ecb608a4b105.tar.bz2
Bug 375221 - [Compatibility] 'Resource configurations' menu shows up inv20130228-184016I20130228-2000
context menus merge the correct visibleWhen
-rw-r--r--bundles/org.eclipse.e4.ui.workbench.renderers.swt/src/org/eclipse/e4/ui/workbench/renderers/swt/ContributionRecord.java3
1 files changed, 1 insertions, 2 deletions
diff --git a/bundles/org.eclipse.e4.ui.workbench.renderers.swt/src/org/eclipse/e4/ui/workbench/renderers/swt/ContributionRecord.java b/bundles/org.eclipse.e4.ui.workbench.renderers.swt/src/org/eclipse/e4/ui/workbench/renderers/swt/ContributionRecord.java
index bff5aaf..05a31ed 100644
--- a/bundles/org.eclipse.e4.ui.workbench.renderers.swt/src/org/eclipse/e4/ui/workbench/renderers/swt/ContributionRecord.java
+++ b/bundles/org.eclipse.e4.ui.workbench.renderers.swt/src/org/eclipse/e4/ui/workbench/renderers/swt/ContributionRecord.java
@@ -215,8 +215,7 @@ public class ContributionRecord {
renderer.linkElementToContributionRecord(copy, this);
menuModel.getChildren().add(idx++, copy);
} else {
- shared.setVisibleWhen(merge(
- menuContribution.getVisibleWhen(),
+ shared.setVisibleWhen(merge(copy.getVisibleWhen(),
shared.getVisibleWhen()));
copy = shared;
}