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 2013/01/03 18:00:42 UTC

svn commit: r1428470 - /directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/ReplicationDetailsPage.java

Author: pamarcelot
Date: Thu Jan  3 17:00:42 2013
New Revision: 1428470

URL: http://svn.apache.org/viewvc?rev=1428470&view=rev
Log:
Fixed a bug when the Bind Password was not set (null).
Fixed the layout of the attributes table.

Modified:
    directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/ReplicationDetailsPage.java

Modified: directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/ReplicationDetailsPage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/ReplicationDetailsPage.java?rev=1428470&r1=1428469&r2=1428470&view=diff
==============================================================================
--- directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/ReplicationDetailsPage.java (original)
+++ directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/ReplicationDetailsPage.java Thu Jan  3 17:00:42 2013
@@ -426,11 +426,12 @@ public class ReplicationDetailsPage impl
         allOperationalAttributesCheckbox.setLayoutData( new GridData( SWT.FILL, SWT.CENTER, true, false, 2, 1 ) );
 
         // Attributes Table Viewer
+        toolkit.createLabel( composite, "" ); //$NON-NLS-1$
         Composite attributesTableComposite = toolkit.createComposite( composite );
         GridLayout gl = new GridLayout( 2, false );
         gl.marginWidth = gl.marginHeight = 0;
         attributesTableComposite.setLayout( gl );
-        attributesTableComposite.setLayoutData( new GridData( SWT.FILL, SWT.FILL, true, true, 3, 1 ) );
+        attributesTableComposite.setLayoutData( new GridData( SWT.FILL, SWT.FILL, true, true, 2, 1 ) );
         Table attributesTable = toolkit.createTable( attributesTableComposite, SWT.BORDER );
         attributesTable.setLayoutData( new GridData( SWT.FILL, SWT.FILL, true, true, 1, 3 ) );
         attributesTableViewer = new TableViewer( attributesTable );
@@ -975,7 +976,16 @@ public class ReplicationDetailsPage impl
             bindDnText.setText( checkNull( input.getReplUserDn() ) );
 
             // Bind Password
-            bindPasswordText.setText( checkNull( String.valueOf( new String( input.getReplUserPassword() ) ) ) );
+            byte[] bindPassword = input.getReplUserPassword();
+
+            if ( ( bindPassword != null ) && ( bindPassword.length > 0 ) )
+            {
+                bindPasswordText.setText( checkNull( new String( input.getReplUserPassword() ) ) );
+            }
+            else
+            {
+                bindPasswordText.setText( "" );
+            }
 
             // Size Limit
             sizeLimitText.setText( checkNull( String.valueOf( input.getReplSearchSizeLimit() ) ) );