sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mlebi...@apache.org
Subject svn commit: r1650210 - in /sis/branches/JDK8: core/sis-utility/src/main/java/org/apache/sis/util/logging/ storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/ storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/...
Date Thu, 08 Jan 2015 05:57:24 GMT
Author: mlebihan
Date: Thu Jan  8 05:57:24 2015
New Revision: 1650210

URL: http://svn.apache.org/r1650210
Log:
Intermediate commit for internal.shapefile.jdbc renaming.

Added:
    sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/logging/AutoChecker.java
      - copied, changed from r1650209, sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/logging/AbstractAutoChecker.java
    sis/branches/JDK8/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/metadata/AbstractDatabaseMetaData.java
      - copied, changed from r1650209, sis/branches/JDK8/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/metadata/AbstractUnimplementedFeaturesOfDatabaseMetaData.java
    sis/branches/JDK8/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/resultset/BuiltInMemoryResultSet.java
      - copied, changed from r1650209, sis/branches/JDK8/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/resultset/AbstractBuiltInMemoryResultSet.java
    sis/branches/JDK8/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/sql/ClauseResolver.java
      - copied, changed from r1650209, sis/branches/JDK8/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/sql/AbstractClauseResolver.java
    sis/branches/JDK8/storage/sis-shapefile/src/main/resources/org/apache/sis/internal/shapefile/jdbc/sql/ClauseResolver.properties
      - copied unchanged from r1650209, sis/branches/JDK8/storage/sis-shapefile/src/main/resources/org/apache/sis/internal/shapefile/jdbc/sql/AbstractClauseResolver.properties
    sis/branches/JDK8/storage/sis-shapefile/src/main/resources/org/apache/sis/internal/shapefile/jdbc/sql/ClauseResolver_fr.properties
      - copied unchanged from r1650209, sis/branches/JDK8/storage/sis-shapefile/src/main/resources/org/apache/sis/internal/shapefile/jdbc/sql/AbstractClauseResolver_fr.properties
Removed:
    sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/logging/AbstractAutoChecker.java
    sis/branches/JDK8/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/metadata/AbstractUnimplementedFeaturesOfDatabaseMetaData.java
    sis/branches/JDK8/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/resultset/AbstractBuiltInMemoryResultSet.java
    sis/branches/JDK8/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/sql/AbstractClauseResolver.java
    sis/branches/JDK8/storage/sis-shapefile/src/main/resources/org/apache/sis/internal/shapefile/jdbc/sql/AbstractClauseResolver.properties
    sis/branches/JDK8/storage/sis-shapefile/src/main/resources/org/apache/sis/internal/shapefile/jdbc/sql/AbstractClauseResolver_fr.properties
Modified:
    sis/branches/JDK8/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/AbstractJDBC.java
    sis/branches/JDK8/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/CommonByteReader.java
    sis/branches/JDK8/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/DBase3FieldDescriptor.java
    sis/branches/JDK8/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/metadata/DBFDatabaseMetaData.java
    sis/branches/JDK8/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/resultset/DBFBuiltInMemoryResultSetForCatalogNamesListing.java
    sis/branches/JDK8/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/resultset/DBFBuiltInMemoryResultSetForColumnsListing.java
    sis/branches/JDK8/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/resultset/DBFBuiltInMemoryResultSetForSchemaListing.java
    sis/branches/JDK8/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/resultset/DBFBuiltInMemoryResultSetForTablesListing.java
    sis/branches/JDK8/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/resultset/DBFBuiltInMemoryResultSetForTablesTypesListing.java
    sis/branches/JDK8/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/sql/ConditionalClauseResolver.java

Copied: sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/logging/AutoChecker.java
(from r1650209, sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/logging/AbstractAutoChecker.java)
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/logging/AutoChecker.java?p2=sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/logging/AutoChecker.java&p1=sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/logging/AbstractAutoChecker.java&r1=1650209&r2=1650210&rev=1650210&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/logging/AbstractAutoChecker.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/logging/AutoChecker.java
[UTF-8] Thu Jan  8 05:57:24 2015
@@ -30,7 +30,7 @@ import java.util.logging.Logger;
  * and easy access to Bundle and logging function. 
  * @author Marc LE BIHAN
  */
-public abstract class AbstractAutoChecker {
+public abstract class AutoChecker {
     /** Logger. */
     private Logger logger = Logging.getLogger(getClass().getSimpleName());
 

Modified: sis/branches/JDK8/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/AbstractJDBC.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/AbstractJDBC.java?rev=1650210&r1=1650209&r2=1650210&view=diff
==============================================================================
--- sis/branches/JDK8/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/AbstractJDBC.java
[UTF-8] (original)
+++ sis/branches/JDK8/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/AbstractJDBC.java
[UTF-8] Thu Jan  8 05:57:24 2015
@@ -20,7 +20,7 @@ import java.io.File;
 import java.sql.*;
 import java.util.logging.Level;
 
-import org.apache.sis.util.logging.AbstractAutoChecker;
+import org.apache.sis.util.logging.AutoChecker;
 
 
 /**
@@ -30,7 +30,7 @@ import org.apache.sis.util.logging.Abstr
  * @since   0.5
  * @module
  */
-public abstract class AbstractJDBC extends AbstractAutoChecker implements Wrapper {
+public abstract class AbstractJDBC extends AutoChecker implements Wrapper {
     /**
      * Constructs a new instance of a JDBC interface.
      */

Modified: sis/branches/JDK8/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/CommonByteReader.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/CommonByteReader.java?rev=1650210&r1=1650209&r2=1650210&view=diff
==============================================================================
--- sis/branches/JDK8/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/CommonByteReader.java
(original)
+++ sis/branches/JDK8/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/CommonByteReader.java
Thu Jan  8 05:57:24 2015
@@ -22,7 +22,7 @@ import java.nio.channels.FileChannel;
 import java.util.Objects;
 import java.util.logging.Level;
 
-import org.apache.sis.util.logging.AbstractAutoChecker;
+import org.apache.sis.util.logging.AutoChecker;
 
 /**
  * Common byte reader.
@@ -33,7 +33,7 @@ import org.apache.sis.util.logging.Abstr
  * @since   0.5
  * @module
  */
-public abstract class CommonByteReader<InvalidFormatException extends Exception, FNFException
extends Exception> extends AbstractAutoChecker  implements AutoCloseable  {
+public abstract class CommonByteReader<InvalidFormatException extends Exception, FNFException
extends Exception> extends AutoChecker  implements AutoCloseable  {
     /** The File. */
     private File file;
     

Modified: sis/branches/JDK8/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/DBase3FieldDescriptor.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/DBase3FieldDescriptor.java?rev=1650210&r1=1650209&r2=1650210&view=diff
==============================================================================
--- sis/branches/JDK8/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/DBase3FieldDescriptor.java
[UTF-8] (original)
+++ sis/branches/JDK8/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/DBase3FieldDescriptor.java
[UTF-8] Thu Jan  8 05:57:24 2015
@@ -18,7 +18,7 @@ package org.apache.sis.internal.shapefil
 
 import java.nio.MappedByteBuffer;
 
-import org.apache.sis.util.logging.AbstractAutoChecker;
+import org.apache.sis.util.logging.AutoChecker;
 
 
 /**
@@ -29,7 +29,7 @@ import org.apache.sis.util.logging.Abstr
  * @version 0.5
  * @module
  */
-public class DBase3FieldDescriptor extends AbstractAutoChecker {
+public class DBase3FieldDescriptor extends AutoChecker {
     /** Field name. */
     private byte[] fieldName = new byte[11];
 

Copied: sis/branches/JDK8/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/metadata/AbstractDatabaseMetaData.java
(from r1650209, sis/branches/JDK8/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/metadata/AbstractUnimplementedFeaturesOfDatabaseMetaData.java)
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/metadata/AbstractDatabaseMetaData.java?p2=sis/branches/JDK8/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/metadata/AbstractDatabaseMetaData.java&p1=sis/branches/JDK8/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/metadata/AbstractUnimplementedFeaturesOfDatabaseMetaData.java&r1=1650209&r2=1650210&rev=1650210&view=diff
==============================================================================
--- sis/branches/JDK8/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/metadata/AbstractUnimplementedFeaturesOfDatabaseMetaData.java
[UTF-8] (original)
+++ sis/branches/JDK8/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/metadata/AbstractDatabaseMetaData.java
[UTF-8] Thu Jan  8 05:57:24 2015
@@ -8,7 +8,7 @@ import org.apache.sis.internal.shapefile
  * Unimplemented methods of DatabaseMetaData.
  * @author Marc LE BIHAN
  */
-public abstract class AbstractUnimplementedFeaturesOfDatabaseMetaData extends AbstractJDBC
implements DatabaseMetaData {
+public abstract class AbstractDatabaseMetaData extends AbstractJDBC implements DatabaseMetaData
{
     /**
      * @see java.sql.DatabaseMetaData#getAttributes(java.lang.String, java.lang.String, java.lang.String,
java.lang.String)
      */

Modified: sis/branches/JDK8/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/metadata/DBFDatabaseMetaData.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/metadata/DBFDatabaseMetaData.java?rev=1650210&r1=1650209&r2=1650210&view=diff
==============================================================================
--- sis/branches/JDK8/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/metadata/DBFDatabaseMetaData.java
[UTF-8] (original)
+++ sis/branches/JDK8/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/metadata/DBFDatabaseMetaData.java
[UTF-8] Thu Jan  8 05:57:24 2015
@@ -30,7 +30,7 @@ import org.apache.sis.internal.shapefile
  * Database Metadata.
  * @author Marc LE BIHAN
  */
-public class DBFDatabaseMetaData extends AbstractUnimplementedFeaturesOfDatabaseMetaData
{
+public class DBFDatabaseMetaData extends AbstractDatabaseMetaData {
     /** Connection. */
     private DBFConnection connection;
     

Copied: sis/branches/JDK8/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/resultset/BuiltInMemoryResultSet.java
(from r1650209, sis/branches/JDK8/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/resultset/AbstractBuiltInMemoryResultSet.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?p2=sis/branches/JDK8/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/resultset/BuiltInMemoryResultSet.java&p1=sis/branches/JDK8/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/resultset/AbstractBuiltInMemoryResultSet.java&r1=1650209&r2=1650210&rev=1650210&view=diff
==============================================================================
--- sis/branches/JDK8/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/resultset/AbstractBuiltInMemoryResultSet.java
[UTF-8] (original)
+++ sis/branches/JDK8/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/resultset/BuiltInMemoryResultSet.java
[UTF-8] Thu Jan  8 05:57:24 2015
@@ -31,13 +31,13 @@ import org.apache.sis.internal.shapefile
  * @since   0.5
  * @module
  */
-public abstract class AbstractBuiltInMemoryResultSet extends AbstractResultSet {
+public abstract class BuiltInMemoryResultSet extends AbstractResultSet {
     /**
      * Construct a ResultSet for descriptions.
      * @param stmt Statement.
      * @param sqlQuery SQLQuery.
      */
-    public AbstractBuiltInMemoryResultSet(DBFStatement stmt, String sqlQuery) {
+    public BuiltInMemoryResultSet(DBFStatement stmt, String sqlQuery) {
         super(stmt, sqlQuery);
     }
 

Modified: sis/branches/JDK8/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/resultset/DBFBuiltInMemoryResultSetForCatalogNamesListing.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/resultset/DBFBuiltInMemoryResultSetForCatalogNamesListing.java?rev=1650210&r1=1650209&r2=1650210&view=diff
==============================================================================
--- sis/branches/JDK8/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/resultset/DBFBuiltInMemoryResultSetForCatalogNamesListing.java
[UTF-8] (original)
+++ sis/branches/JDK8/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/resultset/DBFBuiltInMemoryResultSetForCatalogNamesListing.java
[UTF-8] Thu Jan  8 05:57:24 2015
@@ -23,7 +23,7 @@ import org.apache.sis.internal.shapefile
  * Special ResultSet listing tables types contained in this DBase 3 (none).
  * @author Marc LE BIHAN
  */
-public class DBFBuiltInMemoryResultSetForCatalogNamesListing extends AbstractBuiltInMemoryResultSet
{
+public class DBFBuiltInMemoryResultSetForCatalogNamesListing extends BuiltInMemoryResultSet
{
     /**
      * Construct a ResultSet listing the catalog names of a database.
      * @param stmt Statement.

Modified: sis/branches/JDK8/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/resultset/DBFBuiltInMemoryResultSetForColumnsListing.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/resultset/DBFBuiltInMemoryResultSetForColumnsListing.java?rev=1650210&r1=1650209&r2=1650210&view=diff
==============================================================================
--- sis/branches/JDK8/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/resultset/DBFBuiltInMemoryResultSetForColumnsListing.java
(original)
+++ sis/branches/JDK8/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/resultset/DBFBuiltInMemoryResultSetForColumnsListing.java
Thu Jan  8 05:57:24 2015
@@ -30,7 +30,7 @@ import org.apache.sis.internal.shapefile
  * Special ResultSet listing columns contained in this DBase 3.
  * @author Marc LE BIHAN
  */
-public class DBFBuiltInMemoryResultSetForColumnsListing extends AbstractBuiltInMemoryResultSet
{
+public class DBFBuiltInMemoryResultSetForColumnsListing extends BuiltInMemoryResultSet {
     /** Current field descriptor. */
     private DBase3FieldDescriptor current;
     

Modified: sis/branches/JDK8/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/resultset/DBFBuiltInMemoryResultSetForSchemaListing.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/resultset/DBFBuiltInMemoryResultSetForSchemaListing.java?rev=1650210&r1=1650209&r2=1650210&view=diff
==============================================================================
--- sis/branches/JDK8/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/resultset/DBFBuiltInMemoryResultSetForSchemaListing.java
[UTF-8] (original)
+++ sis/branches/JDK8/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/resultset/DBFBuiltInMemoryResultSetForSchemaListing.java
[UTF-8] Thu Jan  8 05:57:24 2015
@@ -23,7 +23,7 @@ import org.apache.sis.internal.shapefile
  * Special ResultSet listing schemas contained in this DBase 3 (they are none).
  * @author Marc LE BIHAN
  */
-public class DBFBuiltInMemoryResultSetForSchemaListing extends AbstractBuiltInMemoryResultSet
{
+public class DBFBuiltInMemoryResultSetForSchemaListing extends BuiltInMemoryResultSet {
     /**
      * Construct a ResultSet listing the tables of a database.
      * @param stmt Statement.

Modified: sis/branches/JDK8/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/resultset/DBFBuiltInMemoryResultSetForTablesListing.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/resultset/DBFBuiltInMemoryResultSetForTablesListing.java?rev=1650210&r1=1650209&r2=1650210&view=diff
==============================================================================
--- sis/branches/JDK8/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/resultset/DBFBuiltInMemoryResultSetForTablesListing.java
[UTF-8] (original)
+++ sis/branches/JDK8/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/resultset/DBFBuiltInMemoryResultSetForTablesListing.java
[UTF-8] Thu Jan  8 05:57:24 2015
@@ -24,7 +24,7 @@ import org.apache.sis.internal.shapefile
  * Special ResultSet listing tables contained in this DBase 3 (a single table).
  * @author Marc LE BIHAN
  */
-public class DBFBuiltInMemoryResultSetForTablesListing extends AbstractBuiltInMemoryResultSet
{
+public class DBFBuiltInMemoryResultSetForTablesListing extends BuiltInMemoryResultSet {
     /** There's only one result in this ResultSet. */
     private int index = 0;
     

Modified: sis/branches/JDK8/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/resultset/DBFBuiltInMemoryResultSetForTablesTypesListing.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/resultset/DBFBuiltInMemoryResultSetForTablesTypesListing.java?rev=1650210&r1=1650209&r2=1650210&view=diff
==============================================================================
--- sis/branches/JDK8/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/resultset/DBFBuiltInMemoryResultSetForTablesTypesListing.java
[UTF-8] (original)
+++ sis/branches/JDK8/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/resultset/DBFBuiltInMemoryResultSetForTablesTypesListing.java
[UTF-8] Thu Jan  8 05:57:24 2015
@@ -24,7 +24,7 @@ import org.apache.sis.internal.shapefile
  * Special ResultSet listing tables types contained in this DBase 3 (only tables).
  * @author Marc LE BIHAN
  */
-public class DBFBuiltInMemoryResultSetForTablesTypesListing extends AbstractBuiltInMemoryResultSet
{
+public class DBFBuiltInMemoryResultSetForTablesTypesListing extends BuiltInMemoryResultSet
{
     /** There's only one result in this ResultSet. */
     private int index = 0;
     

Copied: sis/branches/JDK8/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/sql/ClauseResolver.java
(from r1650209, sis/branches/JDK8/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/sql/AbstractClauseResolver.java)
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/sql/ClauseResolver.java?p2=sis/branches/JDK8/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/sql/ClauseResolver.java&p1=sis/branches/JDK8/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/sql/AbstractClauseResolver.java&r1=1650209&r2=1650210&rev=1650210&view=diff
==============================================================================
--- sis/branches/JDK8/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/sql/AbstractClauseResolver.java
[UTF-8] (original)
+++ sis/branches/JDK8/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/sql/ClauseResolver.java
[UTF-8] Thu Jan  8 05:57:24 2015
@@ -22,13 +22,13 @@ import java.util.logging.Level;
 
 import org.apache.sis.internal.shapefile.jdbc.SQLConnectionClosedException;
 import org.apache.sis.internal.shapefile.jdbc.resultset.*;
-import org.apache.sis.util.logging.AbstractAutoChecker;
+import org.apache.sis.util.logging.AutoChecker;
 
 /**
  * Base class for clause resolver.
  * @author Marc LE BIHAN
  */
-public abstract class AbstractClauseResolver extends AbstractAutoChecker {
+public abstract class ClauseResolver extends AutoChecker {
     /** First comparand. */
     private Object comparand1;
     
@@ -44,7 +44,7 @@ public abstract class AbstractClauseReso
      * @param cmp2 The second comparand that might be a primitive or a Field.
      * @param op The operator to apply.
      */
-    public AbstractClauseResolver(Object cmp1, Object cmp2, String op) {
+    public ClauseResolver(Object cmp1, Object cmp2, String op) {
         comparand1 = cmp1;
         comparand2 = cmp2;
         operator = op;

Modified: sis/branches/JDK8/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/sql/ConditionalClauseResolver.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/sql/ConditionalClauseResolver.java?rev=1650210&r1=1650209&r2=1650210&view=diff
==============================================================================
--- sis/branches/JDK8/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/sql/ConditionalClauseResolver.java
[UTF-8] (original)
+++ sis/branches/JDK8/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/sql/ConditionalClauseResolver.java
[UTF-8] Thu Jan  8 05:57:24 2015
@@ -24,7 +24,7 @@ package org.apache.sis.internal.shapefil
  * <br>- This class is only here temporary, and will be replaced by a good SQL parser
as soon as possible. 
  * @author Marc LE BIHAN
  */
-public class ConditionalClauseResolver extends AbstractClauseResolver
+public class ConditionalClauseResolver extends ClauseResolver
 {
     /**
      * Construct a where clause resolver.



Mime
View raw message