Author: mlebihan
Date: Fri Jan 9 05:40:50 2015
New Revision: 1650443
URL: http://svn.apache.org/r1650443
Log:
Second intermediate commit for internal.shapefile.jdbc renaming.
Added:
sis/branches/JDK8/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/resultset/DBFResultSet.java
- copied, changed from r1650441,
sis/branches/JDK8/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/resultset/AbstractResultSet.java
sis/branches/JDK8/storage/sis-shapefile/src/main/resources/org/apache/sis/internal/shapefile/jdbc/resultset/DBFResultSet.properties
- copied unchanged from r1650441,
sis/branches/JDK8/storage/sis-shapefile/src/main/resources/org/apache/sis/internal/shapefile/jdbc/resultset/AbstractResultSet.properties
sis/branches/JDK8/storage/sis-shapefile/src/main/resources/org/apache/sis/internal/shapefile/jdbc/resultset/DBFResultSet_fr.properties
- copied unchanged from r1650441,
sis/branches/JDK8/storage/sis-shapefile/src/main/resources/org/apache/sis/internal/shapefile/jdbc/resultset/AbstractResultSet_fr.properties
Removed:
sis/branches/JDK8/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/resultset/AbstractResultSet.java
sis/branches/JDK8/storage/sis-shapefile/src/main/resources/org/apache/sis/internal/shapefile/jdbc/resultset/AbstractResultSet.properties
sis/branches/JDK8/storage/sis-shapefile/src/main/resources/org/apache/sis/internal/shapefile/jdbc/resultset/AbstractResultSet_fr.properties
Modified:
sis/branches/JDK8/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/resultset/BuiltInMemoryResultSet.java
sis/branches/JDK8/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/resultset/DBFRecordBasedResultSet.java
sis/branches/JDK8/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/statement/DBFStatement.java
Modified:
sis/branches/JDK8/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/resultset/BuiltInMemoryResultSet.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK8/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/resultset/BuiltInMemoryResultSet.java?rev=1650443&r1=1650442&r2=1650443&view=diff
==============================================================================
---
sis/branches/JDK8/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/resultset/BuiltInMemoryResultSet.java
[UTF-8] (original)
+++
sis/branches/JDK8/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/resultset/BuiltInMemoryResultSet.java
[UTF-8] Fri Jan 9 05:40:50 2015
@@ -31,7 +31,7 @@ import org.apache.sis.internal.shapefile
* @since 0.5
* @module
*/
-public abstract class BuiltInMemoryResultSet extends AbstractResultSet {
+public abstract class BuiltInMemoryResultSet extends DBFResultSet {
/**
* Construct a ResultSet for descriptions.
* @param stmt Statement.
Modified:
sis/branches/JDK8/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/resultset/DBFRecordBasedResultSet.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK8/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/resultset/DBFRecordBasedResultSet.java?rev=1650443&r1=1650442&r2=1650443&view=diff
==============================================================================
---
sis/branches/JDK8/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/resultset/DBFRecordBasedResultSet.java
[UTF-8] (original)
+++
sis/branches/JDK8/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/resultset/DBFRecordBasedResultSet.java
[UTF-8] Fri Jan 9 05:40:50 2015
@@ -23,7 +23,7 @@ import org.apache.sis.internal.shapefile
* A ResultSet based on a record.
* @author Marc LE BIHAN
*/
-public class DBFRecordBasedResultSet extends AbstractResultSet {
+public class DBFRecordBasedResultSet extends DBFResultSet {
/** The current record. */
private Map<String, Object> record;
@@ -372,7 +372,7 @@ public class DBFRecordBasedResultSet ext
}
/**
- * @see
org.apache.sis.internal.shapefile.jdbc.resultset.AbstractResultSet#getObject(java.lang.String)
+ * @see
org.apache.sis.internal.shapefile.jdbc.resultset.DBFResultSet#getObject(java.lang.String)
*/
@Override
public Object getObject(String columnLabel) throws
SQLConnectionClosedException, SQLIllegalColumnIndexException,
SQLFeatureNotSupportedException, SQLNoSuchFieldException,
SQLNotNumericException, SQLNotDateException {
Copied:
sis/branches/JDK8/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/resultset/DBFResultSet.java
(from r1650441,
sis/branches/JDK8/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/resultset/AbstractResultSet.java)
URL:
http://svn.apache.org/viewvc/sis/branches/JDK8/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/resultset/DBFResultSet.java?p2=sis/branches/JDK8/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/resultset/DBFResultSet.java&p1=sis/branches/JDK8/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/resultset/AbstractResultSet.java&r1=1650441&r2=1650443&rev=1650443&view=diff
==============================================================================
---
sis/branches/JDK8/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/resultset/AbstractResultSet.java
[UTF-8] (original)
+++
sis/branches/JDK8/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/resultset/DBFResultSet.java
[UTF-8] Fri Jan 9 05:40:50 2015
@@ -35,7 +35,7 @@ import org.apache.sis.internal.shapefile
* Common implemented features of all ResultSets : those based on a record,
but also those returning results forged in memory.
* @author Marc LE BIHAN
*/
-public abstract class AbstractResultSet extends
AbstractUnimplementedFeaturesOfResultSet {
+public abstract class DBFResultSet extends
AbstractUnimplementedFeaturesOfResultSet {
/** Indicates if the ResultSet is closed. */
protected boolean isClosed;
@@ -53,7 +53,7 @@ public abstract class AbstractResultSet
* @param stmt Parent statement.
* @param sqlQuery SQL Statment that produced this ResultSet.
*/
- public AbstractResultSet(final DBFStatement stmt, String sqlQuery) {
+ public DBFResultSet(final DBFStatement stmt, String sqlQuery) {
Objects.requireNonNull(stmt, "the statement referred by the ResultSet
cannot be null.");
statement = stmt;
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=1650443&r1=1650442&r2=1650443&view=diff
==============================================================================
---
sis/branches/JDK8/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/statement/DBFStatement.java
[UTF-8] (original)
+++
sis/branches/JDK8/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/statement/DBFStatement.java
[UTF-8] Fri Jan 9 05:40:50 2015
@@ -26,7 +26,7 @@ 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.DBFResultSet;
import
org.apache.sis.internal.shapefile.jdbc.resultset.DBFRecordBasedResultSet;
import org.apache.sis.internal.shapefile.jdbc.sql.SQLInvalidStatementException;
@@ -43,10 +43,10 @@ public class DBFStatement extends Abstra
private DBFConnection connection;
/** ResultSets that are currently opened. */
- private HashSet<AbstractResultSet> openedResultSets = new HashSet<>();
+ private HashSet<DBFResultSet> openedResultSets = new HashSet<>();
/** The current result set, or {@code null} if none. */
- private AbstractResultSet currentResultSet;
+ private DBFResultSet currentResultSet;
/** Indicates if the statement is currently closed. */
private boolean isClosed;
@@ -164,7 +164,7 @@ public class DBFStatement extends Abstra
// 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 (openedResultSets.size() > 0) {
- format(Level.WARNING, "log.resultsets_left_opened",
openedResultSets.size(),
openedResultSets.stream().map(AbstractResultSet::toString).collect(Collectors.joining(",
")));
+ format(Level.WARNING, "log.resultsets_left_opened",
openedResultSets.size(),
openedResultSets.stream().map(DBFResultSet::toString).collect(Collectors.joining(",
")));
}
isClosed = true;
@@ -205,7 +205,7 @@ public class DBFStatement extends Abstra
* 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) {
+ public void notifyCloseResultSet(DBFResultSet 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.
@@ -221,7 +221,7 @@ public class DBFStatement extends Abstra
* Register a ResultSet as opened.
* @param rs Result Set.
*/
- public void registerResultSet(AbstractResultSet rs) {
+ public void registerResultSet(DBFResultSet rs) {
currentResultSet = rs;
openedResultSets.add(rs);
}
