From commits-return-47652-apmail-directory-commits-archive=directory.apache.org@directory.apache.org Fri Mar 10 05:20:03 2017 Return-Path: X-Original-To: apmail-directory-commits-archive@www.apache.org Delivered-To: apmail-directory-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 9166619755 for ; Fri, 10 Mar 2017 05:20:03 +0000 (UTC) Received: (qmail 93136 invoked by uid 500); 10 Mar 2017 05:20:03 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 93047 invoked by uid 500); 10 Mar 2017 05:20:02 -0000 Mailing-List: contact commits-help@directory.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@directory.apache.org Delivered-To: mailing list commits@directory.apache.org Received: (qmail 93038 invoked by uid 99); 10 Mar 2017 05:20:01 -0000 Received: from Unknown (HELO svn01-us-west.apache.org) (209.188.14.144) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 10 Mar 2017 05:20:01 +0000 Received: from svn01-us-west.apache.org (localhost [127.0.0.1]) by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org) with ESMTP id 3DDEA3A0112 for ; Fri, 10 Mar 2017 05:20:01 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1786286 - /directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/valueeditors/TextValueEditor.java Date: Fri, 10 Mar 2017 05:20:00 -0000 To: commits@directory.apache.org From: elecharny@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20170310052001.3DDEA3A0112@svn01-us-west.apache.org> Author: elecharny Date: Fri Mar 10 05:20:00 2017 New Revision: 1786286 URL: http://svn.apache.org/viewvc?rev=1786286&view=rev Log: Slight cleanup Modified: directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/valueeditors/TextValueEditor.java Modified: directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/valueeditors/TextValueEditor.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/valueeditors/TextValueEditor.java?rev=1786286&r1=1786285&r2=1786286&view=diff ============================================================================== --- directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/valueeditors/TextValueEditor.java (original) +++ directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/valueeditors/TextValueEditor.java Fri Mar 10 05:20:00 2017 @@ -32,25 +32,29 @@ import org.eclipse.swt.widgets.Shell; */ public class TextValueEditor extends AbstractDialogStringValueEditor { - /** * {@inheritDoc} * * This implementation opens the TextDialog. */ + @Override public boolean openDialog( Shell shell ) { Object value = getValue(); + if ( value instanceof String ) { TextDialog dialog = new TextDialog( shell, ( String ) value ); - if ( dialog.open() == TextDialog.OK && !"".equals( dialog.getText() ) ) //$NON-NLS-1$ + String text = dialog.getText(); + + if ( ( dialog.open() == TextDialog.OK ) && ( text != null ) && ( text.length() != 0 ) ) { - setValue( dialog.getText() ); + setValue( text ); + return true; } } + return false; } - }