You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by se...@apache.org on 2009/10/12 13:50:47 UTC

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

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<IEntryEditor> 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();