From e0b55f83c41368fbc1b6a6cdaae0ba746059f49e Mon Sep 17 00:00:00 2001 From: David Dykstal Date: Wed, 8 Nov 2006 15:34:14 +0000 Subject: [PATCH] Bug 163815 - Fixed NPE caused by lack of GridData for non-drawn inherit button controls. Added GridData for the control - some hints may be ignored on non-drawn platforms. --- .../UI/org/eclipse/rse/ui/widgets/InheritButton.java | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/widgets/InheritButton.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/widgets/InheritButton.java index 6591ffa321b..866e4253657 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/widgets/InheritButton.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/widgets/InheritButton.java @@ -76,12 +76,10 @@ public class InheritButton extends Composite { public InheritButton(Composite parent) { super(parent, SWT.NONE); isDrawn = System.getProperty("os.name").toLowerCase().startsWith("win"); - if (isDrawn) { - GridData data = new GridData(SWT.CENTER, SWT.CENTER, false, false); - data.widthHint = DEFAULT_WIDTH; - data.heightHint = DEFAULT_HEIGHT; - setLayoutData(data); - } + GridData data = new GridData(SWT.CENTER, SWT.CENTER, false, false); + data.widthHint = DEFAULT_WIDTH; + data.heightHint = DEFAULT_HEIGHT; + setLayoutData(data); GridLayout layout = new GridLayout(); layout.marginHeight = 0; layout.marginWidth = 0;