X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.eclipse.ui%2Fsrc%2Forg%2Fargeo%2Feclipse%2Fui%2FEclipseUiUtils.java;h=95b45fed6de36847c67c23afe7c4d2378a9a8565;hb=c53fec78daddb69c489686844188036b04e1615a;hp=c75c5d810254916851160e9ad1e7f7f9b35a4bfc;hpb=a3c54905279e058f512ef83a4b3968005d51f352;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/EclipseUiUtils.java b/org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/EclipseUiUtils.java
index c75c5d810..95b45fed6 100644
--- a/org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/EclipseUiUtils.java
+++ b/org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/EclipseUiUtils.java
@@ -1,18 +1,3 @@
-/*
- * Copyright (C) 2007-2012 Argeo GmbH
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *         http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
 package org.argeo.eclipse.ui;
 
 import org.eclipse.jface.resource.JFaceResources;
@@ -38,13 +23,34 @@ public class EclipseUiUtils {
 	}
 
 	/**
-	 * Enables efficient call to the layout method of a composite, refreshing
-	 * only some of the children controls.
+	 * Enables efficient call to the layout method of a composite, refreshing only
+	 * some of the children controls.
 	 */
 	public static void layout(Composite parent, Control... toUpdateControls) {
 		parent.layout(toUpdateControls);
 	}
 
+	//
+	// FONTS
+	//
+	/** Shortcut to retrieve default italic font from display */
+	public static Font getItalicFont(Composite parent) {
+		return JFaceResources.getFontRegistry().defaultFontDescriptor().setStyle(SWT.ITALIC)
+				.createFont(parent.getDisplay());
+	}
+
+	/** Shortcut to retrieve default bold font from display */
+	public static Font getBoldFont(Composite parent) {
+		return JFaceResources.getFontRegistry().defaultFontDescriptor().setStyle(SWT.BOLD)
+				.createFont(parent.getDisplay());
+	}
+
+	/** Shortcut to retrieve default bold italic font from display */
+	public static Font getBoldItalicFont(Composite parent) {
+		return JFaceResources.getFontRegistry().defaultFontDescriptor().setStyle(SWT.BOLD | SWT.ITALIC)
+				.createFont(parent.getDisplay());
+	}
+
 	//
 	// Simplify grid layouts management
 	//
@@ -52,6 +58,10 @@ public class EclipseUiUtils {
 		return noSpaceGridLayout(new GridLayout());
 	}
 
+	public static GridLayout noSpaceGridLayout(int columns) {
+		return noSpaceGridLayout(new GridLayout(columns, false));
+	}
+
 	public static GridLayout noSpaceGridLayout(GridLayout layout) {
 		layout.horizontalSpacing = 0;
 		layout.verticalSpacing = 0;
@@ -78,10 +88,8 @@ public class EclipseUiUtils {
 		return new GridData(SWT.FILL, SWT.FILL, true, true, colSpan, rowSpan);
 	}
 
-	public static GridData grabWidth(int horizontalAlignment,
-			int verticalAlignment) {
-		return new GridData(horizontalAlignment, horizontalAlignment, true,
-				false);
+	public static GridData grabWidth(int horizontalAlignment, int verticalAlignment) {
+		return new GridData(horizontalAlignment, horizontalAlignment, true, false);
 	}
 
 	//
@@ -102,24 +110,23 @@ public class EclipseUiUtils {
 	}
 
 	/**
-	 * Create a label and a text field for a grid layout, the text field
-	 * grabbing excess horizontal
+	 * Create a label and a text field for a grid layout, the text field grabbing
+	 * excess horizontal
 	 * 
 	 * @param parent
 	 *            the parent composite
 	 * @param label
 	 *            the label to display
 	 * @param modifyListener
-	 *            a {@link ModifyListener} to listen on events on the text, can
-	 *            be null
+	 *            a {@link ModifyListener} to listen on events on the text, can be
+	 *            null
 	 * @return the created text
 	 * 
 	 */
 	// FIXME why was this deprecated.
 	// * @ deprecated use { @ link #createGridLT(Composite, String)} instead
 	// @ Deprecated
-	public static Text createGridLT(Composite parent, String label,
-			ModifyListener modifyListener) {
+	public static Text createGridLT(Composite parent, String label, ModifyListener modifyListener) {
 		Label lbl = new Label(parent, SWT.LEAD);
 		lbl.setText(label);
 		lbl.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, false, false));
@@ -131,16 +138,16 @@ public class EclipseUiUtils {
 	}
 
 	/**
-	 * Create a label and a text field for a grid layout, the text field
-	 * grabbing excess horizontal
+	 * Create a label and a text field for a grid layout, the text field grabbing
+	 * excess horizontal
 	 */
 	public static Text createGridLT(Composite parent, String label) {
 		return createGridLT(parent, label, null);
 	}
 
 	/**
-	 * Creates one label and a text field not editable with background colour of
-	 * the parent (like a label but with selectable text)
+	 * Creates one label and a text field not editable with background colour of the
+	 * parent (like a label but with selectable text)
 	 */
 	public static Text createGridLL(Composite parent, String label, String text) {
 		Text txt = createGridLT(parent, label);
@@ -151,11 +158,19 @@ public class EclipseUiUtils {
 	}
 
 	/**
-	 * Create a label and a text field with password display for a grid layout,
-	 * the text field grabbing excess horizontal
+	 * Create a label and a text field with password display for a grid layout, the
+	 * text field grabbing excess horizontal
 	 */
-	public static Text createGridLP(Composite parent, String label,
-			ModifyListener modifyListener) {
+	public static Text createGridLP(Composite parent, String label) {
+		return createGridLP(parent, label, null);
+	}
+
+	/**
+	 * Create a label and a text field with password display for a grid layout, the
+	 * text field grabbing excess horizontal. The given modify listener will be
+	 * added to the newly created text field if not null.
+	 */
+	public static Text createGridLP(Composite parent, String label, ModifyListener modifyListener) {
 		Label lbl = new Label(parent, SWT.LEAD);
 		lbl.setText(label);
 		lbl.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, false, false));
@@ -166,25 +181,15 @@ public class EclipseUiUtils {
 		return txt;
 	}
 
-	//
-	// FONTS
-	//
-	/** Shortcut to retrieve default italic font from display */
-	public static Font getItalicFont(Composite parent) {
-		return JFaceResources.getFontRegistry().defaultFontDescriptor()
-				.setStyle(SWT.ITALIC).createFont(parent.getDisplay());
-	}
+	// MISCELLANEOUS
 
-	/** Shortcut to retrieve default bold font from display */
-	public static Font getBoldFont(Composite parent) {
-		return JFaceResources.getFontRegistry().defaultFontDescriptor()
-				.setStyle(SWT.BOLD).createFont(parent.getDisplay());
+	/** Simply checks if a string is not null nor empty */
+	public static boolean notEmpty(String stringToTest) {
+		return !(stringToTest == null || "".equals(stringToTest.trim()));
 	}
 
-	/** Shortcut to retrieve default bold italic font from display */
-	public static Font getBoldItalicFont(Composite parent) {
-		return JFaceResources.getFontRegistry().defaultFontDescriptor()
-				.setStyle(SWT.BOLD | SWT.ITALIC)
-				.createFont(parent.getDisplay());
+	/** Simply checks if a string is null or empty */
+	public static boolean isEmpty(String stringToTest) {
+		return stringToTest == null || "".equals(stringToTest.trim());
 	}
 }
\ No newline at end of file