You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by pa...@apache.org on 2010/10/06 19:33:41 UTC
svn commit: r1005180 [1/2] - in
/directory/studio/branches/shared-trunk-merge/plugins:
connection.core/src/main/java/org/apache/directory/studio/connection/core/
ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/actions/
l...
Author: pamarcelot
Date: Wed Oct 6 17:33:40 2010
New Revision: 1005180
URL: http://svn.apache.org/viewvc?rev=1005180&view=rev
Log:
Fixed 'ldapbrowser.common' module.
Modified:
directory/studio/branches/shared-trunk-merge/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/DnUtils.java
directory/studio/branches/shared-trunk-merge/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/actions/BrowserSelectionUtils.java
directory/studio/branches/shared-trunk-merge/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/actions/CopyAction.java
directory/studio/branches/shared-trunk-merge/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/actions/DeleteAction.java
directory/studio/branches/shared-trunk-merge/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/actions/PropertiesAction.java
directory/studio/branches/shared-trunk-merge/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/actions/RenameAction.java
directory/studio/branches/shared-trunk-merge/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/DnDialog.java
directory/studio/branches/shared-trunk-merge/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/EntryExistsCopyStrategyDialogImpl.java
directory/studio/branches/shared-trunk-merge/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/MoveEntriesDialog.java
directory/studio/branches/shared-trunk-merge/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/RenameEntryDialog.java
directory/studio/branches/shared-trunk-merge/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/SimulateRenameDialogImpl.java
directory/studio/branches/shared-trunk-merge/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/preferences/BinaryAttributesAndSyntaxesPreferencePage.java
directory/studio/branches/shared-trunk-merge/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/preferences/ValueEditorsPreferencePage.java
directory/studio/branches/shared-trunk-merge/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dnd/EntryTransfer.java
directory/studio/branches/shared-trunk-merge/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dnd/ValuesTransfer.java
directory/studio/branches/shared-trunk-merge/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/filtereditor/FilterContentAssistProcessor.java
directory/studio/branches/shared-trunk-merge/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/filtereditor/FilterTextHover.java
directory/studio/branches/shared-trunk-merge/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/DnBuilderWidget.java
directory/studio/branches/shared-trunk-merge/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserLabelProvider.java
directory/studio/branches/shared-trunk-merge/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserQuickSearchWidget.java
directory/studio/branches/shared-trunk-merge/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserSorter.java
directory/studio/branches/shared-trunk-merge/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/connection/BrowserParameterPage.java
directory/studio/branches/shared-trunk-merge/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/EntryEditorWidgetContentProvider.java
directory/studio/branches/shared-trunk-merge/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/OpenBestEditorAction.java
directory/studio/branches/shared-trunk-merge/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/search/EntryWidget.java
directory/studio/branches/shared-trunk-merge/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/search/SearchPageWrapper.java
directory/studio/branches/shared-trunk-merge/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/wizards/AttributeTypeWizardPage.java
directory/studio/branches/shared-trunk-merge/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/wizards/NewEntryAttributesWizardPage.java
directory/studio/branches/shared-trunk-merge/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/wizards/NewEntryDnWizardPage.java
directory/studio/branches/shared-trunk-merge/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/wizards/NewEntryObjectclassWizardPage.java
directory/studio/branches/shared-trunk-merge/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/wizards/NewEntryTypeWizardPage.java
directory/studio/branches/shared-trunk-merge/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/wizards/NewEntryWizard.java
directory/studio/branches/shared-trunk-merge/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/valueeditors/RenameValueEditor.java
directory/studio/branches/shared-trunk-merge/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/valueeditors/ValueEditorManager.java
Modified: directory/studio/branches/shared-trunk-merge/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/DnUtils.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/shared-trunk-merge/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/DnUtils.java?rev=1005180&r1=1005179&r2=1005180&view=diff
==============================================================================
--- directory/studio/branches/shared-trunk-merge/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/DnUtils.java (original)
+++ directory/studio/branches/shared-trunk-merge/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/DnUtils.java Wed Oct 6 17:33:40 2010
@@ -147,7 +147,7 @@ public class DnUtils
*
* @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++ )
Modified: directory/studio/branches/shared-trunk-merge/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/actions/BrowserSelectionUtils.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/shared-trunk-merge/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/actions/BrowserSelectionUtils.java?rev=1005180&r1=1005179&r2=1005180&view=diff
==============================================================================
--- directory/studio/branches/shared-trunk-merge/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/actions/BrowserSelectionUtils.java (original)
+++ directory/studio/branches/shared-trunk-merge/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/actions/BrowserSelectionUtils.java Wed Oct 6 17:33:40 2010
@@ -29,7 +29,7 @@ import java.util.LinkedHashSet;
import java.util.List;
import java.util.Set;
-import org.apache.directory.shared.ldap.schema.parsers.AttributeTypeDescription;
+import org.apache.directory.shared.ldap.schema.AttributeType;
import org.apache.directory.studio.connection.core.Connection;
import org.apache.directory.studio.connection.ui.actions.SelectionUtils;
import org.apache.directory.studio.ldapbrowser.common.widgets.browser.BrowserCategory;
@@ -326,10 +326,10 @@ public abstract class BrowserSelectionUt
* @param selection the selection
* @return an array with AttributeTypeDescription beans, may be empty.
*/
- public static AttributeTypeDescription[] getAttributeTypeDescription( ISelection selection )
+ public static AttributeType[] getAttributeTypeDescription( ISelection selection )
{
- List<Object> list = getTypes( selection, AttributeTypeDescription.class );
- return list.toArray( new AttributeTypeDescription[list.size()] );
+ List<Object> list = getTypes( selection, AttributeType.class );
+ return list.toArray( new AttributeType[list.size()] );
}
Modified: directory/studio/branches/shared-trunk-merge/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/actions/CopyAction.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/shared-trunk-merge/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/actions/CopyAction.java?rev=1005180&r1=1005179&r2=1005180&view=diff
==============================================================================
--- directory/studio/branches/shared-trunk-merge/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/actions/CopyAction.java (original)
+++ directory/studio/branches/shared-trunk-merge/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/actions/CopyAction.java Wed Oct 6 17:33:40 2010
@@ -152,7 +152,7 @@ public class CopyAction extends BrowserA
StringBuffer text = new StringBuffer();
for ( int i = 0; i < entries.length; i++ )
{
- text.append( entries[i].getDn().getUpName() );
+ text.append( entries[i].getDn().getName() );
if ( i + 1 < entries.length )
{
text.append( BrowserCoreConstants.LINE_SEPARATOR );
Modified: directory/studio/branches/shared-trunk-merge/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/actions/DeleteAction.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/shared-trunk-merge/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/actions/DeleteAction.java?rev=1005180&r1=1005179&r2=1005180&view=diff
==============================================================================
--- directory/studio/branches/shared-trunk-merge/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/actions/DeleteAction.java (original)
+++ directory/studio/branches/shared-trunk-merge/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/actions/DeleteAction.java Wed Oct 6 17:33:40 2010
@@ -30,8 +30,8 @@ import java.util.LinkedHashSet;
import java.util.Map;
import java.util.Set;
-import org.apache.directory.shared.ldap.schema.parsers.AttributeTypeDescription;
-import org.apache.directory.shared.ldap.schema.parsers.ObjectClassDescription;
+import org.apache.directory.shared.ldap.schema.AttributeType;
+import org.apache.directory.shared.ldap.schema.ObjectClass;
import org.apache.directory.studio.connection.core.StudioControl;
import org.apache.directory.studio.ldapbrowser.common.dialogs.DeleteDialog;
import org.apache.directory.studio.ldapbrowser.core.BrowserCoreConstants;
@@ -279,7 +279,7 @@ public class DeleteAction extends Browse
{
message.append( BrowserCoreConstants.LINE_SEPARATOR );
message.append( " - " ); //$NON-NLS-1$
- message.append( entry.getDn().getUpName() );
+ message.append( entry.getDn().getName() );
}
}
else
@@ -446,12 +446,12 @@ public class DeleteAction extends Browse
protected void appendValuesWarnMessage( StringBuffer message, Collection<IValue> values )
{
- Map<AttributeTypeDescription, Integer> attributeNameToSelectedValuesCountMap = new HashMap<AttributeTypeDescription, Integer>();
- Set<ObjectClassDescription> selectedObjectClasses = new HashSet<ObjectClassDescription>();
+ Map<AttributeType, Integer> attributeNameToSelectedValuesCountMap = new HashMap<AttributeType, Integer>();
+ Set<ObjectClass> selectedObjectClasses = new HashSet<ObjectClass>();
for ( IValue value : values )
{
String type = value.getAttribute().getType();
- AttributeTypeDescription atd = value.getAttribute().getAttributeTypeDescription();
+ AttributeType atd = value.getAttribute().getAttributeTypeDescription();
AttributeHierarchy ah = value.getAttribute().getEntry().getAttributeWithSubtypes( type );
// check if (part of) RDN is selected
@@ -506,17 +506,17 @@ public class DeleteAction extends Browse
IEntry entry = values.iterator().next().getAttribute().getEntry();
Schema schema = entry.getBrowserConnection().getSchema();
// get remaining attributes
- Collection<ObjectClassDescription> remainingObjectClasses = entry.getObjectClassDescriptions();
+ Collection<ObjectClass> remainingObjectClasses = entry.getObjectClassDescriptions();
remainingObjectClasses.removeAll( selectedObjectClasses );
- Set<AttributeTypeDescription> remainingAttributeSet = new HashSet<AttributeTypeDescription>();
- for ( ObjectClassDescription ocd : remainingObjectClasses )
+ Set<AttributeType> remainingAttributeSet = new HashSet<AttributeType>();
+ for ( ObjectClass ocd : remainingObjectClasses )
{
{
Collection<String> mustAttrs = SchemaUtils.getMustAttributeTypeDescriptionNamesTransitive( ocd,
schema );
for ( String mustAttr : mustAttrs )
{
- AttributeTypeDescription atd = entry.getBrowserConnection().getSchema()
+ AttributeType atd = entry.getBrowserConnection().getSchema()
.getAttributeTypeDescription( mustAttr );
remainingAttributeSet.add( atd );
}
@@ -524,7 +524,7 @@ public class DeleteAction extends Browse
schema );
for ( String mayAttr : mayAttrs )
{
- AttributeTypeDescription atd = entry.getBrowserConnection().getSchema()
+ AttributeType atd = entry.getBrowserConnection().getSchema()
.getAttributeTypeDescription( mayAttr );
remainingAttributeSet.add( atd );
}
Modified: directory/studio/branches/shared-trunk-merge/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/actions/PropertiesAction.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/shared-trunk-merge/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/actions/PropertiesAction.java?rev=1005180&r1=1005179&r2=1005180&view=diff
==============================================================================
--- directory/studio/branches/shared-trunk-merge/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/actions/PropertiesAction.java (original)
+++ directory/studio/branches/shared-trunk-merge/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/actions/PropertiesAction.java Wed Oct 6 17:33:40 2010
@@ -134,13 +134,13 @@ public class PropertiesAction extends Br
{
element = ( IAdaptable ) getSelectedEntries()[0];
pageId = BrowserCommonConstants.PROP_ENTRY;
- title = getSelectedEntries()[0].getDn().getUpName();
+ title = getSelectedEntries()[0].getDn().getName();
}
else if ( getSelectedSearchResults().length == 1 )
{
element = ( IAdaptable ) getSelectedSearchResults()[0];
pageId = BrowserCommonConstants.PROP_ENTRY;
- title = getSelectedSearchResults()[0].getDn().getUpName();
+ title = getSelectedSearchResults()[0].getDn().getName();
}
if ( element != null )
Modified: directory/studio/branches/shared-trunk-merge/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/actions/RenameAction.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/shared-trunk-merge/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/actions/RenameAction.java?rev=1005180&r1=1005179&r2=1005180&view=diff
==============================================================================
--- directory/studio/branches/shared-trunk-merge/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/actions/RenameAction.java (original)
+++ directory/studio/branches/shared-trunk-merge/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/actions/RenameAction.java Wed Oct 6 17:33:40 2010
@@ -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/branches/shared-trunk-merge/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/DnDialog.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/shared-trunk-merge/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/DnDialog.java?rev=1005180&r1=1005179&r2=1005180&view=diff
==============================================================================
--- directory/studio/branches/shared-trunk-merge/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/DnDialog.java (original)
+++ directory/studio/branches/shared-trunk-merge/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/DnDialog.java Wed Oct 6 17:33:40 2010
@@ -21,7 +21,7 @@
package org.apache.directory.studio.ldapbrowser.common.dialogs;
-import org.apache.directory.shared.ldap.name.LdapDN;
+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;
@@ -59,8 +59,8 @@ public class DnDialog extends Dialog
/** The connection. */
private IBrowserConnection connection;
- /** The dn. */
- private LdapDN dn;
+ /** The dn */
+ private DN dn;
/**
@@ -72,7 +72,7 @@ public class DnDialog extends Dialog
* @param connection the connection used to browse the directory
* @param dn the initial DN, may be null
*/
- public DnDialog( Shell parentShell, String title, String description, IBrowserConnection connection, LdapDN 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 LdapDN getDn()
+ public DN getDn()
{
return dn;
}
Modified: directory/studio/branches/shared-trunk-merge/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/EntryExistsCopyStrategyDialogImpl.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/shared-trunk-merge/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/EntryExistsCopyStrategyDialogImpl.java?rev=1005180&r1=1005179&r2=1005180&view=diff
==============================================================================
--- directory/studio/branches/shared-trunk-merge/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/EntryExistsCopyStrategyDialogImpl.java (original)
+++ directory/studio/branches/shared-trunk-merge/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/EntryExistsCopyStrategyDialogImpl.java Wed Oct 6 17:33:40 2010
@@ -21,8 +21,8 @@
package org.apache.directory.studio.ldapbrowser.common.dialogs;
-import org.apache.directory.shared.ldap.name.LdapDN;
-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;
@@ -75,7 +75,7 @@ public class EntryExistsCopyStrategyDial
private DnBuilderWidget dnBuilderWidget;
/** The new RDN. */
- private Rdn rdn;
+ private RDN rdn;
/** The strategy */
private EntryExistsCopyStrategy strategy;
@@ -85,7 +85,7 @@ public class EntryExistsCopyStrategyDial
private IBrowserConnection browserConnection;
- private LdapDN dn;
+ private DN dn;
/**
@@ -163,7 +163,7 @@ public class EntryExistsCopyStrategyDial
composite.setLayoutData( gd );
String text = NLS.bind(
- Messages.getString( "EntryExistsCopyStrategyDialogImpl.SelectCopyStrategyDescription" ), dn.getUpName() ); //$NON-NLS-1$
+ Messages.getString( "EntryExistsCopyStrategyDialogImpl.SelectCopyStrategyDescription" ), dn.getName() ); //$NON-NLS-1$
BaseWidgetUtils.createLabel( composite, text, 1 );
Composite group2 = BaseWidgetUtils.createGroup( composite, "", 1 ); //$NON-NLS-1$
@@ -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, LdapDN dn )
+ public void setExistingEntry( IBrowserConnection browserConnection, DN dn )
{
this.browserConnection = browserConnection;
this.dn = dn;
Modified: directory/studio/branches/shared-trunk-merge/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/MoveEntriesDialog.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/shared-trunk-merge/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/MoveEntriesDialog.java?rev=1005180&r1=1005179&r2=1005180&view=diff
==============================================================================
--- directory/studio/branches/shared-trunk-merge/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/MoveEntriesDialog.java (original)
+++ directory/studio/branches/shared-trunk-merge/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/MoveEntriesDialog.java Wed Oct 6 17:33:40 2010
@@ -21,7 +21,7 @@
package org.apache.directory.studio.ldapbrowser.common.dialogs;
-import org.apache.directory.shared.ldap.name.LdapDN;
+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;
@@ -59,7 +59,7 @@ public class MoveEntriesDialog extends D
private Button okButton;
/** The parent DN. */
- private LdapDN parentDn;
+ private DN parentDn;
/**
@@ -159,7 +159,7 @@ public class MoveEntriesDialog extends D
*
* @return the parent dn
*/
- public LdapDN getParentDn()
+ public DN getParentDn()
{
return parentDn;
}
Modified: directory/studio/branches/shared-trunk-merge/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/RenameEntryDialog.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/shared-trunk-merge/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/RenameEntryDialog.java?rev=1005180&r1=1005179&r2=1005180&view=diff
==============================================================================
--- directory/studio/branches/shared-trunk-merge/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/RenameEntryDialog.java (original)
+++ directory/studio/branches/shared-trunk-merge/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/RenameEntryDialog.java Wed Oct 6 17:33:40 2010
@@ -24,8 +24,8 @@ 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.schema.parsers.AttributeTypeDescription;
+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;
import org.apache.directory.studio.ldapbrowser.common.widgets.DnBuilderWidget;
@@ -67,7 +67,7 @@ public class RenameEntryDialog extends D
private Button okButton;
/** The new rdn. */
- private Rdn rdn;
+ private RDN rdn;
/**
@@ -146,7 +146,7 @@ public class RenameEntryDialog extends D
dnBuilderWidget = new DnBuilderWidget( true, false );
dnBuilderWidget.addWidgetModifyListener( this );
dnBuilderWidget.createContents( composite );
- Collection<AttributeTypeDescription> allAtds = SchemaUtils.getAllAttributeTypeDescriptions( entry );
+ Collection<AttributeType> allAtds = SchemaUtils.getAllAttributeTypeDescriptions( entry );
String[] allAttributeNames = SchemaUtils.getNames( allAtds ).toArray( ArrayUtils.EMPTY_STRING_ARRAY );
dnBuilderWidget.setInput( entry.getBrowserConnection(), allAttributeNames, entry.getRdn(), null );
@@ -172,7 +172,7 @@ public class RenameEntryDialog extends D
*
* @return the rdn
*/
- public Rdn getRdn()
+ public RDN getRdn()
{
return rdn;
}
Modified: directory/studio/branches/shared-trunk-merge/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/SimulateRenameDialogImpl.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/shared-trunk-merge/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/SimulateRenameDialogImpl.java?rev=1005180&r1=1005179&r2=1005180&view=diff
==============================================================================
--- directory/studio/branches/shared-trunk-merge/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/SimulateRenameDialogImpl.java (original)
+++ directory/studio/branches/shared-trunk-merge/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/SimulateRenameDialogImpl.java Wed Oct 6 17:33:40 2010
@@ -21,7 +21,7 @@
package org.apache.directory.studio.ldapbrowser.common.dialogs;
-import org.apache.directory.shared.ldap.name.LdapDN;
+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;
@@ -55,10 +55,10 @@ public class SimulateRenameDialogImpl ex
private IBrowserConnection browserConnection;
/** The old DN. */
- private LdapDN oldDn;
+ private DN oldDn;
/** The new DN. */
- private LdapDN newDn;
+ private DN newDn;
/**
@@ -120,7 +120,7 @@ public class SimulateRenameDialogImpl ex
String text1 = NLS
.bind(
- Messages.getString( "SimulateRenameDialogImpl.SimulateRenameDescription1" ), oldDn.getUpName(), newDn.getUpName() ); //$NON-NLS-1$
+ Messages.getString( "SimulateRenameDialogImpl.SimulateRenameDescription1" ), oldDn.getName(), newDn.getName() ); //$NON-NLS-1$
BaseWidgetUtils.createLabel( innerComposite, text1, 1 );
String text2 = NLS.bind( Messages.getString( "SimulateRenameDialogImpl.SimulateRenameDescription2" ), //$NON-NLS-1$
@@ -155,7 +155,7 @@ public class SimulateRenameDialogImpl ex
/**
* {@inheritDoc}
*/
- public void setEntryInfo( IBrowserConnection browserConnection, LdapDN oldDn, LdapDN newDn )
+ public void setEntryInfo( IBrowserConnection browserConnection, DN oldDn, DN newDn )
{
this.browserConnection = browserConnection;
this.oldDn = oldDn;
Modified: directory/studio/branches/shared-trunk-merge/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/preferences/BinaryAttributesAndSyntaxesPreferencePage.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/shared-trunk-merge/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/preferences/BinaryAttributesAndSyntaxesPreferencePage.java?rev=1005180&r1=1005179&r2=1005180&view=diff
==============================================================================
--- directory/studio/branches/shared-trunk-merge/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/preferences/BinaryAttributesAndSyntaxesPreferencePage.java (original)
+++ directory/studio/branches/shared-trunk-merge/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/preferences/BinaryAttributesAndSyntaxesPreferencePage.java Wed Oct 6 17:33:40 2010
@@ -28,8 +28,8 @@ import java.util.List;
import java.util.SortedMap;
import java.util.TreeMap;
-import org.apache.directory.shared.ldap.schema.parsers.AttributeTypeDescription;
-import org.apache.directory.shared.ldap.schema.parsers.LdapSyntaxDescription;
+import org.apache.directory.shared.ldap.schema.AttributeType;
+import org.apache.directory.shared.ldap.schema.LdapSyntax;
import org.apache.directory.studio.common.ui.widgets.BaseWidgetUtils;
import org.apache.directory.studio.connection.core.Utils;
import org.apache.directory.studio.ldapbrowser.core.BrowserConnectionManager;
@@ -71,19 +71,19 @@ public class BinaryAttributesAndSyntaxes
{
/** Map with attribute OID => attribute type description */
- private SortedMap<String, AttributeTypeDescription> attributeOid2AtdMap;
+ private SortedMap<String, AttributeType> attributeOid2AtdMap;
/** Map with attribute name => attribute type description */
- private SortedMap<String, AttributeTypeDescription> attributeNames2AtdMap;
+ private SortedMap<String, AttributeType> attributeNames2AtdMap;
/** The attribute names and OIDs. */
private String[] attributeNamesAndOids;
/** Map with syntax OID => syntax description */
- private SortedMap<String, LdapSyntaxDescription> syntaxOid2LsdMap;
+ private SortedMap<String, LdapSyntax> syntaxOid2LsdMap;
/** Map with syntax DESC => syntax description */
- private SortedMap<String, LdapSyntaxDescription> syntaxDesc2LsdMap;
+ private SortedMap<String, LdapSyntax> syntaxDesc2LsdMap;
/** The syntax OIDs. */
private String[] syntaxOids;
@@ -147,8 +147,8 @@ public class BinaryAttributesAndSyntaxes
composite.setLayoutData( new GridData( GridData.FILL_BOTH ) );
// init available attribute types
- attributeNames2AtdMap = new TreeMap<String, AttributeTypeDescription>();
- attributeOid2AtdMap = new TreeMap<String, AttributeTypeDescription>();
+ attributeNames2AtdMap = new TreeMap<String, AttributeType>();
+ attributeOid2AtdMap = new TreeMap<String, AttributeType>();
BrowserConnectionManager cm = BrowserCorePlugin.getDefault().getConnectionManager();
IBrowserConnection[] connections = cm.getBrowserConnections();
for ( IBrowserConnection browserConnection : connections )
@@ -164,8 +164,8 @@ public class BinaryAttributesAndSyntaxes
.size(), attributeOid2AtdMap.size() );
// init available syntaxes
- syntaxOid2LsdMap = new TreeMap<String, LdapSyntaxDescription>();
- syntaxDesc2LsdMap = new TreeMap<String, LdapSyntaxDescription>();
+ syntaxOid2LsdMap = new TreeMap<String, LdapSyntax>();
+ syntaxDesc2LsdMap = new TreeMap<String, LdapSyntax>();
for ( IBrowserConnection browserConnection : connections )
{
Schema schema = browserConnection.getSchema();
@@ -200,10 +200,10 @@ public class BinaryAttributesAndSyntaxes
private void createAttributeMaps( Schema schema )
{
- Collection<AttributeTypeDescription> atds = schema.getAttributeTypeDescriptions();
- for ( AttributeTypeDescription atd : atds )
+ Collection<AttributeType> atds = schema.getAttributeTypeDescriptions();
+ for ( AttributeType atd : atds )
{
- attributeOid2AtdMap.put( atd.getNumericOid(), atd );
+ attributeOid2AtdMap.put( atd.getOid(), atd );
for ( String name : atd.getNames() )
{
attributeNames2AtdMap.put( name, atd );
@@ -214,10 +214,10 @@ public class BinaryAttributesAndSyntaxes
private void createSyntaxMaps( Schema schema )
{
- Collection<LdapSyntaxDescription> lsds = schema.getLdapSyntaxDescriptions();
- for ( LdapSyntaxDescription lsd : lsds )
+ Collection<LdapSyntax> lsds = schema.getLdapSyntaxDescriptions();
+ for ( LdapSyntax lsd : lsds )
{
- syntaxOid2LsdMap.put( lsd.getNumericOid(), lsd );
+ syntaxOid2LsdMap.put( lsd.getOid(), lsd );
if ( lsd.getDescription() != null )
{
@@ -491,9 +491,9 @@ public class BinaryAttributesAndSyntaxes
{
if ( attributeNames2AtdMap.containsKey( attribute.getAttributeNumericOidOrName() ) )
{
- AttributeTypeDescription atd = ( AttributeTypeDescription ) attributeNames2AtdMap
+ AttributeType atd = ( AttributeType ) attributeNames2AtdMap
.get( attribute.getAttributeNumericOidOrName() );
- String s = atd.getNumericOid();
+ String s = atd.getOid();
for ( String attributeName : atd.getNames() )
{
if ( !attribute.getAttributeNumericOidOrName().equals( attributeName ) )
@@ -505,7 +505,7 @@ public class BinaryAttributesAndSyntaxes
}
else if ( attributeOid2AtdMap.containsKey( attribute.getAttributeNumericOidOrName() ) )
{
- AttributeTypeDescription atd = ( AttributeTypeDescription ) attributeOid2AtdMap
+ AttributeType atd = ( AttributeType ) attributeOid2AtdMap
.get( attribute.getAttributeNumericOidOrName() );
return SchemaUtils.toString( atd );
}
@@ -543,7 +543,7 @@ public class BinaryAttributesAndSyntaxes
{
if ( syntaxOid2LsdMap.containsKey( syntax.getSyntaxNumericOid() ) )
{
- LdapSyntaxDescription lsd = ( LdapSyntaxDescription ) syntaxOid2LsdMap.get( syntax
+ LdapSyntax lsd = ( LdapSyntax ) syntaxOid2LsdMap.get( syntax
.getSyntaxNumericOid() );
return SchemaUtils.toString( lsd );
}
Modified: directory/studio/branches/shared-trunk-merge/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/preferences/ValueEditorsPreferencePage.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/shared-trunk-merge/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/preferences/ValueEditorsPreferencePage.java?rev=1005180&r1=1005179&r2=1005180&view=diff
==============================================================================
--- directory/studio/branches/shared-trunk-merge/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/preferences/ValueEditorsPreferencePage.java (original)
+++ directory/studio/branches/shared-trunk-merge/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/preferences/ValueEditorsPreferencePage.java Wed Oct 6 17:33:40 2010
@@ -30,8 +30,8 @@ import java.util.Map;
import java.util.SortedMap;
import java.util.TreeMap;
-import org.apache.directory.shared.ldap.schema.parsers.AttributeTypeDescription;
-import org.apache.directory.shared.ldap.schema.parsers.LdapSyntaxDescription;
+import org.apache.directory.shared.ldap.schema.AttributeType;
+import org.apache.directory.shared.ldap.schema.LdapSyntax;
import org.apache.directory.studio.common.ui.widgets.BaseWidgetUtils;
import org.apache.directory.studio.ldapbrowser.common.BrowserCommonActivator;
import org.apache.directory.studio.ldapbrowser.core.BrowserConnectionManager;
@@ -78,19 +78,19 @@ public class ValueEditorsPreferencePage
private SortedMap<String, ValueEditorExtension> class2ValueEditorExtensionMap;
/** Map with attribute OID => attribute type description */
- private SortedMap<String, AttributeTypeDescription> attributeOid2AtdMap;
+ private SortedMap<String, AttributeType> attributeOid2AtdMap;
/** Map with attribute name => attribute type description */
- private SortedMap<String, AttributeTypeDescription> attributeNames2AtdMap;
+ private SortedMap<String, AttributeType> attributeNames2AtdMap;
/** The attribute names and OIDs. */
private String[] attributeTypesAndOids;
/** Map with syntax OID => syntax description */
- private SortedMap<String, LdapSyntaxDescription> syntaxOid2LsdMap;
+ private SortedMap<String, LdapSyntax> syntaxOid2LsdMap;
/** Map with syntax DESC => syntax description */
- private SortedMap<String, LdapSyntaxDescription> syntaxDesc2LsdMap;
+ private SortedMap<String, LdapSyntax> syntaxDesc2LsdMap;
/** The syntax DESCs and OIDs. */
private String[] syntaxDescsAndOids;
@@ -187,8 +187,8 @@ public class ValueEditorsPreferencePage
}
// init available attribute types
- attributeNames2AtdMap = new TreeMap<String, AttributeTypeDescription>();
- attributeOid2AtdMap = new TreeMap<String, AttributeTypeDescription>();
+ attributeNames2AtdMap = new TreeMap<String, AttributeType>();
+ attributeOid2AtdMap = new TreeMap<String, AttributeType>();
BrowserConnectionManager cm = BrowserCorePlugin.getDefault().getConnectionManager();
IBrowserConnection[] connections = cm.getBrowserConnections();
for ( IBrowserConnection browserConnection : connections )
@@ -204,8 +204,8 @@ public class ValueEditorsPreferencePage
.size(), attributeOid2AtdMap.size() );
// init available syntaxes
- syntaxOid2LsdMap = new TreeMap<String, LdapSyntaxDescription>();
- syntaxDesc2LsdMap = new TreeMap<String, LdapSyntaxDescription>();
+ syntaxOid2LsdMap = new TreeMap<String, LdapSyntax>();
+ syntaxDesc2LsdMap = new TreeMap<String, LdapSyntax>();
for ( IBrowserConnection browserConnection : connections )
{
Schema schema = browserConnection.getSchema();
@@ -243,10 +243,10 @@ public class ValueEditorsPreferencePage
private void createAttributeMaps( Schema schema )
{
- Collection<AttributeTypeDescription> atds = schema.getAttributeTypeDescriptions();
- for ( AttributeTypeDescription atd : atds )
+ Collection<AttributeType> atds = schema.getAttributeTypeDescriptions();
+ for ( AttributeType atd : atds )
{
- attributeOid2AtdMap.put( atd.getNumericOid(), atd );
+ attributeOid2AtdMap.put( atd.getOid(), atd );
for ( String name : atd.getNames() )
{
@@ -258,10 +258,10 @@ public class ValueEditorsPreferencePage
private void createSyntaxMaps( Schema schema )
{
- Collection<LdapSyntaxDescription> lsds = schema.getLdapSyntaxDescriptions();
- for ( LdapSyntaxDescription lsd : lsds )
+ Collection<LdapSyntax> lsds = schema.getLdapSyntaxDescriptions();
+ for ( LdapSyntax lsd : lsds )
{
- syntaxOid2LsdMap.put( lsd.getNumericOid(), lsd );
+ syntaxOid2LsdMap.put( lsd.getOid(), lsd );
if ( lsd.getDescription() != null )
{
@@ -549,9 +549,9 @@ public class ValueEditorsPreferencePage
{
if ( attributeNames2AtdMap.containsKey( relation.getAttributeNumericOidOrType() ) )
{
- AttributeTypeDescription atd = ( AttributeTypeDescription ) attributeNames2AtdMap
+ AttributeType atd = ( AttributeType ) attributeNames2AtdMap
.get( relation.getAttributeNumericOidOrType() );
- String s = atd.getNumericOid();
+ String s = atd.getOid();
for ( String name : atd.getNames() )
{
if ( !relation.getAttributeNumericOidOrType().equals( name ) )
@@ -563,7 +563,7 @@ public class ValueEditorsPreferencePage
}
else if ( attributeOid2AtdMap.containsKey( relation.getAttributeNumericOidOrType() ) )
{
- AttributeTypeDescription atd = ( AttributeTypeDescription ) attributeOid2AtdMap
+ AttributeType atd = ( AttributeType ) attributeOid2AtdMap
.get( relation.getAttributeNumericOidOrType() );
return atd.toString();
}
@@ -621,7 +621,7 @@ public class ValueEditorsPreferencePage
{
if ( syntaxOid2LsdMap.containsKey( relation.getSyntaxOID() ) )
{
- LdapSyntaxDescription lsd = ( LdapSyntaxDescription ) syntaxOid2LsdMap.get( relation
+ LdapSyntax lsd = ( LdapSyntax ) syntaxOid2LsdMap.get( relation
.getSyntaxOID() );
return SchemaUtils.toString( lsd );
}
Modified: directory/studio/branches/shared-trunk-merge/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dnd/EntryTransfer.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/shared-trunk-merge/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dnd/EntryTransfer.java?rev=1005180&r1=1005179&r2=1005180&view=diff
==============================================================================
--- directory/studio/branches/shared-trunk-merge/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dnd/EntryTransfer.java (original)
+++ directory/studio/branches/shared-trunk-merge/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dnd/EntryTransfer.java Wed Oct 6 17:33:40 2010
@@ -29,13 +29,12 @@ import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
-import org.apache.directory.shared.ldap.name.LdapDN;
+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.BrowserConnectionManager;
+import org.apache.directory.studio.ldapbrowser.core.BrowserCorePlugin;
import org.apache.directory.studio.ldapbrowser.core.model.IBrowserConnection;
import org.apache.directory.studio.ldapbrowser.core.model.IEntry;
-
import org.eclipse.swt.dnd.ByteArrayTransfer;
import org.eclipse.swt.dnd.Transfer;
import org.eclipse.swt.dnd.TransferData;
@@ -107,7 +106,7 @@ public class EntryTransfer extends ByteA
byte[] connectionId = entries[i].getBrowserConnection().getConnection().getId().getBytes( "UTF-8" ); //$NON-NLS-1$
writeOut.writeInt( connectionId.length );
writeOut.write( connectionId );
- byte[] dn = entries[i].getDn().getUpName().getBytes( "UTF-8" ); //$NON-NLS-1$
+ byte[] dn = entries[i].getDn().getName().getBytes( "UTF-8" ); //$NON-NLS-1$
writeOut.writeInt( dn.length );
writeOut.write( dn );
}
@@ -170,7 +169,7 @@ public class EntryTransfer extends ByteA
int size = readIn.readInt();
byte[] dn = new byte[size];
readIn.read( dn );
- entry = connection.getEntryFromCache( new LdapDN( 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/branches/shared-trunk-merge/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dnd/ValuesTransfer.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/shared-trunk-merge/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dnd/ValuesTransfer.java?rev=1005180&r1=1005179&r2=1005180&view=diff
==============================================================================
--- directory/studio/branches/shared-trunk-merge/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dnd/ValuesTransfer.java (original)
+++ directory/studio/branches/shared-trunk-merge/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dnd/ValuesTransfer.java Wed Oct 6 17:33:40 2010
@@ -29,7 +29,7 @@ import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
-import org.apache.directory.shared.ldap.name.LdapDN;
+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;
@@ -107,7 +107,7 @@ public class ValuesTransfer extends Byte
.getId().getBytes( "UTF-8" ); //$NON-NLS-1$
writeOut.writeInt( connectionId.length );
writeOut.write( connectionId );
- byte[] dn = values[i].getAttribute().getEntry().getDn().getUpName().getBytes( "UTF-8" ); //$NON-NLS-1$
+ byte[] dn = values[i].getAttribute().getEntry().getDn().getName().getBytes( "UTF-8" ); //$NON-NLS-1$
writeOut.writeInt( dn.length );
writeOut.write( dn );
byte[] attributeName = values[i].getAttribute().getDescription().getBytes( "UTF-8" ); //$NON-NLS-1$
@@ -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 LdapDN( 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/branches/shared-trunk-merge/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/filtereditor/FilterContentAssistProcessor.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/shared-trunk-merge/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/filtereditor/FilterContentAssistProcessor.java?rev=1005180&r1=1005179&r2=1005180&view=diff
==============================================================================
--- directory/studio/branches/shared-trunk-merge/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/filtereditor/FilterContentAssistProcessor.java (original)
+++ directory/studio/branches/shared-trunk-merge/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/filtereditor/FilterContentAssistProcessor.java Wed Oct 6 17:33:40 2010
@@ -31,9 +31,9 @@ import java.util.Map;
import java.util.TreeMap;
import org.apache.directory.shared.ldap.constants.SchemaConstants;
-import org.apache.directory.shared.ldap.schema.parsers.AttributeTypeDescription;
-import org.apache.directory.shared.ldap.schema.parsers.MatchingRuleDescription;
-import org.apache.directory.shared.ldap.schema.parsers.ObjectClassDescription;
+import org.apache.directory.shared.ldap.schema.AttributeType;
+import org.apache.directory.shared.ldap.schema.MatchingRule;
+import org.apache.directory.shared.ldap.schema.ObjectClass;
import org.apache.directory.studio.ldapbrowser.common.BrowserCommonActivator;
import org.apache.directory.studio.ldapbrowser.common.BrowserCommonConstants;
import org.apache.directory.studio.ldapbrowser.core.model.filter.LdapFilter;
@@ -101,16 +101,16 @@ public class FilterContentAssistProcesso
private Schema schema;
/** The possible attribute types. */
- private Map<String, AttributeTypeDescription> possibleAttributeTypes;
+ private Map<String, AttributeType> possibleAttributeTypes;
/** The possible filter types. */
private Map<String, String> possibleFilterTypes;
/** The possible object classes. */
- private Map<String, ObjectClassDescription> possibleObjectClasses;
+ private Map<String, ObjectClass> possibleObjectClasses;
/** The possible matching rules. */
- private Map<String, MatchingRuleDescription> possibleMatchingRules;
+ private Map<String, MatchingRule> possibleMatchingRules;
/**
@@ -168,17 +168,17 @@ public class FilterContentAssistProcesso
{
this.schema = schema;
- possibleAttributeTypes = new TreeMap<String, AttributeTypeDescription>( nameAndOidComparator );
+ possibleAttributeTypes = new TreeMap<String, AttributeType>( nameAndOidComparator );
possibleFilterTypes = new LinkedHashMap<String, String>();
- possibleObjectClasses = new TreeMap<String, ObjectClassDescription>( nameAndOidComparator );
- possibleMatchingRules = new TreeMap<String, MatchingRuleDescription>( nameAndOidComparator );
+ possibleObjectClasses = new TreeMap<String, ObjectClass>( nameAndOidComparator );
+ possibleMatchingRules = new TreeMap<String, MatchingRule>( nameAndOidComparator );
if ( schema != null )
{
- Collection<AttributeTypeDescription> attributeTypeDescriptions = schema.getAttributeTypeDescriptions();
- for ( AttributeTypeDescription atd : attributeTypeDescriptions )
+ Collection<AttributeType> attributeTypeDescriptions = schema.getAttributeTypeDescriptions();
+ for ( AttributeType atd : attributeTypeDescriptions )
{
- possibleAttributeTypes.put( atd.getNumericOid(), atd );
+ possibleAttributeTypes.put( atd.getOid(), atd );
for ( String atdName : atd.getNames() )
{
possibleAttributeTypes.put( atdName, atd );
@@ -191,20 +191,20 @@ public class FilterContentAssistProcesso
possibleFilterTypes.put( ">=", Messages.getString( "FilterContentAssistProcessor.GreaterThanOrEquals" ) ); //$NON-NLS-1$ //$NON-NLS-2$
possibleFilterTypes.put( "~=", Messages.getString( "FilterContentAssistProcessor.Approximately" ) ); //$NON-NLS-1$ //$NON-NLS-2$
- Collection<ObjectClassDescription> ocds = schema.getObjectClassDescriptions();
- for ( ObjectClassDescription ocd : ocds )
+ Collection<ObjectClass> ocds = schema.getObjectClassDescriptions();
+ for ( ObjectClass ocd : ocds )
{
- possibleObjectClasses.put( ocd.getNumericOid(), ocd );
+ possibleObjectClasses.put( ocd.getOid(), ocd );
for ( String name : ocd.getNames() )
{
possibleObjectClasses.put( name, ocd );
}
}
- Collection<MatchingRuleDescription> matchingRuleDescriptions = schema.getMatchingRuleDescriptions();
- for ( MatchingRuleDescription description : matchingRuleDescriptions )
+ Collection<MatchingRule> matchingRuleDescriptions = schema.getMatchingRuleDescriptions();
+ for ( MatchingRule description : matchingRuleDescriptions )
{
- possibleMatchingRules.put( description.getNumericOid(), description );
+ possibleMatchingRules.put( description.getOid(), description );
for ( String name : description.getNames() )
{
possibleMatchingRules.put( name, description );
@@ -430,18 +430,18 @@ public class FilterContentAssistProcesso
{
for ( String possibleAttributeType : possibleAttributeTypes.keySet() )
{
- AttributeTypeDescription description = possibleAttributeTypes.get( possibleAttributeType );
+ AttributeType description = possibleAttributeTypes.get( possibleAttributeType );
if ( possibleAttributeType.toUpperCase().startsWith( attributeType.toUpperCase() ) )
{
String replacementString = possibleAttributeType;
String displayString = possibleAttributeType;
- if ( displayString.equals( description.getNumericOid() ) )
+ if ( displayString.equals( description.getOid() ) )
{
displayString += " (" + SchemaUtils.toString( description ) + ")"; //$NON-NLS-1$ //$NON-NLS-2$
}
else
{
- displayString += " (" + description.getNumericOid() + ")"; //$NON-NLS-1$ //$NON-NLS-2$
+ displayString += " (" + description.getOid() + ")"; //$NON-NLS-1$ //$NON-NLS-2$
}
String info = SchemaUtils.getLdifLine( description );
ICompletionProposal proposal = new CompletionProposal( replacementString, offset, attributeType
@@ -505,18 +505,18 @@ public class FilterContentAssistProcesso
{
for ( String possibleObjectClass : possibleObjectClasses.keySet() )
{
- ObjectClassDescription description = possibleObjectClasses.get( possibleObjectClass );
+ ObjectClass description = possibleObjectClasses.get( possibleObjectClass );
if ( possibleObjectClass.toUpperCase().startsWith( objectClass.toUpperCase() ) )
{
String replacementString = possibleObjectClass;
String displayString = possibleObjectClass;
- if ( displayString.equals( description.getNumericOid() ) )
+ if ( displayString.equals( description.getOid() ) )
{
displayString += " (" + SchemaUtils.toString( description ) + ")"; //$NON-NLS-1$ //$NON-NLS-2$
}
else
{
- displayString += " (" + description.getNumericOid() + ")"; //$NON-NLS-1$ //$NON-NLS-2$
+ displayString += " (" + description.getOid() + ")"; //$NON-NLS-1$ //$NON-NLS-2$
}
ICompletionProposal proposal = new CompletionProposal( replacementString, offset, objectClass
@@ -545,7 +545,7 @@ public class FilterContentAssistProcesso
{
if ( possibleMatchingRule.toUpperCase().startsWith( matchingRule.toUpperCase() ) )
{
- MatchingRuleDescription description = schema.getMatchingRuleDescription( possibleMatchingRule );
+ MatchingRule description = schema.getMatchingRuleDescription( possibleMatchingRule );
String replacementString = possibleMatchingRule;
if ( equalsColonToken == null )
{
@@ -556,13 +556,13 @@ public class FilterContentAssistProcesso
replacementString += "="; //$NON-NLS-1$
}
String displayString = possibleMatchingRule;
- if ( displayString.equals( description.getNumericOid() ) )
+ if ( displayString.equals( description.getOid() ) )
{
displayString += " (" + SchemaUtils.toString( description ) + ")"; //$NON-NLS-1$ //$NON-NLS-2$
}
else
{
- displayString += " (" + description.getNumericOid() + ")"; //$NON-NLS-1$ //$NON-NLS-2$
+ displayString += " (" + description.getOid() + ")"; //$NON-NLS-1$ //$NON-NLS-2$
}
String info = SchemaUtils.getLdifLine( description );
ICompletionProposal proposal = new CompletionProposal( replacementString, offset, matchingRule
Modified: directory/studio/branches/shared-trunk-merge/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/filtereditor/FilterTextHover.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/shared-trunk-merge/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/filtereditor/FilterTextHover.java?rev=1005180&r1=1005179&r2=1005180&view=diff
==============================================================================
--- directory/studio/branches/shared-trunk-merge/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/filtereditor/FilterTextHover.java (original)
+++ directory/studio/branches/shared-trunk-merge/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/filtereditor/FilterTextHover.java Wed Oct 6 17:33:40 2010
@@ -22,9 +22,9 @@ package org.apache.directory.studio.ldap
import org.apache.directory.shared.ldap.constants.SchemaConstants;
-import org.apache.directory.shared.ldap.schema.parsers.AttributeTypeDescription;
-import org.apache.directory.shared.ldap.schema.parsers.MatchingRuleDescription;
-import org.apache.directory.shared.ldap.schema.parsers.ObjectClassDescription;
+import org.apache.directory.shared.ldap.schema.AttributeType;
+import org.apache.directory.shared.ldap.schema.MatchingRule;
+import org.apache.directory.shared.ldap.schema.ObjectClass;
import org.apache.directory.studio.ldapbrowser.core.model.filter.LdapFilter;
import org.apache.directory.studio.ldapbrowser.core.model.filter.LdapFilterExtensibleComponent;
import org.apache.directory.studio.ldapbrowser.core.model.filter.LdapFilterItemComponent;
@@ -94,7 +94,7 @@ public class FilterTextHover implements
+ fc.getAttributeToken().getLength() )
{
String attributeType = fc.getAttributeToken().getValue();
- AttributeTypeDescription attributeTypeDescription = schema
+ AttributeType attributeTypeDescription = schema
.getAttributeTypeDescription( attributeType );
String ldifLine = SchemaUtils.getLdifLine( attributeTypeDescription );
return ldifLine;
@@ -105,7 +105,7 @@ public class FilterTextHover implements
&& hoverRegion.getOffset() <= fc.getValueToken().getOffset() + fc.getValueToken().getLength() )
{
String objectClass = fc.getValueToken().getValue();
- ObjectClassDescription objectClassDescription = schema.getObjectClassDescription( objectClass );
+ ObjectClass objectClassDescription = schema.getObjectClassDescription( objectClass );
String ldifLine = SchemaUtils.getLdifLine( objectClassDescription );
return ldifLine;
}
@@ -119,7 +119,7 @@ public class FilterTextHover implements
+ fc.getAttributeToken().getLength() )
{
String attributeType = fc.getAttributeToken().getValue();
- AttributeTypeDescription attributeTypeDescription = schema
+ AttributeType attributeTypeDescription = schema
.getAttributeTypeDescription( attributeType );
String ldifLine = SchemaUtils.getLdifLine( attributeTypeDescription );
return ldifLine;
@@ -130,7 +130,7 @@ public class FilterTextHover implements
+ fc.getMatchingRuleToken().getLength() )
{
String matchingRule = fc.getMatchingRuleToken().getValue();
- MatchingRuleDescription matchingRuleDescription = schema.getMatchingRuleDescription( matchingRule );
+ MatchingRule matchingRuleDescription = schema.getMatchingRuleDescription( matchingRule );
String info = SchemaUtils.getLdifLine( matchingRuleDescription );
return info;
}
Modified: directory/studio/branches/shared-trunk-merge/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/DnBuilderWidget.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/shared-trunk-merge/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/DnBuilderWidget.java?rev=1005180&r1=1005179&r2=1005180&view=diff
==============================================================================
--- directory/studio/branches/shared-trunk-merge/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/DnBuilderWidget.java (original)
+++ directory/studio/branches/shared-trunk-merge/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/DnBuilderWidget.java Wed Oct 6 17:33:40 2010
@@ -25,9 +25,9 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.Iterator;
-import org.apache.directory.shared.ldap.name.AttributeTypeAndValue;
-import org.apache.directory.shared.ldap.name.LdapDN;
-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;
@@ -62,10 +62,10 @@ public class DnBuilderWidget extends Bro
private String[] attributeNames;
/** The initial RDN. */
- private Rdn currentRdn;
+ private RDN currentRdn;
/** The initial parent DN. */
- private LdapDN currentParentDn;
+ private DN currentParentDn;
/** True if the RDN input elements should be shown. */
private boolean showRDN;
@@ -77,7 +77,7 @@ public class DnBuilderWidget extends Bro
private Shell shell;
/** The selected parent DN. */
- private LdapDN parentDn;
+ private DN parentDn;
/** The entry widget label. */
private Label parentEntryLabel;
@@ -92,7 +92,7 @@ public class DnBuilderWidget extends Bro
private Composite rdnComposite;
/** The resulting RDN. */
- private Rdn rdn;
+ private RDN rdn;
/** The list of RdnLines. */
private ArrayList<RdnLine> rdnLineList;
@@ -133,7 +133,7 @@ public class DnBuilderWidget extends Bro
* @param browserConnection the connection
* @param parentDn the initial parent DN
*/
- public void setInput( IBrowserConnection browserConnection, String[] attributeNames, Rdn rdn, LdapDN parentDn )
+ public void setInput( IBrowserConnection browserConnection, String[] attributeNames, RDN rdn, DN parentDn )
{
this.attributeNames = attributeNames;
this.currentRdn = rdn;
@@ -168,13 +168,13 @@ public class DnBuilderWidget extends Bro
else
{
int i = 0;
- Iterator<AttributeTypeAndValue> atavIterator = currentRdn.iterator();
+ Iterator<AVA> atavIterator = currentRdn.iterator();
while ( atavIterator.hasNext() )
{
- AttributeTypeAndValue atav = atavIterator.next();
+ AVA ava = atavIterator.next();
addRdnLine( rdnComposite, i );
- rdnLineList.get( i ).rdnTypeCombo.setText( atav.getUpType() );
- rdnLineList.get( i ).rdnValueText.setText( atav.getNormValue().getString() );
+ rdnLineList.get( i ).rdnTypeCombo.setText( ava.getUpType() );
+ rdnLineList.get( i ).rdnValueText.setText( ava.getNormValue().getString() );
if ( i == 0 )
{
if ( "".equals( rdnLineList.get( i ).rdnTypeCombo ) ) //$NON-NLS-1$
@@ -206,7 +206,7 @@ public class DnBuilderWidget extends Bro
*
* @return the RDN
*/
- public Rdn getRdn()
+ public RDN getRdn()
{
return rdn;
}
@@ -217,7 +217,7 @@ public class DnBuilderWidget extends Bro
*
* @return the parent DN
*/
- public LdapDN getParentDn()
+ public DN getParentDn()
{
return parentDn;
}
@@ -340,7 +340,7 @@ public class DnBuilderWidget extends Bro
try
{
// calculate DN
- parentDn = ( LdapDN ) parentEntryWidget.getDn().clone();
+ parentDn = parentEntryWidget.getDn();
}
catch ( Exception e )
{
@@ -367,7 +367,7 @@ public class DnBuilderWidget extends Bro
}
else
{
- LdapDN dn;
+ DN dn;
if ( showParent && showRDN )
{
dn = DnUtils.composeDn( rdn, parentDn );
@@ -378,14 +378,14 @@ public class DnBuilderWidget extends Bro
}
else if ( showRDN )
{
- dn = new LdapDN();
+ dn = new DN();
dn.add( rdn );
}
else
{
- dn = new LdapDN();
+ dn = new DN();
}
- previewText.setText( dn.getUpName() );
+ previewText.setText( dn.getName() );
}
}
Modified: directory/studio/branches/shared-trunk-merge/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserLabelProvider.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/shared-trunk-merge/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserLabelProvider.java?rev=1005180&r1=1005179&r2=1005180&view=diff
==============================================================================
--- directory/studio/branches/shared-trunk-merge/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserLabelProvider.java (original)
+++ directory/studio/branches/shared-trunk-merge/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserLabelProvider.java Wed Oct 6 17:33:40 2010
@@ -23,8 +23,8 @@ package org.apache.directory.studio.ldap
import java.util.Collection;
+import org.apache.directory.shared.ldap.schema.ObjectClass;
import org.apache.directory.shared.ldap.schema.ObjectClassTypeEnum;
-import org.apache.directory.shared.ldap.schema.parsers.ObjectClassDescription;
import org.apache.directory.studio.connection.core.Utils;
import org.apache.directory.studio.connection.core.jobs.StudioConnectionRunnableWithProgress;
import org.apache.directory.studio.ldapbrowser.common.BrowserCommonActivator;
@@ -113,22 +113,22 @@ public class BrowserLabelProvider extend
}
else if ( entry instanceof BaseDNEntry )
{
- return entry.getDn().getUpName() + append.toString();
+ return entry.getDn().getName() + append.toString();
}
else if ( entry.hasParententry() )
{
String label = ""; //$NON-NLS-1$
if ( preferences.getEntryLabel() == BrowserCommonConstants.SHOW_DN )
{
- label = entry.getDn().getUpName();
+ label = entry.getDn().getName();
}
else if ( preferences.getEntryLabel() == BrowserCommonConstants.SHOW_RDN )
{
- label = entry.getRdn().getUpName();
+ label = entry.getRdn().getName();
}
else if ( preferences.getEntryLabel() == BrowserCommonConstants.SHOW_RDN_VALUE )
{
- label = ( String ) entry.getRdn().getUpValue();
+ label = ( String ) entry.getRdn().getName();
}
label += append.toString();
@@ -142,7 +142,7 @@ public class BrowserLabelProvider extend
}
else
{
- return entry.getDn().getUpName() + append.toString();
+ return entry.getDn().getName() + append.toString();
}
}
else if ( obj instanceof SearchContinuation )
@@ -199,15 +199,15 @@ public class BrowserLabelProvider extend
}
else if ( preferences.getSearchResultLabel() == BrowserCommonConstants.SHOW_DN )
{
- label = sr.getEntry().getDn().getUpName();
+ label = sr.getEntry().getDn().getName();
}
else if ( preferences.getSearchResultLabel() == BrowserCommonConstants.SHOW_RDN )
{
- label = sr.getEntry().getRdn().getUpName();
+ label = sr.getEntry().getRdn().getName();
}
else if ( preferences.getSearchResultLabel() == BrowserCommonConstants.SHOW_RDN_VALUE )
{
- label = ( String ) sr.getEntry().getRdn().getUpValue();
+ label = ( String ) sr.getEntry().getRdn().getName();
}
if ( preferences.isSearchResultAbbreviate()
@@ -220,7 +220,7 @@ public class BrowserLabelProvider extend
}
else
{
- return sr.getEntry().getDn().getUpName();
+ return sr.getEntry().getDn().getName();
}
}
@@ -410,7 +410,7 @@ public class BrowserLabelProvider extend
public static Image getImageByObjectClass( IEntry entry )
{
Schema schema = entry.getBrowserConnection().getSchema();
- Collection<ObjectClassDescription> ocds = entry.getObjectClassDescriptions();
+ Collection<ObjectClass> ocds = entry.getObjectClassDescriptions();
if ( ocds != null )
{
Collection<String> numericOids = SchemaUtils.getNumericOids( ocds );
@@ -426,12 +426,12 @@ public class BrowserLabelProvider extend
{
if ( numericOids.contains( ocNumericOid ) )
{
- ObjectClassDescription ocd = schema.getObjectClassDescription( ocNumericOid );
- if ( ocd.getKind() == ObjectClassTypeEnum.STRUCTURAL )
+ ObjectClass ocd = schema.getObjectClassDescription( ocNumericOid );
+ if ( ocd.getType() == ObjectClassTypeEnum.STRUCTURAL )
{
weight += 3;
}
- else if ( ocd.getKind() == ObjectClassTypeEnum.AUXILIARY )
+ else if ( ocd.getType() == ObjectClassTypeEnum.AUXILIARY )
{
weight += 2;
}
Modified: directory/studio/branches/shared-trunk-merge/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserQuickSearchWidget.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/shared-trunk-merge/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserQuickSearchWidget.java?rev=1005180&r1=1005179&r2=1005180&view=diff
==============================================================================
--- directory/studio/branches/shared-trunk-merge/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserQuickSearchWidget.java (original)
+++ directory/studio/branches/shared-trunk-merge/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserQuickSearchWidget.java Wed Oct 6 17:33:40 2010
@@ -24,7 +24,7 @@ package org.apache.directory.studio.ldap
import java.util.Arrays;
import java.util.Collection;
-import org.apache.directory.shared.ldap.schema.parsers.AttributeTypeDescription;
+import org.apache.directory.shared.ldap.schema.AttributeType;
import org.apache.directory.studio.common.ui.widgets.BaseWidgetUtils;
import org.apache.directory.studio.connection.ui.widgets.ExtendedContentAssistCommandAdapter;
import org.apache.directory.studio.ldapbrowser.common.BrowserCommonActivator;
@@ -473,7 +473,7 @@ public class BrowserQuickSearchWidget
String[] atdNames;
if ( connection != null )
{
- Collection<AttributeTypeDescription> atds = connection.getSchema().getAttributeTypeDescriptions();
+ Collection<AttributeType> atds = connection.getSchema().getAttributeTypeDescriptions();
atdNames = SchemaUtils.getNames( atds ).toArray( EMPTY );
}
else
Modified: directory/studio/branches/shared-trunk-merge/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserSorter.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/shared-trunk-merge/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserSorter.java?rev=1005180&r1=1005179&r2=1005180&view=diff
==============================================================================
--- directory/studio/branches/shared-trunk-merge/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserSorter.java (original)
+++ directory/studio/branches/shared-trunk-merge/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserSorter.java Wed Oct 6 17:33:40 2010
@@ -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 )
{
@@ -339,7 +339,7 @@ public class BrowserSorter extends Viewe
}
else
{
- return compare( rdn1.getUpName(), rdn2.getUpName() );
+ return compare( rdn1.getName(), rdn2.getName() );
}
}
@@ -368,27 +368,27 @@ 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.getValue() == null || "".equals( rdn1.getValue() ) ) //$NON-NLS-1$
- && ( rdn2 == null || rdn2.getValue() == null || "".equals( rdn2.getValue() ) ) ) //$NON-NLS-1$
+ if ( ( rdn1 == null || rdn1.getName() == null || "".equals( rdn1.getName() ) ) //$NON-NLS-1$
+ && ( rdn2 == null || rdn2.getName() == null || "".equals( rdn2.getName() ) ) ) //$NON-NLS-1$
{
return equal();
}
- else if ( ( rdn1 == null || rdn1.getValue() == null || "".equals( rdn1.getValue() ) ) //$NON-NLS-1$
- && !( rdn2 == null || rdn2.getValue() == null || "".equals( rdn2.getValue() ) ) ) //$NON-NLS-1$
+ else if ( ( rdn1 == null || rdn1.getName() == null || "".equals( rdn1.getName() ) ) //$NON-NLS-1$
+ && !( rdn2 == null || rdn2.getName() == null || "".equals( rdn2.getName() ) ) ) //$NON-NLS-1$
{
return greaterThan();
}
- else if ( !( rdn1 == null || rdn1.getValue() == null || "".equals( rdn1.getValue() ) ) //$NON-NLS-1$
- && ( rdn2 == null || rdn2.getValue() == null || "".equals( rdn2.getValue() ) ) ) //$NON-NLS-1$
+ else if ( !( rdn1 == null || rdn1.getName() == null || "".equals( rdn1.getName() ) ) //$NON-NLS-1$
+ && ( rdn2 == null || rdn2.getName() == null || "".equals( rdn2.getName() ) ) ) //$NON-NLS-1$
{
return lessThan();
}
- String rdn1Value = ( String ) rdn1.getUpValue();
- String rdn2Value = ( String ) rdn2.getUpValue();
+ String rdn1Value = ( String ) rdn1.getName();
+ String rdn2Value = ( String ) rdn2.getName();
if ( rdn1Value.matches( "\\d*" ) && !rdn2Value.matches( "\\d*" ) ) //$NON-NLS-1$ //$NON-NLS-2$
{
// return lessThan();
Modified: directory/studio/branches/shared-trunk-merge/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/connection/BrowserParameterPage.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/shared-trunk-merge/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/connection/BrowserParameterPage.java?rev=1005180&r1=1005179&r2=1005180&view=diff
==============================================================================
--- directory/studio/branches/shared-trunk-merge/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/connection/BrowserParameterPage.java (original)
+++ directory/studio/branches/shared-trunk-merge/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/connection/BrowserParameterPage.java Wed Oct 6 17:33:40 2010
@@ -24,7 +24,7 @@ package org.apache.directory.studio.ldap
import java.util.List;
import org.apache.commons.lang.StringUtils;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
import org.apache.directory.shared.ldap.util.LdapURL;
import org.apache.directory.shared.ldap.util.LdapURL.Extension;
import org.apache.directory.studio.common.ui.widgets.BaseWidgetUtils;
@@ -448,7 +448,7 @@ public class BrowserParameterPage extend
errorMessage = null;
if ( !isAutoFetchBaseDns() )
{
- if ( !LdapDN.isValid( getBaseDN() ) )
+ if ( !DN.isValid( getBaseDN() ) )
{
message = Messages.getString( "BrowserParameterPage.EnterValidBaseDN" ); //$NON-NLS-1$
}
Modified: directory/studio/branches/shared-trunk-merge/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/EntryEditorWidgetContentProvider.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/shared-trunk-merge/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/EntryEditorWidgetContentProvider.java?rev=1005180&r1=1005179&r2=1005180&view=diff
==============================================================================
--- directory/studio/branches/shared-trunk-merge/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/EntryEditorWidgetContentProvider.java (original)
+++ directory/studio/branches/shared-trunk-merge/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/EntryEditorWidgetContentProvider.java Wed Oct 6 17:33:40 2010
@@ -79,12 +79,12 @@ public class EntryEditorWidgetContentPro
if ( newInput != null && newInput instanceof IEntry )
{
IEntry entry = ( IEntry ) newInput;
- dn = Messages.getString( "EntryEditorWidgetContentProvider.DNLabel" ) + entry.getDn().getUpName(); //$NON-NLS-1$
+ dn = Messages.getString( "EntryEditorWidgetContentProvider.DNLabel" ) + entry.getDn().getName(); //$NON-NLS-1$
}
else if ( newInput != null && newInput instanceof AttributeHierarchy )
{
AttributeHierarchy ah = ( AttributeHierarchy ) newInput;
- dn = Messages.getString( "EntryEditorWidgetContentProvider.DNLabel" ) + ah.getAttribute().getEntry().getDn().getUpName(); //$NON-NLS-1$
+ dn = Messages.getString( "EntryEditorWidgetContentProvider.DNLabel" ) + ah.getAttribute().getEntry().getDn().getName(); //$NON-NLS-1$
}
else
{
Modified: directory/studio/branches/shared-trunk-merge/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/OpenBestEditorAction.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/shared-trunk-merge/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/OpenBestEditorAction.java?rev=1005180&r1=1005179&r2=1005180&view=diff
==============================================================================
--- directory/studio/branches/shared-trunk-merge/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/OpenBestEditorAction.java (original)
+++ directory/studio/branches/shared-trunk-merge/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/OpenBestEditorAction.java Wed Oct 6 17:33:40 2010
@@ -23,7 +23,7 @@ package org.apache.directory.studio.ldap
import java.util.Collection;
-import org.apache.directory.shared.ldap.schema.parsers.AttributeTypeDescription;
+import org.apache.directory.shared.ldap.schema.AttributeType;
import org.apache.directory.studio.ldapbrowser.core.BrowserCoreConstants;
import org.apache.directory.studio.ldapbrowser.core.model.IEntry;
import org.apache.directory.studio.ldapbrowser.core.model.IValue;
@@ -157,8 +157,8 @@ public class OpenBestEditorAction extend
// validate if value is allowed
IEntry entry = value.getAttribute().getEntry();
- Collection<AttributeTypeDescription> allAtds = SchemaUtils.getAllAttributeTypeDescriptions( entry );
- AttributeTypeDescription atd = value.getAttribute().getAttributeTypeDescription();
+ Collection<AttributeType> allAtds = SchemaUtils.getAllAttributeTypeDescriptions( entry );
+ AttributeType atd = value.getAttribute().getAttributeTypeDescription();
if ( !allAtds.contains( atd ) )
{
message.append( NLS.bind( Messages.getString( "OpenBestEditorAction.AttributeNotInSubSchema" ), //$NON-NLS-1$