svn commit: r1488162 - in /directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards: ImportLdifMainWizardPage.java messages.properties messages_de.properties messages_fr.properties

[pa...@apache.org]

Author: pamarcelot
Date: Fri May 31 11:17:30 2013
New Revision: 1488162

URL: http://svn.apache.org/r1488162
Log:
Fix for DIRSTUDIO-918 (Wrong error message in Import LDIF/DSML wizards when no connection is selected).

Modified:
    directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ImportLdifMainWizardPage.java
    directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/messages.properties
    directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/messages_de.properties
    directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/messages_fr.properties

Modified: directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ImportLdifMainWizardPage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ImportLdifMainWizardPage.java?rev=1488162&r1=1488161&r2=1488162&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ImportLdifMainWizardPage.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ImportLdifMainWizardPage.java Fri May 31 11:17:30 2013
@@ -175,6 +175,8 @@ public class ImportLdifMainWizardPage ex
 
         if ( wizard.getImportConnection() == null )
         {
+            setErrorMessage( Messages
+                .getString( "ImportLdifMainWizardPage.ErrorNoConnectionSelected" ) ); //$NON-NLS-1$
             ok = false;
         }
 

Modified: directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/messages.properties
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/messages.properties?rev=1488162&r1=1488161&r2=1488162&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/messages.properties (original)
+++ directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/messages.properties Fri May 31 11:17:30 2013
@@ -123,6 +123,7 @@ ImportDsmlWizard.DSMLImport=DSML Import
 ImportLdifMainWizardPage.ContinueOnError=Continue on error
 ImportLdifMainWizardPage.EnableLogging=Enable logging
 ImportLdifMainWizardPage.ErrorLDIFAndLogEqual=LDIF file and Logfile must not be equal.
+ImportLdifMainWizardPage.ErrorNoConnectionSelected=No connection selected.
 ImportLdifMainWizardPage.ErrorSelectedLDIFNotExist=Selected LDIF file doesn't exist.
 ImportLdifMainWizardPage.ErrorSelectedLDIFNotReadable=Selected LDIF file is not readable.
 ImportLdifMainWizardPage.ErrorSelectedLogFileDirectoryNotWritable=Selected logfile directory is not writeable.

Modified: directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/messages_de.properties
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/messages_de.properties?rev=1488162&r1=1488161&r2=1488162&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/messages_de.properties (original)
+++ directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/messages_de.properties Fri May 31 11:17:30 2013
@@ -109,6 +109,7 @@ ImportDsmlWizard.DSMLImport=DSML Import
 ImportLdifMainWizardPage.ContinueOnError=Bei einem Fehler weiterfahren
 ImportLdifMainWizardPage.EnableLogging=Loggen aktivieren
 ImportLdifMainWizardPage.ErrorLDIFAndLogEqual=LDIF Datei und Logdatei d\u00FCrfen nicht gleich sein.
+ImportLdifMainWizardPage.ErrorNoConnectionSelected=Keine Verbindung ausgew\u00E4hlte.
 ImportLdifMainWizardPage.ErrorSelectedLDIFNotExist=Ausgew\u00E4hlte LDIF Datei existiert nicht.
 ImportLdifMainWizardPage.ErrorSelectedLDIFNotReadable=Ausgew\u00E4hlte LDIF Datei ist nicht lesbar.
 ImportLdifMainWizardPage.ErrorSelectedLogFileDirectoryNotWritable=Verzeichnis der ausgew\u00E4hlten Logdatei ist nicht beschreibbar.

Modified: directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/messages_fr.properties
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/messages_fr.properties?rev=1488162&r1=1488161&r2=1488162&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/messages_fr.properties (original)
+++ directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/messages_fr.properties Fri May 31 11:17:30 2013
@@ -142,6 +142,7 @@ ImportDsmlWizard.DSMLImport=Import DSML
 ImportLdifMainWizardPage.ContinueOnError=Poursuivre sur erreur
 ImportLdifMainWizardPage.EnableLogging=Autoriser les logs
 ImportLdifMainWizardPage.ErrorLDIFAndLogEqual=Le fichier LDIF et le fichier de logs ne doivent pas \u00EAtre les m\u00EAmes.
+ImportLdifMainWizardPage.ErrorNoConnectionSelected=Aucune connexion s\u00E9lectionn\u00E9e.
 ImportLdifMainWizardPage.ErrorSelectedLDIFNotExist=Le fichier LDIF choisi n'existe pas.
 ImportLdifMainWizardPage.ErrorSelectedLDIFNotReadable=Le fichier LDIF choisi n'est pas accessible en lecture.
 ImportLdifMainWizardPage.ErrorSelectedLogFileDirectoryNotWritable=Le r\u00E9pertoire du fichier de log choisiest prot\u00E9g\u00E9 en \u00E9criture.