First stage of a major refactoring.

Question and Answer can now be serialized and deserialized to/from JSON.
As such, I no longer have to pass awkward maps around. As part of this
change I have introduced a Provider interface to abstract out loading
and persisting these beans.

The scoring logic has been completed factored out of
SurveyResultsResource and into the various ScoringEngines. Tests have
been added for Question, Answer, and the ScoringEngines. A bug has been
fixed in computing the value for slider questions.

The label identifiers in the circle questions have changed from all
lower case to camel case. That is, topleft is now topLeft. Several
issues have been corrected in the circle answers where the point values
did not match the labels.

Testing and code coverage support and reports have been added.

1 files changed, 79 insertions, 0 deletions

diff --git a/src/com/p4square/grow/model/Point.java b/src/com/p4square/grow/model/Point.java
new file mode 100644
index 0000000..e9fc0ca
--- /dev/null
+++ b/src/com/p4square/grow/model/Point.java
@@ -0,0 +1,79 @@
+/*
+ * Copyright 2013 Jesse Morgan
+ */
+
+package com.p4square.grow.model;
+
+/**
+ * Simple double based point class.
+ *
+ * @author Jesse Morgan <jesse@jesterpm.net>
+ */
+public class Point {
+    /**
+     * Parse a comma separated x,y pair into a point.
+     *
+     * @return The point represented by the string.
+     * @throws IllegalArgumentException if the input is malformed.
+     */
+    public static Point valueOf(String str) {
+        final int comma = str.indexOf(',');
+        if (comma == -1 || comma == 0 || comma == str.length() - 1) {
+            throw new IllegalArgumentException("Malformed point string");
+        }
+
+        final String sX = str.substring(0, comma);
+        final String sY = str.substring(comma + 1);
+
+        return new Point(Double.valueOf(sX), Double.valueOf(sY));
+    }
+
+    private final double mX;
+    private final double mY;
+
+    /**
+     * Create a new point with the given coordinates.
+     *
+     * @param x The x coordinate.
+     * @param y The y coordinate.
+     */
+    public Point(double x, double y) {
+        mX = x;
+        mY = y;
+    }
+
+    /**
+     * Compute the distance between this point and another.
+     *
+     * @param other The other point.
+     * @return The distance between this point and other.
+     */
+    public double distance(Point other) {
+        final double dx = mX - other.mX;
+        final double dy = mY - other.mY;
+
+        return Math.sqrt(dx*dx + dy*dy);
+    }
+
+    /**
+     * @return The x coordinate.
+     */
+    public double getX() {
+        return mX;
+    }
+
+    /**
+     * @return The y coordinate.
+     */
+    public double getY() {
+        return mY;
+    }
+
+    /**
+     * @return The point represented as a comma separated pair.
+     */
+    @Override
+    public String toString() {
+        return String.format("%.2f,%.2f", mX, mY);
+    }
+}