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 CBF001881A for ; Tue, 28 Jul 2015 04:59:12 +0000 (UTC) Received: (qmail 44907 invoked by uid 500); 28 Jul 2015 04:59:09 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 44848 invoked by uid 500); 28 Jul 2015 04:59:09 -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 44839 invoked by uid 99); 28 Jul 2015 04:59:09 -0000 Received: from eris.apache.org (HELO hades.apache.org) (140.211.11.105) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 28 Jul 2015 04:59:09 +0000 Received: from hades.apache.org (localhost [127.0.0.1]) by hades.apache.org (ASF Mail Server at hades.apache.org) with ESMTP id 6F163AC0024 for ; Tue, 28 Jul 2015 04:59:09 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1692993 - in /directory/studio/trunk/plugins/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor: actions/AbstractOpenValueEditorAction.java reconciler/LdifReconcilingStrategy.java Date: Tue, 28 Jul 2015 04:59:08 -0000 To: commits@directory.apache.org From: elecharny@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20150728045909.6F163AC0024@hades.apache.org> Author: elecharny Date: Tue Jul 28 04:59:08 2015 New Revision: 1692993 URL: http://svn.apache.org/r1692993 Log: o Removed useless checked on x != null when && ( x instanceof X ) o Same for check of x == null when && !( x instanceof X ) Modified: directory/studio/trunk/plugins/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/actions/AbstractOpenValueEditorAction.java directory/studio/trunk/plugins/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/reconciler/LdifReconcilingStrategy.java Modified: directory/studio/trunk/plugins/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/actions/AbstractOpenValueEditorAction.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/actions/AbstractOpenValueEditorAction.java?rev=1692993&r1=1692992&r2=1692993&view=diff ============================================================================== --- directory/studio/trunk/plugins/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/actions/AbstractOpenValueEditorAction.java (original) +++ directory/studio/trunk/plugins/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/actions/AbstractOpenValueEditorAction.java Tue Jul 28 04:59:08 2015 @@ -87,11 +87,12 @@ public abstract class AbstractOpenValueE cellEditor.activate(); Object newValue = cellEditor.getValue(); - if ( newValue != null && newValue instanceof String || newValue instanceof byte[] ) + if ( ( newValue instanceof String ) || ( newValue instanceof byte[] ) ) { IDocument document = editor.getDocumentProvider().getDocument( editor.getEditorInput() ); LdifValueLineBase newLine; + if ( line instanceof LdifControlLine ) { LdifControlLine oldControlLine = ( LdifControlLine ) line; Modified: directory/studio/trunk/plugins/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/reconciler/LdifReconcilingStrategy.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/reconciler/LdifReconcilingStrategy.java?rev=1692993&r1=1692992&r2=1692993&view=diff ============================================================================== --- directory/studio/trunk/plugins/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/reconciler/LdifReconcilingStrategy.java (original) +++ directory/studio/trunk/plugins/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/reconciler/LdifReconcilingStrategy.java Tue Jul 28 04:59:08 2015 @@ -109,7 +109,7 @@ public class LdifReconcilingStrategy imp // notify outline IContentOutlinePage outline = ( IContentOutlinePage ) editor.getAdapter( IContentOutlinePage.class ); - if ( outline != null && outline instanceof LdifOutlinePage ) + if ( outline instanceof LdifOutlinePage ) { ( ( LdifOutlinePage ) outline ).refresh(); }