X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altoslib%2FAltosRotation.java;h=0de2451504fb82385c971a94dc656150385a0e43;hb=a61217f0a6d0ef48b6471f632c4600255867e831;hp=4b7ab407514331e6b3bb62ee117a0a78f62d62c7;hpb=1b5ea911049a8afae6af475a4a2bf62a6e3aa57b;p=fw%2Faltos

diff --git a/altoslib/AltosRotation.java b/altoslib/AltosRotation.java
index 4b7ab407..0de24515 100644
--- a/altoslib/AltosRotation.java
+++ b/altoslib/AltosRotation.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
@@ -15,9 +16,9 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_11;
+package org.altusmetrum.altoslib_12;
 
-public class AltosRotation implements AltosHashable, AltosJsonable {
+public class AltosRotation extends AltosQuaternion {
 	private AltosQuaternion		rotation;
 
 	public double tilt() {
@@ -48,36 +49,7 @@ public class AltosRotation implements AltosHashable, AltosJsonable {
 		rotation = up.vectors_to_rotation(orient);
 	}
 
-	public AltosHashSet hashSet() {
-		AltosHashSet h = new AltosHashSet();
-
-		h.putHashable("rotation", rotation);
-		return h;
-	}
-
-	public AltosJson json() {
-		return rotation.json();
-	}
-
-	public AltosRotation(AltosHashSet h) {
-		rotation = new AltosQuaternion(h.getHash("rotation"));
-	}
-
-	public static AltosRotation fromHashSet(AltosHashSet h, AltosRotation def) {
-		if (h == null)
-			return def;
-
-		return new AltosRotation(h);
-	}
-
-	public AltosRotation(AltosJson j) {
-		rotation = new AltosQuaternion(j);
-	}
-
-	public static AltosRotation fromJson(AltosJson j, AltosRotation def) {
-		if (j == null)
-			return def;
-
-		return new AltosRotation(j);
+	public AltosRotation() {
+		rotation = new AltosQuaternion();
 	}
 }