You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by se...@apache.org on 2009/10/21 22:16:13 UTC
svn commit: r828185 - in
/directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io:
ApacheDsSchemaConnector.java GenericSchemaConnector.java
messages.properties messages_de.properties messages_fr.properties
Author: seelmann
Date: Wed Oct 21 20:16:13 2009
New Revision: 828185
URL: http://svn.apache.org/viewvc?rev=828185&view=rev
Log:
String externalization
Modified:
directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/ApacheDsSchemaConnector.java
directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/GenericSchemaConnector.java
directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/messages.properties
directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/messages_de.properties
directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/messages_fr.properties
Modified: directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/ApacheDsSchemaConnector.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/ApacheDsSchemaConnector.java?rev=828185&r1=828184&r2=828185&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/ApacheDsSchemaConnector.java (original)
+++ directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/ApacheDsSchemaConnector.java Wed Oct 21 20:16:13 2009
@@ -32,10 +32,10 @@
import org.apache.directory.shared.ldap.schema.ObjectClassTypeEnum;
import org.apache.directory.shared.ldap.schema.UsageEnum;
import org.apache.directory.studio.connection.core.Connection;
-import org.apache.directory.studio.connection.core.jobs.StudioProgressMonitor;
import org.apache.directory.studio.connection.core.Connection.AliasDereferencingMethod;
import org.apache.directory.studio.connection.core.Connection.ReferralHandlingMethod;
import org.apache.directory.studio.connection.core.io.jndi.JNDIConnectionWrapper;
+import org.apache.directory.studio.connection.core.jobs.StudioProgressMonitor;
import org.apache.directory.studio.schemaeditor.model.AttributeTypeImpl;
import org.apache.directory.studio.schemaeditor.model.MatchingRuleImpl;
import org.apache.directory.studio.schemaeditor.model.ObjectClassImpl;
@@ -97,7 +97,7 @@
JNDIConnectionWrapper wrapper = connection.getJNDIConnectionWrapper();
- monitor.beginTask( "Fetching Schema: ", 1 );
+ monitor.beginTask( Messages.getString( "GenericSchemaConnector.FetchingSchema" ), 1 ); //$NON-NLS-1$
// Looking for all the defined schemas
SearchControls constraintSearch = new SearchControls();
@@ -202,7 +202,7 @@
private static Schema getSchema( JNDIConnectionWrapper wrapper, String name, StudioProgressMonitor monitor )
throws NamingException
{
- monitor.subTask( "Reading schema '" + name + "'" );
+ monitor.subTask( name ); //$NON-NLS-1$
// Creating the schema
Schema schema = new SchemaImpl( name );
Modified: directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/GenericSchemaConnector.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/GenericSchemaConnector.java?rev=828185&r1=828184&r2=828185&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/GenericSchemaConnector.java (original)
+++ directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/GenericSchemaConnector.java Wed Oct 21 20:16:13 2009
@@ -83,7 +83,7 @@
JNDIConnectionWrapper wrapper = connection.getJNDIConnectionWrapper();
- monitor.beginTask( "Fetching Schema: ", 1 );
+ monitor.beginTask( Messages.getString( "GenericSchemaConnector.FetchingSchema" ), 1 ); //$NON-NLS-1$
SearchControls constraintSearch = new SearchControls();
constraintSearch.setSearchScope( SearchControls.OBJECT_SCOPE );
@@ -187,8 +187,6 @@
private static Schema getSchema( JNDIConnectionWrapper wrapper, SearchResult searchResult,
StudioProgressMonitor monitor ) throws NamingException, ParseException
{
- monitor.subTask( "Reading schema" );
-
// Creating the schema
Schema schema = new SchemaImpl( "schema" );
Modified: directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/messages.properties
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/messages.properties?rev=828185&r1=828184&r2=828185&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/messages.properties (original)
+++ directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/messages.properties Wed Oct 21 20:16:13 2009
@@ -15,6 +15,7 @@
# specific language governing permissions and limitations
# under the License.
+GenericSchemaConnector.FetchingSchema=Fetching Schema
OpenLdapSchemaFileImporter.ErrorMessage=Line\: {0}, column\: {1}, cause\: {2}
OpenLdapSchemaFileImporter.NotReadCorrectly=The file "{0}" can not be read correctly.
ProjectsImporter.NoSchemaConnectorIDFound=The parser was not able to find the SchemaConnector with ID "{0}".
Modified: directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/messages_de.properties
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/messages_de.properties?rev=828185&r1=828184&r2=828185&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/messages_de.properties (original)
+++ directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/messages_de.properties Wed Oct 21 20:16:13 2009
@@ -15,6 +15,7 @@
# specific language governing permissions and limitations
# under the License.
+GenericSchemaConnector.FetchingSchema=Lese Schema
OpenLdapSchemaFileImporter.ErrorMessage=Zeile\: {0}, Spalte\: {1}, Grund\: {2}
OpenLdapSchemaFileImporter.NotReadCorrectlyBegin=Die Datei "{0}" konnte nicht korrekt gelesen werden.
ProjectsImporter.NoSchemaConnectorIDFound=Der Parser war nicht in der Lage, den SchemaConnector mit der OID "{0}" zu finden.
Modified: directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/messages_fr.properties
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/messages_fr.properties?rev=828185&r1=828184&r2=828185&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/messages_fr.properties (original)
+++ directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/messages_fr.properties Wed Oct 21 20:16:13 2009
@@ -15,6 +15,7 @@
# specific language governing permissions and limitations
# under the License.
+GenericSchemaConnector.FetchingSchema=TODO:Fetching Schema
OpenLdapSchemaFileImporter.ErrorMessage=Ligne : {0}, colonne : {1}, cause : {2}
OpenLdapSchemaFileImporter.NotReadCorrectly=Le fichier "{0}" ne peut pas \u00EAtre lu.
ProjectsImporter.NoSchemaConnectorIDFound=Le parseur n'a pas \u00E9t\u00E9 capable de trouver le SchemaConnector avec l'ID "{0}".