refactoring: findbugs cleanup

11 files changed, 34 insertions, 30 deletions

diff --git a/main/src/cgeo/geocaching/export/GpxExport.java b/main/src/cgeo/geocaching/export/GpxExport.java
index c31b1ae..4f5e063 100644
--- a/main/src/cgeo/geocaching/export/GpxExport.java
+++ b/main/src/cgeo/geocaching/export/GpxExport.java
@@ -9,6 +9,8 @@ import cgeo.geocaching.utils.AsyncTaskWithProgress;
 import cgeo.geocaching.utils.FileUtils;
 import cgeo.geocaching.utils.Log;
 
+import org.apache.commons.lang3.CharEncoding;
+
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.app.Dialog;
@@ -23,8 +25,9 @@ import android.widget.TextView;
 
 import java.io.BufferedWriter;
 import java.io.File;
-import java.io.FileWriter;
+import java.io.FileOutputStream;
 import java.io.IOException;
+import java.io.OutputStreamWriter;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -130,11 +133,11 @@ class GpxExport extends AbstractExport {
                 final File exportLocation = new File(Settings.getGpxExportDir());
                 exportLocation.mkdirs();
 
-                writer = new BufferedWriter(new FileWriter(exportFile));
+                writer = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(exportFile), CharEncoding.UTF_8));
                 new GpxSerializer().writeGPX(allGeocodes, writer, new GpxSerializer.ProgressListener() {
 
                     @Override
-                    public void publishProgress(int countExported) {
+                    public void publishProgress(final int countExported) {
                         ExportTask.this.publishProgress(countExported);
                     }
                 });
diff --git a/main/src/cgeo/geocaching/export/GpxSerializer.java b/main/src/cgeo/geocaching/export/GpxSerializer.java
index 2d25296..1e39be4 100644
--- a/main/src/cgeo/geocaching/export/GpxSerializer.java
+++ b/main/src/cgeo/geocaching/export/GpxSerializer.java
@@ -11,6 +11,7 @@ import cgeo.geocaching.utils.TextUtils;
 import cgeo.geocaching.utils.XmlUtils;
 import cgeo.org.kxml2.io.KXmlSerializer;
 
+import org.apache.commons.lang3.CharEncoding;
 import org.apache.commons.lang3.StringUtils;
 import org.xmlpull.v1.XmlSerializer;
 
@@ -56,7 +57,7 @@ public final class GpxSerializer {
         this.progressListener = progressListener;
         gpx.setOutput(writer);
 
-        gpx.startDocument("UTF-8", true);
+        gpx.startDocument(CharEncoding.UTF_8, true);
         gpx.setPrefix("", PREFIX_GPX);
         gpx.setPrefix("xsi", PREFIX_XSI);
         gpx.setPrefix("groundspeak", PREFIX_GROUNDSPEAK);
diff --git a/main/src/cgeo/geocaching/maps/google/GoogleMapView.java b/main/src/cgeo/geocaching/maps/google/GoogleMapView.java
index 6e5406e..3cf258e 100644
--- a/main/src/cgeo/geocaching/maps/google/GoogleMapView.java
+++ b/main/src/cgeo/geocaching/maps/google/GoogleMapView.java
@@ -14,7 +14,7 @@ import cgeo.geocaching.maps.interfaces.MapProjectionImpl;
 import cgeo.geocaching.maps.interfaces.MapViewImpl;
 import cgeo.geocaching.maps.interfaces.OnMapDragListener;
 import cgeo.geocaching.maps.interfaces.OverlayImpl;
-import cgeo.geocaching.maps.interfaces.OverlayImpl.overlayType;
+import cgeo.geocaching.maps.interfaces.OverlayImpl.OverlayType;
 import cgeo.geocaching.utils.Log;
 
 import com.google.android.maps.GeoPoint;
@@ -121,7 +121,7 @@ public class GoogleMapView extends MapView implements MapViewImpl {
     @Override
     public PositionOverlay createAddPositionOverlay(Activity activity) {
 
-        GoogleOverlay ovl = new GoogleOverlay(activity, overlayType.PositionOverlay);
+        GoogleOverlay ovl = new GoogleOverlay(activity, OverlayType.PositionOverlay);
         getOverlays().add(ovl);
         return (PositionOverlay) ovl.getBase();
     }
@@ -129,7 +129,7 @@ public class GoogleMapView extends MapView implements MapViewImpl {
     @Override
     public ScaleOverlay createAddScaleOverlay(Activity activity) {
 
-        GoogleOverlay ovl = new GoogleOverlay(activity, overlayType.ScaleOverlay);
+        GoogleOverlay ovl = new GoogleOverlay(activity, OverlayType.ScaleOverlay);
         getOverlays().add(ovl);
         return (ScaleOverlay) ovl.getBase();
     }
diff --git a/main/src/cgeo/geocaching/maps/google/GoogleOverlay.java b/main/src/cgeo/geocaching/maps/google/GoogleOverlay.java
index 773f9ff..bf4f606 100644
--- a/main/src/cgeo/geocaching/maps/google/GoogleOverlay.java
+++ b/main/src/cgeo/geocaching/maps/google/GoogleOverlay.java
@@ -20,7 +20,7 @@ public class GoogleOverlay extends Overlay implements OverlayImpl {
     private GeneralOverlay overlayBase = null;
     private Lock lock = new ReentrantLock();
 
-    public GoogleOverlay(Activity activityIn, overlayType ovlType) {
+    public GoogleOverlay(Activity activityIn, OverlayType ovlType) {
         switch (ovlType) {
             case PositionOverlay:
                 overlayBase = new PositionOverlay(activityIn, this);
diff --git a/main/src/cgeo/geocaching/maps/interfaces/OverlayImpl.java b/main/src/cgeo/geocaching/maps/interfaces/OverlayImpl.java
index 115b692..a17b5fb 100644
--- a/main/src/cgeo/geocaching/maps/interfaces/OverlayImpl.java
+++ b/main/src/cgeo/geocaching/maps/interfaces/OverlayImpl.java
@@ -6,7 +6,7 @@ package cgeo.geocaching.maps.interfaces;
  */
 public interface OverlayImpl {
 
-    public enum overlayType {
+    public enum OverlayType {
         PositionOverlay,
         ScaleOverlay
     }
diff --git a/main/src/cgeo/geocaching/maps/mapsforge/MapsforgeMapView.java b/main/src/cgeo/geocaching/maps/mapsforge/MapsforgeMapView.java
index 2b0c1f7..aa11405 100644
--- a/main/src/cgeo/geocaching/maps/mapsforge/MapsforgeMapView.java
+++ b/main/src/cgeo/geocaching/maps/mapsforge/MapsforgeMapView.java
@@ -14,7 +14,7 @@ import cgeo.geocaching.maps.interfaces.MapSource;
 import cgeo.geocaching.maps.interfaces.MapViewImpl;
 import cgeo.geocaching.maps.interfaces.OnMapDragListener;
 import cgeo.geocaching.maps.interfaces.OverlayImpl;
-import cgeo.geocaching.maps.interfaces.OverlayImpl.overlayType;
+import cgeo.geocaching.maps.interfaces.OverlayImpl.OverlayType;
 import cgeo.geocaching.utils.Log;
 
 import org.apache.commons.lang3.StringUtils;
@@ -109,14 +109,14 @@ public class MapsforgeMapView extends MapView implements MapViewImpl {
 
     @Override
     public PositionOverlay createAddPositionOverlay(Activity activity) {
-        MapsforgeOverlay ovl = new MapsforgeOverlay(activity, overlayType.PositionOverlay);
+        MapsforgeOverlay ovl = new MapsforgeOverlay(activity, OverlayType.PositionOverlay);
         getOverlays().add(ovl);
         return (PositionOverlay) ovl.getBase();
     }
 
     @Override
     public ScaleOverlay createAddScaleOverlay(Activity activity) {
-        MapsforgeOverlay ovl = new MapsforgeOverlay(activity, overlayType.ScaleOverlay);
+        MapsforgeOverlay ovl = new MapsforgeOverlay(activity, OverlayType.ScaleOverlay);
         getOverlays().add(ovl);
         return (ScaleOverlay) ovl.getBase();
     }
diff --git a/main/src/cgeo/geocaching/maps/mapsforge/MapsforgeOverlay.java b/main/src/cgeo/geocaching/maps/mapsforge/MapsforgeOverlay.java
index dd7fb75..a94b988 100644
--- a/main/src/cgeo/geocaching/maps/mapsforge/MapsforgeOverlay.java
+++ b/main/src/cgeo/geocaching/maps/mapsforge/MapsforgeOverlay.java
@@ -21,7 +21,7 @@ public class MapsforgeOverlay extends Overlay implements OverlayImpl {
     private GeneralOverlay overlayBase = null;
     private Lock lock = new ReentrantLock();
 
-    public MapsforgeOverlay(Activity activityIn, OverlayImpl.overlayType ovlType) {
+    public MapsforgeOverlay(Activity activityIn, OverlayImpl.OverlayType ovlType) {
 
         switch (ovlType) {
             case PositionOverlay:
diff --git a/main/src/cgeo/geocaching/maps/mapsforge/v024/MapsforgeMapView024.java b/main/src/cgeo/geocaching/maps/mapsforge/v024/MapsforgeMapView024.java
index 8e3a4d8..a074e70 100644
--- a/main/src/cgeo/geocaching/maps/mapsforge/v024/MapsforgeMapView024.java
+++ b/main/src/cgeo/geocaching/maps/mapsforge/v024/MapsforgeMapView024.java
@@ -13,7 +13,7 @@ import cgeo.geocaching.maps.interfaces.MapProjectionImpl;
 import cgeo.geocaching.maps.interfaces.MapViewImpl;
 import cgeo.geocaching.maps.interfaces.OnMapDragListener;
 import cgeo.geocaching.maps.interfaces.OverlayImpl;
-import cgeo.geocaching.maps.interfaces.OverlayImpl.overlayType;
+import cgeo.geocaching.maps.interfaces.OverlayImpl.OverlayType;
 import cgeo.geocaching.utils.Log;
 
 import org.mapsforge.android.mapsold.GeoPoint;
@@ -103,14 +103,14 @@ public class MapsforgeMapView024 extends MapView implements MapViewImpl {
 
     @Override
     public PositionOverlay createAddPositionOverlay(Activity activity) {
-        MapsforgeOverlay ovl = new MapsforgeOverlay(activity, overlayType.PositionOverlay);
+        MapsforgeOverlay ovl = new MapsforgeOverlay(activity, OverlayType.PositionOverlay);
         getOverlays().add(ovl);
         return (PositionOverlay) ovl.getBase();
     }
 
     @Override
     public ScaleOverlay createAddScaleOverlay(Activity activity) {
-        MapsforgeOverlay ovl = new MapsforgeOverlay(activity, overlayType.ScaleOverlay);
+        MapsforgeOverlay ovl = new MapsforgeOverlay(activity, OverlayType.ScaleOverlay);
         getOverlays().add(ovl);
         return (ScaleOverlay) ovl.getBase();
     }
diff --git a/main/src/cgeo/geocaching/maps/mapsforge/v024/MapsforgeOverlay.java b/main/src/cgeo/geocaching/maps/mapsforge/v024/MapsforgeOverlay.java
index d40b539..bdaac98 100644
--- a/main/src/cgeo/geocaching/maps/mapsforge/v024/MapsforgeOverlay.java
+++ b/main/src/cgeo/geocaching/maps/mapsforge/v024/MapsforgeOverlay.java
@@ -21,7 +21,7 @@ public class MapsforgeOverlay extends Overlay implements OverlayImpl {
     private GeneralOverlay overlayBase = null;
     private Lock lock = new ReentrantLock();
 
-    public MapsforgeOverlay(Activity activityIn, OverlayImpl.overlayType ovlType) {
+    public MapsforgeOverlay(Activity activityIn, OverlayImpl.OverlayType ovlType) {
 
         switch (ovlType) {
             case PositionOverlay:
diff --git a/main/src/cgeo/geocaching/settings/Settings.java b/main/src/cgeo/geocaching/settings/Settings.java
index 1192ddf..9e4251d 100644
--- a/main/src/cgeo/geocaching/settings/Settings.java
+++ b/main/src/cgeo/geocaching/settings/Settings.java
@@ -53,14 +53,14 @@ public final class Settings {
     private final static String keyConsumerPublic = CryptUtils.rot13("ESnsCvAv3kEupF1GCR3jGj");
     private final static String keyConsumerSecret = CryptUtils.rot13("7vQWceACV9umEjJucmlpFe9FCMZSeqIqfkQ2BnhV9x");
 
-    public enum coordInputFormatEnum {
+    public enum CoordInputFormatEnum {
         Plain,
         Deg,
         Min,
         Sec;
 
-        public static coordInputFormatEnum fromInt(int id) {
-            final coordInputFormatEnum[] values = coordInputFormatEnum.values();
+        public static CoordInputFormatEnum fromInt(int id) {
+            final CoordInputFormatEnum[] values = CoordInputFormatEnum.values();
             if (id < 0 || id >= values.length) {
                 return Min;
             }
@@ -458,11 +458,11 @@ public final class Settings {
         return MapsforgeMapProvider.isValidMapFile(mapFileIn);
     }
 
-    public static coordInputFormatEnum getCoordInputFormat() {
-        return coordInputFormatEnum.fromInt(getInt(R.string.pref_coordinputformat, 0));
+    public static CoordInputFormatEnum getCoordInputFormat() {
+        return CoordInputFormatEnum.fromInt(getInt(R.string.pref_coordinputformat, 0));
     }
 
-    public static void setCoordInputFormat(final coordInputFormatEnum format) {
+    public static void setCoordInputFormat(final CoordInputFormatEnum format) {
         putInt(R.string.pref_coordinputformat, format.ordinal());
     }
 
diff --git a/main/src/cgeo/geocaching/ui/dialog/CoordinatesInputDialog.java b/main/src/cgeo/geocaching/ui/dialog/CoordinatesInputDialog.java
index 959cb14..91ce7e3 100644
--- a/main/src/cgeo/geocaching/ui/dialog/CoordinatesInputDialog.java
+++ b/main/src/cgeo/geocaching/ui/dialog/CoordinatesInputDialog.java
@@ -4,7 +4,7 @@ import cgeo.geocaching.Geocache;
 import cgeo.geocaching.IGeoData;
 import cgeo.geocaching.R;
 import cgeo.geocaching.settings.Settings;
-import cgeo.geocaching.settings.Settings.coordInputFormatEnum;
+import cgeo.geocaching.settings.Settings.CoordInputFormatEnum;
 import cgeo.geocaching.activity.AbstractActivity;
 import cgeo.geocaching.activity.ActivityMixin;
 import cgeo.geocaching.compatibility.Compatibility;
@@ -41,7 +41,7 @@ public class CoordinatesInputDialog extends NoTitleDialog {
 
     private CoordinateUpdate cuListener;
 
-    private coordInputFormatEnum currentFormat = null;
+    private CoordInputFormatEnum currentFormat = null;
 
     public CoordinatesInputDialog(final AbstractActivity context, final Geocache cache, final Geopoint gp, final IGeoData geo) {
         super(context, ActivityMixin.getDialogTheme());
@@ -272,7 +272,7 @@ public class CoordinatesInputDialog extends NoTitleDialog {
              * formatSec 2/3 2 2 3
              */
 
-            if (currentFormat == coordInputFormatEnum.Plain) {
+            if (currentFormat == CoordInputFormatEnum.Plain) {
                 return;
             }
 
@@ -325,7 +325,7 @@ public class CoordinatesInputDialog extends NoTitleDialog {
     }
 
     private boolean calc(final boolean signalError) {
-        if (currentFormat == coordInputFormatEnum.Plain) {
+        if (currentFormat == CoordInputFormatEnum.Plain) {
             try {
                 gp = new Geopoint(eLat.getText().toString(), eLon.getText().toString());
             } catch (final Geopoint.ParseException e) {
@@ -375,10 +375,10 @@ public class CoordinatesInputDialog extends NoTitleDialog {
         if (editText == eLonDeg || editText == eLatSub || editText == eLonSub) {
             return 3;
         }
-        if ((editText == eLatMin || editText == eLonMin) && currentFormat == coordInputFormatEnum.Deg) {
+        if ((editText == eLatMin || editText == eLonMin) && currentFormat == CoordInputFormatEnum.Deg) {
             return 5;
         }
-        if ((editText == eLatSec || editText == eLonSec) && currentFormat == coordInputFormatEnum.Min) {
+        if ((editText == eLatSec || editText == eLonSec) && currentFormat == CoordInputFormatEnum.Min) {
             return 3;
         }
         return 2;
@@ -402,7 +402,7 @@ public class CoordinatesInputDialog extends NoTitleDialog {
                 }
             }
 
-            currentFormat = coordInputFormatEnum.fromInt(pos);
+            currentFormat = CoordInputFormatEnum.fromInt(pos);
             Settings.setCoordInputFormat(currentFormat);
             updateGUI();
         }