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 2011/11/23 18:24:42 UTC

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

Author: pamarcelot
Date: Wed Nov 23 17:24:41 2011
New Revision: 1205502

URL: http://svn.apache.org/viewvc?rev=1205502&view=rev
Log:
Used direct access to the kerberos beans via the static methods of the Kerberos page.

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

Modified: directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/OverviewPage.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/OverviewPage.java?rev=1205502&r1=1205501&r2=1205502&view=diff
==============================================================================
--- directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/OverviewPage.java (original)
+++ directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/OverviewPage.java Wed Nov 23 17:24:41 2011
@@ -268,7 +268,7 @@ public class OverviewPage extends Server
         // Enable LDAP Server Checkbox
         enableLdapCheckbox = toolkit.createButton( composite, "Enable LDAP Server", SWT.CHECK );
         enableLdapCheckbox.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false, gridLayout.numColumns, 1 ) );
-        
+
         // LDAP Server Port Text
         toolkit.createLabel( composite, TABULATION );
         toolkit.createLabel( composite, "Port:" );
@@ -278,7 +278,7 @@ public class OverviewPage extends Server
         // Enable LDAPS Server Checkbox
         enableLdapsCheckbox = toolkit.createButton( composite, "Enable LDAPS Server", SWT.CHECK );
         enableLdapsCheckbox.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false, gridLayout.numColumns, 1 ) );
-        
+
         // LDAPS Server Port Text
         toolkit.createLabel( composite, TABULATION );
         toolkit.createLabel( composite, "Port:" );
@@ -317,7 +317,7 @@ public class OverviewPage extends Server
         enableKerberosCheckbox = toolkit.createButton( composite, "Enable Kerberos Server", SWT.CHECK );
         enableKerberosCheckbox
             .setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false, gridLayout.numColumns, 1 ) );
-        
+
         // Kerberos Server Port Text
         toolkit.createLabel( composite, TABULATION );
         toolkit.createLabel( composite, "Port:" );
@@ -329,7 +329,7 @@ public class OverviewPage extends Server
             SWT.CHECK );
         enableChangePasswordCheckbox.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false,
             gridLayout.numColumns, 1 ) );
-        
+
         // Change Password Server Port Text
         toolkit.createLabel( composite, TABULATION );
         toolkit.createLabel( composite, "Port:" );
@@ -367,7 +367,7 @@ public class OverviewPage extends Server
         // Partitions Label
         partitionsLabel = toolkit.createLabel( composite, "" );
         partitionsLabel.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false ) );
-        
+
         // Partitions Table Viewer
         Table partitionsTable = toolkit.createTable( composite, SWT.NULL );
         GridData gd = new GridData( SWT.FILL, SWT.NONE, true, false );
@@ -523,7 +523,7 @@ public class OverviewPage extends Server
     {
         removeListeners();
 
-        DirectoryServiceBean directoryServiceBean = getConfigBean().getDirectoryServiceBean();
+        DirectoryServiceBean directoryServiceBean = getDirectoryServiceBean();
 
         // LDAP Server
         TransportBean ldapServerTransportBean = LdapLdapsServersPage.getLdapServerTransportBean( directoryServiceBean );
@@ -539,13 +539,14 @@ public class OverviewPage extends Server
         setText( ldapsPortText, ldapsServerTransportBean.getSystemPort() + "" );
 
         // Kerberos Server
-        KdcServerBean kdcServerBean = directoryServiceBean.getKdcServerBean();
+        KdcServerBean kdcServerBean = KerberosServerPage.getKdcServerBean( directoryServiceBean );
         setSelection( enableKerberosCheckbox, kdcServerBean.isEnabled() );
         setEnabled( kerberosPortText, enableKerberosCheckbox.getSelection() );
         setText( kerberosPortText, "" + kdcServerBean.getTransports()[0].getSystemPort() );
 
         // Change Password Server
-        ChangePasswordServerBean changePasswordServerBean = directoryServiceBean.getChangePasswordServerBean();
+        ChangePasswordServerBean changePasswordServerBean = KerberosServerPage
+            .getChangePasswordServerBean( directoryServiceBean );
         setSelection( enableChangePasswordCheckbox, changePasswordServerBean.isEnabled() );
         setEnabled( changePasswordPortText, enableChangePasswordCheckbox.getSelection() );
         setText( changePasswordPortText, "" + changePasswordServerBean.getTransports()[0].getSystemPort() );