svn commit: r1301453 - in /empire-db/trunk/empire-db/src/main/java/org/apache/empire/db: DBColumn.java DBRecord.java DBRowSet.java

[do...@apache.org]

Author: doebele
Date: Fri Mar 16 12:15:54 2012
New Revision: 1301453

URL: http://svn.apache.org/viewvc?rev=1301453&view=rev
Log:
EMPIREDB-137
final cosmetics

Modified:
    empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBColumn.java
    empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBRecord.java
    empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBRowSet.java

Modified: empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBColumn.java
URL: http://svn.apache.org/viewvc/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBColumn.java?rev=1301453&r1=1301452&r2=1301453&view=diff
==============================================================================
--- empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBColumn.java (original)
+++ empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBColumn.java Fri Mar 16 12:15:54 2012
@@ -21,12 +21,10 @@ package org.apache.empire.db;
 // Java
 import java.util.Set;
 
-import org.apache.empire.commons.ObjectUtils;
 import org.apache.empire.commons.Options;
 import org.apache.empire.data.Column;
 import org.apache.empire.data.DataType;
 import org.apache.empire.db.exceptions.DatabaseNotOpenException;
-import org.apache.empire.db.exceptions.FieldNotNullException;
 import org.apache.empire.db.expr.set.DBSetExpr;
 import org.w3c.dom.Element;
 

Modified: empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBRecord.java
URL: http://svn.apache.org/viewvc/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBRecord.java?rev=1301453&r1=1301452&r2=1301453&view=diff
==============================================================================
--- empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBRecord.java (original)
+++ empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBRecord.java Fri Mar 16 12:15:54 2012
@@ -529,7 +529,7 @@ public class DBRecord extends DBRecordDa
             throw new FieldIsReadOnlyException(column);
         }
         // Is Value valid
-        column.checkValue(value);
+        column.validate(value);
         // Init original values
         modifyValue(index, value);
     }

Modified: empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBRowSet.java
URL: http://svn.apache.org/viewvc/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBRowSet.java?rev=1301453&r1=1301452&r2=1301453&view=diff
==============================================================================
--- empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBRowSet.java (original)
+++ empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBRowSet.java Fri Mar 16 12:15:54 2012
@@ -648,7 +648,7 @@ public abstract class DBRowSet extends D
                         if (col.isReadOnly())
                             log.warn("updateRecord: Read-only column '" + col.getName() + " has been modified!");
                         // Check the value
-                        col.checkValue(value);
+                        col.validate(value);
                         // Set the column
                         cmd.set(col.to(value));
                         setCount++;
@@ -685,7 +685,7 @@ public abstract class DBRowSet extends D
                     if (empty==false)
                     {   // Check the value
                         if (col.isAutoGenerated()==false)
-                            col.checkValue(value);
+                            col.validate(value);
                         // Insert a field
                         cmd.set(col.to(value));
                         setCount++;