diff options
| -rw-r--r-- | bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/menus/CompatibilityWorkbenchWindowControlContribution.java | 31 |
1 files changed, 18 insertions, 13 deletions
diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/menus/CompatibilityWorkbenchWindowControlContribution.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/menus/CompatibilityWorkbenchWindowControlContribution.java index ef0bd8b5290..b84c2483e58 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/menus/CompatibilityWorkbenchWindowControlContribution.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/menus/CompatibilityWorkbenchWindowControlContribution.java @@ -63,23 +63,28 @@ public class CompatibilityWorkbenchWindowControlContribution { } MUIElement parent = toolControl.getParent(); - while (!(parent instanceof MTrimBar)) { + while (!(parent instanceof MTrimBar) && parent != null) { parent = parent.getParent(); } - switch (((MTrimBar) parent).getSide()) { - case BOTTOM: - contribution.setCurSide(SWT.BOTTOM); - break; - case LEFT: - contribution.setCurSide(SWT.LEFT); - break; - case RIGHT: - contribution.setCurSide(SWT.RIGHT); - break; - case TOP: + if (parent instanceof MTrimBar) { + switch (((MTrimBar) parent).getSide()) { + case BOTTOM: + contribution.setCurSide(SWT.BOTTOM); + break; + case LEFT: + contribution.setCurSide(SWT.LEFT); + break; + case RIGHT: + contribution.setCurSide(SWT.RIGHT); + break; + case TOP: + contribution.setCurSide(SWT.TOP); + break; + } + } else { + // default position contribution.setCurSide(SWT.TOP); - break; } contribution.delegateCreateControl(composite); |