altoslib: Make cal_data private in AltosDataListener

[fw/altos] / altoslib / AltosCSV.java

diff --git a/altoslib/AltosCSV.java b/altoslib/AltosCSV.java
index 38afdc640e4d85df23a144c497b257ab97477d89..f55b47852a47a895e8fa829346a9594b5a17a6a9 100644 (file)
--- 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;