X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Futil%2FFormat.java;fp=src%2Fjalview%2Futil%2FFormat.java;h=ce7ab6df184a5984bd2262536dc43799e9bf4ce9;hb=f063821ed0be9c1581af74643a1aa5798731af65;hp=389afcde35b710a0dc4bedab43b4339d9c6cdf0d;hpb=fd18e2c73cd015d4e38ad91da0e5d7532ff0ef42;p=jalview.git diff --git a/src/jalview/util/Format.java b/src/jalview/util/Format.java index 389afcd..ce7ab6d 100755 --- a/src/jalview/util/Format.java +++ b/src/jalview/util/Format.java @@ -790,8 +790,8 @@ public class Format { w = width; } - else if (((fmt == 'd') || (fmt == 'i') || (fmt == 'x') || (fmt == 'X') || (fmt == 'o')) - && (precision > 0)) + else if (((fmt == 'd') || (fmt == 'i') || (fmt == 'x') || (fmt == 'X') + || (fmt == 'o')) && (precision > 0)) { w = precision; } @@ -833,7 +833,8 @@ public class Format double factor = 1; String leading_zeroes = ""; - for (int i = 1; (i <= precision) && (factor <= 0x7FFFFFFFFFFFFFFFL); i++) + for (int i = 1; (i <= precision) + && (factor <= 0x7FFFFFFFFFFFFFFFL); i++) { factor *= 10; leading_zeroes = leading_zeroes + "0"; @@ -884,21 +885,18 @@ public class Format String f = ""; int e = 0; double dd = d; - double factor = 1; if (d != 0) { while (dd > 10) { e++; - factor /= 10; dd = dd / 10; } while (dd < 1) { e--; - factor *= 10; dd = dd * 10; } } @@ -908,8 +906,7 @@ public class Format return fixed_format(d); } - d = d * factor; - f = f + fixed_format(d); + f = f + fixed_format(dd); if ((fmt == 'e') || (fmt == 'g')) {