directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pamarce...@apache.org
Subject svn commit: r759857 - in /directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards: ImportSchemasFromXmlWizard.java messages.properties messages_de.properties messages_fr.properties
Date Mon, 30 Mar 2009 07:22:47 GMT
Author: pamarcelot
Date: Mon Mar 30 07:22:46 2009
New Revision: 759857

URL: http://svn.apache.org/viewvc?rev=759857&view=rev
Log:
Fix for DIRSTUDIO-466 (Incorrect error message when importing a bad XML schema file).

Modified:
    directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/ImportSchemasFromXmlWizard.java
    directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/messages.properties
    directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/messages_de.properties
    directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/messages_fr.properties

Modified: directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/ImportSchemasFromXmlWizard.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/ImportSchemasFromXmlWizard.java?rev=759857&r1=759856&r2=759857&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/ImportSchemasFromXmlWizard.java
(original)
+++ directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/ImportSchemasFromXmlWizard.java
Mon Mar 30 07:22:46 2009
@@ -131,7 +131,7 @@
                                     Messages.getString( "ImportSchemasFromXmlWizard.Error"
), //$NON-NLS-1$
                                     NLS
                                         .bind(
-                                            Messages.getString( "ImportSchemasFromXmlWizard.ErrorSavingSchema"
), new File[] { schemaFile } ) ); //$NON-NLS-1$
+                                            Messages.getString( "ImportSchemasFromXmlWizard.ErrorImportingSchema"
), new File[] { schemaFile } ) ); //$NON-NLS-1$
                         }
                         catch ( FileNotFoundException e )
                         {
@@ -145,7 +145,7 @@
                                     Messages.getString( "ImportSchemasFromXmlWizard.Error"
), //$NON-NLS-1$
                                     NLS
                                         .bind(
-                                            Messages.getString( "ImportSchemasFromXmlWizard.ErrorSavingSchema"
), new File[] { schemaFile } ) ); //$NON-NLS-1$
+                                            Messages.getString( "ImportSchemasFromXmlWizard.ErrorImportingSchema"
), new File[] { schemaFile } ) ); //$NON-NLS-1$
                         }
                         monitor.worked( 1 );
                     }

Modified: directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/messages.properties
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/messages.properties?rev=759857&r1=759856&r2=759857&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/messages.properties
(original)
+++ directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/messages.properties
Mon Mar 30 07:22:46 2009
@@ -163,7 +163,6 @@
 ImportSchemasFromOpenLdapWizardPage.SelectOpenLDAPSchema=Please select the OpenLdap schema
files to import.
 ImportSchemasFromXmlWizard.Error=Error
 ImportSchemasFromXmlWizard.ErrorImportingSchema=An error occured when importing  the schema
"{0}".
-ImportSchemasFromXmlWizard.ErrorSavingSchema=An error occured when saving the schema "{0}".
 ImportSchemasFromXmlWizard.ImportingSchemas=Importing schemas\: 
 ImportSchemasFromXmlWizardPage.Browse=Browse...
 ImportSchemasFromXmlWizardPage.ChooseFolder=Choose Folder

Modified: directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/messages_de.properties
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/messages_de.properties?rev=759857&r1=759856&r2=759857&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/messages_de.properties
(original)
+++ directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/messages_de.properties
Mon Mar 30 07:22:46 2009
@@ -170,7 +170,6 @@
 
 ImportSchemasFromXmlWizard.Error=Fehler
 ImportSchemasFromXmlWizard.ErrorImportingSchema=Ein Fehler ist beim Importieren des Schemas
"{0}" aufgetreten.
-ImportSchemasFromXmlWizard.ErrorSavingSchema=Ein Fehler ist beim Speichern des Schemas "{0}"
aufgetreten.
 ImportSchemasFromXmlWizard.ImportingSchemas=Schemas werden importiert\: 
 ImportSchemasFromXmlWizardPage.Browse=Browsen...
 ImportSchemasFromXmlWizardPage.ChooseFolder=Verzeichnis auswählen

Modified: directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/messages_fr.properties
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/messages_fr.properties?rev=759857&r1=759856&r2=759857&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/messages_fr.properties
(original)
+++ directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/messages_fr.properties
Mon Mar 30 07:22:46 2009
@@ -170,7 +170,6 @@
 
 ImportSchemasFromXmlWizard.Error=Erreur
 ImportSchemasFromXmlWizard.ErrorImportingSchema=Une erreur est survenue lors de l''importation
du schéma "{0}".
-ImportSchemasFromXmlWizard.ErrorSavingSchema=Une erreur est survenue lors de la sauvegare
du schéma "{0}".
 ImportSchemasFromXmlWizard.ImportingSchemas=Importation des schémas\: 
 
 ImportSchemasFromXmlWizardPage.Browse=Parcourir...



Mime
View raw message