sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject svn commit: r1644556 [9/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/java/org/apache/sis/internal/shapefile/jdbc/statement/AbstractStatement.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/statement/AbstractStatement.java?rev=1644556&r1=1644555&r2=1644556&view=diff
==============================================================================
--- sis/branches/JDK8/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/statement/AbstractStatement.java [iso-8859-1] (original)
+++ sis/branches/JDK8/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/statement/AbstractStatement.java [UTF-8] Thu Dec 11 05:08:40 2014
@@ -1,308 +1,308 @@
-/*
- * 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.statement;
-
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Statement;
-
-import org.apache.sis.internal.shapefile.jdbc.AbstractJDBC;
-
-
-/**
- * This base class holds most of the unimplemented feature of a {@code Statement}.
- * This is used in order to avoid having a Statement implementation of thousand lines and unreadable.
- *
- * <table class="sis">
- *   <caption>Connection default values</caption>
- *   <tr><th>Property</th>                           <th>Value</th></tr>
- *   <tr><td>{@link #getResultSetType()}</td>        <td>{@link ResultSet#TYPE_SCROLL_SENSITIVE}</td></tr>
- *   <tr><td>{@link #getResultSetConcurrency()}</td> <td>{@link ResultSet#CONCUR_READ_ONLY}</td></tr>
- *   <tr><td>{@link #getResultSetHoldability()}</td> <td>{@link ResultSet#CLOSE_CURSORS_AT_COMMIT}</td></tr>
- *   <tr><td>{@link #getFetchDirection()}</td>       <td>{@link ResultSet#FETCH_FORWARD}</td></tr>
- *   <tr><td>{@link #getQueryTimeout()}</td>         <td>0</td></tr>
- *   <tr><td>{@link #isPoolable()}</td>              <td>{@code false}</td></tr>
- *   <tr><td>{@link #setPoolable(boolean)}</td>      <td>Ignored</td></tr>
- *   <tr><td>{@link #getWarnings()}</td>             <td>{@code null}</td></tr>
- *   <tr><td>{@link #clearWarnings()}</td>           <td>Ignored</td></tr>
- * </table>
- *
- * @author  Marc Le Bihan
- * @author  Martin Desruisseaux (Geomatys)
- * @version 0.5
- * @since   0.5
- * @module
- */
-@SuppressWarnings("unused")
-abstract class AbstractStatement extends AbstractJDBC implements Statement {
-    /**
-     * Constructs a new {@code Statement} instance.
-     */
-    AbstractStatement() {
-    }
-
-    /**
-     * Default to {@link ResultSet#TYPE_SCROLL_SENSITIVE}, meaning that a change in the underlying
-     * database may affect the result set.
-     */
-    @Override
-    public int getResultSetType() throws SQLException {
-        return ResultSet.TYPE_SCROLL_SENSITIVE;
-    }
-
-    /**
-     * Default to {@link ResultSet#CONCUR_READ_ONLY}, which is a conservative vale meaning
-     * that the underlying database should not be updated while we iterate in a result set.
-     */
-    @Override
-    public int getResultSetConcurrency() throws SQLException {
-        return ResultSet.CONCUR_READ_ONLY;
-    }
-
-    /**
-     * Defaults to {@link ResultSet#CLOSE_CURSORS_AT_COMMIT}, which seems the most conservative option.
-     */
-    @Override
-    public int getResultSetHoldability() throws SQLException {
-        return ResultSet.CLOSE_CURSORS_AT_COMMIT;
-    }
-
-    /**
-     * Unsupported by default.
-     */
-    @Override
-    public int getMaxFieldSize() throws SQLException {
-        throw unsupportedOperation("getMaxFieldSize");
-    }
-
-    /**
-     * Unsupported by default.
-     */
-    @Override
-    public void setMaxFieldSize(int max) throws SQLException {
-        throw unsupportedOperation("setMaxFieldSize");
-    }
-
-    /**
-     * Unsupported by default.
-     */
-    @Override
-    public int getFetchSize() throws SQLException {
-        throw unsupportedOperation("getFetchSize");
-    }
-
-    /**
-     * Unsupported by default.
-     */
-    @Override
-    public void setFetchSize(int rows) throws SQLException {
-        throw unsupportedOperation("setFetchSize");
-    }
-
-    /**
-     * Defaults to {@link ResultSet#FETCH_FORWARD}.
-     */
-    @Override
-    public int getFetchDirection() throws SQLException {
-        return ResultSet.FETCH_FORWARD;
-    }
-
-    /**
-     * Unsupported by default.
-     */
-    @Override
-    public void setFetchDirection(int direction) throws SQLException {
-        if (direction != ResultSet.FETCH_FORWARD) {
-            throw unsupportedOperation("setFetchDirection");
-        }
-    }
-
-    /**
-     * Defaults to 0, meaning to limit.
-     */
-    @Override
-    public int getQueryTimeout() throws SQLException {
-        return 0;
-    }
-
-    /**
-     * Unsupported by default.
-     */
-    @Override
-    public void setQueryTimeout(int seconds) throws SQLException {
-        throw unsupportedOperation("setQueryTimeout");
-    }
-
-    /**
-     * Unsupported by default.
-     */
-    @Override
-    public void setEscapeProcessing(boolean enable) throws SQLException {
-        throw unsupportedOperation("setEscapeProcessing");
-    }
-
-    /**
-     * Unsupported by default.
-     */
-    @Override
-    public void setCursorName(String name) throws SQLException {
-        throw unsupportedOperation("setCursorName");
-    }
-
-    /**
-     * Unsupported by default.
-     */
-    @Override
-    public boolean execute(String sql, int autoGeneratedKeys) throws SQLException {
-        throw unsupportedOperation("execute with autoGeneratedKeys");
-    }
-
-    /**
-     * Unsupported by default.
-     */
-    @Override
-    public boolean execute(String sql, int[] columnIndexes) throws SQLException {
-        throw unsupportedOperation("execute with columnIndexes");
-    }
-
-    /**
-     * Unsupported by default.
-     */
-    @Override
-    public boolean execute(String sql, String[] columnNames) throws SQLException {
-        throw unsupportedOperation("execute with columnNames");
-    }
-
-    /**
-     * Unsupported by default.
-     */
-    @Override
-    public int executeUpdate(String sql) throws SQLException {
-        throw unsupportedOperation("executeUpdate");
-    }
-
-    /**
-     * Unsupported by default.
-     */
-    @Override
-    public int executeUpdate(String sql, int autoGeneratedKeys) throws SQLException {
-        throw unsupportedOperation("executeUpdate");
-    }
-
-    /**
-     * Unsupported by default.
-     */
-    @Override
-    public int executeUpdate(String sql, int[] columnIndexes) throws SQLException {
-        throw unsupportedOperation("executeUpdate");
-    }
-
-    /**
-     * Unsupported by default.
-     */
-    @Override
-    public int executeUpdate(String sql, String[] columnNames) throws SQLException {
-        throw unsupportedOperation("executeUpdate");
-    }
-
-    /**
-     * Unsupported by default.
-     */
-    @Override
-    public void addBatch(String sql) throws SQLException {
-        throw unsupportedOperation("addBatch");
-    }
-
-    /**
-     * Unsupported by default.
-     */
-    @Override
-    public void clearBatch() throws SQLException {
-        throw unsupportedOperation("clearBatch");
-    }
-
-    /**
-     * Unsupported by default.
-     */
-    @Override
-    public int[] executeBatch() throws SQLException {
-        throw unsupportedOperation("executeBatch");
-    }
-
-    /**
-     * Unsupported by default.
-     */
-    @Override
-    public boolean getMoreResults() throws SQLException {
-        throw unsupportedOperation("getMoreResults");
-    }
-
-    /**
-     * Unsupported by default.
-     */
-    @Override
-    public boolean getMoreResults(int current) throws SQLException {
-        throw unsupportedOperation("getMoreResults");
-    }
-
-    /**
-     * Unsupported by default.
-     */
-    @Override
-    public ResultSet getGeneratedKeys() throws SQLException {
-        throw unsupportedOperation("getGeneratedKeys");
-    }
-
-    /**
-     * Defaults to {@code false} since simple statement imlementations are not poolable.
-     */
-    @Override
-    public boolean isPoolable() throws SQLException {
-        return false;
-    }
-
-    /**
-     * Ignored by default since this method is only a hint.
-     */
-    @Override
-    public void setPoolable(boolean poolable) throws SQLException {
-    }
-
-    /**
-     * Unsupported by default.
-     */
-    @Override
-    public void cancel() throws SQLException {
-        throw unsupportedOperation("cancel");
-    }
-
-    /**
-     * Unsupported by default.
-     */
-    @Override
-    public void closeOnCompletion() throws SQLException {
-        throw unsupportedOperation("closeOnCompletion");
-    }
-
-    /**
-     * Unsupported by default.
-     */
-    @Override
-    public boolean isCloseOnCompletion() throws SQLException {
-        throw unsupportedOperation("isCloseOnCompletion");
-    }
-}
+/*
+ * 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.statement;
+
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+
+import org.apache.sis.internal.shapefile.jdbc.AbstractJDBC;
+
+
+/**
+ * This base class holds most of the unimplemented feature of a {@code Statement}.
+ * This is used in order to avoid having a Statement implementation of thousand lines and unreadable.
+ *
+ * <table class="sis">
+ *   <caption>Connection default values</caption>
+ *   <tr><th>Property</th>                           <th>Value</th></tr>
+ *   <tr><td>{@link #getResultSetType()}</td>        <td>{@link ResultSet#TYPE_SCROLL_SENSITIVE}</td></tr>
+ *   <tr><td>{@link #getResultSetConcurrency()}</td> <td>{@link ResultSet#CONCUR_READ_ONLY}</td></tr>
+ *   <tr><td>{@link #getResultSetHoldability()}</td> <td>{@link ResultSet#CLOSE_CURSORS_AT_COMMIT}</td></tr>
+ *   <tr><td>{@link #getFetchDirection()}</td>       <td>{@link ResultSet#FETCH_FORWARD}</td></tr>
+ *   <tr><td>{@link #getQueryTimeout()}</td>         <td>0</td></tr>
+ *   <tr><td>{@link #isPoolable()}</td>              <td>{@code false}</td></tr>
+ *   <tr><td>{@link #setPoolable(boolean)}</td>      <td>Ignored</td></tr>
+ *   <tr><td>{@link #getWarnings()}</td>             <td>{@code null}</td></tr>
+ *   <tr><td>{@link #clearWarnings()}</td>           <td>Ignored</td></tr>
+ * </table>
+ *
+ * @author  Marc Le Bihan
+ * @author  Martin Desruisseaux (Geomatys)
+ * @version 0.5
+ * @since   0.5
+ * @module
+ */
+@SuppressWarnings("unused")
+abstract class AbstractStatement extends AbstractJDBC implements Statement {
+    /**
+     * Constructs a new {@code Statement} instance.
+     */
+    AbstractStatement() {
+    }
+
+    /**
+     * Default to {@link ResultSet#TYPE_SCROLL_SENSITIVE}, meaning that a change in the underlying
+     * database may affect the result set.
+     */
+    @Override
+    public int getResultSetType() throws SQLException {
+        return ResultSet.TYPE_SCROLL_SENSITIVE;
+    }
+
+    /**
+     * Default to {@link ResultSet#CONCUR_READ_ONLY}, which is a conservative vale meaning
+     * that the underlying database should not be updated while we iterate in a result set.
+     */
+    @Override
+    public int getResultSetConcurrency() throws SQLException {
+        return ResultSet.CONCUR_READ_ONLY;
+    }
+
+    /**
+     * Defaults to {@link ResultSet#CLOSE_CURSORS_AT_COMMIT}, which seems the most conservative option.
+     */
+    @Override
+    public int getResultSetHoldability() throws SQLException {
+        return ResultSet.CLOSE_CURSORS_AT_COMMIT;
+    }
+
+    /**
+     * Unsupported by default.
+     */
+    @Override
+    public int getMaxFieldSize() throws SQLException {
+        throw unsupportedOperation("getMaxFieldSize");
+    }
+
+    /**
+     * Unsupported by default.
+     */
+    @Override
+    public void setMaxFieldSize(int max) throws SQLException {
+        throw unsupportedOperation("setMaxFieldSize");
+    }
+
+    /**
+     * Unsupported by default.
+     */
+    @Override
+    public int getFetchSize() throws SQLException {
+        throw unsupportedOperation("getFetchSize");
+    }
+
+    /**
+     * Unsupported by default.
+     */
+    @Override
+    public void setFetchSize(int rows) throws SQLException {
+        throw unsupportedOperation("setFetchSize");
+    }
+
+    /**
+     * Defaults to {@link ResultSet#FETCH_FORWARD}.
+     */
+    @Override
+    public int getFetchDirection() throws SQLException {
+        return ResultSet.FETCH_FORWARD;
+    }
+
+    /**
+     * Unsupported by default.
+     */
+    @Override
+    public void setFetchDirection(int direction) throws SQLException {
+        if (direction != ResultSet.FETCH_FORWARD) {
+            throw unsupportedOperation("setFetchDirection");
+        }
+    }
+
+    /**
+     * Defaults to 0, meaning to limit.
+     */
+    @Override
+    public int getQueryTimeout() throws SQLException {
+        return 0;
+    }
+
+    /**
+     * Unsupported by default.
+     */
+    @Override
+    public void setQueryTimeout(int seconds) throws SQLException {
+        throw unsupportedOperation("setQueryTimeout");
+    }
+
+    /**
+     * Unsupported by default.
+     */
+    @Override
+    public void setEscapeProcessing(boolean enable) throws SQLException {
+        throw unsupportedOperation("setEscapeProcessing");
+    }
+
+    /**
+     * Unsupported by default.
+     */
+    @Override
+    public void setCursorName(String name) throws SQLException {
+        throw unsupportedOperation("setCursorName");
+    }
+
+    /**
+     * Unsupported by default.
+     */
+    @Override
+    public boolean execute(String sql, int autoGeneratedKeys) throws SQLException {
+        throw unsupportedOperation("execute with autoGeneratedKeys");
+    }
+
+    /**
+     * Unsupported by default.
+     */
+    @Override
+    public boolean execute(String sql, int[] columnIndexes) throws SQLException {
+        throw unsupportedOperation("execute with columnIndexes");
+    }
+
+    /**
+     * Unsupported by default.
+     */
+    @Override
+    public boolean execute(String sql, String[] columnNames) throws SQLException {
+        throw unsupportedOperation("execute with columnNames");
+    }
+
+    /**
+     * Unsupported by default.
+     */
+    @Override
+    public int executeUpdate(String sql) throws SQLException {
+        throw unsupportedOperation("executeUpdate");
+    }
+
+    /**
+     * Unsupported by default.
+     */
+    @Override
+    public int executeUpdate(String sql, int autoGeneratedKeys) throws SQLException {
+        throw unsupportedOperation("executeUpdate");
+    }
+
+    /**
+     * Unsupported by default.
+     */
+    @Override
+    public int executeUpdate(String sql, int[] columnIndexes) throws SQLException {
+        throw unsupportedOperation("executeUpdate");
+    }
+
+    /**
+     * Unsupported by default.
+     */
+    @Override
+    public int executeUpdate(String sql, String[] columnNames) throws SQLException {
+        throw unsupportedOperation("executeUpdate");
+    }
+
+    /**
+     * Unsupported by default.
+     */
+    @Override
+    public void addBatch(String sql) throws SQLException {
+        throw unsupportedOperation("addBatch");
+    }
+
+    /**
+     * Unsupported by default.
+     */
+    @Override
+    public void clearBatch() throws SQLException {
+        throw unsupportedOperation("clearBatch");
+    }
+
+    /**
+     * Unsupported by default.
+     */
+    @Override
+    public int[] executeBatch() throws SQLException {
+        throw unsupportedOperation("executeBatch");
+    }
+
+    /**
+     * Unsupported by default.
+     */
+    @Override
+    public boolean getMoreResults() throws SQLException {
+        throw unsupportedOperation("getMoreResults");
+    }
+
+    /**
+     * Unsupported by default.
+     */
+    @Override
+    public boolean getMoreResults(int current) throws SQLException {
+        throw unsupportedOperation("getMoreResults");
+    }
+
+    /**
+     * Unsupported by default.
+     */
+    @Override
+    public ResultSet getGeneratedKeys() throws SQLException {
+        throw unsupportedOperation("getGeneratedKeys");
+    }
+
+    /**
+     * Defaults to {@code false} since simple statement imlementations are not poolable.
+     */
+    @Override
+    public boolean isPoolable() throws SQLException {
+        return false;
+    }
+
+    /**
+     * Ignored by default since this method is only a hint.
+     */
+    @Override
+    public void setPoolable(boolean poolable) throws SQLException {
+    }
+
+    /**
+     * Unsupported by default.
+     */
+    @Override
+    public void cancel() throws SQLException {
+        throw unsupportedOperation("cancel");
+    }
+
+    /**
+     * Unsupported by default.
+     */
+    @Override
+    public void closeOnCompletion() throws SQLException {
+        throw unsupportedOperation("closeOnCompletion");
+    }
+
+    /**
+     * Unsupported by default.
+     */
+    @Override
+    public boolean isCloseOnCompletion() throws SQLException {
+        throw unsupportedOperation("isCloseOnCompletion");
+    }
+}

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

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

Modified: sis/branches/JDK8/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/statement/DBFStatement.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/statement/DBFStatement.java?rev=1644556&r1=1644555&r2=1644556&view=diff
==============================================================================
--- sis/branches/JDK8/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/statement/DBFStatement.java [iso-8859-1] (original)
+++ sis/branches/JDK8/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/statement/DBFStatement.java [UTF-8] Thu Dec 11 05:08:40 2014
@@ -1,244 +1,244 @@
-/*
- * 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.statement;
-
-import java.sql.*;
-import java.text.MessageFormat;
-import java.util.HashSet;
-import java.util.Objects;
-import java.util.logging.Level;
-import java.util.stream.Collectors;
-
-import org.apache.sis.internal.shapefile.jdbc.SQLConnectionClosedException;
-import org.apache.sis.internal.shapefile.jdbc.connection.DBFConnection;
-import org.apache.sis.internal.shapefile.jdbc.resultset.AbstractResultSet;
-import org.apache.sis.internal.shapefile.jdbc.resultset.DBFRecordBasedResultSet;
-import org.apache.sis.internal.shapefile.jdbc.sql.SQLInvalidStatementException;
-import org.apache.sis.storage.shapefile.Database;
-
-
-/**
- * DBF Statement.
- * @author  Marc Le Bihan
- * @version 0.5
- * @since   0.5
- * @module
- */
-public class DBFStatement extends AbstractStatement {
-    /** Connection this statement is relying on. */
-    private DBFConnection connection;
-
-    /** ResultSets that are currently opened. */
-    private HashSet<AbstractResultSet> m_openedResultSets = new HashSet<>(); 
-    
-    /** The current result set, or {@code null} if none. */
-    private AbstractResultSet currentResultSet;
-
-    /** Indicates if the statement is currently closed. */
-    private boolean isClosed;
-
-    /**
-     * Constructs a statement.
-     * @param cnt Connection associated to this statement.
-     */
-    public DBFStatement(DBFConnection cnt) {
-        this.connection = cnt;
-    }
-
-    /**
-     * Returns the connection.
-     * @return Connection.
-     * @throws SQLConnectionClosedException if the connection is closed.
-     */
-    @Override
-    public Connection getConnection() throws SQLConnectionClosedException {
-        assertNotClosed();
-        return connection;
-    }
-    
-    /**
-     * @see java.sql.Statement#execute(java.lang.String)
-     */
-    @Override
-    public boolean execute(String sql) throws SQLException {
-        // We are only able to handle SQL Queries at this time.
-        if (sql.trim().toLowerCase().startsWith("select")) {
-            executeQuery(sql);
-            return true; // The result is a ResultSet.
-        }
-        else
-            throw unsupportedOperation("execute something else than a SELECT statement");
-    }
-
-    /**
-     * Executes the given SQL statement.
-     * @return SQL Statement.
-     * @throws SQLConnectionClosedException if the connection is closed.
-     * @throws SQLInvalidStatementException if the SQL Statement is invalid.
-     */
-    @Override
-    public ResultSet executeQuery(final String sql) throws SQLConnectionClosedException, SQLInvalidStatementException {
-        Objects.requireNonNull(sql, "The SQL query cannot be null.");
-        assertNotClosed();
-        
-        DBFRecordBasedResultSet rs = new DBFRecordBasedResultSet(this, sql);
-        registerResultSet(rs);
-        return rs;
-    }
-
-    /**
-     * Returns the JDBC interface implemented by this class.
-     * This is used for formatting error messages.
-     */
-    @Override
-    final protected Class<?> getInterface() {
-        return Statement.class;
-    }
-
-    /**
-     * @see java.sql.Statement#getMaxRows()
-     */
-    @Override
-    public int getMaxRows() {
-        return 0;
-    }
-
-    /**
-     * Returns the result set created by the last call to {@link #executeQuery(String)}.
-     * @return ResultSet.
-     */
-    @Override
-    public ResultSet getResultSet() throws SQLConnectionClosedException {
-        assertNotClosed();
-        return currentResultSet;
-    }
-
-    /**
-     * @see java.sql.Statement#getUpdateCount()
-     */
-    @Override
-    public int getUpdateCount() {
-        return 0; // We currently only handle select statements.
-    }
-
-    /**
-     * @see java.sql.Statement#close()
-     */
-    @Override
-    public void close() {
-        if (isClosed())
-            return;
-        
-        if (currentResultSet != null) {
-            // Inform that this ResultSet could have been closed but that we are handling this :
-            // Some developpers may expect their ResultSet should have been closed before in their program.
-            format(Level.INFO, "log.closing_underlying_resultset", currentResultSet);
-            currentResultSet.close();
-            
-            currentResultSet = null;
-        }
-        
-        // Check if all the underlying ResultSets that has been opened with this statement has been closed.
-        // If not, we log a warning to help the developper.
-        if (m_openedResultSets.size() > 0) {
-            format(Level.WARNING, "log.resultsets_left_opened", m_openedResultSets.size(), m_openedResultSets.stream().map(AbstractResultSet::toString).collect(Collectors.joining(", ")));  
-        }
-        
-        isClosed = true;
-        connection.notifyCloseStatement(this);
-    }
-
-    /**
-     * Returns {@code true} if this statement has been closed or if the underlying connection is closed.
-     * @return true if the database is closed.
-     */
-    @Override
-    public boolean isClosed() {
-        return isClosed || connection.isClosed();
-    }
-    
-    /**
-     * Returns the binary representation of the database.
-     * This function shall not check the closed state of this connection, as it can be used in exception messages descriptions.
-     * @return Database.
-     */
-    public Database getDatabase() {
-        return connection.getDatabase();
-    }
-
-    /**
-     * Asserts that the connection and the statement are together opened.
-     * @throws SQLConnectionClosedException if one of them is closed.
-     */
-    public void assertNotClosed() throws SQLConnectionClosedException {
-        connection.assertNotClosed(); // First, the underlying shall not be closed.
-        
-        // Then, this statement shouldn't be closed too.
-        if (isClosed) {
-            throw new SQLConnectionClosedException(format("excp.closed_statement", connection.getDatabase().getFile().getName()), null, connection.getDatabase().getFile());
-        }
-    }
-    
-    /**
-     * @see java.sql.Wrapper#isWrapperFor(java.lang.Class)
-     */
-    @Override
-    public boolean isWrapperFor(Class<?> iface) {
-        return iface.isAssignableFrom(getInterface());
-    }
-
-    /**
-     * Method called by ResultSet class to notity this statement that a resultSet has been closed.
-     * @param rs ResultSet that has been closed.
-     */
-    public void notifyCloseResultSet(AbstractResultSet rs) {
-        Objects.requireNonNull(rs, "The ResultSet notified being closed cannot be null.");
-        
-        // If this ResultSet was the current ResultSet, now there is no more current ResultSet.
-        if (currentResultSet == rs)
-            currentResultSet = null;
-        
-        if (m_openedResultSets.remove(rs) == false) {
-            throw new RuntimeException(format(Level.SEVERE, "assert.resultset_not_opened_by_me", rs, toString()));
-        }
-    }
-
-    /**
-     * Register a ResultSet as opened.
-     * @param rs Result Set.
-     */
-    public void registerResultSet(AbstractResultSet rs) {
-        currentResultSet = rs;
-        m_openedResultSets.add(rs);
-    }
-
-    /**
-     * @see java.sql.Statement#setMaxRows(int)
-     */
-    @Override
-    public void setMaxRows(int max) {
-        this.logUnsupportedOperation(MessageFormat.format("setMaxRows({0,number})", max));
-    }
-
-    /**
-     * @see java.lang.Object#toString()
-     */
-    @Override
-    public String toString() {
-        return format("toString", connection != null ? connection.toString() : null, isClosed() == false);
-    }
-}
+/*
+ * 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.statement;
+
+import java.sql.*;
+import java.text.MessageFormat;
+import java.util.HashSet;
+import java.util.Objects;
+import java.util.logging.Level;
+import java.util.stream.Collectors;
+
+import org.apache.sis.internal.shapefile.jdbc.SQLConnectionClosedException;
+import org.apache.sis.internal.shapefile.jdbc.connection.DBFConnection;
+import org.apache.sis.internal.shapefile.jdbc.resultset.AbstractResultSet;
+import org.apache.sis.internal.shapefile.jdbc.resultset.DBFRecordBasedResultSet;
+import org.apache.sis.internal.shapefile.jdbc.sql.SQLInvalidStatementException;
+import org.apache.sis.storage.shapefile.Database;
+
+
+/**
+ * DBF Statement.
+ * @author  Marc Le Bihan
+ * @version 0.5
+ * @since   0.5
+ * @module
+ */
+public class DBFStatement extends AbstractStatement {
+    /** Connection this statement is relying on. */
+    private DBFConnection connection;
+
+    /** ResultSets that are currently opened. */
+    private HashSet<AbstractResultSet> m_openedResultSets = new HashSet<>(); 
+    
+    /** The current result set, or {@code null} if none. */
+    private AbstractResultSet currentResultSet;
+
+    /** Indicates if the statement is currently closed. */
+    private boolean isClosed;
+
+    /**
+     * Constructs a statement.
+     * @param cnt Connection associated to this statement.
+     */
+    public DBFStatement(DBFConnection cnt) {
+        this.connection = cnt;
+    }
+
+    /**
+     * Returns the connection.
+     * @return Connection.
+     * @throws SQLConnectionClosedException if the connection is closed.
+     */
+    @Override
+    public Connection getConnection() throws SQLConnectionClosedException {
+        assertNotClosed();
+        return connection;
+    }
+    
+    /**
+     * @see java.sql.Statement#execute(java.lang.String)
+     */
+    @Override
+    public boolean execute(String sql) throws SQLException {
+        // We are only able to handle SQL Queries at this time.
+        if (sql.trim().toLowerCase().startsWith("select")) {
+            executeQuery(sql);
+            return true; // The result is a ResultSet.
+        }
+        else
+            throw unsupportedOperation("execute something else than a SELECT statement");
+    }
+
+    /**
+     * Executes the given SQL statement.
+     * @return SQL Statement.
+     * @throws SQLConnectionClosedException if the connection is closed.
+     * @throws SQLInvalidStatementException if the SQL Statement is invalid.
+     */
+    @Override
+    public ResultSet executeQuery(final String sql) throws SQLConnectionClosedException, SQLInvalidStatementException {
+        Objects.requireNonNull(sql, "The SQL query cannot be null.");
+        assertNotClosed();
+        
+        DBFRecordBasedResultSet rs = new DBFRecordBasedResultSet(this, sql);
+        registerResultSet(rs);
+        return rs;
+    }
+
+    /**
+     * Returns the JDBC interface implemented by this class.
+     * This is used for formatting error messages.
+     */
+    @Override
+    final protected Class<?> getInterface() {
+        return Statement.class;
+    }
+
+    /**
+     * @see java.sql.Statement#getMaxRows()
+     */
+    @Override
+    public int getMaxRows() {
+        return 0;
+    }
+
+    /**
+     * Returns the result set created by the last call to {@link #executeQuery(String)}.
+     * @return ResultSet.
+     */
+    @Override
+    public ResultSet getResultSet() throws SQLConnectionClosedException {
+        assertNotClosed();
+        return currentResultSet;
+    }
+
+    /**
+     * @see java.sql.Statement#getUpdateCount()
+     */
+    @Override
+    public int getUpdateCount() {
+        return 0; // We currently only handle select statements.
+    }
+
+    /**
+     * @see java.sql.Statement#close()
+     */
+    @Override
+    public void close() {
+        if (isClosed())
+            return;
+        
+        if (currentResultSet != null) {
+            // Inform that this ResultSet could have been closed but that we are handling this :
+            // Some developpers may expect their ResultSet should have been closed before in their program.
+            format(Level.INFO, "log.closing_underlying_resultset", currentResultSet);
+            currentResultSet.close();
+            
+            currentResultSet = null;
+        }
+        
+        // Check if all the underlying ResultSets that has been opened with this statement has been closed.
+        // If not, we log a warning to help the developper.
+        if (m_openedResultSets.size() > 0) {
+            format(Level.WARNING, "log.resultsets_left_opened", m_openedResultSets.size(), m_openedResultSets.stream().map(AbstractResultSet::toString).collect(Collectors.joining(", ")));  
+        }
+        
+        isClosed = true;
+        connection.notifyCloseStatement(this);
+    }
+
+    /**
+     * Returns {@code true} if this statement has been closed or if the underlying connection is closed.
+     * @return true if the database is closed.
+     */
+    @Override
+    public boolean isClosed() {
+        return isClosed || connection.isClosed();
+    }
+    
+    /**
+     * Returns the binary representation of the database.
+     * This function shall not check the closed state of this connection, as it can be used in exception messages descriptions.
+     * @return Database.
+     */
+    public Database getDatabase() {
+        return connection.getDatabase();
+    }
+
+    /**
+     * Asserts that the connection and the statement are together opened.
+     * @throws SQLConnectionClosedException if one of them is closed.
+     */
+    public void assertNotClosed() throws SQLConnectionClosedException {
+        connection.assertNotClosed(); // First, the underlying shall not be closed.
+        
+        // Then, this statement shouldn't be closed too.
+        if (isClosed) {
+            throw new SQLConnectionClosedException(format("excp.closed_statement", connection.getDatabase().getFile().getName()), null, connection.getDatabase().getFile());
+        }
+    }
+    
+    /**
+     * @see java.sql.Wrapper#isWrapperFor(java.lang.Class)
+     */
+    @Override
+    public boolean isWrapperFor(Class<?> iface) {
+        return iface.isAssignableFrom(getInterface());
+    }
+
+    /**
+     * Method called by ResultSet class to notity this statement that a resultSet has been closed.
+     * @param rs ResultSet that has been closed.
+     */
+    public void notifyCloseResultSet(AbstractResultSet rs) {
+        Objects.requireNonNull(rs, "The ResultSet notified being closed cannot be null.");
+        
+        // If this ResultSet was the current ResultSet, now there is no more current ResultSet.
+        if (currentResultSet == rs)
+            currentResultSet = null;
+        
+        if (m_openedResultSets.remove(rs) == false) {
+            throw new RuntimeException(format(Level.SEVERE, "assert.resultset_not_opened_by_me", rs, toString()));
+        }
+    }
+
+    /**
+     * Register a ResultSet as opened.
+     * @param rs Result Set.
+     */
+    public void registerResultSet(AbstractResultSet rs) {
+        currentResultSet = rs;
+        m_openedResultSets.add(rs);
+    }
+
+    /**
+     * @see java.sql.Statement#setMaxRows(int)
+     */
+    @Override
+    public void setMaxRows(int max) {
+        this.logUnsupportedOperation(MessageFormat.format("setMaxRows({0,number})", max));
+    }
+
+    /**
+     * @see java.lang.Object#toString()
+     */
+    @Override
+    public String toString() {
+        return format("toString", connection != null ? connection.toString() : null, isClosed() == false);
+    }
+}

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

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

Modified: sis/branches/JDK8/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/statement/package-info.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/statement/package-info.java?rev=1644556&r1=1644555&r2=1644556&view=diff
==============================================================================
--- sis/branches/JDK8/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/statement/package-info.java [iso-8859-1] (original)
+++ sis/branches/JDK8/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/statement/package-info.java [UTF-8] Thu Dec 11 05:08:40 2014
@@ -1,19 +1,19 @@
-/*
- * 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.
- */
-
-/** Statements */
+/*
+ * 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.
+ */
+
+/** Statements */
 package org.apache.sis.internal.shapefile.jdbc.statement;
\ No newline at end of file

Propchange: sis/branches/JDK8/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/statement/package-info.java
------------------------------------------------------------------------------
    svn:eol-style = native

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

Modified: sis/branches/JDK8/storage/sis-shapefile/src/main/java/org/apache/sis/storage/shapefile/FieldsDescriptors.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/storage/sis-shapefile/src/main/java/org/apache/sis/storage/shapefile/FieldsDescriptors.java?rev=1644556&r1=1644555&r2=1644556&view=diff
==============================================================================
--- sis/branches/JDK8/storage/sis-shapefile/src/main/java/org/apache/sis/storage/shapefile/FieldsDescriptors.java [iso-8859-1] (original)
+++ sis/branches/JDK8/storage/sis-shapefile/src/main/java/org/apache/sis/storage/shapefile/FieldsDescriptors.java [UTF-8] Thu Dec 11 05:08:40 2014
@@ -1,41 +1,41 @@
-/*
- * 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.storage.shapefile;
-
-import java.util.stream.Collectors;
-
-import org.apache.sis.util.logging.AbstractAutoCheckerList;
-
-/**
- * Fields descriptors of a DBase 3 field.
- * @author Marc LE BIHAN
- */
-public class FieldsDescriptors extends AbstractAutoCheckerList<FieldDescriptor> {
-    /** Serial ID. */
-    private static final long serialVersionUID = 4313603786088155463L;
-
-    /**
-     * @see java.util.AbstractCollection#toString()
-     */
-    @Override 
-    public String toString() {
-        String lineSeparator = System.getProperty("line.separator", "\n");
-        
-        String text = stream().map(FieldDescriptor::toString).collect(Collectors.joining(lineSeparator, "{" + lineSeparator, "}" + lineSeparator));
-        return text;
-    }
-}
+/*
+ * 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.storage.shapefile;
+
+import java.util.stream.Collectors;
+
+import org.apache.sis.util.logging.AbstractAutoCheckerList;
+
+/**
+ * Fields descriptors of a DBase 3 field.
+ * @author Marc LE BIHAN
+ */
+public class FieldsDescriptors extends AbstractAutoCheckerList<FieldDescriptor> {
+    /** Serial ID. */
+    private static final long serialVersionUID = 4313603786088155463L;
+
+    /**
+     * @see java.util.AbstractCollection#toString()
+     */
+    @Override 
+    public String toString() {
+        String lineSeparator = System.getProperty("line.separator", "\n");
+        
+        String text = stream().map(FieldDescriptor::toString).collect(Collectors.joining(lineSeparator, "{" + lineSeparator, "}" + lineSeparator));
+        return text;
+    }
+}

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

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

Modified: sis/branches/JDK8/storage/sis-shapefile/src/main/java/org/apache/sis/storage/shapefile/InvalidDbaseFileFormatException.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/storage/sis-shapefile/src/main/java/org/apache/sis/storage/shapefile/InvalidDbaseFileFormatException.java?rev=1644556&r1=1644555&r2=1644556&view=diff
==============================================================================
--- sis/branches/JDK8/storage/sis-shapefile/src/main/java/org/apache/sis/storage/shapefile/InvalidDbaseFileFormatException.java [iso-8859-1] (original)
+++ sis/branches/JDK8/storage/sis-shapefile/src/main/java/org/apache/sis/storage/shapefile/InvalidDbaseFileFormatException.java [UTF-8] Thu Dec 11 05:08:40 2014
@@ -1,50 +1,50 @@
-/*
- * 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.storage.shapefile;
-
-import java.sql.SQLNonTransientException;
-
-
-/**
- * Thrown when the DBF file format seems to be invalid.
- *
- * @author  Marc Le Bihan
- * @version 0.5
- * @since   0.5
- * @module
- */
-public class InvalidDbaseFileFormatException extends SQLNonTransientException {
-    /** Serial UID. */
-    private static final long serialVersionUID = 3924612615300490837L;
-
-    /**
-     * Construct an exception.
-     * @param message Message of the exception.
-     */
-    public InvalidDbaseFileFormatException(String message) {
-        super(message);
-    }
-
-    /**
-     * Construct an exception.
-     * @param message Message of the exception.
-     * @param cause Root cause of the exception.
-     */
-    public InvalidDbaseFileFormatException(String message, Throwable cause) {
-        super(message, cause);
-    }
-}
+/*
+ * 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.storage.shapefile;
+
+import java.sql.SQLNonTransientException;
+
+
+/**
+ * Thrown when the DBF file format seems to be invalid.
+ *
+ * @author  Marc Le Bihan
+ * @version 0.5
+ * @since   0.5
+ * @module
+ */
+public class InvalidDbaseFileFormatException extends SQLNonTransientException {
+    /** Serial UID. */
+    private static final long serialVersionUID = 3924612615300490837L;
+
+    /**
+     * Construct an exception.
+     * @param message Message of the exception.
+     */
+    public InvalidDbaseFileFormatException(String message) {
+        super(message);
+    }
+
+    /**
+     * Construct an exception.
+     * @param message Message of the exception.
+     * @param cause Root cause of the exception.
+     */
+    public InvalidDbaseFileFormatException(String message, Throwable cause) {
+        super(message, cause);
+    }
+}

Propchange: sis/branches/JDK8/storage/sis-shapefile/src/main/java/org/apache/sis/storage/shapefile/InvalidDbaseFileFormatException.java
------------------------------------------------------------------------------
    svn:eol-style = native

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

Modified: sis/branches/JDK8/storage/sis-shapefile/src/main/resources/org/apache/sis/internal/shapefile/jdbc/AbstractJDBC.properties
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/storage/sis-shapefile/src/main/resources/org/apache/sis/internal/shapefile/jdbc/AbstractJDBC.properties?rev=1644556&r1=1644555&r2=1644556&view=diff
==============================================================================
--- sis/branches/JDK8/storage/sis-shapefile/src/main/resources/org/apache/sis/internal/shapefile/jdbc/AbstractJDBC.properties [iso-8859-1] (original)
+++ sis/branches/JDK8/storage/sis-shapefile/src/main/resources/org/apache/sis/internal/shapefile/jdbc/AbstractJDBC.properties [ISO-8859-1] Thu Dec 11 05:08:40 2014
@@ -1,23 +1,23 @@
-# Exception thrown when the driver cannot handle a feature.
-#0: Interface that is not implemented.
-#1: Method name (or goal / feature asked for).
-#2: Simple class name.
-excp.unsupportedDriverFeature=Internal JDBC driver currently does not support the {0} ability/calls in the {2}.{1}() method.
-
-# Exception thrown when the driver cannot handle a feature.
-#0: Interface that is not implemented.
-#1: Method name (or goal / feature asked for).
-#2: Simple class name.
-#3: Method arguments.
-excp.unsupportedDriverFeature_with_arguments=Internal JDBC driver currently does not support the {0} ability/calls in the {2}.{1}({3}) method.
-
-# Log a function call without arguments.
-#0: Method name (or goal / feature asked for).
-#1: Simple class name.
-log.step=[DBase 3 Driver] {1}.{0}()...
-
-# Log a function call with arguments.
-#0: Method name (or goal / feature asked for).
-#1: Simple class name.
-#2: Method arguments.
-log.step_with_arguments=[DBase 3 Driver] {1}.{0}({2})...
+# Exception thrown when the driver cannot handle a feature.
+#0: Interface that is not implemented.
+#1: Method name (or goal / feature asked for).
+#2: Simple class name.
+excp.unsupportedDriverFeature=Internal JDBC driver currently does not support the {0} ability/calls in the {2}.{1}() method.
+
+# Exception thrown when the driver cannot handle a feature.
+#0: Interface that is not implemented.
+#1: Method name (or goal / feature asked for).
+#2: Simple class name.
+#3: Method arguments.
+excp.unsupportedDriverFeature_with_arguments=Internal JDBC driver currently does not support the {0} ability/calls in the {2}.{1}({3}) method.
+
+# Log a function call without arguments.
+#0: Method name (or goal / feature asked for).
+#1: Simple class name.
+log.step=[DBase 3 Driver] {1}.{0}()...
+
+# Log a function call with arguments.
+#0: Method name (or goal / feature asked for).
+#1: Simple class name.
+#2: Method arguments.
+log.step_with_arguments=[DBase 3 Driver] {1}.{0}({2})...

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

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

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

Propchange: sis/branches/JDK8/storage/sis-shapefile/src/main/resources/org/apache/sis/internal/shapefile/jdbc/AbstractJDBC_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/connection/AbstractConnection.properties
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/storage/sis-shapefile/src/main/resources/org/apache/sis/internal/shapefile/jdbc/connection/AbstractConnection.properties?rev=1644556&r1=1644555&r2=1644556&view=diff
==============================================================================
--- sis/branches/JDK8/storage/sis-shapefile/src/main/resources/org/apache/sis/internal/shapefile/jdbc/connection/AbstractConnection.properties [iso-8859-1] (original)
+++ sis/branches/JDK8/storage/sis-shapefile/src/main/resources/org/apache/sis/internal/shapefile/jdbc/connection/AbstractConnection.properties [ISO-8859-1] Thu Dec 11 05:08:40 2014
@@ -1,6 +1,6 @@
-# The auto commit has no effect.
-#0: true / false.
-log.auto_commit_ignored=The auto-commit \u2018{0}\u2019 value is currently ignored (not implemented): auto-commit is always true.
-
-# Log to warn that the rollback has no effect.
-log.commit_rollback_ignored=Commit and rollback has no effect (currently not implemented): auto-commit is always true.
+# The auto commit has no effect.
+#0: true / false.
+log.auto_commit_ignored=The auto-commit \u2018{0}\u2019 value is currently ignored (not implemented): auto-commit is always true.
+
+# Log to warn that the rollback has no effect.
+log.commit_rollback_ignored=Commit and rollback has no effect (currently not implemented): auto-commit is always true.

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

Propchange: sis/branches/JDK8/storage/sis-shapefile/src/main/resources/org/apache/sis/internal/shapefile/jdbc/connection/AbstractConnection.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/connection/AbstractConnection_fr.properties
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/storage/sis-shapefile/src/main/resources/org/apache/sis/internal/shapefile/jdbc/connection/AbstractConnection_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/connection/AbstractConnection_fr.properties [iso-8859-1] (original)
+++ sis/branches/JDK8/storage/sis-shapefile/src/main/resources/org/apache/sis/internal/shapefile/jdbc/connection/AbstractConnection_fr.properties [ISO-8859-1] Thu Dec 11 05:08:40 2014
@@ -1,6 +1,6 @@
-# Exception thrown if th auto commit has no effect.
-#0: true / false.
-log.auto_commit_ignored=L\u2019auto-commit \u2018{0}\u2019 est actuellement ignor\u00e9 (non impl\u00e9ment\u00e9)\u202f: L\u2019auto-commit vaut toujours \u2018vrai\u2019.
-
-# Log to warn that the rollback has no effect. 
-log.commit_rollback_ignored=Les commit et rollback n'ont pas d\u2019effet (ils ne sont pas actuellement impl\u00e9ment\u00e9s)\u202f: l\u2019auto-commit vaut toujours \u2018vrai\u2019.
+# Exception thrown if th auto commit has no effect.
+#0: true / false.
+log.auto_commit_ignored=L\u2019auto-commit \u2018{0}\u2019 est actuellement ignor\u00e9 (non impl\u00e9ment\u00e9)\u202f: L\u2019auto-commit vaut toujours \u2018vrai\u2019.
+
+# Log to warn that the rollback has no effect. 
+log.commit_rollback_ignored=Les commit et rollback n'ont pas d\u2019effet (ils ne sont pas actuellement impl\u00e9ment\u00e9s)\u202f: l\u2019auto-commit vaut toujours \u2018vrai\u2019.

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

Propchange: sis/branches/JDK8/storage/sis-shapefile/src/main/resources/org/apache/sis/internal/shapefile/jdbc/connection/AbstractConnection_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/connection/DBFConnection.properties
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/storage/sis-shapefile/src/main/resources/org/apache/sis/internal/shapefile/jdbc/connection/DBFConnection.properties?rev=1644556&r1=1644555&r2=1644556&view=diff
==============================================================================
--- sis/branches/JDK8/storage/sis-shapefile/src/main/resources/org/apache/sis/internal/shapefile/jdbc/connection/DBFConnection.properties [iso-8859-1] (original)
+++ sis/branches/JDK8/storage/sis-shapefile/src/main/resources/org/apache/sis/internal/shapefile/jdbc/connection/DBFConnection.properties [ISO-8859-1] Thu Dec 11 05:08:40 2014
@@ -1,38 +1,38 @@
-# Asserttion : the statement has not been found opened by this connection when it was searched for.
-#0 : the statement that should had been found opened by this connection.
-#1 : The connection.
-assert.statement_not_opened_by_me=[Internal API trouble] The Statement {0} has not been opened by the connection {1}.  
-
-# Exception thrown if the connection is closed 
-#0 : DBF File name.
-excp.closed_connection=The connection to the DBase 3 file {0} is closed.
-
-# Exception : a directory has been given instead of a file.
-#0 : Directory name.
-excp.directory_not_expected=Your file ''{0}'' points to a directory instead of a file. 
-
-# Exception : the file has not been found.
-#0 : File that has not been found.
-excp.file_not_found=The DBF file ''{0}'' has not been found.
-
-# Warning : autocommit isn't implemented.
-#0 : true / false.
-log.autocommit_ignored=The autocommit {0} is currently ignored (not implemented) : autocommit is always true.
-
-# Warning : commit and rollback are not implemented : autocommit is always true.
-log.commit_rollback_ignored=Commit and rollback has no effect (currently not implemented) : autocommit is always true.
-
-# Information : Connection opened.
-#0 : DBF File opened.
-#1 : Header information.
-log.database_connection_opened=Database connection to {0} opened. DBase 3 descriptor of this dbf file is : {1}.
-
-# Warning : At the time the caller is closing this connection, he has left some statements opened.
-#0, number : Number of statements that are left opened.
-#1 : Opened statements.
-log.statements_left_opened={0,number,integer} {0,choice,1#statement is|2#statements are} left opened at the time you are closing this connection : {1}.
-
-# toString()
-#0 : Database file.
-#1 : Open state (true, false).
-toString='{'{0}, connection open state : {1}'}'
+# Asserttion : the statement has not been found opened by this connection when it was searched for.
+#0 : the statement that should had been found opened by this connection.
+#1 : The connection.
+assert.statement_not_opened_by_me=[Internal API trouble] The Statement {0} has not been opened by the connection {1}.  
+
+# Exception thrown if the connection is closed 
+#0 : DBF File name.
+excp.closed_connection=The connection to the DBase 3 file {0} is closed.
+
+# Exception : a directory has been given instead of a file.
+#0 : Directory name.
+excp.directory_not_expected=Your file ''{0}'' points to a directory instead of a file. 
+
+# Exception : the file has not been found.
+#0 : File that has not been found.
+excp.file_not_found=The DBF file ''{0}'' has not been found.
+
+# Warning : autocommit isn't implemented.
+#0 : true / false.
+log.autocommit_ignored=The autocommit {0} is currently ignored (not implemented) : autocommit is always true.
+
+# Warning : commit and rollback are not implemented : autocommit is always true.
+log.commit_rollback_ignored=Commit and rollback has no effect (currently not implemented) : autocommit is always true.
+
+# Information : Connection opened.
+#0 : DBF File opened.
+#1 : Header information.
+log.database_connection_opened=Database connection to {0} opened. DBase 3 descriptor of this dbf file is : {1}.
+
+# Warning : At the time the caller is closing this connection, he has left some statements opened.
+#0, number : Number of statements that are left opened.
+#1 : Opened statements.
+log.statements_left_opened={0,number,integer} {0,choice,1#statement is|2#statements are} left opened at the time you are closing this connection : {1}.
+
+# toString()
+#0 : Database file.
+#1 : Open state (true, false).
+toString='{'{0}, connection open state : {1}'}'

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

Propchange: sis/branches/JDK8/storage/sis-shapefile/src/main/resources/org/apache/sis/internal/shapefile/jdbc/connection/DBFConnection.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/connection/DBFConnection_fr.properties
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/storage/sis-shapefile/src/main/resources/org/apache/sis/internal/shapefile/jdbc/connection/DBFConnection_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/connection/DBFConnection_fr.properties [iso-8859-1] (original)
+++ sis/branches/JDK8/storage/sis-shapefile/src/main/resources/org/apache/sis/internal/shapefile/jdbc/connection/DBFConnection_fr.properties [ISO-8859-1] Thu Dec 11 05:08:40 2014
@@ -1,28 +1,28 @@
-# Exception thrown if the connection is closed 
-#0: DBF File name.
-excp.closed_connection=La connexion à {0} est fermée.
-
-# Exception : a directory has been given instead of a file.
-#0 : Directory name.
-excp.directory_not_expected=Votre fichier ''{0}'' désigne un répertoire et non un fichier. 
-
-# Exception : the file has not been found.
-#0 : File that has not been found.
-excp.file_not_found=Le fichier DBF ''{0}'' n''a pas été trouvé.
-
-# Warning : autocommit isn't implemented.
-#0 : true / false.
-log.autocommit_ignored=L''autocommit {0} est actuellement ignoré (non implémenté) : L''autocommit vaut toujours true.
-
-# Warning : commit and rollback are not implemented : autocommit is always true.
-log.commit_rollback_ignored=Les commit et rollback n'ont pas d''effet (ils ne sont pas actuellement implémentés) : l''autocommit vaut toujours true.
-
-# Warning : At the time the caller is closing this connection, he has left some statements opened.
-#0, number : Number of statements that are left opened.
-#1 : Opened statements.
-log.statements_left_opened={0,number,integer} {0,choice,1#statement est resté ouvert|2#statements sont restés ouverts} au moment où vous fermez cette connexion : {1}.
-
-# Information : Connection opened.
-#0 : DBF File opened.
-#1 : Header information.
-log.database_connection_opened=Connexion à la base de données {0} ouverte. Le descripteur DBase 3 de ce fichier dbf est : {1}.
+# Exception thrown if the connection is closed 
+#0: DBF File name.
+excp.closed_connection=La connexion à {0} est fermée.
+
+# Exception : a directory has been given instead of a file.
+#0 : Directory name.
+excp.directory_not_expected=Votre fichier ''{0}'' désigne un répertoire et non un fichier. 
+
+# Exception : the file has not been found.
+#0 : File that has not been found.
+excp.file_not_found=Le fichier DBF ''{0}'' n''a pas été trouvé.
+
+# Warning : autocommit isn't implemented.
+#0 : true / false.
+log.autocommit_ignored=L''autocommit {0} est actuellement ignoré (non implémenté) : L''autocommit vaut toujours true.
+
+# Warning : commit and rollback are not implemented : autocommit is always true.
+log.commit_rollback_ignored=Les commit et rollback n'ont pas d''effet (ils ne sont pas actuellement implémentés) : l''autocommit vaut toujours true.
+
+# Warning : At the time the caller is closing this connection, he has left some statements opened.
+#0, number : Number of statements that are left opened.
+#1 : Opened statements.
+log.statements_left_opened={0,number,integer} {0,choice,1#statement est resté ouvert|2#statements sont restés ouverts} au moment où vous fermez cette connexion : {1}.
+
+# Information : Connection opened.
+#0 : DBF File opened.
+#1 : Header information.
+log.database_connection_opened=Connexion à la base de données {0} ouverte. Le descripteur DBase 3 de ce fichier dbf est : {1}.

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

Propchange: sis/branches/JDK8/storage/sis-shapefile/src/main/resources/org/apache/sis/internal/shapefile/jdbc/connection/DBFConnection_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/metadata/DBFResultSetMataData.properties
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/storage/sis-shapefile/src/main/resources/org/apache/sis/internal/shapefile/jdbc/metadata/DBFResultSetMataData.properties?rev=1644556&r1=1644555&r2=1644556&view=diff
==============================================================================
--- sis/branches/JDK8/storage/sis-shapefile/src/main/resources/org/apache/sis/internal/shapefile/jdbc/metadata/DBFResultSetMataData.properties [iso-8859-1] (original)
+++ sis/branches/JDK8/storage/sis-shapefile/src/main/resources/org/apache/sis/internal/shapefile/jdbc/metadata/DBFResultSetMataData.properties [ISO-8859-1] Thu Dec 11 05:08:40 2014
@@ -1,4 +1,4 @@
-# Exception : illegal column index for metadata querying.
-#0 : The index that is illegal.
-#1, number : The number of column in that ResultSet.
-excp.illegal_column_index_metadata=Illegal column index {0} for metadata. The query returned a ResultSet with {1,number} columns.
+# Exception : illegal column index for metadata querying.
+#0 : The index that is illegal.
+#1, number : The number of column in that ResultSet.
+excp.illegal_column_index_metadata=Illegal column index {0} for metadata. The query returned a ResultSet with {1,number} columns.

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

Propchange: sis/branches/JDK8/storage/sis-shapefile/src/main/resources/org/apache/sis/internal/shapefile/jdbc/metadata/DBFResultSetMataData.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/metadata/DBFResultSetMataData_fr.properties
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/storage/sis-shapefile/src/main/resources/org/apache/sis/internal/shapefile/jdbc/metadata/DBFResultSetMataData_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/metadata/DBFResultSetMataData_fr.properties [iso-8859-1] (original)
+++ sis/branches/JDK8/storage/sis-shapefile/src/main/resources/org/apache/sis/internal/shapefile/jdbc/metadata/DBFResultSetMataData_fr.properties [ISO-8859-1] Thu Dec 11 05:08:40 2014
@@ -1,4 +1,4 @@
-# Exception : illegal column index for metadata querying.
-#0 : The index that is illegal.
-#1, number : The number of column in that ResultSet.
-excp.illegal_column_index_metadata=Index de colonne {0} illégal pour des meta-données. La requête a retourné un ResultSet avec {1,number} colonnes.
+# Exception : illegal column index for metadata querying.
+#0 : The index that is illegal.
+#1, number : The number of column in that ResultSet.
+excp.illegal_column_index_metadata=Index de colonne {0} illégal pour des meta-données. La requête a retourné un ResultSet avec {1,number} colonnes.

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

Propchange: sis/branches/JDK8/storage/sis-shapefile/src/main/resources/org/apache/sis/internal/shapefile/jdbc/metadata/DBFResultSetMataData_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/resultset/AbstractResultSet.properties
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/storage/sis-shapefile/src/main/resources/org/apache/sis/internal/shapefile/jdbc/resultset/AbstractResultSet.properties?rev=1644556&r1=1644555&r2=1644556&view=diff
==============================================================================
--- sis/branches/JDK8/storage/sis-shapefile/src/main/resources/org/apache/sis/internal/shapefile/jdbc/resultset/AbstractResultSet.properties [iso-8859-1] (original)
+++ sis/branches/JDK8/storage/sis-shapefile/src/main/resources/org/apache/sis/internal/shapefile/jdbc/resultset/AbstractResultSet.properties [ISO-8859-1] Thu Dec 11 05:08:40 2014
@@ -1,21 +1,21 @@
-# Exception : attempting to get a connection from a closed connection.
-#0 : SQL Query that can no more be queryied.
-#1 : Database name.
-excp.closed_resultset=The ResultSet connection is closed, and querying data for SQL request ''{0}'' on database {1} is no longer possible.
-
-# Exception : illegal column index.
-#0 : The index that is illegal.
-#1, number : The number of column in that ResultSet.
-excp.illegal_column_index=Illegal column index {0}. The query returned a ResultSet with {1,number} columns.
-
-# Exception thrown when a column doesn't exist in the result set.
-#0 : Column name.
-#1 : SQL Query that was attempted but failed.
-#2 : Database name.
-excp.no_such_column_in_resultset=There is no ''{0}'' column in this SQL query ''{1}'' on database {2}.
-
-# toString()
-#0 : Underlying statement.
-#1 : SQL Query.
-#2 : Open state.
-toString='{'(based on statement : {0}), sql query : {1}, result set open state : {2}'}'
+# Exception : attempting to get a connection from a closed connection.
+#0 : SQL Query that can no more be queryied.
+#1 : Database name.
+excp.closed_resultset=The ResultSet connection is closed, and querying data for SQL request ''{0}'' on database {1} is no longer possible.
+
+# Exception : illegal column index.
+#0 : The index that is illegal.
+#1, number : The number of column in that ResultSet.
+excp.illegal_column_index=Illegal column index {0}. The query returned a ResultSet with {1,number} columns.
+
+# Exception thrown when a column doesn't exist in the result set.
+#0 : Column name.
+#1 : SQL Query that was attempted but failed.
+#2 : Database name.
+excp.no_such_column_in_resultset=There is no ''{0}'' column in this SQL query ''{1}'' on database {2}.
+
+# toString()
+#0 : Underlying statement.
+#1 : SQL Query.
+#2 : Open state.
+toString='{'(based on statement : {0}), sql query : {1}, result set open state : {2}'}'

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

Propchange: sis/branches/JDK8/storage/sis-shapefile/src/main/resources/org/apache/sis/internal/shapefile/jdbc/resultset/AbstractResultSet.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/resultset/AbstractResultSet_fr.properties
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/storage/sis-shapefile/src/main/resources/org/apache/sis/internal/shapefile/jdbc/resultset/AbstractResultSet_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/resultset/AbstractResultSet_fr.properties [iso-8859-1] (original)
+++ sis/branches/JDK8/storage/sis-shapefile/src/main/resources/org/apache/sis/internal/shapefile/jdbc/resultset/AbstractResultSet_fr.properties [ISO-8859-1] Thu Dec 11 05:08:40 2014
@@ -1,15 +1,15 @@
-# Exception : attempting to get a connection from a closed connection.
-#0: SQL Query that can no more be queryied.
-#1: Database name.
-excp.closed_resultset=Le ResultSet est fermé, et requêter des données pour la requête SQL ''{0}'' sur la base de données {1} n''est plus possible. 
-
-# Exception : illegal column index.
-#0 : The index that is illegal.
-#1, number : The number of column in that ResultSet.
-excp.illegal_column_index=Index de colonne {0} illégal. La requête a renvoyé un ResultSet avec {1,number} colonnes.
-
-# Exception thrown when a column doesn't exist in the result set.
-#0: Column name.
-#1: SQL Query that was attempted but failed.
-#2: Database name.
-excp.no_such_column_in_resultset=Il n''y a pas de colonne ''{0}'' dans cette requête SQL ''{1}'' sur la base de données {2}.
+# Exception : attempting to get a connection from a closed connection.
+#0: SQL Query that can no more be queryied.
+#1: Database name.
+excp.closed_resultset=Le ResultSet est fermé, et requêter des données pour la requête SQL ''{0}'' sur la base de données {1} n''est plus possible. 
+
+# Exception : illegal column index.
+#0 : The index that is illegal.
+#1, number : The number of column in that ResultSet.
+excp.illegal_column_index=Index de colonne {0} illégal. La requête a renvoyé un ResultSet avec {1,number} colonnes.
+
+# Exception thrown when a column doesn't exist in the result set.
+#0: Column name.
+#1: SQL Query that was attempted but failed.
+#2: Database name.
+excp.no_such_column_in_resultset=Il n''y a pas de colonne ''{0}'' dans cette requête SQL ''{1}'' sur la base de données {2}.

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

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

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

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

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

Propchange: sis/branches/JDK8/storage/sis-shapefile/src/main/resources/org/apache/sis/internal/shapefile/jdbc/resultset/AbstractUnimplementedFeaturesOfResultSet_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/resultset/DBFBuiltInMemoryResultSetForTablesListing.properties
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/storage/sis-shapefile/src/main/resources/org/apache/sis/internal/shapefile/jdbc/resultset/DBFBuiltInMemoryResultSetForTablesListing.properties?rev=1644556&r1=1644555&r2=1644556&view=diff
==============================================================================
--- sis/branches/JDK8/storage/sis-shapefile/src/main/resources/org/apache/sis/internal/shapefile/jdbc/resultset/DBFBuiltInMemoryResultSetForTablesListing.properties [iso-8859-1] (original)
+++ sis/branches/JDK8/storage/sis-shapefile/src/main/resources/org/apache/sis/internal/shapefile/jdbc/resultset/DBFBuiltInMemoryResultSetForTablesListing.properties [ISO-8859-1] Thu Dec 11 05:08:40 2014
@@ -1,5 +1,5 @@
-# The ResultSet listing the tables has only one result.
-excp.only_one_table_per_dbf=DBase 3 files contain only one table.
-
-# The ResultSet listing the tables types has only one result.
-excp.only_one_table_type_handled=DBase 3 only handles TABLE types. No more results available.
+# The ResultSet listing the tables has only one result.
+excp.only_one_table_per_dbf=DBase 3 files contain only one table.
+
+# The ResultSet listing the tables types has only one result.
+excp.only_one_table_type_handled=DBase 3 only handles TABLE types. No more results available.

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

Propchange: sis/branches/JDK8/storage/sis-shapefile/src/main/resources/org/apache/sis/internal/shapefile/jdbc/resultset/DBFBuiltInMemoryResultSetForTablesListing.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/resultset/DBFRecordBasedResultSet.properties
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/storage/sis-shapefile/src/main/resources/org/apache/sis/internal/shapefile/jdbc/resultset/DBFRecordBasedResultSet.properties?rev=1644556&r1=1644555&r2=1644556&view=diff
==============================================================================
--- sis/branches/JDK8/storage/sis-shapefile/src/main/resources/org/apache/sis/internal/shapefile/jdbc/resultset/DBFRecordBasedResultSet.properties [iso-8859-1] (original)
+++ sis/branches/JDK8/storage/sis-shapefile/src/main/resources/org/apache/sis/internal/shapefile/jdbc/resultset/DBFRecordBasedResultSet.properties [ISO-8859-1] Thu Dec 11 05:08:40 2014
@@ -1,24 +1,24 @@
-
-# Exception : field is not a date. 
-#0 : Field name.
-#1 : SQL Query.
-#2 : Field value that is not a date.
-excp.field_is_not_a_date=The field {0} in the query ''{1}'' has a ''{2}'' value that is not a date. 
-
-# Exception : field is not numeric. 
-#0 : Field name.
-#1 : Field type.
-#2 : SQL Query.
-#3 : Field value that is not a number.
-excp.field_is_not_numeric=The field {0} of type {1} in the query ''{2}'' has a ''{3}'' value that is not numeric. 
-
-# Exception thrown when the resultset has no more results.
-#0 : SQL Query that was attempted but failed.
-#1 : Database name.
-excp.no_more_results=The result set has no more results for the SQL request ''{0}'' on database {1}.
-
-# Log : a string value has been converted with a charset.
-#0 : Field name.
-#1 : Field original database value.
-#2 : Field value after being converted with the charset.
-log.string_field_charset=String field name ''{0}'', value ''{1}'' changed to ''{2}'' using charset {3}.
+
+# Exception : field is not a date. 
+#0 : Field name.
+#1 : SQL Query.
+#2 : Field value that is not a date.
+excp.field_is_not_a_date=The field {0} in the query ''{1}'' has a ''{2}'' value that is not a date. 
+
+# Exception : field is not numeric. 
+#0 : Field name.
+#1 : Field type.
+#2 : SQL Query.
+#3 : Field value that is not a number.
+excp.field_is_not_numeric=The field {0} of type {1} in the query ''{2}'' has a ''{3}'' value that is not numeric. 
+
+# Exception thrown when the resultset has no more results.
+#0 : SQL Query that was attempted but failed.
+#1 : Database name.
+excp.no_more_results=The result set has no more results for the SQL request ''{0}'' on database {1}.
+
+# Log : a string value has been converted with a charset.
+#0 : Field name.
+#1 : Field original database value.
+#2 : Field value after being converted with the charset.
+log.string_field_charset=String field name ''{0}'', value ''{1}'' changed to ''{2}'' using charset {3}.

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

Propchange: sis/branches/JDK8/storage/sis-shapefile/src/main/resources/org/apache/sis/internal/shapefile/jdbc/resultset/DBFRecordBasedResultSet.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/resultset/DBFRecordBasedResultSet_fr.properties
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/storage/sis-shapefile/src/main/resources/org/apache/sis/internal/shapefile/jdbc/resultset/DBFRecordBasedResultSet_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/resultset/DBFRecordBasedResultSet_fr.properties [iso-8859-1] (original)
+++ sis/branches/JDK8/storage/sis-shapefile/src/main/resources/org/apache/sis/internal/shapefile/jdbc/resultset/DBFRecordBasedResultSet_fr.properties [ISO-8859-1] Thu Dec 11 05:08:40 2014
@@ -1,24 +1,24 @@
-# Exception : field is not a date. 
-#0 : Field name.
-#1 : SQL Query.
-#2 : Field value that is not a date.
-excp.field_is_not_a_date=Le champ {0} dans la requête ''{1}'' a une valeur ''{2}'' qui n''est pas une date.  
-
-# Exception : field is not numeric. 
-#0 : Field name.
-#1 : Field type.
-#2 : SQL Query.
-#3 : Field value that is not a number.
-excp.field_is_not_numeric=Le champ {0} de type {1} dans la requête ''{2}'' a une valeur ''{3}'' qui n''est pas numérique. 
-
-# Exception : the result set has no more results.
-#0: SQL Query that was attempted but failed.
-#1: Database name.
-excp.no_more_results=Le ResultSet n''a plus de résultats pour la requête SQL ''{0}'' sur la base de données {1}.
-
-# Log : a string value has been converted with a charset.
-#0 : Field name.
-#1 : Field original database value.
-#2 : Field value after being converted with the charset.
-log.string_field_charset=String field name ''{0}'', value ''{1}'' changed to ''{2}'' using charset {3}.
-
+# Exception : field is not a date. 
+#0 : Field name.
+#1 : SQL Query.
+#2 : Field value that is not a date.
+excp.field_is_not_a_date=Le champ {0} dans la requête ''{1}'' a une valeur ''{2}'' qui n''est pas une date.  
+
+# Exception : field is not numeric. 
+#0 : Field name.
+#1 : Field type.
+#2 : SQL Query.
+#3 : Field value that is not a number.
+excp.field_is_not_numeric=Le champ {0} de type {1} dans la requête ''{2}'' a une valeur ''{3}'' qui n''est pas numérique. 
+
+# Exception : the result set has no more results.
+#0: SQL Query that was attempted but failed.
+#1: Database name.
+excp.no_more_results=Le ResultSet n''a plus de résultats pour la requête SQL ''{0}'' sur la base de données {1}.
+
+# Log : a string value has been converted with a charset.
+#0 : Field name.
+#1 : Field original database value.
+#2 : Field value after being converted with the charset.
+log.string_field_charset=String field name ''{0}'', value ''{1}'' changed to ''{2}'' using charset {3}.
+

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

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



Mime
View raw message