You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by ak...@apache.org on 2011/01/23 02:17:26 UTC
svn commit: r1062306 [30/32] - in /directory:
apacheds-manuals/trunk/src/advanced-user-guide/
apacheds-manuals/trunk/src/basic-user-guide/
apacheds/trunk/core-annotations/src/main/java/org/apache/directory/server/core/factory/
apacheds/trunk/core-api/s...
Modified: directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/search/EntryWidget.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/search/EntryWidget.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/search/EntryWidget.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/search/EntryWidget.java Sun Jan 23 01:17:06 2011
@@ -22,7 +22,7 @@ package org.apache.directory.studio.ldap
import org.apache.directory.shared.ldap.exception.LdapInvalidDnException;
-import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.name.Dn;
import org.apache.directory.studio.common.ui.widgets.BaseWidgetUtils;
import org.apache.directory.studio.connection.core.DnUtils;
import org.apache.directory.studio.connection.ui.RunnableContextRunner;
@@ -49,9 +49,9 @@ import org.eclipse.swt.widgets.Composite
* The EntryWidget could be used to select an entry.
* It is composed
* <ul>
- * <li>a combo to manually enter an DN or to choose one from
+ * <li>a combo to manually enter an Dn or to choose one from
* the history
- * <li>an up button to switch to the parent's DN
+ * <li>an up button to switch to the parent's Dn
* <li>a browse button to open a {@link SelectEntryDialog}
* </ul>
*
@@ -60,7 +60,7 @@ import org.eclipse.swt.widgets.Composite
public class EntryWidget extends BrowserWidget
{
- /** The DN combo. */
+ /** The Dn combo. */
private Combo dnCombo;
/** The up button. */
@@ -72,11 +72,11 @@ public class EntryWidget extends Browser
/** The connection. */
private IBrowserConnection browserConnection;
- /** The selected DN. */
- private DN dn;
+ /** The selected Dn. */
+ private Dn dn;
/** The suffix. */
- private DN suffix;
+ private Dn suffix;
/** Flag indicating if using local name for the dn */
boolean useLocalName;
@@ -96,9 +96,9 @@ public class EntryWidget extends Browser
* Creates a new instance of EntryWidget.
*
* @param browserConnection the connection
- * @param dn the initial DN
+ * @param dn the initial Dn
*/
- public EntryWidget( IBrowserConnection browserConnection, DN dn )
+ public EntryWidget( IBrowserConnection browserConnection, Dn dn )
{
this( browserConnection, dn, null, false );
}
@@ -108,11 +108,11 @@ public class EntryWidget extends Browser
* Creates a new instance of EntryWidget.
*
* @param browserConnection the connection
- * @param dn the initial DN
+ * @param dn the initial Dn
* @param suffix the suffix
- * @param useLocalName true to use local name for the DN
+ * @param useLocalName true to use local name for the Dn
*/
- public EntryWidget( IBrowserConnection browserConnection, DN dn, DN suffix, boolean useLocalName )
+ public EntryWidget( IBrowserConnection browserConnection, Dn dn, Dn suffix, boolean useLocalName )
{
this.browserConnection = browserConnection;
this.dn = dn;
@@ -129,7 +129,7 @@ public class EntryWidget extends Browser
public void createWidget( final Composite parent )
{
- // DN combo
+ // Dn combo
Composite textAndUpComposite = BaseWidgetUtils.createColumnContainer( parent, 2, 1 );
dnCombo = BaseWidgetUtils.createCombo( textAndUpComposite, new String[0], -1, 1 );
GridData gd = new GridData( GridData.FILL_HORIZONTAL );
@@ -137,7 +137,7 @@ public class EntryWidget extends Browser
gd.widthHint = 200;
dnCombo.setLayoutData( gd );
- // DN history
+ // Dn history
String[] history = HistoryUtils.load( BrowserCommonConstants.DIALOGSETTING_KEY_DN_HISTORY );
dnCombo.setItems( history );
dnCombo.addModifyListener( new ModifyListener()
@@ -146,7 +146,7 @@ public class EntryWidget extends Browser
{
try
{
- dn = new DN( dnCombo.getText() );
+ dn = new Dn( dnCombo.getText() );
}
catch ( LdapInvalidDnException e1 )
{
@@ -198,24 +198,24 @@ public class EntryWidget extends Browser
}
}
- // calculate initial DN
- DN initialDN = dn;
+ // calculate initial Dn
+ Dn initialDn = dn;
if ( useLocalName && suffix != null && suffix.size() > 0 )
{
- if ( initialDN != null && initialDN.size() > 0 )
+ if ( initialDn != null && initialDn.size() > 0 )
{
- initialDN = DnUtils.composeDn( initialDN, suffix );
+ initialDn = DnUtils.composeDn(initialDn, suffix );
}
}
// get initial entry
IEntry entry = rootEntry;
- if ( initialDN != null && initialDN.size() > 0 )
+ if ( initialDn != null && initialDn.size() > 0 )
{
- entry = browserConnection.getEntryFromCache( initialDN );
+ entry = browserConnection.getEntryFromCache(initialDn);
if ( entry == null )
{
- ReadEntryRunnable runnable = new ReadEntryRunnable( browserConnection, initialDN );
+ ReadEntryRunnable runnable = new ReadEntryRunnable( browserConnection, initialDn);
RunnableContextRunner.execute( runnable, null, true );
entry = runnable.getReadEntry();
}
@@ -227,7 +227,7 @@ public class EntryWidget extends Browser
dialog.open();
IEntry selectedEntry = dialog.getSelectedEntry();
- // get selected DN
+ // get selected Dn
if ( selectedEntry != null )
{
dn = selectedEntry.getDn();
@@ -249,7 +249,7 @@ public class EntryWidget extends Browser
/**
- * Notifies that the DN has been changed.
+ * Notifies that the Dn has been changed.
*/
private void dnChanged()
{
@@ -298,22 +298,22 @@ public class EntryWidget extends Browser
/**
- * Gets the suffix DN or <code>null</code> if not set.
+ * Gets the suffix Dn or <code>null</code> if not set.
*
- * @return the suffix DN or <code>null</code> if not set
+ * @return the suffix Dn or <code>null</code> if not set
*/
- public DN getSuffix()
+ public Dn getSuffix()
{
return suffix;
}
/**
- * Gets the DN or <code>null</code> if the DN isn't valid.
+ * Gets the Dn or <code>null</code> if the Dn isn't valid.
*
- * @return the DN or <code>null</code> if the DN isn't valid
+ * @return the Dn or <code>null</code> if the Dn isn't valid
*/
- public DN getDn()
+ public Dn getDn()
{
return dn;
}
@@ -333,10 +333,10 @@ public class EntryWidget extends Browser
/**
* Sets the input.
*
- * @param dn the DN
+ * @param dn the Dn
* @param browserConnection the connection
*/
- public void setInput( IBrowserConnection browserConnection, DN dn )
+ public void setInput( IBrowserConnection browserConnection, Dn dn )
{
setInput( browserConnection, dn, null, false );
}
@@ -346,11 +346,11 @@ public class EntryWidget extends Browser
* Sets the input.
*
* @param browserConnection the connection
- * @param dn the DN
+ * @param dn the Dn
* @param suffix the suffix
- * @param useLocalName true to use local name for the DN
+ * @param useLocalName true to use local name for the Dn
*/
- public void setInput( IBrowserConnection browserConnection, DN dn, DN suffix, boolean useLocalName )
+ public void setInput( IBrowserConnection browserConnection, Dn dn, Dn suffix, boolean useLocalName )
{
if ( this.browserConnection != browserConnection || this.dn != dn || this.suffix != suffix )
{
Modified: directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/search/SearchPageWrapper.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/search/SearchPageWrapper.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/search/SearchPageWrapper.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/search/SearchPageWrapper.java Sun Jan 23 01:17:06 2011
@@ -29,7 +29,7 @@ import java.util.List;
import java.util.Set;
import org.apache.directory.shared.ldap.constants.SchemaConstants;
-import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.name.Dn;
import org.apache.directory.shared.ldap.schema.AttributeType;
import org.apache.directory.studio.common.ui.widgets.BaseWidgetUtils;
import org.apache.directory.studio.connection.core.Connection;
@@ -102,10 +102,10 @@ public class SearchPageWrapper extends B
/** Style for read-only returning attributes field */
public static final int RETURNINGATTRIBUTES_READONLY = 1 << 10;
- /** Style for visible return DN checkbox */
+ /** Style for visible return Dn checkbox */
public static final int RETURN_DN_VISIBLE = 1 << 11;
- /** Style for checked return DN checkbox */
+ /** Style for checked return Dn checkbox */
public static final int RETURN_DN_CHECKED = 1 << 12;
/** Style for visible return all attributes checkbox */
@@ -662,7 +662,7 @@ public class SearchPageWrapper extends B
if ( search.getBrowserConnection() != null )
{
IBrowserConnection browserConnection = search.getBrowserConnection();
- DN searchBase = search.getSearchBase();
+ Dn searchBase = search.getSearchBase();
if ( browserConnectionWidget != null )
{
Modified: directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/wizards/NewEntryAttributesWizardPage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/wizards/NewEntryAttributesWizardPage.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/wizards/NewEntryAttributesWizardPage.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/wizards/NewEntryAttributesWizardPage.java Sun Jan 23 01:17:06 2011
@@ -184,7 +184,7 @@ public class NewEntryAttributesWizardPag
// remove empty must attributes
// necessary when navigating back, modifying object classes
- // and DN and navigation forward again.
+ // and Dn and navigation forward again.
Collection<AttributeType> oldMusts = SchemaUtils.getMustAttributeTypeDescriptions( newEntry );
for ( AttributeType oldMust : oldMusts )
{
Modified: directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/wizards/NewEntryDnWizardPage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/wizards/NewEntryDnWizardPage.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/wizards/NewEntryDnWizardPage.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/wizards/NewEntryDnWizardPage.java Sun Jan 23 01:17:06 2011
@@ -28,9 +28,9 @@ import java.util.Iterator;
import org.apache.commons.lang.ArrayUtils;
import org.apache.directory.shared.ldap.constants.SchemaConstants;
import org.apache.directory.shared.ldap.exception.LdapInvalidDnException;
-import org.apache.directory.shared.ldap.name.AVA;
-import org.apache.directory.shared.ldap.name.DN;
-import org.apache.directory.shared.ldap.name.RDN;
+import org.apache.directory.shared.ldap.name.Ava;
+import org.apache.directory.shared.ldap.name.Dn;
+import org.apache.directory.shared.ldap.name.Rdn;
import org.apache.directory.shared.ldap.schema.AttributeType;
import org.apache.directory.studio.common.ui.widgets.BaseWidgetUtils;
import org.apache.directory.studio.connection.core.DnUtils;
@@ -74,13 +74,13 @@ public class NewEntryDnWizardPage extend
/** The wizard. */
private NewEntryWizard wizard;
- /** The DN builder widget. */
+ /** The Dn builder widget. */
private DnBuilderWidget dnBuilderWidget;
- /** The context entry DN combo. */
+ /** The context entry Dn combo. */
private Combo contextEntryDnCombo;
- /** The content proposal adapter for the context entry DN combo. */
+ /** The content proposal adapter for the context entry Dn combo. */
private ContentProposalAdapter contextEntryDnComboCPA;
@@ -131,7 +131,7 @@ public class NewEntryDnWizardPage extend
private void validate()
{
if ( wizard.isNewContextEntry() && !"".equals( contextEntryDnCombo.getText() ) //$NON-NLS-1$
- && DN.isValid( contextEntryDnCombo.getText() ) )
+ && Dn.isValid(contextEntryDnCombo.getText()) )
{
setPageComplete( true );
saveState();
@@ -150,7 +150,7 @@ public class NewEntryDnWizardPage extend
/**
- * Initializes the DN builder widget with the DN of
+ * Initializes the Dn builder widget with the Dn of
* the prototype entry. Called when this page becomes visible.
*/
private void loadState()
@@ -183,7 +183,7 @@ public class NewEntryDnWizardPage extend
Collection<AttributeType> atds = SchemaUtils.getAllAttributeTypeDescriptions( newEntry );
String[] attributeNames = SchemaUtils.getNames( atds ).toArray( ArrayUtils.EMPTY_STRING_ARRAY );
- DN parentDn = null;
+ Dn parentDn = null;
if ( wizard.getSelectedEntry() != null && newEntry.getDn().equals( wizard.getSelectedEntry().getDn() )
&& DnUtils.getParent( newEntry.getDn() ) != null )
{
@@ -198,7 +198,7 @@ public class NewEntryDnWizardPage extend
parentDn = DnUtils.getParent( newEntry.getDn() );
}
- RDN rdn = newEntry.getRdn();
+ Rdn rdn = newEntry.getRdn();
dnBuilderWidget.setInput( wizard.getSelectedConnection(), attributeNames, rdn, parentDn );
}
@@ -206,7 +206,7 @@ public class NewEntryDnWizardPage extend
/**
- * Saves the DN of the DN builder widget to the prototype entry.
+ * Saves the Dn of the Dn builder widget to the prototype entry.
*/
private void saveState()
{
@@ -216,13 +216,13 @@ public class NewEntryDnWizardPage extend
{
EventRegistry.suspendEventFiringInCurrentThread();
- // remove old RDN
+ // remove old Rdn
if ( newEntry.getRdn().size() > 0 )
{
- Iterator<AVA> atavIterator = newEntry.getRdn().iterator();
+ Iterator<Ava> atavIterator = newEntry.getRdn().iterator();
while ( atavIterator.hasNext() )
{
- AVA atav = atavIterator.next();
+ Ava atav = atavIterator.next();
IAttribute attribute = newEntry.getAttribute( atav.getUpType() );
if ( attribute != null )
{
@@ -247,17 +247,17 @@ public class NewEntryDnWizardPage extend
}
}
- // set new DN
- DN dn;
+ // set new Dn
+ Dn dn;
if ( wizard.isNewContextEntry() )
{
try
{
- dn = new DN( contextEntryDnCombo.getText() );
+ dn = new Dn( contextEntryDnCombo.getText() );
}
catch ( LdapInvalidDnException e )
{
- dn = DN.EMPTY_DN;
+ dn = Dn.EMPTY_DN;
}
}
else
@@ -266,13 +266,13 @@ public class NewEntryDnWizardPage extend
}
newEntry.setDn( dn );
- // add new RDN
+ // add new Rdn
if ( dn.getRdn().size() > 0 )
{
- Iterator<AVA> atavIterator = dn.getRdn().iterator();
+ Iterator<Ava> atavIterator = dn.getRdn().iterator();
while ( atavIterator.hasNext() )
{
- AVA atav = atavIterator.next();
+ Ava atav = atavIterator.next();
IAttribute rdnAttribute = newEntry.getAttribute( atav.getUpType() );
if ( rdnAttribute == null )
{
@@ -299,8 +299,8 @@ public class NewEntryDnWizardPage extend
/**
* {@inheritDoc}
*
- * This implementation initializes DN builder widghet with the
- * DN of the protoype entry.
+ * This implementation initializes Dn builder widghet with the
+ * Dn of the protoype entry.
*/
public void setVisible( boolean visible )
{
@@ -336,7 +336,7 @@ public class NewEntryDnWizardPage extend
* {@inheritDoc}
*
* This implementation invokes a {@link ReadEntryRunnable} to check if an
- * entry with the composed DN already exists.
+ * entry with the composed Dn already exists.
*/
public IWizardPage getNextPage()
{
@@ -344,9 +344,9 @@ public class NewEntryDnWizardPage extend
{
dnBuilderWidget.validate();
- RDN rdn = dnBuilderWidget.getRdn();
- DN parentDn = dnBuilderWidget.getParentDn();
- final DN dn = DnUtils.composeDn( rdn, parentDn );
+ Rdn rdn = dnBuilderWidget.getRdn();
+ Dn parentDn = dnBuilderWidget.getParentDn();
+ final Dn dn = DnUtils.composeDn( rdn, parentDn );
// check if parent exists
ReadEntryRunnable readEntryRunnable1 = new ReadEntryRunnable( wizard.getSelectedConnection(), parentDn );
@@ -392,7 +392,7 @@ public class NewEntryDnWizardPage extend
{
try
{
- final DN dn = new DN( contextEntryDnCombo.getText() );
+ final Dn dn = new Dn( contextEntryDnCombo.getText() );
// check that new entry does not exists yet
ReadEntryRunnable readEntryRunnable2 = new ReadEntryRunnable( wizard.getSelectedConnection(), dn );
Modified: directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/wizards/NewEntryTypeWizardPage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/wizards/NewEntryTypeWizardPage.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/wizards/NewEntryTypeWizardPage.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/wizards/NewEntryTypeWizardPage.java Sun Jan 23 01:17:06 2011
@@ -21,7 +21,7 @@
package org.apache.directory.studio.ldapbrowser.common.wizards;
-import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.name.Dn;
import org.apache.directory.studio.common.ui.widgets.BaseWidgetUtils;
import org.apache.directory.studio.connection.ui.RunnableContextRunner;
import org.apache.directory.studio.ldapbrowser.common.BrowserCommonActivator;
@@ -141,7 +141,7 @@ public class NewEntryTypeWizardPage exte
if ( templateButton.getSelection() )
{
final IBrowserConnection browserConnection = entryWidget.getBrowserConnection();
- final DN dn = entryWidget.getDn();
+ final Dn dn = entryWidget.getDn();
IEntry templateEntry = null;
if ( browserConnection == null )
@@ -173,7 +173,7 @@ public class NewEntryTypeWizardPage exte
return null;
}
- // check if selected DN exists
+ // check if selected Dn exists
ReadEntryRunnable readEntryRunnable = new ReadEntryRunnable( browserConnection, dn );
RunnableContextRunner.execute( readEntryRunnable, getContainer(), false );
templateEntry = readEntryRunnable.getReadEntry();
@@ -227,7 +227,7 @@ public class NewEntryTypeWizardPage exte
}
else
{
- wizard.setPrototypeEntry( new DummyEntry( new DN(), wizard.getSelectedConnection() ) );
+ wizard.setPrototypeEntry( new DummyEntry( new Dn(), wizard.getSelectedConnection() ) );
}
return super.getNextPage();
Modified: directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/wizards/NewEntryWizard.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/wizards/NewEntryWizard.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/wizards/NewEntryWizard.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/wizards/NewEntryWizard.java Sun Jan 23 01:17:06 2011
@@ -21,7 +21,7 @@
package org.apache.directory.studio.ldapbrowser.common.wizards;
-import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.name.Dn;
import org.apache.directory.studio.connection.ui.RunnableContextRunner;
import org.apache.directory.studio.ldapbrowser.common.BrowserCommonActivator;
import org.apache.directory.studio.ldapbrowser.common.BrowserCommonConstants;
@@ -186,7 +186,7 @@ public class NewEntryWizard extends Wiza
originalReadOnlyFlag = selectedConnection.getConnection().isReadOnly();
selectedConnection.getConnection().setReadOnly( true );
}
- prototypeEntry = new DummyEntry( new DN(), selectedConnection );
+ prototypeEntry = new DummyEntry( new Dn(), selectedConnection );
}
}
Modified: directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/valueeditors/RenameValueEditor.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/valueeditors/RenameValueEditor.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/valueeditors/RenameValueEditor.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/valueeditors/RenameValueEditor.java Sun Jan 23 01:17:06 2011
@@ -26,7 +26,7 @@ import java.util.Arrays;
import java.util.Iterator;
import java.util.List;
-import org.apache.directory.shared.ldap.name.RDN;
+import org.apache.directory.shared.ldap.name.Rdn;
import org.apache.directory.studio.ldapbrowser.common.dialogs.RenameEntryDialog;
import org.apache.directory.studio.ldapbrowser.common.dialogs.SimulateRenameDialogImpl;
import org.apache.directory.studio.ldapbrowser.core.jobs.RenameEntryRunnable;
@@ -141,7 +141,7 @@ public class RenameValueEditor extends C
RenameEntryDialog renameDialog = new RenameEntryDialog( parent.getShell(), entry );
if ( renameDialog.open() == Dialog.OK )
{
- RDN newRdn = renameDialog.getRdn();
+ Rdn newRdn = renameDialog.getRdn();
if ( newRdn != null && !newRdn.equals( entry.getRdn() ) )
{
IEntry originalEntry = entry.getBrowserConnection().getEntryFromCache( entry.getDn() );
Modified: directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/valueeditors/ValueEditorManager.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/valueeditors/ValueEditorManager.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/valueeditors/ValueEditorManager.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/valueeditors/ValueEditorManager.java Sun Jan 23 01:17:06 2011
@@ -314,7 +314,7 @@ public class ValueEditorManager
return entryValueEditor;
}
- // special case RDN attribute: always return rename editor
+ // special case Rdn attribute: always return rename editor
if ( userSelectedValueEditor == null && value.isRdnPart() && renameValueEditor != null )
{
return renameValueEditor;
@@ -371,7 +371,7 @@ public class ValueEditorManager
&& attributeHierarchy.getAttributeDescription().equalsIgnoreCase(
attributeHierarchy.getAttribute().getValues()[0].getAttribute().getDescription() ) )
{
- // special case RDN: always return MV-editor
+ // special case Rdn: always return MV-editor
if ( userSelectedValueEditor == null && attributeHierarchy.getAttribute().getValues()[0].isRdnPart() )
{
if ( renameValueEditor != null )
@@ -489,7 +489,7 @@ public class ValueEditorManager
return new IValueEditor[0];
}
- // special case RDN: no alternative to the rename editor, except the MV editor
+ // special case Rdn: no alternative to the rename editor, except the MV editor
// perhaps this should be moved somewhere else
if ( multiValuedValueEditor != null )
{
Modified: directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/BrowserConnectionIO.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/BrowserConnectionIO.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/BrowserConnectionIO.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/BrowserConnectionIO.java Sun Jan 23 01:17:06 2011
@@ -33,7 +33,7 @@ import java.util.List;
import java.util.Map;
import org.apache.directory.shared.ldap.exception.LdapInvalidDnException;
-import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.name.Dn;
import org.apache.directory.shared.util.Base64;
import org.apache.directory.studio.connection.core.Connection;
import org.apache.directory.studio.connection.core.StudioControl;
@@ -197,7 +197,7 @@ public class BrowserConnectionIO
{
try
{
- searchParameter.setSearchBase( new DN( searchBaseAttribute.getValue() ) );
+ searchParameter.setSearchBase( new Dn( searchBaseAttribute.getValue() ) );
}
catch ( LdapInvalidDnException e )
{
@@ -360,17 +360,17 @@ public class BrowserConnectionIO
bookmarkParameter.setName( nameAttribute.getValue() );
}
- // DN
+ // Dn
Attribute dnAttribute = bookmarkParameterElement.attribute( DN_TAG );
if ( dnAttribute != null )
{
try
{
- bookmarkParameter.setDn( new DN( dnAttribute.getValue() ) );
+ bookmarkParameter.setDn( new Dn( dnAttribute.getValue() ) );
}
catch ( LdapInvalidDnException e )
{
- throw new ConnectionIOException( "Unable to parse 'DN' of bookmark '" + bookmarkParameter.getName()
+ throw new ConnectionIOException( "Unable to parse 'Dn' of bookmark '" + bookmarkParameter.getName()
+ "' :" + dnAttribute.getValue() );
}
}
@@ -512,7 +512,7 @@ public class BrowserConnectionIO
// Name
bookmarkParameterElement.addAttribute( NAME_TAG, bookmarkParameter.getName() );
- // DN
+ // Dn
String dn = bookmarkParameter.getDn() != null ? bookmarkParameter.getDn().getName() : "";
bookmarkParameterElement.addAttribute( DN_TAG, dn );
}
Modified: directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/events/EntryMovedEvent.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/events/EntryMovedEvent.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/events/EntryMovedEvent.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/events/EntryMovedEvent.java Sun Jan 23 01:17:06 2011
@@ -55,7 +55,7 @@ public class EntryMovedEvent extends Ent
/**
- * Gets the new entry with the new DN.
+ * Gets the new entry with the new Dn.
*
* @return the new entry
*/
@@ -66,7 +66,7 @@ public class EntryMovedEvent extends Ent
/**
- * Gets the old entry with the old DN.
+ * Gets the old entry with the old Dn.
*
* @return the old entry
*/
Modified: directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/events/EntryRenamedEvent.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/events/EntryRenamedEvent.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/events/EntryRenamedEvent.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/events/EntryRenamedEvent.java Sun Jan 23 01:17:06 2011
@@ -55,7 +55,7 @@ public class EntryRenamedEvent extends E
/**
- * Gets the new entry with the new DN.
+ * Gets the new entry with the new Dn.
*
* @return the new entry
*/
@@ -66,7 +66,7 @@ public class EntryRenamedEvent extends E
/**
- * Gets the old entry with the old DN.
+ * Gets the old entry with the old Dn.
*
* @return the old entry
*/
Modified: directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/CopyEntriesRunnable.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/CopyEntriesRunnable.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/CopyEntriesRunnable.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/CopyEntriesRunnable.java Sun Jan 23 01:17:06 2011
@@ -39,9 +39,9 @@ import javax.naming.ldap.Control;
import javax.naming.ldap.ManageReferralControl;
import org.apache.directory.shared.ldap.constants.SchemaConstants;
-import org.apache.directory.shared.ldap.name.AVA;
-import org.apache.directory.shared.ldap.name.DN;
-import org.apache.directory.shared.ldap.name.RDN;
+import org.apache.directory.shared.ldap.name.Ava;
+import org.apache.directory.shared.ldap.name.Dn;
+import org.apache.directory.shared.ldap.name.Rdn;
import org.apache.directory.studio.common.core.jobs.StudioProgressMonitor;
import org.apache.directory.studio.connection.core.Connection;
import org.apache.directory.studio.connection.core.Connection.AliasDereferencingMethod;
@@ -204,9 +204,9 @@ public class CopyEntriesRunnable impleme
* recursively.
*
* @param browserConnection the browser connection
- * @param dnToCopy the DN to copy
- * @param parentDn the parent DN
- * @param newRdn the new RDN, if null the RDN of dnToCopy is used
+ * @param dnToCopy the Dn to copy
+ * @param parentDn the parent Dn
+ * @param newRdn the new Rdn, if null the Rdn of dnToCopy is used
* @param scope the copy scope
* @param numberOfCopiedEntries the number of copied entries
* @param dialog the dialog to ask for the copy strategy, if null the user won't be
@@ -217,7 +217,7 @@ public class CopyEntriesRunnable impleme
*
* @return the number of copied entries
*/
- static int copyEntry( IEntry entryToCopy, IEntry parent, RDN newRdn, int scope, int numberOfCopiedEntries,
+ static int copyEntry( IEntry entryToCopy, IEntry parent, Rdn newRdn, int scope, int numberOfCopiedEntries,
EntryExistsCopyStrategyDialog dialog, StudioProgressMonitor dummyMonitor, StudioProgressMonitor monitor )
{
SearchControls searchControls = new SearchControls();
@@ -241,8 +241,8 @@ public class CopyEntriesRunnable impleme
.search( entryToCopy.getDn().getName(), ISearch.FILTER_TRUE, searchControls,
AliasDereferencingMethod.NEVER, ReferralHandlingMethod.IGNORE, controls, monitor, null );
- // In case the parent is the RootDSE: use the parent DN of the old entry
- DN parentDn = parent.getDn();
+ // In case the parent is the RootDSE: use the parent Dn of the old entry
+ Dn parentDn = parent.getDn();
if ( parentDn.isEmpty() )
{
parentDn = DnUtils.getParent( entryToCopy.getDn() );
@@ -262,8 +262,8 @@ public class CopyEntriesRunnable impleme
* @param sourceBrowserConnection the source browser connection
* @param entries the source entries to copy
* @param targetBrowserConnection the target browser connection
- * @param parentDn the target parent DN
- * @param newRdn the new RDN, if null the original RDN of each entry is used
+ * @param parentDn the target parent Dn
+ * @param newRdn the new Rdn, if null the original Rdn of each entry is used
* @param scope the copy scope
* @param numberOfCopiedEntries the number of copied entries
* @param dialog the dialog to ask for the copy strategy, if null the user won't be
@@ -275,7 +275,7 @@ public class CopyEntriesRunnable impleme
* @return the number of copied entries
*/
static int copyEntryRecursive( IBrowserConnection sourceBrowserConnection, NamingEnumeration<SearchResult> entries,
- IBrowserConnection targetBrowserConnection, DN parentDn, RDN forceNewRdn, int scope,
+ IBrowserConnection targetBrowserConnection, Dn parentDn, Rdn forceNewRdn, int scope,
int numberOfCopiedEntries, EntryExistsCopyStrategyDialog dialog, StudioProgressMonitor dummyMonitor,
StudioProgressMonitor monitor )
{
@@ -285,21 +285,21 @@ public class CopyEntriesRunnable impleme
{
// get next entry to copy
SearchResult sr = entries.next();
- DN oldLdapDn = JNDIUtils.getDn( sr );
- RDN oldRdn = oldLdapDn.getRdn();
+ Dn oldLdapDn = JNDIUtils.getDn( sr );
+ Rdn oldRdn = oldLdapDn.getRdn();
// reuse attributes of the entry to copy
Attributes newAttributes = sr.getAttributes();
- // compose new DN
- RDN newRdn = oldLdapDn.getRdn();
+ // compose new Dn
+ Rdn newRdn = oldLdapDn.getRdn();
if ( forceNewRdn != null )
{
newRdn = forceNewRdn;
}
- DN newLdapDn = DnUtils.composeDn( newRdn, parentDn );
+ Dn newLdapDn = DnUtils.composeDn( newRdn, parentDn );
- // apply new RDN to the attributes
+ // apply new Rdn to the attributes
applyNewRdn( newAttributes, oldRdn, newRdn );
// ManageDsaIT control
@@ -366,12 +366,12 @@ public class CopyEntriesRunnable impleme
break;
case RENAME_AND_CONTINUE:
- RDN renamedRdn = dialog.getRdn();
+ Rdn renamedRdn = dialog.getRdn();
- // apply renamed RDN to the attributes
+ // apply renamed Rdn to the attributes
applyNewRdn( newAttributes, newRdn, renamedRdn );
- // compose new DN
+ // compose new Dn
newLdapDn = DnUtils.composeDn( renamedRdn, parentDn );
// create entry
@@ -437,12 +437,12 @@ public class CopyEntriesRunnable impleme
}
- private static void applyNewRdn( Attributes attributes, RDN oldRdn, RDN newRdn )
+ private static void applyNewRdn( Attributes attributes, Rdn oldRdn, Rdn newRdn )
{
- // remove old RDN attributes and values
- for ( Iterator<AVA> it = oldRdn.iterator(); it.hasNext(); )
+ // remove old Rdn attributes and values
+ for ( Iterator<Ava> it = oldRdn.iterator(); it.hasNext(); )
{
- AVA atav = it.next();
+ Ava atav = it.next();
Attribute attribute = attributes.get( atav.getUpType() );
if ( attribute != null )
{
@@ -454,10 +454,10 @@ public class CopyEntriesRunnable impleme
}
}
- // add new RDN attributes and values
- for ( Iterator<AVA> it = newRdn.iterator(); it.hasNext(); )
+ // add new Rdn attributes and values
+ for ( Iterator<Ava> it = newRdn.iterator(); it.hasNext(); )
{
- AVA atav = it.next();
+ Ava atav = it.next();
Attribute attribute = attributes.get( atav.getUpType() );
if ( attribute == null )
{
Modified: directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/DeleteEntriesRunnable.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/DeleteEntriesRunnable.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/DeleteEntriesRunnable.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/DeleteEntriesRunnable.java Sun Jan 23 01:17:06 2011
@@ -37,7 +37,7 @@ import javax.naming.ldap.BasicControl;
import javax.naming.ldap.Control;
import javax.naming.ldap.ManageReferralControl;
-import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.name.Dn;
import org.apache.directory.studio.common.core.jobs.StudioProgressMonitor;
import org.apache.directory.studio.connection.core.Connection;
import org.apache.directory.studio.connection.core.Connection.AliasDereferencingMethod;
@@ -254,7 +254,7 @@ public class DeleteEntriesRunnable imple
* </ol>
*
* @param browserConnection the browser connection
- * @param dn the DN to delete
+ * @param dn the Dn to delete
* @param useManageDsaItControl true to use the ManageDsaIT control
* @param useTreeDeleteControl true to use the tree delete control
* @param numberOfDeletedEntries the number of deleted entries
@@ -263,7 +263,7 @@ public class DeleteEntriesRunnable imple
*
* @return the cumulative number of deleted entries
*/
- static int optimisticDeleteEntryRecursive( IBrowserConnection browserConnection, DN dn,
+ static int optimisticDeleteEntryRecursive( IBrowserConnection browserConnection, Dn dn,
boolean useManageDsaItControl, boolean useTreeDeleteControl, int numberOfDeletedEntries,
StudioProgressMonitor dummyMonitor, StudioProgressMonitor monitor )
{
@@ -307,7 +307,7 @@ public class DeleteEntriesRunnable imple
while ( !dummyMonitor.isCanceled() && !dummyMonitor.errorsReported() && result.hasMore() )
{
SearchResult sr = result.next();
- DN childDn = JNDIUtils.getDn( sr );
+ Dn childDn = JNDIUtils.getDn( sr );
numberOfDeletedEntries = optimisticDeleteEntryRecursive( browserConnection, childDn, false,
false, numberOfDeletedEntries, dummyMonitor, monitor );
@@ -357,7 +357,7 @@ public class DeleteEntriesRunnable imple
}
- static void deleteEntry( IBrowserConnection browserConnection, DN dn, boolean useManageDsaItControl,
+ static void deleteEntry( IBrowserConnection browserConnection, Dn dn, boolean useManageDsaItControl,
boolean useTreeDeleteControl, StudioProgressMonitor monitor )
{
// controls
Modified: directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/EntryExistsCopyStrategyDialog.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/EntryExistsCopyStrategyDialog.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/EntryExistsCopyStrategyDialog.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/EntryExistsCopyStrategyDialog.java Sun Jan 23 01:17:06 2011
@@ -20,8 +20,8 @@
package org.apache.directory.studio.ldapbrowser.core.jobs;
-import org.apache.directory.shared.ldap.name.DN;
-import org.apache.directory.shared.ldap.name.RDN;
+import org.apache.directory.shared.ldap.name.Dn;
+import org.apache.directory.shared.ldap.name.Rdn;
import org.apache.directory.studio.ldapbrowser.core.model.IBrowserConnection;
@@ -37,9 +37,9 @@ public interface EntryExistsCopyStrategy
* Sets the existing entry.
*
* @param browserConnection the browser connection
- * @param newLdapDn the new DN
+ * @param newLdapDn the new Dn
*/
- void setExistingEntry( IBrowserConnection browserConnection, DN newLdapDn );
+ void setExistingEntry( IBrowserConnection browserConnection, Dn newLdapDn );
/**
@@ -51,12 +51,12 @@ public interface EntryExistsCopyStrategy
/**
- * Gets the RDN if {@link EntryExistsCopyStrategy.RENAME_AND_CONTINUE} was selected.
+ * Gets the Rdn if {@link EntryExistsCopyStrategy.RENAME_AND_CONTINUE} was selected.
* Returns null if another strategy was selected.
*
- * @return the RDN
+ * @return the Rdn
*/
- RDN getRdn();
+ Rdn getRdn();
/**
Modified: directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExportCsvRunnable.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExportCsvRunnable.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExportCsvRunnable.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExportCsvRunnable.java Sun Jan 23 01:17:06 2011
@@ -77,7 +77,7 @@ public class ExportCsvRunnable implement
* @param exportCsvFilename the filename of the csv file
* @param browserConnection the browser connection
* @param searchParameter the search parameter
- * @param exportDn true to export the DN
+ * @param exportDn true to export the Dn
*/
public ExportCsvRunnable( String exportCsvFilename, IBrowserConnection browserConnection,
SearchParameter searchParameter, boolean exportDn )
Modified: directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExportDsmlRunnable.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExportDsmlRunnable.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExportDsmlRunnable.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExportDsmlRunnable.java Sun Jan 23 01:17:06 2011
@@ -53,7 +53,7 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.message.ResultCodeEnum;
import org.apache.directory.shared.ldap.message.SearchResultDone;
import org.apache.directory.shared.ldap.message.SearchResultDoneImpl;
-import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.name.Dn;
import org.apache.directory.shared.ldap.filter.LdapURL;
import org.apache.directory.studio.common.core.jobs.StudioProgressMonitor;
import org.apache.directory.studio.connection.core.Connection;
@@ -340,7 +340,7 @@ public class ExportDsmlRunnable implemen
throws LdapException, LdapURLEncodingException
{
Entry entry = AttributeUtils.toClientEntry(searchResult.getAttributes(),
- new DN(searchResult.getNameInNamespace()));
+ new Dn(searchResult.getNameInNamespace()));
if ( isReferral( entry ) )
{
@@ -481,7 +481,7 @@ public class ExportDsmlRunnable implemen
{
AddRequestDsml ar = new AddRequestDsml();
Entry entry = AttributeUtils.toClientEntry( searchResult.getAttributes(),
- new DN( searchResult.getNameInNamespace() ) );
+ new Dn( searchResult.getNameInNamespace() ) );
ar.setEntry( entry );
return ar;
Modified: directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExportLdifRunnable.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExportLdifRunnable.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExportLdifRunnable.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExportLdifRunnable.java Sun Jan 23 01:17:06 2011
@@ -37,7 +37,7 @@ import javax.naming.ldap.PagedResultsRes
import org.apache.commons.codec.digest.DigestUtils;
import org.apache.directory.shared.ldap.exception.LdapInvalidDnException;
-import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.name.Dn;
import org.apache.directory.studio.common.core.jobs.StudioProgressMonitor;
import org.apache.directory.studio.connection.core.Connection;
import org.apache.directory.studio.connection.core.StudioControl;
@@ -307,7 +307,7 @@ public class ExportLdifRunnable implemen
public LdifContainer next() throws NamingException, LdapInvalidDnException
{
SearchResult sr = enumeration.next();
- DN dn = JNDIUtils.getDn( sr );
+ Dn dn = JNDIUtils.getDn( sr );
LdifContentRecord record = LdifContentRecord.create( dn.getName() );
NamingEnumeration<? extends Attribute> attributeEnumeration = sr.getAttributes().getAll();
Modified: directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExportOdfRunnable.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExportOdfRunnable.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExportOdfRunnable.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExportOdfRunnable.java Sun Jan 23 01:17:06 2011
@@ -81,7 +81,7 @@ public class ExportOdfRunnable implement
* @param exportOdfFilename the ODF filename
* @param browserConnection the browser connection
* @param searchParameter the search parameter
- * @param exportDn true to export the DN
+ * @param exportDn true to export the Dn
*/
public ExportOdfRunnable( String exportOdfFilename, IBrowserConnection browserConnection,
SearchParameter searchParameter, boolean exportDn )
Modified: directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExportXlsRunnable.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExportXlsRunnable.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExportXlsRunnable.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExportXlsRunnable.java Sun Jan 23 01:17:06 2011
@@ -78,7 +78,7 @@ public class ExportXlsRunnable implement
* @param exportLdifFilename the export ldif filename
* @param browserConnection the browser connection
* @param searchParameter the search parameter
- * @param exportDn true to export the DN
+ * @param exportDn true to export the Dn
*/
public ExportXlsRunnable( String exportLdifFilename, IBrowserConnection browserConnection,
SearchParameter searchParameter, boolean exportDn )
Modified: directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ImportDsmlRunnable.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ImportDsmlRunnable.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ImportDsmlRunnable.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ImportDsmlRunnable.java Sun Jan 23 01:17:06 2011
@@ -65,7 +65,7 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.message.ModifyRequest;
import org.apache.directory.shared.ldap.message.ResultCodeEnum;
import org.apache.directory.shared.ldap.message.SearchRequest;
-import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.name.Dn;
import org.apache.directory.studio.common.core.jobs.StudioProgressMonitor;
import org.apache.directory.studio.connection.core.Connection;
import org.apache.directory.studio.connection.core.Connection.AliasDereferencingMethod;
@@ -365,9 +365,9 @@ public class ImportDsmlRunnable implemen
}
// Update cached entries
- DN dn = entry.getDn();
+ Dn dn = entry.getDn();
IEntry e = browserConnection.getEntryFromCache( dn );
- DN parentDn = DnUtils.getParent( dn );
+ Dn parentDn = DnUtils.getParent( dn );
IEntry parentEntry = parentDn != null ? browserConnection.getEntryFromCache( parentDn ) : null;
if ( e != null )
{
@@ -432,9 +432,9 @@ public class ImportDsmlRunnable implemen
}
// Update cached entries
- DN dn = request.getName();
+ Dn dn = request.getName();
IEntry e = browserConnection.getEntryFromCache( dn );
- DN parentDn = DnUtils.getParent( dn );
+ Dn parentDn = DnUtils.getParent( dn );
IEntry parentEntry = parentDn != null ? browserConnection.getEntryFromCache( parentDn ) : null;
if ( e != null )
{
@@ -510,7 +510,7 @@ public class ImportDsmlRunnable implemen
batchResponseDsml.addResponse( modifyResponseDsml );
}
- DN dn = request.getName();
+ Dn dn = request.getName();
IEntry e = browserConnection.getEntryFromCache( dn );
if ( e != null )
{
@@ -544,7 +544,7 @@ public class ImportDsmlRunnable implemen
/**
- * Processes a modify DN request.
+ * Processes a modify Dn request.
*
* @param request
* the request
@@ -554,7 +554,7 @@ public class ImportDsmlRunnable implemen
private void processModifyDNRequest( ModifyDnRequest request, BatchResponseDsml batchResponseDsml,
StudioProgressMonitor monitor )
{
- // Executing the modify DN request
+ // Executing the modify Dn request
browserConnection
.getConnection()
.getConnectionWrapper()
@@ -572,9 +572,9 @@ public class ImportDsmlRunnable implemen
}
// Update cached entries
- DN dn = request.getName();
+ Dn dn = request.getName();
IEntry e = browserConnection.getEntryFromCache( dn );
- DN parentDn = DnUtils.getParent( dn );
+ Dn parentDn = DnUtils.getParent( dn );
IEntry parentEntry = parentDn != null ? browserConnection.getEntryFromCache( parentDn ) : null;
if ( e != null )
{
@@ -587,7 +587,7 @@ public class ImportDsmlRunnable implemen
}
if ( request.getNewSuperior() != null )
{
- DN newSuperiorDn = request.getNewSuperior();
+ Dn newSuperiorDn = request.getNewSuperior();
IEntry newSuperiorEntry = browserConnection.getEntryFromCache( newSuperiorDn );
if ( newSuperiorEntry != null )
{
Modified: directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ImportLdifRunnable.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ImportLdifRunnable.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ImportLdifRunnable.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ImportLdifRunnable.java Sun Jan 23 01:17:06 2011
@@ -48,7 +48,7 @@ import javax.naming.ldap.Control;
import org.apache.commons.codec.digest.DigestUtils;
import org.apache.directory.shared.ldap.exception.LdapInvalidDnException;
-import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.name.Dn;
import org.apache.directory.studio.common.core.jobs.StudioProgressMonitor;
import org.apache.directory.studio.connection.core.Connection;
import org.apache.directory.studio.connection.core.ConnectionCoreConstants;
@@ -289,9 +289,9 @@ public class ImportLdifRunnable implemen
logModification( browserConnection, logWriter, record, monitor );
// update cache and adjust attribute/children initialization flags
- DN dn = new DN( record.getDnLine().getValueAsString() );
+ Dn dn = new Dn( record.getDnLine().getValueAsString() );
IEntry entry = browserConnection.getEntryFromCache( dn );
- DN parentDn = DnUtils.getParent( dn );
+ Dn parentDn = DnUtils.getParent( dn );
IEntry parentEntry = null;
while ( parentEntry == null && parentDn != null )
{
@@ -325,7 +325,7 @@ public class ImportLdifRunnable implemen
LdifChangeModDnRecord modDnRecord = ( LdifChangeModDnRecord ) record;
if ( modDnRecord.getNewsuperiorLine() != null )
{
- DN newSuperiorDn = new DN( modDnRecord.getNewsuperiorLine()
+ Dn newSuperiorDn = new Dn( modDnRecord.getNewsuperiorLine()
.getValueAsString() );
IEntry newSuperiorEntry = browserConnection.getEntryFromCache( newSuperiorDn );
if ( newSuperiorEntry != null )
@@ -522,15 +522,15 @@ public class ImportLdifRunnable implemen
String newRdn = modDnRecord.getNewrdnLine().getValueAsString();
boolean deleteOldRdn = modDnRecord.getDeloldrdnLine().isDeleteOldRdn();
- DN newDn;
+ Dn newDn;
if ( modDnRecord.getNewsuperiorLine() != null )
{
newDn = DnUtils.composeDn( newRdn, modDnRecord.getNewsuperiorLine().getValueAsString() );
}
else
{
- DN dnObject = new DN( dn );
- DN parent = DnUtils.getParent( dnObject );
+ Dn dnObject = new Dn( dn );
+ Dn parent = DnUtils.getParent( dnObject );
newDn = DnUtils.composeDn( newRdn, parent.getName() );
}
Modified: directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/InitializeRootDSERunnable.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/InitializeRootDSERunnable.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/InitializeRootDSERunnable.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/InitializeRootDSERunnable.java Sun Jan 23 01:17:06 2011
@@ -30,7 +30,7 @@ import java.util.Set;
import org.apache.directory.shared.ldap.constants.SchemaConstants;
import org.apache.directory.shared.ldap.exception.LdapInvalidDnException;
-import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.name.Dn;
import org.apache.directory.studio.common.core.jobs.StudioProgressMonitor;
import org.apache.directory.studio.connection.core.Connection;
import org.apache.directory.studio.connection.core.Connection.AliasDereferencingMethod;
@@ -171,26 +171,26 @@ public class InitializeRootDSERunnable i
}
// load well-known Root DSE attributes and operational attributes
- ISearch search = new Search( null, browserConnection, DN.EMPTY_DN, ISearch.FILTER_TRUE,
+ ISearch search = new Search( null, browserConnection, Dn.EMPTY_DN, ISearch.FILTER_TRUE,
ROOT_DSE_ATTRIBUTES, SearchScope.OBJECT, 0, 0, Connection.AliasDereferencingMethod.NEVER,
Connection.ReferralHandlingMethod.IGNORE, false, null );
SearchRunnable.searchAndUpdateModel( browserConnection, search, monitor );
// load all user attributes
- search = new Search( null, browserConnection, DN.EMPTY_DN, ISearch.FILTER_TRUE, new String[]
+ search = new Search( null, browserConnection, Dn.EMPTY_DN, ISearch.FILTER_TRUE, new String[]
{ SchemaConstants.ALL_USER_ATTRIBUTES }, SearchScope.OBJECT, 0, 0,
Connection.AliasDereferencingMethod.NEVER, Connection.ReferralHandlingMethod.IGNORE, false, null );
SearchRunnable.searchAndUpdateModel( browserConnection, search, monitor );
// the list of entries under the Root DSE
- Map<DN, IEntry> rootDseEntries = new HashMap<DN, IEntry>();
+ Map<Dn, IEntry> rootDseEntries = new HashMap<Dn, IEntry>();
// 1st: add base DNs, either the specified or from the namingContexts attribute
if ( !browserConnection.isFetchBaseDNs() && browserConnection.getBaseDN() != null
&& !"".equals( browserConnection.getBaseDN().toString() ) )
{
- // only add the specified base DN
- DN dn = browserConnection.getBaseDN();
+ // only add the specified base Dn
+ Dn dn = browserConnection.getBaseDN();
IEntry entry = browserConnection.getEntryFromCache( dn );
if ( entry == null )
{
@@ -226,7 +226,7 @@ public class InitializeRootDSERunnable i
{
try
{
- DN dn = new DN( namingContext );
+ Dn dn = new Dn( namingContext );
IEntry entry = browserConnection.getEntryFromCache( dn );
if ( entry == null )
{
@@ -301,7 +301,7 @@ public class InitializeRootDSERunnable i
private static void initBaseEntry( IEntry entry, StudioProgressMonitor monitor )
{
IBrowserConnection browserConnection = entry.getBrowserConnection();
- DN dn = entry.getDn();
+ Dn dn = entry.getDn();
// search the entry
AliasDereferencingMethod derefAliasMethod = browserConnection.getAliasesDereferencingMethod();
@@ -320,7 +320,7 @@ public class InitializeRootDSERunnable i
}
else
{
- // DN exists in the Root DSE, but doesn't exist in directory
+ // Dn exists in the Root DSE, but doesn't exist in directory
browserConnection.uncacheEntryRecursive( entry );
}
}
@@ -329,7 +329,7 @@ public class InitializeRootDSERunnable i
private static IEntry[] getDirectoryMetadataEntries( IBrowserConnection browserConnection,
String metadataAttributeName )
{
- List<DN> metadataEntryDnList = new ArrayList<DN>();
+ List<Dn> metadataEntryDnList = new ArrayList<Dn>();
IAttribute attribute = browserConnection.getRootDSE().getAttribute( metadataAttributeName );
if ( attribute != null )
{
@@ -340,7 +340,7 @@ public class InitializeRootDSERunnable i
{
try
{
- metadataEntryDnList.add( new DN( dn ) );
+ metadataEntryDnList.add( new Dn( dn ) );
}
catch ( LdapInvalidDnException e )
{
@@ -352,7 +352,7 @@ public class InitializeRootDSERunnable i
IEntry[] metadataEntries = new IEntry[metadataEntryDnList.size()];
for ( int i = 0; i < metadataEntryDnList.size(); i++ )
{
- DN dn = metadataEntryDnList.get( i );
+ Dn dn = metadataEntryDnList.get( i );
metadataEntries[i] = browserConnection.getEntryFromCache( dn );
if ( metadataEntries[i] == null )
{
@@ -365,10 +365,10 @@ public class InitializeRootDSERunnable i
}
- private static void searchRootDseEntries( IBrowserConnection browserConnection, Map<DN, IEntry> rootDseEntries,
+ private static void searchRootDseEntries( IBrowserConnection browserConnection, Map<Dn, IEntry> rootDseEntries,
StudioProgressMonitor monitor )
{
- ISearch search = new Search( null, browserConnection, DN.EMPTY_DN, ISearch.FILTER_TRUE,
+ ISearch search = new Search( null, browserConnection, Dn.EMPTY_DN, ISearch.FILTER_TRUE,
ISearch.NO_ATTRIBUTES, SearchScope.ONELEVEL, 0, 0, Connection.AliasDereferencingMethod.NEVER,
Connection.ReferralHandlingMethod.IGNORE, false, null );
SearchRunnable.searchAndUpdateModel( browserConnection, search, monitor );
Modified: directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/MoveEntriesRunnable.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/MoveEntriesRunnable.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/MoveEntriesRunnable.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/MoveEntriesRunnable.java Sun Jan 23 01:17:06 2011
@@ -30,7 +30,7 @@ import java.util.Set;
import javax.naming.ContextNotEmptyException;
import javax.naming.directory.SearchControls;
-import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.name.Dn;
import org.apache.directory.studio.common.core.jobs.StudioProgressMonitor;
import org.apache.directory.studio.connection.core.Connection;
import org.apache.directory.studio.connection.core.DnUtils;
@@ -154,15 +154,15 @@ public class MoveEntriesRunnable impleme
int numAdd = 0;
int numDel = 0;
boolean isSimulatedRename = false;
- DN parentDn = newParent.getDn();
+ Dn parentDn = newParent.getDn();
for ( int i = 0; i < oldEntries.length; i++ )
{
dummyMonitor.reset();
IEntry oldEntry = oldEntries[i];
- DN oldDn = oldEntry.getDn();
- DN newDn = DnUtils.composeDn( oldDn.getRdn(), parentDn );
+ Dn oldDn = oldEntry.getDn();
+ Dn newDn = DnUtils.composeDn( oldDn.getRdn(), parentDn );
// try to move entry
RenameEntryRunnable.renameEntry( browserConnection, oldEntry, newDn, dummyMonitor );
Modified: directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ReadEntryRunnable.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ReadEntryRunnable.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ReadEntryRunnable.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ReadEntryRunnable.java Sun Jan 23 01:17:06 2011
@@ -23,7 +23,7 @@ package org.apache.directory.studio.ldap
import java.util.List;
-import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.name.Dn;
import org.apache.directory.studio.common.core.jobs.StudioProgressMonitor;
import org.apache.directory.studio.connection.core.Connection;
import org.apache.directory.studio.connection.core.Connection.AliasDereferencingMethod;
@@ -49,8 +49,8 @@ public class ReadEntryRunnable implement
/** The browser connection. */
private IBrowserConnection browserConnection;
- /** The DN of the entry. */
- private DN dn;
+ /** The Dn of the entry. */
+ private Dn dn;
/** The entry read from directory. */
private IEntry readEntry;
@@ -60,9 +60,9 @@ public class ReadEntryRunnable implement
* Creates a new instance of ReadEntryRunnable.
*
* @param browserConnection the browser connection
- * @param dn the DN of the entry
+ * @param dn the Dn of the entry
*/
- public ReadEntryRunnable( IBrowserConnection browserConnection, DN dn )
+ public ReadEntryRunnable( IBrowserConnection browserConnection, Dn dn )
{
this.browserConnection = browserConnection;
this.dn = dn;
@@ -138,13 +138,13 @@ public class ReadEntryRunnable implement
* Gets the entry, either from the BrowserConnection's cache or from the directory.
*
* @param browserConnection the browser connection
- * @param dn the DN of the entry
+ * @param dn the Dn of the entry
* @param controls the LDAP controls
* @param monitor the progress monitor
*
* @return the read entry
*/
- static IEntry getEntry( IBrowserConnection browserConnection, DN dn, List<StudioControl> controls,
+ static IEntry getEntry( IBrowserConnection browserConnection, Dn dn, List<StudioControl> controls,
StudioProgressMonitor monitor )
{
try
Modified: directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ReloadSchemaRunnable.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ReloadSchemaRunnable.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ReloadSchemaRunnable.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ReloadSchemaRunnable.java Sun Jan 23 01:17:06 2011
@@ -26,7 +26,7 @@ import javax.naming.directory.Attribute;
import javax.naming.directory.SearchResult;
import org.apache.directory.shared.ldap.constants.SchemaConstants;
-import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.name.Dn;
import org.apache.directory.studio.common.core.jobs.StudioProgressMonitor;
import org.apache.directory.studio.connection.core.Connection;
import org.apache.directory.studio.connection.core.jobs.StudioConnectionBulkRunnableWithProgress;
@@ -142,7 +142,7 @@ public class ReloadSchemaRunnable implem
public static void reloadSchema( boolean forceReload, IBrowserConnection browserConnection,
StudioProgressMonitor monitor )
{
- DN schemaLocation = getSchemaLocation( browserConnection, monitor );
+ Dn schemaLocation = getSchemaLocation( browserConnection, monitor );
if ( schemaLocation == null )
{
monitor.reportError( BrowserCoreMessages.model__missing_schema_location );
@@ -198,7 +198,7 @@ public class ReloadSchemaRunnable implem
* @param browserConnection the browser connection
* @param monitor the progress monitor
*/
- private static boolean mustReload( DN schemaLocation, IBrowserConnection browserConnection,
+ private static boolean mustReload( Dn schemaLocation, IBrowserConnection browserConnection,
StudioProgressMonitor monitor )
{
Schema schema = browserConnection.getSchema();
@@ -252,12 +252,12 @@ public class ReloadSchemaRunnable implem
}
- private static DN getSchemaLocation( IBrowserConnection browserConnection, StudioProgressMonitor monitor )
+ private static Dn getSchemaLocation( IBrowserConnection browserConnection, StudioProgressMonitor monitor )
{
try
{
SearchParameter sp = new SearchParameter();
- sp.setSearchBase( new DN() );
+ sp.setSearchBase( new Dn() );
sp.setScope( SearchScope.OBJECT );
sp.setReturningAttributes( new String[]
{ SchemaConstants.SUBSCHEMA_SUBENTRY_AT } );
@@ -272,9 +272,9 @@ public class ReloadSchemaRunnable implem
if ( attribute.getID().equalsIgnoreCase( SchemaConstants.SUBSCHEMA_SUBENTRY_AT ) )
{
String value = ( String ) attribute.get();
- if ( DN.isValid( value ) )
+ if ( Dn.isValid(value) )
{
- DN dn = new DN( value );
+ Dn dn = new Dn( value );
return dn;
}
}
Modified: directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/RenameEntryRunnable.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/RenameEntryRunnable.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/RenameEntryRunnable.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/RenameEntryRunnable.java Sun Jan 23 01:17:06 2011
@@ -30,10 +30,9 @@ import javax.naming.ContextNotEmptyExcep
import javax.naming.directory.SearchControls;
import javax.naming.ldap.Control;
import javax.naming.ldap.ManageReferralControl;
-import javax.naming.ldap.Rdn;
-import org.apache.directory.shared.ldap.name.DN;
-import org.apache.directory.shared.ldap.name.RDN;
+import org.apache.directory.shared.ldap.name.Dn;
+import org.apache.directory.shared.ldap.name.Rdn;
import org.apache.directory.studio.common.core.jobs.StudioProgressMonitor;
import org.apache.directory.studio.connection.core.Connection;
import org.apache.directory.studio.connection.core.DnUtils;
@@ -67,8 +66,8 @@ public class RenameEntryRunnable impleme
/** The old entry. */
private IEntry oldEntry;
- /** The new RDN. */
- private RDN newRdn;
+ /** The new Rdn. */
+ private Rdn newRdn;
/** The new entry. */
private IEntry newEntry;
@@ -84,10 +83,10 @@ public class RenameEntryRunnable impleme
* Creates a new instance of RenameEntryRunnable.
*
* @param entry the entry to rename
- * @param newRdn the new RDN
+ * @param newRdn the new Rdn
* @param dialog the dialog
*/
- public RenameEntryRunnable( IEntry entry, RDN newRdn, SimulateRenameDialog dialog )
+ public RenameEntryRunnable( IEntry entry, Rdn newRdn, SimulateRenameDialog dialog )
{
this.browserConnection = entry.getBrowserConnection();
this.oldEntry = entry;
@@ -146,9 +145,9 @@ public class RenameEntryRunnable impleme
monitor.reportProgress( " " ); //$NON-NLS-1$
monitor.worked( 1 );
- DN oldDn = oldEntry.getDn();
- DN parentDn = DnUtils.getParent( oldDn );
- DN newDn = DnUtils.composeDn( newRdn, parentDn );
+ Dn oldDn = oldEntry.getDn();
+ Dn parentDn = DnUtils.getParent( oldDn );
+ Dn newDn = DnUtils.composeDn( newRdn, parentDn );
// use a dummy monitor to be able to handle exceptions
StudioProgressMonitor dummyMonitor = new StudioProgressMonitor( monitor );
@@ -272,10 +271,10 @@ public class RenameEntryRunnable impleme
*
* @param browserConnection the browser connection
* @param entry the entry to move/rename
- * @param newDn the new DN
+ * @param newDn the new Dn
* @param monitor the progress monitor
*/
- static void renameEntry( IBrowserConnection browserConnection, IEntry entry, DN newDn,
+ static void renameEntry( IBrowserConnection browserConnection, IEntry entry, Dn newDn,
StudioProgressMonitor monitor )
{
// DNs
Modified: directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/SearchRunnable.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/SearchRunnable.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/SearchRunnable.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/SearchRunnable.java Sun Jan 23 01:17:06 2011
@@ -40,7 +40,7 @@ import javax.naming.ldap.PagedResultsRes
import org.apache.directory.shared.ldap.constants.SchemaConstants;
import org.apache.directory.shared.ldap.filter.LdapURL;
-import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.name.Dn;
import org.apache.directory.studio.common.core.jobs.StudioProgressMonitor;
import org.apache.directory.studio.connection.core.Connection;
import org.apache.directory.studio.connection.core.Connection.AliasDereferencingMethod;
@@ -326,7 +326,7 @@ public class SearchRunnable implements S
if ( searchContinuationUrl == null )
{
- DN dn = JNDIUtils.getDn( sr );
+ Dn dn = JNDIUtils.getDn( sr );
IEntry entry = null;
Connection resultConnection = sr.getConnection();
@@ -597,39 +597,39 @@ public class SearchRunnable implements S
* Creates the entry and puts it into the BrowserConnection's entry cache.
*
* @param browserConnection the browser connection
- * @param dn the DN of the entry
+ * @param dn the Dn of the entry
* @param monitor
*
* @return the created entry
*/
- private static IEntry createAndCacheEntry( IBrowserConnection browserConnection, DN dn,
+ private static IEntry createAndCacheEntry( IBrowserConnection browserConnection, Dn dn,
StudioProgressMonitor monitor )
{
StudioProgressMonitor dummyMonitor = new StudioProgressMonitor( monitor );
IEntry entry = null;
// build tree to parent
- LinkedList<DN> parentDnList = new LinkedList<DN>();
- DN parentDN = dn;
- while ( parentDN != null && browserConnection.getEntryFromCache( parentDN ) == null )
+ LinkedList<Dn> parentDnList = new LinkedList<Dn>();
+ Dn parentDn = dn;
+ while ( parentDn != null && browserConnection.getEntryFromCache(parentDn) == null )
{
- parentDnList.addFirst( parentDN );
- parentDN = DnUtils.getParent( parentDN );
+ parentDnList.addFirst(parentDn);
+ parentDn = DnUtils.getParent(parentDn);
}
- for ( DN aDN : parentDnList )
+ for ( Dn aDn : parentDnList )
{
- parentDN = DnUtils.getParent( aDN );
- if ( parentDN == null )
+ parentDn = DnUtils.getParent(aDn);
+ if ( parentDn == null )
{
// only the root DSE has a null parent
entry = browserConnection.getRootDSE();
}
- else if ( !parentDN.isEmpty() && browserConnection.getEntryFromCache( parentDN ) != null )
+ else if ( !parentDn.isEmpty() && browserConnection.getEntryFromCache(parentDn) != null )
{
// a normal entry has a parent but the parent isn't the rootDSE
- IEntry parentEntry = browserConnection.getEntryFromCache( parentDN );
- entry = new Entry( parentEntry, aDN.getRdn() );
+ IEntry parentEntry = browserConnection.getEntryFromCache(parentDn);
+ entry = new Entry( parentEntry, aDn.getRdn() );
entry.setDirectoryEntry( true );
parentEntry.addChild( entry );
parentEntry.setChildrenInitialized( true );
@@ -639,10 +639,10 @@ public class SearchRunnable implements S
}
else
{
- // we have a base DN, check if the entry really exists in LDAP
+ // we have a base Dn, check if the entry really exists in LDAP
// this is to avoid that a node "dc=com" is created for "dc=example,dc=com" context entry
SearchParameter searchParameter = new SearchParameter();
- searchParameter.setSearchBase( aDN );
+ searchParameter.setSearchBase(aDn);
searchParameter.setFilter( null );
searchParameter.setReturningAttributes( ISearch.NO_ATTRIBUTES );
searchParameter.setScope( SearchScope.OBJECT );
@@ -657,8 +657,8 @@ public class SearchRunnable implements S
{
if ( enumeration != null && enumeration.hasMore() )
{
- // create base DN entry
- entry = new BaseDNEntry( aDN, browserConnection );
+ // create base Dn entry
+ entry = new BaseDNEntry(aDn, browserConnection );
browserConnection.getRootDSE().addChild( entry );
browserConnection.cacheEntry( entry );
enumeration.close();
Modified: directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/SimulateRenameDialog.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/SimulateRenameDialog.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/SimulateRenameDialog.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/SimulateRenameDialog.java Sun Jan 23 01:17:06 2011
@@ -20,7 +20,7 @@
package org.apache.directory.studio.ldapbrowser.core.jobs;
-import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.name.Dn;
import org.apache.directory.studio.ldapbrowser.core.model.IBrowserConnection;
@@ -37,10 +37,10 @@ public interface SimulateRenameDialog
* Sets the existing entry.
*
* @param browserConnection the browser connection
- * @param oldDn the old DN
- * @param newDn the new DN
+ * @param oldDn the old Dn
+ * @param newDn the new Dn
*/
- void setEntryInfo( IBrowserConnection browserConnection, DN oldDn, DN newDn );
+ void setEntryInfo( IBrowserConnection browserConnection, Dn oldDn, Dn newDn );
/**
Modified: directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/BookmarkParameter.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/BookmarkParameter.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/BookmarkParameter.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/BookmarkParameter.java Sun Jan 23 01:17:06 2011
@@ -23,7 +23,7 @@ package org.apache.directory.studio.ldap
import java.io.Serializable;
-import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.name.Dn;
/**
@@ -38,8 +38,8 @@ public class BookmarkParameter implement
/** The serialVersionUID. */
private static final long serialVersionUID = 105108281861642267L;
- /** The target DN. */
- private DN dn;
+ /** The target Dn. */
+ private Dn dn;
/** The symbolic name. */
private String name;
@@ -56,10 +56,10 @@ public class BookmarkParameter implement
/**
* Creates a new instance of BookmarkParameter.
*
- * @param dn the target DN
+ * @param dn the target Dn
* @param name the symbolic name
*/
- public BookmarkParameter( DN dn, String name )
+ public BookmarkParameter( Dn dn, String name )
{
this.dn = dn;
this.name = name;
@@ -67,22 +67,22 @@ public class BookmarkParameter implement
/**
- * Gets the target DN.
+ * Gets the target Dn.
*
- * @return the target DN
+ * @return the target Dn
*/
- public DN getDn()
+ public Dn getDn()
{
return dn;
}
/**
- * Sets the target DN.
+ * Sets the target Dn.
*
- * @param dn the target DN
+ * @param dn the target Dn
*/
- public void setDn( DN dn )
+ public void setDn( Dn dn )
{
this.dn = dn;
}