Organized imports

[phpeclipse.git] / net.sourceforge.phpeclipse / src / net / sourceforge / phpdt / internal / ui / util / SWTUtil.java

diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/util/SWTUtil.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/util/SWTUtil.java
index ffdd686..f45e83c 100644 (file)
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/util/SWTUtil.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/util/SWTUtil.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
+ * Copyright (c) 2000, 2004 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials 
  * are made available under the terms of the Common Public License v1.0
  * which accompanies this distribution, and is available at
@@ -11,6 +11,9 @@
 package net.sourceforge.phpdt.internal.ui.util;
 
 
+import org.eclipse.jface.dialogs.IDialogConstants;
+import org.eclipse.jface.resource.JFaceResources;
+import org.eclipse.jface.util.Assert;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.dnd.DragSource;
 import org.eclipse.swt.dnd.DropTarget;
@@ -25,10 +28,6 @@ import org.eclipse.swt.widgets.Shell;
 import org.eclipse.swt.widgets.Table;
 import org.eclipse.swt.widgets.Widget;
 
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.resource.JFaceResources;
-import org.eclipse.jface.util.Assert;
-
 /**
  * Utility class to simplify access to some SWT resources. 
  */
@@ -75,8 +74,7 @@ public class SWTUtil {
         * Returns a width hint for a button control.
         */
        public static int getButtonWidthHint(Button button) {
-               if (button.getFont().equals(JFaceResources.getDefaultFont()))
-                       button.setFont(JFaceResources.getDialogFont());
+               button.setFont(JFaceResources.getDialogFont());
                PixelConverter converter= new PixelConverter(button);
                int widthHint= converter.convertHorizontalDLUsToPixels(IDialogConstants.BUTTON_WIDTH);
                return Math.max(widthHint, button.computeSize(SWT.DEFAULT, SWT.DEFAULT, true).x);
@@ -85,27 +83,26 @@ public class SWTUtil {
        /**
         * Returns a height hint for a button control.
         */             
-       public static int getButtonHeigthHint(Button button) {
-               if (button.getFont().equals(JFaceResources.getDefaultFont()))
-                       button.setFont(JFaceResources.getDialogFont());
+       public static int getButtonHeightHint(Button button) {
+               button.setFont(JFaceResources.getDialogFont());
                PixelConverter converter= new PixelConverter(button);
                return converter.convertVerticalDLUsToPixels(IDialogConstants.BUTTON_HEIGHT);
-       }       
-
+       }
        
        /**
         * Sets width and height hint for the button control.
         * <b>Note:</b> This is a NOP if the button's layout data is not
         * an instance of <code>GridData</code>.
         * 
-        * @param       the button for which to set the dimension hint
+        * @param button        the button for which to set the dimension hint
         */             
        public static void setButtonDimensionHint(Button button) {
                Assert.isNotNull(button);
                Object gd= button.getLayoutData();
                if (gd instanceof GridData) {
-                       ((GridData)gd).heightHint= getButtonHeigthHint(button);
-                       ((GridData)gd).widthHint= getButtonWidthHint(button);            
+                       ((GridData)gd).heightHint= getButtonHeightHint(button);
+                       ((GridData)gd).widthHint= getButtonWidthHint(button);   
+                       ((GridData)gd).horizontalAlignment = GridData.FILL;      
                }
        }