X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altoslib%2FAltosMag.java;fp=altoslib%2FAltosMag.java;h=8d40bc607490f5392fff4c4eb5cc3f50573a396c;hp=ec98882f2e0513629fa3e25395d814b120a9b757;hb=f7e2f7f430e612c682bf55478860054ce94b995f;hpb=1b5ea911049a8afae6af475a4a2bf62a6e3aa57b diff --git a/altoslib/AltosMag.java b/altoslib/AltosMag.java index ec98882f..8d40bc60 100644 --- a/altoslib/AltosMag.java +++ b/altoslib/AltosMag.java @@ -20,7 +20,7 @@ package org.altusmetrum.altoslib_11; import java.util.concurrent.*; import java.io.*; -public class AltosMag implements Cloneable, AltosHashable, AltosJsonable { +public class AltosMag implements Cloneable, AltosJsonable { public int along; public int across; public int through; @@ -94,15 +94,6 @@ public class AltosMag implements Cloneable, AltosHashable, AltosJsonable { } } - public AltosHashSet hashSet() { - AltosHashSet h = new AltosHashSet(); - - h.putInt("along", along); - h.putInt("across", across); - h.putInt("through", through); - return h; - } - public AltosJson json() { AltosJson j = new AltosJson(); @@ -112,21 +103,6 @@ public class AltosMag implements Cloneable, AltosHashable, AltosJsonable { return j; } - public AltosMag(AltosHashSet h) { - this(); - - along = h.getInt("along", along); - across = h.getInt("across", across); - through = h.getInt("through", through); - } - - public static AltosMag fromHashSet(AltosHashSet h, AltosMag def) { - if (h == null) - return def; - - return new AltosMag(h); - } - public AltosMag(AltosJson j) { this();