Mailing-List: contact commits-help@directory.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@directory.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Subject: svn commit: r1412523 - in
 /directory/studio/trunk/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/widgets:
 NetworkParameterPage.java messages.properties messages_de.properties
 messages_fr.properties
Date: Thu, 22 Nov 2012 12:30:02 -0000
To: commits@directory.apache.org
From: pamarcelot@apache.org
Message-Id: <20121122123003.10D5323888CD@eris.apache.org>

Author: pamarcelot
Date: Thu Nov 22 12:30:00 2012
New Revision: 1412523

URL: http://svn.apache.org/viewvc?rev=1412523&view=rev
Log:
Fix for DIRSTUDIO-851 (Add a hint in the Connection Properties dialog about Certifcate Validation with a link to the corresponding preference page).

Modified:
    directory/studio/trunk/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/widgets/NetworkParameterPage.java
    directory/studio/trunk/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/widgets/messages.properties
    directory/studio/trunk/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/widgets/messages_de.properties
    directory/studio/trunk/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/widgets/messages_fr.properties

Modified: directory/studio/trunk/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/widgets/NetworkParameterPage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/widgets/NetworkParameterPage.java?rev=1412523&r1=1412522&r2=1412523&view=diff
==============================================================================
--- directory/studio/trunk/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/widgets/NetworkParameterPage.java (original)
+++ directory/studio/trunk/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/widgets/NetworkParameterPage.java Thu Nov 22 12:30:00 2012
@@ -43,6 +43,7 @@ import org.apache.directory.studio.conne
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.jface.dialogs.IDialogSettings;
 import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.jface.preference.PreferenceDialog;
 import org.eclipse.osgi.util.NLS;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.ModifyEvent;
@@ -57,7 +58,9 @@ import org.eclipse.swt.widgets.Combo;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Group;
+import org.eclipse.swt.widgets.Link;
 import org.eclipse.swt.widgets.Text;
+import org.eclipse.ui.dialogs.PreferencesUtil;
 
 
 /**
@@ -251,6 +254,29 @@ public class NetworkParameterPage extend
             BaseWidgetUtils.createLabel( groupComposite, Messages
                 .getString( "NetworkParameterPage.WarningCertificateValidation" ), 2 ); //$NON-NLS-1$
         }
+        else
+        {
+            BaseWidgetUtils.createSpacer( groupComposite, 1 );
+
+            Link link = BaseWidgetUtils.createLink( groupComposite,
+                Messages.getString( "NetworkParameterPage.CertificateValidationLink" ), 2 ); //$NON-NLS-1$
+            GridData linkGridData = new GridData( GridData.FILL_HORIZONTAL );
+            linkGridData.horizontalSpan = 2;
+            linkGridData.widthHint = 100;
+            link.setLayoutData( linkGridData );
+            link.addSelectionListener( new SelectionAdapter()
+            {
+                public void widgetSelected( SelectionEvent e )
+                {
+                    String certificateValidationPreferencePageId = "org.apache.directory.studio.connection.preferences.CertificateValidationPreferencePage"; //$NON-NLS-1$
+
+                    PreferenceDialog dialog = PreferencesUtil.createPreferenceDialogOn( Display.getDefault()
+                        .getActiveShell(), certificateValidationPreferencePageId, new String[]
+                        { certificateValidationPreferencePageId }, null );
+                    dialog.open();
+                }
+            } );
+        }
 
         String[] networkProviders = new String[]
             { "Apache Directory LDAP Client API", "JNDI (Java Naming and Directory Interface)" };

Modified: directory/studio/trunk/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/widgets/messages.properties
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/widgets/messages.properties?rev=1412523&r1=1412522&r2=1412523&view=diff
==============================================================================
--- directory/studio/trunk/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/widgets/messages.properties (original)
+++ directory/studio/trunk/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/widgets/messages.properties Thu Nov 22 12:30:00 2012
@@ -124,4 +124,5 @@ NetworkParameterPage.Port               
 NetworkParameterPage.ReadOnly                     = Read-Only (prevents any add, delete, modify or rename operation) 
 NetworkParameterPage.UseSSLEncryption             = Use SSL encryption (ldaps://)
 NetworkParameterPage.UseStartTLS                  = Use StartTLS extension
-NetworkParameterPage.WarningCertificateValidation = Warning:\nCertificate validation is disabled, \nbe aware of invalid certificates or man-in-the-middle attacks!
+NetworkParameterPage.WarningCertificateValidation = Warning: Certificate validation is disabled, \nbe aware of invalid certificates or man-in-the-middle attacks!
+NetworkParameterPage.CertificateValidationLink    = Server certificates for LDAP connections can be managed in the '<a>Certificate Validation</a>' preference page.

Modified: directory/studio/trunk/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/widgets/messages_de.properties
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/widgets/messages_de.properties?rev=1412523&r1=1412522&r2=1412523&view=diff
==============================================================================
--- directory/studio/trunk/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/widgets/messages_de.properties (original)
+++ directory/studio/trunk/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/widgets/messages_de.properties Thu Nov 22 12:30:00 2012
@@ -121,4 +121,5 @@ NetworkParameterPage.PleaseEnterPort    
 NetworkParameterPage.ReadOnly                     = TODO:Read-Only (prevents any add, delete, modify or rename operation) 
 NetworkParameterPage.UseSSLEncryption             = SSL Verschl\u00FCsselung (ldaps://)
 NetworkParameterPage.UseStartTLS                  = StartTLS Erweiterung
-NetworkParameterPage.WarningCertificateValidation = Warnung:\nZertifikat Validierung ist deaktiviert,\nsind Sie sich der Gefahr von ung\u00FCltigen Zertifikaten\noder 'man-in-the-middle' Angriffen bewusst!
+NetworkParameterPage.WarningCertificateValidation = Warnung: Zertifikat Validierung ist deaktiviert,\nsind Sie sich der Gefahr von ung\u00FCltigen Zertifikaten\noder 'man-in-the-middle' Angriffen bewusst!
+NetworkParameterPage.CertificateValidationLink    = Server-Zertifikate für LDAP-Verbindungen können in der '<a>Zertifikatsvalidierung</ a>' Präferenz Seite verwaltet werden.

Modified: directory/studio/trunk/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/widgets/messages_fr.properties
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/widgets/messages_fr.properties?rev=1412523&r1=1412522&r2=1412523&view=diff
==============================================================================
--- directory/studio/trunk/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/widgets/messages_fr.properties (original)
+++ directory/studio/trunk/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/widgets/messages_fr.properties Thu Nov 22 12:30:00 2012
@@ -121,4 +121,5 @@ NetworkParameterPage.PleaseEnterPort    
 NetworkParameterPage.ReadOnly                     = Lecture seule (emp\u00E8che toute op\u00E9ration d'ajout, suppression, modification ou renommage) 
 NetworkParameterPage.UseSSLEncryption             = Utilise l'encryption SSL (ldaps://)
 NetworkParameterPage.UseStartTLS                  = Utilise l'extension StartTLS
-NetworkParameterPage.WarningCertificateValidation = Attention :\n La validation des certificats est d\u00E9sactiv\u00E9e, \nm\u00E9fiez-vous des certificats invalides ou des attaques par interposition (man-in-the-middle)!
+NetworkParameterPage.WarningCertificateValidation = Attention : La validation des certificats est d\u00E9sactiv\u00E9e, \nm\u00E9fiez-vous des certificats invalides ou des attaques par interposition (man-in-the-middle)!
+NetworkParameterPage.CertificateValidationLink    = Les certificats serveur pour les connexions LDAP sont administrables dans la page de préférence '<a>Validation de certificat</a>'.