From e4f32559b64acdc508bcb7f1b49db6693dff3d92 Mon Sep 17 00:00:00 2001 From: graywolf336 Date: Mon, 21 Jul 2014 18:30:39 -0500 Subject: [PATCH] Clean up the formatting of the copied code in the update. --- src/main/java/com/graywolf336/jail/Update.java | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/graywolf336/jail/Update.java b/src/main/java/com/graywolf336/jail/Update.java index 9febd2e..041bd5d 100644 --- a/src/main/java/com/graywolf336/jail/Update.java +++ b/src/main/java/com/graywolf336/jail/Update.java @@ -133,26 +133,23 @@ public class Update { * The result is a positive integer if str1 is _numerically_ greater than str2. * The result is zero if the strings are _numerically_ equal. */ - private Integer versionCompare(String str1, String str2) - { + private Integer versionCompare(String str1, String str2) { String[] vals1 = str1.split("\\."); String[] vals2 = str2.split("\\."); int i = 0; // set index to first non-equal ordinal or length of shortest version string - while (i < vals1.length && i < vals2.length && vals1[i].equals(vals2[i])) - { + while (i < vals1.length && i < vals2.length && vals1[i].equals(vals2[i])) { i++; } + // compare first non-equal ordinal number - if (i < vals1.length && i < vals2.length) - { - int diff = Integer.valueOf(vals1[i]).compareTo(Integer.valueOf(vals2[i])); - return Integer.signum(diff); + if (i < vals1.length && i < vals2.length) { + return Integer.signum(Integer.valueOf(vals1[i]).compareTo(Integer.valueOf(vals2[i]))); } + // the strings are equal or one string is a substring of the other // e.g. "1.2.3" = "1.2.3" or "1.2.3" < "1.2.3.4" - else - { + else { return Integer.signum(vals1.length - vals2.length); } }