svn commit: r1221714 - in /directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core: ./ jobs/

[pa...@apache.org]

Author: pamarcelot
Date: Wed Dec 21 13:22:55 2011
New Revision: 1221714

URL: http://svn.apache.org/viewvc?rev=1221714&view=rev
Log:
Fix for DIRSTUDIO-432 (Better error message for invalid LDIF records on import).
Added the invalid message from the record in the error.

Modified:
    directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/browsercoremessages.properties
    directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/browsercoremessages_de.properties
    directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/browsercoremessages_fr.properties
    directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ImportLdifRunnable.java

Modified: directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/browsercoremessages.properties
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/browsercoremessages.properties?rev=1221714&r1=1221713&r2=1221714&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/browsercoremessages.properties (original)
+++ directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/browsercoremessages.properties Wed Dec 21 13:22:55 2011
@@ -46,7 +46,7 @@ model__empty_rdn=Empty RDN is not allowe
 model__url_no_dn=No DN
 model__empty_password=Empty password is not allowed\!
 model__loading_schema=Loading Schema...
-model__invalid_record=Record is invalid
+model__invalid_record=Record is invalid: {0}
 model__invalid_rdn=Invalid RDN
 model__invalid_protocol=Invalid protocol
 model__invalid_url=Invalid URL

Modified: directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/browsercoremessages_de.properties
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/browsercoremessages_de.properties?rev=1221714&r1=1221713&r2=1221714&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/browsercoremessages_de.properties (original)
+++ directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/browsercoremessages_de.properties Wed Dec 21 13:22:55 2011
@@ -44,7 +44,7 @@ model__empty_rdn=Leerer RDN ist nicht er
 model__url_no_dn=Kein DN
 model__empty_password=Leeres Passwort ist nicht erlaubt\!
 model__loading_schema=Schema laden...
-model__invalid_record=Datensatz ist ung\u00FCltig
+model__invalid_record=Datensatz ist ung\u00FCltig: {0}
 model__invalid_rdn=Ung\u00FCltiger RDN
 model__invalid_protocol=Ung\u00FCltiges Protokoll
 model__invalid_url=Ung\u00FCltige URL

Modified: directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/browsercoremessages_fr.properties
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/browsercoremessages_fr.properties?rev=1221714&r1=1221713&r2=1221714&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/browsercoremessages_fr.properties (original)
+++ directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/browsercoremessages_fr.properties Wed Dec 21 13:22:55 2011
@@ -46,7 +46,7 @@ model__empty_rdn=Un RDN vide n'est pas a
 model__url_no_dn=Pas de DN
 model__empty_password=Un mot de passe vide n'est pas autoris\u00E9 \!
 model__loading_schema=Chargement du Sch\u00E9ma...
-model__invalid_record=L'enregistrement est invalide
+model__invalid_record=L'enregistrement est invalide : {0}
 model__invalid_rdn=RDN invalide
 model__invalid_protocol=Protocol invalide
 model__invalid_url=URL invalide

Modified: directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ImportLdifRunnable.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ImportLdifRunnable.java?rev=1221714&r1=1221713&r2=1221714&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ImportLdifRunnable.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ImportLdifRunnable.java Wed Dec 21 13:22:55 2011
@@ -406,7 +406,8 @@ public class ImportLdifRunnable implemen
     {
         if ( !record.isValid() )
         {
-            throw new NamingException( BrowserCoreMessages.model__invalid_record );
+            throw new NamingException( BrowserCoreMessages.bind( BrowserCoreMessages.model__invalid_record,
+                record.getInvalidString() ) );
         }
 
         String dn = record.getDnLine().getValueAsString();