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/07 09:15:31 UTC
svn commit: r1005342 - in
/directory/studio/branches/shared-trunk-merge/plugins/valueeditors: ./
src/main/java/org/apache/directory/studio/valueeditors/dn/
src/main/java/org/apache/directory/studio/valueeditors/objectclass/
src/main/java/org/apache/dir...
Author: pamarcelot
Date: Thu Oct 7 07:15:30 2010
New Revision: 1005342
URL: http://svn.apache.org/viewvc?rev=1005342&view=rev
Log:
Fixed 'valueeditors' module.
Modified:
directory/studio/branches/shared-trunk-merge/plugins/valueeditors/pom.xml
directory/studio/branches/shared-trunk-merge/plugins/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/dn/DnValueEditor.java
directory/studio/branches/shared-trunk-merge/plugins/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/objectclass/ObjectClassValueEditor.java
directory/studio/branches/shared-trunk-merge/plugins/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/password/PasswordDialog.java
Modified: directory/studio/branches/shared-trunk-merge/plugins/valueeditors/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/branches/shared-trunk-merge/plugins/valueeditors/pom.xml?rev=1005342&r1=1005341&r2=1005342&view=diff
==============================================================================
--- directory/studio/branches/shared-trunk-merge/plugins/valueeditors/pom.xml (original)
+++ directory/studio/branches/shared-trunk-merge/plugins/valueeditors/pom.xml Thu Oct 7 07:15:30 2010
@@ -115,7 +115,7 @@
<Require-Bundle>
org.apache.commons.codec;bundle-version="${org.apache.commons.codec.version}",
org.apache.commons.io;bundle-version="${org.apache.commons.io.version}",
- org.apache.directory.shared.ldap;bundle-version="${org.apache.directory.shared.version}",
+ org.apache.directory.shared.ldap;bundle-version="${org.apache.directory.shared.validversion}",
org.apache.directory.studio.common.ui,
org.apache.directory.studio.connection.core,
org.apache.directory.studio.connection.ui,
Modified: directory/studio/branches/shared-trunk-merge/plugins/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/dn/DnValueEditor.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/shared-trunk-merge/plugins/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/dn/DnValueEditor.java?rev=1005342&r1=1005341&r2=1005342&view=diff
==============================================================================
--- directory/studio/branches/shared-trunk-merge/plugins/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/dn/DnValueEditor.java (original)
+++ directory/studio/branches/shared-trunk-merge/plugins/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/dn/DnValueEditor.java Thu Oct 7 07:15:30 2010
@@ -21,9 +21,8 @@
package org.apache.directory.studio.valueeditors.dn;
-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.common.dialogs.DnDialog;
import org.apache.directory.studio.ldapbrowser.common.dialogs.TextDialog;
import org.apache.directory.studio.ldapbrowser.core.model.AttributeHierarchy;
@@ -53,12 +52,12 @@ public class DnValueEditor extends Abstr
if ( value != null && value instanceof DnValueEditorRawValueWrapper )
{
DnValueEditorRawValueWrapper wrapper = ( DnValueEditorRawValueWrapper ) value;
- LdapDN dn;
+ DN dn;
try
{
- dn = wrapper.dn != null ? new LdapDN( wrapper.dn ) : null;
+ dn = wrapper.dn != null ? new DN( wrapper.dn ) : null;
}
- catch ( InvalidNameException e )
+ catch ( LdapInvalidDnException e )
{
dn = null;
}
@@ -66,7 +65,7 @@ public class DnValueEditor extends Abstr
Messages.getString( "DnValueEditor.DNEditor" ), null, wrapper.connection, dn ); //$NON-NLS-1$
if ( dialog.open() == TextDialog.OK && dialog.getDn() != null )
{
- setValue( dialog.getDn().getUpName() );
+ setValue( dialog.getDn().getName() );
return true;
}
}
Modified: directory/studio/branches/shared-trunk-merge/plugins/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/objectclass/ObjectClassValueEditor.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/shared-trunk-merge/plugins/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/objectclass/ObjectClassValueEditor.java?rev=1005342&r1=1005341&r2=1005342&view=diff
==============================================================================
--- directory/studio/branches/shared-trunk-merge/plugins/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/objectclass/ObjectClassValueEditor.java (original)
+++ directory/studio/branches/shared-trunk-merge/plugins/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/objectclass/ObjectClassValueEditor.java Thu Oct 7 07:15:30 2010
@@ -21,7 +21,7 @@
package org.apache.directory.studio.valueeditors.objectclass;
-import org.apache.directory.shared.ldap.schema.parsers.ObjectClassDescription;
+import org.apache.directory.shared.ldap.schema.ObjectClass;
import org.apache.directory.studio.ldapbrowser.common.dialogs.TextDialog;
import org.apache.directory.studio.ldapbrowser.core.model.AttributeHierarchy;
import org.apache.directory.studio.ldapbrowser.core.model.IBrowserConnection;
@@ -79,8 +79,8 @@ public class ObjectClassValueEditor exte
if ( !showRawValues() && !"".equals( displayValue ) ) //$NON-NLS-1$
{
Schema schema = value.getAttribute().getEntry().getBrowserConnection().getSchema();
- ObjectClassDescription ocd = schema.getObjectClassDescription( displayValue );
- switch ( ocd.getKind() )
+ ObjectClass ocd = schema.getObjectClassDescription( displayValue );
+ switch ( ocd.getType() )
{
case STRUCTURAL:
displayValue = displayValue + Messages.getString( "ObjectClassValueEditor.Structural" ); //$NON-NLS-1$
Modified: directory/studio/branches/shared-trunk-merge/plugins/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/password/PasswordDialog.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/shared-trunk-merge/plugins/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/password/PasswordDialog.java?rev=1005342&r1=1005341&r2=1005342&view=diff
==============================================================================
--- directory/studio/branches/shared-trunk-merge/plugins/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/password/PasswordDialog.java (original)
+++ directory/studio/branches/shared-trunk-merge/plugins/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/password/PasswordDialog.java Thu Oct 7 07:15:30 2010
@@ -466,7 +466,7 @@ public class PasswordDialog extends Dial
// enable/disable test field and buttons
testPasswordText.setEnabled( currentPassword != null && currentPassword.getHashedPassword() != null
&& currentPassword.toBytes().length > 0 );
- testBindDnText.setText( entry != null ? entry.getDn().getUpName() : Utils.getNonNullString( null ) );
+ testBindDnText.setText( entry != null ? entry.getDn().getName() : Utils.getNonNullString( null ) );
if ( showTestPasswordDetailsButton.getSelection() )
{
testPasswordText.setEchoChar( '\0' );
@@ -531,7 +531,7 @@ public class PasswordDialog extends Dial
{
Connection connection = ( Connection ) entry.getBrowserConnection().getConnection().clone();
connection.getConnectionParameter().setName( null );
- connection.getConnectionParameter().setBindPrincipal( entry.getDn().getUpName() );
+ connection.getConnectionParameter().setBindPrincipal( entry.getDn().getName() );
connection.getConnectionParameter().setBindPassword( testPasswordText.getText() );
connection.getConnectionParameter().setAuthMethod( AuthenticationMethod.SIMPLE );