altos/lisp: Fix uninitialized values in ao_lisp_make_const

[fw/altos] / altoslib / AltosMag.java

diff --git a/altoslib/AltosMag.java b/altoslib/AltosMag.java
index c350ae46392f4ddd637b58fe8f34c0c825a9faf1..e89ec0debf5742abff50960451dd0006b02b3493 100644 (file)
--- a/altoslib/AltosMag.java
+++ b/altoslib/AltosMag.java
@@ -3,7 +3,8 @@
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -20,7 +21,7 @@ package org.altusmetrum.altoslib_11;
 import java.util.concurrent.*;
 import java.io.*;
 
-public class AltosMag implements Cloneable, AltosHashable {
+public class AltosMag implements Cloneable {
        public int              along;
        public int              across;
        public int              through;
@@ -93,28 +94,4 @@ public class AltosMag implements Cloneable, AltosHashable {
                                break;
                }
        }
-
-       public AltosHashSet hashSet() {
-               AltosHashSet    h = new AltosHashSet();
-
-               h.putInt("along", along);
-               h.putInt("across", across);
-               h.putInt("through", through);
-               return h;
-       }
-
-       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);
-       }
 }