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/08 18:58:56 UTC
svn commit: r1005899 [1/2] - in
/directory/studio/trunk/plugins/ldapbrowser.ui: ./
src/main/java/org/apache/directory/studio/entryeditors/
src/main/java/org/apache/directory/studio/ldapbrowser/ui/
src/main/java/org/apache/directory/studio/ldapbrowser/u...
Author: pamarcelot
Date: Fri Oct 8 16:58:54 2010
New Revision: 1005899
URL: http://svn.apache.org/viewvc?rev=1005899&view=rev
Log:
Merged the 'shared-trunk-merge' branch back into trunk.
It includes all changes related to the use of the current Shared trunk into Studio (which was stuck at version 0.9.17 until now).
Modified:
directory/studio/trunk/plugins/ldapbrowser.ui/pom.xml
directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/entryeditors/EntryEditorInput.java
directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/entryeditors/EntryEditorManager.java
directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/entryeditors/EntryEditorUtils.java
directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/CopyDnAction.java
directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/CopyEntryAsCsvAction.java
directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/CopyEntryAsLdifAction.java
directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/CopyValueAction.java
directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/GotoDnAction.java
directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/LocateDnInDitAction.java
directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/LocateInDitAction.java
directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/MoveAction.java
directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/OpenSchemaBrowserAction.java
directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/messages.properties (props changed)
directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/messages_de.properties (props changed)
directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/dialogs/messages.properties (props changed)
directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/dialogs/messages_de.properties (props changed)
directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/dialogs/preferences/messages.properties (props changed)
directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/dialogs/preferences/messages_de.properties (props changed)
directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/dialogs/properties/AttributePropertyPage.java
directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/dialogs/properties/EntryPropertyPage.java
directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/dialogs/properties/messages.properties (props changed)
directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/dialogs/properties/messages_de.properties (props changed)
directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/entry/EntryEditorNavigationLocation.java
directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/entry/EntryEditorOutlinePage.java
directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/entry/LdifEntryEditorDocumentProvider.java
directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/entry/messages.properties (props changed)
directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/entry/messages_de.properties (props changed)
directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/AttributeTypeDescriptionDetailsPage.java
directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/AttributeTypeDescriptionPage.java
directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/LdapSyntaxDescriptionDetailsPage.java
directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/LdapSyntaxDescriptionPage.java
directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/MatchingRuleDescriptionDetailsPage.java
directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/MatchingRuleDescriptionPage.java
directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/MatchingRuleUseDescriptionDetailsPage.java
directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/MatchingRuleUseDescriptionPage.java
directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/ObjectClassDescriptionDetailsPage.java
directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/ObjectClassDescriptionPage.java
directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/SchemaBrowser.java
directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/SchemaBrowserInput.java
directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/SchemaBrowserManager.java
directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/SchemaBrowserNavigationLocation.java
directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/SchemaDetailsPage.java
directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/SchemaPage.java
directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/messages.properties (props changed)
directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/messages_de.properties (props changed)
directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/OpenBestEditorAction.java
directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/SearchResultEditorContentProvider.java
directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/SearchResultEditorFilter.java
directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/SearchResultEditorLabelProvider.java
directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/SearchResultEditorUniversalListener.java
directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/messages.properties (props changed)
directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/messages_de.properties (props changed)
directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/messages.properties (props changed)
directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/messages_de.properties (props changed)
directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/views/browser/messages.properties (props changed)
directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/views/browser/messages_de.properties (props changed)
directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/views/connection/messages.properties (props changed)
directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/views/connection/messages_de.properties (props changed)
directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/views/modificationlogs/messages.properties (props changed)
directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/views/modificationlogs/messages_de.properties (props changed)
directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/views/searchlogs/messages.properties (props changed)
directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/views/searchlogs/messages_de.properties (props changed)
directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/BatchOperationApplyOnWizardPage.java
directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/BatchOperationWizard.java
directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/NewBookmarkMainWizardPage.java
directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/NewBookmarkWizard.java
directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/messages.properties (props changed)
Modified: directory/studio/trunk/plugins/ldapbrowser.ui/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.ui/pom.xml?rev=1005899&r1=1005898&r2=1005899&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.ui/pom.xml (original)
+++ directory/studio/trunk/plugins/ldapbrowser.ui/pom.xml Fri Oct 8 16:58:54 2010
@@ -119,8 +119,7 @@
<Require-Bundle>
org.apache.commons.io;bundle-version="${org.apache.commons.io.version}",
org.apache.commons.lang;bundle-version="${org.apache.commons.lang.version}",
- org.apache.directory.shared.ldap;bundle-version="${org.apache.directory.shared.version}",
- org.apache.directory.shared.ldapconstants;bundle-version="${org.apache.directory.shared.version}",
+ org.apache.directory.shared.ldap;bundle-version="${org.apache.directory.shared.validversion}",
org.apache.directory.studio.common.core,
org.apache.directory.studio.common.ui,
org.apache.directory.studio.connection.core,
@@ -183,11 +182,6 @@
<artifactId>org.apache.directory.shared.ldap</artifactId>
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>org.apache.directory.studio</groupId>
- <artifactId>org.apache.directory.shared.ldapconstants</artifactId>
- <scope>provided</scope>
- </dependency>
<!-- Apache Directory Studio plugins dependencies -->
<dependency>
Modified: directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/entryeditors/EntryEditorInput.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/entryeditors/EntryEditorInput.java?rev=1005899&r1=1005898&r2=1005899&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/entryeditors/EntryEditorInput.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/entryeditors/EntryEditorInput.java Fri Oct 8 16:58:54 2010
@@ -140,7 +140,7 @@ public class EntryEditorInput implements
}
else
{
- return entry.getDn().getUpName();
+ return entry.getDn().getName();
}
}
Modified: directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/entryeditors/EntryEditorManager.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/entryeditors/EntryEditorManager.java?rev=1005899&r1=1005898&r2=1005899&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/entryeditors/EntryEditorManager.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/entryeditors/EntryEditorManager.java Fri Oct 8 16:58:54 2010
@@ -31,7 +31,7 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
import org.apache.directory.studio.connection.core.Connection;
import org.apache.directory.studio.connection.core.event.ConnectionEventRegistry;
import org.apache.directory.studio.connection.core.event.ConnectionUpdateAdapter;
@@ -350,7 +350,7 @@ public class EntryEditorManager
if ( editor != null && editor.getEntryEditorInput().getResolvedEntry() != null )
{
IBrowserConnection bc = editor.getEntryEditorInput().getResolvedEntry().getBrowserConnection();
- LdapDN dn = editor.getEntryEditorInput().getResolvedEntry().getDn();
+ DN dn = editor.getEntryEditorInput().getResolvedEntry().getDn();
if ( bc.getEntryFromCache( dn ) == null )
{
editorReferences.add( ref );
Modified: directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/entryeditors/EntryEditorUtils.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/entryeditors/EntryEditorUtils.java?rev=1005899&r1=1005898&r2=1005899&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/entryeditors/EntryEditorUtils.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/entryeditors/EntryEditorUtils.java Fri Oct 8 16:58:54 2010
@@ -102,7 +102,7 @@ public class EntryEditorUtils
else
{
return NLS.bind( Messages.getString( "EntryEditorNavigationLocation.Entry" ), //$NON-NLS-1$
- input.getEntryInput().getDn().getUpName() ) + connectionName;
+ input.getEntryInput().getDn().getName() ) + connectionName;
}
}
else if ( input.getSearchResultInput() != null )
@@ -116,7 +116,7 @@ public class EntryEditorUtils
else
{
return NLS.bind( Messages.getString( "EntryEditorNavigationLocation.SearchResult" ), //$NON-NLS-1$
- input.getSearchResultInput().getDn().getUpName() ) + connectionName; //$NON-NLS-1$
+ input.getSearchResultInput().getDn().getName() ) + connectionName; //$NON-NLS-1$
}
}
else if ( input.getBookmarkInput() != null )
@@ -130,7 +130,7 @@ public class EntryEditorUtils
else
{
return NLS.bind( Messages.getString( "EntryEditorNavigationLocation.Bookmark" ), //$NON-NLS-1$
- input.getBookmarkInput().getDn().getUpName() ) + connectionName;
+ input.getBookmarkInput().getDn().getName() ) + connectionName;
}
}
else
Modified: directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/CopyDnAction.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/CopyDnAction.java?rev=1005899&r1=1005898&r2=1005899&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/CopyDnAction.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/CopyDnAction.java Fri Oct 8 16:58:54 2010
@@ -54,27 +54,27 @@ public class CopyDnAction extends Browse
String dn = null;
if ( getSelectedEntries().length > 0 )
{
- dn = getSelectedEntries()[0].getDn().getUpName();
+ dn = getSelectedEntries()[0].getDn().getName();
}
else if ( getSelectedAttributes().length > 0 )
{
- dn = getSelectedAttributes()[0].getEntry().getDn().getUpName();
+ dn = getSelectedAttributes()[0].getEntry().getDn().getName();
}
else if ( getSelectedAttributeHierarchies().length > 0 )
{
- dn = getSelectedAttributeHierarchies()[0].getAttribute().getEntry().getDn().getUpName();
+ dn = getSelectedAttributeHierarchies()[0].getAttribute().getEntry().getDn().getName();
}
else if ( getSelectedValues().length > 0 )
{
- dn = getSelectedValues()[0].getAttribute().getEntry().getDn().getUpName();
+ dn = getSelectedValues()[0].getAttribute().getEntry().getDn().getName();
}
else if ( getSelectedSearchResults().length > 0 )
{
- dn = getSelectedSearchResults()[0].getDn().getUpName();
+ dn = getSelectedSearchResults()[0].getDn().getName();
}
else if ( getSelectedBookmarks().length > 0 )
{
- dn = getSelectedBookmarks()[0].getDn().getUpName();
+ dn = getSelectedBookmarks()[0].getDn().getName();
}
if ( dn != null )
Modified: directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/CopyEntryAsCsvAction.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/CopyEntryAsCsvAction.java?rev=1005899&r1=1005898&r2=1005899&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/CopyEntryAsCsvAction.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/CopyEntryAsCsvAction.java Fri Oct 8 16:58:54 2010
@@ -264,7 +264,7 @@ public class CopyEntryAsCsvAction extend
BrowserUIConstants.PREFERENCE_SEARCHRESULTEDITOR_SHOW_DN ) )
{
text.append( quoteCharacter );
- text.append( entries[e].getDn().getUpName() );
+ text.append( entries[e].getDn().getName() );
text.append( quoteCharacter );
text.append( attributeDelimiter );
Modified: directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/CopyEntryAsLdifAction.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/CopyEntryAsLdifAction.java?rev=1005899&r1=1005898&r2=1005899&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/CopyEntryAsLdifAction.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/CopyEntryAsLdifAction.java Fri Oct 8 16:58:54 2010
@@ -27,7 +27,7 @@ import java.util.HashSet;
import java.util.List;
import java.util.Set;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
import org.apache.directory.studio.ldapbrowser.core.BrowserCoreConstants;
import org.apache.directory.studio.ldapbrowser.core.BrowserCorePlugin;
import org.apache.directory.studio.ldapbrowser.core.model.IAttribute;
@@ -176,7 +176,7 @@ public class CopyEntryAsLdifAction exten
* @param text
* the StringBuffer to serialize to
*/
- protected void serializeDn( LdapDN dn, StringBuffer text )
+ protected void serializeDn( DN dn, StringBuffer text )
{
text.append( ModelConverter.dnToLdifDnLine( dn ).toFormattedString( Utils.getLdifFormatParameters() ) );
}
Modified: directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/CopyValueAction.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/CopyValueAction.java?rev=1005899&r1=1005898&r2=1005899&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/CopyValueAction.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/CopyValueAction.java Fri Oct 8 16:58:54 2010
@@ -26,7 +26,7 @@ import java.util.Iterator;
import java.util.LinkedHashSet;
import java.util.Set;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
import org.apache.directory.studio.ldapbrowser.common.actions.BrowserAction;
import org.apache.directory.studio.ldapbrowser.common.actions.CopyAction;
import org.apache.directory.studio.ldapbrowser.core.BrowserCoreConstants;
@@ -216,18 +216,18 @@ public class CopyValueAction extends Bro
}
else if ( getSelectedSearchResults().length > 0 )
{
- LdapDN dn = getSelectedSearchResults()[0].getDn();
+ DN dn = getSelectedSearchResults()[0].getDn();
switch ( mode )
{
case UTF8:
case DISPLAY:
- text.append( dn.getUpName() );
+ text.append( dn.getName() );
break;
case BASE64:
- text.append( LdifUtils.base64encode( LdifUtils.utf8encode( dn.getUpName() ) ) );
+ text.append( LdifUtils.base64encode( LdifUtils.utf8encode( dn.getName() ) ) );
break;
case HEX:
- text.append( LdifUtils.hexEncode( LdifUtils.utf8encode( dn.getUpName() ) ) );
+ text.append( LdifUtils.hexEncode( LdifUtils.utf8encode( dn.getName() ) ) );
break;
case LDIF:
text.append( ModelConverter.dnToLdifDnLine( dn )
Modified: directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/GotoDnAction.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/GotoDnAction.java?rev=1005899&r1=1005898&r2=1005899&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/GotoDnAction.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/GotoDnAction.java Fri Oct 8 16:58:54 2010
@@ -21,7 +21,7 @@
package org.apache.directory.studio.ldapbrowser.ui.actions;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
import org.apache.directory.studio.connection.core.Utils;
import org.apache.directory.studio.ldapbrowser.common.dialogs.DnDialog;
import org.apache.directory.studio.ldapbrowser.common.dialogs.TextDialog;
@@ -95,7 +95,7 @@ public class GotoDnAction extends Locate
{
IBrowserConnection conn = ( IBrowserConnection ) getInput();
- LdapDN dn = Utils.getLdapDn( getStringFromClipboard() );
+ DN dn = Utils.getLdapDn( getStringFromClipboard() );
DnDialog dialog = new DnDialog(
getShell(),
Modified: directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/LocateDnInDitAction.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/LocateDnInDitAction.java?rev=1005899&r1=1005898&r2=1005899&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/LocateDnInDitAction.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/LocateDnInDitAction.java Fri Oct 8 16:58:54 2010
@@ -21,9 +21,8 @@
package org.apache.directory.studio.ldapbrowser.ui.actions;
-import javax.naming.InvalidNameException;
-
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.exception.LdapInvalidDnException;
+import org.apache.directory.shared.ldap.name.DN;
import org.apache.directory.studio.ldapbrowser.core.model.ISearchResult;
import org.apache.directory.studio.ldapbrowser.core.model.IValue;
import org.apache.directory.studio.ldapbrowser.ui.BrowserUIConstants;
@@ -82,13 +81,13 @@ public class LocateDnInDitAction extends
try
{
IValue value = getSelectedAttributeHierarchies()[0].getAttribute().getValues()[0];
- if ( value.isString() && LdapDN.isValid( value.getStringValue() ) )
+ if ( value.isString() && DN.isValid( value.getStringValue() ) )
{
- return new ConnectionAndDn( value.getAttribute().getEntry().getBrowserConnection(), new LdapDN(
+ return new ConnectionAndDn( value.getAttribute().getEntry().getBrowserConnection(), new DN(
value.getStringValue() ) );
}
}
- catch ( InvalidNameException e )
+ catch ( LdapInvalidDnException e )
{
// no valid DN
}
@@ -99,13 +98,13 @@ public class LocateDnInDitAction extends
try
{
IValue value = getSelectedValues()[0];
- if ( value.isString() && LdapDN.isValid( value.getStringValue() ) )
+ if ( value.isString() && DN.isValid( value.getStringValue() ) )
{
- return new ConnectionAndDn( value.getAttribute().getEntry().getBrowserConnection(), new LdapDN(
+ return new ConnectionAndDn( value.getAttribute().getEntry().getBrowserConnection(), new DN(
value.getStringValue() ) );
}
}
- catch ( InvalidNameException e )
+ catch ( LdapInvalidDnException e )
{
// no valid DN
}
Modified: directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/LocateInDitAction.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/LocateInDitAction.java?rev=1005899&r1=1005898&r2=1005899&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/LocateInDitAction.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/LocateInDitAction.java Fri Oct 8 16:58:54 2010
@@ -21,7 +21,7 @@
package org.apache.directory.studio.ldapbrowser.ui.actions;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
import org.apache.directory.studio.connection.ui.RunnableContextRunner;
import org.apache.directory.studio.ldapbrowser.common.actions.BrowserAction;
import org.apache.directory.studio.ldapbrowser.core.jobs.ReadEntryRunnable;
@@ -51,7 +51,7 @@ public abstract class LocateInDitAction
if ( connectionAndDn != null )
{
IBrowserConnection connection = connectionAndDn.connection;
- LdapDN dn = connectionAndDn.dn;
+ DN dn = connectionAndDn.dn;
IEntry entry = connection.getEntryFromCache( dn );
if ( entry == null )
@@ -123,7 +123,7 @@ public abstract class LocateInDitAction
private IBrowserConnection connection;
/** The DN */
- private LdapDN dn;
+ private DN dn;
/**
@@ -132,7 +132,7 @@ public abstract class LocateInDitAction
* @param connection the connection
* @param dn the DN
*/
- protected ConnectionAndDn( IBrowserConnection connection, LdapDN dn )
+ protected ConnectionAndDn( IBrowserConnection connection, DN dn )
{
this.connection = connection;
this.dn = dn;
Modified: directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/MoveAction.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/MoveAction.java?rev=1005899&r1=1005898&r2=1005899&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/MoveAction.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/MoveAction.java Fri Oct 8 16:58:54 2010
@@ -23,7 +23,7 @@ package org.apache.directory.studio.ldap
import java.util.LinkedHashSet;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
import org.apache.directory.studio.connection.ui.RunnableContextRunner;
import org.apache.directory.studio.ldapbrowser.common.actions.BrowserAction;
import org.apache.directory.studio.ldapbrowser.common.dialogs.MoveEntriesDialog;
@@ -179,7 +179,7 @@ public class MoveAction extends BrowserA
MoveEntriesDialog moveDialog = new MoveEntriesDialog( getShell(), entries );
if ( moveDialog.open() == Dialog.OK )
{
- LdapDN newParentDn = moveDialog.getParentDn();
+ DN newParentDn = moveDialog.getParentDn();
if ( newParentDn != null /* && !newRdn.equals(entry.getRdn()) */)
{
IEntry newParentEntry = entries[0].getBrowserConnection().getEntryFromCache( newParentDn );
Modified: directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/OpenSchemaBrowserAction.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/OpenSchemaBrowserAction.java?rev=1005899&r1=1005898&r2=1005899&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/OpenSchemaBrowserAction.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/OpenSchemaBrowserAction.java Fri Oct 8 16:58:54 2010
@@ -21,10 +21,10 @@
package org.apache.directory.studio.ldapbrowser.ui.actions;
-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.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.LdapSyntax;
+import org.apache.directory.shared.ldap.schema.MatchingRule;
+import org.apache.directory.shared.ldap.schema.ObjectClass;
import org.apache.directory.studio.connection.core.Connection;
import org.apache.directory.studio.ldapbrowser.common.actions.BrowserAction;
import org.apache.directory.studio.ldapbrowser.core.BrowserCorePlugin;
@@ -281,12 +281,12 @@ public class OpenSchemaBrowserAction ext
* @return
* the LDAP Syntax Description
*/
- private LdapSyntaxDescription getLsd()
+ private LdapSyntax getLsd()
{
if ( getConnection() != null )
{
Schema schema = getConnection().getSchema();
- AttributeTypeDescription atd = getAtd();
+ AttributeType atd = getAtd();
if ( atd != null && SchemaUtils.getSyntaxNumericOidTransitive( atd, schema ) != null
&& schema.hasLdapSyntaxDescription( SchemaUtils.getSyntaxNumericOidTransitive( atd, schema ) ) )
@@ -305,7 +305,7 @@ public class OpenSchemaBrowserAction ext
* @return
* the Object Class Description
*/
- private ObjectClassDescription getOcd()
+ private ObjectClass getOcd()
{
if ( getSelectedAttributes().length == 0 && getSelectedValues().length == 1
&& getSelectedValues()[0].getAttribute().isObjectClassAttribute() )
@@ -330,11 +330,11 @@ public class OpenSchemaBrowserAction ext
* @return
* the Attribute Type Description
*/
- private AttributeTypeDescription getAtd()
+ private AttributeType getAtd()
{
if ( ( getSelectedValues().length + getSelectedAttributes().length ) + getSelectedAttributeHierarchies().length == 1 )
{
- AttributeTypeDescription atd = null;
+ AttributeType atd = null;
if ( getSelectedValues().length == 1 )
{
atd = getSelectedValues()[0].getAttribute().getAttributeTypeDescription();
@@ -414,12 +414,12 @@ public class OpenSchemaBrowserAction ext
* @return
* the Equality Matching Rule Description
*/
- private MatchingRuleDescription getEmrd()
+ private MatchingRule getEmrd()
{
if ( getConnection() != null )
{
Schema schema = getConnection().getSchema();
- AttributeTypeDescription atd = getAtd();
+ AttributeType atd = getAtd();
if ( atd != null
&& SchemaUtils.getEqualityMatchingRuleNameOrNumericOidTransitive( atd, schema ) != null
&& schema.hasLdapSyntaxDescription( SchemaUtils.getEqualityMatchingRuleNameOrNumericOidTransitive( atd,
@@ -439,12 +439,12 @@ public class OpenSchemaBrowserAction ext
* @return
* the Substring Matching Rule Description
*/
- private MatchingRuleDescription getSmrd()
+ private MatchingRule getSmrd()
{
if ( getConnection() != null )
{
Schema schema = getConnection().getSchema();
- AttributeTypeDescription atd = getAtd();
+ AttributeType atd = getAtd();
if ( atd != null
&& SchemaUtils.getSubstringMatchingRuleNameOrNumericOidTransitive( atd, schema ) != null
&& schema.hasLdapSyntaxDescription( SchemaUtils.getSubstringMatchingRuleNameOrNumericOidTransitive(
@@ -464,12 +464,12 @@ public class OpenSchemaBrowserAction ext
* @return
* the Ordering Matching Rule Description
*/
- private MatchingRuleDescription getOmrd()
+ private MatchingRule getOmrd()
{
if ( getConnection() != null )
{
Schema schema = getConnection().getSchema();
- AttributeTypeDescription atd = getAtd();
+ AttributeType atd = getAtd();
if ( atd != null
&& SchemaUtils.getOrderingMatchingRuleNameOrNumericOidTransitive( atd, schema ) != null
&& schema.hasLdapSyntaxDescription( SchemaUtils.getOrderingMatchingRuleNameOrNumericOidTransitive( atd,
Propchange: directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/messages.properties
('svn:mergeinfo' removed)
Propchange: directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/messages_de.properties
('svn:mergeinfo' removed)
Propchange: directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/dialogs/messages.properties
('svn:mergeinfo' removed)
Propchange: directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/dialogs/messages_de.properties
('svn:mergeinfo' removed)
Propchange: directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/dialogs/preferences/messages.properties
('svn:mergeinfo' removed)
Propchange: directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/dialogs/preferences/messages_de.properties
('svn:mergeinfo' removed)
Modified: directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/dialogs/properties/AttributePropertyPage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/dialogs/properties/AttributePropertyPage.java?rev=1005899&r1=1005898&r2=1005899&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/dialogs/properties/AttributePropertyPage.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/dialogs/properties/AttributePropertyPage.java Fri Oct 8 16:58:54 2010
@@ -21,7 +21,7 @@
package org.apache.directory.studio.ldapbrowser.ui.dialogs.properties;
-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.ldapbrowser.core.model.IAttribute;
import org.apache.directory.studio.ldapbrowser.core.model.IValue;
@@ -293,9 +293,9 @@ public class AttributePropertyPage exten
if ( schema.hasAttributeTypeDescription( attribute.getDescription() ) )
{
- AttributeTypeDescription atd = schema.getAttributeTypeDescription( attribute.getDescription() );
+ AttributeType atd = schema.getAttributeTypeDescription( attribute.getDescription() );
- atdOidText.setText( atd.getNumericOid() );
+ atdOidText.setText( atd.getOid() );
String atdNames = atd.getNames().toString();
atdNamesText.setText( atdNames.substring( 1, atdNames.length() - 1 ) );
atdDescText.setText( Utils.getNonNullString( atd.getDescription() ) );
@@ -307,12 +307,12 @@ public class AttributePropertyPage exten
obsoleteFlag.setSelection( atd.isObsolete() );
String syntaxNumericOid = SchemaUtils.getSyntaxNumericOidTransitive( atd, schema );
- int syntaxLength = SchemaUtils.getSyntaxLengthTransitive( atd, schema );
+ long syntaxLength = SchemaUtils.getSyntaxLengthTransitive( atd, schema );
String syntaxDescription = syntaxNumericOid != null ? schema
.getLdapSyntaxDescription( syntaxNumericOid ).getDescription() : null;
syntaxOidText.setText( Utils.getNonNullString( syntaxNumericOid ) );
syntaxDescText.setText( Utils.getNonNullString( syntaxDescription ) );
- syntaxLengthText.setText( Utils.getNonNullString( syntaxLength > 0 ? Integer.toString( syntaxLength )
+ syntaxLengthText.setText( Utils.getNonNullString( syntaxLength > 0 ? Long.toString( syntaxLength )
: null ) );
equalityMatchingRuleText.setText( Utils.getNonNullString( SchemaUtils
Modified: directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/dialogs/properties/EntryPropertyPage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/dialogs/properties/EntryPropertyPage.java?rev=1005899&r1=1005898&r2=1005899&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/dialogs/properties/EntryPropertyPage.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/dialogs/properties/EntryPropertyPage.java Fri Oct 8 16:58:54 2010
@@ -322,9 +322,9 @@ public class EntryPropertyPage extends P
if ( !this.dnText.isDisposed() )
{
- setMessage( Messages.getString( "EntryPropertyPage.Entry" ) + entry.getDn().getUpName() ); //$NON-NLS-1$
+ setMessage( Messages.getString( "EntryPropertyPage.Entry" ) + entry.getDn().getName() ); //$NON-NLS-1$
- dnText.setText( entry.getDn().getUpName() );
+ dnText.setText( entry.getDn().getName() );
urlText.setText( entry.getUrl().toString() );
ctText.setText( getNonNullStringValue( entry.getAttribute( SchemaConstants.CREATE_TIMESTAMP_AT ) ) );
cnText.setText( getNonNullStringValue( entry.getAttribute( SchemaConstants.CREATORS_NAME_AT ) ) );
Propchange: directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/dialogs/properties/messages.properties
('svn:mergeinfo' removed)
Propchange: directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/dialogs/properties/messages_de.properties
('svn:mergeinfo' removed)
Modified: directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/entry/EntryEditorNavigationLocation.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/entry/EntryEditorNavigationLocation.java?rev=1005899&r1=1005898&r2=1005899&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/entry/EntryEditorNavigationLocation.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/entry/EntryEditorNavigationLocation.java Fri Oct 8 16:58:54 2010
@@ -21,9 +21,8 @@
package org.apache.directory.studio.ldapbrowser.ui.editors.entry;
-import javax.naming.InvalidNameException;
-
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.exception.LdapInvalidDnException;
+import org.apache.directory.shared.ldap.name.DN;
import org.apache.directory.studio.entryeditors.EntryEditorExtension;
import org.apache.directory.studio.entryeditors.EntryEditorInput;
import org.apache.directory.studio.entryeditors.EntryEditorManager;
@@ -82,14 +81,14 @@ public class EntryEditorNavigationLocati
{
IEntry entry = eei.getEntryInput();
memento.putString( "TYPE", "IEntry" ); //$NON-NLS-1$ //$NON-NLS-2$
- memento.putString( "DN", entry.getDn().getUpName() ); //$NON-NLS-1$
+ memento.putString( "DN", entry.getDn().getName() ); //$NON-NLS-1$
memento.putString( "CONNECTION", entry.getBrowserConnection().getConnection().getId() ); //$NON-NLS-1$
}
else if ( eei.getSearchResultInput() != null )
{
ISearchResult searchResult = eei.getSearchResultInput();
memento.putString( "TYPE", "ISearchResult" ); //$NON-NLS-1$ //$NON-NLS-2$
- memento.putString( "DN", searchResult.getDn().getUpName() ); //$NON-NLS-1$
+ memento.putString( "DN", searchResult.getDn().getName() ); //$NON-NLS-1$
memento.putString( "SEARCH", searchResult.getSearch().getName() ); //$NON-NLS-1$
memento.putString(
"CONNECTION", searchResult.getSearch().getBrowserConnection().getConnection().getId() ); //$NON-NLS-1$
@@ -120,7 +119,7 @@ public class EntryEditorNavigationLocati
{
IBrowserConnection connection = BrowserCorePlugin.getDefault().getConnectionManager()
.getBrowserConnectionById( memento.getString( "CONNECTION" ) ); //$NON-NLS-1$
- LdapDN dn = new LdapDN( memento.getString( "DN" ) ); //$NON-NLS-1$
+ DN dn = new DN( memento.getString( "DN" ) ); //$NON-NLS-1$
IEntry entry = connection.getEntryFromCache( dn );
super.setInput( new EntryEditorInput( entry, entryEditorExtension ) );
}
@@ -130,7 +129,7 @@ public class EntryEditorNavigationLocati
.getBrowserConnectionById( memento.getString( "CONNECTION" ) ); //$NON-NLS-1$
ISearch search = connection.getSearchManager().getSearch( memento.getString( "SEARCH" ) ); //$NON-NLS-1$
ISearchResult[] searchResults = search.getSearchResults();
- LdapDN dn = new LdapDN( memento.getString( "DN" ) ); //$NON-NLS-1$
+ DN dn = new DN( memento.getString( "DN" ) ); //$NON-NLS-1$
for ( int i = 0; i < searchResults.length; i++ )
{
if ( dn.equals( searchResults[i].getDn() ) )
@@ -148,7 +147,7 @@ public class EntryEditorNavigationLocati
super.setInput( new EntryEditorInput( bookmark, entryEditorExtension ) );
}
}
- catch ( InvalidNameException e )
+ catch ( LdapInvalidDnException e )
{
e.printStackTrace();
}
Modified: directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/entry/EntryEditorOutlinePage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/entry/EntryEditorOutlinePage.java?rev=1005899&r1=1005898&r2=1005899&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/entry/EntryEditorOutlinePage.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/entry/EntryEditorOutlinePage.java Fri Oct 8 16:58:54 2010
@@ -343,7 +343,7 @@ public class EntryEditorOutlinePage exte
else
{
// Any other case
- return entry.getDn().getUpName();
+ return entry.getDn().getName();
}
}
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=1005899&r1=1005898&r2=1005899&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 Fri Oct 8 16:58:54 2010
@@ -23,9 +23,8 @@ package org.apache.directory.studio.ldap
import java.util.Arrays;
-import javax.naming.InvalidNameException;
-
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.exception.LdapInvalidDnException;
+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;
@@ -101,14 +100,14 @@ public class LdifEntryEditorDocumentProv
EntryEditorInput input = getEntryEditorInput( element );
try
{
- LdapDN newDN = new LdapDN( records[0].getDnLine().getValueAsString() );
+ 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$
}
}
- catch ( InvalidNameException e )
+ catch ( LdapInvalidDnException e )
{
throw new CoreException( new Status( IStatus.ERROR, BrowserUIConstants.PLUGIN_ID, Messages
.getString( "LdifEntryEditorDocumentProvider.InvalidDN" ) ) ); //$NON-NLS-1$
@@ -159,7 +158,7 @@ public class LdifEntryEditorDocumentProv
( ( DummyEntry ) input.getSharedWorkingCopy( editor ) ).setDn( modifiedEntry.getDn() );
new CompoundModification().replaceAttributes( modifiedEntry, input.getSharedWorkingCopy( editor ), this );
}
- catch ( InvalidNameException e )
+ catch ( LdapInvalidDnException e )
{
throw new RuntimeException( e );
}
Propchange: directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/entry/messages.properties
('svn:mergeinfo' removed)
Propchange: directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/entry/messages_de.properties
('svn:mergeinfo' removed)
Modified: directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/AttributeTypeDescriptionDetailsPage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/AttributeTypeDescriptionDetailsPage.java?rev=1005899&r1=1005898&r2=1005899&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/AttributeTypeDescriptionDetailsPage.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/AttributeTypeDescriptionDetailsPage.java Fri Oct 8 16:58:54 2010
@@ -23,11 +23,11 @@ package org.apache.directory.studio.ldap
import java.util.Collection;
+import org.apache.directory.shared.ldap.schema.AttributeType;
+import org.apache.directory.shared.ldap.schema.LdapSyntax;
+import org.apache.directory.shared.ldap.schema.MatchingRule;
+import org.apache.directory.shared.ldap.schema.ObjectClass;
import org.apache.directory.shared.ldap.schema.UsageEnum;
-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.parsers.MatchingRuleDescription;
-import org.apache.directory.shared.ldap.schema.parsers.ObjectClassDescription;
import org.apache.directory.studio.ldapbrowser.core.model.schema.SchemaUtils;
import org.eclipse.osgi.util.NLS;
import org.eclipse.swt.SWT;
@@ -344,10 +344,10 @@ public class AttributeTypeDescriptionDet
*/
public void setInput( Object input )
{
- AttributeTypeDescription atd = null;
- if ( input instanceof AttributeTypeDescription )
+ AttributeType atd = null;
+ if ( input instanceof AttributeType )
{
- atd = ( AttributeTypeDescription ) input;
+ atd = ( AttributeType ) input;
}
// create main content
@@ -362,8 +362,8 @@ public class AttributeTypeDescriptionDet
// set syntax content
String lsdOid = null;
- LdapSyntaxDescription lsd = null;
- int lsdLength = 0;
+ LdapSyntax lsd = null;
+ long lsdLength = 0;
if ( atd != null )
{
lsdOid = SchemaUtils.getSyntaxNumericOidTransitive( atd, getSchema() );
@@ -373,17 +373,17 @@ public class AttributeTypeDescriptionDet
}
lsdLength = SchemaUtils.getSyntaxLengthTransitive( atd, getSchema() );
}
- syntaxLink.setText( getNonNullString( lsd != null ? lsd.getNumericOid() : lsdOid ) );
+ syntaxLink.setText( getNonNullString( lsd != null ? lsd.getOid() : lsdOid ) );
syntaxLink.setHref( lsd );
syntaxLink.setUnderlined( lsd != null );
syntaxLink.setEnabled( lsd != null );
syntaxDescText.setText( getNonNullString( lsd != null ? lsd.getDescription() : null ) );
- lengthText.setText( getNonNullString( lsdLength > 0 ? Integer.toString( lsdLength ) : null ) );
+ lengthText.setText( getNonNullString( lsdLength > 0 ? Long.toString( lsdLength ) : null ) );
syntaxSection.layout();
// set matching rules content
String emrOid = null;
- MatchingRuleDescription emr = null;
+ MatchingRule emr = null;
if ( atd != null )
{
emrOid = SchemaUtils.getEqualityMatchingRuleNameOrNumericOidTransitive( atd, getSchema() );
@@ -398,7 +398,7 @@ public class AttributeTypeDescriptionDet
equalityLink.setEnabled( emr != null );
String smrOid = null;
- MatchingRuleDescription smr = null;
+ MatchingRule smr = null;
if ( atd != null )
{
smrOid = SchemaUtils.getSubstringMatchingRuleNameOrNumericOidTransitive( atd, getSchema() );
@@ -413,7 +413,7 @@ public class AttributeTypeDescriptionDet
substringLink.setEnabled( smr != null );
String omrOid = null;
- MatchingRuleDescription omr = null;
+ MatchingRule omr = null;
if ( atd != null )
{
omrOid = SchemaUtils.getOrderingMatchingRuleNameOrNumericOidTransitive( atd, getSchema() );
@@ -447,7 +447,7 @@ public class AttributeTypeDescriptionDet
*
* @param atd the attribute type description
*/
- private void createMainContent( AttributeTypeDescription atd )
+ private void createMainContent( AttributeType atd )
{
// dispose old content
if ( mainSection.getClient() != null )
@@ -466,7 +466,7 @@ public class AttributeTypeDescriptionDet
{
toolkit.createLabel( mainClient,
Messages.getString( "AttributeTypeDescriptionDetailsPage.NumericOID" ), SWT.NONE ); //$NON-NLS-1$
- numericOidText = toolkit.createText( mainClient, getNonNullString( atd.getNumericOid() ), SWT.NONE );
+ numericOidText = toolkit.createText( mainClient, getNonNullString( atd.getOid() ), SWT.NONE );
numericOidText.setLayoutData( new GridData( GridData.FILL_HORIZONTAL ) );
numericOidText.setEditable( false );
@@ -504,7 +504,7 @@ public class AttributeTypeDescriptionDet
*
* @param atd the attribute type description
*/
- private void createOtherMatchContent( AttributeTypeDescription atd )
+ private void createOtherMatchContent( AttributeType atd )
{
// dispose old content
if ( otherMatchSection.getClient() != null )
@@ -532,7 +532,7 @@ public class AttributeTypeDescriptionDet
{
if ( getSchema().hasMatchingRuleDescription( mrdName ) )
{
- MatchingRuleDescription mrd = getSchema().getMatchingRuleDescription( mrdName );
+ MatchingRule mrd = getSchema().getMatchingRuleDescription( mrdName );
Hyperlink otherMatchLink = toolkit.createHyperlink( otherMatchClient, SchemaUtils
.toString( mrd ), SWT.WRAP );
otherMatchLink.setHref( mrd );
@@ -575,7 +575,7 @@ public class AttributeTypeDescriptionDet
*
* @param atd the attribute type description
*/
- private void createSupertypeContent( AttributeTypeDescription atd )
+ private void createSupertypeContent( AttributeType atd )
{
// dispose old content
if ( supertypeSection.getClient() != null )
@@ -592,14 +592,14 @@ public class AttributeTypeDescriptionDet
// or a dash if no supertype exists.
if ( atd != null )
{
- String superType = atd.getSuperType();
+ String superType = atd.getSuperiorOid();
if ( superType != null )
{
supertypeSection.setText( NLS.bind( Messages
.getString( "AttributeTypeDescriptionDetailsPage.SupertypeCount" ), new Object[] { 1 } ) ); //$NON-NLS-1$
if ( getSchema().hasAttributeTypeDescription( superType ) )
{
- AttributeTypeDescription supAtd = getSchema().getAttributeTypeDescription( superType );
+ AttributeType supAtd = getSchema().getAttributeTypeDescription( superType );
Hyperlink superLink = toolkit.createHyperlink( superClient, SchemaUtils.toString( supAtd ),
SWT.WRAP );
superLink.setHref( supAtd );
@@ -641,7 +641,7 @@ public class AttributeTypeDescriptionDet
*
* @param atd the attribute type description
*/
- private void createSubtypesContent( AttributeTypeDescription atd )
+ private void createSubtypesContent( AttributeType atd )
{
// dispose old content
if ( subtypesSection.getClient() != null )
@@ -657,7 +657,7 @@ public class AttributeTypeDescriptionDet
// create new content, either links to subtypes or a dash if no subtypes exist.
if ( atd != null )
{
- Collection<AttributeTypeDescription> derivedAtds = SchemaUtils.getDerivedAttributeTypeDescriptions( atd,
+ Collection<AttributeType> derivedAtds = SchemaUtils.getDerivedAttributeTypeDescriptions( atd,
getSchema() );
if ( derivedAtds != null && derivedAtds.size() > 0 )
{
@@ -665,7 +665,7 @@ public class AttributeTypeDescriptionDet
.setText( NLS
.bind(
Messages.getString( "AttributeTypeDescriptionDetailsPage.SubtypesCount" ), new Object[] { derivedAtds.size() } ) ); //$NON-NLS-1$
- for ( AttributeTypeDescription derivedAtd : derivedAtds )
+ for ( AttributeType derivedAtd : derivedAtds )
{
Hyperlink subAttributeTypeLink = toolkit.createHyperlink( subClient, SchemaUtils
.toString( derivedAtd ), SWT.WRAP );
@@ -702,7 +702,7 @@ public class AttributeTypeDescriptionDet
*
* @param atd the attribute type description
*/
- private void createUsedAsMustContent( AttributeTypeDescription atd )
+ private void createUsedAsMustContent( AttributeType atd )
{
// dispose old content
if ( usedAsMustSection.getClient() != null )
@@ -718,14 +718,14 @@ public class AttributeTypeDescriptionDet
// create new content, either links to objectclasses or a dash
if ( atd != null )
{
- Collection<ObjectClassDescription> usedAsMusts = SchemaUtils.getUsedAsMust( atd, getSchema() );
+ Collection<ObjectClass> usedAsMusts = SchemaUtils.getUsedAsMust( atd, getSchema() );
if ( usedAsMusts != null && usedAsMusts.size() > 0 )
{
usedAsMustSection
.setText( NLS
.bind(
Messages.getString( "AttributeTypeDescriptionDetailsPage.UsedAsMustCount" ), new Object[] { usedAsMusts.size() } ) ); //$NON-NLS-1$
- for ( ObjectClassDescription ocd : usedAsMusts )
+ for ( ObjectClass ocd : usedAsMusts )
{
Hyperlink usedAsMustLink = toolkit.createHyperlink( mustClient, SchemaUtils.toString( ocd ),
SWT.WRAP );
@@ -762,7 +762,7 @@ public class AttributeTypeDescriptionDet
*
* @param atd the attribute type description
*/
- private void createUsedAsMayContent( AttributeTypeDescription atd )
+ private void createUsedAsMayContent( AttributeType atd )
{
// dispose old content
if ( usedAsMaySection.getClient() != null )
@@ -778,14 +778,14 @@ public class AttributeTypeDescriptionDet
// create new content, either links to objectclasses or a dash
if ( atd != null )
{
- Collection<ObjectClassDescription> usedAsMays = SchemaUtils.getUsedAsMay( atd, getSchema() );
+ Collection<ObjectClass> usedAsMays = SchemaUtils.getUsedAsMay( atd, getSchema() );
if ( usedAsMays != null && usedAsMays.size() > 0 )
{
usedAsMaySection
.setText( NLS
.bind(
Messages.getString( "AttributeTypeDescriptionDetailsPage.UsedAsMayCount" ), new Object[] { usedAsMays.size() } ) ); //$NON-NLS-1$
- for ( ObjectClassDescription ocd : usedAsMays )
+ for ( ObjectClass ocd : usedAsMays )
{
Hyperlink usedAsMayLink = toolkit
.createHyperlink( mayClient, SchemaUtils.toString( ocd ), SWT.WRAP );
Modified: directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/AttributeTypeDescriptionPage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/AttributeTypeDescriptionPage.java?rev=1005899&r1=1005898&r2=1005899&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/AttributeTypeDescriptionPage.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/AttributeTypeDescriptionPage.java Fri Oct 8 16:58:54 2010
@@ -21,8 +21,8 @@
package org.apache.directory.studio.ldapbrowser.ui.editors.schemabrowser;
-import org.apache.directory.shared.ldap.schema.parsers.AbstractSchemaDescription;
-import org.apache.directory.shared.ldap.schema.parsers.AttributeTypeDescription;
+import org.apache.directory.shared.ldap.schema.AbstractSchemaObject;
+import org.apache.directory.shared.ldap.schema.AttributeType;
import org.apache.directory.studio.ldapbrowser.core.model.schema.Schema;
import org.apache.directory.studio.ldapbrowser.core.model.schema.SchemaUtils;
import org.eclipse.jface.viewers.IStructuredContentProvider;
@@ -168,9 +168,9 @@ public class AttributeTypeDescriptionPag
*/
public String getColumnText( Object obj, int index )
{
- if ( obj instanceof AttributeTypeDescription )
+ if ( obj instanceof AttributeType )
{
- return SchemaUtils.toString( ( AbstractSchemaDescription ) obj );
+ return SchemaUtils.toString( ( AbstractSchemaObject ) obj );
}
return obj.toString();
}
@@ -197,13 +197,13 @@ public class AttributeTypeDescriptionPag
*/
public int compare( Viewer viewer, Object e1, Object e2 )
{
- if ( e1 instanceof AttributeTypeDescription )
+ if ( e1 instanceof AttributeType )
{
- e1 = SchemaUtils.toString( ( AbstractSchemaDescription ) e1 );
+ e1 = SchemaUtils.toString( ( AbstractSchemaObject ) e1 );
}
- if ( e2 instanceof AttributeTypeDescription )
+ if ( e2 instanceof AttributeType )
{
- e2 = SchemaUtils.toString( ( AbstractSchemaDescription ) e2 );
+ e2 = SchemaUtils.toString( ( AbstractSchemaObject ) e2 );
}
return e1.toString().compareTo( e2.toString() );
}
@@ -221,12 +221,12 @@ public class AttributeTypeDescriptionPag
*/
public boolean select( Viewer viewer, Object parentElement, Object element )
{
- if ( element instanceof AttributeTypeDescription )
+ if ( element instanceof AttributeType )
{
- AttributeTypeDescription atd = ( AttributeTypeDescription ) element;
+ AttributeType atd = ( AttributeType ) element;
boolean matched = SchemaUtils.toString( atd ).toLowerCase()
.indexOf( filterText.getText().toLowerCase() ) != -1
- || atd.getNumericOid().toLowerCase().indexOf( filterText.getText().toLowerCase() ) != -1;
+ || atd.getOid().toLowerCase().indexOf( filterText.getText().toLowerCase() ) != -1;
return matched;
}
return false;
Modified: directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/LdapSyntaxDescriptionDetailsPage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/LdapSyntaxDescriptionDetailsPage.java?rev=1005899&r1=1005898&r2=1005899&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/LdapSyntaxDescriptionDetailsPage.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/LdapSyntaxDescriptionDetailsPage.java Fri Oct 8 16:58:54 2010
@@ -23,8 +23,8 @@ 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.parsers.LdapSyntaxDescription;
+import org.apache.directory.shared.ldap.schema.AttributeType;
+import org.apache.directory.shared.ldap.schema.LdapSyntax;
import org.apache.directory.studio.ldapbrowser.core.model.schema.SchemaUtils;
import org.eclipse.osgi.util.NLS;
import org.eclipse.swt.SWT;
@@ -110,10 +110,10 @@ public class LdapSyntaxDescriptionDetail
*/
public void setInput( Object input )
{
- LdapSyntaxDescription lsd = null;
- if ( input instanceof LdapSyntaxDescription )
+ LdapSyntax lsd = null;
+ if ( input instanceof LdapSyntax )
{
- lsd = ( LdapSyntaxDescription ) input;
+ lsd = ( LdapSyntax ) input;
}
createMainContent( lsd );
@@ -131,7 +131,7 @@ public class LdapSyntaxDescriptionDetail
*
* @param lsd the syntax description
*/
- private void createMainContent( LdapSyntaxDescription lsd )
+ private void createMainContent( LdapSyntax lsd )
{
// dispose old content
if ( mainSection.getClient() != null )
@@ -150,7 +150,7 @@ public class LdapSyntaxDescriptionDetail
{
toolkit.createLabel( mainClient,
Messages.getString( "LdapSyntaxDescriptionDetailsPage.NumericOID" ), SWT.NONE ); //$NON-NLS-1$
- Text numericOidText = toolkit.createText( mainClient, getNonNullString( lsd.getNumericOid() ), SWT.NONE );
+ Text numericOidText = toolkit.createText( mainClient, getNonNullString( lsd.getOid() ), SWT.NONE );
numericOidText.setLayoutData( new GridData( GridData.FILL_HORIZONTAL ) );
numericOidText.setEditable( false );
@@ -175,7 +175,7 @@ public class LdapSyntaxDescriptionDetail
*
* @param lsd the syntax description
*/
- private void createUsedFromContents( LdapSyntaxDescription lsd )
+ private void createUsedFromContents( LdapSyntax lsd )
{
// dispose old content
if ( usedFromSection.getClient() != null && !usedFromSection.getClient().isDisposed() )
@@ -191,7 +191,7 @@ public class LdapSyntaxDescriptionDetail
// create content
if ( lsd != null )
{
- Collection<AttributeTypeDescription> usedFromATDs = SchemaUtils.getUsedFromAttributeTypeDescriptions( lsd,
+ Collection<AttributeType> usedFromATDs = SchemaUtils.getUsedFromAttributeTypeDescriptions( lsd,
getSchema() );
if ( usedFromATDs != null && !usedFromATDs.isEmpty() )
{
@@ -199,7 +199,7 @@ public class LdapSyntaxDescriptionDetail
.setText( NLS
.bind(
Messages.getString( "LdapSyntaxDescriptionDetailsPage.UsedFromCount" ), new Object[] { usedFromATDs.size() } ) ); //$NON-NLS-1$
- for ( AttributeTypeDescription atd : usedFromATDs )
+ for ( AttributeType atd : usedFromATDs )
{
Hyperlink usedFromLink = toolkit.createHyperlink( usedFromClient, SchemaUtils.toString( atd ),
SWT.WRAP );
Modified: directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/LdapSyntaxDescriptionPage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/LdapSyntaxDescriptionPage.java?rev=1005899&r1=1005898&r2=1005899&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/LdapSyntaxDescriptionPage.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/LdapSyntaxDescriptionPage.java Fri Oct 8 16:58:54 2010
@@ -21,7 +21,7 @@
package org.apache.directory.studio.ldapbrowser.ui.editors.schemabrowser;
-import org.apache.directory.shared.ldap.schema.parsers.LdapSyntaxDescription;
+import org.apache.directory.shared.ldap.schema.LdapSyntax;
import org.apache.directory.studio.ldapbrowser.core.model.schema.Schema;
import org.apache.directory.studio.ldapbrowser.core.model.schema.SchemaUtils;
import org.eclipse.jface.viewers.IStructuredContentProvider;
@@ -167,9 +167,9 @@ public class LdapSyntaxDescriptionPage e
*/
public String getColumnText( Object obj, int index )
{
- if ( obj instanceof LdapSyntaxDescription )
+ if ( obj instanceof LdapSyntax )
{
- return SchemaUtils.toString( ( LdapSyntaxDescription ) obj );
+ return SchemaUtils.toString( ( LdapSyntax ) obj );
}
return obj.toString();
}
@@ -196,13 +196,13 @@ public class LdapSyntaxDescriptionPage e
*/
public int compare( Viewer viewer, Object e1, Object e2 )
{
- if ( e1 instanceof LdapSyntaxDescription )
+ if ( e1 instanceof LdapSyntax )
{
- e1 = SchemaUtils.toString( ( LdapSyntaxDescription ) e1 );
+ e1 = SchemaUtils.toString( ( LdapSyntax ) e1 );
}
- if ( e2 instanceof LdapSyntaxDescription )
+ if ( e2 instanceof LdapSyntax )
{
- e2 = SchemaUtils.toString( ( LdapSyntaxDescription ) e2 );
+ e2 = SchemaUtils.toString( ( LdapSyntax ) e2 );
}
return e1.toString().compareTo( e2.toString() );
}
@@ -220,12 +220,12 @@ public class LdapSyntaxDescriptionPage e
*/
public boolean select( Viewer viewer, Object parentElement, Object element )
{
- if ( element instanceof LdapSyntaxDescription )
+ if ( element instanceof LdapSyntax )
{
- LdapSyntaxDescription lsd = ( LdapSyntaxDescription ) element;
+ LdapSyntax lsd = ( LdapSyntax ) element;
boolean matched = SchemaUtils.toString( lsd ).toLowerCase()
.indexOf( filterText.getText().toLowerCase() ) != -1
- || lsd.getNumericOid().toLowerCase().indexOf( filterText.getText().toLowerCase() ) != -1;
+ || lsd.getOid().toLowerCase().indexOf( filterText.getText().toLowerCase() ) != -1;
return matched;
}
return false;
Modified: directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/MatchingRuleDescriptionDetailsPage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/MatchingRuleDescriptionDetailsPage.java?rev=1005899&r1=1005898&r2=1005899&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/MatchingRuleDescriptionDetailsPage.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/MatchingRuleDescriptionDetailsPage.java Fri Oct 8 16:58:54 2010
@@ -23,9 +23,9 @@ 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.parsers.LdapSyntaxDescription;
-import org.apache.directory.shared.ldap.schema.parsers.MatchingRuleDescription;
+import org.apache.directory.shared.ldap.schema.AttributeType;
+import org.apache.directory.shared.ldap.schema.LdapSyntax;
+import org.apache.directory.shared.ldap.schema.MatchingRule;
import org.apache.directory.studio.ldapbrowser.core.model.schema.Schema;
import org.apache.directory.studio.ldapbrowser.core.model.schema.SchemaUtils;
import org.eclipse.osgi.util.NLS;
@@ -187,10 +187,10 @@ public class MatchingRuleDescriptionDeta
*/
public void setInput( Object input )
{
- MatchingRuleDescription mrd = null;
- if ( input instanceof MatchingRuleDescription )
+ MatchingRule mrd = null;
+ if ( input instanceof MatchingRule )
{
- mrd = ( MatchingRuleDescription ) input;
+ mrd = ( MatchingRule ) input;
}
// create main content
@@ -201,17 +201,17 @@ public class MatchingRuleDescriptionDeta
// set syntax content
String lsdOid = null;
- LdapSyntaxDescription lsd = null;
+ LdapSyntax lsd = null;
if ( mrd != null )
{
Schema schema = getSchema();
- lsdOid = mrd.getSyntax();
+ lsdOid = mrd.getSyntaxOid();
if ( lsdOid != null && schema.hasLdapSyntaxDescription( lsdOid ) )
{
lsd = schema.getLdapSyntaxDescription( lsdOid );
}
}
- syntaxLink.setText( getNonNullString( lsd != null ? lsd.getNumericOid() : lsdOid ) );
+ syntaxLink.setText( getNonNullString( lsd != null ? lsd.getOid() : lsdOid ) );
syntaxLink.setHref( lsd );
syntaxLink.setUnderlined( lsd != null );
syntaxLink.setEnabled( lsd != null );
@@ -233,7 +233,7 @@ public class MatchingRuleDescriptionDeta
*
* @param mrd the matching rule description
*/
- private void createMainContent( MatchingRuleDescription mrd )
+ private void createMainContent( MatchingRule mrd )
{
// dispose old content
if ( mainSection.getClient() != null )
@@ -252,7 +252,7 @@ public class MatchingRuleDescriptionDeta
{
toolkit.createLabel( mainClient,
Messages.getString( "MatchingRuleDescriptionDetailsPage.NumericOID" ), SWT.NONE ); //$NON-NLS-1$
- numericOidText = toolkit.createText( mainClient, getNonNullString( mrd.getNumericOid() ), SWT.NONE );
+ numericOidText = toolkit.createText( mainClient, getNonNullString( mrd.getOid() ), SWT.NONE );
numericOidText.setLayoutData( new GridData( GridData.FILL_HORIZONTAL ) );
numericOidText.setEditable( false );
@@ -282,7 +282,7 @@ public class MatchingRuleDescriptionDeta
*
* @param mrd the matching rule description
*/
- private void createUsedFromContents( MatchingRuleDescription mrd )
+ private void createUsedFromContents( MatchingRule mrd )
{
// dispose old content
if ( usedFromSection.getClient() != null )
@@ -298,7 +298,7 @@ public class MatchingRuleDescriptionDeta
// create new content
if ( mrd != null )
{
- Collection<AttributeTypeDescription> usedFromATDs = SchemaUtils.getUsedFromAttributeTypeDescriptions( mrd,
+ Collection<AttributeType> usedFromATDs = SchemaUtils.getUsedFromAttributeTypeDescriptions( mrd,
getSchema() );
if ( usedFromATDs != null && usedFromATDs.size() > 0 )
{
@@ -306,7 +306,7 @@ public class MatchingRuleDescriptionDeta
.setText( NLS
.bind(
Messages.getString( "MatchingRuleDescriptionDetailsPage.UsedFromCount" ), new Object[] { usedFromATDs.size() } ) ); //$NON-NLS-1$
- for ( AttributeTypeDescription atd : usedFromATDs )
+ for ( AttributeType atd : usedFromATDs )
{
Hyperlink usedFromLink = toolkit.createHyperlink( usedFromClient, SchemaUtils.toString( atd ),
SWT.WRAP );
Modified: directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/MatchingRuleDescriptionPage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/MatchingRuleDescriptionPage.java?rev=1005899&r1=1005898&r2=1005899&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/MatchingRuleDescriptionPage.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/MatchingRuleDescriptionPage.java Fri Oct 8 16:58:54 2010
@@ -21,7 +21,7 @@
package org.apache.directory.studio.ldapbrowser.ui.editors.schemabrowser;
-import org.apache.directory.shared.ldap.schema.parsers.MatchingRuleDescription;
+import org.apache.directory.shared.ldap.schema.MatchingRule;
import org.apache.directory.studio.ldapbrowser.core.model.schema.Schema;
import org.apache.directory.studio.ldapbrowser.core.model.schema.SchemaUtils;
import org.eclipse.jface.viewers.IStructuredContentProvider;
@@ -167,9 +167,9 @@ public class MatchingRuleDescriptionPage
*/
public String getColumnText( Object obj, int index )
{
- if ( obj instanceof MatchingRuleDescription )
+ if ( obj instanceof MatchingRule )
{
- return SchemaUtils.toString( ( MatchingRuleDescription ) obj );
+ return SchemaUtils.toString( ( MatchingRule ) obj );
}
return obj.toString();
}
@@ -196,13 +196,13 @@ public class MatchingRuleDescriptionPage
*/
public int compare( Viewer viewer, Object e1, Object e2 )
{
- if ( e1 instanceof MatchingRuleDescription )
+ if ( e1 instanceof MatchingRule )
{
- e1 = SchemaUtils.toString( ( MatchingRuleDescription ) e1 );
+ e1 = SchemaUtils.toString( ( MatchingRule ) e1 );
}
- if ( e2 instanceof MatchingRuleDescription )
+ if ( e2 instanceof MatchingRule )
{
- e2 = SchemaUtils.toString( ( MatchingRuleDescription ) e2 );
+ e2 = SchemaUtils.toString( ( MatchingRule ) e2 );
}
return e1.toString().compareTo( e2.toString() );
}
@@ -220,12 +220,12 @@ public class MatchingRuleDescriptionPage
*/
public boolean select( Viewer viewer, Object parentElement, Object element )
{
- if ( element instanceof MatchingRuleDescription )
+ if ( element instanceof MatchingRule )
{
- MatchingRuleDescription mrd = ( MatchingRuleDescription ) element;
+ MatchingRule mrd = ( MatchingRule ) element;
boolean matched = SchemaUtils.toString( mrd ).toLowerCase()
.indexOf( filterText.getText().toLowerCase() ) != -1
- || mrd.getNumericOid().toLowerCase().indexOf( filterText.getText().toLowerCase() ) != -1;
+ || mrd.getOid().toLowerCase().indexOf( filterText.getText().toLowerCase() ) != -1;
return matched;
}
return false;
Modified: directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/MatchingRuleUseDescriptionDetailsPage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/MatchingRuleUseDescriptionDetailsPage.java?rev=1005899&r1=1005898&r2=1005899&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/MatchingRuleUseDescriptionDetailsPage.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/MatchingRuleUseDescriptionDetailsPage.java Fri Oct 8 16:58:54 2010
@@ -23,9 +23,9 @@ package org.apache.directory.studio.ldap
import java.util.List;
-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.MatchingRuleUseDescription;
+import org.apache.directory.shared.ldap.schema.AttributeType;
+import org.apache.directory.shared.ldap.schema.MatchingRule;
+import org.apache.directory.shared.ldap.schema.MatchingRuleUse;
import org.apache.directory.studio.ldapbrowser.core.model.schema.Schema;
import org.apache.directory.studio.ldapbrowser.core.model.schema.SchemaUtils;
import org.eclipse.osgi.util.NLS;
@@ -144,10 +144,10 @@ public class MatchingRuleUseDescriptionD
*/
public void setInput( Object input )
{
- MatchingRuleUseDescription mrud = null;
- if ( input instanceof MatchingRuleUseDescription )
+ MatchingRuleUse mrud = null;
+ if ( input instanceof MatchingRuleUse )
{
- mrud = ( MatchingRuleUseDescription ) input;
+ mrud = ( MatchingRuleUse ) input;
}
// create main content
@@ -171,7 +171,7 @@ public class MatchingRuleUseDescriptionD
*
* @param mrud the matching rule use description
*/
- private void createMainContent( MatchingRuleUseDescription mrud )
+ private void createMainContent( MatchingRuleUse mrud )
{
// dispose old content
if ( mainSection.getClient() != null )
@@ -190,7 +190,7 @@ public class MatchingRuleUseDescriptionD
{
toolkit.createLabel( mainClient,
Messages.getString( "MatchingRuleUseDescriptionDetailsPage.NumericOID" ), SWT.NONE ); //$NON-NLS-1$
- numericOidText = toolkit.createText( mainClient, getNonNullString( mrud.getNumericOid() ), SWT.NONE );
+ numericOidText = toolkit.createText( mainClient, getNonNullString( mrud.getOid() ), SWT.NONE );
numericOidText.setLayoutData( new GridData( GridData.FILL_HORIZONTAL ) );
numericOidText.setEditable( false );
@@ -201,8 +201,8 @@ public class MatchingRuleUseDescriptionD
nameLink.addHyperlinkListener( this );
Schema schema = getSchema();
- MatchingRuleDescription mrd = schema.hasMatchingRuleDescription( mrud.getNumericOid() ) ? schema
- .getMatchingRuleDescription( mrud.getNumericOid() ) : null;
+ MatchingRule mrd = schema.hasMatchingRuleDescription( mrud.getOid() ) ? schema
+ .getMatchingRuleDescription( mrud.getOid() ) : null;
nameLink
.setText( getNonNullString( mrd != null ? SchemaUtils.toString( mrd ) : SchemaUtils.toString( mrud ) ) );
nameLink.setHref( mrd );
@@ -229,7 +229,7 @@ public class MatchingRuleUseDescriptionD
*
* @param mrud the matching rule use description
*/
- private void createAppliesContents( MatchingRuleUseDescription mrud )
+ private void createAppliesContents( MatchingRuleUse mrud )
{
// dispose old content
if ( appliesSection.getClient() != null )
@@ -245,7 +245,7 @@ public class MatchingRuleUseDescriptionD
// create content
if ( mrud != null )
{
- List<String> names = mrud.getApplicableAttributes();
+ List<String> names = mrud.getApplicableAttributeOids();
if ( names != null && !names.isEmpty() )
{
appliesSection
@@ -257,7 +257,7 @@ public class MatchingRuleUseDescriptionD
{
if ( schema.hasAttributeTypeDescription( name ) )
{
- AttributeTypeDescription appliesAtd = schema.getAttributeTypeDescription( name );
+ AttributeType appliesAtd = schema.getAttributeTypeDescription( name );
Hyperlink appliesLink = toolkit.createHyperlink( appliesClient, SchemaUtils
.toString( appliesAtd ), SWT.WRAP );
appliesLink.setHref( appliesAtd );