sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject svn commit: r1644556 [10/10] - in /sis/branches/JDK8: core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/ core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/matrix/ core/sis-referencing/src/main/java/org/apache/sis...
Date Thu, 11 Dec 2014 05:08:41 GMT
Modified: sis/branches/JDK8/storage/sis-shapefile/src/main/resources/org/apache/sis/internal/shapefile/jdbc/sql/AbstractClauseResolver.properties
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/storage/sis-shapefile/src/main/resources/org/apache/sis/internal/shapefile/jdbc/sql/AbstractClauseResolver.properties?rev=1644556&r1=1644555&r2=1644556&view=diff
==============================================================================
--- sis/branches/JDK8/storage/sis-shapefile/src/main/resources/org/apache/sis/internal/shapefile/jdbc/sql/AbstractClauseResolver.properties [iso-8859-1] (original)
+++ sis/branches/JDK8/storage/sis-shapefile/src/main/resources/org/apache/sis/internal/shapefile/jdbc/sql/AbstractClauseResolver.properties [ISO-8859-1] Thu Dec 11 05:08:40 2014
@@ -1,25 +1,25 @@
-# A field type is not known.
-#0 : Field type.
-assert.unknown_field_type=[Internal API Error] The field type {0} is not known among the DBase 3 type.
-
-# Illegal parameter in a where clause.
-#0 : Illegal parameter value.
-#1 : SQL Query that failed.
-excp.illegal_parameter_where=The where clause contains a parameter that has an illegal value : {0}. The query that failed is : {1}.
-
-# An operator in a statement is invalid.
-#0 : Invalid operator.
-#1 : SQL Query that failed.
-excp.invalid_statement_operator=The operator {0} in the where clause of the SQL Query {1} is invalid.
-
-# A type encountered while translating literals and fields value to java types is not Comparable.
-#0 : Value.
-#1 : Java type.
-#2 : SQL Query.
-excp.uncomparable_type=The field or literal value {0} belongs to a Java type {1} that is not Comparable, and this driver cannot handle it during a comparison. The SQL Query that encountered the problem is : {2}.
-
-# A field type is currently not supported.
-#0 : Field name.
-#1 : Unparsable field type.
-#2 : SQL Query that failed.
-excp.unparsable_field_type=The field {0} has a type {1} that is not currently parsable (unsupported yet) in the ''{2}'' query.
+# A field type is not known.
+#0 : Field type.
+assert.unknown_field_type=[Internal API Error] The field type {0} is not known among the DBase 3 type.
+
+# Illegal parameter in a where clause.
+#0 : Illegal parameter value.
+#1 : SQL Query that failed.
+excp.illegal_parameter_where=The where clause contains a parameter that has an illegal value : {0}. The query that failed is : {1}.
+
+# An operator in a statement is invalid.
+#0 : Invalid operator.
+#1 : SQL Query that failed.
+excp.invalid_statement_operator=The operator {0} in the where clause of the SQL Query {1} is invalid.
+
+# A type encountered while translating literals and fields value to java types is not Comparable.
+#0 : Value.
+#1 : Java type.
+#2 : SQL Query.
+excp.uncomparable_type=The field or literal value {0} belongs to a Java type {1} that is not Comparable, and this driver cannot handle it during a comparison. The SQL Query that encountered the problem is : {2}.
+
+# A field type is currently not supported.
+#0 : Field name.
+#1 : Unparsable field type.
+#2 : SQL Query that failed.
+excp.unparsable_field_type=The field {0} has a type {1} that is not currently parsable (unsupported yet) in the ''{2}'' query.

Propchange: sis/branches/JDK8/storage/sis-shapefile/src/main/resources/org/apache/sis/internal/shapefile/jdbc/sql/AbstractClauseResolver.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: sis/branches/JDK8/storage/sis-shapefile/src/main/resources/org/apache/sis/internal/shapefile/jdbc/sql/AbstractClauseResolver.properties
------------------------------------------------------------------------------
    svn:mime-type = text/plain;charset=ISO-8859-1

Modified: sis/branches/JDK8/storage/sis-shapefile/src/main/resources/org/apache/sis/internal/shapefile/jdbc/sql/AbstractClauseResolver_fr.properties
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/storage/sis-shapefile/src/main/resources/org/apache/sis/internal/shapefile/jdbc/sql/AbstractClauseResolver_fr.properties?rev=1644556&r1=1644555&r2=1644556&view=diff
==============================================================================
--- sis/branches/JDK8/storage/sis-shapefile/src/main/resources/org/apache/sis/internal/shapefile/jdbc/sql/AbstractClauseResolver_fr.properties [iso-8859-1] (original)
+++ sis/branches/JDK8/storage/sis-shapefile/src/main/resources/org/apache/sis/internal/shapefile/jdbc/sql/AbstractClauseResolver_fr.properties [ISO-8859-1] Thu Dec 11 05:08:40 2014
@@ -1,16 +1,16 @@
-# Illegal parameter in a where clause.
-#0 : Illegal parameter value.
-#1 : SQL Query that failed.
-excp.illegal_parameter_where=La clause where contient un paramètre qui a une valeur illégale : {0}. La requête SQL qui a échoué est : {1}.
-
-# A type encountered while translating literals and fields value to java types is not Comparable.
-#0 : Value.
-#1 : Java type.
-#2 : SQL Query.
-excp.uncomparable_type=La valeur du champ ou du littéral {0} appartient au type Java {1} qui n''est pas Comparable, et ce driver ne peut pas le prendre en charge durant une comparaison. La requête SQL qui a rencontré ce problème est : {2}.
-
-# A field type is currently not supported.
-#0 : Field name.
-#1 : Unparsable field type.
-#2 : SQL Query that failed.
-excp.unparsable_field_type=Le champ {0} a un type {1} qui n'est pas analysable (non supporté actuellement) dans la requête ''{2}''.
+# Illegal parameter in a where clause.
+#0 : Illegal parameter value.
+#1 : SQL Query that failed.
+excp.illegal_parameter_where=La clause where contient un paramètre qui a une valeur illégale : {0}. La requête SQL qui a échoué est : {1}.
+
+# A type encountered while translating literals and fields value to java types is not Comparable.
+#0 : Value.
+#1 : Java type.
+#2 : SQL Query.
+excp.uncomparable_type=La valeur du champ ou du littéral {0} appartient au type Java {1} qui n''est pas Comparable, et ce driver ne peut pas le prendre en charge durant une comparaison. La requête SQL qui a rencontré ce problème est : {2}.
+
+# A field type is currently not supported.
+#0 : Field name.
+#1 : Unparsable field type.
+#2 : SQL Query that failed.
+excp.unparsable_field_type=Le champ {0} a un type {1} qui n'est pas analysable (non supporté actuellement) dans la requête ''{2}''.

Propchange: sis/branches/JDK8/storage/sis-shapefile/src/main/resources/org/apache/sis/internal/shapefile/jdbc/sql/AbstractClauseResolver_fr.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: sis/branches/JDK8/storage/sis-shapefile/src/main/resources/org/apache/sis/internal/shapefile/jdbc/sql/AbstractClauseResolver_fr.properties
------------------------------------------------------------------------------
    svn:mime-type = text/plain;charset=ISO-8859-1

Modified: sis/branches/JDK8/storage/sis-shapefile/src/main/resources/org/apache/sis/internal/shapefile/jdbc/sql/CrudeSQLParser.properties
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/storage/sis-shapefile/src/main/resources/org/apache/sis/internal/shapefile/jdbc/sql/CrudeSQLParser.properties?rev=1644556&r1=1644555&r2=1644556&view=diff
==============================================================================
--- sis/branches/JDK8/storage/sis-shapefile/src/main/resources/org/apache/sis/internal/shapefile/jdbc/sql/CrudeSQLParser.properties [iso-8859-1] (original)
+++ sis/branches/JDK8/storage/sis-shapefile/src/main/resources/org/apache/sis/internal/shapefile/jdbc/sql/CrudeSQLParser.properties [ISO-8859-1] Thu Dec 11 05:08:40 2014
@@ -1,12 +1,12 @@
-# Exception thrown when the SQL parser only accepts a degraded request.
-#0 : Request parsed.
-excp.limited_feature_syntax=The SQL parser is yet limited, and only accepts statements starting exactly with ''SELECT * FROM <your_dbf_file_name (without extension)> '', use spaces and not tabs. Your statement ''{0}'' doesn''t match.
-
-# Exception thrown when the parser had not been able to split a condition in three parts (comparand operator comparand) to analyze it.
-#0 : Condition that wasn't parsed.
-#1 : Request parsed.
-excp.limited_feature_conditional_parsing=The SQL parser is limited yet and is only able to parse conditional expressions that are constituted in three parts : comparand1 operator comparand2, separated by spaces. A string containing spaces inside might not be well parsed yet. Your where condition ''{0}'' has been rejected in your SQL statement {1}.
-
-# Exception thrown when a WHERE clause is not followed by one or more conditions.
-#0 : Request parsed.
-excp.where_without_conditions=The WHERE clause has not been followed by a/some condition(s) in your SQL statement : ''{0}''. 
+# Exception thrown when the SQL parser only accepts a degraded request.
+#0 : Request parsed.
+excp.limited_feature_syntax=The SQL parser is yet limited, and only accepts statements starting exactly with ''SELECT * FROM <your_dbf_file_name (without extension)> '', use spaces and not tabs. Your statement ''{0}'' doesn''t match.
+
+# Exception thrown when the parser had not been able to split a condition in three parts (comparand operator comparand) to analyze it.
+#0 : Condition that wasn't parsed.
+#1 : Request parsed.
+excp.limited_feature_conditional_parsing=The SQL parser is limited yet and is only able to parse conditional expressions that are constituted in three parts : comparand1 operator comparand2, separated by spaces. A string containing spaces inside might not be well parsed yet. Your where condition ''{0}'' has been rejected in your SQL statement {1}.
+
+# Exception thrown when a WHERE clause is not followed by one or more conditions.
+#0 : Request parsed.
+excp.where_without_conditions=The WHERE clause has not been followed by a/some condition(s) in your SQL statement : ''{0}''. 

Propchange: sis/branches/JDK8/storage/sis-shapefile/src/main/resources/org/apache/sis/internal/shapefile/jdbc/sql/CrudeSQLParser.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: sis/branches/JDK8/storage/sis-shapefile/src/main/resources/org/apache/sis/internal/shapefile/jdbc/sql/CrudeSQLParser.properties
------------------------------------------------------------------------------
    svn:mime-type = text/plain;charset=ISO-8859-1

Modified: sis/branches/JDK8/storage/sis-shapefile/src/main/resources/org/apache/sis/internal/shapefile/jdbc/statement/DBFStatement.properties
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/storage/sis-shapefile/src/main/resources/org/apache/sis/internal/shapefile/jdbc/statement/DBFStatement.properties?rev=1644556&r1=1644555&r2=1644556&view=diff
==============================================================================
--- sis/branches/JDK8/storage/sis-shapefile/src/main/resources/org/apache/sis/internal/shapefile/jdbc/statement/DBFStatement.properties [iso-8859-1] (original)
+++ sis/branches/JDK8/storage/sis-shapefile/src/main/resources/org/apache/sis/internal/shapefile/jdbc/statement/DBFStatement.properties [ISO-8859-1] Thu Dec 11 05:08:40 2014
@@ -1,22 +1,22 @@
-# Asserttion : the ResultSet has not been found opened by this statement when it was searched for.
-#0 : the ResultSet that should had been found opened by this statement.
-#1 : The statement.
-assert.resultset_not_opened_by_me=[Internal API trouble] The ResultSet {0} has not been opened by the Statement {1}.  
-
-# Exception thrown if the statement is closed.
-#0 : Underlying DBF File name. 
-excp.closed_statement=The statement to the DBase 3 File {0} is closed.
-
-# Warning : At the time the caller is closing this statement, he has left some ResultSets opened.
-#0, number : Number of ResultSets that are left opened.
-#1 : Opened ResultSets.
-log.resultsets_left_opened={0,number,integer} {0,choice,1#ResultSet is|2#ResultSets are} left opened at the time you are closing this statement : {1}.
-
-# Information : At the time the caller is closing this statement, the current ResultSet was still opened, but this statement will close it.
-#0 : Closed ResultSet.
-log.closing_underlying_resultset=The ResultSet {0} that was left open is closed by this statement.
-
-# toString()
-#0 : Underlying connection.
-#1 : Open state.
-toString='{'(based on connection : {0}), statement open state : {1}'}'
+# Asserttion : the ResultSet has not been found opened by this statement when it was searched for.
+#0 : the ResultSet that should had been found opened by this statement.
+#1 : The statement.
+assert.resultset_not_opened_by_me=[Internal API trouble] The ResultSet {0} has not been opened by the Statement {1}.  
+
+# Exception thrown if the statement is closed.
+#0 : Underlying DBF File name. 
+excp.closed_statement=The statement to the DBase 3 File {0} is closed.
+
+# Warning : At the time the caller is closing this statement, he has left some ResultSets opened.
+#0, number : Number of ResultSets that are left opened.
+#1 : Opened ResultSets.
+log.resultsets_left_opened={0,number,integer} {0,choice,1#ResultSet is|2#ResultSets are} left opened at the time you are closing this statement : {1}.
+
+# Information : At the time the caller is closing this statement, the current ResultSet was still opened, but this statement will close it.
+#0 : Closed ResultSet.
+log.closing_underlying_resultset=The ResultSet {0} that was left open is closed by this statement.
+
+# toString()
+#0 : Underlying connection.
+#1 : Open state.
+toString='{'(based on connection : {0}), statement open state : {1}'}'

Propchange: sis/branches/JDK8/storage/sis-shapefile/src/main/resources/org/apache/sis/internal/shapefile/jdbc/statement/DBFStatement.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: sis/branches/JDK8/storage/sis-shapefile/src/main/resources/org/apache/sis/internal/shapefile/jdbc/statement/DBFStatement.properties
------------------------------------------------------------------------------
    svn:mime-type = text/plain;charset=ISO-8859-1

Modified: sis/branches/JDK8/storage/sis-shapefile/src/main/resources/org/apache/sis/internal/shapefile/jdbc/statement/DBFStatement_fr.properties
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/storage/sis-shapefile/src/main/resources/org/apache/sis/internal/shapefile/jdbc/statement/DBFStatement_fr.properties?rev=1644556&r1=1644555&r2=1644556&view=diff
==============================================================================
--- sis/branches/JDK8/storage/sis-shapefile/src/main/resources/org/apache/sis/internal/shapefile/jdbc/statement/DBFStatement_fr.properties [iso-8859-1] (original)
+++ sis/branches/JDK8/storage/sis-shapefile/src/main/resources/org/apache/sis/internal/shapefile/jdbc/statement/DBFStatement_fr.properties [ISO-8859-1] Thu Dec 11 05:08:40 2014
@@ -1,12 +1,12 @@
-# Exception thrown if the statement is closed.
-#0 : Underlying DBF File name. 
-excp.closed_statement=Le statement au fichier DBase 3 {0} est fermée.
-
-# Warning : At the time the caller is closing this statement, he has left some ResultSets opened.
-#0, number : Number of ResultSets that are left opened.
-#1 : Opened ResultSets.
-log.resultsets_left_opened={0,number,integer} {0,choice,1#ResultSet est|2#ResultSets sont} restés ouverts au moment où vous fermez ce statement : {1}.
-
-# Information : At the time the caller is closing this statement, the current ResultSet was still opened, but this statement will close it.
-#0 : Closed ResultSet.
-log.closing_underlying_resultset=Le ResultSet {0} qui était resté ouvert est fermé par cette fermeture de statement.
+# Exception thrown if the statement is closed.
+#0 : Underlying DBF File name. 
+excp.closed_statement=Le statement au fichier DBase 3 {0} est fermée.
+
+# Warning : At the time the caller is closing this statement, he has left some ResultSets opened.
+#0, number : Number of ResultSets that are left opened.
+#1 : Opened ResultSets.
+log.resultsets_left_opened={0,number,integer} {0,choice,1#ResultSet est|2#ResultSets sont} restés ouverts au moment où vous fermez ce statement : {1}.
+
+# Information : At the time the caller is closing this statement, the current ResultSet was still opened, but this statement will close it.
+#0 : Closed ResultSet.
+log.closing_underlying_resultset=Le ResultSet {0} qui était resté ouvert est fermé par cette fermeture de statement.

Propchange: sis/branches/JDK8/storage/sis-shapefile/src/main/resources/org/apache/sis/internal/shapefile/jdbc/statement/DBFStatement_fr.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: sis/branches/JDK8/storage/sis-shapefile/src/main/resources/org/apache/sis/internal/shapefile/jdbc/statement/DBFStatement_fr.properties
------------------------------------------------------------------------------
    svn:mime-type = text/plain;charset=ISO-8859-1

Modified: sis/branches/JDK8/storage/sis-shapefile/src/main/resources/org/apache/sis/storage/shapefile/Database.properties
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/storage/sis-shapefile/src/main/resources/org/apache/sis/storage/shapefile/Database.properties?rev=1644556&r1=1644555&r2=1644556&view=diff
==============================================================================
--- sis/branches/JDK8/storage/sis-shapefile/src/main/resources/org/apache/sis/storage/shapefile/Database.properties [iso-8859-1] (original)
+++ sis/branches/JDK8/storage/sis-shapefile/src/main/resources/org/apache/sis/storage/shapefile/Database.properties [ISO-8859-1] Thu Dec 11 05:08:40 2014
@@ -1,30 +1,30 @@
-# Exception thrown when there is a file descriptor problem.
-#0 : DBase 3 File who causes trouble.
-#1 : Root cause message.
-excp.filedescriptor_problem=The file descriptor of the ''{0}'' database file is not readable : {1}. Its DBF format seems corrupted.
-
-# Exception thrown when a binary code page value is illegal.
-#0 : Illegal value.
-#1 : DBase 3 file that causes the problem.
-excp.illegal_codepage=The DBase 3 code page binary value {0} doesn''t match a legal binary code page. The DBF file ''{1}'' seems corrupted.
-
-# Exception thrown when a binary code page value is not supported.
-#0 : Unsupported value.
-#1 : DBase 3 file that causes the problem.
-excp.unsupported_codepage=The DBase 3 legacy code page {0} doesn''t have a translation to an known charset. This DBF ''{1}'' cannot be handled.
-
-# Assertion : when this exception occurs, the involved code that produced it is sure to have a bug.
-#0 : Charset that as been asked for and that is wrong.
-#1 : Root cause message.
-assert.wrong_charset_selection=[Internal API trouble] : The Database::toCharset(..) method has selected a wrong charset ''{0}'' that is eventually refused : {1}.
-
-# Database:toString() 
-#0 : Line separator.
-#1 : Database Version.
-#2 : Last update (Date).
-#3 : Feature count (Integer).
-#4 : Field descriptor (Embedded List).
-#5 : Header length (in bytes).
-#6 : Record length (in bytes).
-#7 : Charset (converted from binary code page value).
-toString='{'{0}DBase version : {1}{0}Last update : {2,date,medium}{0}Feature count : {3,number,integer}{0}Field descriptor : {4}{0}Header length : {5}, Record length : {6}, Charset : {7}'}'
+# Exception thrown when there is a file descriptor problem.
+#0 : DBase 3 File who causes trouble.
+#1 : Root cause message.
+excp.filedescriptor_problem=The file descriptor of the ''{0}'' database file is not readable : {1}. Its DBF format seems corrupted.
+
+# Exception thrown when a binary code page value is illegal.
+#0 : Illegal value.
+#1 : DBase 3 file that causes the problem.
+excp.illegal_codepage=The DBase 3 code page binary value {0} doesn''t match a legal binary code page. The DBF file ''{1}'' seems corrupted.
+
+# Exception thrown when a binary code page value is not supported.
+#0 : Unsupported value.
+#1 : DBase 3 file that causes the problem.
+excp.unsupported_codepage=The DBase 3 legacy code page {0} doesn''t have a translation to an known charset. This DBF ''{1}'' cannot be handled.
+
+# Assertion : when this exception occurs, the involved code that produced it is sure to have a bug.
+#0 : Charset that as been asked for and that is wrong.
+#1 : Root cause message.
+assert.wrong_charset_selection=[Internal API trouble] : The Database::toCharset(..) method has selected a wrong charset ''{0}'' that is eventually refused : {1}.
+
+# Database:toString() 
+#0 : Line separator.
+#1 : Database Version.
+#2 : Last update (Date).
+#3 : Feature count (Integer).
+#4 : Field descriptor (Embedded List).
+#5 : Header length (in bytes).
+#6 : Record length (in bytes).
+#7 : Charset (converted from binary code page value).
+toString='{'{0}DBase version : {1}{0}Last update : {2,date,medium}{0}Feature count : {3,number,integer}{0}Field descriptor : {4}{0}Header length : {5}, Record length : {6}, Charset : {7}'}'

Propchange: sis/branches/JDK8/storage/sis-shapefile/src/main/resources/org/apache/sis/storage/shapefile/Database.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: sis/branches/JDK8/storage/sis-shapefile/src/main/resources/org/apache/sis/storage/shapefile/Database.properties
------------------------------------------------------------------------------
    svn:mime-type = text/plain;charset=ISO-8859-1

Modified: sis/branches/JDK8/storage/sis-shapefile/src/main/resources/org/apache/sis/storage/shapefile/Database_fr.properties
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/storage/sis-shapefile/src/main/resources/org/apache/sis/storage/shapefile/Database_fr.properties?rev=1644556&r1=1644555&r2=1644556&view=diff
==============================================================================
--- sis/branches/JDK8/storage/sis-shapefile/src/main/resources/org/apache/sis/storage/shapefile/Database_fr.properties [iso-8859-1] (original)
+++ sis/branches/JDK8/storage/sis-shapefile/src/main/resources/org/apache/sis/storage/shapefile/Database_fr.properties [ISO-8859-1] Thu Dec 11 05:08:40 2014
@@ -1,19 +1,19 @@
-# Exception thrown when there is a file descriptor problem.
-#0 : DBase 3 File who causes trouble.
-#1 : Root cause message.
-excp.filedescriptor_problem=Le descripteur du fichier base de données ''{0}'' n''est pas lisible : {1}. Le format de ce DBF semble corrompu.
-
-# Exception thrown when a binary code page value is illegal.
-#0 : Illegal value.
-#1 : DBase 3 file that causes the problem.
-excp.illegal_codepage=La valeur binaire du code page DBase 3, {0}, ne correspond pas à un code page binaire légal. Le fichier DBF ''{1}'' semble corrompu.
-
-# Exception thrown when a binary code page value is not supported.
-#0 : Unsupported value.
-#1 : DBase 3 file that causes the problem.
-excp.unsupported_codepage=Le code page de la DBase 3, {0}, est ancien et n''a pas de traduction dans un jeu de caractères récent. Ce fichier DBF ''{1}'' ne peut pas être pris en charge.
-
-# Assertion : when this exception occurs, the involved code that produced it is sure to have a bug.
-#0 : Charset that as been asked for and that is wrong.
-#1 : Root cause message.
-assert.wrong_charset_selection=[Problème interne de l''API] : La méthode Database::toCharset(..) a sélectionné un mauvais charset ''{0}'' qui est finalement refusé : {1}.
+# Exception thrown when there is a file descriptor problem.
+#0 : DBase 3 File who causes trouble.
+#1 : Root cause message.
+excp.filedescriptor_problem=Le descripteur du fichier base de données ''{0}'' n''est pas lisible : {1}. Le format de ce DBF semble corrompu.
+
+# Exception thrown when a binary code page value is illegal.
+#0 : Illegal value.
+#1 : DBase 3 file that causes the problem.
+excp.illegal_codepage=La valeur binaire du code page DBase 3, {0}, ne correspond pas à un code page binaire légal. Le fichier DBF ''{1}'' semble corrompu.
+
+# Exception thrown when a binary code page value is not supported.
+#0 : Unsupported value.
+#1 : DBase 3 file that causes the problem.
+excp.unsupported_codepage=Le code page de la DBase 3, {0}, est ancien et n''a pas de traduction dans un jeu de caractères récent. Ce fichier DBF ''{1}'' ne peut pas être pris en charge.
+
+# Assertion : when this exception occurs, the involved code that produced it is sure to have a bug.
+#0 : Charset that as been asked for and that is wrong.
+#1 : Root cause message.
+assert.wrong_charset_selection=[Problème interne de l''API] : La méthode Database::toCharset(..) a sélectionné un mauvais charset ''{0}'' qui est finalement refusé : {1}.

Propchange: sis/branches/JDK8/storage/sis-shapefile/src/main/resources/org/apache/sis/storage/shapefile/Database_fr.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: sis/branches/JDK8/storage/sis-shapefile/src/main/resources/org/apache/sis/storage/shapefile/Database_fr.properties
------------------------------------------------------------------------------
    svn:mime-type = text/plain;charset=ISO-8859-1

Modified: sis/branches/JDK8/storage/sis-shapefile/src/main/resources/org/apache/sis/storage/shapefile/FieldDescriptor.properties
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/storage/sis-shapefile/src/main/resources/org/apache/sis/storage/shapefile/FieldDescriptor.properties?rev=1644556&r1=1644555&r2=1644556&view=diff
==============================================================================
--- sis/branches/JDK8/storage/sis-shapefile/src/main/resources/org/apache/sis/storage/shapefile/FieldDescriptor.properties [iso-8859-1] (original)
+++ sis/branches/JDK8/storage/sis-shapefile/src/main/resources/org/apache/sis/storage/shapefile/FieldDescriptor.properties [ISO-8859-1] Thu Dec 11 05:08:40 2014
@@ -1,7 +1,7 @@
-# toString() representation of a Field descriptor.
-#0 : Field name.
-#1 : Field type.
-# Field Address skipped (address is set in memory; not useful on disk).
-#3 : Field length (Integer).
-#4 : Decimal positions (Integer).
-toString='{'Field name : {0}, Type : {1}, Field length : {2,number,integer}, Decimal positions : {3,number,integer}'}'
+# toString() representation of a Field descriptor.
+#0 : Field name.
+#1 : Field type.
+# Field Address skipped (address is set in memory; not useful on disk).
+#3 : Field length (Integer).
+#4 : Decimal positions (Integer).
+toString='{'Field name : {0}, Type : {1}, Field length : {2,number,integer}, Decimal positions : {3,number,integer}'}'

Propchange: sis/branches/JDK8/storage/sis-shapefile/src/main/resources/org/apache/sis/storage/shapefile/FieldDescriptor.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: sis/branches/JDK8/storage/sis-shapefile/src/main/resources/org/apache/sis/storage/shapefile/FieldDescriptor.properties
------------------------------------------------------------------------------
    svn:mime-type = text/plain;charset=ISO-8859-1

Propchange: sis/branches/JDK8/storage/sis-shapefile/src/main/resources/org/apache/sis/storage/shapefile/FieldDescriptor_fr.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: sis/branches/JDK8/storage/sis-shapefile/src/main/resources/org/apache/sis/storage/shapefile/FieldDescriptor_fr.properties
------------------------------------------------------------------------------
    svn:mime-type = text/plain;charset=ISO-8859-1

Propchange: sis/branches/JDK8/storage/sis-shapefile/src/main/resources/org/apache/sis/storage/shapefile/FieldsDescriptors.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: sis/branches/JDK8/storage/sis-shapefile/src/main/resources/org/apache/sis/storage/shapefile/FieldsDescriptors.properties
------------------------------------------------------------------------------
    svn:mime-type = text/plain;charset=ISO-8859-1

Propchange: sis/branches/JDK8/storage/sis-shapefile/src/main/resources/org/apache/sis/storage/shapefile/FieldsDescriptors_fr.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: sis/branches/JDK8/storage/sis-shapefile/src/main/resources/org/apache/sis/storage/shapefile/FieldsDescriptors_fr.properties
------------------------------------------------------------------------------
    svn:mime-type = text/plain;charset=ISO-8859-1

Modified: sis/branches/JDK8/storage/sis-shapefile/src/test/java/org/apache/sis/internal/shapefile/jdbc/AbstractTestBaseForInternalJDBC.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/storage/sis-shapefile/src/test/java/org/apache/sis/internal/shapefile/jdbc/AbstractTestBaseForInternalJDBC.java?rev=1644556&r1=1644555&r2=1644556&view=diff
==============================================================================
--- sis/branches/JDK8/storage/sis-shapefile/src/test/java/org/apache/sis/internal/shapefile/jdbc/AbstractTestBaseForInternalJDBC.java [iso-8859-1] (original)
+++ sis/branches/JDK8/storage/sis-shapefile/src/test/java/org/apache/sis/internal/shapefile/jdbc/AbstractTestBaseForInternalJDBC.java [UTF-8] Thu Dec 11 05:08:40 2014
@@ -1,51 +1,51 @@
-package org.apache.sis.internal.shapefile.jdbc;
-
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
-import java.io.File;
-import java.net.URISyntaxException;
-import java.net.URL;
-import java.sql.Connection;
-import java.sql.Driver;
-import java.sql.SQLException;
-import java.util.logging.Logger;
-
-import org.apache.sis.storage.shapefile.Database;
-import org.apache.sis.test.TestCase;
-import org.junit.Before;
-
-/**
- * Base class to settle a common environment to all the JDBC tests : 
- * all these tests are currently based on the SignedBikeRoute_4326_clipped.dbf DBase 3 file.
- * @author Marc LE BIHAN
- */
-abstract public class AbstractTestBaseForInternalJDBC extends TestCase {
-    /** Logger. */
-    protected Logger log = Logger.getLogger(getClass().getName());
-    
-    /** The database file to use for testing purpose.  */
-    protected File dbfFile;
-
-    /**
-     * Connect to test database.
-     * @return Connection to database.
-     * @throws SQLException if the connection failed.
-     */
-    public Connection connect() throws SQLException {
-        final Driver driver = new DBFDriver();
-        return driver.connect(dbfFile.getAbsolutePath(), null);        
-    }
-    
-    /**
-     * Test setup.
-     * @throws URISyntaxException If an error occurred while getting the file to the test database.
-     */
-    @Before
-    public void setup() throws URISyntaxException {
-        final URL url = Database.class.getResource("SignedBikeRoute_4326_clipped.dbf");
-        assertNotNull("The database file used for testing doesn't exist.", url);
-        dbfFile = new File(url.toURI());
-        assertTrue(dbfFile.isFile());
-    }
-}
+package org.apache.sis.internal.shapefile.jdbc;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+import java.io.File;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.sql.Connection;
+import java.sql.Driver;
+import java.sql.SQLException;
+import java.util.logging.Logger;
+
+import org.apache.sis.storage.shapefile.Database;
+import org.apache.sis.test.TestCase;
+import org.junit.Before;
+
+/**
+ * Base class to settle a common environment to all the JDBC tests : 
+ * all these tests are currently based on the SignedBikeRoute_4326_clipped.dbf DBase 3 file.
+ * @author Marc LE BIHAN
+ */
+abstract public class AbstractTestBaseForInternalJDBC extends TestCase {
+    /** Logger. */
+    protected Logger log = Logger.getLogger(getClass().getName());
+    
+    /** The database file to use for testing purpose.  */
+    protected File dbfFile;
+
+    /**
+     * Connect to test database.
+     * @return Connection to database.
+     * @throws SQLException if the connection failed.
+     */
+    public Connection connect() throws SQLException {
+        final Driver driver = new DBFDriver();
+        return driver.connect(dbfFile.getAbsolutePath(), null);        
+    }
+    
+    /**
+     * Test setup.
+     * @throws URISyntaxException If an error occurred while getting the file to the test database.
+     */
+    @Before
+    public void setup() throws URISyntaxException {
+        final URL url = Database.class.getResource("SignedBikeRoute_4326_clipped.dbf");
+        assertNotNull("The database file used for testing doesn't exist.", url);
+        dbfFile = new File(url.toURI());
+        assertTrue(dbfFile.isFile());
+    }
+}

Propchange: sis/branches/JDK8/storage/sis-shapefile/src/test/java/org/apache/sis/internal/shapefile/jdbc/AbstractTestBaseForInternalJDBC.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: sis/branches/JDK8/storage/sis-shapefile/src/test/java/org/apache/sis/internal/shapefile/jdbc/AbstractTestBaseForInternalJDBC.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain;charset=UTF-8

Modified: sis/branches/JDK8/storage/sis-shapefile/src/test/java/org/apache/sis/internal/shapefile/jdbc/DBFConnectionTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/storage/sis-shapefile/src/test/java/org/apache/sis/internal/shapefile/jdbc/DBFConnectionTest.java?rev=1644556&r1=1644555&r2=1644556&view=diff
==============================================================================
--- sis/branches/JDK8/storage/sis-shapefile/src/test/java/org/apache/sis/internal/shapefile/jdbc/DBFConnectionTest.java [iso-8859-1] (original)
+++ sis/branches/JDK8/storage/sis-shapefile/src/test/java/org/apache/sis/internal/shapefile/jdbc/DBFConnectionTest.java [UTF-8] Thu Dec 11 05:08:40 2014
@@ -1,72 +1,72 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.sis.internal.shapefile.jdbc;
-
-import java.sql.*;
-
-import org.apache.sis.internal.shapefile.jdbc.connection.DBFConnection;
-import org.apache.sis.test.DependsOnMethod;
-import org.junit.*;
-
-import static org.junit.Assert.*;
-
-
-/**
- * Tests {@link DBFConnection}.
- * @author  Marc Le Bihan
- * @version 0.5
- * @since   0.5
- * @module
- */
-public class DBFConnectionTest extends AbstractTestBaseForInternalJDBC {
-    /**
-     * Open and close a connection.
-     * @throws SQLException if an error occurred while opening the database.
-     */
-    @Test
-    public void openCloseConnection() throws SQLException {
-        final Driver driver = new DBFDriver();
-        final Connection connection = driver.connect(dbfFile.getAbsolutePath(), null);
-        assertFalse("Connection should be opened", connection.isClosed());
-        assertTrue ("Connection should be valid",  connection.isValid(0));
-
-        connection.close();
-        assertTrue ("Connection should be closed", connection.isClosed());
-        assertFalse("Connection should no more be valid", connection.isValid(0));
-    }
-    
-    /**
-     * An attempt to use a closed connection must fail with the correct exception.
-     * @throws SQLException if an error occurred while opening the database.
-     */
-    @Test(expected=SQLConnectionClosedException.class)
-    @DependsOnMethod("openCloseConnection")
-    public void connectionClosed() throws SQLException {
-        // Open and close an connection.
-        final Driver driver = new DBFDriver();
-        final Connection connection = driver.connect(dbfFile.getAbsolutePath(), null);
-        connection.close();
-        
-        // Then, attempt to use it.
-        try {
-            connection.createStatement();
-        } catch(SQLConnectionClosedException e) {
-            assertEquals("The database name in this exception is not well set.", e.getDatabase().getName(), dbfFile.getName());
-            throw e;
-        }
-    }
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.sis.internal.shapefile.jdbc;
+
+import java.sql.*;
+
+import org.apache.sis.internal.shapefile.jdbc.connection.DBFConnection;
+import org.apache.sis.test.DependsOnMethod;
+import org.junit.*;
+
+import static org.junit.Assert.*;
+
+
+/**
+ * Tests {@link DBFConnection}.
+ * @author  Marc Le Bihan
+ * @version 0.5
+ * @since   0.5
+ * @module
+ */
+public class DBFConnectionTest extends AbstractTestBaseForInternalJDBC {
+    /**
+     * Open and close a connection.
+     * @throws SQLException if an error occurred while opening the database.
+     */
+    @Test
+    public void openCloseConnection() throws SQLException {
+        final Driver driver = new DBFDriver();
+        final Connection connection = driver.connect(dbfFile.getAbsolutePath(), null);
+        assertFalse("Connection should be opened", connection.isClosed());
+        assertTrue ("Connection should be valid",  connection.isValid(0));
+
+        connection.close();
+        assertTrue ("Connection should be closed", connection.isClosed());
+        assertFalse("Connection should no more be valid", connection.isValid(0));
+    }
+    
+    /**
+     * An attempt to use a closed connection must fail with the correct exception.
+     * @throws SQLException if an error occurred while opening the database.
+     */
+    @Test(expected=SQLConnectionClosedException.class)
+    @DependsOnMethod("openCloseConnection")
+    public void connectionClosed() throws SQLException {
+        // Open and close an connection.
+        final Driver driver = new DBFDriver();
+        final Connection connection = driver.connect(dbfFile.getAbsolutePath(), null);
+        connection.close();
+        
+        // Then, attempt to use it.
+        try {
+            connection.createStatement();
+        } catch(SQLConnectionClosedException e) {
+            assertEquals("The database name in this exception is not well set.", e.getDatabase().getName(), dbfFile.getName());
+            throw e;
+        }
+    }
+}

Propchange: sis/branches/JDK8/storage/sis-shapefile/src/test/java/org/apache/sis/internal/shapefile/jdbc/DBFConnectionTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: sis/branches/JDK8/storage/sis-shapefile/src/test/java/org/apache/sis/internal/shapefile/jdbc/DBFConnectionTest.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain;charset=UTF-8

Modified: sis/branches/JDK8/storage/sis-shapefile/src/test/java/org/apache/sis/internal/shapefile/jdbc/DBFStatementTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/storage/sis-shapefile/src/test/java/org/apache/sis/internal/shapefile/jdbc/DBFStatementTest.java?rev=1644556&r1=1644555&r2=1644556&view=diff
==============================================================================
--- sis/branches/JDK8/storage/sis-shapefile/src/test/java/org/apache/sis/internal/shapefile/jdbc/DBFStatementTest.java [iso-8859-1] (original)
+++ sis/branches/JDK8/storage/sis-shapefile/src/test/java/org/apache/sis/internal/shapefile/jdbc/DBFStatementTest.java [UTF-8] Thu Dec 11 05:08:40 2014
@@ -1,97 +1,97 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.sis.internal.shapefile.jdbc;
-
-import java.sql.*;
-
-import org.apache.sis.internal.shapefile.jdbc.statement.DBFStatement;
-import org.apache.sis.test.DependsOnMethod;
-import org.junit.*;
-
-import static org.junit.Assert.*;
-
-
-/**
- * Tests {@link DBFStatement}.
- * @author  Marc Le Bihan
- * @version 0.5
- * @since   0.5
- * @module
- */
-public class DBFStatementTest extends AbstractTestBaseForInternalJDBC {
-    /**
-     * Open and close a statement.
-     * @throws SQLException if an error occurred while opening the database or the statement.
-     */
-    @Test
-    public void openCloseStatement() throws SQLException {
-        final Driver driver = new DBFDriver();
-        
-        try(Connection connection = driver.connect(dbfFile.getAbsolutePath(), null)) {
-            final Statement stmt = connection.createStatement();
-            assertFalse("Statement should be opened", stmt.isClosed());
-    
-            stmt.close();
-            assertTrue ("Statement should be closed", stmt.isClosed());
-        }
-    }
-    
-    /**
-     * An attempt to use a closed statement must fail with the correct exception.
-     * @throws SQLException if an error occurred while opening the database or the statement.
-     */
-    @Test
-    @DependsOnMethod("openCloseStatement")
-    public void statementClosed() throws SQLException {
-        // Open a connection, open and close a statement.
-        try(Connection connection = connect()) {
-            final Statement stmt = connection.createStatement();
-            stmt.close();
-            
-            // Then, attempt to use it.
-            try {
-                stmt.executeQuery("Must detect that the statement is closed, and not try to parse this query.");
-            } 
-            catch(SQLConnectionClosedException e) {
-                assertEquals("The database name in this exception is not well set.", e.getDatabase().getName(), dbfFile.getName());
-            } 
-            catch(SQLException e) {
-                fail("Not the expected exception for using a closed statement.");
-            }
-        }
-        
-        // Same, but we close the connection instead.
-        Connection connection = connect();
-        final Statement stmt = connection.createStatement();
-        
-        connection.close(); // At this time, you expect also a warning on the console, telling that you have one statement still opened.
-        
-        // Then, attempt to use it.
-        try {
-            stmt.executeQuery("Must detect that the statement is closed, and not try to parse this query.");
-        } 
-        catch(SQLConnectionClosedException e) {
-            assertEquals("The database name in this exception is not well set.", e.getDatabase().getName(), dbfFile.getName());
-        } 
-        catch(SQLException e) {
-            fail("Not the expected exception for using a closed statement.");
-        }
-        finally {
-            stmt.close();
-        }
-    }
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.sis.internal.shapefile.jdbc;
+
+import java.sql.*;
+
+import org.apache.sis.internal.shapefile.jdbc.statement.DBFStatement;
+import org.apache.sis.test.DependsOnMethod;
+import org.junit.*;
+
+import static org.junit.Assert.*;
+
+
+/**
+ * Tests {@link DBFStatement}.
+ * @author  Marc Le Bihan
+ * @version 0.5
+ * @since   0.5
+ * @module
+ */
+public class DBFStatementTest extends AbstractTestBaseForInternalJDBC {
+    /**
+     * Open and close a statement.
+     * @throws SQLException if an error occurred while opening the database or the statement.
+     */
+    @Test
+    public void openCloseStatement() throws SQLException {
+        final Driver driver = new DBFDriver();
+        
+        try(Connection connection = driver.connect(dbfFile.getAbsolutePath(), null)) {
+            final Statement stmt = connection.createStatement();
+            assertFalse("Statement should be opened", stmt.isClosed());
+    
+            stmt.close();
+            assertTrue ("Statement should be closed", stmt.isClosed());
+        }
+    }
+    
+    /**
+     * An attempt to use a closed statement must fail with the correct exception.
+     * @throws SQLException if an error occurred while opening the database or the statement.
+     */
+    @Test
+    @DependsOnMethod("openCloseStatement")
+    public void statementClosed() throws SQLException {
+        // Open a connection, open and close a statement.
+        try(Connection connection = connect()) {
+            final Statement stmt = connection.createStatement();
+            stmt.close();
+            
+            // Then, attempt to use it.
+            try {
+                stmt.executeQuery("Must detect that the statement is closed, and not try to parse this query.");
+            } 
+            catch(SQLConnectionClosedException e) {
+                assertEquals("The database name in this exception is not well set.", e.getDatabase().getName(), dbfFile.getName());
+            } 
+            catch(SQLException e) {
+                fail("Not the expected exception for using a closed statement.");
+            }
+        }
+        
+        // Same, but we close the connection instead.
+        Connection connection = connect();
+        final Statement stmt = connection.createStatement();
+        
+        connection.close(); // At this time, you expect also a warning on the console, telling that you have one statement still opened.
+        
+        // Then, attempt to use it.
+        try {
+            stmt.executeQuery("Must detect that the statement is closed, and not try to parse this query.");
+        } 
+        catch(SQLConnectionClosedException e) {
+            assertEquals("The database name in this exception is not well set.", e.getDatabase().getName(), dbfFile.getName());
+        } 
+        catch(SQLException e) {
+            fail("Not the expected exception for using a closed statement.");
+        }
+        finally {
+            stmt.close();
+        }
+    }
+}

Propchange: sis/branches/JDK8/storage/sis-shapefile/src/test/java/org/apache/sis/internal/shapefile/jdbc/DBFStatementTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: sis/branches/JDK8/storage/sis-shapefile/src/test/java/org/apache/sis/internal/shapefile/jdbc/DBFStatementTest.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain;charset=UTF-8

Modified: sis/branches/JDK8/storage/sis-shapefile/src/test/java/org/apache/sis/internal/shapefile/jdbc/readme.txt
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/storage/sis-shapefile/src/test/java/org/apache/sis/internal/shapefile/jdbc/readme.txt?rev=1644556&r1=1644555&r2=1644556&view=diff
==============================================================================
--- sis/branches/JDK8/storage/sis-shapefile/src/test/java/org/apache/sis/internal/shapefile/jdbc/readme.txt [iso-8859-1] (original)
+++ sis/branches/JDK8/storage/sis-shapefile/src/test/java/org/apache/sis/internal/shapefile/jdbc/readme.txt [UTF-8] Thu Dec 11 05:08:40 2014
@@ -1,58 +1,58 @@
-The SignedBikeRoute_4326_clipped.dbf used for testing in this package has this description :
-
-Field name : OBJECTID, Type : Number, Field length : 10, Decimal positions : 0
-Field name : FNODE_, Type : Number, Field length : 10, Decimal positions : 0
-Field name : TNODE_, Type : Number, Field length : 10, Decimal positions : 0
-Field name : LPOLY_, Type : Number, Field length : 10, Decimal positions : 0
-Field name : RPOLY_, Type : Number, Field length : 10, Decimal positions : 0
-Field name : SCL_, Type : Number, Field length : 10, Decimal positions : 0
-Field name : SCL_ID, Type : Number, Field length : 10, Decimal positions : 0
-Field name : SCL_CODE, Type : Number, Field length : 10, Decimal positions : 0
-Field name : DXF_LAYER, Type : Character, Field length : 16, Decimal positions : 0
-Field name : SIS_ID, Type : Character, Field length : 12, Decimal positions : 0
-Field name : QUAD_CODE, Type : Character, Field length : 1, Decimal positions : 0
-Field name : PRIME_ST, Type : Character, Field length : 4, Decimal positions : 0
-Field name : INT_SEQ, Type : Character, Field length : 3, Decimal positions : 0
-Field name : ST_NAME, Type : Character, Field length : 29, Decimal positions : 0
-Field name : FDPRE, Type : Character, Field length : 2, Decimal positions : 0
-Field name : FNAME, Type : Character, Field length : 30, Decimal positions : 0
-Field name : FTYPE, Type : Character, Field length : 4, Decimal positions : 0
-Field name : FDSUF, Type : Character, Field length : 2, Decimal positions : 0
-Field name : LEFTRANGE1, Type : Number, Field length : 10, Decimal positions : 0
-Field name : LEFTRANGE2, Type : Number, Field length : 10, Decimal positions : 0
-Field name : RGTRANGE1, Type : Number, Field length : 10, Decimal positions : 0
-Field name : RGTRANGE2, Type : Number, Field length : 10, Decimal positions : 0
-Field name : STREET, Type : Character, Field length : 26, Decimal positions : 0
-Field name : QUAD, Type : Character, Field length : 2, Decimal positions : 0
-Field name : FROM_ST, Type : Character, Field length : 100, Decimal positions : 0
-Field name : TO_ST, Type : Character, Field length : 100, Decimal positions : 0
-Field name : ODD_WARD, Type : Character, Field length : 1, Decimal positions : 0
-Field name : EVEN_WARD, Type : Character, Field length : 1, Decimal positions : 0
-Field name : WARD, Type : Character, Field length : 3, Decimal positions : 0
-Field name : FC, Type : Character, Field length : 40, Decimal positions : 0
-Field name : NHS, Type : Number, Field length : 5, Decimal positions : 0
-Field name : SIGNEDRTE1, Type : Character, Field length : 5, Decimal positions : 0
-Field name : RTETYPE1, Type : Character, Field length : 10, Decimal positions : 0
-Field name : SIGNEDRTE2, Type : Character, Field length : 5, Decimal positions : 0
-Field name : RTETYPE2, Type : Character, Field length : 10, Decimal positions : 0
-Field name : AADT, Type : Number, Field length : 19, Decimal positions : 8
-Field name : AADT_YEAR, Type : Number, Field length : 19, Decimal positions : 8
-Field name : COM_SING_P, Type : Number, Field length : 19, Decimal positions : 8
-Field name : COM_SING_A, Type : Number, Field length : 19, Decimal positions : 8
-Field name : COM_COMB_P, Type : Number, Field length : 19, Decimal positions : 8
-Field name : COM_COMB_A, Type : Number, Field length : 19, Decimal positions : 8
-Field name : IS_ONEWAY, Type : Number, Field length : 5, Decimal positions : 0
-Field name : TRAVEL_DIR, Type : Character, Field length : 20, Decimal positions : 0
-Field name : LEN_MI, Type : Number, Field length : 19, Decimal positions : 8
-Field name : STUDY_NET, Type : Number, Field length : 10, Decimal positions : 0
-Field name : TR_DATE, Type : Date, Field length : 8, Decimal positions : 0
-Field name : AADT_2, Type : Number, Field length : 19, Decimal positions : 8
-Field name : AADT_FINAL, Type : Number, Field length : 19, Decimal positions : 8
-Field name : ROUTENET, Type : Number, Field length : 19, Decimal positions : 8
-Field name : NOTES, Type : Character, Field length : 50, Decimal positions : 0
-Field name : LENGTH_MI, Type : Number, Field length : 19, Decimal positions : 8
-Field name : NET_MARCH, Type : Number, Field length : 5, Decimal positions : 0
-Field name : SIGNED_JOI, Type : Character, Field length : 5, Decimal positions : 0
-Field name : SIGNED_FAC, Type : Character, Field length : 30, Decimal positions : 0
-Field name : NEW_USE, Type : Character, Field length : 30, Decimal positions : 0
-Field name : SHAPE_LEN, Type : Number, Field length : 19, Decimal positions : 11
+The SignedBikeRoute_4326_clipped.dbf used for testing in this package has this description :
+
+Field name : OBJECTID, Type : Number, Field length : 10, Decimal positions : 0
+Field name : FNODE_, Type : Number, Field length : 10, Decimal positions : 0
+Field name : TNODE_, Type : Number, Field length : 10, Decimal positions : 0
+Field name : LPOLY_, Type : Number, Field length : 10, Decimal positions : 0
+Field name : RPOLY_, Type : Number, Field length : 10, Decimal positions : 0
+Field name : SCL_, Type : Number, Field length : 10, Decimal positions : 0
+Field name : SCL_ID, Type : Number, Field length : 10, Decimal positions : 0
+Field name : SCL_CODE, Type : Number, Field length : 10, Decimal positions : 0
+Field name : DXF_LAYER, Type : Character, Field length : 16, Decimal positions : 0
+Field name : SIS_ID, Type : Character, Field length : 12, Decimal positions : 0
+Field name : QUAD_CODE, Type : Character, Field length : 1, Decimal positions : 0
+Field name : PRIME_ST, Type : Character, Field length : 4, Decimal positions : 0
+Field name : INT_SEQ, Type : Character, Field length : 3, Decimal positions : 0
+Field name : ST_NAME, Type : Character, Field length : 29, Decimal positions : 0
+Field name : FDPRE, Type : Character, Field length : 2, Decimal positions : 0
+Field name : FNAME, Type : Character, Field length : 30, Decimal positions : 0
+Field name : FTYPE, Type : Character, Field length : 4, Decimal positions : 0
+Field name : FDSUF, Type : Character, Field length : 2, Decimal positions : 0
+Field name : LEFTRANGE1, Type : Number, Field length : 10, Decimal positions : 0
+Field name : LEFTRANGE2, Type : Number, Field length : 10, Decimal positions : 0
+Field name : RGTRANGE1, Type : Number, Field length : 10, Decimal positions : 0
+Field name : RGTRANGE2, Type : Number, Field length : 10, Decimal positions : 0
+Field name : STREET, Type : Character, Field length : 26, Decimal positions : 0
+Field name : QUAD, Type : Character, Field length : 2, Decimal positions : 0
+Field name : FROM_ST, Type : Character, Field length : 100, Decimal positions : 0
+Field name : TO_ST, Type : Character, Field length : 100, Decimal positions : 0
+Field name : ODD_WARD, Type : Character, Field length : 1, Decimal positions : 0
+Field name : EVEN_WARD, Type : Character, Field length : 1, Decimal positions : 0
+Field name : WARD, Type : Character, Field length : 3, Decimal positions : 0
+Field name : FC, Type : Character, Field length : 40, Decimal positions : 0
+Field name : NHS, Type : Number, Field length : 5, Decimal positions : 0
+Field name : SIGNEDRTE1, Type : Character, Field length : 5, Decimal positions : 0
+Field name : RTETYPE1, Type : Character, Field length : 10, Decimal positions : 0
+Field name : SIGNEDRTE2, Type : Character, Field length : 5, Decimal positions : 0
+Field name : RTETYPE2, Type : Character, Field length : 10, Decimal positions : 0
+Field name : AADT, Type : Number, Field length : 19, Decimal positions : 8
+Field name : AADT_YEAR, Type : Number, Field length : 19, Decimal positions : 8
+Field name : COM_SING_P, Type : Number, Field length : 19, Decimal positions : 8
+Field name : COM_SING_A, Type : Number, Field length : 19, Decimal positions : 8
+Field name : COM_COMB_P, Type : Number, Field length : 19, Decimal positions : 8
+Field name : COM_COMB_A, Type : Number, Field length : 19, Decimal positions : 8
+Field name : IS_ONEWAY, Type : Number, Field length : 5, Decimal positions : 0
+Field name : TRAVEL_DIR, Type : Character, Field length : 20, Decimal positions : 0
+Field name : LEN_MI, Type : Number, Field length : 19, Decimal positions : 8
+Field name : STUDY_NET, Type : Number, Field length : 10, Decimal positions : 0
+Field name : TR_DATE, Type : Date, Field length : 8, Decimal positions : 0
+Field name : AADT_2, Type : Number, Field length : 19, Decimal positions : 8
+Field name : AADT_FINAL, Type : Number, Field length : 19, Decimal positions : 8
+Field name : ROUTENET, Type : Number, Field length : 19, Decimal positions : 8
+Field name : NOTES, Type : Character, Field length : 50, Decimal positions : 0
+Field name : LENGTH_MI, Type : Number, Field length : 19, Decimal positions : 8
+Field name : NET_MARCH, Type : Number, Field length : 5, Decimal positions : 0
+Field name : SIGNED_JOI, Type : Character, Field length : 5, Decimal positions : 0
+Field name : SIGNED_FAC, Type : Character, Field length : 30, Decimal positions : 0
+Field name : NEW_USE, Type : Character, Field length : 30, Decimal positions : 0
+Field name : SHAPE_LEN, Type : Number, Field length : 19, Decimal positions : 11

Propchange: sis/branches/JDK8/storage/sis-shapefile/src/test/java/org/apache/sis/internal/shapefile/jdbc/readme.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: sis/branches/JDK8/storage/sis-shapefile/src/test/java/org/apache/sis/internal/shapefile/jdbc/readme.txt
------------------------------------------------------------------------------
    svn:mime-type = text/plain;charset=UTF-8

Modified: sis/branches/JDK8/storage/sis-shapefile/src/test/java/org/apache/sis/internal/shapefile/jdbc/sql/WhereClauseTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/storage/sis-shapefile/src/test/java/org/apache/sis/internal/shapefile/jdbc/sql/WhereClauseTest.java?rev=1644556&r1=1644555&r2=1644556&view=diff
==============================================================================
--- sis/branches/JDK8/storage/sis-shapefile/src/test/java/org/apache/sis/internal/shapefile/jdbc/sql/WhereClauseTest.java [iso-8859-1] (original)
+++ sis/branches/JDK8/storage/sis-shapefile/src/test/java/org/apache/sis/internal/shapefile/jdbc/sql/WhereClauseTest.java [UTF-8] Thu Dec 11 05:08:40 2014
@@ -1,124 +1,124 @@
-package org.apache.sis.internal.shapefile.jdbc.sql;
-
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.assertEquals;
-
-import java.sql.*;
-
-import org.apache.sis.internal.shapefile.jdbc.AbstractTestBaseForInternalJDBC;
-import org.apache.sis.internal.shapefile.jdbc.resultset.DBFRecordBasedResultSet;
-import org.junit.Test;
-
-/**
- * Testing of the WHERE clause in SQL Statements.
- */
-public class WhereClauseTest extends AbstractTestBaseForInternalJDBC {
-    /**
-     * Test operators.
-     * @throws SQLException if a trouble occurs : all tests shall pass.
-     */
-    @Test
-    public void operators() throws SQLException {
-        try(Connection connection = connect(); Statement stmt = connection.createStatement(); DBFRecordBasedResultSet rs = (DBFRecordBasedResultSet)stmt.executeQuery("SELECT * FROM SignedBikeRoute")) {
-            rs.next();
-            
-            assertTrue("FNODE_ = 1199", new ConditionalClauseResolver("FNODE_", 1199L, "=").isVerified(rs));
-            assertFalse("FNODE_ > 1199", new ConditionalClauseResolver("FNODE_", 1199L, ">").isVerified(rs));
-            assertFalse("FNODE_ < 1199", new ConditionalClauseResolver("FNODE_", 1199L, "<").isVerified(rs));
-            assertTrue("FNODE_ >= 1199", new ConditionalClauseResolver("FNODE_", 1199L, ">=").isVerified(rs));
-            assertTrue("FNODE_ <= 1199", new ConditionalClauseResolver("FNODE_", 1199L, "<=").isVerified(rs));
-            
-            assertTrue("FNODE_ > 1198", new ConditionalClauseResolver("FNODE_", 1198L, ">").isVerified(rs));
-            assertFalse("FNODE_ < 1198", new ConditionalClauseResolver("FNODE_", 1198L, "<").isVerified(rs));
-            assertTrue("FNODE_ >= 1198", new ConditionalClauseResolver("FNODE_", 1198L, ">=").isVerified(rs));
-            assertFalse("FNODE_ <= 1198", new ConditionalClauseResolver("FNODE_", 1198L, "<=").isVerified(rs));
-            
-            assertFalse("FNODE_ > 1200", new ConditionalClauseResolver("FNODE_", 1200L, ">").isVerified(rs));
-            assertTrue("FNODE_ < 1200", new ConditionalClauseResolver("FNODE_", 1200L, "<").isVerified(rs));
-            assertFalse("FNODE_ >= 1200", new ConditionalClauseResolver("FNODE_", 1200L, ">=").isVerified(rs));
-            assertTrue("FNODE_ <= 1200", new ConditionalClauseResolver("FNODE_", 1200L, "<=").isVerified(rs));
-            
-            assertTrue("ST_NAME = '36TH ST'", new ConditionalClauseResolver("ST_NAME", "'36TH ST'", "=").isVerified(rs));
-            
-            assertTrue("SHAPE_LEN = 43.0881492571", new ConditionalClauseResolver("SHAPE_LEN", 43.0881492571, "=").isVerified(rs));
-            assertTrue("SHAPE_LEN > 43.088", new ConditionalClauseResolver("SHAPE_LEN", 43.088, ">").isVerified(rs));
-            assertFalse("SHAPE_LEN < 43.0881492571", new ConditionalClauseResolver("SHAPE_LEN", 43.0881492571, "<").isVerified(rs));
-        }
-    }
-    
-    /**
-     * Test where conditions : field [operator] integer.
-     * @throws SQLException if a trouble occurs : all tests shall pass.
-     */
-    @Test
-    public void whereCondition_field_literal_int() throws SQLException {
-        checkAndCount("FNODE_ < 2000", rs -> rs.getInt("FNODE_") < 2000, 3);
-    }
-    
-    /**
-     * Test where conditions : field [operator] integer.
-     * @throws SQLException if a trouble occurs : all tests shall pass.
-     */
-    @Test
-    public void whereCondition_field_literal_double() throws SQLException {
-        checkAndCount("SHAPE_LEN < 70.5", rs -> rs.getDouble("SHAPE_LEN") < 70.5, 3);
-    }
-
-    /**
-     * Test where conditions : field [operator] String value.
-     * @throws SQLException if a trouble occurs : all tests shall pass.
-     */
-    @Test
-    public void whereCondition_field_literal_string() throws SQLException {
-        checkAndCount("FNAME = '36TH'", rs -> rs.getString("FNAME").equals("36TH"), 1);
-    }
-
-    /**
-     * Test where conditions : field [operator] field.
-     * @throws SQLException if a trouble occurs : all tests shall pass.
-     */
-    @Test
-    public void whereCondition_field_field() throws SQLException {
-        checkAndCount("FNODE_ < TNODE_", rs -> rs.getInt("FNODE_") < rs.getInt("TNODE_"), 1);
-    }
-    
-    /** 
-     * Trick suggested by AdiGuba (Forum des développeurs) to avoid the exception thrown by ResultSet:getInt(), 
-     * unhandlable by a simple Predicate.
-     * @param <T> Type used. 
-     */ 
-    @FunctionalInterface
-    public interface ResultSetPredicate<T> {
-        /**
-         * Test a condition.
-         * @param condition Condition.
-         * @return true is the condition passed.
-         * @throws SQLException if a trouble occurs.
-         */
-        boolean test(T condition) throws SQLException;
-    }
-    
-    /**
-     * Check that all records match the conditions and count them.
-     * @param whereCondition The where condition to add to a "SELECT * FROM SignedBikeRoute WHERE " statement.
-     * @param condition Condition.
-     * @param countExpected Count Expected, -1 if you don't want to count them.
-     * @throws SQLException if a trouble occurs : all tests shall pass.
-     */
-    private void checkAndCount(String whereCondition, ResultSetPredicate<ResultSet> condition, int countExpected) throws SQLException {
-        String sql = "SELECT * FROM SignedBikeRoute WHERE " + whereCondition;
-        
-        try(Connection connection = connect(); Statement stmt = connection.createStatement(); ResultSet rs = stmt.executeQuery(sql)) {
-            int count = 0;
-            
-            while(rs.next()) {
-                count ++;
-                assertTrue(sql, condition.test(rs));
-            }
-            
-            if (countExpected != -1)
-                assertEquals("Wrong number of records red by : " + sql, countExpected, count);
-        }
-    }
-}
+package org.apache.sis.internal.shapefile.jdbc.sql;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertEquals;
+
+import java.sql.*;
+
+import org.apache.sis.internal.shapefile.jdbc.AbstractTestBaseForInternalJDBC;
+import org.apache.sis.internal.shapefile.jdbc.resultset.DBFRecordBasedResultSet;
+import org.junit.Test;
+
+/**
+ * Testing of the WHERE clause in SQL Statements.
+ */
+public class WhereClauseTest extends AbstractTestBaseForInternalJDBC {
+    /**
+     * Test operators.
+     * @throws SQLException if a trouble occurs : all tests shall pass.
+     */
+    @Test
+    public void operators() throws SQLException {
+        try(Connection connection = connect(); Statement stmt = connection.createStatement(); DBFRecordBasedResultSet rs = (DBFRecordBasedResultSet)stmt.executeQuery("SELECT * FROM SignedBikeRoute")) {
+            rs.next();
+            
+            assertTrue("FNODE_ = 1199", new ConditionalClauseResolver("FNODE_", 1199L, "=").isVerified(rs));
+            assertFalse("FNODE_ > 1199", new ConditionalClauseResolver("FNODE_", 1199L, ">").isVerified(rs));
+            assertFalse("FNODE_ < 1199", new ConditionalClauseResolver("FNODE_", 1199L, "<").isVerified(rs));
+            assertTrue("FNODE_ >= 1199", new ConditionalClauseResolver("FNODE_", 1199L, ">=").isVerified(rs));
+            assertTrue("FNODE_ <= 1199", new ConditionalClauseResolver("FNODE_", 1199L, "<=").isVerified(rs));
+            
+            assertTrue("FNODE_ > 1198", new ConditionalClauseResolver("FNODE_", 1198L, ">").isVerified(rs));
+            assertFalse("FNODE_ < 1198", new ConditionalClauseResolver("FNODE_", 1198L, "<").isVerified(rs));
+            assertTrue("FNODE_ >= 1198", new ConditionalClauseResolver("FNODE_", 1198L, ">=").isVerified(rs));
+            assertFalse("FNODE_ <= 1198", new ConditionalClauseResolver("FNODE_", 1198L, "<=").isVerified(rs));
+            
+            assertFalse("FNODE_ > 1200", new ConditionalClauseResolver("FNODE_", 1200L, ">").isVerified(rs));
+            assertTrue("FNODE_ < 1200", new ConditionalClauseResolver("FNODE_", 1200L, "<").isVerified(rs));
+            assertFalse("FNODE_ >= 1200", new ConditionalClauseResolver("FNODE_", 1200L, ">=").isVerified(rs));
+            assertTrue("FNODE_ <= 1200", new ConditionalClauseResolver("FNODE_", 1200L, "<=").isVerified(rs));
+            
+            assertTrue("ST_NAME = '36TH ST'", new ConditionalClauseResolver("ST_NAME", "'36TH ST'", "=").isVerified(rs));
+            
+            assertTrue("SHAPE_LEN = 43.0881492571", new ConditionalClauseResolver("SHAPE_LEN", 43.0881492571, "=").isVerified(rs));
+            assertTrue("SHAPE_LEN > 43.088", new ConditionalClauseResolver("SHAPE_LEN", 43.088, ">").isVerified(rs));
+            assertFalse("SHAPE_LEN < 43.0881492571", new ConditionalClauseResolver("SHAPE_LEN", 43.0881492571, "<").isVerified(rs));
+        }
+    }
+    
+    /**
+     * Test where conditions : field [operator] integer.
+     * @throws SQLException if a trouble occurs : all tests shall pass.
+     */
+    @Test
+    public void whereCondition_field_literal_int() throws SQLException {
+        checkAndCount("FNODE_ < 2000", rs -> rs.getInt("FNODE_") < 2000, 3);
+    }
+    
+    /**
+     * Test where conditions : field [operator] integer.
+     * @throws SQLException if a trouble occurs : all tests shall pass.
+     */
+    @Test
+    public void whereCondition_field_literal_double() throws SQLException {
+        checkAndCount("SHAPE_LEN < 70.5", rs -> rs.getDouble("SHAPE_LEN") < 70.5, 3);
+    }
+
+    /**
+     * Test where conditions : field [operator] String value.
+     * @throws SQLException if a trouble occurs : all tests shall pass.
+     */
+    @Test
+    public void whereCondition_field_literal_string() throws SQLException {
+        checkAndCount("FNAME = '36TH'", rs -> rs.getString("FNAME").equals("36TH"), 1);
+    }
+
+    /**
+     * Test where conditions : field [operator] field.
+     * @throws SQLException if a trouble occurs : all tests shall pass.
+     */
+    @Test
+    public void whereCondition_field_field() throws SQLException {
+        checkAndCount("FNODE_ < TNODE_", rs -> rs.getInt("FNODE_") < rs.getInt("TNODE_"), 1);
+    }
+    
+    /** 
+     * Trick suggested by AdiGuba (Forum des développeurs) to avoid the exception thrown by ResultSet:getInt(), 
+     * unhandlable by a simple Predicate.
+     * @param <T> Type used. 
+     */ 
+    @FunctionalInterface
+    public interface ResultSetPredicate<T> {
+        /**
+         * Test a condition.
+         * @param condition Condition.
+         * @return true is the condition passed.
+         * @throws SQLException if a trouble occurs.
+         */
+        boolean test(T condition) throws SQLException;
+    }
+    
+    /**
+     * Check that all records match the conditions and count them.
+     * @param whereCondition The where condition to add to a "SELECT * FROM SignedBikeRoute WHERE " statement.
+     * @param condition Condition.
+     * @param countExpected Count Expected, -1 if you don't want to count them.
+     * @throws SQLException if a trouble occurs : all tests shall pass.
+     */
+    private void checkAndCount(String whereCondition, ResultSetPredicate<ResultSet> condition, int countExpected) throws SQLException {
+        String sql = "SELECT * FROM SignedBikeRoute WHERE " + whereCondition;
+        
+        try(Connection connection = connect(); Statement stmt = connection.createStatement(); ResultSet rs = stmt.executeQuery(sql)) {
+            int count = 0;
+            
+            while(rs.next()) {
+                count ++;
+                assertTrue(sql, condition.test(rs));
+            }
+            
+            if (countExpected != -1)
+                assertEquals("Wrong number of records red by : " + sql, countExpected, count);
+        }
+    }
+}

Propchange: sis/branches/JDK8/storage/sis-shapefile/src/test/java/org/apache/sis/internal/shapefile/jdbc/sql/WhereClauseTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: sis/branches/JDK8/storage/sis-shapefile/src/test/java/org/apache/sis/internal/shapefile/jdbc/sql/WhereClauseTest.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain;charset=UTF-8



Mime
View raw message