Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 54987 invoked from network); 23 Jan 2011 01:19:17 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 23 Jan 2011 01:19:17 -0000 Received: (qmail 17892 invoked by uid 500); 23 Jan 2011 01:19:16 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 17859 invoked by uid 500); 23 Jan 2011 01:19:16 -0000 Mailing-List: contact commits-help@directory.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@directory.apache.org Delivered-To: mailing list commits@directory.apache.org Received: (qmail 17852 invoked by uid 99); 23 Jan 2011 01:19:16 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 23 Jan 2011 01:19:16 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 23 Jan 2011 01:19:05 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id B53A22388C9C; Sun, 23 Jan 2011 01:17:43 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1062306 [32/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... Date: Sun, 23 Jan 2011 01:17:26 -0000 To: commits@directory.apache.org From: akarasulu@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110123011743.B53A22388C9C@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Modified: directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/entry/LdifEntryEditorDocumentProvider.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/entry/LdifEntryEditorDocumentProvider.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/LdifEntryEditorDocumentProvider.java (original) +++ directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/entry/LdifEntryEditorDocumentProvider.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.exception.LdapInvalidDnException; -import org.apache.directory.shared.ldap.name.DN; +import org.apache.directory.shared.ldap.name.Dn; import org.apache.directory.studio.entryeditors.EntryEditorInput; import org.apache.directory.studio.ldapbrowser.core.model.IBrowserConnection; import org.apache.directory.studio.ldapbrowser.core.model.IEntry; @@ -100,8 +100,8 @@ public class LdifEntryEditorDocumentProv EntryEditorInput input = getEntryEditorInput( element ); try { - DN newDN = new DN( records[0].getDnLine().getValueAsString() ); - if ( !newDN.equals( input.getResolvedEntry().getDn() ) ) + Dn newDn = new Dn( records[0].getDnLine().getValueAsString() ); + if ( !newDn.equals( input.getResolvedEntry().getDn() ) ) { throw new CoreException( new Status( IStatus.ERROR, BrowserUIConstants.PLUGIN_ID, NLS.bind( Messages .getString( "LdifEntryEditorDocumentProvider.ModDnNotSupported" ), records[0].getInvalidString() ) ) ); //$NON-NLS-1$ Modified: directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/SearchResultEditorActionGroup.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/SearchResultEditorActionGroup.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/searchresult/SearchResultEditorActionGroup.java (original) +++ directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/SearchResultEditorActionGroup.java Sun Jan 23 01:17:06 2011 @@ -73,7 +73,7 @@ import org.eclipse.ui.actions.Contributi public class SearchResultEditorActionGroup implements ActionHandlerManager, IMenuListener { - /** The show DN action. */ + /** The show Dn action. */ private ShowDNAction showDNAction; /** The show links action. */ Modified: directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/SearchResultEditorCellModifier.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/SearchResultEditorCellModifier.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/searchresult/SearchResultEditorCellModifier.java (original) +++ directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/SearchResultEditorCellModifier.java Sun Jan 23 01:17:06 2011 @@ -84,7 +84,7 @@ public class SearchResultEditorCellModif ISearchResult result = ( ISearchResult ) element; AttributeHierarchy ah = result.getAttributeWithSubtypes( property ); - // check DN + // check Dn if ( BrowserUIConstants.DN.equals( property ) ) { return false; Modified: directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/SearchResultEditorFilter.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/SearchResultEditorFilter.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/searchresult/SearchResultEditorFilter.java (original) +++ directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/SearchResultEditorFilter.java Sun Jan 23 01:17:06 2011 @@ -46,7 +46,7 @@ public class SearchResultEditorFilter ex /** The quick filter value. */ protected String quickFilterValue; - /** The show DN flag. */ + /** The show Dn flag. */ private boolean showDn; @@ -74,7 +74,7 @@ public class SearchResultEditorFilter ex * Called when the input of the viewer changes. * * @param newSearch the new search - * @param showDn the show DN flag + * @param showDn the show Dn flag */ public void inputChanged( ISearch newSearch, boolean showDn ) { Modified: directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/SearchResultEditorLabelProvider.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/SearchResultEditorLabelProvider.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/searchresult/SearchResultEditorLabelProvider.java (original) +++ directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/SearchResultEditorLabelProvider.java Sun Jan 23 01:17:06 2011 @@ -56,7 +56,7 @@ public class SearchResultEditorLabelProv /** The search. */ private ISearch search; - /** The show DN flag. */ + /** The show Dn flag. */ private boolean showDn; @@ -76,7 +76,7 @@ public class SearchResultEditorLabelProv * Called when the input of the viewer has been changed. * * @param newSearch the new search - * @param showDn the show DN flag + * @param showDn the show Dn flag */ public void inputChanged( ISearch newSearch, boolean showDn ) { Modified: directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/SearchResultEditorSorter.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/SearchResultEditorSorter.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/searchresult/SearchResultEditorSorter.java (original) +++ directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/SearchResultEditorSorter.java Sun Jan 23 01:17:06 2011 @@ -57,7 +57,7 @@ public class SearchResultEditorSorter ex /** The columns. */ private TableColumn[] columns; - /** The show DN flag. */ + /** The show Dn flag. */ private boolean showDn; /** The sort property. */ @@ -91,7 +91,7 @@ public class SearchResultEditorSorter ex * Called when the input of the viewer has been changed. * * @param newSearch the new search - * @param showDn the show DN flag + * @param showDn the show Dn flag */ public void inputChanged( ISearch newSearch, boolean showDn ) { Modified: directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/SearchResultEditorUniversalListener.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/SearchResultEditorUniversalListener.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/searchresult/SearchResultEditorUniversalListener.java (original) +++ directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/SearchResultEditorUniversalListener.java Sun Jan 23 01:17:06 2011 @@ -222,13 +222,13 @@ public class SearchResultEditorUniversal } }; - /** The listener used to handle clicks to the DN hyper link */ + /** The listener used to handle clicks to the Dn hyper link */ private IHyperlinkListener dnHyperlinkListener = new IHyperlinkListener() { /** * {@inheritDoc} * - * This implementation opens the search result when clicking thd DN link. + * This implementation opens the search result when clicking thd Dn link. */ public void linkActivated( HyperlinkEvent e ) { @@ -256,7 +256,7 @@ public class SearchResultEditorUniversal } }; - /** This listener removes the DN link when then mouse exits the hyperlink control */ + /** This listener removes the Dn link when then mouse exits the hyperlink control */ private MouseTrackListener dnMouseTrackListener = new MouseTrackListener() { /** @@ -270,7 +270,7 @@ public class SearchResultEditorUniversal /** * {@inheritDoc} * - * This implementation removed the DN link. + * This implementation removed the Dn link. */ public void mouseExit( MouseEvent e ) { @@ -287,13 +287,13 @@ public class SearchResultEditorUniversal } }; - /** This listener renders the DN hyperlink when the mouse cursor moves over the DN */ + /** This listener renders the Dn hyperlink when the mouse cursor moves over the Dn */ private MouseMoveListener cursorMouseMoveListener = new MouseMoveListener() { /** * {@inheritDoc} * - * This implementation renders the DN link. + * This implementation renders the Dn link. */ public void mouseMove( MouseEvent e ) { @@ -301,7 +301,7 @@ public class SearchResultEditorUniversal { TableItem item = cursor.getRow(); if ( cursor.getColumn() == 0 - && "DN".equalsIgnoreCase( cursor.getRow().getParent().getColumns()[0].getText() ) ) //$NON-NLS-1$ + && "Dn".equalsIgnoreCase( cursor.getRow().getParent().getColumns()[0].getText() ) ) //$NON-NLS-1$ { checkDnLink( item ); } @@ -309,13 +309,13 @@ public class SearchResultEditorUniversal } }; - /** This listener renders the DN link when the mouse cursor moves over the DN */ + /** This listener renders the Dn link when the mouse cursor moves over the Dn */ private MouseMoveListener viewerMouseMoveListener = new MouseMoveListener() { /** * {@inheritDoc} * - * This implementation renders the DN link. + * This implementation renders the Dn link. */ public void mouseMove( MouseEvent e ) { @@ -324,7 +324,7 @@ public class SearchResultEditorUniversal TableItem item = viewer.getTable().getItem( new Point( e.x, e.y ) ); viewer.getTable().getColumns()[0].getWidth(); if ( e.x > 0 && e.x < viewer.getTable().getColumns()[0].getWidth() - && "DN".equalsIgnoreCase( viewer.getTable().getColumns()[0].getText() ) ) //$NON-NLS-1$ + && "Dn".equalsIgnoreCase( viewer.getTable().getColumns()[0].getText() ) ) //$NON-NLS-1$ { checkDnLink( item ); } @@ -600,7 +600,7 @@ public class SearchResultEditorUniversal if ( showDn ) { attributes = new String[selectedSearch.getReturningAttributes().length + 1]; - attributes[0] = "DN"; //$NON-NLS-1$ + attributes[0] = "Dn"; //$NON-NLS-1$ System.arraycopy( selectedSearch.getReturningAttributes(), 0, attributes, 1, attributes.length - 1 ); } else @@ -650,7 +650,7 @@ public class SearchResultEditorUniversal else { viewer.setInput( null ); - columns[0].setText( "DN" ); //$NON-NLS-1$ + columns[0].setText( "Dn" ); //$NON-NLS-1$ columns[0].pack(); usedColumns = 1; } @@ -693,7 +693,7 @@ public class SearchResultEditorUniversal /** - * Renders the DN link. + * Renders the Dn link. * * @param item the table item */ Modified: directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/ShowDNAction.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/ShowDNAction.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/searchresult/ShowDNAction.java (original) +++ directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/ShowDNAction.java Sun Jan 23 01:17:06 2011 @@ -27,7 +27,7 @@ import org.eclipse.jface.action.Action; /** - * Action to show/hide the DN column. + * Action to show/hide the Dn column. * * @author Apache Directory Project */ Modified: directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/BatchOperationApplyOnWizardPage.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/BatchOperationApplyOnWizardPage.java?rev=1062306&r1=1062305&r2=1062306&view=diff ============================================================================== --- directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/BatchOperationApplyOnWizardPage.java (original) +++ directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/BatchOperationApplyOnWizardPage.java Sun Jan 23 01:17:06 2011 @@ -27,7 +27,7 @@ import java.util.List; import java.util.Set; import org.apache.directory.shared.ldap.exception.LdapInvalidDnException; -import org.apache.directory.shared.ldap.name.DN; +import org.apache.directory.shared.ldap.name.Dn; import org.apache.directory.studio.common.ui.widgets.BaseWidgetUtils; import org.apache.directory.studio.connection.core.Connection; import org.apache.directory.studio.ldapbrowser.common.actions.BrowserSelectionUtils; @@ -61,7 +61,7 @@ public class BatchOperationApplyOnWizard private String[] initCurrentSelectionTexts; - private DN[][] initCurrentSelectionDns; + private Dn[][] initCurrentSelectionDns; private ISearch initSearch; @@ -168,7 +168,7 @@ public class BatchOperationApplyOnWizard } - public DN[] getApplyOnDns() + public Dn[] getApplyOnDns() { if ( currentSelectionButton.getSelection() ) { @@ -232,18 +232,18 @@ public class BatchOperationApplyOnWizard IValue[] values = BrowserSelectionUtils.getValues( selection ); List textList = new ArrayList(); - List dnsList = new ArrayList(); + List dnsList = new ArrayList(); if ( attributes.length + values.length > 0 ) { - Set internalDnSet = new LinkedHashSet(); + Set internalDnSet = new LinkedHashSet(); for ( int v = 0; v < values.length; v++ ) { if ( values[v].isString() ) { try { - DN dn = new DN( values[v].getStringValue() ); + Dn dn = new Dn( values[v].getStringValue() ); internalDnSet.add( dn ); } catch ( LdapInvalidDnException e ) @@ -261,7 +261,7 @@ public class BatchOperationApplyOnWizard { try { - DN dn = new DN( vals[v].getStringValue() ); + Dn dn = new Dn( vals[v].getStringValue() ); internalDnSet.add( dn ); } catch ( LdapInvalidDnException e ) @@ -273,7 +273,7 @@ public class BatchOperationApplyOnWizard if ( !internalDnSet.isEmpty() ) { - dnsList.add( internalDnSet.toArray( new DN[internalDnSet.size()] ) ); + dnsList.add( internalDnSet.toArray( new Dn[internalDnSet.size()] ) ); textList .add( NLS .bind( @@ -282,14 +282,14 @@ public class BatchOperationApplyOnWizard } if ( searches.length == 1 && searches[0].getSearchResults() != null ) { - Set internalDnSet = new LinkedHashSet(); + Set internalDnSet = new LinkedHashSet(); ISearchResult[] srs = searches[0].getSearchResults(); for ( int i = 0; i < srs.length; i++ ) { internalDnSet.add( srs[i].getDn() ); } - dnsList.add( internalDnSet.toArray( new DN[internalDnSet.size()] ) ); + dnsList.add( internalDnSet.toArray( new Dn[internalDnSet.size()] ) ); textList .add( NLS .bind( @@ -297,7 +297,7 @@ public class BatchOperationApplyOnWizard } if ( entries.length + searchResults.length + bookmarks.length > 0 ) { - Set internalDnSet = new LinkedHashSet(); + Set internalDnSet = new LinkedHashSet(); for ( int i = 0; i < entries.length; i++ ) { internalDnSet.add( entries[i].getDn() ); @@ -311,7 +311,7 @@ public class BatchOperationApplyOnWizard internalDnSet.add( bookmarks[i].getDn() ); } - dnsList.add( internalDnSet.toArray( new DN[internalDnSet.size()] ) ); + dnsList.add( internalDnSet.toArray( new Dn[internalDnSet.size()] ) ); textList .add( NLS .bind( @@ -319,7 +319,7 @@ public class BatchOperationApplyOnWizard } this.initCurrentSelectionTexts = textList.toArray( new String[textList.size()] ); - this.initCurrentSelectionDns = dnsList.toArray( new DN[0][0] ); + this.initCurrentSelectionDns = dnsList.toArray( new Dn[0][0] ); } Modified: directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/BatchOperationWizard.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/BatchOperationWizard.java?rev=1062306&r1=1062305&r2=1062306&view=diff ============================================================================== --- directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/BatchOperationWizard.java (original) +++ directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/BatchOperationWizard.java Sun Jan 23 01:17:06 2011 @@ -21,7 +21,7 @@ package org.apache.directory.studio.ldapbrowser.ui.wizards; -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.ui.RunnableContextRunner; import org.apache.directory.studio.ldapbrowser.common.actions.BrowserSelectionUtils; @@ -293,7 +293,7 @@ public class BatchOperationWizard extend } // get DNs - DN[] dns = applyOnPage.getApplyOnDns(); + Dn[] dns = applyOnPage.getApplyOnDns(); if ( dns == null ) { if ( applyOnPage.getApplyOnSearch() != null ) @@ -308,7 +308,7 @@ public class BatchOperationWizard extend if ( status.isOK() ) { ISearchResult[] srs = search.getSearchResults(); - dns = new DN[srs.length]; + dns = new Dn[srs.length]; for ( int i = 0; i < srs.length; i++ ) { dns[i] = srs[i].getDn(); Modified: directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ExportCsvFromWizardPage.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ExportCsvFromWizardPage.java?rev=1062306&r1=1062305&r2=1062306&view=diff ============================================================================== --- directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ExportCsvFromWizardPage.java (original) +++ directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ExportCsvFromWizardPage.java Sun Jan 23 01:17:06 2011 @@ -39,7 +39,7 @@ public class ExportCsvFromWizardPage ext * {@link SearchPageWrapper} with *
    *
  • hidden name - *
  • visible and checked return DN checkbox + *
  • visible and checked return Dn checkbox *
  • invisible all attributes checkbox *
  • invisible operational attributes checkbox *
Modified: directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ExportExcelFromWizardPage.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ExportExcelFromWizardPage.java?rev=1062306&r1=1062305&r2=1062306&view=diff ============================================================================== --- directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ExportExcelFromWizardPage.java (original) +++ directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ExportExcelFromWizardPage.java Sun Jan 23 01:17:06 2011 @@ -39,7 +39,7 @@ public class ExportExcelFromWizardPage e * {@link SearchPageWrapper} with *
    *
  • hidden name - *
  • visible and checked return DN checkbox + *
  • visible and checked return Dn checkbox *
  • visible all attributes checkbox *
  • visible operational attributes checkbox *
Modified: directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ExportOdfFromWizardPage.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ExportOdfFromWizardPage.java?rev=1062306&r1=1062305&r2=1062306&view=diff ============================================================================== --- directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ExportOdfFromWizardPage.java (original) +++ directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ExportOdfFromWizardPage.java Sun Jan 23 01:17:06 2011 @@ -39,7 +39,7 @@ public class ExportOdfFromWizardPage ext * {@link SearchPageWrapper} with *
    *
  • hidden name - *
  • visible and checked return DN checkbox + *
  • visible and checked return Dn checkbox *
  • visible all attributes checkbox *
  • visible operational attributes checkbox *
Modified: directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/NewBookmarkMainWizardPage.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/NewBookmarkMainWizardPage.java?rev=1062306&r1=1062305&r2=1062306&view=diff ============================================================================== --- directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/NewBookmarkMainWizardPage.java (original) +++ directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/NewBookmarkMainWizardPage.java Sun Jan 23 01:17:06 2011 @@ -21,7 +21,7 @@ package org.apache.directory.studio.ldapbrowser.ui.wizards; -import org.apache.directory.shared.ldap.name.DN; +import org.apache.directory.shared.ldap.name.Dn; import org.apache.directory.studio.common.ui.widgets.BaseWidgetUtils; import org.apache.directory.studio.ldapbrowser.common.widgets.WidgetModifyEvent; import org.apache.directory.studio.ldapbrowser.common.widgets.WidgetModifyListener; @@ -39,7 +39,7 @@ import org.eclipse.swt.widgets.Text; /** * The NewBookmarkMainWizardPage is used to specify the bookmark name - * and the DN of the target entry. + * and the Dn of the target entry. * * @author Apache Directory Project */ @@ -157,7 +157,7 @@ public class NewBookmarkMainWizardPage e * * @return the bookmark dn */ - public DN getBookmarkDn() + public Dn getBookmarkDn() { return bookmarkEntryWidget.getDn(); } Modified: directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/NewBookmarkWizard.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/NewBookmarkWizard.java?rev=1062306&r1=1062305&r2=1062306&view=diff ============================================================================== --- directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/NewBookmarkWizard.java (original) +++ directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/NewBookmarkWizard.java Sun Jan 23 01:17:06 2011 @@ -21,7 +21,7 @@ package org.apache.directory.studio.ldapbrowser.ui.wizards; -import org.apache.directory.shared.ldap.name.DN; +import org.apache.directory.shared.ldap.name.Dn; import org.apache.directory.studio.ldapbrowser.common.widgets.browser.BrowserCategory; import org.apache.directory.studio.ldapbrowser.common.widgets.browser.BrowserEntryPage; import org.apache.directory.studio.ldapbrowser.common.widgets.browser.BrowserSearchResultPage; @@ -88,7 +88,7 @@ public class NewBookmarkWizard extends W public void init( IWorkbench workbench, IStructuredSelection selection ) { // determine the currently selected entry, used - // to preset the bookmark target DN + // to preset the bookmark target Dn Object o = selection.getFirstElement(); if ( o instanceof IEntry ) { @@ -199,7 +199,7 @@ public class NewBookmarkWizard extends W if ( selectedEntry != null ) { String name = mainPage.getBookmarkName(); - DN dn = mainPage.getBookmarkDn(); + Dn dn = mainPage.getBookmarkDn(); IBookmark bookmark = new Bookmark( selectedEntry.getBrowserConnection(), dn, name ); selectedEntry.getBrowserConnection().getBookmarkManager().addBookmark( bookmark ); } Modified: directory/studio/trunk/plugins/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/dialogs/preferences/LdifEditorSyntaxColoringPreferencePage.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/dialogs/preferences/LdifEditorSyntaxColoringPreferencePage.java?rev=1062306&r1=1062305&r2=1062306&view=diff ============================================================================== --- directory/studio/trunk/plugins/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/dialogs/preferences/LdifEditorSyntaxColoringPreferencePage.java (original) +++ directory/studio/trunk/plugins/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/dialogs/preferences/LdifEditorSyntaxColoringPreferencePage.java Sun Jan 23 01:17:06 2011 @@ -83,7 +83,7 @@ public class LdifEditorSyntaxColoringPre + BrowserCoreConstants.LINE_SEPARATOR + "changetype: delete" + BrowserCoreConstants.LINE_SEPARATOR + "" //$NON-NLS-1$ //$NON-NLS-2$ + BrowserCoreConstants.LINE_SEPARATOR - + "# Modify DN record" + BrowserCoreConstants.LINE_SEPARATOR + "dn: cn=moddn record" //$NON-NLS-1$ //$NON-NLS-2$ + + "# Modify Dn record" + BrowserCoreConstants.LINE_SEPARATOR + "dn: cn=moddn record" //$NON-NLS-1$ //$NON-NLS-2$ + BrowserCoreConstants.LINE_SEPARATOR + "changetype: moddn" + BrowserCoreConstants.LINE_SEPARATOR //$NON-NLS-1$ + "newrdn: cn=new rdn" + BrowserCoreConstants.LINE_SEPARATOR + "deleteoldrdn: 1" //$NON-NLS-1$ //$NON-NLS-2$ + BrowserCoreConstants.LINE_SEPARATOR + "newsuperior: cn=new superior" + BrowserCoreConstants.LINE_SEPARATOR //$NON-NLS-1$ @@ -235,7 +235,7 @@ public class LdifEditorSyntaxColoringPre syntaxItems[0] = new SyntaxItem( Messages.getString( "LdifEditorSyntaxColoringPreferencePage.Comments" ), LdifEditorConstants.PREFERENCE_LDIFEDITOR_SYNTAX_COMMENT ); //$NON-NLS-1$ syntaxItems[1] = new SyntaxItem( - Messages.getString( "LdifEditorSyntaxColoringPreferencePage.DN" ), LdifEditorConstants.PREFERENCE_LDIFEDITOR_SYNTAX_DN ); //$NON-NLS-1$ + Messages.getString( "LdifEditorSyntaxColoringPreferencePage.Dn" ), LdifEditorConstants.PREFERENCE_LDIFEDITOR_SYNTAX_DN ); //$NON-NLS-1$ syntaxItems[2] = new SyntaxItem( Messages .getString( "LdifEditorSyntaxColoringPreferencePage.AttributeDescriptions" ), //$NON-NLS-1$ LdifEditorConstants.PREFERENCE_LDIFEDITOR_SYNTAX_ATTRIBUTE ); Modified: directory/studio/trunk/plugins/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/LdifOutlinePage.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/LdifOutlinePage.java?rev=1062306&r1=1062305&r2=1062306&view=diff ============================================================================== --- directory/studio/trunk/plugins/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/LdifOutlinePage.java (original) +++ directory/studio/trunk/plugins/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/LdifOutlinePage.java Sun Jan 23 01:17:06 2011 @@ -27,7 +27,7 @@ import java.util.List; import java.util.Map; import org.apache.directory.shared.ldap.exception.LdapInvalidDnException; -import org.apache.directory.shared.ldap.name.DN; +import org.apache.directory.shared.ldap.name.Dn; import org.apache.directory.studio.ldapbrowser.common.BrowserCommonActivator; import org.apache.directory.studio.ldapbrowser.common.BrowserCommonConstants; import org.apache.directory.studio.ldapbrowser.common.widgets.browser.BrowserLabelProvider; @@ -456,7 +456,7 @@ public class LdifOutlinePage extends Con try { return BrowserLabelProvider.getImageByObjectClass( ldifEditor.getConnection() - .getEntryFromCache( new DN( dn ) ) ); + .getEntryFromCache( new Dn( dn ) ) ); } catch ( LdapInvalidDnException e ) { Modified: directory/studio/trunk/plugins/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/actions/AbstractOpenValueEditorAction.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/actions/AbstractOpenValueEditorAction.java?rev=1062306&r1=1062305&r2=1062306&view=diff ============================================================================== --- directory/studio/trunk/plugins/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/actions/AbstractOpenValueEditorAction.java (original) +++ directory/studio/trunk/plugins/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/actions/AbstractOpenValueEditorAction.java Sun Jan 23 01:17:06 2011 @@ -22,7 +22,7 @@ package org.apache.directory.studio.ldif 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.IBrowserConnection; import org.apache.directory.studio.ldapbrowser.core.model.impl.Attribute; import org.apache.directory.studio.ldapbrowser.core.model.impl.DummyConnection; @@ -152,8 +152,8 @@ public abstract class AbstractOpenValueE { try { - // some value editors need the real DN (e.g. the password editor) - DummyEntry dummyEntry = new DummyEntry( DN.isValid( dn ) ? new DN( dn ) : new DN(), + // some value editors need the real Dn (e.g. the password editor) + DummyEntry dummyEntry = new DummyEntry( Dn.isValid(dn) ? new Dn( dn ) : new Dn(), connection ); Attribute dummyAttribute = new Attribute( dummyEntry, description ); Value dummyValue = new Value( dummyAttribute, value ); Modified: directory/studio/trunk/plugins/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/actions/EditLdifAttributeAction.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/actions/EditLdifAttributeAction.java?rev=1062306&r1=1062305&r2=1062306&view=diff ============================================================================== --- directory/studio/trunk/plugins/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/actions/EditLdifAttributeAction.java (original) +++ directory/studio/trunk/plugins/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/actions/EditLdifAttributeAction.java Sun Jan 23 01:17:06 2011 @@ -21,10 +21,8 @@ package org.apache.directory.studio.ldifeditor.editor.actions; -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.Dn; import org.apache.directory.studio.ldapbrowser.common.BrowserCommonConstants; import org.apache.directory.studio.ldapbrowser.common.wizards.AttributeWizard; import org.apache.directory.studio.ldapbrowser.core.model.IBrowserConnection; @@ -122,7 +120,7 @@ public class EditLdifAttributeAction ext } else if ( containers[0] instanceof LdifChangeModifyRecord ) { - dummyEntry = new DummyEntry( new DN(), dummyConnection ); + dummyEntry = new DummyEntry( new Dn(), dummyConnection ); } AttributeWizard wizard = new AttributeWizard( Messages Modified: directory/studio/trunk/plugins/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/text/LdifCompletionProcessor.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/text/LdifCompletionProcessor.java?rev=1062306&r1=1062305&r2=1062306&view=diff ============================================================================== --- directory/studio/trunk/plugins/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/text/LdifCompletionProcessor.java (original) +++ directory/studio/trunk/plugins/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/text/LdifCompletionProcessor.java Sun Jan 23 01:17:06 2011 @@ -66,7 +66,7 @@ import org.eclipse.swt.graphics.Image; public class LdifCompletionProcessor extends TemplateCompletionProcessor { - // private final static String DN = "dn: "; + // private final static String Dn = "dn: "; private final static String CT_ADD = "changetype: add" + BrowserCoreConstants.LINE_SEPARATOR; //$NON-NLS-1$ private final static String CT_MODIFY = "changetype: modify" + BrowserCoreConstants.LINE_SEPARATOR; //$NON-NLS-1$ Modified: directory/studio/trunk/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/LdifUtils.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/LdifUtils.java?rev=1062306&r1=1062305&r2=1062306&view=diff ============================================================================== --- directory/studio/trunk/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/LdifUtils.java (original) +++ directory/studio/trunk/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/LdifUtils.java Sun Jan 23 01:17:06 2011 @@ -158,7 +158,7 @@ public class LdifUtils * * @param dn the dn to check * - * @return true, if must encode DN + * @return true, if must encode Dn */ public static boolean mustEncodeDN( String dn ) { Modified: directory/studio/trunk/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/container/LdifChangeModDnRecord.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/container/LdifChangeModDnRecord.java?rev=1062306&r1=1062305&r2=1062306&view=diff ============================================================================== --- directory/studio/trunk/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/container/LdifChangeModDnRecord.java (original) +++ directory/studio/trunk/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/container/LdifChangeModDnRecord.java Sun Jan 23 01:17:06 2011 @@ -139,11 +139,11 @@ public class LdifChangeModDnRecord exten { if ( this.getNewrdnLine() == null ) { - return "Missing new RDN"; + return "Missing new Rdn"; } else if ( this.getDeloldrdnLine() == null ) { - return "Missing delete old RDN"; + return "Missing delete old Rdn"; } else { Modified: directory/studio/trunk/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/container/LdifRecord.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/container/LdifRecord.java?rev=1062306&r1=1062305&r2=1062306&view=diff ============================================================================== --- directory/studio/trunk/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/container/LdifRecord.java (original) +++ directory/studio/trunk/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/container/LdifRecord.java Sun Jan 23 01:17:06 2011 @@ -95,7 +95,7 @@ public abstract class LdifRecord extends LdifSepLine sepLine = getSepLine(); if ( dnLine == null ) - return "Record must start with DN"; + return "Record must start with Dn"; else if ( !dnLine.isValid() ) return dnLine.getInvalidString(); Modified: directory/studio/trunk/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/lines/LdifDeloldrdnLine.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/lines/LdifDeloldrdnLine.java?rev=1062306&r1=1062305&r2=1062306&view=diff ============================================================================== --- directory/studio/trunk/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/lines/LdifDeloldrdnLine.java (original) +++ directory/studio/trunk/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/lines/LdifDeloldrdnLine.java Sun Jan 23 01:17:06 2011 @@ -91,11 +91,11 @@ public class LdifDeloldrdnLine extends L { if ( this.getUnfoldedDeleteOldrdnSpec().length() == 0 ) { - return "Missing delete old RDN spec 'deleteoldrdn'"; + return "Missing delete old Rdn spec 'deleteoldrdn'"; } else if ( !"0".equals( getUnfoldedDeleteOldrdn() ) && !"1".equals( getUnfoldedDeleteOldrdn() ) ) { - return "Invalid value of delete old RDN, must be '0' or '1'"; + return "Invalid value of delete old Rdn, must be '0' or '1'"; } else { Modified: directory/studio/trunk/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/lines/LdifDnLine.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/lines/LdifDnLine.java?rev=1062306&r1=1062305&r2=1062306&view=diff ============================================================================== --- directory/studio/trunk/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/lines/LdifDnLine.java (original) +++ directory/studio/trunk/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/lines/LdifDnLine.java Sun Jan 23 01:17:06 2011 @@ -21,7 +21,7 @@ package org.apache.directory.studio.ldifparser.model.lines; -import org.apache.directory.shared.ldap.name.DN; +import org.apache.directory.shared.ldap.name.Dn; import org.apache.directory.studio.ldifparser.LdifParserConstants; import org.apache.directory.studio.ldifparser.LdifUtils; @@ -75,7 +75,7 @@ public class LdifDnLine extends LdifValu public boolean isValid() { - return super.isValid() && DN.isValid( getValueAsString() ); + return super.isValid() && Dn.isValid(getValueAsString()); } @@ -83,15 +83,15 @@ public class LdifDnLine extends LdifValu { if ( this.getUnfoldedDnSpec().length() == 0 ) { - return "Missing DN spec 'dn'"; + return "Missing Dn spec 'dn'"; } else if ( this.getUnfoldedDn().length() == 0 ) { - return "Missing DN"; + return "Missing Dn"; } - else if ( !DN.isValid( getValueAsString() ) ) + else if ( !Dn.isValid(getValueAsString()) ) { - return "Invalid DN"; + return "Invalid Dn"; } else { Modified: directory/studio/trunk/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/lines/LdifNewrdnLine.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/lines/LdifNewrdnLine.java?rev=1062306&r1=1062305&r2=1062306&view=diff ============================================================================== --- directory/studio/trunk/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/lines/LdifNewrdnLine.java (original) +++ directory/studio/trunk/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/lines/LdifNewrdnLine.java Sun Jan 23 01:17:06 2011 @@ -82,11 +82,11 @@ public class LdifNewrdnLine extends Ldif { if ( this.getUnfoldedNewrdnSpec().length() == 0 ) { - return "Missing new RDN spec 'newrdn'"; + return "Missing new Rdn spec 'newrdn'"; } else if ( this.getUnfoldedNewrdn().length() == 0 ) { - return "Missing new RDN"; + return "Missing new Rdn"; } else { Modified: directory/studio/trunk/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/lines/LdifNewsuperiorLine.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/lines/LdifNewsuperiorLine.java?rev=1062306&r1=1062305&r2=1062306&view=diff ============================================================================== --- directory/studio/trunk/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/lines/LdifNewsuperiorLine.java (original) +++ directory/studio/trunk/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/lines/LdifNewsuperiorLine.java Sun Jan 23 01:17:06 2011 @@ -87,7 +87,7 @@ public class LdifNewsuperiorLine extends } else if ( this.getUnfoldedNewSuperiorDn().length() == 0 ) { - return "Missing new superior DN"; + return "Missing new superior Dn"; } else { Modified: directory/studio/trunk/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/parser/LdifParser.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/parser/LdifParser.java?rev=1062306&r1=1062305&r2=1062306&view=diff ============================================================================== --- directory/studio/trunk/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/parser/LdifParser.java (original) +++ directory/studio/trunk/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/parser/LdifParser.java Sun Jan 23 01:17:06 2011 @@ -271,7 +271,7 @@ public class LdifParser return false; } - // get DN + // get Dn LdifToken dnValueTypeToken = null; LdifToken dnToken = null; LdifToken dnSepToken = null; Modified: directory/studio/trunk/plugins/ldifparser/src/test/java/org/apache/directory/studio/ldifparser/model/lines/LdifDnLineTest.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldifparser/src/test/java/org/apache/directory/studio/ldifparser/model/lines/LdifDnLineTest.java?rev=1062306&r1=1062305&r2=1062306&view=diff ============================================================================== --- directory/studio/trunk/plugins/ldifparser/src/test/java/org/apache/directory/studio/ldifparser/model/lines/LdifDnLineTest.java (original) +++ directory/studio/trunk/plugins/ldifparser/src/test/java/org/apache/directory/studio/ldifparser/model/lines/LdifDnLineTest.java Sun Jan 23 01:17:06 2011 @@ -78,7 +78,7 @@ public class LdifDnLineTest extends Test /** * Test for DIRSTUDIO-598 - * (Base64 encoded DN marked as invalid in LDIF editor) + * (Base64 encoded Dn marked as invalid in LDIF editor) */ public void testIsValid() { Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/ApacheDsSchemaConnector.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/ApacheDsSchemaConnector.java?rev=1062306&r1=1062305&r2=1062306&view=diff ============================================================================== --- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/ApacheDsSchemaConnector.java (original) +++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/ApacheDsSchemaConnector.java Sun Jan 23 01:17:06 2011 @@ -52,7 +52,7 @@ import org.apache.directory.studio.schem public class ApacheDsSchemaConnector extends AbstractSchemaConnector implements SchemaConnector { - /** The Schema DN */ + /** The Schema Dn */ public static final String SCHEMA_DN = "ou=schema"; /** The name of the metaAttributeType object class */ Modified: directory/studio/trunk/plugins/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/ValueEditorsConstants.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/ValueEditorsConstants.java?rev=1062306&r1=1062305&r2=1062306&view=diff ============================================================================== --- directory/studio/trunk/plugins/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/ValueEditorsConstants.java (original) +++ directory/studio/trunk/plugins/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/ValueEditorsConstants.java Sun Jan 23 01:17:06 2011 @@ -47,7 +47,7 @@ public final class ValueEditorsConstants /** The relative path to the address editor icon */ public static final String IMG_ADDRESSEDITOR = "resources/icons/addresseditor.gif"; //$NON-NLS-1$ - /** The relative path to the DN editor icon */ + /** The relative path to the Dn editor icon */ public static final String IMG_DNEDITOR = "resources/icons/dneditor.gif"; //$NON-NLS-1$ /** The relative path to the password editor icon */ Modified: directory/studio/trunk/plugins/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/dn/DnValueEditor.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/dn/DnValueEditor.java?rev=1062306&r1=1062305&r2=1062306&view=diff ============================================================================== --- directory/studio/trunk/plugins/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/dn/DnValueEditor.java (original) +++ directory/studio/trunk/plugins/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/dn/DnValueEditor.java Sun Jan 23 01:17:06 2011 @@ -22,7 +22,7 @@ package org.apache.directory.studio.valu 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.common.dialogs.DnDialog; import org.apache.directory.studio.ldapbrowser.common.dialogs.TextDialog; import org.apache.directory.studio.ldapbrowser.core.model.AttributeHierarchy; @@ -52,10 +52,10 @@ public class DnValueEditor extends Abstr if ( value != null && value instanceof DnValueEditorRawValueWrapper ) { DnValueEditorRawValueWrapper wrapper = ( DnValueEditorRawValueWrapper ) value; - DN dn; + Dn dn; try { - dn = wrapper.dn != null ? new DN( wrapper.dn ) : null; + dn = wrapper.dn != null ? new Dn( wrapper.dn ) : null; } catch ( LdapInvalidDnException e ) { @@ -77,11 +77,11 @@ public class DnValueEditor extends Abstr * {@inheritDoc} * * Returns a DnValueEditorRawValueWrapper with the connection of - * the attribute hierarchy and a null DN if there are no values + * the attribute hierarchy and a null Dn if there are no values * in attributeHierarchy. * * Returns a DnValueEditorRawValueWrapper with the connection of - * the attribute hierarchy and a DN if there is one value + * the attribute hierarchy and a Dn if there is one value * in attributeHierarchy. */ public Object getRawValue( AttributeHierarchy attributeHierarchy ) @@ -111,7 +111,7 @@ public class DnValueEditor extends Abstr * {@inheritDoc} * * Returns a DnValueEditorRawValueWrapper with the connection of - * the value and a DN build from the given value. + * the value and a Dn build from the given value. */ public Object getRawValue( IValue value ) { @@ -136,7 +136,7 @@ public class DnValueEditor extends Abstr /** The connection, used in DnDialog to browse for an entry */ private IBrowserConnection connection; - /** The DN, used as initial value in DnDialog */ + /** The Dn, used as initial value in DnDialog */ private String dn; @@ -144,7 +144,7 @@ public class DnValueEditor extends Abstr * Creates a new instance of DnValueEditorRawValueWrapper. * * @param connection the connection - * @param dn the DN + * @param dn the Dn */ private DnValueEditorRawValueWrapper( IBrowserConnection connection, String dn ) {