directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From seelm...@apache.org
Subject svn commit: r814009 [3/3] - in /directory/studio/trunk: ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/actions/ ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/ ldapbr...
Date Fri, 11 Sep 2009 20:12:00 GMT
Modified: directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/SearchResultEditorPasteAction.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/SearchResultEditorPasteAction.java?rev=814009&r1=814008&r2=814009&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/SearchResultEditorPasteAction.java
(original)
+++ directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/SearchResultEditorPasteAction.java
Fri Sep 11 20:11:30 2009
@@ -23,11 +23,11 @@
 
 import org.apache.directory.studio.ldapbrowser.common.actions.PasteAction;
 import org.apache.directory.studio.ldapbrowser.common.dnd.ValuesTransfer;
-import org.apache.directory.studio.ldapbrowser.core.jobs.CreateValuesJob;
 import org.apache.directory.studio.ldapbrowser.core.model.IAttribute;
 import org.apache.directory.studio.ldapbrowser.core.model.IEntry;
 import org.apache.directory.studio.ldapbrowser.core.model.IValue;
 import org.apache.directory.studio.ldapbrowser.core.model.impl.Value;
+import org.apache.directory.studio.ldapbrowser.core.utils.CompoundModification;
 
 
 /**
@@ -92,7 +92,7 @@
                 newValues[v] = new Value( attribute, values[v].getRawValue() );
             }
 
-            new CreateValuesJob( entry, newValues ).execute();
+            new CompoundModification().createValues( entry, newValues );
         }
     }
 

Modified: directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/views/browser/BrowserViewUniversalListener.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/views/browser/BrowserViewUniversalListener.java?rev=814009&r1=814008&r2=814009&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/views/browser/BrowserViewUniversalListener.java
(original)
+++ directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/views/browser/BrowserViewUniversalListener.java
Fri Sep 11 20:11:30 2009
@@ -21,7 +21,6 @@
 package org.apache.directory.studio.ldapbrowser.ui.views.browser;
 
 
-import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -53,6 +52,7 @@
 import org.apache.directory.studio.ldapbrowser.core.model.IRootDSE;
 import org.apache.directory.studio.ldapbrowser.core.model.ISearch;
 import org.apache.directory.studio.ldapbrowser.core.model.ISearchResult;
+import org.apache.directory.studio.ldapbrowser.core.model.impl.DummyEntry;
 import org.apache.directory.studio.ldapbrowser.ui.BrowserUIConstants;
 import org.apache.directory.studio.ldapbrowser.ui.BrowserUIPlugin;
 import org.apache.directory.studio.ldapbrowser.ui.editors.searchresult.SearchResultEditor;
@@ -573,7 +573,7 @@
             }
             viewer.refresh( event.getModifiedEntry(), true );
         }
-        else
+        else if ( !( event.getModifiedEntry() instanceof DummyEntry ) )
         {
             viewer.refresh( event.getModifiedEntry(), true );
         }

Modified: directory/studio/trunk/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/LdifEditor.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/LdifEditor.java?rev=814009&r1=814008&r2=814009&view=diff
==============================================================================
--- directory/studio/trunk/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/LdifEditor.java
(original)
+++ directory/studio/trunk/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/LdifEditor.java
Fri Sep 11 20:11:30 2009
@@ -240,7 +240,7 @@
         ConnectionEventRegistry.addConnectionUpdateListener( this, ConnectionUIPlugin.getDefault().getEventRunner()
);
         getSite().getPage().addPartListener( this );
 
-        this.valueEditorManager = new ValueEditorManager( getSite().getShell() );
+        this.valueEditorManager = new ValueEditorManager( getSite().getShell(), false );
     }
 
 
@@ -600,9 +600,12 @@
      */
     public final void connectionUpdated( Connection connection )
     {
-        IBrowserConnection browserConnection = browserConnectionWidget.getBrowserConnection();
-        setConnection( browserConnection );
-        browserConnectionWidget.setBrowserConnection( browserConnection );
+        if ( browserConnectionWidget != null )
+        {
+            IBrowserConnection browserConnection = browserConnectionWidget.getBrowserConnection();
+            setConnection( browserConnection );
+            browserConnectionWidget.setBrowserConnection( browserConnection );
+        }
     }
 
 

Modified: directory/studio/trunk/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/actions/EditLdifAttributeAction.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/actions/EditLdifAttributeAction.java?rev=814009&r1=814008&r2=814009&view=diff
==============================================================================
--- directory/studio/trunk/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/actions/EditLdifAttributeAction.java
(original)
+++ directory/studio/trunk/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/actions/EditLdifAttributeAction.java
Fri Sep 11 20:11:30 2009
@@ -44,7 +44,6 @@
 import org.apache.directory.studio.ldifparser.model.lines.LdifModSpecSepLine;
 import org.apache.directory.studio.ldifparser.model.lines.LdifModSpecTypeLine;
 import org.apache.directory.studio.ldifparser.model.lines.LdifValueLineBase;
-import org.apache.directory.studio.valueeditors.ValueEditorManager;
 import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.BadLocationException;
 import org.eclipse.jface.text.IDocument;
@@ -55,15 +54,10 @@
 public class EditLdifAttributeAction extends AbstractLdifAction
 {
 
-    ValueEditorManager manager;
-
-
     public EditLdifAttributeAction( LdifEditor editor )
     {
         super( Messages.getString("EditLdifAttributeAction.EditAttributeDescription"), editor
); //$NON-NLS-1$
         super.setActionDefinitionId( BrowserCommonConstants.ACTION_ID_EDIT_ATTRIBUTE_DESCRIPTION
);
-
-        manager = new ValueEditorManager( editor.getSite().getShell() );
     }
 
 



Mime
View raw message