projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altoslib: Improve AltosState save/restore debugging
[fw/altos]
/
altoslib
/
AltosMag.java
diff --git
a/altoslib/AltosMag.java
b/altoslib/AltosMag.java
index c350ae46392f4ddd637b58fe8f34c0c825a9faf1..8d40bc607490f5392fff4c4eb5cc3f50573a396c 100644
(file)
--- a/
altoslib/AltosMag.java
+++ b/
altoslib/AltosMag.java
@@
-20,7
+20,7
@@
package org.altusmetrum.altoslib_11;
import java.util.concurrent.*;
import java.io.*;
import java.util.concurrent.*;
import java.io.*;
-public class AltosMag implements Cloneable, Altos
Hash
able {
+public class AltosMag implements Cloneable, Altos
Json
able {
public int along;
public int across;
public int through;
public int along;
public int across;
public int through;
@@
-94,27
+94,27
@@
public class AltosMag implements Cloneable, AltosHashable {
}
}
}
}
- public Altos
HashSet hashSet
() {
- Altos
HashSet h = new AltosHashSet
();
+ public Altos
Json json
() {
+ Altos
Json j = new AltosJson
();
-
h.putIn
t("along", along);
-
h.putIn
t("across", across);
-
h.putIn
t("through", through);
- return
h
;
+
j.pu
t("along", along);
+
j.pu
t("across", across);
+
j.pu
t("through", through);
+ return
j
;
}
}
- public AltosMag(Altos
HashSet h
) {
+ public AltosMag(Altos
Json j
) {
this();
this();
- along =
h.getI
nt("along", along);
- across =
h.getI
nt("across", across);
- through =
h.getI
nt("through", through);
+ along =
j.get_i
nt("along", along);
+ across =
j.get_i
nt("across", across);
+ through =
j.get_i
nt("through", through);
}
}
- public static AltosMag from
HashSet(AltosHashSet h
, AltosMag def) {
- if (
h
== null)
+ public static AltosMag from
Json(AltosJson j
, AltosMag def) {
+ if (
j
== null)
return def;
return def;
- return new AltosMag(
h
);
+ return new AltosMag(
j
);
}
}
}
}