X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altoslib%2FAltosCSV.java;h=f55b47852a47a895e8fa829346a9594b5a17a6a9;hp=38afdc640e4d85df23a144c497b257ab97477d89;hb=0da4e201041a4420f273c2e0cda77eea78099518;hpb=222158581887b5f9e8b9843d14321c313fa023fa

diff --git a/altoslib/AltosCSV.java b/altoslib/AltosCSV.java
index 38afdc64..f55b4785 100644
--- a/altoslib/AltosCSV.java
+++ b/altoslib/AltosCSV.java
@@ -16,7 +16,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_11;
+package org.altusmetrum.altoslib_12;
 
 import java.io.*;
 import java.util.*;
@@ -133,8 +133,8 @@ public class AltosCSV implements AltosWriter {
 	void write_general() {
 		double time = time();
 		out.printf("%s, %d, %d, %s, %8.2f, %8.2f, %4d, %3d",
-			   ALTOS_CSV_VERSION, series.cal_data.serial,
-			   series.cal_data.flight, series.cal_data.callsign,
+			   ALTOS_CSV_VERSION, series.cal_data().serial,
+			   series.cal_data().flight, series.cal_data().callsign,
 			   time, time,
 			   rssi(), status() & 0x7f);
 	}
@@ -220,8 +220,8 @@ public class AltosCSV implements AltosWriter {
 
 		AltosGreatCircle from_pad;
 
-		if (series.cal_data.gps_pad != null && gps != null)
-			from_pad = new AltosGreatCircle(series.cal_data.gps_pad, gps);
+		if (series.cal_data().gps_pad != null && gps != null)
+			from_pad = new AltosGreatCircle(series.cal_data().gps_pad, gps);
 		else
 			from_pad = new AltosGreatCircle();
 
@@ -393,7 +393,7 @@ public class AltosCSV implements AltosWriter {
 
 		this.series = series;
 
-		series.fill_in();
+		series.finish();
 
 		has_flight_state = false;
 		has_basic = false;