projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into altosdroid
[fw/altos]
/
altoslib
/
AltosRecord.java
diff --git
a/altoslib/AltosRecord.java
b/altoslib/AltosRecord.java
index 091695154fea3cc01a2a5fecf7b2afebed47e218..f8c44cc5a06a9f2f5092bd7eef316eb334d6b9d3 100644
(file)
--- a/
altoslib/AltosRecord.java
+++ b/
altoslib/AltosRecord.java
@@
-15,7
+15,7
@@
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
* 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 <AltosRecord>, Cloneable {
public abstract class AltosRecord implements Comparable <AltosRecord>, Cloneable {
@@
-126,6
+126,8
@@
public abstract class AltosRecord implements Comparable <AltosRecord>, Cloneable
return tick - o.tick;
}
return tick - o.tick;
}
+ abstract public AltosRecord clone();
+
public void copy(AltosRecord old) {
seen = old.seen;
version = old.version;
public void copy(AltosRecord old) {
seen = old.seen;
version = old.version;
@@
-144,16
+146,6
@@
public abstract class AltosRecord implements Comparable <AltosRecord>, Cloneable
kalman_height = old.kalman_height;
}
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;
public AltosRecord() {
seen = 0;
version = 0;