From 1dce20f7eee56166ac61798ca26eeb323dc8f012 Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Fri, 17 Jun 2016 00:52:38 -0700 Subject: altoslib: Get rid of manual JSON encoding stuff Now that the reflective JSON stuff is working, we can delete all of the manual code. Signed-off-by: Keith Packard --- altoslib/AltosRotation.java | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) (limited to 'altoslib/AltosRotation.java') diff --git a/altoslib/AltosRotation.java b/altoslib/AltosRotation.java index 6db0b541..97cf7896 100644 --- a/altoslib/AltosRotation.java +++ b/altoslib/AltosRotation.java @@ -17,7 +17,7 @@ package org.altusmetrum.altoslib_11; -public class AltosRotation implements AltosJsonable { +public class AltosRotation extends AltosQuaternion { private AltosQuaternion rotation; public double tilt() { @@ -48,22 +48,7 @@ public class AltosRotation implements AltosJsonable { rotation = up.vectors_to_rotation(orient); } - public AltosRotation(AltosJson j) { - rotation = new AltosQuaternion(j); - } - public AltosRotation() { rotation = new AltosQuaternion(); } - - public AltosJson json() { - return rotation.json(); - } - - public static AltosRotation fromJson(AltosJson j, AltosRotation def) { - if (j == null) - return def; - - return new AltosRotation(j); - } } -- cgit v1.2.3