hammant 01/11/13 18:33:00
Modified: apps/db/src/java/org/apache/avalon/db/data/impl
BigIntColumn.java DecimalColumn.java
RealColumn.java SmallIntColumn.java
Log:
updated type handling
Revision Changes Path
1.2 +8 -2
jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/data/impl/BigIntColumn.java
Index: BigIntColumn.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/data/impl/BigIntColumn.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- BigIntColumn.java 2001/11/13 12:33:27 1.1
+++ BigIntColumn.java 2001/11/14 02:33:00 1.2
@@ -13,12 +13,12 @@
* Class BigIntColumn
*
* @author Gerhard Froehlich <a
href="mailto:[EMAIL PROTECTED]";>[EMAIL PROTECTED]</a>
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
*/
public class BigIntColumn extends AbstractColumn {
/**
- * Constructor DecimalColumn
+ * Constructor BigIntColumn
* @param name
*/
public BigIntColumn(String name) {
@@ -27,7 +27,13 @@
public void test(Object obj) throws ValidationException {
try {
- long l = Long.parseLong(obj.toString());
+ if (obj instanceof String) {
+ Long.parseLong(obj.toString());
+ } else if (obj instanceof Long) {
+ // OK
+ } else {
+ throw new ValidationException("Bigint " + mName + " is not passed
up as String or Long");
+ }
} catch (NumberFormatException nfe) {
throw new ValidationException("Bigint " + mName + " is not a valid
number (" + obj + ")");
}
1.2 +7 -1
jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/data/impl/DecimalColumn.java
Index: DecimalColumn.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/data/impl/DecimalColumn.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DecimalColumn.java 2001/11/13 12:32:54 1.1
+++ DecimalColumn.java 2001/11/14 02:33:00 1.2
@@ -15,7 +15,7 @@
* Class DecimalColumn
*
* @author Gerhard Froehlich <a
href="mailto:[EMAIL PROTECTED]";>[EMAIL PROTECTED]</a>
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
*/
public class DecimalColumn extends AbstractColumn {
@@ -29,7 +29,13 @@
public void test(Object obj) throws ValidationException {
try {
- BigDecimal bd = new BigDecimal(obj.toString());
+ if (obj instanceof String) {
+ BigDecimal bd = new BigDecimal(obj.toString());
+ } else if (obj instanceof BigDecimal) {
+ // OK
+ } else {
+ throw new ValidationException("Decimal " + mName + " is not passed
up as String or BigDecimal");
+ }
} catch (NumberFormatException nfe) {
throw new ValidationException("Decimal " + mName + " is not a valid
number (" + obj + ")");
}
1.2 +8 -2
jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/data/impl/RealColumn.java
Index: RealColumn.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/data/impl/RealColumn.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- RealColumn.java 2001/11/13 12:34:00 1.1
+++ RealColumn.java 2001/11/14 02:33:00 1.2
@@ -13,12 +13,12 @@
* Class RealColumn
*
* @author Gerhard Froehlich <a
href="mailto:[EMAIL PROTECTED]";>[EMAIL PROTECTED]</a>
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
*/
public class RealColumn extends AbstractColumn {
/**
- * Constructor DecimalColumn
+ * Constructor RealColumn
* @param name
*/
public RealColumn(String name) {
@@ -27,7 +27,13 @@
public void test(Object obj) throws ValidationException {
try {
- float f = Float.parseFloat(obj.toString());
+ if (obj instanceof String) {
+ Float.parseFloat(obj.toString());
+ } else if (obj instanceof Float) {
+ // OK
+ } else {
+ throw new ValidationException("Real " + mName + " is not passed up
as String or Float");
+ }
} catch (NumberFormatException nfe) {
throw new ValidationException("Real " + mName + " is not a valid number
(" + obj + ")");
}
1.3 +9 -3
jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/data/impl/SmallIntColumn.java
Index: SmallIntColumn.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/data/impl/SmallIntColumn.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SmallIntColumn.java 2001/11/13 12:22:56 1.2
+++ SmallIntColumn.java 2001/11/14 02:33:00 1.3
@@ -13,12 +13,12 @@
* Class SmallIntColumn
*
* @author Gerhard Froehlich <a
href="mailto:[EMAIL PROTECTED]";>[EMAIL PROTECTED]</a>
- * @version $Revision: 1.2 $
+ * @version $Revision: 1.3 $
*/
public class SmallIntColumn extends AbstractColumn {
/**
- * Constructor SmallIntegerColumn
+ * Constructor SmallIntColumn
* @param name
*/
public SmallIntColumn(String name) {
@@ -27,7 +27,13 @@
public void test(Object obj) throws ValidationException {
try {
- short s = Short.parseShort(obj.toString());
+ if (obj instanceof String) {
+ Short.parseShort(obj.toString());
+ } else if (obj instanceof Short) {
+ // OK
+ } else {
+ throw new ValidationException("Smallint " + mName + " is not passed
up as String or Short");
+ }
} catch (NumberFormatException nfe) {
throw new ValidationException("SmallInt " + mName + " is not a valid
number (" + obj + ")");
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
