projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altoslib: Make cal_data private in AltosDataListener
[fw/altos]
/
altoslib
/
AltosDataListener.java
diff --git
a/altoslib/AltosDataListener.java
b/altoslib/AltosDataListener.java
index 7f5dfda9360cfb9bf1c4c249e457134aae4957b2..5f89b3e4b5adae46772f47387ea0e5da37107f19 100644
(file)
--- a/
altoslib/AltosDataListener.java
+++ b/
altoslib/AltosDataListener.java
@@
-16,24
+16,45
@@
package org.altusmetrum.altoslib_12;
public abstract class AltosDataListener {
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 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_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) {
public double time() {
return time;
}
public void set_state(int state) {
+ cal_data().set_state(state);
if (state != AltosLib.MISSING)
this.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() {
}
/* Called after all records are captured */
public void finish() {
}