Cleans up imports and simplifies if clause
Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/45aae9cd Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/45aae9cd Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/45aae9cd Branch: refs/heads/master Commit: 45aae9cd8094eb9df6ca61b6c0c948756c6f5046 Parents: 229afea Author: Lukasz Lenart <lukaszlen...@apache.org> Authored: Fri May 12 16:36:30 2017 +0200 Committer: Lukasz Lenart <lukaszlen...@apache.org> Committed: Fri May 12 16:36:30 2017 +0200 ---------------------------------------------------------------------- .../xwork2/conversion/impl/NumberConverter.java | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/struts/blob/45aae9cd/core/src/main/java/com/opensymphony/xwork2/conversion/impl/NumberConverter.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/com/opensymphony/xwork2/conversion/impl/NumberConverter.java b/core/src/main/java/com/opensymphony/xwork2/conversion/impl/NumberConverter.java index c4a2a1d..6e7d231 100644 --- a/core/src/main/java/com/opensymphony/xwork2/conversion/impl/NumberConverter.java +++ b/core/src/main/java/com/opensymphony/xwork2/conversion/impl/NumberConverter.java @@ -1,21 +1,15 @@ package com.opensymphony.xwork2.conversion.impl; import com.opensymphony.xwork2.XWorkException; -import com.opensymphony.xwork2.validator.validators.DoubleRangeFieldValidator; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.apache.logging.log4j.message.ParameterizedMessage; import java.lang.reflect.Member; import java.math.BigDecimal; import java.math.BigInteger; -import java.math.RoundingMode; import java.text.DecimalFormat; -import java.text.DecimalFormatSymbols; import java.text.NumberFormat; -import java.text.ParseException; import java.text.ParsePosition; -import java.util.Formatter; import java.util.Locale; import java.util.Map; @@ -40,7 +34,7 @@ public class NumberConverter extends DefaultTypeConverter { return convertedValue; } else { String stringValue = (String) value; - if (!toType.isPrimitive() && (stringValue == null || stringValue.length() == 0)) { + if (!toType.isPrimitive() && stringValue.isEmpty()) { return null; } NumberFormat numFormat = NumberFormat.getInstance(getLocale(context)); @@ -182,7 +176,7 @@ public class NumberConverter extends DefaultTypeConverter { return true; } - return ((Comparable)bigValue).compareTo(lowerBound) >= 0 && ((Comparable)bigValue).compareTo(upperBound) <= 0; + return ((Comparable) bigValue).compareTo(lowerBound) >= 0 && ((Comparable) bigValue).compareTo(upperBound) <= 0; } private boolean isIntegerType(Class type) {