Author: adietish Date: 2012-02-14 17:11:14 -0500 (Tue, 14 Feb 2012) New Revision: 38729 Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/utils/StringUtils.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/utils/UIUtils.java Log: [JBIDE-10901] fixing erroneous state when running wizard from console ("Import application") Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/utils/StringUtils.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/utils/StringUtils.java 2012-02-14 22:10:59 UTC (rev 38728) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/utils/StringUtils.java 2012-02-14 22:11:14 UTC (rev 38729) @@ -51,5 +51,13 @@ return System.getProperty(LINE_SEPARATOR_KEY); } + public static boolean isAlphaNumeric(String value) { + for (int i = 0; i < value.length(); ++i) { + if (!Character.isLetterOrDigit(value.charAt(i))) { + return false; + } + } + return true; + } } Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/utils/UIUtils.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/utils/UIUtils.java 2012-02-14 22:10:59 UTC (rev 38728) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/utils/UIUtils.java 2012-02-14 22:11:14 UTC (rev 38729) @@ -16,12 +16,16 @@ import org.eclipse.jface.action.IContributionManager; import org.eclipse.jface.action.IMenuManager; import org.eclipse.jface.action.MenuManager; +import org.eclipse.swt.SWT; import org.eclipse.swt.events.DisposeEvent; import org.eclipse.swt.events.DisposeListener; import org.eclipse.swt.events.FocusAdapter; import org.eclipse.swt.events.FocusEvent; +import org.eclipse.swt.events.FocusListener; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; +import org.eclipse.swt.widgets.Event; +import org.eclipse.swt.widgets.Listener; import org.eclipse.swt.widgets.Menu; import org.eclipse.swt.widgets.Text; import org.eclipse.ui.IWorkbenchActionConstants; @@ -34,14 +38,47 @@ public class UIUtils { public static void selectAllOnFocus(final Text text) { - text.addFocusListener(new FocusAdapter() { + final FocusListener onFocus = new FocusAdapter() { @Override public void focusGained(FocusEvent e) { text.selectAll(); } + }; + text.addFocusListener(onFocus); + text.addDisposeListener(new DisposeListener() { + + @Override + public void widgetDisposed(DisposeEvent e) { + text.removeFocusListener(onFocus); + } }); + } + /** + * Ensures that the given text gets the focus if the given control is + * selected. + * + * @param control + * @param text + */ + public static void focusOnSelection(final Control control, final Text text) { + final Listener onSelect = new Listener() { + + @Override + public void handleEvent(Event event) { + text.selectAll(); + text.setFocus(); + } + }; + control.addListener(SWT.Selection, onSelect); + control.addDisposeListener(new DisposeListener() { + + @Override + public void widgetDisposed(DisposeEvent e) { + control.removeListener(SWT.Selection, onSelect); + } + }); } /**