altoslib: Make cal_data private in AltosDataListener

This way we can create it as needed.

Signed-off-by: Keith Packard <keithp@keithp.com>

1 files changed, 22 insertions, 1 deletions

diff --git a/altoslib/AltosDataListener.java b/altoslib/AltosDataListener.java
index 7f5dfda9..5f89b3e4 100644
--- a/altoslib/AltosDataListener.java
+++ b/altoslib/AltosDataListener.java
@@ -16,24 +16,45 @@ package org.altusmetrum.altoslib_12;
 
 public abstract class AltosDataListener {
 
-	public AltosCalData	cal_data = null;
+	private AltosCalData	cal_data = null;
+
 	public double		time = AltosLib.MISSING;
 	public int		state = AltosLib.MISSING;
 
+	public void set_tick(int tick) {
+		cal_data.set_tick(tick);
+		set_time(cal_data.time());
+	}
+
+	public AltosCalData cal_data() {
+		if (cal_data == null)
+			cal_data = new AltosCalData();
+		return cal_data;
+	}
+
 	public void set_time(double time) {
 		if (time != AltosLib.MISSING)
 			this.time = time;
 	}
 
+	public void set_serial(int serial) {
+		cal_data().set_serial(serial);
+	}
+
 	public double time() {
 		return time;
 	}
 
 	public void set_state(int state) {
+		cal_data().set_state(state);
 		if (state != AltosLib.MISSING)
 			this.state = state;
 	}
 
+	public void set_flight(int flight) {
+		cal_data().set_flight(flight);
+	}
+
 	/* Called after all records are captured */
 	public void finish() {
 	}