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 [29/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/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/AbstractServerXmlIO.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/AbstractServerXmlIO.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/AbstractServerXmlIO.java (original)
+++ directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/AbstractServerXmlIO.java Sun Jan 23 01:17:06 2011
@@ -183,7 +183,7 @@ public abstract class AbstractServerXmlI
/**
- * Reads an entry (without DN)
+ * Reads an entry (without Dn)
*
* @param text
* The ldif format text
Modified: directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v151/ServerConfigurationV151.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v151/ServerConfigurationV151.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v151/ServerConfigurationV151.java (original)
+++ directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v151/ServerConfigurationV151.java Sun Jan 23 01:17:06 2011
@@ -80,7 +80,7 @@ public class ServerConfigurationV151 ext
/** The SASL Realms */
private List<String> saslRealms;
- /** The Search Base DN */
+ /** The Search Base Dn */
private String searchBaseDn;
// Protocols
@@ -521,10 +521,10 @@ public class ServerConfigurationV151 ext
/**
- * Gets the Search Base DN.
+ * Gets the Search Base Dn.
*
* @return
- * the Search Base DN
+ * the Search Base Dn
*/
public String getSearchBaseDn()
{
@@ -1098,7 +1098,7 @@ public class ServerConfigurationV151 ext
/**
- * Sets the Search Base DN
+ * Sets the Search Base Dn
*
* @param searchBaseDn
* the new value
Modified: directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v151/ServerXmlIOV151.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v151/ServerXmlIOV151.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v151/ServerXmlIOV151.java (original)
+++ directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v151/ServerXmlIOV151.java Sun Jan 23 01:17:06 2011
@@ -483,7 +483,7 @@ public class ServerXmlIOV151 extends Abs
}
}
- // Search Base DN
+ // Search Base Dn
String searchBaseDn = readBeanProperty( "searchBaseDn", ldapConfiguration ); //$NON-NLS-1$
if ( searchBaseDn != null )
{
@@ -1144,7 +1144,7 @@ public class ServerXmlIOV151 extends Abs
}
}
- // Search Base DN
+ // Search Base Dn
propertyElement = ldapConfiguration.addElement( "property" ); //$NON-NLS-1$
propertyElement.addAttribute( "name", "searchBaseDN" ); //$NON-NLS-1$ //$NON-NLS-2$
propertyElement.addAttribute( "value", serverConfiguration.getSearchBaseDn() ); //$NON-NLS-1$
Modified: directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v152/ServerConfigurationV152.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v152/ServerConfigurationV152.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v152/ServerConfigurationV152.java (original)
+++ directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v152/ServerConfigurationV152.java Sun Jan 23 01:17:06 2011
@@ -74,7 +74,7 @@ public class ServerConfigurationV152 ext
/** The SASL Realms */
private List<String> saslRealms;
- /** The Search Base DN */
+ /** The Search Base Dn */
private String searchBaseDn;
// Protocols
@@ -452,10 +452,10 @@ public class ServerConfigurationV152 ext
/**
- * Gets the Search Base DN.
+ * Gets the Search Base Dn.
*
* @return
- * the Search Base DN
+ * the Search Base Dn
*/
public String getSearchBaseDn()
{
@@ -979,7 +979,7 @@ public class ServerConfigurationV152 ext
/**
- * Sets the Search Base DN
+ * Sets the Search Base Dn
*
* @param searchBaseDn
* the new value
Modified: directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v153/ServerConfigurationV153.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v153/ServerConfigurationV153.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v153/ServerConfigurationV153.java (original)
+++ directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v153/ServerConfigurationV153.java Sun Jan 23 01:17:06 2011
@@ -74,7 +74,7 @@ public class ServerConfigurationV153 ext
/** The SASL Realms */
private List<String> saslRealms;
- /** The Search Base DN */
+ /** The Search Base Dn */
private String searchBaseDn;
// Protocols
@@ -452,10 +452,10 @@ public class ServerConfigurationV153 ext
/**
- * Gets the Search Base DN.
+ * Gets the Search Base Dn.
*
* @return
- * the Search Base DN
+ * the Search Base Dn
*/
public String getSearchBaseDn()
{
@@ -979,7 +979,7 @@ public class ServerConfigurationV153 ext
/**
- * Sets the Search Base DN
+ * Sets the Search Base Dn
*
* @param searchBaseDn
* the new value
Modified: directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v154/ServerConfigurationV154.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v154/ServerConfigurationV154.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v154/ServerConfigurationV154.java (original)
+++ directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v154/ServerConfigurationV154.java Sun Jan 23 01:17:06 2011
@@ -74,7 +74,7 @@ public class ServerConfigurationV154 ext
/** The SASL Realms */
private List<String> saslRealms;
- /** The Search Base DN */
+ /** The Search Base Dn */
private String searchBaseDn;
// Protocols
@@ -452,10 +452,10 @@ public class ServerConfigurationV154 ext
/**
- * Gets the Search Base DN.
+ * Gets the Search Base Dn.
*
* @return
- * the Search Base DN
+ * the Search Base Dn
*/
public String getSearchBaseDn()
{
@@ -979,7 +979,7 @@ public class ServerConfigurationV154 ext
/**
- * Sets the Search Base DN
+ * Sets the Search Base Dn
*
* @param searchBaseDn
* the new value
Modified: directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v155/ServerConfigurationV155.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v155/ServerConfigurationV155.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v155/ServerConfigurationV155.java (original)
+++ directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v155/ServerConfigurationV155.java Sun Jan 23 01:17:06 2011
@@ -71,7 +71,7 @@ public class ServerConfigurationV155 ext
/** The SASL Realms */
private List<String> saslRealms;
- /** The Search Base DN */
+ /** The Search Base Dn */
private String searchBaseDn;
// Protocols
@@ -422,10 +422,10 @@ public class ServerConfigurationV155 ext
/**
- * Gets the Search Base DN.
+ * Gets the Search Base Dn.
*
* @return
- * the Search Base DN
+ * the Search Base Dn
*/
public String getSearchBaseDn()
{
@@ -923,7 +923,7 @@ public class ServerConfigurationV155 ext
/**
- * Sets the Search Base DN
+ * Sets the Search Base Dn
*
* @param searchBaseDn
* the new value
Modified: directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v156/ServerConfigurationV156.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v156/ServerConfigurationV156.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v156/ServerConfigurationV156.java (original)
+++ directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v156/ServerConfigurationV156.java Sun Jan 23 01:17:06 2011
@@ -71,7 +71,7 @@ public class ServerConfigurationV156 ext
/** The SASL Realms */
private List<String> saslRealms;
- /** The Search Base DN */
+ /** The Search Base Dn */
private String searchBaseDn;
// Protocols
@@ -422,10 +422,10 @@ public class ServerConfigurationV156 ext
/**
- * Gets the Search Base DN.
+ * Gets the Search Base Dn.
*
* @return
- * the Search Base DN
+ * the Search Base Dn
*/
public String getSearchBaseDn()
{
@@ -923,7 +923,7 @@ public class ServerConfigurationV156 ext
/**
- * Sets the Search Base DN
+ * Sets the Search Base Dn
*
* @param searchBaseDn
* the new value
Modified: directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v157/ServerConfigurationV157.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v157/ServerConfigurationV157.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v157/ServerConfigurationV157.java (original)
+++ directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v157/ServerConfigurationV157.java Sun Jan 23 01:17:06 2011
@@ -71,7 +71,7 @@ public class ServerConfigurationV157 ext
/** The SASL Realms */
private List<String> saslRealms;
- /** The Search Base DN */
+ /** The Search Base Dn */
private String searchBaseDn;
// Protocols
@@ -422,10 +422,10 @@ public class ServerConfigurationV157 ext
/**
- * Gets the Search Base DN.
+ * Gets the Search Base Dn.
*
* @return
- * the Search Base DN
+ * the Search Base Dn
*/
public String getSearchBaseDn()
{
@@ -923,7 +923,7 @@ public class ServerConfigurationV157 ext
/**
- * Sets the Search Base DN
+ * Sets the Search Base Dn
*
* @param searchBaseDn
* the new value
Modified: directory/studio/trunk/plugins/apacheds.configuration/src/main/resources/org/apache/directory/studio/apacheds/configuration/default-server-1.5.1.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/apacheds.configuration/src/main/resources/org/apache/directory/studio/apacheds/configuration/default-server-1.5.1.xml?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/studio/trunk/plugins/apacheds.configuration/src/main/resources/org/apache/directory/studio/apacheds/configuration/default-server-1.5.1.xml (original)
+++ directory/studio/trunk/plugins/apacheds.configuration/src/main/resources/org/apache/directory/studio/apacheds/configuration/default-server-1.5.1.xml Sun Jan 23 01:17:06 2011
@@ -120,7 +120,7 @@
</list>
</property>
- <!-- The base DN containing users that can be SASL authenticated. -->
+ <!-- The base Dn containing users that can be SASL authenticated. -->
<property name="searchBaseDn" value="ou=users,ou=system" />
<!-- SSL CONFIG CAN GO HERE-->
Modified: directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/ConnectionParameter.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/ConnectionParameter.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/ConnectionParameter.java (original)
+++ directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/ConnectionParameter.java Sun Jan 23 01:17:06 2011
@@ -130,7 +130,7 @@ public class ConnectionParameter
/** The authentication method. */
private AuthenticationMethod authMethod;
- /** The bind principal, typically a DN. */
+ /** The bind principal, typically a Dn. */
private String bindPrincipal;
/** The bind password. */
Modified: directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/Credentials.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/Credentials.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/Credentials.java (original)
+++ directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/Credentials.java Sun Jan 23 01:17:06 2011
@@ -42,7 +42,7 @@ public class Credentials implements ICre
/**
* Creates a new instance of Credentials.
*
- * @param bindPrincipal the bind principal, typically a DN
+ * @param bindPrincipal the bind principal, typically a Dn
* @param bindPassword the bind password
* @param connectionParameter the connection parameter
*/
Modified: directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/DnUtils.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/DnUtils.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/DnUtils.java (original)
+++ directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/DnUtils.java Sun Jan 23 01:17:06 2011
@@ -23,12 +23,12 @@ package org.apache.directory.studio.conn
import javax.naming.InvalidNameException;
import org.apache.directory.shared.ldap.exception.LdapInvalidDnException;
-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;
/**
- * Utility class for DN specific stuff.
+ * Utility class for Dn specific stuff.
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
@@ -36,28 +36,28 @@ public class DnUtils
{
/**
- * Composes an DN based on the given RDN and DN.
+ * Composes an Dn based on the given Rdn and Dn.
*
- * @param rdn the RDN
- * @param parent the parent DN
+ * @param rdn the Rdn
+ * @param parent the parent Dn
*
- * @return the composed DN
+ * @return the composed Dn
*/
- public static DN composeDn( RDN rdn, DN parent )
+ public static Dn composeDn( Rdn rdn, Dn parent )
{
return parent.add( rdn );
}
/**
- * Gets the parent DN of the given DN or null if the given
- * DN hasn't a parent.
+ * Gets the parent Dn of the given Dn or null if the given
+ * Dn hasn't a parent.
*
- * @param dn the DN
+ * @param dn the Dn
*
- * @return the parent DN, null if the given DN hasn't a parent
+ * @return the parent Dn, null if the given Dn hasn't a parent
*/
- public static DN getParent( DN dn )
+ public static Dn getParent( Dn dn )
{
if ( dn.size() < 1 )
{
@@ -65,27 +65,27 @@ public class DnUtils
}
else
{
- DN parent = ( DN ) dn.getPrefix( dn.size() - 1 );
+ Dn parent = (Dn) dn.getPrefix( dn.size() - 1 );
return parent;
}
}
/**
- * Compose an DN based on the given RDN and DN.
+ * Compose an Dn based on the given Rdn and Dn.
*
- * @param rdn the RDN
- * @param parent the parent DN
+ * @param rdn the Rdn
+ * @param parent the parent Dn
*
- * @return the composed RDN
+ * @return the composed Rdn
*
* @throws InvalidNameException the invalid name exception
*/
- public static DN composeDn( String rdn, String parent ) throws InvalidNameException
+ public static Dn composeDn( String rdn, String parent ) throws InvalidNameException
{
try
{
- return composeDn( new RDN( rdn ), new DN( parent ) );
+ return composeDn( new Rdn( rdn ), new Dn( parent ) );
}
catch ( LdapInvalidDnException e )
{
@@ -95,20 +95,20 @@ public class DnUtils
/**
- * Composes an DN based on the given prefix and suffix.
+ * Composes an Dn based on the given prefix and suffix.
*
* @param prefix the prefix
* @param suffix the suffix
*
- * @return the composed DN
+ * @return the composed Dn
*/
- public static DN composeDn( DN prefix, DN suffix )
+ public static Dn composeDn( Dn prefix, Dn suffix )
{
- DN ldapDn = suffix;
+ Dn ldapDn = suffix;
for ( int i = 0; i < prefix.size(); i++ )
{
- ldapDn = ldapDn.add( ( RDN ) prefix.getRdn( i ).clone() );
+ ldapDn = ldapDn.add( (Rdn) prefix.getRdn( i ).clone() );
}
return ldapDn;
@@ -116,14 +116,14 @@ public class DnUtils
/**
- * Gets the prefix, cuts the suffix from the given DN.
+ * Gets the prefix, cuts the suffix from the given Dn.
*
- * @param dn the DN
+ * @param dn the Dn
* @param suffix the suffix
*
* @return the prefix
*/
- public static DN getPrefixName( DN dn, DN suffix )
+ public static Dn getPrefixName( Dn dn, Dn suffix )
{
if ( suffix.size() < 1 )
{
@@ -131,23 +131,23 @@ public class DnUtils
}
else
{
- DN prefix = ( DN ) dn.getSuffix( suffix.size() );
+ Dn prefix = (Dn) dn.getSuffix( suffix.size() );
return prefix;
}
}
/**
- * Composes an RDN based on the given types and values.
+ * Composes an Rdn based on the given types and values.
*
* @param rdnTypes the types
* @param rdnValues the values
*
- * @return the RDN
+ * @return the Rdn
*
* @throws InvalidNameException the invalid name exception
*/
- public static RDN composeRdn( String[] rdnTypes, String[] rdnValues ) throws InvalidNameException
+ public static Rdn composeRdn( String[] rdnTypes, String[] rdnValues ) throws InvalidNameException
{
StringBuffer sb = new StringBuffer();
for ( int i = 0; i < rdnTypes.length; i++ )
@@ -159,15 +159,15 @@ public class DnUtils
sb.append( rdnTypes[i] );
sb.append( '=' );
- sb.append( RDN.escapeValue( rdnValues[i] ) );
+ sb.append( Rdn.escapeValue(rdnValues[i]) );
}
String s = sb.toString();
try
{
- if ( DN.isValid( s ) )
+ if ( Dn.isValid(s) )
{
- RDN rdn = new RDN( sb.toString() );
+ Rdn rdn = new Rdn( sb.toString() );
return rdn;
}
}
Modified: directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/ICredentials.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/ICredentials.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/ICredentials.java (original)
+++ directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/ICredentials.java Sun Jan 23 01:17:06 2011
@@ -38,7 +38,7 @@ public interface ICredentials
/**
- * Gets the bind principal, typically a DN.
+ * Gets the bind principal, typically a Dn.
*
* @return the bind principal
*/
Modified: directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/IJndiLogger.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/IJndiLogger.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/IJndiLogger.java (original)
+++ directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/IJndiLogger.java Sun Jan 23 01:17:06 2011
@@ -44,7 +44,7 @@ public interface IJndiLogger
* Logs a changetype:add.
*
* @param connection the connection
- * @param dn the DN
+ * @param dn the Dn
* @param attributes the attributes
* @param controls the controls
* @param ex the naming exception if an error occurred, null otherwise
@@ -57,7 +57,7 @@ public interface IJndiLogger
* Logs a changetype:delete.
*
* @param connection the connection
- * @param dn the DN
+ * @param dn the Dn
* @param controls the controls
* @param ex the naming exception if an error occurred, null otherwise
*
@@ -70,7 +70,7 @@ public interface IJndiLogger
* Logs a changetype:modify.
*
* @param connection the connection
- * @param dn the DN
+ * @param dn the Dn
* @param modificationItems the modification items
* @param ex the naming exception if an error occurred, null otherwise
* @param controls the controls
@@ -83,9 +83,9 @@ public interface IJndiLogger
* Logs a changetype:moddn.
*
* @param connection the connection
- * @param oldDn the old DN
- * @param newDn the new DN
- * @param deleteOldRdn the delete old RDN
+ * @param oldDn the old Dn
+ * @param newDn the new Dn
+ * @param deleteOldRdn the delete old Rdn
* @param controls the controls
* @param ex the naming exception if an error occurred, null otherwise
*/
Modified: directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/Utils.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/Utils.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/Utils.java (original)
+++ directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/Utils.java Sun Jan 23 01:17:06 2011
@@ -29,7 +29,7 @@ import javax.naming.directory.SearchCont
import org.apache.directory.shared.ldap.exception.LdapInvalidDnException;
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.shared.util.Strings;
import org.apache.directory.studio.connection.core.Connection.AliasDereferencingMethod;
import org.apache.directory.studio.connection.core.ConnectionParameter.EncryptionMethod;
@@ -193,7 +193,7 @@ public class Utils
url.setPort( connection.getPort() );
try
{
- url.setDn( new DN( searchBase ) );
+ url.setDn( new Dn( searchBase ) );
}
catch ( LdapInvalidDnException e )
{
@@ -317,11 +317,11 @@ public class Utils
* Gets the LdapDN from the given String or null if the
* String can't be parsed.
*
- * @param dn the DN as String
+ * @param dn the Dn as String
*
- * @return the DN as LdapDN
+ * @return the Dn as LdapDN
*/
- public static DN getLdapDn( String dn )
+ public static Dn getLdapDn( String dn )
{
if ( dn == null )
{
@@ -329,7 +329,7 @@ public class Utils
}
try
{
- return new DN( dn );
+ return new Dn( dn );
}
catch ( LdapInvalidDnException e )
{
Modified: directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/ConnectionWrapper.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/ConnectionWrapper.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/ConnectionWrapper.java (original)
+++ directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/ConnectionWrapper.java Sun Jan 23 01:17:06 2011
@@ -109,7 +109,7 @@ public interface ConnectionWrapper
/**
* Modifies attributes of an entry.
*
- * @param dn the DN
+ * @param dn the Dn
* @param modificationItems the modification items
* @param controls the controls
* @param monitor the progress monitor
@@ -122,9 +122,9 @@ public interface ConnectionWrapper
/**
* Renames an entry.
*
- * @param oldDn the old DN
- * @param newDn the new DN
- * @param deleteOldRdn true to delete the old RDN
+ * @param oldDn the old Dn
+ * @param newDn the new Dn
+ * @param deleteOldRdn true to delete the old Rdn
* @param controls the controls
* @param monitor the progress monitor
* @param referralsInfo the referrals info
@@ -136,7 +136,7 @@ public interface ConnectionWrapper
/**
* Creates an entry.
*
- * @param dn the entry's DN
+ * @param dn the entry's Dn
* @param attributes the entry's attributes
* @param controls the controls
* @param monitor the progress monitor
@@ -149,7 +149,7 @@ public interface ConnectionWrapper
/**
* Deletes an entry.
*
- * @param dn the DN of the entry to delete
+ * @param dn the Dn of the entry to delete
* @param controls the controls
* @param monitor the progress monitor
* @param referralsInfo the referrals info
Modified: directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/api/DirectoryApiConnectionWrapper.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/api/DirectoryApiConnectionWrapper.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/api/DirectoryApiConnectionWrapper.java (original)
+++ directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/api/DirectoryApiConnectionWrapper.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.ResultResponse;
import org.apache.directory.shared.ldap.message.SearchRequest;
import org.apache.directory.shared.ldap.message.SearchRequestImpl;
-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;
@@ -417,7 +417,7 @@ public class DirectoryApiConnectionWrapp
{
// Preparing the search request
SearchRequest request = new SearchRequestImpl();
- request.setBase( new DN( searchBase ) );
+ request.setBase( new Dn( searchBase ) );
request.setFilter( filter );
request.setScope( convertSearchScope( searchControls ) );
request.addAttributes( searchControls.getReturningAttributes() );
@@ -599,7 +599,7 @@ public class DirectoryApiConnectionWrapp
{
// Preparing the modify request
ModifyRequest request = new ModifyRequestImpl();
- request.setName( new DN( dn ) );
+ request.setName( new Dn( dn ) );
Modification[] modifications = convertModificationItems( modificationItems );
if ( modifications != null )
{
@@ -732,9 +732,9 @@ public class DirectoryApiConnectionWrapp
{
// Preparing the rename request
ModifyDnRequest request = new ModifyDnRequestImpl();
- request.setName( new DN( oldDn ) );
+ request.setName( new Dn( oldDn ) );
request.setDeleteOldRdn( deleteOldRdn );
- DN newName = new DN( newDn );
+ Dn newName = new Dn( newDn );
request.setNewRdn( newName.getRdn() );
request.setNewSuperior( newName.getParent() );
request.addAllControls( convertControls( controls ) );
@@ -803,8 +803,8 @@ public class DirectoryApiConnectionWrapp
{
// Preparing the add request
AddRequest request = new AddRequestImpl();
- request.setEntryDn( new DN( dn ) );
- request.setEntry( AttributeUtils.toClientEntry( attributes, new DN( dn ) ) );
+ request.setEntryDn( new Dn( dn ) );
+ request.setEntry( AttributeUtils.toClientEntry( attributes, new Dn( dn ) ) );
request.addAllControls( convertControls( controls ) );
// Performing the add operation
@@ -871,7 +871,7 @@ public class DirectoryApiConnectionWrapp
{
// Preparing the delete request
DeleteRequest request = new DeleteRequestImpl();
- request.setName( new DN( dn ) );
+ request.setName( new Dn( dn ) );
request.addAllControls( convertControls( controls ) );
// Performing the delete operation
Modified: directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/jndi/JNDIConnectionWrapper.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/jndi/JNDIConnectionWrapper.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/jndi/JNDIConnectionWrapper.java (original)
+++ directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/jndi/JNDIConnectionWrapper.java Sun Jan 23 01:17:06 2011
@@ -95,7 +95,7 @@ import org.eclipse.osgi.util.NLS;
* - asychron + cancelable
* - SSL certificate
* - manages broken/closed connections
- * - delete old RDN
+ * - delete old Rdn
* - exception handling
* - referral handling
*
@@ -420,7 +420,7 @@ public class JNDIConnectionWrapper imple
/**
* Modifies attributes of an entry.
*
- * @param dn the DN
+ * @param dn the Dn
* @param modificationItems the modification items
* @param controls the controls
* @param monitor the progress monitor
@@ -525,9 +525,9 @@ public class JNDIConnectionWrapper imple
/**
* Renames an entry.
*
- * @param oldDn the old DN
- * @param newDn the new DN
- * @param deleteOldRdn true to delete the old RDN
+ * @param oldDn the old Dn
+ * @param newDn the new Dn
+ * @param deleteOldRdn true to delete the old Rdn
* @param controls the controls
* @param monitor the progress monitor
* @param referralsInfo the referrals info
@@ -554,7 +554,7 @@ public class JNDIConnectionWrapper imple
// use "throw" as we handle referrals manually
modCtx.addToEnvironment( Context.REFERRAL, REFERRAL_THROW );
- // delete old RDN
+ // delete old Rdn
if ( deleteOldRdn )
{
modCtx.addToEnvironment( JAVA_NAMING_LDAP_DELETE_RDN, "true" ); //$NON-NLS-1$
@@ -632,7 +632,7 @@ public class JNDIConnectionWrapper imple
/**
* Creates an entry.
*
- * @param dn the entry's DN
+ * @param dn the entry's Dn
* @param attributes the entry's attributes
* @param controls the controls
* @param monitor the progress monitor
@@ -735,7 +735,7 @@ public class JNDIConnectionWrapper imple
/**
* Deletes an entry.
*
- * @param dn the DN of the entry to delete
+ * @param dn the Dn of the entry to delete
* @param controls the controls
* @param monitor the progress monitor
* @param referralsInfo the referrals info
@@ -1469,7 +1469,7 @@ public class JNDIConnectionWrapper imple
* <p>
* In JNDI we have could use the following classes for names:
* <ul>
- * <li>DN as String</li>
+ * <li>Dn as String</li>
* <li>javax.naming.CompositeName</li>
* <li>javax.naming.ldap.LdapName (since Java5)</li>
* <li>org.apache.directory.shared.ldap.name.LdapDN</li>
@@ -1477,22 +1477,22 @@ public class JNDIConnectionWrapper imple
* <p>
* There are some drawbacks when using this classes:
* <ul>
- * <li>When passing DN as String, JNDI doesn't handle slashes '/' correctly.
+ * <li>When passing Dn as String, JNDI doesn't handle slashes '/' correctly.
* So we must use a Name object here.</li>
* <li>With CompositeName we have the same problem with slashes '/'.</li>
* <li>When using LdapDN from shared-ldap, JNDI uses the toString() method
* and LdapDN.toString() returns the normalized ATAV, but we need the
* user provided ATAV.</li>
- * <li>When using LdapName for the empty DN (Root DSE) JNDI _sometimes_ throws
+ * <li>When using LdapName for the empty Dn (Root DSE) JNDI _sometimes_ throws
* an Exception (java.lang.IndexOutOfBoundsException: Posn: -1, Size: 0
* at javax.naming.ldap.LdapName.getPrefix(LdapName.java:240)).</li>
* <li>Using LdapDN for the RootDSE doesn't work with Apache Harmony because
* its JNDI provider only accepts intstances of CompositeName or LdapName.</li>
* </ul>
* <p>
- * So we use LdapName as default and the CompositeName for the empty DN.
+ * So we use LdapName as default and the CompositeName for the empty Dn.
*
- * @param name the DN
+ * @param name the Dn
*
* @return the save JNDI name
*
Modified: directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/jndi/LdifModificationLogger.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/jndi/LdifModificationLogger.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/jndi/LdifModificationLogger.java (original)
+++ directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/jndi/LdifModificationLogger.java Sun Jan 23 01:17:06 2011
@@ -49,8 +49,8 @@ import javax.naming.ldap.Control;
import org.apache.directory.shared.ldap.exception.LdapInvalidDnException;
import org.apache.directory.shared.ldap.message.Referral;
-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.Connection;
import org.apache.directory.studio.connection.core.Connection.AliasDereferencingMethod;
import org.apache.directory.studio.connection.core.ConnectionCoreConstants;
@@ -421,9 +421,9 @@ public class LdifModificationLogger impl
try
{
- DN dn = new DN( newDn );
- RDN newrdn = dn.getRdn();
- DN newsuperior = DnUtils.getParent( dn );
+ Dn dn = new Dn( newDn );
+ Rdn newrdn = dn.getRdn();
+ Dn newsuperior = DnUtils.getParent( dn );
LdifChangeModDnRecord record = new LdifChangeModDnRecord( LdifDnLine.create( oldDn ) );
addControlLines( record, controls );
Modified: directory/studio/trunk/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/actions/CopyAction.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/actions/CopyAction.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/studio/trunk/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/actions/CopyAction.java (original)
+++ directory/studio/trunk/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/actions/CopyAction.java Sun Jan 23 01:17:06 2011
@@ -26,7 +26,7 @@ import java.util.Arrays;
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.ConnectionCoreConstants;
import org.apache.directory.studio.connection.core.ConnectionFolder;
@@ -195,7 +195,7 @@ public class CopyAction extends StudioAc
{
ConnectionParameter parameter = connection.getConnectionParameter();
LdapURL ldapUrl = new LdapURL();
- ldapUrl.setDn( DN.EMPTY_DN);
+ ldapUrl.setDn( Dn.EMPTY_DN);
for ( ConnectionParameterPage connectionParameterPage : connectionParameterPages )
{
connectionParameterPage.mergeParametersToLdapURL( parameter, ldapUrl );
Modified: directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/actions/BrowserSelectionUtils.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/actions/BrowserSelectionUtils.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/actions/BrowserSelectionUtils.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/actions/BrowserSelectionUtils.java Sun Jan 23 01:17:06 2011
@@ -68,9 +68,9 @@ public abstract class BrowserSelectionUt
* search base and filter:
* <ul>
* <li>ISearch: all parameters are copied to the prototype search (clone)
- * <li>IEntry or ISearchResult or IBookmark: DN is used as search base
+ * <li>IEntry or ISearchResult or IBookmark: Dn is used as search base
* <li>IEntry: children filter is used as filter
- * <li>IAttribute or IValue: the entry's DN is used as search base,
+ * <li>IAttribute or IValue: the entry's Dn is used as search base,
* the filter is built using the name-value-pairs (query by example).
* </ul>
*
Modified: directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/actions/DeleteAction.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/actions/DeleteAction.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/actions/DeleteAction.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/actions/DeleteAction.java Sun Jan 23 01:17:06 2011
@@ -454,7 +454,7 @@ public class DeleteAction extends Browse
AttributeType atd = value.getAttribute().getAttributeTypeDescription();
AttributeHierarchy ah = value.getAttribute().getEntry().getAttributeWithSubtypes( type );
- // check if (part of) RDN is selected
+ // check if (part of) Rdn is selected
if ( value.isRdnPart() )
{
message.append( NLS.bind( Messages.getString( "DeleteAction.DeletePartOfRDN" ), value.toString() ) ); //$NON-NLS-1$
Modified: directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/actions/RenameAction.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/actions/RenameAction.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/actions/RenameAction.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/actions/RenameAction.java Sun Jan 23 01:17:06 2011
@@ -21,7 +21,7 @@
package org.apache.directory.studio.ldapbrowser.common.actions;
-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;
@@ -194,7 +194,7 @@ public class RenameAction extends Browse
RenameEntryDialog renameDialog = new RenameEntryDialog( getShell(), entry );
if ( renameDialog.open() == Dialog.OK )
{
- RDN newRdn = renameDialog.getRdn();
+ Rdn newRdn = renameDialog.getRdn();
if ( newRdn != null && !newRdn.equals( entry.getRdn() ) )
{
new StudioBrowserJob(
Modified: directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/DnDialog.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/DnDialog.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/DnDialog.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/DnDialog.java Sun Jan 23 01:17:06 2011
@@ -21,7 +21,7 @@
package org.apache.directory.studio.ldapbrowser.common.dialogs;
-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.ldapbrowser.common.BrowserCommonActivator;
import org.apache.directory.studio.ldapbrowser.common.BrowserCommonConstants;
@@ -39,7 +39,7 @@ import org.eclipse.swt.widgets.Shell;
/**
- * The DnDialog is used from the DN value editor to edit and select a DN.
+ * The DnDialog is used from the Dn value editor to edit and select a Dn.
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
@@ -60,7 +60,7 @@ public class DnDialog extends Dialog
private IBrowserConnection connection;
/** The dn */
- private DN dn;
+ private Dn dn;
/**
@@ -70,9 +70,9 @@ public class DnDialog extends Dialog
* @param title the title of the dialog
* @param description the description of the dialog
* @param connection the connection used to browse the directory
- * @param dn the initial DN, may be null
+ * @param dn the initial Dn, may be null
*/
- public DnDialog( Shell parentShell, String title, String description, IBrowserConnection connection, DN dn )
+ public DnDialog( Shell parentShell, String title, String description, IBrowserConnection connection, Dn dn )
{
super( parentShell );
super.setShellStyle( super.getShellStyle() | SWT.RESIZE );
@@ -165,7 +165,7 @@ public class DnDialog extends Dialog
*
* @return the dn
*/
- public DN getDn()
+ public Dn getDn()
{
return dn;
}
Modified: directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/EntryExistsCopyStrategyDialogImpl.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/EntryExistsCopyStrategyDialogImpl.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/EntryExistsCopyStrategyDialogImpl.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/EntryExistsCopyStrategyDialogImpl.java Sun Jan 23 01:17:06 2011
@@ -21,8 +21,8 @@
package org.apache.directory.studio.ldapbrowser.common.dialogs;
-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.ui.widgets.BaseWidgetUtils;
import org.apache.directory.studio.ldapbrowser.common.widgets.DnBuilderWidget;
import org.apache.directory.studio.ldapbrowser.common.widgets.WidgetModifyEvent;
@@ -71,11 +71,11 @@ public class EntryExistsCopyStrategyDial
// /** The remember check box. */
// private Button rememberCheckbox;
- /** The DN builder widget. */
+ /** The Dn builder widget. */
private DnBuilderWidget dnBuilderWidget;
- /** The new RDN. */
- private RDN rdn;
+ /** The new Rdn. */
+ private Rdn rdn;
/** The strategy */
private EntryExistsCopyStrategy strategy;
@@ -85,7 +85,7 @@ public class EntryExistsCopyStrategyDial
private IBrowserConnection browserConnection;
- private DN dn;
+ private Dn dn;
/**
@@ -260,7 +260,7 @@ public class EntryExistsCopyStrategyDial
/**
* {@inheritDoc}
*/
- public RDN getRdn()
+ public Rdn getRdn()
{
return rdn;
}
@@ -278,7 +278,7 @@ public class EntryExistsCopyStrategyDial
/**
* {@inheritDoc}
*/
- public void setExistingEntry( IBrowserConnection browserConnection, DN dn )
+ public void setExistingEntry( IBrowserConnection browserConnection, Dn dn )
{
this.browserConnection = browserConnection;
this.dn = dn;
Modified: directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/MoveEntriesDialog.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/MoveEntriesDialog.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/MoveEntriesDialog.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/MoveEntriesDialog.java Sun Jan 23 01:17:06 2011
@@ -21,7 +21,7 @@
package org.apache.directory.studio.ldapbrowser.common.dialogs;
-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.ldapbrowser.common.widgets.DnBuilderWidget;
@@ -58,8 +58,8 @@ public class MoveEntriesDialog extends D
/** The ok button. */
private Button okButton;
- /** The parent DN. */
- private DN parentDn;
+ /** The parent Dn. */
+ private Dn parentDn;
/**
@@ -159,7 +159,7 @@ public class MoveEntriesDialog extends D
*
* @return the parent dn
*/
- public DN getParentDn()
+ public Dn getParentDn()
{
return parentDn;
}
Modified: directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/RenameEntryDialog.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/RenameEntryDialog.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/RenameEntryDialog.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/RenameEntryDialog.java Sun Jan 23 01:17:06 2011
@@ -24,7 +24,7 @@ package org.apache.directory.studio.ldap
import java.util.Collection;
import org.apache.commons.lang.ArrayUtils;
-import org.apache.directory.shared.ldap.name.RDN;
+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.ldapbrowser.common.BrowserCommonActivator;
@@ -44,14 +44,14 @@ import org.eclipse.swt.widgets.Shell;
/**
- * A dialog to enter the new RDN of an entry.
+ * A dialog to enter the new Rdn of an entry.
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class RenameEntryDialog extends Dialog implements WidgetModifyListener
{
- /** The "Delete old RDN" dialog setting . */
+ /** The "Delete old Rdn" dialog setting . */
private static final String DELETE_OLD_RDN_DIALOGSETTING_KEY = RenameEntryDialog.class.getName() + ".deleteOldRdn"; //$NON-NLS-1$
/** The dialog title. */
@@ -67,7 +67,7 @@ public class RenameEntryDialog extends D
private Button okButton;
/** The new rdn. */
- private RDN rdn;
+ private Rdn rdn;
/**
@@ -172,7 +172,7 @@ public class RenameEntryDialog extends D
*
* @return the rdn
*/
- public RDN getRdn()
+ public Rdn getRdn()
{
return rdn;
}
Modified: directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/SimulateRenameDialogImpl.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/SimulateRenameDialogImpl.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/SimulateRenameDialogImpl.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/SimulateRenameDialogImpl.java Sun Jan 23 01:17:06 2011
@@ -21,7 +21,7 @@
package org.apache.directory.studio.ldapbrowser.common.dialogs;
-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.ldapbrowser.core.jobs.SimulateRenameDialog;
import org.apache.directory.studio.ldapbrowser.core.model.IBrowserConnection;
@@ -54,11 +54,11 @@ public class SimulateRenameDialogImpl ex
/** The browser connection. */
private IBrowserConnection browserConnection;
- /** The old DN. */
- private DN oldDn;
+ /** The old Dn. */
+ private Dn oldDn;
- /** The new DN. */
- private DN newDn;
+ /** The new Dn. */
+ private Dn newDn;
/**
@@ -155,7 +155,7 @@ public class SimulateRenameDialogImpl ex
/**
* {@inheritDoc}
*/
- public void setEntryInfo( IBrowserConnection browserConnection, DN oldDn, DN newDn )
+ public void setEntryInfo( IBrowserConnection browserConnection, Dn oldDn, Dn newDn )
{
this.browserConnection = browserConnection;
this.oldDn = oldDn;
Modified: directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/preferences/BrowserPreferencePage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/preferences/BrowserPreferencePage.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/preferences/BrowserPreferencePage.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/preferences/BrowserPreferencePage.java Sun Jan 23 01:17:06 2011
@@ -52,9 +52,9 @@ import org.eclipse.ui.IWorkbenchPreferen
public class BrowserPreferencePage extends PreferencePage implements IWorkbenchPreferencePage
{
- private static final String DN = Messages.getString( "BrowserPreferencePage.DN" ); //$NON-NLS-1$
+ private static final String DN = Messages.getString( "BrowserPreferencePage.Dn" ); //$NON-NLS-1$
- private static final String RDN = Messages.getString( "BrowserPreferencePage.RDN" ); //$NON-NLS-1$
+ private static final String RDN = Messages.getString( "BrowserPreferencePage.Rdn" ); //$NON-NLS-1$
private static final String RDN_VALUE = Messages.getString( "BrowserPreferencePage.RDNValue" ); //$NON-NLS-1$
Modified: directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dnd/EntryTransfer.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dnd/EntryTransfer.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dnd/EntryTransfer.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dnd/EntryTransfer.java Sun Jan 23 01:17:06 2011
@@ -29,7 +29,7 @@ import java.io.IOException;
import java.util.ArrayList;
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.ldapbrowser.common.BrowserCommonConstants;
import org.apache.directory.studio.ldapbrowser.core.BrowserConnectionManager;
import org.apache.directory.studio.ldapbrowser.core.BrowserCorePlugin;
@@ -42,7 +42,7 @@ import org.eclipse.swt.dnd.TransferData;
/**
* A {@link Transfer} that could be used to transfer {@link IEntry} objects.
- * Note that only the connection id and entry's DN is converted to a platform specific
+ * Note that only the connection id and entry's Dn is converted to a platform specific
* representation, not the complete object.
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
@@ -83,7 +83,7 @@ public class EntryTransfer extends ByteA
* {@inheritDoc}
*
* This implementation only accepts {@link IEntry} objects.
- * It just converts the id of the connection and the entry's DN
+ * It just converts the id of the connection and the entry's Dn
* to the platform specific representation.
*/
public void javaToNative( Object object, TransferData transferData )
@@ -128,9 +128,9 @@ public class EntryTransfer extends ByteA
* {@inheritDoc}
*
* This implementation just converts the platform specific representation
- * to the connection id and entry DN and invokes
+ * to the connection id and entry Dn and invokes
* {@link BrowserConnectionManager#getBrowserConnectionById(String)} to get the
- * {@link IBrowserConnection} object and {@link IBrowserConnection#getEntryFromCache(DN)}
+ * {@link IBrowserConnection} object and {@link IBrowserConnection#getEntryFromCache(org.apache.directory.shared.ldap.name.Dn)}
* to get the {@link IEntry} object.
*/
public Object nativeToJava( TransferData transferData )
@@ -169,7 +169,7 @@ public class EntryTransfer extends ByteA
int size = readIn.readInt();
byte[] dn = new byte[size];
readIn.read( dn );
- entry = connection.getEntryFromCache( new DN( new String( dn, "UTF-8" ) ) ); //$NON-NLS-1$
+ entry = connection.getEntryFromCache( new Dn( new String( dn, "UTF-8" ) ) ); //$NON-NLS-1$
}
else
{
Modified: directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dnd/ValuesTransfer.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dnd/ValuesTransfer.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dnd/ValuesTransfer.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dnd/ValuesTransfer.java Sun Jan 23 01:17:06 2011
@@ -29,7 +29,7 @@ import java.io.IOException;
import java.util.ArrayList;
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.ldapbrowser.common.BrowserCommonConstants;
import org.apache.directory.studio.ldapbrowser.core.BrowserCorePlugin;
import org.apache.directory.studio.ldapbrowser.core.model.IAttribute;
@@ -82,7 +82,7 @@ public class ValuesTransfer extends Byte
* {@inheritDoc}
*
* This implementation only accepts {@link IValue} objects.
- * It converts the id of the connection, the entry's DN, the
+ * It converts the id of the connection, the entry's Dn, the
* attribute description and the value to the platform specific
* representation.
*/
@@ -146,7 +146,7 @@ public class ValuesTransfer extends Byte
* {@inheritDoc}
*
* This implementation converts the platform specific representation
- * to the connection name, entry DN, attribute description and value and
+ * to the connection name, entry Dn, attribute description and value and
* restores the {@link IValue} object.
*/
public Object nativeToJava( TransferData transferData )
@@ -185,7 +185,7 @@ public class ValuesTransfer extends Byte
int size = readIn.readInt();
byte[] dn = new byte[size];
readIn.read( dn );
- entry = connection.getEntryFromCache( new DN( new String( dn, "UTF-8" ) ) ); //$NON-NLS-1$
+ entry = connection.getEntryFromCache( new Dn( new String( dn, "UTF-8" ) ) ); //$NON-NLS-1$
}
else
{
Modified: directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/DnBuilderWidget.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/DnBuilderWidget.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/DnBuilderWidget.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/DnBuilderWidget.java Sun Jan 23 01:17:06 2011
@@ -25,9 +25,9 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.Iterator;
-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.ui.widgets.BaseWidgetUtils;
import org.apache.directory.studio.connection.core.DnUtils;
import org.apache.directory.studio.connection.ui.widgets.ExtendedContentAssistCommandAdapter;
@@ -50,8 +50,8 @@ import org.eclipse.swt.widgets.Text;
/**
- * The DnBuilderWidget provides input elements to select a parent DN
- * and to build a (multivalued) RDN.
+ * The DnBuilderWidget provides input elements to select a parent Dn
+ * and to build a (multivalued) Rdn.
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
@@ -61,38 +61,38 @@ public class DnBuilderWidget extends Bro
/** The attribute names that could be selected from drop-down list. */
private String[] attributeNames;
- /** The initial RDN. */
- private RDN currentRdn;
+ /** The initial Rdn. */
+ private Rdn currentRdn;
- /** The initial parent DN. */
- private DN currentParentDn;
+ /** The initial parent Dn. */
+ private Dn currentParentDn;
- /** True if the RDN input elements should be shown. */
+ /** True if the Rdn input elements should be shown. */
private boolean showRDN;
- /** True if the parent DN input elements should be shown. */
+ /** True if the parent Dn input elements should be shown. */
private boolean showParent;
/** The shell. */
private Shell shell;
- /** The selected parent DN. */
- private DN parentDn;
+ /** The selected parent Dn. */
+ private Dn parentDn;
/** The entry widget label. */
private Label parentEntryLabel;
- /** The entry widget to enter/select the parent DN. */
+ /** The entry widget to enter/select the parent Dn. */
private EntryWidget parentEntryWidget;
- /** The RDN label */
+ /** The Rdn label */
private Label rdnLabel;
/** The composite that contains the RdnLines. */
private Composite rdnComposite;
- /** The resulting RDN. */
- private RDN rdn;
+ /** The resulting Rdn. */
+ private Rdn rdn;
/** The list of RdnLines. */
private ArrayList<RdnLine> rdnLineList;
@@ -107,8 +107,8 @@ public class DnBuilderWidget extends Bro
/**
* Creates a new instance of DnBuilderWidget.
*
- * @param showParent true if the parent DN input elements should be shown
- * @param showRDN true if the RDN input elements should be shown
+ * @param showParent true if the parent Dn input elements should be shown
+ * @param showRDN true if the Rdn input elements should be shown
*/
public DnBuilderWidget( boolean showRDN, boolean showParent )
{
@@ -128,12 +128,12 @@ public class DnBuilderWidget extends Bro
/**
* Sets the input.
*
- * @param rdn the initial RDN
+ * @param rdn the initial Rdn
* @param attributeNames the attribute names that could be selected from drop-down list
* @param browserConnection the connection
- * @param parentDn the initial parent DN
+ * @param parentDn the initial parent Dn
*/
- public void setInput( IBrowserConnection browserConnection, String[] attributeNames, RDN rdn, DN parentDn )
+ public void setInput( IBrowserConnection browserConnection, String[] attributeNames, Rdn rdn, Dn parentDn )
{
this.attributeNames = attributeNames;
this.currentRdn = rdn;
@@ -168,10 +168,10 @@ public class DnBuilderWidget extends Bro
else
{
int i = 0;
- Iterator<AVA> atavIterator = currentRdn.iterator();
+ Iterator<Ava> atavIterator = currentRdn.iterator();
while ( atavIterator.hasNext() )
{
- AVA ava = atavIterator.next();
+ Ava ava = atavIterator.next();
addRdnLine( rdnComposite, i );
rdnLineList.get( i ).rdnTypeCombo.setText( ava.getUpType() );
rdnLineList.get( i ).rdnValueText.setText( ava.getNormValue().getString() );
@@ -202,22 +202,22 @@ public class DnBuilderWidget extends Bro
/**
- * Gets the RDN.
+ * Gets the Rdn.
*
- * @return the RDN
+ * @return the Rdn
*/
- public RDN getRdn()
+ public Rdn getRdn()
{
return rdn;
}
/**
- * Gets the parent DN.
+ * Gets the parent Dn.
*
- * @return the parent DN
+ * @return the parent Dn
*/
- public DN getParentDn()
+ public Dn getParentDn()
{
return parentDn;
}
@@ -254,10 +254,10 @@ public class DnBuilderWidget extends Bro
BaseWidgetUtils.createSpacer( composite, 3 );
}
- // draw RDN group
+ // draw Rdn group
if ( showRDN )
{
- rdnLabel = BaseWidgetUtils.createLabel( composite, Messages.getString( "DnBuilderWidget.RDN" ), 1 ); //$NON-NLS-1$
+ rdnLabel = BaseWidgetUtils.createLabel( composite, Messages.getString( "DnBuilderWidget.Rdn" ), 1 ); //$NON-NLS-1$
rdnComposite = BaseWidgetUtils.createColumnContainer( composite, 5, 2 );
rdnLineList = new ArrayList<RdnLine>();
BaseWidgetUtils.createSpacer( composite, 3 );
@@ -307,7 +307,7 @@ public class DnBuilderWidget extends Bro
{
try
{
- // calculate RDN
+ // calculate Rdn
String[] rdnTypes = new String[rdnLineList.size()];
String[] rdnValues = new String[rdnLineList.size()];
for ( int i = 0; i < rdnLineList.size(); i++ )
@@ -339,7 +339,7 @@ public class DnBuilderWidget extends Bro
{
try
{
- // calculate DN
+ // calculate Dn
parentDn = parentEntryWidget.getDn();
}
catch ( Exception e )
@@ -367,7 +367,7 @@ public class DnBuilderWidget extends Bro
}
else
{
- DN dn;
+ Dn dn;
if ( showParent && showRDN )
{
dn = DnUtils.composeDn( rdn, parentDn );
@@ -378,12 +378,12 @@ public class DnBuilderWidget extends Bro
}
else if ( showRDN )
{
- dn = new DN();
+ dn = new Dn();
dn.add( rdn );
}
else
{
- dn = new DN();
+ dn = new Dn();
}
previewText.setText( dn.getName() );
}
@@ -394,9 +394,9 @@ public class DnBuilderWidget extends Bro
/**
- * Adds an RDN line at the given index.
+ * Adds an Rdn line at the given index.
*
- * @param rdnComposite the RDN composite
+ * @param rdnComposite the Rdn composite
* @param index the index
*/
private void addRdnLine( Composite rdnComposite, int index )
@@ -448,11 +448,11 @@ public class DnBuilderWidget extends Bro
/**
- * Creates and returns an RDN line.
+ * Creates and returns an Rdn line.
*
- * @param rdnComposite the RDN composite
+ * @param rdnComposite the Rdn composite
*
- * @return the created RDN line
+ * @return the created Rdn line
*/
private RdnLine createRdnLine( final Composite rdnComposite )
{
@@ -527,9 +527,9 @@ public class DnBuilderWidget extends Bro
/**
- * Delete thd RDN line on the given index.
+ * Delete thd Rdn line on the given index.
*
- * @param rdnComposite the RDN composite
+ * @param rdnComposite the Rdn composite
* @param index the index
*/
private void deleteRdnLine( Composite rdnComposite, int index )
@@ -552,9 +552,9 @@ public class DnBuilderWidget extends Bro
/**
* The Class RdnLine is a wrapper for all input elements
- * of an RDN line. It contains a combo for the RDN attribute,
- * an input field for the RDN value and + and - buttons
- * to add and remove other RDN lines. It looks like this:
+ * of an Rdn line. It contains a combo for the Rdn attribute,
+ * an input field for the Rdn value and + and - buttons
+ * to add and remove other Rdn lines. It looks like this:
* <pre>
* --------------------------------------------------
* | attribute type v | = | attribute value | + | - |
Modified: directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserSorter.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserSorter.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/browser/BrowserSorter.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserSorter.java Sun Jan 23 01:17:06 2011
@@ -23,7 +23,7 @@ package org.apache.directory.studio.ldap
import java.math.BigInteger;
-import org.apache.directory.shared.ldap.name.RDN;
+import org.apache.directory.shared.ldap.name.Rdn;
import org.apache.directory.studio.connection.core.jobs.StudioConnectionRunnableWithProgress;
import org.apache.directory.studio.ldapbrowser.core.BrowserCoreConstants;
import org.apache.directory.studio.ldapbrowser.core.model.IEntry;
@@ -322,8 +322,8 @@ public class BrowserSorter extends Viewe
*/
private int compareRdns( IEntry entry1, IEntry entry2 )
{
- RDN rdn1 = entry1.getRdn();
- RDN rdn2 = entry2.getRdn();
+ Rdn rdn1 = entry1.getRdn();
+ Rdn rdn2 = entry2.getRdn();
if ( rdn1 == null && rdn2 == null )
{
@@ -345,7 +345,7 @@ public class BrowserSorter extends Viewe
/**
- * Compares the RDN values of two IEntry objects.
+ * Compares the Rdn values of two IEntry objects.
* Numeric values are compared as numeric.
*
* @param entry1 the first entry
@@ -368,8 +368,8 @@ public class BrowserSorter extends Viewe
}
else
{
- RDN rdn1 = entry1.getRdn();
- RDN rdn2 = entry2.getRdn();
+ Rdn rdn1 = entry1.getRdn();
+ Rdn rdn2 = entry2.getRdn();
if ( ( rdn1 == null || rdn1.getName() == null || "".equals( rdn1.getName() ) ) //$NON-NLS-1$
&& ( rdn2 == null || rdn2.getName() == null || "".equals( rdn2.getName() ) ) ) //$NON-NLS-1$
Modified: directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserSorterDialog.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserSorterDialog.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/browser/BrowserSorterDialog.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserSorterDialog.java Sun Jan 23 01:17:06 2011
@@ -58,7 +58,7 @@ public class BrowserSorterDialog extends
public static final String SORT_BY_NONE = Messages.getString( "BrowserSorterDialog.NoSorting" ); //$NON-NLS-1$
/** The Constant SORT_BY_RDN. */
- public static final String SORT_BY_RDN = Messages.getString( "BrowserSorterDialog.RDN" ); //$NON-NLS-1$
+ public static final String SORT_BY_RDN = Messages.getString( "BrowserSorterDialog.Rdn" ); //$NON-NLS-1$
/** The Constant SORT_BY_RDN_VALUE. */
public static final String SORT_BY_RDN_VALUE = Messages.getString( "BrowserSorterDialog.RDNValue" ); //$NON-NLS-1$
Modified: directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/connection/BrowserParameterPage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/connection/BrowserParameterPage.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/connection/BrowserParameterPage.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/connection/BrowserParameterPage.java Sun Jan 23 01:17:06 2011
@@ -25,7 +25,7 @@ import java.util.List;
import org.apache.commons.lang.StringUtils;
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.shared.ldap.filter.LdapURL.Extension;
import org.apache.directory.studio.common.ui.widgets.BaseWidgetUtils;
import org.apache.directory.studio.connection.core.Connection;
@@ -66,7 +66,7 @@ import org.eclipse.swt.widgets.Text;
public class BrowserParameterPage extends AbstractConnectionParameterPage
{
- private static final String X_BASE_DN = "X-BASE-DN"; //$NON-NLS-1$
+ private static final String X_BASE_DN = "X-BASE-Dn"; //$NON-NLS-1$
private static final String X_COUNT_LIMIT = "X-COUNT-LIMIT"; //$NON-NLS-1$
@@ -98,13 +98,13 @@ public class BrowserParameterPage extend
private static final String X_PAGED_SEARCH_SCROLL_MODE = "X-PAGED-SEARCH-SCROLL-MODE"; //$NON-NLS-1$
- /** The checkbox to fetch the base DN's from namingContexts whenever opening the connection */
+ /** The checkbox to fetch the base Dn's from namingContexts whenever opening the connection */
private Button autoFetchBaseDnsButton;
- /** The button to fetch the base DN's from namingContexts attribute */
+ /** The button to fetch the base Dn's from namingContexts attribute */
private Button fetchBaseDnsButton;
- /** The combo that displays the fetched base DN's */
+ /** The combo that displays the fetched base Dn's */
private Combo baseDNCombo;
/** The widget with the count and time limits */
@@ -147,10 +147,10 @@ public class BrowserParameterPage extend
/**
- * Returns true if base DN's should be fetched
+ * Returns true if base Dn's should be fetched
* whenever opening the connection.
*
- * @return true, if base DN's should be fetched
+ * @return true, if base Dn's should be fetched
*/
private boolean isAutoFetchBaseDns()
{
@@ -159,9 +159,9 @@ public class BrowserParameterPage extend
/**
- * Gets the base DN.
+ * Gets the base Dn.
*
- * @return the base DN
+ * @return the base Dn
*/
private String getBaseDN()
{
@@ -320,7 +320,7 @@ public class BrowserParameterPage extend
/**
- * Adds the base DN input.
+ * Adds the base Dn input.
*
* @param parent the parent
*/
@@ -448,7 +448,7 @@ public class BrowserParameterPage extend
errorMessage = null;
if ( !isAutoFetchBaseDns() )
{
- if ( !DN.isValid( getBaseDN() ) )
+ if ( !Dn.isValid(getBaseDN()) )
{
message = Messages.getString( "BrowserParameterPage.EnterValidBaseDN" ); //$NON-NLS-1$
}
@@ -830,7 +830,7 @@ public class BrowserParameterPage extend
*/
public void mergeLdapUrlToParameters( LdapURL ldapUrl, ConnectionParameter parameter )
{
- // base DN, get from Root DSE if absent, may be empty
+ // base Dn, get from Root DSE if absent, may be empty
String baseDn = ldapUrl.getExtensionValue( X_BASE_DN );
if ( baseDn == null )
{
Modified: directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/OpenBestEditorAction.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/OpenBestEditorAction.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/entryeditor/OpenBestEditorAction.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/OpenBestEditorAction.java Sun Jan 23 01:17:06 2011
@@ -177,7 +177,7 @@ public class OpenBestEditorAction extend
message.append( BrowserCoreConstants.LINE_SEPARATOR );
}
- // validate modification of RDN
+ // validate modification of Rdn
if ( value.isRdnPart() && cellEditor != valueEditorManager.getRenameValueEditor() )
{
message.append( NLS.bind( Messages.getString( "OpenBestEditorAction.ValueIsRdnPart" ), //$NON-NLS-1$
Modified: directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/OpenDefaultEditorAction.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/OpenDefaultEditorAction.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/entryeditor/OpenDefaultEditorAction.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/OpenDefaultEditorAction.java Sun Jan 23 01:17:06 2011
@@ -30,7 +30,7 @@ import org.eclipse.jface.viewers.TreeVie
/**
* The OpenBestEditorAction is used to edit a value with the default value editor.
- * This is either the best value editor or in case of an RDN attribute the rename
+ * This is either the best value editor or in case of an Rdn attribute the rename
* action is invoked.
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>