git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'develop' into features/JAL-250_hideredundantseqs
[jalview.git]
/
src
/
jalview
/
util
/
Format.java
diff --git
a/src/jalview/util/Format.java
b/src/jalview/util/Format.java
index
389afcd
..
ce7ab6d
100755
(executable)
--- a/
src/jalview/util/Format.java
+++ b/
src/jalview/util/Format.java
@@
-790,8
+790,8
@@
public class Format
{
w = width;
}
{
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;
}
{
w = precision;
}
@@
-833,7
+833,8
@@
public class Format
double factor = 1;
String leading_zeroes = "";
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";
{
factor *= 10;
leading_zeroes = leading_zeroes + "0";
@@
-884,21
+885,18
@@
public class Format
String f = "";
int e = 0;
double dd = d;
String f = "";
int e = 0;
double dd = d;
- double factor = 1;
if (d != 0)
{
while (dd > 10)
{
e++;
if (d != 0)
{
while (dd > 10)
{
e++;
- factor /= 10;
dd = dd / 10;
}
while (dd < 1)
{
e--;
dd = dd / 10;
}
while (dd < 1)
{
e--;
- factor *= 10;
dd = dd * 10;
}
}
dd = dd * 10;
}
}
@@
-908,8
+906,7
@@
public class Format
return fixed_format(d);
}
return fixed_format(d);
}
- d = d * factor;
- f = f + fixed_format(d);
+ f = f + fixed_format(dd);
if ((fmt == 'e') || (fmt == 'g'))
{
if ((fmt == 'e') || (fmt == 'g'))
{