X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altoslib%2FAltosRecord.java;h=07e910eb726e53fb28471521035f7f0a68b7665b;hp=091695154fea3cc01a2a5fecf7b2afebed47e218;hb=02243463adbdfb860f69580f544da9026dc7cbd4;hpb=055f3232decc07e064d596469b81cf9869411c2d diff --git a/altoslib/AltosRecord.java b/altoslib/AltosRecord.java index 09169515..07e910eb 100644 --- a/altoslib/AltosRecord.java +++ b/altoslib/AltosRecord.java @@ -15,9 +15,9 @@ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ -package org.altusmetrum.AltosLib; +package org.altusmetrum.altoslib_1; -public abstract class AltosRecord implements Comparable , Cloneable { +public class AltosRecord implements Comparable , Cloneable { public static final int seen_flight = 1; public static final int seen_sensor = 2; @@ -75,9 +75,9 @@ public abstract class AltosRecord implements Comparable , Cloneable * temperature: °C */ - abstract public double pressure(); - abstract public double ground_pressure(); - abstract public double acceleration(); + public double pressure() { return MISSING; } + public double ground_pressure() { return MISSING; } + public double acceleration() { return MISSING; } public double altitude() { double p = pressure(); @@ -126,6 +126,12 @@ public abstract class AltosRecord implements Comparable , Cloneable return tick - o.tick; } + public AltosRecord clone() { + AltosRecord n = new AltosRecord(); + n.copy(this); + return n; + } + public void copy(AltosRecord old) { seen = old.seen; version = old.version; @@ -144,27 +150,17 @@ public abstract class AltosRecord implements Comparable , Cloneable kalman_height = old.kalman_height; } - public AltosRecord clone() { - try { - AltosRecord n = (AltosRecord) super.clone(); - n.copy(this); - return n; - } catch (CloneNotSupportedException e) { - return null; - } - } - public AltosRecord() { seen = 0; version = 0; callsign = "N0CALL"; - serial = 0; - flight = 0; + serial = MISSING; + flight = MISSING; rssi = 0; status = 0; state = AltosLib.ao_flight_startup; tick = 0; - gps = new AltosGPS(); + gps = null; new_gps = false; companion = null;