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 [31/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.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/IBookmark.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/IBookmark.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/IBookmark.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/IBookmark.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;
import org.apache.directory.studio.connection.core.ConnectionPropertyPageProvider;
import org.apache.directory.studio.ldapbrowser.core.propertypageproviders.BookmarkPropertyPageProvider;
import org.apache.directory.studio.ldapbrowser.core.propertypageproviders.EntryPropertyPageProvider;
@@ -32,7 +32,7 @@ import org.eclipse.core.runtime.IAdaptab
/**
* An IBookmark is used as shortcut to an entry in the DIT.
- * The target entry is defined by a connection a DN.
+ * The target entry is defined by a connection a Dn.
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
@@ -41,19 +41,19 @@ public interface IBookmark extends Seria
{
/**
- * Gets the target DN.
+ * Gets the target Dn.
*
- * @return the DN
+ * @return the Dn
*/
- public DN getDn();
+ public Dn getDn();
/**
- * Sets the target DN.
+ * Sets the target Dn.
*
- * @param dn the DN
+ * @param dn the Dn
*/
- public void setDn( DN dn );
+ public void setDn( Dn dn );
/**
Modified: directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/IBrowserConnection.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/IBrowserConnection.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/IBrowserConnection.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/IBrowserConnection.java Sun Jan 23 01:17:06 2011
@@ -24,7 +24,7 @@ package org.apache.directory.studio.ldap
import java.io.Serializable;
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.connection.core.Connection;
import org.apache.directory.studio.connection.core.ConnectionPropertyPageProvider;
import org.apache.directory.studio.connection.core.Connection.AliasDereferencingMethod;
@@ -162,7 +162,7 @@ public interface IBrowserConnection exte
/** The key for the connection parameter "Get Base DNs from Root DSE". */
public static String CONNECTION_PARAMETER_FETCH_BASE_DNS = "ldapbrowser.fetchBaseDns";
- /** The key for the connection parameter "Base DN". */
+ /** The key for the connection parameter "Base Dn". */
public static String CONNECTION_PARAMETER_BASE_DN = "ldapbrowser.baseDn";
/** The key for the connection parameter "Count Limit". */
@@ -215,17 +215,17 @@ public interface IBrowserConnection exte
/**
* Gets the flag whether the base DNs is retrieved
- * from Root DSE or whether the base DN is defined manually.
+ * from Root DSE or whether the base Dn is defined manually.
*
* @return true, if the base DNs are fetched from Root DSE,
- * false, if the base DN is defined manually
+ * false, if the base Dn is defined manually
*/
public abstract boolean isFetchBaseDNs();
/**
* Sets the flag whether the base DNs should be retrieved
- * from Root DSE or whether the base DN is defined manually.
+ * from Root DSE or whether the base Dn is defined manually.
*
* @param fetchBaseDNs true to get the base DNs from Root DSE,
* false to define one manually
@@ -234,19 +234,19 @@ public interface IBrowserConnection exte
/**
- * Gets the manually defined base DN.
+ * Gets the manually defined base Dn.
*
* @return the manually defined base ND
*/
- public abstract DN getBaseDN();
+ public abstract Dn getBaseDN();
/**
- * Sets the manually defined base DN.
+ * Sets the manually defined base Dn.
*
- * @param baseDN the new base DN
+ * @param baseDn the new base Dn
*/
- public abstract void setBaseDN( DN baseDN );
+ public abstract void setBaseDN( Dn baseDn);
/**
@@ -500,11 +500,11 @@ public interface IBrowserConnection exte
/**
* Gets the entry from cache.
*
- * @param dn the DN of the entry
+ * @param dn the Dn of the entry
*
* @return the entry from cache or null if the entry isn't cached
*/
- public abstract IEntry getEntryFromCache( DN dn );
+ public abstract IEntry getEntryFromCache( Dn dn );
/**
Modified: directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/IEntry.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/IEntry.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/IEntry.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/IEntry.java Sun Jan 23 01:17:06 2011
@@ -24,8 +24,8 @@ package org.apache.directory.studio.ldap
import java.io.Serializable;
import java.util.Collection;
-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.shared.ldap.schema.ObjectClass;
import org.apache.directory.shared.ldap.filter.LdapURL;
import org.apache.directory.studio.connection.core.ConnectionPropertyPageProvider;
@@ -166,19 +166,19 @@ public interface IEntry extends Serializ
/**
- * Gets the DN of this entry, never null.
+ * Gets the Dn of this entry, never null.
*
- * @return the DN of this entry, never null.
+ * @return the Dn of this entry, never null.
*/
- public abstract DN getDn();
+ public abstract Dn getDn();
/**
- * Gets the RDN of this entry, never null.
+ * Gets the Rdn of this entry, never null.
*
- * @return the RDN of this entry, never null.
+ * @return the Rdn of this entry, never null.
*/
- public abstract RDN getRdn();
+ public abstract Rdn getRdn();
/**
Modified: directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/ISearch.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/ISearch.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/ISearch.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/ISearch.java Sun Jan 23 01:17:06 2011
@@ -25,7 +25,7 @@ import java.io.Serializable;
import java.util.List;
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.connection.core.Connection;
import org.apache.directory.studio.connection.core.ConnectionPropertyPageProvider;
import org.apache.directory.studio.connection.core.StudioControl;
@@ -45,7 +45,7 @@ public interface ISearch extends Seriali
{
/** Constant for empty search base */
- public static final DN EMPTY_SEARCH_BASE = new DN(); //$NON-NLS-1$
+ public static final Dn EMPTY_SEARCH_BASE = new Dn(); //$NON-NLS-1$
/** Constant for no returning attributes, an empty array */
public static final String[] NO_ATTRIBUTES = new String[0];
@@ -275,18 +275,18 @@ public interface ISearch extends Seriali
*
* @return the search base
*/
- public abstract DN getSearchBase();
+ public abstract Dn getSearchBase();
/**
* Sets the search base, a null search base will be
- * transformed to an empty DN.
+ * transformed to an empty Dn.
*
* Calling this method causes firing a search update event.
*
* @param searchBase the search base
*/
- public abstract void setSearchBase( DN searchBase );
+ public abstract void setSearchBase( Dn searchBase );
/**
Modified: directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/ISearchResult.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/ISearchResult.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/ISearchResult.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/ISearchResult.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;
import org.apache.directory.studio.connection.core.ConnectionPropertyPageProvider;
import org.apache.directory.studio.ldapbrowser.core.propertypageproviders.EntryPropertyPageProvider;
import org.eclipse.core.runtime.IAdaptable;
@@ -39,11 +39,11 @@ public interface ISearchResult extends S
{
/**
- * Returns the DN of the search result entry.
+ * Returns the Dn of the search result entry.
*
- * @return the DN of the search result entry.
+ * @return the Dn of the search result entry.
*/
- public DN getDn();
+ public Dn getDn();
/**
Modified: directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/IValue.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/IValue.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/IValue.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/IValue.java Sun Jan 23 01:17:06 2011
@@ -248,9 +248,9 @@ public interface IValue extends Serializ
/**
- * Returns true if this value is part of its entry's RDN.
+ * Returns true if this value is part of its entry's Rdn.
*
- * @return true if this value is part of its entry's RDN.
+ * @return true if this value is part of its entry's Rdn.
*/
public abstract boolean isRdnPart();
Modified: directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/NameException.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/NameException.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/NameException.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/NameException.java Sun Jan 23 01:17:06 2011
@@ -22,7 +22,7 @@ package org.apache.directory.studio.ldap
/**
- * @deprecated This class will be removed in the next version. The DN/RDN/RDNPart
+ * @deprecated This class will be removed in the next version. The Dn/Rdn/RDNPart
* classes are replaced with the shared-ldap LdapDN/Rdn/ATAV. This class just
* remains to provide backward compatibility of the old browserconnections.xml
* file that stores searches and bookmarks.
Modified: directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/SearchParameter.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/SearchParameter.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/SearchParameter.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/SearchParameter.java Sun Jan 23 01:17:06 2011
@@ -26,7 +26,7 @@ import java.util.ArrayList;
import java.util.List;
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.connection.core.Connection.AliasDereferencingMethod;
import org.apache.directory.studio.connection.core.Connection.ReferralHandlingMethod;
import org.apache.directory.studio.connection.core.StudioControl;
@@ -49,7 +49,7 @@ public class SearchParameter implements
private String name;
/** The search base. */
- private DN searchBase;
+ private Dn searchBase;
/** The filter. */
private String filter;
@@ -287,7 +287,7 @@ public class SearchParameter implements
*
* @return the search base
*/
- public DN getSearchBase()
+ public Dn getSearchBase()
{
return searchBase;
}
@@ -298,7 +298,7 @@ public class SearchParameter implements
*
* @param searchBase the search base
*/
- public void setSearchBase( DN searchBase )
+ public void setSearchBase( Dn searchBase )
{
assert searchBase != null;
this.searchBase = searchBase;
Modified: directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/filter/parser/LdapFilterToken.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/filter/parser/LdapFilterToken.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/filter/parser/LdapFilterToken.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/filter/parser/LdapFilterToken.java Sun Jan 23 01:17:06 2011
@@ -89,10 +89,10 @@ public class LdapFilterToken implements
/** The token identifier for the attribute type in extensible filters. */
public static final int EXTENSIBLE_ATTRIBUTE = 61;
- /** The token identifier for the colon before the DN flag in extensible filters. */
+ /** The token identifier for the colon before the Dn flag in extensible filters. */
public static final int EXTENSIBLE_DNATTR_COLON = 62;
- /** The token identifier for the DN flag in extensible filters. */
+ /** The token identifier for the Dn flag in extensible filters. */
public static final int EXTENSIBLE_DNATTR = 63;
/** The token identifier for the colon before the matching rule OID in extensible filters. */
Modified: directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/AbstractEntry.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/AbstractEntry.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/impl/AbstractEntry.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/AbstractEntry.java Sun Jan 23 01:17:06 2011
@@ -28,7 +28,7 @@ import java.util.LinkedHashSet;
import java.util.List;
import org.apache.directory.shared.ldap.constants.SchemaConstants;
-import org.apache.directory.shared.ldap.name.RDN;
+import org.apache.directory.shared.ldap.name.Rdn;
import org.apache.directory.shared.ldap.schema.ObjectClass;
import org.apache.directory.shared.ldap.filter.LdapURL;
import org.apache.directory.studio.connection.core.Connection;
@@ -110,11 +110,11 @@ public abstract class AbstractEntry impl
/**
- * Sets the RDN.
+ * Sets the Rdn.
*
- * @param newRdn the new RDN
+ * @param newRdn the new Rdn
*/
- protected abstract void setRdn( RDN newRdn );
+ protected abstract void setRdn( Rdn newRdn );
/**
@@ -383,10 +383,10 @@ public abstract class AbstractEntry impl
/**
* {@inheritDoc}
*/
- public RDN getRdn()
+ public Rdn getRdn()
{
- RDN rdn = getDn().getRdn();
- return rdn == null ? new RDN() : rdn;
+ Rdn rdn = getDn().getRdn();
+ return rdn == null ? new Rdn() : rdn;
}
Modified: directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/BaseDNEntry.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/BaseDNEntry.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/impl/BaseDNEntry.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/BaseDNEntry.java Sun Jan 23 01:17:06 2011
@@ -21,8 +21,8 @@
package org.apache.directory.studio.ldapbrowser.core.model.impl;
-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;
import org.apache.directory.studio.ldapbrowser.core.model.IEntry;
@@ -37,8 +37,8 @@ public class BaseDNEntry extends Abstrac
private static final long serialVersionUID = -5444229580355372176L;
- /** The base DN. */
- protected DN baseDn;
+ /** The base Dn. */
+ protected Dn baseDn;
/** The browser connection. */
protected IBrowserConnection browserConnection;
@@ -52,10 +52,10 @@ public class BaseDNEntry extends Abstrac
/**
* Creates a new instance of BaseDNEntry.
*
- * @param baseDn the base DN
+ * @param baseDn the base Dn
* @param browserConnection the browser connection
*/
- public BaseDNEntry( DN baseDn, IBrowserConnection browserConnection )
+ public BaseDNEntry( Dn baseDn, IBrowserConnection browserConnection )
{
assert baseDn != null;
assert browserConnection != null;
@@ -69,7 +69,7 @@ public class BaseDNEntry extends Abstrac
/**
* @see org.apache.directory.studio.ldapbrowser.core.model.IEntry#getDn()
*/
- public DN getDn()
+ public Dn getDn()
{
return baseDn;
}
@@ -96,7 +96,7 @@ public class BaseDNEntry extends Abstrac
/**
* @see org.apache.directory.studio.ldapbrowser.core.model.impl.AbstractEntry#setRdn(org.apache.directory.studio.ldapbrowser.core.model.RDN)
*/
- protected void setRdn( RDN newRdn )
+ protected void setRdn( Rdn newRdn )
{
}
Modified: directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/Bookmark.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/Bookmark.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/impl/Bookmark.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/Bookmark.java Sun Jan 23 01:17:06 2011
@@ -21,7 +21,7 @@
package org.apache.directory.studio.ldapbrowser.core.model.impl;
-import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.name.Dn;
import org.apache.directory.studio.connection.core.Connection;
import org.apache.directory.studio.ldapbrowser.core.events.BookmarkUpdateEvent;
import org.apache.directory.studio.ldapbrowser.core.events.EventRegistry;
@@ -80,10 +80,10 @@ public class Bookmark implements IBookma
* Creates a new instance of Bookmark.
*
* @param connection the connection
- * @param dn the target DN
+ * @param dn the target Dn
* @param name the symbolic name
*/
- public Bookmark( IBrowserConnection connection, DN dn, String name )
+ public Bookmark( IBrowserConnection connection, Dn dn, String name )
{
this.connection = connection;
this.bookmarkParameter = new BookmarkParameter( dn, name );
@@ -94,7 +94,7 @@ public class Bookmark implements IBookma
/**
* {@inheritDoc}
*/
- public DN getDn()
+ public Dn getDn()
{
return this.bookmarkParameter.getDn();
}
@@ -103,7 +103,7 @@ public class Bookmark implements IBookma
/**
* {@inheritDoc}
*/
- public void setDn( DN dn )
+ public void setDn( Dn dn )
{
this.bookmarkParameter.setDn( dn );
this.fireBookmarkUpdated( BookmarkUpdateEvent.Detail.BOOKMARK_UPDATED );
Modified: directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/BookmarkEntry.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/BookmarkEntry.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/impl/BookmarkEntry.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/BookmarkEntry.java Sun Jan 23 01:17:06 2011
@@ -21,7 +21,7 @@
package org.apache.directory.studio.ldapbrowser.core.model.impl;
-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;
import org.apache.directory.studio.ldapbrowser.core.model.ICompareableEntry;
@@ -46,9 +46,9 @@ public class BookmarkEntry extends Deleg
* Creates a new instance of BookmarkEntry.
*
* @param connection the connection of the bookmark target
- * @param dn the DN of the bookmark target
+ * @param dn the Dn of the bookmark target
*/
- public BookmarkEntry( IBrowserConnection connection, DN dn )
+ public BookmarkEntry( IBrowserConnection connection, Dn dn )
{
super( connection, dn );
}
Modified: directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/BrowserConnection.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/BrowserConnection.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/impl/BrowserConnection.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/BrowserConnection.java Sun Jan 23 01:17:06 2011
@@ -26,7 +26,7 @@ import java.util.HashMap;
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.ldap.filter.LdapURL;
import org.apache.directory.studio.connection.core.Connection;
import org.apache.directory.studio.connection.core.Connection.AliasDereferencingMethod;
@@ -164,7 +164,7 @@ public class BrowserConnection implement
/**
* {@inheritDoc}
*/
- public IEntry getEntryFromCache( DN dn )
+ public IEntry getEntryFromCache( Dn dn )
{
if ( dn == null )
{
@@ -206,11 +206,11 @@ public class BrowserConnection implement
/**
* {@inheritDoc}
*/
- public DN getBaseDN()
+ public Dn getBaseDN()
{
try
{
- return new DN( connection.getConnectionParameter().getExtendedProperty( CONNECTION_PARAMETER_BASE_DN ) );
+ return new Dn( connection.getConnectionParameter().getExtendedProperty( CONNECTION_PARAMETER_BASE_DN ) );
}
catch ( LdapInvalidDnException e )
{
@@ -222,9 +222,9 @@ public class BrowserConnection implement
/**
* {@inheritDoc}
*/
- public void setBaseDN( DN baseDN )
+ public void setBaseDN( Dn baseDn)
{
- connection.getConnectionParameter().setExtendedProperty( CONNECTION_PARAMETER_BASE_DN, baseDN.toString() );
+ connection.getConnectionParameter().setExtendedProperty( CONNECTION_PARAMETER_BASE_DN, baseDn.toString() );
ConnectionEventRegistry.fireConnectionUpdated( connection, this );
}
@@ -609,9 +609,9 @@ public class BrowserConnection implement
/**
* Removes the entry from the cache.
*
- * @param dn the DN of the entry to remove from cache
+ * @param dn the Dn of the entry to remove from cache
*/
- protected synchronized void uncacheEntry( DN dn )
+ protected synchronized void uncacheEntry( Dn dn )
{
dnToEntryCache.remove( Utils.getNormalizedOidString( dn, getSchema() ) );
}
Modified: directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/ContinuedSearchResultEntry.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/ContinuedSearchResultEntry.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/impl/ContinuedSearchResultEntry.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/ContinuedSearchResultEntry.java Sun Jan 23 01:17:06 2011
@@ -25,7 +25,7 @@ import java.util.ArrayList;
import java.util.List;
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.connection.core.Connection;
import org.apache.directory.studio.connection.core.ConnectionCorePlugin;
import org.apache.directory.studio.ldapbrowser.core.jobs.InitializeAttributesRunnable;
@@ -67,9 +67,9 @@ public class ContinuedSearchResultEntry
* Sets the internal state of the target connection to "resolved".
*
* @param connection the connection of the continued search
- * @param dn the DN of the entry
+ * @param dn the Dn of the entry
*/
- public ContinuedSearchResultEntry( IBrowserConnection connection, DN dn )
+ public ContinuedSearchResultEntry( IBrowserConnection connection, Dn dn )
{
super( connection, dn );
this.state = State.RESOLVED;
Modified: directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/DelegateEntry.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/DelegateEntry.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/impl/DelegateEntry.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/DelegateEntry.java Sun Jan 23 01:17:06 2011
@@ -23,8 +23,8 @@ package org.apache.directory.studio.ldap
import java.util.Collection;
-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.shared.ldap.schema.ObjectClass;
import org.apache.directory.shared.ldap.filter.LdapURL;
import org.apache.directory.studio.connection.core.jobs.StudioConnectionBulkRunnableWithProgress;
@@ -54,8 +54,8 @@ public abstract class DelegateEntry impl
/** The connection id. */
protected String connectionId;
- /** The DN. */
- protected DN dn;
+ /** The Dn. */
+ protected Dn dn;
/** The entry does not exist flag. */
protected boolean entryDoesNotExist;
@@ -73,9 +73,9 @@ public abstract class DelegateEntry impl
* Creates a new instance of DelegateEntry.
*
* @param browserConnection the browser connection of the delegate
- * @param dn the DN of the delegate
+ * @param dn the Dn of the delegate
*/
- protected DelegateEntry( IBrowserConnection browserConnection, DN dn )
+ protected DelegateEntry( IBrowserConnection browserConnection, Dn dn )
{
this.connectionId = browserConnection.getConnection() != null ? browserConnection.getConnection().getId()
: null;
@@ -149,7 +149,7 @@ public abstract class DelegateEntry impl
/**
* {@inheritDoc}
*/
- public DN getDn()
+ public Dn getDn()
{
if ( getDelegate() != null )
{
@@ -397,7 +397,7 @@ public abstract class DelegateEntry impl
/**
* {@inheritDoc}
*/
- public RDN getRdn()
+ public Rdn getRdn()
{
if ( getDelegate() != null )
{
@@ -405,8 +405,8 @@ public abstract class DelegateEntry impl
}
else
{
- RDN rdn = dn.getRdn();
- return rdn == null ? new RDN() : rdn;
+ Rdn rdn = dn.getRdn();
+ return rdn == null ? new Rdn() : rdn;
}
}
Modified: directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/DirectoryMetadataEntry.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/DirectoryMetadataEntry.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/impl/DirectoryMetadataEntry.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/DirectoryMetadataEntry.java Sun Jan 23 01:17:06 2011
@@ -21,7 +21,7 @@
package org.apache.directory.studio.ldapbrowser.core.model.impl;
-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;
@@ -48,10 +48,10 @@ public class DirectoryMetadataEntry exte
/**
* Creates a new instance of DirectoryMetadataEntry.
*
- * @param dn the DN
+ * @param dn the Dn
* @param browserConnection the browser connection
*/
- public DirectoryMetadataEntry( DN dn, IBrowserConnection browserConnection )
+ public DirectoryMetadataEntry( Dn dn, IBrowserConnection browserConnection )
{
super();
this.baseDn = dn;
Modified: directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/DummyConnection.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/DummyConnection.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/impl/DummyConnection.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/DummyConnection.java Sun Jan 23 01:17:06 2011
@@ -22,7 +22,7 @@ package org.apache.directory.studio.ldap
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.connection.core.Connection;
import org.apache.directory.studio.ldapbrowser.core.BookmarkManager;
import org.apache.directory.studio.ldapbrowser.core.SearchManager;
@@ -61,9 +61,9 @@ public class DummyConnection implements
/**
* {@inheritDoc}
*/
- public DN getBaseDN()
+ public Dn getBaseDN()
{
- return DN.EMPTY_DN;
+ return Dn.EMPTY_DN;
}
@@ -97,7 +97,7 @@ public class DummyConnection implements
/**
* {@inheritDoc}
*/
- public IEntry getEntryFromCache( DN dn )
+ public IEntry getEntryFromCache( Dn dn )
{
return null;
}
@@ -151,7 +151,7 @@ public class DummyConnection implements
/**
* {@inheritDoc}
*/
- public void setBaseDN( DN baseDN )
+ public void setBaseDN( Dn baseDn)
{
}
Modified: directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/DummyEntry.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/DummyEntry.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/impl/DummyEntry.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/DummyEntry.java Sun Jan 23 01:17:06 2011
@@ -29,8 +29,8 @@ import java.util.Map;
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.RDN;
+import org.apache.directory.shared.ldap.name.Dn;
+import org.apache.directory.shared.ldap.name.Rdn;
import org.apache.directory.shared.ldap.schema.ObjectClass;
import org.apache.directory.studio.connection.core.jobs.StudioConnectionBulkRunnableWithProgress;
import org.apache.directory.studio.ldapbrowser.core.events.AttributeAddedEvent;
@@ -63,8 +63,8 @@ public class DummyEntry implements IEntr
private static final long serialVersionUID = 4833907766031149971L;
- /** The DN. */
- private DN dn;
+ /** The Dn. */
+ private Dn dn;
/** The browser connection. */
private IBrowserConnection browserConnection;
@@ -81,10 +81,10 @@ public class DummyEntry implements IEntr
/**
* Creates a new instance of DummyEntry.
*
- * @param dn the DN
+ * @param dn the Dn
* @param browserConnection the browser connection
*/
- public DummyEntry( DN dn, IBrowserConnection browserConnection )
+ public DummyEntry( Dn dn, IBrowserConnection browserConnection )
{
this.dn = dn;
this.browserConnection = browserConnection;
@@ -93,11 +93,11 @@ public class DummyEntry implements IEntr
/**
- * Sets the DN.
+ * Sets the Dn.
*
- * @param dn the new DN
+ * @param dn the new Dn
*/
- public void setDn( DN dn )
+ public void setDn( Dn dn )
{
this.dn = dn;
}
@@ -208,7 +208,7 @@ public class DummyEntry implements IEntr
/**
* {@inheritDoc}
*/
- public DN getDn()
+ public Dn getDn()
{
return dn;
}
@@ -235,10 +235,10 @@ public class DummyEntry implements IEntr
/**
* {@inheritDoc}
*/
- public RDN getRdn()
+ public Rdn getRdn()
{
- RDN rdn = dn.getRdn();
- return rdn == null ? new RDN() : rdn;
+ Rdn rdn = dn.getRdn();
+ return rdn == null ? new Rdn() : rdn;
}
Modified: directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/Entry.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/Entry.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/impl/Entry.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/Entry.java Sun Jan 23 01:17:06 2011
@@ -21,8 +21,8 @@
package org.apache.directory.studio.ldapbrowser.core.model.impl;
-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.connection.core.DnUtils;
import org.apache.directory.studio.ldapbrowser.core.model.IBrowserConnection;
import org.apache.directory.studio.ldapbrowser.core.model.IEntry;
@@ -38,8 +38,8 @@ public class Entry extends AbstractEntry
private static final long serialVersionUID = -4718107307581983276L;
- /** The RDN. */
- protected RDN rdn;
+ /** The Rdn. */
+ protected Rdn rdn;
/** The parent entry. */
protected IEntry parent;
@@ -54,9 +54,9 @@ public class Entry extends AbstractEntry
* Creates a new instance of Entry.
*
* @param parent the parent entry
- * @param rdn the RDN
+ * @param rdn the Rdn
*/
- public Entry( IEntry parent, RDN rdn )
+ public Entry( IEntry parent, Rdn rdn )
{
assert parent != null;
assert rdn != null;
@@ -70,7 +70,7 @@ public class Entry extends AbstractEntry
/**
* @see org.apache.directory.studio.ldapbrowser.core.model.impl.AbstractEntry#getRdn()
*/
- public RDN getRdn()
+ public Rdn getRdn()
{
// performance opt.
return rdn;
@@ -80,9 +80,9 @@ public class Entry extends AbstractEntry
/**
* @see org.apache.directory.studio.ldapbrowser.core.model.IEntry#getDn()
*/
- public DN getDn()
+ public Dn getDn()
{
- DN dn = DnUtils.composeDn( rdn, parent.getDn() );
+ Dn dn = DnUtils.composeDn( rdn, parent.getDn() );
return dn;
}
@@ -108,7 +108,7 @@ public class Entry extends AbstractEntry
/**
* @see org.apache.directory.studio.ldapbrowser.core.model.impl.AbstractEntry#setRdn(org.apache.directory.studio.ldapbrowser.core.model.RDN)
*/
- protected void setRdn( RDN newRdn )
+ protected void setRdn( Rdn newRdn )
{
this.rdn = newRdn;
}
Modified: directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/RootDSE.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/RootDSE.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/impl/RootDSE.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/RootDSE.java Sun Jan 23 01:17:06 2011
@@ -24,7 +24,7 @@ package org.apache.directory.studio.ldap
import java.util.Arrays;
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.ldapbrowser.core.model.IAttribute;
import org.apache.directory.studio.ldapbrowser.core.model.IBrowserConnection;
import org.apache.directory.studio.ldapbrowser.core.model.IEntry;
@@ -54,7 +54,7 @@ public final class RootDSE extends BaseD
*/
public RootDSE( IBrowserConnection browserConnection )
{
- super( DN.EMPTY_DN, browserConnection );
+ super( Dn.EMPTY_DN, browserConnection );
}
Modified: directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/Search.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/Search.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/impl/Search.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/Search.java Sun Jan 23 01:17:06 2011
@@ -25,7 +25,7 @@ import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.List;
-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.connection.core.Connection;
import org.apache.directory.studio.connection.core.Connection.AliasDereferencingMethod;
@@ -128,8 +128,8 @@ public class Search implements ISearch
* @param conn
* the connection of the search
* @param searchBase
- * the base DN of the search, a null search base will be
- * transformed to an empty DN.
+ * the base Dn of the search, a null search base will be
+ * transformed to an empty Dn.
* @param filter
* the filter to use, null or empty filters will be
* transformed to (objectClass=*)
@@ -151,7 +151,7 @@ public class Search implements ISearch
* @param controls
* the controls
*/
- public Search( String searchName, IBrowserConnection conn, DN searchBase, String filter,
+ public Search( String searchName, IBrowserConnection conn, Dn searchBase, String filter,
String[] returningAttributes, SearchScope scope, int countLimit, int timeLimit,
AliasDereferencingMethod aliasesDereferencingMethod, ReferralHandlingMethod referralsHandlingMethod,
boolean initHasChildrenFlag, List<StudioControl> controls )
@@ -345,7 +345,7 @@ public class Search implements ISearch
/**
* {@inheritDoc}
*/
- public DN getSearchBase()
+ public Dn getSearchBase()
{
return searchParameter.getSearchBase();
}
@@ -354,7 +354,7 @@ public class Search implements ISearch
/**
* {@inheritDoc}
*/
- public void setSearchBase( DN searchBase )
+ public void setSearchBase( Dn searchBase )
{
searchParameter.setSearchBase( searchBase );
fireSearchUpdated( SearchUpdateEvent.EventDetail.SEARCH_PARAMETER_UPDATED );
Modified: directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/SearchContinuation.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/SearchContinuation.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/impl/SearchContinuation.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/SearchContinuation.java Sun Jan 23 01:17:06 2011
@@ -59,10 +59,10 @@ public class SearchContinuation extends
/**
* Creates a new instance of ContinuedSearchResultEntry.
*
- * @param dn the DN
+ * @param dn the Dn
* @param resultBrowserConnection the connection
* @param connection the connection of the continued search
- * @param dn the DN of the entry
+ * @param dn the Dn of the entry
*/
public SearchContinuation( ISearch originalSearch, LdapURL searchContinuationURL )
{
Modified: directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/SearchResult.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/SearchResult.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/impl/SearchResult.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/SearchResult.java Sun Jan 23 01:17:06 2011
@@ -23,7 +23,7 @@ package org.apache.directory.studio.ldap
import java.util.ArrayList;
-import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.name.Dn;
import org.apache.directory.studio.connection.core.Connection;
import org.apache.directory.studio.ldapbrowser.core.internal.search.LdapSearchPageScoreComputer;
import org.apache.directory.studio.ldapbrowser.core.model.AttributeHierarchy;
@@ -73,7 +73,7 @@ public class SearchResult implements ISe
/**
* {@inheritDoc}
*/
- public DN getDn()
+ public Dn getDn()
{
return entry.getDn();
}
Modified: directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/Value.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/Value.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/impl/Value.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/Value.java Sun Jan 23 01:17:06 2011
@@ -23,7 +23,7 @@ package org.apache.directory.studio.ldap
import java.util.Iterator;
-import org.apache.directory.shared.ldap.name.AVA;
+import org.apache.directory.shared.ldap.name.Ava;
import org.apache.directory.studio.connection.core.Connection;
import org.apache.directory.studio.ldapbrowser.core.internal.search.LdapSearchPageScoreComputer;
import org.apache.directory.studio.ldapbrowser.core.model.IAttribute;
@@ -305,10 +305,10 @@ public class Value implements IValue
*/
public boolean isRdnPart()
{
- Iterator<AVA> atavIterator = getAttribute().getEntry().getRdn().iterator();
+ Iterator<Ava> atavIterator = getAttribute().getEntry().getRdn().iterator();
while ( atavIterator.hasNext() )
{
- AVA ava = atavIterator.next();
+ Ava ava = atavIterator.next();
if ( getAttribute().getDescription().equals( ava.getUpType() )
&& getStringValue().equals( ava.getNormValue().getString() ) )
{
Modified: directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/schema/Schema.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/schema/Schema.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/schema/Schema.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/schema/Schema.java Sun Jan 23 01:17:06 2011
@@ -36,7 +36,7 @@ import java.util.Set;
import org.apache.commons.lang.StringUtils;
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.shared.ldap.schema.LdapSyntax;
import org.apache.directory.shared.ldap.schema.MatchingRule;
@@ -120,7 +120,7 @@ public class Schema
private LdifContentRecord schemaRecord;
- private DN dn;
+ private Dn dn;
private String createTimestamp;
@@ -232,7 +232,7 @@ public class Schema
private void parseSchemaRecord( LdifContentRecord schemaRecord ) throws Exception
{
setSchemaRecord( schemaRecord );
- setDn( new DN( schemaRecord.getDnLine().getValueAsString() ) );
+ setDn( new Dn( schemaRecord.getDnLine().getValueAsString() ) );
ObjectClassDescriptionSchemaParser ocdPparser = new ObjectClassDescriptionSchemaParser();
ocdPparser.setQuirksMode( true );
@@ -374,22 +374,22 @@ public class Schema
/**
- * Gets the DN of the schema record, may be null.
+ * Gets the Dn of the schema record, may be null.
*
- * @return the DN of the schema record, may be null
+ * @return the Dn of the schema record, may be null
*/
- public DN getDn()
+ public Dn getDn()
{
return dn;
}
/**
- * Sets the DN.
+ * Sets the Dn.
*
- * @param dn the new DN
+ * @param dn the new Dn
*/
- public void setDn( DN dn )
+ public void setDn( Dn dn )
{
this.dn = dn;
}
Modified: directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/utils/JNDIUtils.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/utils/JNDIUtils.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/utils/JNDIUtils.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/utils/JNDIUtils.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;
/**
@@ -40,10 +40,10 @@ public class JNDIUtils
* @return the LdapDN
* @throws LdapInvalidDnException
*/
- public static DN getDn( javax.naming.directory.SearchResult sr ) throws LdapInvalidDnException
+ public static Dn getDn( javax.naming.directory.SearchResult sr ) throws LdapInvalidDnException
{
String dn = sr.getNameInNamespace();
- DN ldapDn = new DN( unescapeJndiName( dn ) );
+ Dn ldapDn = new Dn( unescapeJndiName( dn ) );
return ldapDn;
}
@@ -51,8 +51,8 @@ public class JNDIUtils
/**
* Correct some JNDI encodings...
*
- * @param name the DN
- * @return the modified DN
+ * @param name the Dn
+ * @return the modified Dn
*/
public static String unescapeJndiName( String name )
{
Modified: directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/utils/ModelConverter.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/utils/ModelConverter.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/utils/ModelConverter.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/utils/ModelConverter.java Sun Jan 23 01:17:06 2011
@@ -32,7 +32,7 @@ import javax.naming.directory.DirContext
import javax.naming.directory.ModificationItem;
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.connection.core.StudioControl;
import org.apache.directory.studio.ldapbrowser.core.BrowserCoreConstants;
import org.apache.directory.studio.ldapbrowser.core.events.EventRegistry;
@@ -111,7 +111,7 @@ public class ModelConverter
EventRegistry.suspendEventFiringInCurrentThread();
- DummyEntry entry = new DummyEntry( new DN( ldifRecord.getDnLine().getValueAsString() ), connection );
+ DummyEntry entry = new DummyEntry( new Dn( ldifRecord.getDnLine().getValueAsString() ), connection );
for ( int i = 0; i < parts.length; i++ )
{
@@ -278,7 +278,7 @@ public class ModelConverter
}
- public static LdifDnLine dnToLdifDnLine( DN dn )
+ public static LdifDnLine dnToLdifDnLine( Dn dn )
{
LdifDnLine line = LdifDnLine.create( dn.getName() );
return line;
Modified: directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/utils/Utils.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/utils/Utils.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/utils/Utils.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/utils/Utils.java Sun Jan 23 01:17:06 2011
@@ -36,9 +36,9 @@ import java.util.Map;
import java.util.Set;
import org.apache.directory.shared.ldap.filter.LdapURL;
-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.connection.core.ConnectionParameter.EncryptionMethod;
import org.apache.directory.studio.connection.core.StudioControl;
@@ -71,7 +71,7 @@ public class Utils
{
/**
- * Transforms the given DN into a normalized String, usable by the schema cache.
+ * Transforms the given Dn into a normalized String, usable by the schema cache.
* The following transformations are performed:
* <ul>
* <li>The attribute type is replaced by the OID
@@ -81,19 +81,19 @@ public class Utils
* 2.5.4.4=bar
*
*
- * @param dn the DN
+ * @param dn the Dn
* @param schema the schema
*
* @return the oid string
*/
- public static String getNormalizedOidString( DN dn, Schema schema )
+ public static String getNormalizedOidString( Dn dn, Schema schema )
{
StringBuffer sb = new StringBuffer();
- Iterator<RDN> it = dn.getRdns().iterator();
+ Iterator<Rdn> it = dn.getRdns().iterator();
while ( it.hasNext() )
{
- RDN rdn = it.next();
+ Rdn rdn = it.next();
sb.append( getOidString( rdn, schema ) );
if ( it.hasNext() )
{
@@ -105,14 +105,14 @@ public class Utils
}
- private static String getOidString( RDN rdn, Schema schema )
+ private static String getOidString( Rdn rdn, Schema schema )
{
StringBuffer sb = new StringBuffer();
- Iterator<AVA> it = rdn.iterator();
+ Iterator<Ava> it = rdn.iterator();
while ( it.hasNext() )
{
- AVA ava = it.next();
+ Ava ava = it.next();
sb.append( getOidString( ava, schema ) );
if ( it.hasNext() )
{
@@ -124,7 +124,7 @@ public class Utils
}
- private static String getOidString( AVA ava, Schema schema )
+ private static String getOidString( Ava ava, Schema schema )
{
String oid = schema != null ? schema.getAttributeTypeDescription( ava.getNormType() ).getOid() : ava
.getNormType();
Modified: directory/studio/trunk/plugins/ldapbrowser.core/src/test/java/org/apache/directory/studio/ldapbrowser/core/model/LdapFilterParserTest.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.core/src/test/java/org/apache/directory/studio/ldapbrowser/core/model/LdapFilterParserTest.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.core/src/test/java/org/apache/directory/studio/ldapbrowser/core/model/LdapFilterParserTest.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.core/src/test/java/org/apache/directory/studio/ldapbrowser/core/model/LdapFilterParserTest.java Sun Jan 23 01:17:06 2011
@@ -324,7 +324,7 @@ public class LdapFilterParserTest extend
* Tests an extensible filter.
*
* From RFC4515:
- * The fourth example denotes an equality match, except that DN
+ * The fourth example denotes an equality match, except that Dn
* components should be considered part of the entry when doing the
* match.
*/
@@ -360,14 +360,14 @@ public class LdapFilterParserTest extend
* From RFC4515:
* The sixth and final example is also a filter that should be applied
* to any attribute supporting the matching rule given. Attributes
- * supporting the matching rule contained in the DN should also be
+ * supporting the matching rule contained in the Dn should also be
* considered.
*/
public void testExtensibleFilterRFC4515_6()
{
- parser.parse( "(:DN:2.4.6.8.10:=Dino)" );
- assertEquals( "(:DN:2.4.6.8.10:=Dino)", parser.getModel().toString() );
- assertEquals( "(:DN:2.4.6.8.10:=Dino)", parser.getModel().toUserProvidedString() );
+ parser.parse( "(:Dn:2.4.6.8.10:=Dino)" );
+ assertEquals( "(:Dn:2.4.6.8.10:=Dino)", parser.getModel().toString() );
+ assertEquals( "(:Dn:2.4.6.8.10:=Dino)", parser.getModel().toUserProvidedString() );
assertTrue( parser.getModel().isValid() );
}
Modified: directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/entryeditors/EntryEditorManager.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/entryeditors/EntryEditorManager.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/entryeditors/EntryEditorManager.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/entryeditors/EntryEditorManager.java Sun Jan 23 01:17:06 2011
@@ -31,7 +31,7 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
-import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.name.Dn;
import org.apache.directory.studio.connection.core.Connection;
import org.apache.directory.studio.connection.core.event.ConnectionEventRegistry;
import org.apache.directory.studio.connection.core.event.ConnectionUpdateAdapter;
@@ -350,7 +350,7 @@ public class EntryEditorManager
if ( editor != null && editor.getEntryEditorInput().getResolvedEntry() != null )
{
IBrowserConnection bc = editor.getEntryEditorInput().getResolvedEntry().getBrowserConnection();
- DN dn = editor.getEntryEditorInput().getResolvedEntry().getDn();
+ Dn dn = editor.getEntryEditorInput().getResolvedEntry().getDn();
if ( bc.getEntryFromCache( dn ) == null )
{
editorReferences.add( ref );
Modified: directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/BrowserUIConstants.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/BrowserUIConstants.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/BrowserUIConstants.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/BrowserUIConstants.java Sun Jan 23 01:17:06 2011
@@ -43,7 +43,7 @@ public final class BrowserUIConstants
public static final String ENTRY_EDITOR_EXTENSION_POINT = "org.apache.directory.studio.entryeditors"; //$NON-NLS-1$
- public static final String DN = "DN"; //$NON-NLS-1$
+ public static final String DN = "Dn"; //$NON-NLS-1$
public static final String PREFERENCE_BROWSER_LINK_WITH_EDITOR = "browserLinkWithEditor"; //$NON-NLS-1$
public static final String PREFERENCE_SEARCHRESULTEDITOR_SHOW_DN = "searchResultEditorShowDn"; //$NON-NLS-1$
Modified: directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/CopyEntryAsAction.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/CopyEntryAsAction.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/CopyEntryAsAction.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/CopyEntryAsAction.java Sun Jan 23 01:17:06 2011
@@ -45,7 +45,7 @@ import org.eclipse.swt.widgets.Display;
public abstract class CopyEntryAsAction extends BrowserAction
{
/**
- * Returns DN only Mode.
+ * Returns Dn only Mode.
*/
public static final int MODE_DN_ONLY = 1;
Modified: directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/CopyEntryAsCsvAction.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/CopyEntryAsCsvAction.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/CopyEntryAsCsvAction.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/CopyEntryAsCsvAction.java Sun Jan 23 01:17:06 2011
@@ -240,7 +240,7 @@ public class CopyEntryAsCsvAction extend
BrowserUIConstants.PREFERENCE_SEARCHRESULTEDITOR_SHOW_DN ) )
{
text.append( quoteCharacter );
- text.append( "DN" ); //$NON-NLS-1$
+ text.append( "Dn" ); //$NON-NLS-1$
text.append( quoteCharacter );
text.append( attributeDelimiter );
}
Modified: directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/CopyEntryAsLdifAction.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/CopyEntryAsLdifAction.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/CopyEntryAsLdifAction.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/CopyEntryAsLdifAction.java Sun Jan 23 01:17:06 2011
@@ -27,7 +27,7 @@ import java.util.HashSet;
import java.util.List;
import java.util.Set;
-import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.name.Dn;
import org.apache.directory.studio.ldapbrowser.core.BrowserCoreConstants;
import org.apache.directory.studio.ldapbrowser.core.BrowserCorePlugin;
import org.apache.directory.studio.ldapbrowser.core.model.IAttribute;
@@ -169,14 +169,14 @@ public class CopyEntryAsLdifAction exten
/**
- * Serialize a DN.
+ * Serialize a Dn.
*
* @param dn
- * the DN to serialize
+ * the Dn to serialize
* @param text
* the StringBuffer to serialize to
*/
- protected void serializeDn( DN dn, StringBuffer text )
+ protected void serializeDn( Dn dn, StringBuffer text )
{
text.append( ModelConverter.dnToLdifDnLine( dn ).toFormattedString( Utils.getLdifFormatParameters() ) );
}
Modified: directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/CopyValueAction.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/CopyValueAction.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/CopyValueAction.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/CopyValueAction.java Sun Jan 23 01:17:06 2011
@@ -26,7 +26,7 @@ import java.util.Iterator;
import java.util.LinkedHashSet;
import java.util.Set;
-import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.name.Dn;
import org.apache.directory.studio.ldapbrowser.common.actions.BrowserAction;
import org.apache.directory.studio.ldapbrowser.common.actions.CopyAction;
import org.apache.directory.studio.ldapbrowser.core.BrowserCoreConstants;
@@ -216,7 +216,7 @@ public class CopyValueAction extends Bro
}
else if ( getSelectedSearchResults().length > 0 )
{
- DN dn = getSelectedSearchResults()[0].getDn();
+ Dn dn = getSelectedSearchResults()[0].getDn();
switch ( mode )
{
case UTF8:
Modified: directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/GotoDnAction.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/GotoDnAction.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/GotoDnAction.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/GotoDnAction.java Sun Jan 23 01:17:06 2011
@@ -21,7 +21,7 @@
package org.apache.directory.studio.ldapbrowser.ui.actions;
-import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.name.Dn;
import org.apache.directory.studio.connection.core.Utils;
import org.apache.directory.studio.ldapbrowser.common.dialogs.DnDialog;
import org.apache.directory.studio.ldapbrowser.common.dialogs.TextDialog;
@@ -35,7 +35,7 @@ import org.eclipse.swt.widgets.Display;
/**
- * This action locates a DN that the user entered into a dialog.
+ * This action locates a Dn that the user entered into a dialog.
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
@@ -86,8 +86,8 @@ public class GotoDnAction extends Locate
/**
- * This implementation returns a connection and DN if th user put
- * a valid DN into the dialog
+ * This implementation returns a connection and Dn if th user put
+ * a valid Dn into the dialog
*/
protected ConnectionAndDn getConnectionAndDn()
{
@@ -95,7 +95,7 @@ public class GotoDnAction extends Locate
{
IBrowserConnection conn = ( IBrowserConnection ) getInput();
- DN dn = Utils.getLdapDn( getStringFromClipboard() );
+ Dn dn = Utils.getLdapDn( getStringFromClipboard() );
DnDialog dialog = new DnDialog(
getShell(),
Modified: directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/LocateDnInDitAction.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/LocateDnInDitAction.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/LocateDnInDitAction.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/LocateDnInDitAction.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.ldapbrowser.core.model.ISearchResult;
import org.apache.directory.studio.ldapbrowser.core.model.IValue;
import org.apache.directory.studio.ldapbrowser.ui.BrowserUIConstants;
@@ -32,7 +32,7 @@ import org.eclipse.jface.resource.ImageD
/**
* This action is used within the entry editor and search result editor
- * to locate and open the entry identified by the DN under the cursor.
+ * to locate and open the entry identified by the Dn under the cursor.
*
* Example: Attribute "seeAlso" with value "ou=test" is selected in entry edtor.
* Then this action is enabled and opens entry "ou=test" in DIT.
@@ -68,8 +68,8 @@ public class LocateDnInDitAction extends
/**
- * This implementation returns a connection and DN if the selected attribute or value
- * contains a valid DN.
+ * This implementation returns a connection and Dn if the selected attribute or value
+ * contains a valid Dn.
*/
protected ConnectionAndDn getConnectionAndDn()
{
@@ -81,15 +81,15 @@ public class LocateDnInDitAction extends
try
{
IValue value = getSelectedAttributeHierarchies()[0].getAttribute().getValues()[0];
- if ( value.isString() && DN.isValid( value.getStringValue() ) )
+ if ( value.isString() && Dn.isValid(value.getStringValue()) )
{
- return new ConnectionAndDn( value.getAttribute().getEntry().getBrowserConnection(), new DN(
+ return new ConnectionAndDn( value.getAttribute().getEntry().getBrowserConnection(), new Dn(
value.getStringValue() ) );
}
}
catch ( LdapInvalidDnException e )
{
- // no valid DN
+ // no valid Dn
}
}
@@ -98,15 +98,15 @@ public class LocateDnInDitAction extends
try
{
IValue value = getSelectedValues()[0];
- if ( value.isString() && DN.isValid( value.getStringValue() ) )
+ if ( value.isString() && Dn.isValid(value.getStringValue()) )
{
- return new ConnectionAndDn( value.getAttribute().getEntry().getBrowserConnection(), new DN(
+ return new ConnectionAndDn( value.getAttribute().getEntry().getBrowserConnection(), new Dn(
value.getStringValue() ) );
}
}
catch ( LdapInvalidDnException e )
{
- // no valid DN
+ // no valid Dn
}
}
Modified: directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/LocateEntryInDitAction.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/LocateEntryInDitAction.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/LocateEntryInDitAction.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/LocateEntryInDitAction.java Sun Jan 23 01:17:06 2011
@@ -90,7 +90,7 @@ public class LocateEntryInDitAction exte
/**
- * This implementation returns a connection and DN if the a search result or bookmark
+ * This implementation returns a connection and Dn if the a search result or bookmark
* is selected.
*/
protected ConnectionAndDn getConnectionAndDn()
Modified: directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/LocateInDitAction.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/LocateInDitAction.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/LocateInDitAction.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/LocateInDitAction.java Sun Jan 23 01:17:06 2011
@@ -21,7 +21,7 @@
package org.apache.directory.studio.ldapbrowser.ui.actions;
-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.actions.BrowserAction;
import org.apache.directory.studio.ldapbrowser.core.jobs.ReadEntryRunnable;
@@ -36,7 +36,7 @@ import org.eclipse.ui.PlatformUI;
/**
- * This action is used to locate and open an entry by its DN in DIT.
+ * This action is used to locate and open an entry by its Dn in DIT.
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
@@ -51,7 +51,7 @@ public abstract class LocateInDitAction
if ( connectionAndDn != null )
{
IBrowserConnection connection = connectionAndDn.connection;
- DN dn = connectionAndDn.dn;
+ Dn dn = connectionAndDn.dn;
IEntry entry = connection.getEntryFromCache( dn );
if ( entry == null )
@@ -106,14 +106,14 @@ public abstract class LocateInDitAction
/**
- * Get the connection and DN to open.
+ * Get the connection and Dn to open.
*
* @return a ConnectionAndDn bean, or null.
*/
protected abstract ConnectionAndDn getConnectionAndDn();
/**
- * Inner class to get connection and DN of the entry to locate.
+ * Inner class to get connection and Dn of the entry to locate.
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
@@ -122,17 +122,17 @@ public abstract class LocateInDitAction
/** The connection */
private IBrowserConnection connection;
- /** The DN */
- private DN dn;
+ /** The Dn */
+ private Dn dn;
/**
* Creates a new instance of ConnectionAndDn.
*
* @param connection the connection
- * @param dn the DN
+ * @param dn the Dn
*/
- protected ConnectionAndDn( IBrowserConnection connection, DN dn )
+ protected ConnectionAndDn( IBrowserConnection connection, Dn dn )
{
this.connection = connection;
this.dn = dn;
Modified: directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/MoveAction.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/MoveAction.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/MoveAction.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/MoveAction.java Sun Jan 23 01:17:06 2011
@@ -23,7 +23,7 @@ package org.apache.directory.studio.ldap
import java.util.LinkedHashSet;
-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.actions.BrowserAction;
import org.apache.directory.studio.ldapbrowser.common.dialogs.MoveEntriesDialog;
@@ -179,7 +179,7 @@ public class MoveAction extends BrowserA
MoveEntriesDialog moveDialog = new MoveEntriesDialog( getShell(), entries );
if ( moveDialog.open() == Dialog.OK )
{
- DN newParentDn = moveDialog.getParentDn();
+ Dn newParentDn = moveDialog.getParentDn();
if ( newParentDn != null /* && !newRdn.equals(entry.getRdn()) */)
{
IEntry newParentEntry = entries[0].getBrowserConnection().getEntryFromCache( newParentDn );
Modified: directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/dialogs/preferences/SearchResultEditorPreferencePage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/dialogs/preferences/SearchResultEditorPreferencePage.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/dialogs/preferences/SearchResultEditorPreferencePage.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/dialogs/preferences/SearchResultEditorPreferencePage.java Sun Jan 23 01:17:06 2011
@@ -41,7 +41,7 @@ import org.eclipse.ui.IWorkbenchPreferen
public class SearchResultEditorPreferencePage extends PreferencePage implements IWorkbenchPreferencePage
{
- /** The show DN button. */
+ /** The show Dn button. */
private Button showDnButton;
/** The show links button. */
Modified: directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/dialogs/properties/EntryPropertyPage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/dialogs/properties/EntryPropertyPage.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/dialogs/properties/EntryPropertyPage.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/dialogs/properties/EntryPropertyPage.java Sun Jan 23 01:17:06 2011
@@ -112,7 +112,7 @@ public class EntryPropertyPage extends P
Composite mainGroup = BaseWidgetUtils.createColumnContainer( BaseWidgetUtils.createColumnContainer( composite,
1, 1 ), 2, 1 );
- BaseWidgetUtils.createLabel( mainGroup, Messages.getString( "EntryPropertyPage.DN" ), 1 ); //$NON-NLS-1$
+ BaseWidgetUtils.createLabel( mainGroup, Messages.getString( "EntryPropertyPage.Dn" ), 1 ); //$NON-NLS-1$
dnText = BaseWidgetUtils.createWrappedLabeledText( mainGroup, "", 1 ); //$NON-NLS-1$
GridData dnTextGridData = new GridData( SWT.FILL, SWT.NONE, true, false );
dnTextGridData.widthHint = 300;
Modified: directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/dialogs/properties/SchemaPropertyPage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/dialogs/properties/SchemaPropertyPage.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/dialogs/properties/SchemaPropertyPage.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/dialogs/properties/SchemaPropertyPage.java Sun Jan 23 01:17:06 2011
@@ -54,7 +54,7 @@ import org.eclipse.ui.dialogs.PropertyPa
public class SchemaPropertyPage extends PropertyPage implements IWorkbenchPropertyPage
{
- /** Text field containing the DN of the schema entry. */
+ /** Text field containing the Dn of the schema entry. */
private Text dnText;
/** Text field containing the create timestamp of the schema entry. */
Modified: directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/entry/EntryEditorNavigationLocation.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/entry/EntryEditorNavigationLocation.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/entry/EntryEditorNavigationLocation.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/entry/EntryEditorNavigationLocation.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.entryeditors.EntryEditorExtension;
import org.apache.directory.studio.entryeditors.EntryEditorInput;
import org.apache.directory.studio.entryeditors.EntryEditorManager;
@@ -81,14 +81,14 @@ public class EntryEditorNavigationLocati
{
IEntry entry = eei.getEntryInput();
memento.putString( "TYPE", "IEntry" ); //$NON-NLS-1$ //$NON-NLS-2$
- memento.putString( "DN", entry.getDn().getName() ); //$NON-NLS-1$
+ memento.putString( "Dn", entry.getDn().getName() ); //$NON-NLS-1$
memento.putString( "CONNECTION", entry.getBrowserConnection().getConnection().getId() ); //$NON-NLS-1$
}
else if ( eei.getSearchResultInput() != null )
{
ISearchResult searchResult = eei.getSearchResultInput();
memento.putString( "TYPE", "ISearchResult" ); //$NON-NLS-1$ //$NON-NLS-2$
- memento.putString( "DN", searchResult.getDn().getName() ); //$NON-NLS-1$
+ memento.putString( "Dn", searchResult.getDn().getName() ); //$NON-NLS-1$
memento.putString( "SEARCH", searchResult.getSearch().getName() ); //$NON-NLS-1$
memento.putString(
"CONNECTION", searchResult.getSearch().getBrowserConnection().getConnection().getId() ); //$NON-NLS-1$
@@ -119,7 +119,7 @@ public class EntryEditorNavigationLocati
{
IBrowserConnection connection = BrowserCorePlugin.getDefault().getConnectionManager()
.getBrowserConnectionById( memento.getString( "CONNECTION" ) ); //$NON-NLS-1$
- DN dn = new DN( memento.getString( "DN" ) ); //$NON-NLS-1$
+ Dn dn = new Dn( memento.getString( "Dn" ) ); //$NON-NLS-1$
IEntry entry = connection.getEntryFromCache( dn );
super.setInput( new EntryEditorInput( entry, entryEditorExtension ) );
}
@@ -129,7 +129,7 @@ public class EntryEditorNavigationLocati
.getBrowserConnectionById( memento.getString( "CONNECTION" ) ); //$NON-NLS-1$
ISearch search = connection.getSearchManager().getSearch( memento.getString( "SEARCH" ) ); //$NON-NLS-1$
ISearchResult[] searchResults = search.getSearchResults();
- DN dn = new DN( memento.getString( "DN" ) ); //$NON-NLS-1$
+ Dn dn = new Dn( memento.getString( "Dn" ) ); //$NON-NLS-1$
for ( int i = 0; i < searchResults.length; i++ )
{
if ( dn.equals( searchResults[i].getDn() ) )