| Pierre-Arnaud Marcelot 2007-12-18, 7:11 am |
| Date: Tue, 18 Dec 2007 11:02:09 +0100
Lines: 828
Approved: news@gmane.org
Message-ID: < 98d8c0860712180202g7317dc65ofe539f14e802
b59b@mail.gmail.com>
References: <20071218095558.7AEF61A9838@eris.apache.org>
Reply-To: "Apache Directory Developers List" <dev-aYN4UCa7k1r1N9kud6OZbmD2FQJk+8+b@public.gmane.org>
NNTP-Posting-Host: lo.gmane.org
Mime-Version: 1.0
Content-Type: multipart/alternative;
boundary="----=_Part_13471_13841954.1197972129556"
X-Trace: ger.gmane.org 1197972176 31754 80.91.229.12 (18 Dec 2007 10:02:56 GMT)
X-Complaints-To: usenet@ger.gmane.org
NNTP-Posting-Date: Tue, 18 Dec 2007 10:02:56 +0000 (UTC)
To: dev-aYN4UCa7k1r1N9kud6OZbmD2FQJk+8+b@public.gmane.org
Original-X-From: dev-return-22889-gcaidd-directory-dev=m.gmane.org-aYN4UCa7k1r1N9kud6OZbmD2FQJk+8+b@public.gmane.org Tue Dec 18 11:03:08 2007
Return-path: <dev-return-22889-gcaidd-directory-dev=m.gmane.org-aYN4UCa7k1r1N9kud6OZbmD2FQJk+8+b@public.gmane.org>
Envelope-to: gcaidd-directory-dev-Uylq5CNFT+jYtjvyW6yDsg@public.gmane.org
Original-Received: from hermes.apache.org ([140.211.11.2] helo=mail.apache.org)
by lo.gmane.org with smtp (Exim 4.50)
id 1J4ZHw-00016Y-Sz
for gcaidd-directory-dev-Uylq5CNFT+jYtjvyW6yDsg@public.gmane.org; Tue, 18 Dec 2007 11:03:03 +0100
Original-Received: (qmail 12381 invoked by uid 500); 18 Dec 2007 10:02:29 -0000
Mailing-List: contact dev-help-aYN4UCa7k1r1N9kud6OZbmD2FQJk+8+b@public.gmane.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:dev-help-aYN4UCa7k1r1N9kud6OZbmD2FQJk+8+b@public.gmane.org>
List-Unsubscribe: <mailto:dev-unsubscribe-aYN4UCa7k1r1N9kud6OZbmD2FQJk+8+b@public.gmane.org>
List-Post: <mailto:dev-aYN4UCa7k1r1N9kud6OZbmD2FQJk+8+b@public.gmane.org>
List-Id: <dev.directory.apache.org>
Delivered-To: mailing list dev-aYN4UCa7k1r1N9kud6OZbmD2FQJk+8+b@public.gmane.org
Original-Received: (qmail 12370 invoked by uid 99); 18 Dec 2007 10:02:29 -0000
Original-Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 18 Dec 2007 02:02:29 -0800
X-ASF-Spam-Status: No, hits=2.0 required=10.0
tests=HTML_MESSAGE,SPF_PASS
X-Spam-Check-By: apache.org
Received-SPF: pass (athena.apache.org: domain of pajbam-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org designates 64.233.178.251 as permitted sender)
Original-Received: from [64.233.178.251] (HELO hs-out-2122.google.com) (64.233.178.251)
by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 18 Dec 2007 10:02:08 +0000
Original-Received: by hs-out-2122.google.com with SMTP id x43so2583098hsb.9
for <dev-aYN4UCa7k1r1N9kud6OZbmD2FQJk+8+b@public.gmane.org>; Tue, 18 Dec 2007 02:02:11 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=gmail.com; s=gamma;
h=domainkey-signature:received:received:message-id:date:from:sender:to:subject:in-reply-to:mime-version:content-type:references:x-google-sender-auth;
bh=pqeaJ+E1DY2fAlhmIo/1oCWeXk7OB5LFGjFKPkkvHzU=;
b=nsCvSW/p7vRk0vx7UqNuuEnEgQ0/QJaZjKMLfVeM7BFH1Z62jjd98Xn9J5zV9Yy1/ 1qkbC6i7hjxFQ3foWAJDf1KBKquK3DzBpQszmd8+
Bf/U75LYUC/ vk1QUMF1hgDKITdiBQ+y+mPGHV4ajXALXMKlvgQr
xVLIpUkKYOaIC9E=
DomainKey-Signature: a=rsa-sha1; c=nofws;
d=gmail.com; s=gamma;
h=message-id:date:from:sender:to:subject:in-reply-to:mime-version:content-type:references:x-google-sender-auth;
b=TZ5tqmZkY8lI1jRjBm/ Ijx+JhQ29PbFlGW0k7DPU+gvQRmvjCJs63pPlCgK
u+KAV6FBotxrmCKi3u29wKoxby7kzSc/lk3AOOLDjz/Wa6d1czOMuPxkhIryTz33drY/VK/ 3bKJ2mUpGjgz1OlyBFWZO1ZMzgyQ2FDxylnD2Xlu
E=
Original-Received: by 10.142.98.18 with SMTP id v18mr1989811wfb.61.1197972129579;
Tue, 18 Dec 2007 02:02:09 -0800 (PST)
Original-Received: by 10.142.200.6 with HTTP; Tue, 18 Dec 2007 02:02:09 -0800 (PST)
Original-Sender: pajbam-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org
In-Reply-To: <20071218095558.7AEF61A9838-ttHkP/HvpBMPKjDvHGQMeg@public.gmane.org>
X-Google-Sender-Auth: 2ec9b5c1ac66a1c9
X-Virus-Checked: Checked by ClamAV on apache.org
Xref: news.gmane.org gmane.comp.apache.incubator.directory.devel:18545
Archived-At: <http://permalink.gmane.org/gmane.co...ory.devel/18545>
------=_Part_13471_13841954.1197972129556
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
Stefan,
I hope you don't mind, I have changed the way the listeners are created in
the Connection Property pages.
They are now created after the inputs are filled with values.
Regards,
Pierre-Arnaud
On Dec 18, 2007 10:55 AM, <pamarcelot-1oDqGaOF3Lkdnm+yROfE0A@public.gmane.org> wrote:
> Author: pamarcelot
> Date: Tue Dec 18 01:55:57 2007
> New Revision: 605161
>
> URL: http://svn.apache.org/viewvc?rev=605161&view=rev
> Log:
> Fix for DIRSTUDIO-204 (Warning displayed when showing the properties of a
> connection). I have delayed the creation of the listeners in a dedicated
> method after the inputs are filled with values.
>
> Modified:
>
> directory/studio/trunk/studio-connection-ui/src/main/java/org/apache/directory/studio/connection/ui/widgets/AuthenticationParameterPage.java
>
> directory/studio/trunk/studio-connection-ui/src/main/java/org/apache/directory/studio/connection/ui/widgets/NetworkParameterPage.java
>
> directory/studio/trunk/studio-ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/connection/BrowserParameterPage.java
>
> Modified:
> directory/studio/trunk/studio-connection-ui/src/main/java/org/apache/directory/studio/connection/ui/widgets/AuthenticationParameterPage.java
> URL:
> http://svn.apache.org/viewvc/direct...05161&view=diff
>
> ========================================
======================================
> ---
> directory/studio/trunk/studio-connection-ui/src/main/java/org/apache/directory/studio/connection/ui/widgets/AuthenticationParameterPage.java
> (original)
> +++
> directory/studio/trunk/studio-connection-ui/src/main/java/org/apache/directory/studio/connection/ui/widgets/AuthenticationParameterPage.java
> Tue Dec 18 01:55:57 2007
> @@ -60,7 +60,7 @@
>
> /** The text widget to input bind password */
> private Text bindPasswordText;
> -
> +
> /** The text widget to input saslRealm */
> private Combo saslRealmText;
>
> @@ -122,7 +122,8 @@
> {
> return isSaveBindPassword() ? bindPasswordText.getText() : null;
> }
> -
> +
> +
> private String getSaslRealm()
> {
> return saslRealmText.getText();
> @@ -167,13 +168,6 @@
> String[] authMethods = new String[]
> { "Anonymous Authentication", "Simple Authentication",
> "DIGEST-MD5 (SASL)", "CRAM-MD5 (SASL)" };
> authenticationMethodCombo = BaseWidgetUtils.createReadonlyCombo(
> groupComposite, authMethods, 1, 2 );
> - authenticationMethodCombo.addSelectionListener( new
> SelectionAdapter()
> - {
> - public void widgetSelected( SelectionEvent event )
> - {
> - connectionPageModified();
> - }
> - } );
>
> Composite composite2 = BaseWidgetUtils.createColumnContainer(
> parent, 1, 1 );
>
> @@ -183,45 +177,17 @@
> BaseWidgetUtils.createLabel( composite, "Bind DN or user:", 1 );
> String[] dnHistory = HistoryUtils.load(
> ConnectionUIConstants.DIALOGSETTING_KEY_PRINCIPAL_HISTORY );
> bindPrincipalCombo = BaseWidgetUtils.createCombo( composite,
> dnHistory, -1, 2 );
> - bindPrincipalCombo.addModifyListener( new ModifyListener()
> - {
> - public void modifyText( ModifyEvent event )
> - {
> - connectionPageModified();
> - }
> - } );
>
> BaseWidgetUtils.createLabel( composite, "Bind password:", 1 );
> bindPasswordText = BaseWidgetUtils.createPasswordText( composite,
> "", 2 );
> - bindPasswordText.addModifyListener( new ModifyListener()
> - {
> - public void modifyText( ModifyEvent event )
> - {
> - connectionPageModified();
> - }
> - } );
>
> BaseWidgetUtils.createLabel( composite, "SASL Realm:", 1 );
> String[] saslHistory = HistoryUtils.load(
> ConnectionUIConstants.DIALOGSETTING_KEY_REALM_HISTORY );
> saslRealmText = BaseWidgetUtils.createCombo( composite,
> saslHistory, -1, 2 );
> - saslRealmText.addModifyListener( new ModifyListener()
> - {
> - public void modifyText( ModifyEvent even )
> - {
> - connectionPageModified();
> - }
> - } );
> -
> +
> BaseWidgetUtils.createSpacer( composite, 1 );
> saveBindPasswordButton = BaseWidgetUtils.createCheckbox(
> composite, "Save password", 1 );
> saveBindPasswordButton.setSelection( true );
> - saveBindPasswordButton.addSelectionListener( new
> SelectionAdapter()
> - {
> - public void widgetSelected( SelectionEvent event )
> - {
> - connectionPageModified();
> - }
> - } );
>
> checkPrincipalPasswordAuthButton = new Button( composite, SWT.PUSH);
> GridData gd = new GridData( GridData.FILL_HORIZONTAL );
> @@ -229,22 +195,6 @@
> checkPrincipalPasswordAuthButton.setLayoutData( gd );
> checkPrincipalPasswordAuthButton.setText( "Check Authentication"
> );
> checkPrincipalPasswordAuthButton.setEnabled( false );
> - checkPrincipalPasswordAuthButton.addSelectionListener( new
> SelectionAdapter()
> - {
> - public void widgetSelected( SelectionEvent e )
> - {
> - Connection connection = getTestConnection();
> - CheckBindJob job = new CheckBindJob( connection );
> - RunnableContextJobAdapter.execute( job, runnableContext
> );
> - if ( job.getExternalResult().isOK() )
> - {
> - MessageDialog.openInformation( Display.getDefault().getActiveShell(),
> "Check Authentication",
> - "The authentication was successful." );
> - }
> - }
> - } );
> -
> - validate();
> }
>
>
> @@ -253,7 +203,6 @@
> */
> private void connectionPageModified()
> {
> -
> validate();
> fireConnectionPageModified();
> }
> @@ -286,7 +235,7 @@
> message = "Please enter a bind DN or user.";
> }
> }
> -
> +
> if ( isSaslRealmTextEnabled() )
> {
> if ( "".equals( saslRealmText.getText() ) )
> @@ -309,15 +258,17 @@
> || ( getAuthenticationMethod() ==
> AuthenticationMethod.SASL_DIGEST_MD5 )
> || ( getAuthenticationMethod() ==
> AuthenticationMethod.SASL_CRAM_MD5 );
> }
> -
> -
> - private boolean isSaslRealmTextEnabled(){
> - return getAuthenticationMethod() ==
> AuthenticationMethod.SASL_DIGEST_MD5;
> - }
> -
> -
> - private boolean isGssapiEnabled(){
> - return getAuthenticationMethod() ==
> AuthenticationMethod.SASL_GSSAPI;
> +
> +
> + private boolean isSaslRealmTextEnabled()
> + {
> + return getAuthenticationMethod() ==
> AuthenticationMethod.SASL_DIGEST_MD5;
> + }
> +
> +
> + private boolean isGssapiEnabled()
> + {
> + return getAuthenticationMethod() ==
> AuthenticationMethod.SASL_GSSAPI;
> }
>
>
> @@ -338,11 +289,75 @@
> saveBindPasswordButton.setSelection( parameter.getBindPassword()
> != null );
> saslRealmText.setText( parameter.getSaslRealm() != null ?
> parameter.getSaslRealm() : "" );
>
> + initListeners();
> +
> connectionPageModified();
> }
>
>
> /**
> + * Initializes the listeners.
> + */
> + private void initListeners()
> + {
> + authenticationMethodCombo.addSelectionListener( new
> SelectionAdapter()
> + {
> + public void widgetSelected( SelectionEvent event )
> + {
> + connectionPageModified();
> + }
> + } );
> +
> + bindPrincipalCombo.addModifyListener( new ModifyListener()
> + {
> + public void modifyText( ModifyEvent event )
> + {
> + connectionPageModified();
> + }
> + } );
> +
> + bindPasswordText.addModifyListener( new ModifyListener()
> + {
> + public void modifyText( ModifyEvent event )
> + {
> + connectionPageModified();
> + }
> + } );
> +
> + saslRealmText.addModifyListener( new ModifyListener()
> + {
> + public void modifyText( ModifyEvent even )
> + {
> + connectionPageModified();
> + }
> + } );
> +
> + saveBindPasswordButton.addSelectionListener( new
> SelectionAdapter()
> + {
> + public void widgetSelected( SelectionEvent event )
> + {
> + connectionPageModified();
> + }
> + } );
> +
> + checkPrincipalPasswordAuthButton.addSelectionListener( new
> SelectionAdapter()
> + {
> + public void widgetSelected( SelectionEvent e )
> + {
> + Connection connection = getTestConnection();
> + CheckBindJob job = new CheckBindJob( connection );
> + RunnableContextJobAdapter.execute( job, runnableContext
> );
> + if ( job.getExternalResult().isOK() )
> + {
> + MessageDialog.openInformation( Display.getDefault().getActiveShell(),
> "Check Authentication",
> + "The authentication was successful." );
> + }
> + }
> + } );
> + }
> +
> +
> + /**
> * @see
> org.apache.directory.studio.connection.ui.ConnectionParameterPage#saveParameters
> (org.apache.directory.studio.connection.core.ConnectionParameter)
> */
> public void saveParameters( ConnectionParameter parameter )
> @@ -350,7 +365,7 @@
> parameter.setAuthMethod( getAuthenticationMethod() );
> parameter.setBindPrincipal( getBindPrincipal() );
> parameter.setBindPassword( getBindPassword() );
> - parameter.setSaslRealm(getSaslRealm());
> + parameter.setSaslRealm( getSaslRealm() );
> }
>
>
>
> Modified:
> directory/studio/trunk/studio-connection-ui/src/main/java/org/apache/directory/studio/connection/ui/widgets/NetworkParameterPage.java
> URL:
> http://svn.apache.org/viewvc/direct...05161&view=diff
>
> ========================================
======================================
> ---
> directory/studio/trunk/studio-connection-ui/src/main/java/org/apache/directory/studio/connection/ui/widgets/NetworkParameterPage.java
> (original)
> +++
> directory/studio/trunk/studio-connection-ui/src/main/java/org/apache/directory/studio/connection/ui/widgets/NetworkParameterPage.java
> Tue Dec 18 01:55:57 2007
> @@ -151,19 +151,11 @@
> */
> public void createComposite( Composite parent )
> {
> -
> Composite composite = BaseWidgetUtils.createColumnContainer(
> parent, 1, 1 );
>
> Composite nameComposite = BaseWidgetUtils.createColumnContainer(
> composite, 2, 1 );
> BaseWidgetUtils.createLabel( nameComposite, "Connection name:", 1
> );
> nameText = BaseWidgetUtils.createText( nameComposite, "", 1 );
> - nameText.addModifyListener( new ModifyListener()
> - {
> - public void modifyText( ModifyEvent event )
> - {
> - connectionPageModified();
> - }
> - } );
>
> BaseWidgetUtils.createSpacer( composite, 1 );
>
> @@ -173,51 +165,16 @@
> BaseWidgetUtils.createLabel( groupComposite, "Hostname:", 1 );
> String[] hostHistory = HistoryUtils.load(
> ConnectionUIConstants.DIALOGSETTING_KEY_HOST_HISTORY );
> hostCombo = BaseWidgetUtils.createCombo( groupComposite,
> hostHistory, -1, 2 );
> - hostCombo.addModifyListener( new ModifyListener()
> - {
> - public void modifyText( ModifyEvent event )
> - {
> - connectionPageModified();
> - }
> - } );
>
> BaseWidgetUtils.createLabel( groupComposite, "Port:", 1 );
> String[] portHistory = HistoryUtils.load(
> ConnectionUIConstants.DIALOGSETTING_KEY_PORT_HISTORY );
> portCombo = BaseWidgetUtils.createCombo( groupComposite,
> portHistory, -1, 2 );
> - portCombo.addVerifyListener( new VerifyListener()
> - {
> - public void verifyText( VerifyEvent event )
> - {
> - if ( !event.text.matches( "[0-9]*" ) )
> - {
> - event.doit = false;
> - }
> - if ( portCombo.getText().length() > 4 &&
> event.text.length() > 0 )
> - {
> - event.doit = false;
> - }
> - }
> - } );
> - portCombo.addModifyListener( new ModifyListener()
> - {
> - public void modifyText( ModifyEvent event )
> - {
> - connectionPageModified();
> - }
> - } );
>
> String[] encMethods = new String[]
> { "No encryption", "Use SSL encryption (ldaps://)", "Use
> StartTLS extension" };
> int index = 0;
> BaseWidgetUtils.createLabel( groupComposite, "Encryption method:",
> 1 );
> encryptionMethodCombo = BaseWidgetUtils.createReadonlyCombo(
> groupComposite, encMethods, index, 2 );
> - encryptionMethodCombo.addSelectionListener( new
> SelectionAdapter()
> - {
> - public void widgetSelected( SelectionEvent event )
> - {
> - connectionPageModified();
> - }
> - } );
> BaseWidgetUtils.createSpacer( groupComposite, 1 );
> BaseWidgetUtils
> .createLabel(
> @@ -232,22 +189,7 @@
> gd.verticalAlignment = SWT.BOTTOM;
> checkConnectionButton.setLayoutData( gd );
> checkConnectionButton.setText( "Check Network Parameter" );
> - checkConnectionButton.addSelectionListener( new
> SelectionAdapter()
> - {
> - public void widgetSelected( SelectionEvent event )
> - {
> - Connection connection = getTestConnection();
> - CheckNetworkParameterJob job = new
> CheckNetworkParameterJob( connection );
> - RunnableContextJobAdapter.execute( job, runnableContext
> );
> - if ( job.getExternalResult().isOK() )
> - {
> - MessageDialog.openInformation( Display.getDefault().getActiveShell(),
> "Check Network Parameter",
> - "The connection was established successfully." );
> - }
> - }
> - } );
>
> - validate();
> nameText.setFocus();
> }
>
> @@ -257,10 +199,7 @@
> */
> private void connectionPageModified()
> {
> - // validate()
> validate();
> -
> - // fire
> fireConnectionPageModified();
> }
>
> @@ -310,7 +249,77 @@
> : parameter.getEncryptionMethod() ==
> EncryptionMethod.START_TLS ? 2 : 0;
> encryptionMethodCombo.select( index );
>
> + initListeners();
> +
> connectionPageModified();
> + }
> +
> +
> + /**
> + * Initializes the listeners.
> + */
> + private void initListeners()
> + {
> + nameText.addModifyListener( new ModifyListener()
> + {
> + public void modifyText( ModifyEvent event )
> + {
> + connectionPageModified();
> + }
> + } );
> +
> + hostCombo.addModifyListener( new ModifyListener()
> + {
> + public void modifyText( ModifyEvent event )
> + {
> + connectionPageModified();
> + }
> + } );
> +
> + portCombo.addVerifyListener( new VerifyListener()
> + {
> + public void verifyText( VerifyEvent event )
> + {
> + if ( !event.text.matches( "[0-9]*" ) )
> + {
> + event.doit = false;
> + }
> + if ( portCombo.getText().length() > 4 &&
> event.text.length() > 0 )
> + {
> + event.doit = false;
> + }
> + }
> + } );
> + portCombo.addModifyListener( new ModifyListener()
> + {
> + public void modifyText( ModifyEvent event )
> + {
> + connectionPageModified();
> + }
> + } );
> +
> + encryptionMethodCombo.addSelectionListener( new
> SelectionAdapter()
> + {
> + public void widgetSelected( SelectionEvent event )
> + {
> + connectionPageModified();
> + }
> + } );
> +
> + checkConnectionButton.addSelectionListener( new
> SelectionAdapter()
> + {
> + public void widgetSelected( SelectionEvent event )
> + {
> + Connection connection = getTestConnection();
> + CheckNetworkParameterJob job = new
> CheckNetworkParameterJob( connection );
> + RunnableContextJobAdapter.execute( job, runnableContext
> );
> + if ( job.getExternalResult().isOK() )
> + {
> + MessageDialog.openInformation( Display.getDefault().getActiveShell(),
> "Check Network Parameter",
> + "The connection was established successfully." );
> + }
> + }
> + } );
> }
>
>
>
> Modified:
> directory/studio/trunk/studio-ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/connection/BrowserParameterPage.java
> URL:
> http://svn.apache.org/viewvc/direct...05161&view=diff
>
> ========================================
======================================
> ---
> directory/studio/trunk/studio-ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/connection/BrowserParameterPage.java
> (original)
> +++
> directory/studio/trunk/studio-ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/connection/BrowserParameterPage.java
> Tue Dec 18 01:55:57 2007
> @@ -174,7 +174,6 @@
> {
> addBaseDNInput( parent );
> addLimitInput( parent );
> - validate();
> }
>
>
> @@ -193,13 +192,6 @@
>
> autoFetchBaseDnsButton = BaseWidgetUtils.createCheckbox(
> groupComposite, "Get base DNs from Root DSE", 2 );
> autoFetchBaseDnsButton.setSelection( true );
> - autoFetchBaseDnsButton.addSelectionListener( new
> SelectionAdapter()
> - {
> - public void widgetSelected( SelectionEvent arg0 )
> - {
> - connectionPageModified();
> - }
> - } );
>
> fetchBaseDnsButton = new Button( groupComposite, SWT.PUSH );
> fetchBaseDnsButton.setText( "Fetch Base DNs" );
> @@ -207,49 +199,9 @@
> gd = new GridData();
> gd.horizontalAlignment = SWT.RIGHT;
> fetchBaseDnsButton.setLayoutData( gd );
> - fetchBaseDnsButton.addSelectionListener( new SelectionAdapter()
> - {
> - public void widgetSelected( SelectionEvent e )
> - {
> - Connection connection = getTestConnection();
> - IBrowserConnection browserConnection = new
> BrowserConnection( connection );
> -
> - FetchBaseDNsJob job = new FetchBaseDNsJob(
> browserConnection );
> - RunnableContextJobAdapter.execute( job, runnableContext
> );
> - if ( job.getExternalResult().isOK() )
> - {
> - if ( job.getBaseDNs().length > 0 )
> - {
> - String[] baseDNs = job.getBaseDNs();
> - baseDNCombo.setItems( baseDNs );
> - baseDNCombo.select( 0 );
> -
> - String msg = "The server returned the following
> base DNs:";
> - for ( int i = 0; i < baseDNs.length; i++ )
> - {
> - msg += "\n - " + baseDNs[i];
> - }
> - MessageDialog.openInformation( Display.getDefault().getActiveShell(),
> "Fetch Base DNs", msg );
> - }
> - else
> - {
> - MessageDialog.openWarning( Display.getDefault().getActiveShell(),
> "Fetch Base DNs",
> - "No base DN returned from server. Please
> enter the base DN manually." );
> - autoFetchBaseDnsButton.setSelection( false );
> - }
> - }
> - }
> - } );
>
> BaseWidgetUtils.createLabel( groupComposite, "Base DN:", 1 );
> baseDNCombo = BaseWidgetUtils.createCombo( groupComposite, new
> String[0], 0, 2 );
> - baseDNCombo.addModifyListener( new ModifyListener()
> - {
> - public void modifyText( ModifyEvent event )
> - {
> - connectionPageModified();
> - }
> - } );
> }
>
>
> @@ -296,7 +248,7 @@
> errorMessage = null;
> if ( !isAutoFetchBaseDns() )
> {
> - if( !LdapDN.isValid( getBaseDN() ) )
> + if ( !LdapDN.isValid( getBaseDN() ) )
> {
> message = "Please enter a valid base DN.";
> }
> @@ -334,7 +286,66 @@
> .getByOrdinal( aliasesDereferencingMethodOrdinal );
> aliasesDereferencingWidget.setAliasesDereferencingMethod(
> aliasesDereferencingMethod );
>
> + initListeners();
> +
> connectionPageModified();
> + }
> +
> +
> + /**
> + * Initializes the listeners.
> + */
> + private void initListeners()
> + {
> + autoFetchBaseDnsButton.addSelectionListener( new
> SelectionAdapter()
> + {
> + public void widgetSelected( SelectionEvent arg0 )
> + {
> + connectionPageModified();
> + }
> + } );
> +
> + fetchBaseDnsButton.addSelectionListener( new SelectionAdapter()
> + {
> + public void widgetSelected( SelectionEvent e )
> + {
> + Connection connection = getTestConnection();
> + IBrowserConnection browserConnection = new
> BrowserConnection( connection );
> +
> + FetchBaseDNsJob job = new FetchBaseDNsJob(
> browserConnection );
> + RunnableContextJobAdapter.execute( job, runnableContext
> );
> + if ( job.getExternalResult().isOK() )
> + {
> + if ( job.getBaseDNs().length > 0 )
> + {
> + String[] baseDNs = job.getBaseDNs();
> + baseDNCombo.setItems( baseDNs );
> + baseDNCombo.select( 0 );
> +
> + String msg = "The server returned the following
> base DNs:";
> + for ( int i = 0; i < baseDNs.length; i++ )
> + {
> + msg += "\n - " + baseDNs[i];
> + }
> + MessageDialog.openInformation( Display.getDefault().getActiveShell(),
> "Fetch Base DNs", msg );
> + }
> + else
> + {
> + MessageDialog.openWarning( Display.getDefault().getActiveShell(),
> "Fetch Base DNs",
> + "No base DN returned from server. Please
> enter the base DN manually." );
> + autoFetchBaseDnsButton.setSelection( false );
> + }
> + }
> + }
> + } );
> +
> + baseDNCombo.addModifyListener( new ModifyListener()
> + {
> + public void modifyText( ModifyEvent event )
> + {
> + connectionPageModified();
> + }
> + } );
> }
>
>
>
>
>
------=_Part_13471_13841954.1197972129556
Content-Type: text/html; charset=ISO-8859-1
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
Stefan,<div><br class="webkit-block-placeholder"></div><div>I hope you don't mind, I have changed the way the listeners are created in the Connection Property pages.</div><div>They are now created after the inputs are filled with values.
</div><div><br class="webkit-block-placeholder"></div><div>Regards,</div><div>Pierre-Arnaud<br><br><div class="gmail_quote">On Dec 18, 2007 10:55 AM, <<a href="mailto:pamarcelot-1oDqGaOF3Lkdnm+yROfE0A@public.gmane.org">pamarcelot-1oDqGaOF3Lkdnm+yROfE0
A@public.gmane.org</a>> wrote:
<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex;">Author: pamarcelot<br>Date: Tue Dec 18 01:55:57 2007<br>New Revision: 605161<br><br>URL: <a href="http://svn.apache.org/viewvc?rev=605161&view=r
ev" target="_blank">
http://svn.apache.org/viewvc?rev=605161&view=rev</a><br>Log:<br>Fix for DIRSTUDIO-204 (Warning displayed when showing the properties of a connection). I have delayed the creation of the listeners in a dedicated method after the inputs are filled with
values.
<br><br>Modified:<br> directory/studio/trunk/studio-connection-ui/src/main/java/org/apache/directory/studio/connection/ui/widgets/AuthenticationParameterPage.java<br> directory/studio/trunk/studio-connection-ui/src/main/java/org/
apache/directory/studio/connection/ui/widgets/NetworkParameterPage.java
<br> directory/studio/trunk/studio-ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/connection/BrowserParameterPage.java<br><br>Modified: directory/studio/trunk/studio-connection-ui/src/main/java/org/apa
che/directory/studio/connection/ui/widgets/AuthenticationParameterPage.java
<br>URL: <a href="http://svn.apache.org/viewvc/directory/studio/trunk/studio-connection-ui/src/main/java/org/apache/directory/studio/connection/ui/widgets/AuthenticationParameterPage.java?rev=605161&r1=605160&r2=605161&view=diff" target="_blan
k">
http://svn.apache.org/viewvc/direct...1&view=diff
</a><br> ========================================
======================================<br>--- directory/studio/trunk/studio-connection-ui/src/main/java/org/apache/directory/studio/connection/ui/widgets/AuthenticationParameterPage.java (original)
<br>+++ directory/studio/trunk/studio-connection-ui/src/main/java/org/apache/directory/studio/connection/ui/widgets/AuthenticationParameterPage.java Tue Dec 18 01:55:57 2007<br>@@ -60,7 +60,7 @@<br><br> /** The text widget to input bind pass
word */
<br> private Text bindPasswordText;<br>-<br>+<br> /** The text widget to input saslRealm */<br> private Combo saslRealmText;<br><br>@@ -122,7 +122,8 @@<br> {<br> return is
SaveBindPassword() ? bindPasswordText.getText
() : null;<br> }<br>-<br>+<br>+<br> private String getSaslRealm()<br> {<br> return saslRealmText.getText();<br>@@ -167,13 +168,6 @@<br> String[] authMethods
= new String[]<br> { "Anonymous Authentication", "Simple Authentication", "DIGEST-MD5 (SASL)", "CRAM-MD5 (SASL)" };
<br> authenticationMethodCombo = BaseWidgetUtils.createReadonlyCombo( groupComposite, authMethods, 1, 2 );<br>- authenticationMethodCombo.addSelectionListener( new SelectionAdapter()<br>-
; {<br>- public void widgetSelected( SelectionEvent event )
<br>- {<br>- connectionPageModified();<br>- }<br>- } );<br><br>
Composite composite2 = BaseWidgetUtils.createColumnContainer( parent, 1, 1 );<br><br>@@ -183,45 +177,17 @@
<br> BaseWidgetUtils.createLabel( composite, "Bind DN or user:", 1 );<br> String[] dnHistory = HistoryUtils.load( ConnectionUIConstants.DIALOGSETTING_KEY_PRINCIPAL_HISTORY );<br> &nb
sp; bindPrincipalCombo =
BaseWidgetUtils.createCombo( composite, dnHistory, -1, 2 );<br>- bindPrincipalCombo.addModifyListener( new ModifyListener()<br>- {<br>- public void modifyText(
ModifyEvent event )<br>- {
<br>- connectionPageModified();<br>- }<br>- } );<br><br> BaseWidgetUtils.createLabel( composite, "B
ind password:", 1 );<br> bindPasswordText = BaseWidgetUtils.createPasswordText
( composite, "", 2 );<br>- bindPasswordText.addModifyListener( new ModifyListener()<br>- {<br>- public void modifyText( ModifyEvent event )<br>-
; {<br>- connectionPageModified();
<br>- }<br>- } );<br><br> BaseWidgetUtils.createLabel( composite, "SASL Realm:", 1 );<br> String[] saslHistory = HistoryU
tils.load( ConnectionUIConstants.DIALOGSETTING_KEY_REALM_HISTORY
);<br> saslRealmText = BaseWidgetUtils.createCombo( composite, saslHistory, -1, 2 );<br>- saslRealmText.addModifyListener( new ModifyListener()<br>- {<br>- &n
bsp; public void modifyText( ModifyEvent even )
<br>- {<br>- connectionPageModified();<br>- }<br>- } );<br>-<br>+<br>
BaseWidgetUtils.createSpacer( composite, 1 );<br> saveBindPasswordButton = BaseWidgetUtils.createCheckbox
( composite, "Save password", 1 );<br> saveBindPasswordButton.setSelection( true );<br>- saveBindPasswordButton.addSelectionListener( new SelectionAdapter()<br>- {
<br>- public void widgetSelected( SelectionEvent event )
<br>- {<br>- connectionPageModified();<br>- }<br>- } );<br><br>
checkPrincipalPasswordAuthButton = new Button( composite, SWT.PUSH );<br> GridData gd = new GridData(
GridData.FILL_HORIZONTAL );<br>@@ -229,22 +195,6 @@<br> checkPrincipalPasswordAuthButton.setLayoutData( gd );<br> checkPrincipalPasswordAuthButton.setText( "Check Authentication" );<br> &nb
sp; checkPrincipalPasswordAuthButton.setEnabled
( false );<br>- & amp;nbsp;checkPrincipalPasswordAuthButto
n.addSelectionListener( new SelectionAdapter()<br>- {<br>- public void widgetSelected( SelectionEvent e )<br>- &n
bsp; {<br>- Connection connection = getTestConnection();
<br>- CheckBindJob job = new CheckBindJob( connection );<br>- RunnableContextJobAdapter.execute( job, runnableContext );<br>-
; if ( job.getExternalResult().isOK() )<br>- {
<br>- MessageDialog.openInformation( Display.getDefault().getActiveShell(), "Check Authentication",<br>- &
nbsp; "The authentication was successful." );<br>- }
<br>- }<br>- } );<br>-<br>- validate();<br> }<br><br><br>@@ -253,7 +203,6 @@<br> */<br> private void connectionP
ageModified()<br> {<br>-<br> validate();<br> fireConnectionPageModified();
<br> }<br>@@ -286,7 +235,7 @@<br> message = "Please enter a bind DN or user.";<br> }<br> }<br>-<br>+<br>
if ( isSaslRealmTextEnabled() )<br> {<br> if ( "".equals(
saslRealmText.getText() ) )<br>@@ -309,15 +258,17 @@<br> || ( getAuthenticationMethod() == AuthenticationMethod.SASL_DIGEST_MD5 )<br> || ( getAuthenticationMethod() == Aut
henticationMethod.SASL_CRAM_MD5
);<br> }<br>-<br>-<br>- private boolean isSaslRealmTextEnabled(){<br>- return getAuthenticationMethod() == AuthenticationMethod.SASL_DIGEST_MD5;<br>- }<br>-<br>-<br>- private boole
an isGssapiEnabled(){
<br>- return getAuthenticationMethod() == AuthenticationMethod.SASL_GSSAPI;<br>+<br>+<br>+ private boolean isSaslRealmTextEnabled()<br>+ {<br>+ return getAuthenticationMethod() == A
uthenticationMethod.SASL_DIGEST_MD5
;<br>+ }<br>+<br>+<br>+ private boolean isGssapiEnabled()<br>+ {<br>+ return getAuthenticationMethod() == AuthenticationMethod.SASL_GSSAPI;<br> }<br><br><br>@@ -338,11 +289,75
@@<br> saveBindPasswordButton.setSelection
( parameter.getBindPassword() != null );<br> saslRealmText.setText( parameter.getSaslRealm() != null ? parameter.getSaslRealm() : "" );<br><br>+ initListeners();<br>+<br>
; connectionPageModified();
<br> }<br><br><br> /**<br>+ * Initializes the listeners.<br>+ */<br>+ private void initListeners()<br>+ {<br>+ authenticationMethodCombo.addSelect
ionListener( new SelectionAdapter()<br>+ {
<br>+ public void widgetSelected( SelectionEvent event )<br>+ {<br>+ connectionPageModified();<br>+ &nbs
p; }<br>+ } );<br>+<br>+ bindPrincipalCombo.addModifyListener( new ModifyListener()
<br>+ {<br>+ public void modifyText( ModifyEvent event )<br>+ {<br>+ connectionPageModified
();<br>+ }<br>+ } );<br>+<br>+ bindPasswordText.addModifyListener
( new ModifyListener()<br>+ {<br>+ public void modifyText( ModifyEvent event )<br>+ {<br>+
connectionPageModified();<br>+ }<br>+ } );<br>+<br>+ saslRealmText.addModifyListener
( new ModifyListener()<br>+ {<br>+ public void modifyText( ModifyEvent even )<br>+ {<br>+ c
onnectionPageModified();<br>+ }<br>+ } );<br>+<br>+ saveBindPasswordButton.addSelectionListener
( new SelectionAdapter()<br>+ {<br>+ public void widgetSelected( SelectionEvent event )<br>+ {<br>+ &nbs
p; connectionPageModified();<br>+ }<br>+ } );<br>+<br>+
checkPrincipalPasswordAuthButton.addSelectionListener( new SelectionAdapter()<br>+ {<br>+ public void widgetSelected( SelectionEvent e )<br>+ {<br
>+ Connection connection = getTestConnection();
<br>+ CheckBindJob job = new CheckBindJob( connection );<br>+ RunnableContextJobAdapter.execute( job, runnableContext );<br>+
; if ( job.getExternalResult().isOK() )<br>+ {
<br>+ MessageDialog.openInformation( Display.getDefault().getActiveShell(), "Check Authentication",<br>+ &
nbsp; "The authentication was successful." );<br>+ }
<br>+ }<br>+ } );<br>+ }<br>+<br>+<br>+ /**<br> * @see org.apache.directory.studio.connection.ui. ConnectionParameterPage#saveParameters(o
rg.a
pache.directory.studio.connection.core.ConnectionParameter
)<br> */<br> public void saveParameters( ConnectionParameter parameter )<br>@@ -350,7 +365,7 @@<br> parameter.setAuthMethod( getAuthenticationMethod() );<br> paramet
er.setBindPrincipal( getBindPrincipal() );
<br> parameter.setBindPassword( getBindPassword() );<br>- parameter.setSaslRealm(getSaslRealm());<br>+ parameter.setSaslRealm( getSaslRealm() );<br> }<br><br><
br><br>Modified: directory/studio/trunk/studio-connection-ui/src/main/java/org/apache/directory/studio/connection/ui/widgets/NetworkParameterPage.java
<br>URL: <a href="http://svn.apache.org/viewvc/directory/studio/trunk/studio-connection-ui/src/main/java/org/apache/directory/studio/connection/ui/widgets/NetworkParameterPage.java?rev=605161&r1=605160&r2=605161&view=diff" target="_blank">
http://svn.apache.org/viewvc/direct...1&view=diff</a><br>
========================================
======================================<br>--- directory/studio/trunk/studio-connection-ui/src/main/java/org/apache/directory/studio/connection/ui/widgets/NetworkParameterPage.java (original)
<br>+++ directory/studio/trunk/studio-connection-ui/src/main/java/org/apache/directory/studio/connection/ui/widgets/NetworkParameterPage.java Tue Dec 18 01:55:57 2007<br>@@ -151,19 +151,11 @@<br> */<br> public void create
Composite( Composite parent )
<br> {<br>-<br> Composite composite = BaseWidgetUtils.createColumnContainer( parent, 1, 1 );<br><br> Composite nameComposite = BaseWidgetUtils.createColumnContainer( composite, 2, 1 );<
br> BaseWidgetUtils.createLabel
( nameComposite, "Connection name:", 1 );<br> nameText = BaseWidgetUtils.createText( nameComposite, "", 1 );<br>- nameText.addModifyListener( new ModifyListener()<br>-
; {<br>- public void modifyText( ModifyEvent event )
<br>- {<br>- connectionPageModified();<br>- }<br>- } );<br><br>
BaseWidgetUtils.createSpacer( composite, 1 );<br><br>@@ -173,51 +165,16 @@<br> BaseWidgetUtils.createLabel
( groupComposite, "Hostname:", 1 );<br> String[] hostHistory = HistoryUtils.load( ConnectionUIConstants.DIALOGSETTING_KEY_HOST_HISTORY );<br> hostCombo = BaseWidgetUtils.createCombo( groupC
omposite, hostHistory, -1, 2 );
<br>- hostCombo.addModifyListener( new ModifyListener()<br>- {<br>- public void modifyText( ModifyEvent event )<br>- {<
br>- connectionPageModified();<br>- }<br>
- } );<br><br> BaseWidgetUtils.createLabel( groupComposite, "Port:", 1 );<br> String[] portHistory = HistoryUtils.load( ConnectionUIConstants.DIALOGSETTING_KEY_PO
RT_HISTORY );<br> portCombo =
BaseWidgetUtils.createCombo( groupComposite, portHistory, -1, 2 );<br>- portCombo.addVerifyListener( new VerifyListener()<br>- {<br>- public void verifyText( Ve
rifyEvent event )<br>- {<br>
- if ( !event.text.matches( "[0-9]*" ) )<br>- {<br>- event.doit =
false;<br>- }<br>- if ( portCombo.getText().length() > 4 &&
event.text.length() > 0 )<br>- {<br>- event.doit = false;<br>- }<br>- &nb
sp; }<br>- } );<br>- portCombo.addModifyListener( new ModifyListener()<br>- {
<br>- public void modifyText( ModifyEvent event )<br>- {<br>- connectionPageModified();<br>- &nbs
p; }<br>- } );<br><br> String[] encMethods = new String[]<br> { "No encryption", "Use SSL encryption (ldaps://)", "Use S
tartTLS extension" };
<br> int index = 0;<br> BaseWidgetUtils.createLabel( groupComposite, "Encryption method:", 1 );<br> encryptionMethodCombo = BaseWidgetUtils.createReadonlyCombo(
groupComposite, encMethods, index, 2 );
<br>- encryptionMethodCombo.addSelectionListener( new SelectionAdapter()<br>- {<br>- public void widgetSelected( SelectionEvent event )<br>-
; {<br>- connectionPageModified();
<br>- }<br>- } );<br> BaseWidgetUtils.createSpacer( groupComposite, 1 );<br> BaseWidgetUtils<br>
.createLabel(<br>@@ -232,22 +189,7 @@<br> gd.verticalAlignment = SWT.BOTTOM
;<br> checkConnectionButton.setLayoutData( gd );<br> checkConnectionButton.setText( "Check Network Parameter" );<br>- checkConnectionButton.addSelectionListener(
new SelectionAdapter()<br>
- {<br>- public void widgetSelected( SelectionEvent event )<br>- {<br>- Connection connecti
on = getTestConnection();<br>- CheckNetworkParameterJob job = new CheckNetworkParameterJob( connection );
<br>- RunnableContextJobAdapter.execute( job, runnableContext );<br>- if ( job.getExternalResult().isOK() )<br>- &nbs
p; {<br>- MessageDialog.openInformation( Display.getDefault
().getActiveShell(), "Check Network Parameter",<br>- "The connection was established successfully." );<br>- &n
bsp; }<br>- }<br>- } );<br><br>- validate();
<br> nameText.setFocus();<br> }<br><br>@@ -257,10 +199,7 @@<br> */<br> private void connectionPageModified()<br> {<br>- // validate()<br>
validate();<br>-<br>- // fire<br> fireConnectionPageModified();
<br> }<br><br>@@ -310,7 +249,77 @@<br> : parameter.getEncryptionMethod() == EncryptionMethod.START_TLS ? 2 : 0;<br> encryptionMethodCombo.select( index );<br><br>+
initListeners();<br>+<br> connectionPageModified();
<br>+ }<br>+<br>+<br>+ /**<br>+ * Initializes the listeners.<br>+ */<br>+ private void initListeners()<br>+ {<br>+ nameText.addModifyListener( new M
odifyListener()<br>+ {<br>+ public void modifyText( ModifyEvent event )
<br>+ {<br>+ connectionPageModified();<br>+ }<br>+ } );<br>+<br>+ &nbs
p;hostCombo.addModifyListener( new ModifyListener()<br>+ {<br>+ public void modifyText( ModifyEvent event )
<br>+ {<br>+ connectionPageModified();<br>+ }<br>+ } );<br>+<br>+ &nbs
p;portCombo.addVerifyListener( new VerifyListener()<br>+ {<br>+ public void verifyText( VerifyEvent event )
<br>+ {<br>+ if ( !event.text.matches( "[0-9]*" ) )<br>+ {<br>+ &n
bsp; event.doit = false;<br>+ }<br>+ if ( portCombo.getText().length() > 4 &&
event.text.length() > 0 )<br>+ {<br>+ event.doit = false;<br>+ }<br>+ &nb
sp; }<br>+ } );<br>+ portCombo.addModifyListener( new ModifyListener()<br>+ {
<br>+ public void modifyText( ModifyEvent event )<br>+ {<br>+ connectionPageModified();<br>+ &nbs
p; }<br>+ } );<br>+<br>+ encryptionMethodCombo.addSelectionListener( new SelectionAdapter()
<br>+ {<br>+ public void widgetSelected( SelectionEvent event )<br>+ {<br>+ connectionPageM
odified();<br>+ }<br>+ } );<br>+<br>+ checkConnectionButton.addSelectionListener
( new SelectionAdapter()<br>+ {<br>+ public void widgetSelected( SelectionEvent event )<br>+ {<br>+ &nbs
p; Connection connection = getTestConnection();<br>+ CheckNetworkParameterJob job = new CheckNetworkParameterJob( connection );
<br>+ RunnableContextJobAdapter.execute( job, runnableContext );<br>+ if ( job.getExternalResult().isOK() )<br>+ &nbs
p; {<br>+ MessageDialog.openInformation( Display.getDefault
().getActiveShell(), "Check Network Parameter",<br>+ "The connection was established successfully." );<br>+ &n
bsp; }<br>+ }<br>+ } );<br> }<br><br><br>
<br>Modified: directory/studio/trunk/studio-ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/connection/BrowserParameterPage.java<br>URL: <a href="http://svn.apache.org/viewvc/directory/studio/trunk/studio-ldapbrowse
r-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/connection/BrowserParameterPage.java?rev=605161&r1=605160&r2=605161&view=diff" target="_blank">
http://svn.apache.org/viewvc/direct...1&view=diff
</a><br> ========================================
======================================<br>--- directory/studio/trunk/studio-ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/connection/BrowserParameterPage.java (origi
nal)
<br>+++ directory/studio/trunk/studio-ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/connection/BrowserParameterPage.java Tue Dec 18 01:55:57 2007<br>@@ -174,7 +174,6 @@<br> {<br>
addBaseDNInput( parent );<br> addLimitInput( parent );<br>- validate();<br> }<br><br><br>@@ -193,13 +192,6 @@<br><br> autoFetchBa
seDnsButton = BaseWidgetUtils.createCheckbox( groupComposite, "Get base DNs from Root DSE", 2 );
<br> autoFetchBaseDnsButton.setSelection( true );<br>- autoFetchBaseDnsButton.addSelectionListener( new SelectionAdapter()<br>- {<br>- &nb
sp;public void widgetSelected( SelectionEvent arg0 )<br>
- {<br>- connectionPageModified();<br>- }<br>- } );<br><br> fet
chBaseDnsButton = new Button( groupComposite, SWT.PUSH );<br> fetchBaseDnsButton.setText( "Fetch Base DNs" );
<br>@@ -207,49 +199,9 @@<br> gd = new GridData();<br> gd.horizontalAlignment = SWT.RIGHT;<br> fetchBaseDnsButton.setLayoutData( gd );<br>- fetch
BaseDnsButton.addSelectionListener( new SelectionAdapter()
<br>- {<br>- public void widgetSelected( SelectionEvent e )<br>- {<br>- Connection connecti
on = getTestConnection();<br>- IBrowserConnection browserConnection = new BrowserConnection( connection );
<br>-<br>- FetchBaseDNsJob job = new FetchBaseDNsJob( browserConnection );<br>- RunnableContextJobAdapter.execute( job, runnableContext );<br>- &
nbsp; if ( job.getExternalResult().isOK() )
<br>- {<br>- if ( job.getBaseDNs().length > 0 )<br>- {<br>-
String[] baseDNs = job.getBaseDNs();<br>- baseDNCombo.setItems
( baseDNs );<br>- baseDNCombo.select( 0 );<br>-<br>- String msg = "The server return
ed the following base DNs:";<br>- for ( int i = 0; i <
baseDNs.length; i++ )<br>- {<br>- msg += "\n - " + baseDNs[
i];<br>- }<br>- MessageDialog.openInformation( Display.getDefault
().getActiveShell(), "Fetch Base DNs", msg );<br>- }<br>- else<br>- &nbs
p; {<br>- MessageDialog.openWarning( Display.getDefault().getActiveShell(), "Fetch Base DNs",
<br>- "No base DN returned from server. Please enter the base DN manually." );<br>- &
nbsp; autoFetchBaseDnsButton.setSelection( false );<br>- }<br>- }
<br>- }<br>- } );<br><br> BaseWidgetUtils.createLabel( groupComposite, "Base DN:", 1 );<br> baseDNCombo = BaseWidgetUtils
.createCombo( groupComposite, new String[0], 0, 2 );<br>
- baseDNCombo.addModifyListener( new ModifyListener()<br>- {<br>- public void modifyText( ModifyEvent event )<br>- {<br
>- connectionPageModified();<br>- }<br>- } );
<br> }<br><br><br>@@ -296,7 +248,7 @@<br> errorMessage = null;<br> if ( !isAutoFetchBaseDns() )<br> {<br>- if( !Ldap
DN.isValid( getBaseDN() ) )<br>+ if ( !LdapDN.isValid( getBaseDN() ) )
<br> {<br> message = "Please enter a valid base DN.";<br> }<br>@@ -334,7 +286,66 @@<br> &nb
sp; .getByOrdinal( aliasesDereferencingMethodOrdinal );<br> aliasesDereferencingWidget.setAliasesDereferencingMethod
( aliasesDereferencingMethod );<br><br>+ initListeners();<br>+<br> connectionPageModified();<br>+ }<br>+<br>+<br>+ /**<br>+ * Initializes the listeners.<br>+ &n
bsp; */<br>+ private void initListeners()
<br>+ {<br>+ autoFetchBaseDnsButton.addSelectionListener( new SelectionAdapter()<br>+ {<br>+ public void widgetSelected( SelectionEvent arg0 )<br>+
{<br>+ connectionPageModified();
<br>+ }<br>+ } );<br>+<br>+ fetchBaseDnsButton.addSelectionListener( new SelectionAdapter()<br>+ {<br>+ &
nbsp; public void widgetSelected( SelectionEvent e )<br>+ {<br>+ Connection connection = getTestConnection();
<br>+ IBrowserConnection browserConnection = new BrowserConnection( connection );<br>+<br>+ FetchBaseDNsJob job = new FetchBaseDNsJob( browserCon
nection );<br>+ RunnableContextJobAdapter.execute
( job, runnableContext );<br>+ if ( job.getExternalResult().isOK() )<br>+ {<br>+ &
nbsp;if ( job.getBaseDNs().length > 0 )<br>+ {<br>+ String[] baseDNs =
job.getBaseDNs();<br>+ baseDNCombo.setItems( baseDNs );<br>+ baseDNCombo.select( 0 );<br>
+<br>+ String msg = "The server returned the following base DNs:";
<br>+ for ( int i = 0; i < baseDNs.length; i++ )<br>+ {<br>+ &nbs
p; msg += "\n - " + baseDNs[i];<br>+ }<br>+ &
nbsp;
MessageDialog.openInformation( Display.getDefault().getActiveShell(), "Fetch Base DNs", msg );<br>+ }<br>+
else<br>+ {<br>+ MessageDialog.openWarning
( Display.getDefault().getActiveShell(), "Fetch Base DNs",<br>+ "No base DN returned from server. Please enter the base DN manually." );<b
r>+ autoFetchBaseDnsButton.setSelection
( false );<br>+ }<br>+ }<br>+ }<br>+ } );<br>+<br>+ &nbs
p; baseDNCombo.addModifyListener( new ModifyListener()<br>+ {<br>+ public void modifyText( ModifyEvent event )
<br>+ {<br>+ connectionPageModified();<br>+ }<br>+ } );<br> }<br><br><br><br>
<br></blockquote></div><br></div>
------=_Part_13471_13841954.1197972129556--
|