You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pivot.apache.org by sm...@apache.org on 2013/02/13 19:09:42 UTC
svn commit: r1445785 - in
/pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/validation:
DecimalValidator.java DoubleValidator.java FloatValidator.java
FormattedValidator.java
Author: smartini
Date: Wed Feb 13 18:09:42 2013
New Revision: 1445785
URL: http://svn.apache.org/r1445785
Log:
PIVOT-892: set useful default in validators, and small updates
Modified:
pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/validation/DecimalValidator.java
pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/validation/DoubleValidator.java
pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/validation/FloatValidator.java
pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/validation/FormattedValidator.java
Modified: pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/validation/DecimalValidator.java
URL: http://svn.apache.org/viewvc/pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/validation/DecimalValidator.java?rev=1445785&r1=1445784&r2=1445785&view=diff
==============================================================================
--- pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/validation/DecimalValidator.java (original)
+++ pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/validation/DecimalValidator.java Wed Feb 13 18:09:42 2013
@@ -43,7 +43,7 @@ public class DecimalValidator extends Fo
protected final Number parseNumber(String text) {
try {
// We have to upper case because of the exponent symbol
- text = (locale == null) ? text.toUpperCase() : text.toUpperCase(locale);
+ text = text.toUpperCase(locale);
return format.parse(text);
} catch (ParseException ex) {
// this should never happen
Modified: pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/validation/DoubleValidator.java
URL: http://svn.apache.org/viewvc/pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/validation/DoubleValidator.java?rev=1445785&r1=1445784&r2=1445785&view=diff
==============================================================================
--- pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/validation/DoubleValidator.java (original)
+++ pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/validation/DoubleValidator.java Wed Feb 13 18:09:42 2013
@@ -13,8 +13,6 @@
*/
package org.apache.pivot.wtk.validation;
-import java.text.DecimalFormat;
-import java.text.DecimalFormatSymbols;
import java.util.Locale;
/**
Modified: pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/validation/FloatValidator.java
URL: http://svn.apache.org/viewvc/pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/validation/FloatValidator.java?rev=1445785&r1=1445784&r2=1445785&view=diff
==============================================================================
--- pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/validation/FloatValidator.java (original)
+++ pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/validation/FloatValidator.java Wed Feb 13 18:09:42 2013
@@ -13,8 +13,6 @@
*/
package org.apache.pivot.wtk.validation;
-import java.text.DecimalFormat;
-import java.text.DecimalFormatSymbols;
import java.util.Locale;
/**
@@ -37,13 +35,12 @@ public class FloatValidator extends Deci
/*
* DecimalFormat will parse the number as a double. Make sure the
- * resulting number is withing range for a float.
+ * resulting number is within range for a float.
*/
Number number = parseNumber(text);
double doubleValue = number.doubleValue();
- if (doubleValue == Double.POSITIVE_INFINITY ||
- doubleValue == Double.NEGATIVE_INFINITY ||
- doubleValue == Double.NaN) {
+ if (doubleValue == Double.POSITIVE_INFINITY || doubleValue == Double.NEGATIVE_INFINITY
+ || Double.isNaN(doubleValue)) {
return true;
}
doubleValue = Math.abs(doubleValue);
Modified: pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/validation/FormattedValidator.java
URL: http://svn.apache.org/viewvc/pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/validation/FormattedValidator.java?rev=1445785&r1=1445784&r2=1445785&view=diff
==============================================================================
--- pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/validation/FormattedValidator.java (original)
+++ pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/validation/FormattedValidator.java Wed Feb 13 18:09:42 2013
@@ -31,13 +31,21 @@ public class FormattedValidator<F extend
protected final Locale locale;
public FormattedValidator(F format) {
- this.format = format;
- this.locale = null;
+ this(format, null);
}
public FormattedValidator(F format, Locale locale) {
+ if (format == null) {
+ throw new IllegalArgumentException("format is null.");
+ }
this.format = format;
- this.locale = locale;
+
+ if (locale == null) {
+ this.locale = Locale.getDefault();
+ } else {
+ this.locale = locale;
+ }
+
}
@Override
@@ -45,7 +53,7 @@ public class FormattedValidator<F extend
final ParsePosition pos = new ParsePosition(0);
if (format instanceof NumberFormat) {
// We have to upper case because of the exponent symbol
- text = (locale == null) ? text.toUpperCase() : text.toUpperCase(locale);
+ text = text.toUpperCase(locale);
}
Object obj = format.parseObject(text, pos);