Rename TrackFormatWriter to TrackWriter

MyTracks/src/com/google/android/apps/mytracks/io/file/CsvTrackWriter.java

@@ -48,7 +48,7 @@ import java.text.NumberFormat;
  *
  * @author Rodrigo Damazio
  */
-public class CsvTrackWriter implements TrackFormatWriter {
+public class CsvTrackWriter implements TrackWriter {
 
   private static final NumberFormat SHORT_FORMAT = NumberFormat.getInstance();
 

MyTracks/src/com/google/android/apps/mytracks/io/file/GpxTrackWriter.java

@@ -34,7 +34,7 @@ import java.util.Locale;
  * 
  * @author Sandor Dornbush
  */
-public class GpxTrackWriter implements TrackFormatWriter {
+public class GpxTrackWriter implements TrackWriter {
 
   private static final NumberFormat ELEVATION_FORMAT = NumberFormat.getInstance(Locale.US);
   private static final NumberFormat COORDINATE_FORMAT = NumberFormat.getInstance(Locale.US);

MyTracks/src/com/google/android/apps/mytracks/io/file/KmlTrackWriter.java

@@ -44,7 +44,7 @@ import java.util.ArrayList;
  * 
  * @author Leif Hendrik Wilden
  */
-public class KmlTrackWriter implements TrackFormatWriter {
+public class KmlTrackWriter implements TrackWriter {
 
   private static final String WAYPOINT_STYLE = "waypoint";
   private static final String STATISTICS_STYLE = "statistics";

MyTracks/src/com/google/android/apps/mytracks/io/file/TcxTrackWriter.java

@@ -40,7 +40,7 @@ import java.util.Locale;
  * @author Sandor Dornbush
  * @author Dominik Ršttsches
  */
-public class TcxTrackWriter implements TrackFormatWriter {
+public class TcxTrackWriter implements TrackWriter {
 
   /**
    * TCX sport type. See the TCX spec.

MyTracks/src/com/google/android/apps/mytracks/io/file/TrackExporter.java

@@ -59,7 +59,7 @@ public class TrackExporter {
 
   private final MyTracksProviderUtils myTracksProviderUtils;
   private final Track[] tracks;
-  private final TrackFormatWriter trackFormatWriter;
+  private final TrackWriter trackWriter;
   private final OnWriteListener onWriteListener;
 
   private Thread writeThread;
@@ -76,15 +76,15 @@ public class TrackExporter {
    */
   public TrackExporter(Context context, MyTracksProviderUtils myTracksProviderUtils, Track[] tracks,
       TrackFileFormat trackFileFormat, OnWriteListener onWriteListener) {
-    this(myTracksProviderUtils, tracks, trackFileFormat.newFormatWriter(context), onWriteListener);
+    this(myTracksProviderUtils, tracks, trackFileFormat.newTrackWriter(context), onWriteListener);
   }
 
   @VisibleForTesting
   public TrackExporter(MyTracksProviderUtils myTracksProviderUtils, Track[] tracks,
-      TrackFormatWriter trackFormatWriter, OnWriteListener onWriteListener) {
+      TrackWriter trackWriter, OnWriteListener onWriteListener) {
     this.myTracksProviderUtils = myTracksProviderUtils;
     this.tracks = tracks;
-    this.trackFormatWriter = trackFormatWriter;
+    this.trackWriter = trackWriter;
     this.onWriteListener = onWriteListener;
   }
   
@@ -105,16 +105,16 @@ public class TrackExporter {
         @Override
       public void run() {
         try {
-          trackFormatWriter.prepare(outputStream);
-          trackFormatWriter.writeHeader(tracks[0]);
+          trackWriter.prepare(outputStream);
+          trackWriter.writeHeader(tracks[0]);
           long startTime = tracks[0].getTripStatistics().getStartTime();
           for (int i = 0; i < tracks.length; i++) {
             writeWaypoints(tracks[i]);
             long offset = tracks[i].getTripStatistics().getStartTime() - startTime;
             writeLocations(tracks[i], offset);
           }
-          trackFormatWriter.writeFooter();
-          trackFormatWriter.close();
+          trackWriter.writeFooter();
+          trackWriter.close();
           success = true;
         } catch (InterruptedException e) {
           success = false;
@@ -169,11 +169,11 @@ public class TrackExporter {
          */
         while (cursor.moveToNext()) {
           if (!hasWaypoints) {
-            trackFormatWriter.writeBeginWaypoints();
+            trackWriter.writeBeginWaypoints();
             hasWaypoints = true;
           }
           Waypoint waypoint = myTracksProviderUtils.createWaypoint(cursor);
-          trackFormatWriter.writeWaypoint(waypoint);
+          trackWriter.writeWaypoint(waypoint);
         }
       }
     } finally {
@@ -182,7 +182,7 @@ public class TrackExporter {
       }
     }
     if (hasWaypoints) {
-      trackFormatWriter.writeEndWaypoints();
+      trackWriter.writeEndWaypoints();
     }
   }
 
@@ -211,28 +211,28 @@ public class TrackExporter {
         boolean isSegmentValid = isLocationValid && isLastLocationValid;
         if (!wroteTrack && isSegmentValid) {
           // Found the first two consecutive locations that are valid          
-          trackFormatWriter.writeBeginTrack(track, locationFactory.lastLocation);
+          trackWriter.writeBeginTrack(track, locationFactory.lastLocation);
           wroteTrack = true;
         }
 
         if (isSegmentValid) {
           if (!wroteSegment) {
             // Start a segment
-            trackFormatWriter.writeOpenSegment();
+            trackWriter.writeOpenSegment();
             wroteSegment = true;
 
             // Write the previous location, which we had previously skipped
-            trackFormatWriter.writeLocation(locationFactory.lastLocation);
+            trackWriter.writeLocation(locationFactory.lastLocation);
           }
 
           // Write the current location
-          trackFormatWriter.writeLocation(location);
+          trackWriter.writeLocation(location);
           if (onWriteListener != null) {
             onWriteListener.onWrite(locationNumber, track.getNumberOfPoints());
           }
         } else {
           if (wroteSegment) {
-            trackFormatWriter.writeCloseSegment();
+            trackWriter.writeCloseSegment();
             wroteSegment = false;
           }
         }
@@ -241,17 +241,17 @@ public class TrackExporter {
       }
       
       if (wroteSegment) {
-        trackFormatWriter.writeCloseSegment();
+        trackWriter.writeCloseSegment();
         wroteSegment = false;
       }
       if (wroteTrack) {
         Location lastValidTrackPoint = myTracksProviderUtils.getLastValidTrackPoint(track.getId());
         setLocationTime(lastValidTrackPoint, offset);
-        trackFormatWriter.writeEndTrack(track, lastValidTrackPoint);
+        trackWriter.writeEndTrack(track, lastValidTrackPoint);
       } else {
         // Write an empty track
-        trackFormatWriter.writeBeginTrack(track, null);
-        trackFormatWriter.writeEndTrack(track, null);
+        trackWriter.writeBeginTrack(track, null);
+        trackWriter.writeEndTrack(track, null);
       }
     } finally {
       iterator.close();

MyTracks/src/com/google/android/apps/mytracks/io/file/TrackFileFormat.java

@@ -12,25 +12,25 @@ import java.util.Locale;
 public enum TrackFileFormat implements Parcelable {
   KML {
   @Override
-    TrackFormatWriter newFormatWriter(Context context) {
+    TrackWriter newTrackWriter(Context context) {
       return new KmlTrackWriter(context);
     }
   },
   GPX {
   @Override
-    TrackFormatWriter newFormatWriter(Context context) {
+    TrackWriter newTrackWriter(Context context) {
       return new GpxTrackWriter(context);
     }
   },
   CSV {
   @Override
-    public TrackFormatWriter newFormatWriter(Context context) {
+    public TrackWriter newTrackWriter(Context context) {
       return new CsvTrackWriter(context);
     }
   },
   TCX {
   @Override
-    public TrackFormatWriter newFormatWriter(Context context) {
+    public TrackWriter newTrackWriter(Context context) {
       return new TcxTrackWriter(context);
     }
   };
@@ -58,9 +58,9 @@ public enum TrackFileFormat implements Parcelable {
   };
 
   /**
-   * Creates and returns a new format writer for each format.
+   * Creates a new track writer for the format.
    */
-  abstract TrackFormatWriter newFormatWriter(Context context);
+  abstract TrackWriter newTrackWriter(Context context);
 
   /**
    * Returns the mime type for each format.

MyTracks/src/com/google/android/apps/mytracks/io/file/TrackWriter.java

@@ -50,7 +50,7 @@ import java.io.OutputStream;
  *
  * @author Rodrigo Damazio
  */
-public interface TrackFormatWriter {
+public interface TrackWriter {
 
   /**
    * Gets the file extension (i.e. gpx, kml, ...)