diff options
author | Samuel Tardieu <sam@rfc1149.net> | 2014-11-23 01:19:20 +0100 |
---|---|---|
committer | Samuel Tardieu <sam@rfc1149.net> | 2014-11-23 01:19:20 +0100 |
commit | 78a9e2f15c6ca46ce13231c2d4768d04cbfe67ee (patch) | |
tree | 926aa3f67d537b202d72d335c3b4beea6e5ebec3 /main/src | |
parent | 831e800b792bc3bbb6e6467c257e6cf0c351e188 (diff) | |
download | cgeo-78a9e2f15c6ca46ce13231c2d4768d04cbfe67ee.zip cgeo-78a9e2f15c6ca46ce13231c2d4768d04cbfe67ee.tar.gz cgeo-78a9e2f15c6ca46ce13231c2d4768d04cbfe67ee.tar.bz2 |
Inline concatenation in string format parameter
Diffstat (limited to 'main/src')
-rw-r--r-- | main/src/cgeo/geocaching/location/Units.java | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/main/src/cgeo/geocaching/location/Units.java b/main/src/cgeo/geocaching/location/Units.java index 511537a..842bd83 100644 --- a/main/src/cgeo/geocaching/location/Units.java +++ b/main/src/cgeo/geocaching/location/Units.java @@ -10,7 +10,7 @@ public class Units { public static ImmutablePair<Double, String> scaleDistance(final double distanceKilometers) { double distance; - String units; + final String units; if (Settings.useImperialUnits()) { distance = distanceKilometers / IConversion.MILES_TO_KILOMETER; if (distance >= 0.1) { @@ -37,19 +37,19 @@ public class Units { } final ImmutablePair<Double, String> scaled = scaleDistance(distanceKilometers); - String formatString; + final String formatString; if (scaled.left >= 100) { - formatString = "%.0f"; + formatString = "%.0f %s"; } else if (scaled.left >= 10) { - formatString = "%.1f"; + formatString = "%.1f %s"; } else { - formatString = "%.2f"; + formatString = "%.2f %s"; } - return String.format(formatString + " %s", scaled.left, scaled.right); + return String.format(formatString, scaled.left, scaled.right); } - public static String getDistanceFromMeters(float meters) { + public static String getDistanceFromMeters(final float meters) { return getDistanceFromKilometers(meters / 1000f); } |