Merge "Prefer valueOf() to boxed primitive constructors" (773627cf) · Commits · e / os / android_frameworks_base

core/java/com/android/internal/util/TypedProperties.java

+25 −25

Original line number	Diff line number	Diff line
		@@ -268,22 +268,22 @@ public class TypedProperties extends HashMap<String, Object> {
		if (value < Byte.MIN_VALUE \|\| value > Byte.MAX_VALUE) {
		throw new ParseException(st, "8-bit integer constant");
		}
		return new Byte((byte)value);
		return Byte.valueOf((byte) value);
		case 2:
		if (value < Short.MIN_VALUE \|\| value > Short.MAX_VALUE) {
		throw new ParseException(st, "16-bit integer constant");
		}
		return new Short((short)value);
		return Short.valueOf((short) value);
		case 4:
		if (value < Integer.MIN_VALUE \|\| value > Integer.MAX_VALUE) {
		throw new ParseException(st, "32-bit integer constant");
		}
		return new Integer((int)value);
		return Integer.valueOf((int) value);
		case 8:
		if (value < Long.MIN_VALUE \|\| value > Long.MAX_VALUE) {
		throw new ParseException(st, "64-bit integer constant");
		}
		return new Long(value);
		return Long.valueOf(value);
		default:
		throw new IllegalStateException(
		"Internal error; unexpected integer type width " + width);
		@@ -317,10 +317,10 @@ public class TypedProperties extends HashMap<String, Object> {
		throw new ParseException(st, "32-bit float constant");
		}
		}
		return new Float((float)value);
		return Float.valueOf((float) value);
		} else {
		// This property is a double; no need to truncate.
		return new Double(value);
		return Double.valueOf(value);
		}
		} else if (type == TYPE_STRING) {
		// Expect a quoted string or the word "null".