Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 62707 invoked from network); 12 Oct 2009 11:51:09 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 12 Oct 2009 11:51:09 -0000 Received: (qmail 16531 invoked by uid 500); 12 Oct 2009 11:51:09 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 16470 invoked by uid 500); 12 Oct 2009 11:51: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 16461 invoked by uid 99); 12 Oct 2009 11:51:09 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 12 Oct 2009 11:51:09 +0000 X-ASF-Spam-Status: No, hits=-2.6 required=5.0 tests=BAYES_00 X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 12 Oct 2009 11:51:07 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 4DCAC23888E3; Mon, 12 Oct 2009 11:50:47 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r824302 - in /directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio: entryeditors/EntryEditorManager.java ldapbrowser/ui/editors/entry/EntryEditor.java Date: Mon, 12 Oct 2009 11:50:47 -0000 To: commits@directory.apache.org From: seelmann@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20091012115047.4DCAC23888E3@eris.apache.org> Author: seelmann Date: Mon Oct 12 11:50:46 2009 New Revision: 824302 URL: http://svn.apache.org/viewvc?rev=824302&view=rev Log: Fixed issue with lost focus after modification Modified: directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/entryeditors/EntryEditorManager.java directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/entry/EntryEditor.java Modified: directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/entryeditors/EntryEditorManager.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/entryeditors/EntryEditorManager.java?rev=824302&r1=824301&r2=824302&view=diff ============================================================================== --- directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/entryeditors/EntryEditorManager.java (original) +++ directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/entryeditors/EntryEditorManager.java Mon Oct 12 11:50:46 2009 @@ -391,6 +391,11 @@ // don't care if status is ok or not: always update updateAutoSaveSharedReferenceCopy( originalEntry ); updateAutoSaveSharedWorkingCopy( originalEntry ); + List editors = getAutoSaveEditors( autoSaveSharedWorkingCopy ); + for ( IEntryEditor editor : editors ) + { + editor.workingCopyModified( event.getSource() ); + } } } } Modified: directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/entry/EntryEditor.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/entry/EntryEditor.java?rev=824302&r1=824301&r2=824302&view=diff ============================================================================== --- directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/entry/EntryEditor.java (original) +++ directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/entry/EntryEditor.java Mon Oct 12 11:50:46 2009 @@ -387,10 +387,7 @@ */ public void workingCopyModified( Object source ) { - if ( isAutoSave() ) - { - setEntryEditorWidgetInput( getEntryEditorInput() ); - } + setEntryEditorWidgetInput( getEntryEditorInput() ); if ( !isAutoSave() ) { // mark as dirty only @@ -406,7 +403,8 @@ */ private void setEntryEditorWidgetInput( EntryEditorInput eei ) { - if ( mainWidget != null ) + // don't update input if an cell editor is active + if ( mainWidget != null && !mainWidget.getViewer().isCellEditorActive() ) { // set input, remember old selection and set it afterwards ISelection selection = mainWidget.getViewer().getSelection();