create reusable parseValue method for ratio limits

jacoco · May 17, 2017 · c39e3d2 · c39e3d2
1 parent d9caed9
commit c39e3d2
Showing 1 changed file with 13 additions and 20 deletions.
diff --git a/org.jacoco.report/src/org/jacoco/report/check/Limit.java b/org.jacoco.report/src/org/jacoco/report/check/Limit.java
@@ -124,13 +124,7 @@ public String getMinimum() {
 	 *            checked
 	 */
 	public void setMinimum(final String minimum) {
-		if (minimum == null) {
+		this.minimum = parseValue(minimum);
-			this.minimum = null;
-		} else if (isPercent(minimum)) {
-			this.minimum = percentToBigDecimal(minimum);
-		} else {
-			this.minimum = new BigDecimal(minimum);
-		}
 	}
 
 	/**
@@ -151,22 +145,21 @@ public String getMaximum() {
 	 *            checked
 	 */
 	public void setMaximum(final String maximum) {
-		if (maximum == null) {
+		this.maximum = parseValue(maximum);
-			this.maximum = null;
-		} else if (isPercent(maximum)) {
-			this.maximum = percentToBigDecimal(maximum);
-		} else {
-			this.maximum = new BigDecimal(maximum);
-		}
 	}
 
-	private static boolean isPercent(final String value) {
+	private static BigDecimal parseValue(final String value) {
-		return value.trim().endsWith("%");
+		if (value == null) {
-	}
+			return null;
+		}
+
+		final String trimmedValue = value.trim();
+		if (trimmedValue.endsWith("%")) {
+			final String percent = trimmedValue.substring(0, trimmedValue.length() - 1);
+			return new BigDecimal(percent).movePointLeft(2);
+		}
 
-	private static BigDecimal percentToBigDecimal(final String value) {
+		return new BigDecimal(trimmedValue);
-		final String percent = value.trim().substring(0, value.length() - 1);
-		return new BigDecimal(percent).movePointLeft(2);
 	}
 
 	String check(final ICoverageNode node) {