1 files changed, 11 insertions, 11 deletions

diff --git a/main/src/cgeo/geocaching/speech/TextFactory.java b/main/src/cgeo/geocaching/speech/TextFactory.java
index eb780c6..3f1f142 100644
--- a/main/src/cgeo/geocaching/speech/TextFactory.java
+++ b/main/src/cgeo/geocaching/speech/TextFactory.java
@@ -2,8 +2,8 @@ package cgeo.geocaching.speech;
 
 import cgeo.geocaching.CgeoApplication;
 import cgeo.geocaching.R;
-import cgeo.geocaching.geopoint.Geopoint;
-import cgeo.geocaching.geopoint.IConversion;
+import cgeo.geocaching.location.Geopoint;
+import cgeo.geocaching.location.IConversion;
 import cgeo.geocaching.settings.Settings;
 import cgeo.geocaching.utils.AngleUtils;
 
@@ -21,17 +21,17 @@ import java.util.Locale;
  * on unit expressions.
  */
 public class TextFactory {
-    public static String getText(Geopoint position, Geopoint target, float direction) {
+    public static String getText(final Geopoint position, final Geopoint target, final float direction) {
         if (position == null || target == null) {
             return null;
         }
         return getDirection(position, target, direction) + ". " + getDistance(position, target);
     }
 
-    private static String getDistance(Geopoint position, Geopoint target) {
+    private static String getDistance(final Geopoint position, final Geopoint target) {
         final float kilometers = position.distanceTo(target);
 
-        if (Settings.isUseImperialUnits()) {
+        if (Settings.useImperialUnits()) {
             return getDistance(kilometers / IConversion.MILES_TO_KILOMETER,
                     (int) (kilometers * 1000.0 * IConversion.METERS_TO_FEET),
                     3.0f, 0.2f, 300,
@@ -44,9 +44,9 @@ public class TextFactory {
                 R.plurals.tts_meters, R.string.tts_one_meter);
     }
 
-    private static String getDistance(float farDistance, int nearDistance,
-            float farFarAway, float farNearAway, int nearFarAway,
-            int farId, int farOneId, int nearId, int nearOneId) {
+    private static String getDistance(final float farDistance, final int nearDistance,
+            final float farFarAway, final float farNearAway, final int nearFarAway,
+            final int farId, final int farOneId, final int nearId, final int nearOneId) {
         if (farDistance >= farFarAway) {
             // example: "5 kilometers" - always without decimal digits
             final int quantity = Math.round(farDistance);
@@ -84,15 +84,15 @@ public class TextFactory {
         return getQuantityString(nearId, quantity, String.valueOf(quantity));
     }
 
-    private static String getString(int resourceId, Object... formatArgs) {
+    private static String getString(final int resourceId, final Object... formatArgs) {
         return CgeoApplication.getInstance().getString(resourceId, formatArgs);
     }
 
-    private static String getQuantityString(int resourceId, int quantity, Object... formatArgs) {
+    private static String getQuantityString(final int resourceId, final int quantity, final Object... formatArgs) {
         return CgeoApplication.getInstance().getResources().getQuantityString(resourceId, quantity, formatArgs);
     }
 
-    private static String getDirection(Geopoint position, Geopoint target, float direction) {
+    private static String getDirection(final Geopoint position, final Geopoint target, final float direction) {
         final int bearing = (int) position.bearingTo(target);
         final int degrees = (int) AngleUtils.normalize(bearing - direction);