directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pamarce...@apache.org
Subject svn commit: r898339 - in /directory/studio/trunk/connection-ui/src/main/java/org/apache/directory/studio/connection/ui/widgets: CertificateListComposite.java messages.properties messages_de.properties messages_fr.properties
Date Tue, 12 Jan 2010 14:29:56 GMT
Author: pamarcelot
Date: Tue Jan 12 14:29:56 2010
New Revision: 898339

URL: http://svn.apache.org/viewvc?rev=898339&view=rev
Log:
Fix for DIRSTUDIO-613 (Certificate with empty common name (cn) appears almost hidden in the
preference page table view).

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

Modified: directory/studio/trunk/connection-ui/src/main/java/org/apache/directory/studio/connection/ui/widgets/CertificateListComposite.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/connection-ui/src/main/java/org/apache/directory/studio/connection/ui/widgets/CertificateListComposite.java?rev=898339&r1=898338&r2=898339&view=diff
==============================================================================
--- directory/studio/trunk/connection-ui/src/main/java/org/apache/directory/studio/connection/ui/widgets/CertificateListComposite.java
(original)
+++ directory/studio/trunk/connection-ui/src/main/java/org/apache/directory/studio/connection/ui/widgets/CertificateListComposite.java
Tue Jan 12 14:29:56 2010
@@ -229,7 +229,16 @@
             if ( element instanceof X509Certificate )
             {
                 X509Certificate certificate = ( X509Certificate ) element;
-                return certificate.getSubjectX500Principal().getName();
+
+                String certificateName = certificate.getSubjectX500Principal().getName();
+                if ( ( certificateName != null ) && ( !"".equals( certificateName
) ) )
+                {
+                    return certificateName;
+                }
+                else
+                {
+                    return Messages.getString( "CertificateListComposite.UntitledCertificate"
); //$NON-NLS-1$
+                }
             }
             return super.getText( element );
         }

Modified: directory/studio/trunk/connection-ui/src/main/java/org/apache/directory/studio/connection/ui/widgets/messages.properties
URL: http://svn.apache.org/viewvc/directory/studio/trunk/connection-ui/src/main/java/org/apache/directory/studio/connection/ui/widgets/messages.properties?rev=898339&r1=898338&r2=898339&view=diff
==============================================================================
--- directory/studio/trunk/connection-ui/src/main/java/org/apache/directory/studio/connection/ui/widgets/messages.properties
(original)
+++ directory/studio/trunk/connection-ui/src/main/java/org/apache/directory/studio/connection/ui/widgets/messages.properties
Tue Jan 12 14:29:56 2010
@@ -100,9 +100,10 @@
 CertificateInfoComposite.ValidityLabel             = Validity
 CertificateInfoComposite.Version                   = Version
 
-CertificateListComposite.AddButton    = Add...
-CertificateListComposite.RemoveButton = Remove
-CertificateListComposite.ViewButton   = View...
+CertificateListComposite.AddButton    			= Add...
+CertificateListComposite.RemoveButton 			= Remove
+CertificateListComposite.ViewButton   			= View...
+CertificateListComposite.UntitledCertificate	= <Untitled>
 
 NetworkParameterPage.CheckNetworkParameter        = Check Network Parameter
 NetworkParameterPage.ConnectionEstablished        = The connection was established successfully.

Modified: directory/studio/trunk/connection-ui/src/main/java/org/apache/directory/studio/connection/ui/widgets/messages_de.properties
URL: http://svn.apache.org/viewvc/directory/studio/trunk/connection-ui/src/main/java/org/apache/directory/studio/connection/ui/widgets/messages_de.properties?rev=898339&r1=898338&r2=898339&view=diff
==============================================================================
--- directory/studio/trunk/connection-ui/src/main/java/org/apache/directory/studio/connection/ui/widgets/messages_de.properties
(original)
+++ directory/studio/trunk/connection-ui/src/main/java/org/apache/directory/studio/connection/ui/widgets/messages_de.properties
Tue Jan 12 14:29:56 2010
@@ -99,9 +99,10 @@
 CertificateInfoComposite.ValidityLabel             = G\u00FCltigkeit
 CertificateInfoComposite.Version                   = Version
 
-CertificateListComposite.AddButton    = Hinzuf\u00FCgen...
-CertificateListComposite.RemoveButton = Entfernen
-CertificateListComposite.ViewButton   = Anzeigen...
+CertificateListComposite.AddButton    			= Hinzuf\u00FCgen...
+CertificateListComposite.RemoveButton 			= Entfernen
+CertificateListComposite.ViewButton   			= Anzeigen...
+CertificateListComposite.UntitledCertificate	= <Unbetitelt>
 
 NetworkParameterPage.CheckNetworkParameter        = Netzwerkparameter \u00FCberpr\u00FCfen
 NetworkParameterPage.ConnectionEstablished        = Die Verbindung wurde erfolgreich aufgebaut.

Modified: directory/studio/trunk/connection-ui/src/main/java/org/apache/directory/studio/connection/ui/widgets/messages_fr.properties
URL: http://svn.apache.org/viewvc/directory/studio/trunk/connection-ui/src/main/java/org/apache/directory/studio/connection/ui/widgets/messages_fr.properties?rev=898339&r1=898338&r2=898339&view=diff
==============================================================================
--- directory/studio/trunk/connection-ui/src/main/java/org/apache/directory/studio/connection/ui/widgets/messages_fr.properties
(original)
+++ directory/studio/trunk/connection-ui/src/main/java/org/apache/directory/studio/connection/ui/widgets/messages_fr.properties
Tue Jan 12 14:29:56 2010
@@ -98,9 +98,10 @@
 CertificateInfoComposite.ValidityLabel             = Validit\u00E9
 CertificateInfoComposite.Version                   = Version
 
-CertificateListComposite.AddButton    = Ajouter...
-CertificateListComposite.RemoveButton = Supprimer
-CertificateListComposite.ViewButton   = Afficher...
+CertificateListComposite.AddButton    			= Ajouter...
+CertificateListComposite.RemoveButton 			= Supprimer
+CertificateListComposite.ViewButton   			= Afficher...
+CertificateListComposite.UntitledCertificate	= <Sans titre>
 
 NetworkParameterPage.CheckNetworkParameter        = V\u00E9rifier les param\u00E8tres r\u00E9seau
 NetworkParameterPage.ConnectionEstablished        = La connexion a \u00E9t\u00E9 \u00E9tablie
avec succ\u00E8s



Mime
View raw message