sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mlebi...@apache.org
Subject svn commit: r1649998 [2/2] - 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/ storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile...
Date Wed, 07 Jan 2015 06:34:42 GMT
Modified: sis/branches/JDK8/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/resultset/SQLNoResultException.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/resultset/SQLNoResultException.java?rev=1649998&r1=1649997&r2=1649998&view=diff
==============================================================================
--- sis/branches/JDK8/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/resultset/SQLNoResultException.java
[UTF-8] (original)
+++ sis/branches/JDK8/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/resultset/SQLNoResultException.java
[UTF-8] Wed Jan  7 06:34:41 2015
@@ -28,21 +28,21 @@ public class SQLNoResultException extend
     private static final long serialVersionUID = -6685966109486353932L;
 
     /** The SQL Statement that whas attempted. */
-    private String m_sql;
+    private String sql;
     
     /** The database that was queried. */
-    private File m_database;
+    private File database;
     
     /**
      * Build the exception.
      * @param message Exception message.
-     * @param sql SQL Statement who encountered the trouble.
-     * @param database The database that was queried.
+     * @param sqlStatement SQL Statement who encountered the trouble.
+     * @param dbf The database that was queried.
      */
-    public SQLNoResultException(String message, String sql, File database) {
+    public SQLNoResultException(String message, String sqlStatement, File dbf) {
         super(message);
-        m_sql = sql;
-        m_database = database;
+        sql = sqlStatement;
+        database = dbf;
     }
     
     /**
@@ -50,7 +50,7 @@ public class SQLNoResultException extend
      * @return SQL statement.
      */
     public String getSQL() {
-        return m_sql;
+        return sql;
     }
     
     /**
@@ -58,6 +58,6 @@ public class SQLNoResultException extend
      * @return The database that was queried.
      */
     public File getDatabase() {
-        return m_database;
+        return database;
     }
 }

Modified: sis/branches/JDK8/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/resultset/SQLNoSuchFieldException.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/resultset/SQLNoSuchFieldException.java?rev=1649998&r1=1649997&r2=1649998&view=diff
==============================================================================
--- sis/branches/JDK8/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/resultset/SQLNoSuchFieldException.java
[UTF-8] (original)
+++ sis/branches/JDK8/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/resultset/SQLNoSuchFieldException.java
[UTF-8] Wed Jan  7 06:34:41 2015
@@ -28,26 +28,26 @@ public class SQLNoSuchFieldException ext
     private static final long serialVersionUID = 1118679516090878177L;
 
     /** The SQL Statement (if known). */
-    private String m_sql;
+    private String sql;
     
     /** The database file. */
-    private File m_database;
+    private File database;
     
     /** Column name that doesn't exist. */
-    private String m_columnName;
+    private String columnName;
     
     /**
      * Build the exception.
      * @param message Exception message.
-     * @param sql SQL Statement who encountered the trouble, if known.
-     * @param database The database that was queried.
-     * @param columnName The column name that doesn't exist.
+     * @param sqlStatement SQL Statement who encountered the trouble, if known.
+     * @param dbf The database that was queried.
+     * @param colName The column name that doesn't exist.
      */
-    public SQLNoSuchFieldException(String message, String sql, File database, String columnName)
{
+    public SQLNoSuchFieldException(String message, String sqlStatement, File dbf, String
colName) {
         super(message);
-        m_sql = sql;
-        m_database = database;
-        m_columnName = columnName;
+        sql = sqlStatement;
+        database = dbf;
+        columnName = colName;
     }
     
     /**
@@ -55,7 +55,7 @@ public class SQLNoSuchFieldException ext
      * @return SQL statement or null.
      */
     public String getSQL() {
-        return m_sql;
+        return sql;
     }
     
     /**
@@ -63,7 +63,7 @@ public class SQLNoSuchFieldException ext
      * @return Column name.
      */
     public String getColumnName() {
-        return m_columnName;
+        return columnName;
     }
     
     /**
@@ -71,6 +71,6 @@ public class SQLNoSuchFieldException ext
      * @return Database file.
      */
     public File getDatabase() {
-        return m_database;
+        return database;
     }
 }

Modified: sis/branches/JDK8/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/resultset/SQLNotDateException.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/resultset/SQLNotDateException.java?rev=1649998&r1=1649997&r2=1649998&view=diff
==============================================================================
--- sis/branches/JDK8/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/resultset/SQLNotDateException.java
[UTF-8] (original)
+++ sis/branches/JDK8/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/resultset/SQLNotDateException.java
[UTF-8] Wed Jan  7 06:34:41 2015
@@ -28,31 +28,31 @@ public class SQLNotDateException extends
     private static final long serialVersionUID = 848673127131548693L;
 
     /** The SQL Statement (if known). */
-    private String m_sql;
+    private String sql;
     
     /** The database file. */
-    private File m_database;
+    private File database;
     
     /** Column name. */
-    private String m_columnName;
+    private String columnName;
     
     /** The value that is not numeric. */
-    private String m_value;
+    private String value;
     
     /**
      * Build the exception.
      * @param message Exception message.
-     * @param sql SQL Statement who encountered the trouble, if known.
-     * @param database The database that was queried.
-     * @param columnName The column name that has a non numeric value.
-     * @param value The wrong value.
+     * @param sqlStatement SQL Statement who encountered the trouble, if known.
+     * @param dbf The database that was queried.
+     * @param colName The column name that has a non numeric value.
+     * @param wrongValue The wrong value.
      */
-    public SQLNotDateException(String message, String sql, File database, String columnName,
String value) {
+    public SQLNotDateException(String message, String sqlStatement, File dbf, String colName,
String wrongValue) {
         super(message);
-        m_sql = sql;
-        m_database = database;
-        m_columnName = columnName;
-        m_value = value;
+        sql = sqlStatement;
+        database = dbf;
+        columnName = colName;
+        value = wrongValue;
     }
     
     /**
@@ -60,7 +60,7 @@ public class SQLNotDateException extends
      * @return SQL statement or null.
      */
     public String getSQL() {
-        return m_sql;
+        return sql;
     }
     
     /**
@@ -68,7 +68,7 @@ public class SQLNotDateException extends
      * @return Column name.
      */
     public String getColumnName() {
-        return m_columnName;
+        return columnName;
     }
     
     /**
@@ -76,7 +76,7 @@ public class SQLNotDateException extends
      * @return Value.
      */
     public String getValue() {
-        return m_value;
+        return value;
     }
     
     /**
@@ -84,6 +84,6 @@ public class SQLNotDateException extends
      * @return Database file.
      */
     public File getDatabase() {
-        return m_database;
+        return database;
     }
 }

Modified: sis/branches/JDK8/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/resultset/SQLNotNumericException.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/resultset/SQLNotNumericException.java?rev=1649998&r1=1649997&r2=1649998&view=diff
==============================================================================
--- sis/branches/JDK8/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/resultset/SQLNotNumericException.java
[UTF-8] (original)
+++ sis/branches/JDK8/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/resultset/SQLNotNumericException.java
[UTF-8] Wed Jan  7 06:34:41 2015
@@ -28,31 +28,31 @@ public class SQLNotNumericException exte
     private static final long serialVersionUID = -1065338463289030584L;
 
     /** The SQL Statement (if known). */
-    private String m_sql;
+    private String sql;
     
     /** The database file. */
-    private File m_database;
+    private File database;
     
     /** Column name. */
-    private String m_columnName;
+    private String columnName;
     
     /** The value that is not numeric. */
-    private String m_value;
+    private String value;
     
     /**
      * Build the exception.
      * @param message Exception message.
-     * @param sql SQL Statement who encountered the trouble, if known.
-     * @param database The database that was queried.
-     * @param columnName The column name that has a non numeric value.
-     * @param value The wrong value.
+     * @param sqlStatement SQL Statement who encountered the trouble, if known.
+     * @param dbf The database that was queried.
+     * @param colName The column name that has a non numeric value.
+     * @param wrongValue The wrong value.
      */
-    public SQLNotNumericException(String message, String sql, File database, String columnName,
String value) {
+    public SQLNotNumericException(String message, String sqlStatement, File dbf, String colName,
String wrongValue) {
         super(message);
-        m_sql = sql;
-        m_database = database;
-        m_columnName = columnName;
-        m_value = value;
+        sql = sqlStatement;
+        database = dbf;
+        columnName = colName;
+        value = wrongValue;
     }
     
     /**
@@ -60,7 +60,7 @@ public class SQLNotNumericException exte
      * @return SQL statement or null.
      */
     public String getSQL() {
-        return m_sql;
+        return sql;
     }
     
     /**
@@ -68,7 +68,7 @@ public class SQLNotNumericException exte
      * @return Column name.
      */
     public String getColumnName() {
-        return m_columnName;
+        return columnName;
     }
     
     /**
@@ -76,7 +76,7 @@ public class SQLNotNumericException exte
      * @return Value.
      */
     public String getValue() {
-        return m_value;
+        return value;
     }
     
     /**
@@ -84,6 +84,6 @@ public class SQLNotNumericException exte
      * @return Database file.
      */
     public File getDatabase() {
-        return m_database;
+        return database;
     }
 }

Modified: 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/AbstractClauseResolver.java?rev=1649998&r1=1649997&r2=1649998&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/AbstractClauseResolver.java
[UTF-8] Wed Jan  7 06:34:41 2015
@@ -30,24 +30,24 @@ import org.apache.sis.util.logging.Abstr
  */
 public abstract class AbstractClauseResolver extends AbstractAutoChecker {
     /** First comparand. */
-    private Object m_comparand1;
+    private Object comparand1;
     
     /** Second comparand. */
-    private Object m_comparand2;
+    private Object comparand2;
     
     /** Operator. */
-    private String m_operator;
+    private String operator;
     
     /**
      * Construct a where clause resolver.
-     * @param comparand1 The first comparand that might be a primitive or a Field.
-     * @param comparand2 The second comparand that might be a primitive or a Field.
-     * @param operator The operator to apply.
-     */
-    public AbstractClauseResolver(Object comparand1, Object comparand2, String operator)
{
-        m_comparand1 = comparand1;
-        m_comparand2 = comparand2;
-        m_operator = operator;
+     * @param cmp1 The first comparand that might be a primitive or a Field.
+     * @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) {
+        comparand1 = cmp1;
+        comparand2 = cmp2;
+        operator = op;
     }
 
     /**
@@ -55,7 +55,7 @@ public abstract class AbstractClauseReso
      * @return First comparand.
      */
     public Object getComparand1() {
-        return m_comparand1;
+        return comparand1;
     }
 
     /**
@@ -63,7 +63,7 @@ public abstract class AbstractClauseReso
      * @return Second comparand.
      */
     public Object getComparand2() {
-        return m_comparand2;
+        return comparand2;
     }
 
     /**
@@ -71,7 +71,7 @@ public abstract class AbstractClauseReso
      * @return Operator.
      */
     public String getOperator() {
-        return m_operator;
+        return operator;
     }
 
     /**
@@ -79,7 +79,7 @@ public abstract class AbstractClauseReso
      * @param comparand First comparand.
      */
     public void setComparand1(Object comparand) {
-        m_comparand1 = comparand;
+        comparand1 = comparand;
     }
 
     /**
@@ -87,15 +87,15 @@ public abstract class AbstractClauseReso
      * @param comparand Second comparand.
      */
     public void setComparand2(Object comparand) {
-        m_comparand2 = comparand;
+        comparand2 = comparand;
     }
 
     /**
      * Set the operator.
-     * @param operator Operator.
+     * @param op Operator.
      */
-    public void setOperator(String operator) {
-        m_operator = operator;
+    public void setOperator(String op) {
+        operator = op;
     }
     
     /**

Modified: sis/branches/JDK8/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/sql/CrudeSQLParser.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/sql/CrudeSQLParser.java?rev=1649998&r1=1649997&r2=1649998&view=diff
==============================================================================
--- sis/branches/JDK8/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/sql/CrudeSQLParser.java
[UTF-8] (original)
+++ sis/branches/JDK8/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/sql/CrudeSQLParser.java
[UTF-8] Wed Jan  7 06:34:41 2015
@@ -13,15 +13,15 @@ import org.apache.sis.internal.shapefile
  */
 public class CrudeSQLParser extends AbstractJDBC {
     /** ResultSet followed straight forward. */
-    private DBFRecordBasedResultSet m_rs;
+    private DBFRecordBasedResultSet rs;
     
     /**
      * Construct a crude SQL parser.
-     * @param rs Target ResultSet.
+     * @param resultset Target ResultSet.
      */
-    public CrudeSQLParser(DBFRecordBasedResultSet rs) {
-        Objects.requireNonNull(rs, "The ResultSet given to the SQL parser cannot be null.");
-        m_rs = rs;
+    public CrudeSQLParser(DBFRecordBasedResultSet resultset) {
+        Objects.requireNonNull(resultset, "The ResultSet given to the SQL parser cannot be
null.");
+        rs = resultset;
     }
     
     /**
@@ -32,11 +32,11 @@ public class CrudeSQLParser extends Abst
     public ConditionalClauseResolver parse() throws SQLInvalidStatementException {
         logStep("parse");
         
-        String sql = m_rs.getSQL().trim();
+        String sql = rs.getSQL().trim();
         
         if (sql.toLowerCase().startsWith("select * from ") == false) {
             String message = format(Level.WARNING, "excp.limited_feature_syntax", sql);
-            throw new SQLInvalidStatementException(message, m_rs.getSQL(), m_rs.getFile());
+            throw new SQLInvalidStatementException(message, rs.getSQL(), rs.getFile());
         }
         
         final String whereWord = " where ";
@@ -53,7 +53,7 @@ public class CrudeSQLParser extends Abst
         // If the condition is empty, it's a syntax error because a WHERE clause went before.
         if (whereCondition.isEmpty()) {
             String message = format(Level.WARNING, "excp.where_without_conditions", sql);
           
-            throw new SQLInvalidStatementException(message, m_rs.getSQL(), m_rs.getFile());
+            throw new SQLInvalidStatementException(message, rs.getSQL(), rs.getFile());
         }
         
         // Currently, all the condition are made of three parts :
@@ -64,7 +64,7 @@ public class CrudeSQLParser extends Abst
         
         if (parts.length != 3) {
             String message = format(Level.WARNING, "excp.limited_feature_conditional_parsing",
whereCondition, sql);
-            throw new SQLInvalidStatementException(message, m_rs.getSQL(), m_rs.getFile());
+            throw new SQLInvalidStatementException(message, rs.getSQL(), rs.getFile());
         }
         
         // Detect and promote litterals in parameters to their best types.
@@ -108,7 +108,7 @@ public class CrudeSQLParser extends Abst
      * @see org.apache.sis.internal.shapefile.jdbc.AbstractJDBC#getFile()
      */
     @Override protected File getFile() {
-        return m_rs.getFile();
+        return rs.getFile();
     }
 
     /**

Modified: sis/branches/JDK8/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/sql/SQLIllegalParameterException.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/sql/SQLIllegalParameterException.java?rev=1649998&r1=1649997&r2=1649998&view=diff
==============================================================================
--- sis/branches/JDK8/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/sql/SQLIllegalParameterException.java
[UTF-8] (original)
+++ sis/branches/JDK8/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/sql/SQLIllegalParameterException.java
[UTF-8] Wed Jan  7 06:34:41 2015
@@ -28,31 +28,31 @@ public class SQLIllegalParameterExceptio
     private static final long serialVersionUID = -3173798942882143448L;
 
     /** The SQL Statement (if known). */
-    private String m_sql;
+    private String sql;
     
     /** The database file. */
-    private File m_database;
+    private File database;
     
     /** Parameter name (if known) that is invalid. */
-    private String m_parameterName;
+    private String parameterName;
     
     /** Parameter value that is invalid. */
-    private String m_parameterValue;
+    private String parameterValue;
     
     /**
      * Build the exception.
      * @param message Exception message.
-     * @param sql SQL Statement who encountered the trouble, if known.
-     * @param database The database that was queried.
-     * @param parameterName The parameter name that is invalid.
-     * @param parameterValue The parameter value that is invalid.
+     * @param sqlStatement SQL Statement who encountered the trouble, if known.
+     * @param dbf The database that was queried.
+     * @param name The parameter name that is invalid.
+     * @param value The parameter value that is invalid.
      */
-    public SQLIllegalParameterException(String message, String sql, File database, String
parameterName, String parameterValue) {
+    public SQLIllegalParameterException(String message, String sqlStatement, File dbf, String
name, String value) {
         super(message);
-        m_sql = sql;
-        m_database = database;
-        m_parameterName = parameterName;
-        m_parameterValue = parameterValue;
+        sql = sqlStatement;
+        database = dbf;
+        parameterName = name;
+        parameterValue = value;
     }
     
     /**
@@ -60,7 +60,7 @@ public class SQLIllegalParameterExceptio
      * @return SQL statement or null.
      */
     public String getSQL() {
-        return m_sql;
+        return sql;
     }
     
     /**
@@ -68,7 +68,7 @@ public class SQLIllegalParameterExceptio
      * @return Parameter name.
      */
     public String geParameterName() {
-        return m_parameterName;
+        return parameterName;
     }
     
     /**
@@ -76,7 +76,7 @@ public class SQLIllegalParameterExceptio
      * @return Parameter name.
      */
     public String geParameterValue() {
-        return m_parameterValue;
+        return parameterValue;
     }
     
     /**
@@ -84,6 +84,6 @@ public class SQLIllegalParameterExceptio
      * @return Database file.
      */
     public File getDatabase() {
-        return m_database;
+        return database;
     }
 }

Modified: sis/branches/JDK8/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/sql/SQLInvalidStatementException.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/sql/SQLInvalidStatementException.java?rev=1649998&r1=1649997&r2=1649998&view=diff
==============================================================================
--- sis/branches/JDK8/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/sql/SQLInvalidStatementException.java
[UTF-8] (original)
+++ sis/branches/JDK8/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/sql/SQLInvalidStatementException.java
[UTF-8] Wed Jan  7 06:34:41 2015
@@ -28,21 +28,21 @@ public class SQLInvalidStatementExceptio
     private static final long serialVersionUID = -1807300055143449480L;
 
     /** The SQL Statement (if known). */
-    private String m_sql;
+    private String sql;
     
     /** The database file. */
-    private File m_database;
+    private File database;
     
     /**
      * Build the exception.
      * @param message Exception message.
-     * @param sql SQL Statement who encountered the trouble, if known.
-     * @param database The database that was queried.
+     * @param sqlStatement SQL Statement who encountered the trouble, if known.
+     * @param dbf The database that was queried.
      */
-    public SQLInvalidStatementException(String message, String sql, File database) {
+    public SQLInvalidStatementException(String message, String sqlStatement, File dbf) {
         super(message);
-        m_sql = sql;
-        m_database = database;
+        sql = sqlStatement;
+        database = dbf;
     }
     
     /**
@@ -50,7 +50,7 @@ public class SQLInvalidStatementExceptio
      * @return SQL statement or null.
      */
     public String getSQL() {
-        return m_sql;
+        return sql;
     }
     
     /**
@@ -58,6 +58,6 @@ public class SQLInvalidStatementExceptio
      * @return Database file.
      */
     public File getDatabase() {
-        return m_database;
+        return database;
     }
 }

Modified: sis/branches/JDK8/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/sql/SQLUnsupportedParsingFeatureException.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/sql/SQLUnsupportedParsingFeatureException.java?rev=1649998&r1=1649997&r2=1649998&view=diff
==============================================================================
--- sis/branches/JDK8/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/sql/SQLUnsupportedParsingFeatureException.java
[UTF-8] (original)
+++ sis/branches/JDK8/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/sql/SQLUnsupportedParsingFeatureException.java
[UTF-8] Wed Jan  7 06:34:41 2015
@@ -28,21 +28,21 @@ public class SQLUnsupportedParsingFeatur
     private static final long serialVersionUID = 6944940576163675495L;
 
     /** The SQL Statement that whas attempted. */
-    private String m_sql;
+    private String sql;
     
     /** The database that was queried. */
-    private File m_database;
+    private File database;
     
     /**
      * Build the exception.
      * @param message Exception message.
-     * @param sql SQL Statement who encountered the trouble.
-     * @param database The database that was queried.
+     * @param sqlStatement SQL Statement who encountered the trouble.
+     * @param dbf The database that was queried.
      */
-    public SQLUnsupportedParsingFeatureException(String message, String sql, File database)
{
+    public SQLUnsupportedParsingFeatureException(String message, String sqlStatement, File
dbf) {
         super(message);
-        m_sql = sql;
-        m_database = database;
+        sql = sqlStatement;
+        database = dbf;
     }
     
     /**
@@ -50,7 +50,7 @@ public class SQLUnsupportedParsingFeatur
      * @return SQL statement.
      */
     public String getSQL() {
-        return m_sql;
+        return sql;
     }
     
     /**
@@ -58,6 +58,6 @@ public class SQLUnsupportedParsingFeatur
      * @return The database that was queried.
      */
     public File getDatabase() {
-        return m_database;
+        return database;
     }
 }

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=1649998&r1=1649997&r2=1649998&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] Wed Jan  7 06:34:41 2015
@@ -43,7 +43,7 @@ public class DBFStatement extends Abstra
     private DBFConnection connection;
 
     /** ResultSets that are currently opened. */
-    private HashSet<AbstractResultSet> m_openedResultSets = new HashSet<>();

+    private HashSet<AbstractResultSet> openedResultSets = new HashSet<>(); 
     
     /** The current result set, or {@code null} if none. */
     private AbstractResultSet currentResultSet;
@@ -163,8 +163,8 @@ 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 (m_openedResultSets.size() > 0) {
-            format(Level.WARNING, "log.resultsets_left_opened", m_openedResultSets.size(),
m_openedResultSets.stream().map(AbstractResultSet::toString).collect(Collectors.joining(",
")));  
+        if (openedResultSets.size() > 0) {
+            format(Level.WARNING, "log.resultsets_left_opened", openedResultSets.size(),
openedResultSets.stream().map(AbstractResultSet::toString).collect(Collectors.joining(", ")));
 
         }
         
         isClosed = true;
@@ -212,7 +212,7 @@ public class DBFStatement extends Abstra
         if (currentResultSet == rs)
             currentResultSet = null;
         
-        if (m_openedResultSets.remove(rs) == false) {
+        if (openedResultSets.remove(rs) == false) {
             throw new RuntimeException(format(Level.SEVERE, "assert.resultset_not_opened_by_me",
rs, toString()));
         }
     }
@@ -223,7 +223,7 @@ public class DBFStatement extends Abstra
      */
     public void registerResultSet(AbstractResultSet rs) {
         currentResultSet = rs;
-        m_openedResultSets.add(rs);
+        openedResultSets.add(rs);
     }
 
     /**

Modified: sis/branches/JDK8/storage/sis-shapefile/src/main/java/org/apache/sis/storage/shapefile/InputFeatureStream.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/storage/sis-shapefile/src/main/java/org/apache/sis/storage/shapefile/InputFeatureStream.java?rev=1649998&r1=1649997&r2=1649998&view=diff
==============================================================================
--- sis/branches/JDK8/storage/sis-shapefile/src/main/java/org/apache/sis/storage/shapefile/InputFeatureStream.java
(original)
+++ sis/branches/JDK8/storage/sis-shapefile/src/main/java/org/apache/sis/storage/shapefile/InputFeatureStream.java
Wed Jan  7 06:34:41 2015
@@ -45,35 +45,35 @@ import org.opengis.feature.Feature;
  */
 public class InputFeatureStream extends InputStream {
     /** Dedicated connection to DBF. */
-    private DBFConnection m_connection;
+    private DBFConnection connection;
     
     /** Statement. */
-    private DBFStatement m_stmt;
+    private DBFStatement stmt;
     
     /** ResultSet. */
-    private DBFRecordBasedResultSet m_rs;
+    private DBFRecordBasedResultSet rs;
     
     /** SQL Statement executed. */
-    private String m_sql;
+    private String sql;
     
     /** Marks the end of file. */
-    private boolean m_endOfFile;
+    private boolean endOfFile;
     
     /** Shapefile. */
-    private File m_shapefile;
+    private File shapefile;
     
     /** Database file. */
-    private File m_databaseFile;
+    private File databaseFile;
 
     /** Type of the features contained in this shapefile. */
-    private DefaultFeatureType m_featuresType;
+    private DefaultFeatureType featuresType;
     
     /** Shapefile reader. */
-    private ShapefileByteReader m_shapefileReader;
+    private ShapefileByteReader shapefileReader;
 
     /**
      * Create an input stream of features over a connection.
-     * @param shapefile Shapefile.
+     * @param shpfile Shapefile.
      * @param dbaseFile Database file.
      * @throws SQLInvalidStatementException if the given SQL Statement is invalid.
      * @throws InvalidShapefileFormatException if the shapefile format is invalid. 
@@ -81,14 +81,14 @@ public class InputFeatureStream extends
      * @throws ShapefileNotFoundException if the shapefile has not been found.
      * @throws DbaseFileNotFoundException if the database file has not been found.
      */
-    public InputFeatureStream(File shapefile, File dbaseFile) throws SQLInvalidStatementException,
InvalidDbaseFileFormatException, InvalidShapefileFormatException, ShapefileNotFoundException,
DbaseFileNotFoundException {
-        m_connection = (DBFConnection)new DBFDriver().connect(dbaseFile.getAbsolutePath(),
null);
-        m_sql = MessageFormat.format("SELECT * FROM {0}", dbaseFile.getName());
-        m_shapefile = shapefile;
-        m_databaseFile = dbaseFile;
+    public InputFeatureStream(File shpfile, File dbaseFile) throws SQLInvalidStatementException,
InvalidDbaseFileFormatException, InvalidShapefileFormatException, ShapefileNotFoundException,
DbaseFileNotFoundException {
+        connection = (DBFConnection)new DBFDriver().connect(dbaseFile.getAbsolutePath(),
null);
+        sql = MessageFormat.format("SELECT * FROM {0}", dbaseFile.getName());
+        shapefile = shpfile;
+        databaseFile = dbaseFile;
         
-        m_shapefileReader = new ShapefileByteReader(m_shapefile, m_databaseFile);
-        m_featuresType = m_shapefileReader.getFeaturesType(); 
+        shapefileReader = new ShapefileByteReader(shapefile, databaseFile);
+        featuresType = shapefileReader.getFeaturesType(); 
         
         try {
             executeQuery();
@@ -120,9 +120,9 @@ public class InputFeatureStream extends
      */
     @Override 
     public void close() {
-        m_rs.close();
-        m_stmt.close();
-        m_connection.close();
+        rs.close();
+        stmt.close();
+        connection.close();
     }
     
     /**
@@ -141,23 +141,23 @@ public class InputFeatureStream extends
      */
     public Feature readFeature() throws SQLConnectionClosedException, SQLInvalidStatementException,
SQLIllegalParameterException, SQLNoSuchFieldException, SQLUnsupportedParsingFeatureException,
SQLNotNumericException, SQLNotDateException, SQLFeatureNotSupportedException, SQLIllegalColumnIndexException,
InvalidShapefileFormatException {
         try {
-            if (m_endOfFile) {
+            if (endOfFile) {
                 return null;
             }
             
-            if (m_rs.next() == false) {
-                m_endOfFile = true;
+            if (rs.next() == false) {
+                endOfFile = true;
                 return null;
             }
             
-            Feature feature = m_featuresType.newInstance();
-            m_shapefileReader.completeFeature(feature);
-            DBFDatabaseMetaData metadata = (DBFDatabaseMetaData)m_connection.getMetaData();
+            Feature feature = featuresType.newInstance();
+            shapefileReader.completeFeature(feature);
+            DBFDatabaseMetaData metadata = (DBFDatabaseMetaData)connection.getMetaData();
             
             try(DBFBuiltInMemoryResultSetForColumnsListing rsDatabase = (DBFBuiltInMemoryResultSetForColumnsListing)metadata.getColumns(null,
null, null, null)) {
                 while(rsDatabase.next()) {
                     String fieldName = rsDatabase.getString("COLUMN_NAME");
-                    Object fieldValue = m_rs.getObject(fieldName);
+                    Object fieldValue = rs.getObject(fieldName);
                     
                     // FIXME To allow features to be filled again, the values are converted
to String again : feature should allow any kind of data.
                     String stringValue;
@@ -203,7 +203,7 @@ public class InputFeatureStream extends
      * @throws SQLInvalidStatementException if the given SQL Statement is invalid.
      */
     private void executeQuery() throws SQLConnectionClosedException, SQLInvalidStatementException
{
-        m_stmt = (DBFStatement)m_connection.createStatement(); 
-        m_rs = (DBFRecordBasedResultSet)m_stmt.executeQuery(m_sql);
+        stmt = (DBFStatement)connection.createStatement(); 
+        rs = (DBFRecordBasedResultSet)stmt.executeQuery(sql);
     }
 }

Modified: sis/branches/JDK8/storage/sis-shapefile/src/test/java/org/apache/sis/internal/shapefile/jdbc/AbstractTestBaseForInternalJDBC.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/storage/sis-shapefile/src/test/java/org/apache/sis/internal/shapefile/jdbc/AbstractTestBaseForInternalJDBC.java?rev=1649998&r1=1649997&r2=1649998&view=diff
==============================================================================
--- sis/branches/JDK8/storage/sis-shapefile/src/test/java/org/apache/sis/internal/shapefile/jdbc/AbstractTestBaseForInternalJDBC.java
[UTF-8] (original)
+++ sis/branches/JDK8/storage/sis-shapefile/src/test/java/org/apache/sis/internal/shapefile/jdbc/AbstractTestBaseForInternalJDBC.java
[UTF-8] Wed Jan  7 06:34:41 2015
@@ -21,7 +21,7 @@ import org.junit.Before;
  * all these tests are currently based on the SignedBikeRoute_4326_clipped.dbf DBase 3 file.
  * @author Marc LE BIHAN
  */
-abstract public class AbstractTestBaseForInternalJDBC extends TestCase {
+public abstract class AbstractTestBaseForInternalJDBC extends TestCase {
     /** Logger. */
     protected Logger log = Logging.getLogger(getClass().getName());
     



Mime
View raw message