Enabling foot-square conversion for Area objects.

src/org/leumasjaffe/charsheet/model/magic/dimension/Area.java

@@ -1,7 +1,8 @@
 package org.leumasjaffe.charsheet.model.magic.dimension;
 
+import org.leumasjaffe.charsheet.util.StringHelper;
+
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
-import com.fasterxml.jackson.annotation.JsonTypeInfo.As;
 import com.fasterxml.jackson.annotation.JsonTypeInfo.Id;
 
 import lombok.AccessLevel;
@@ -9,7 +10,7 @@ import lombok.NonNull;
 import lombok.RequiredArgsConstructor;
 import lombok.experimental.FieldDefaults;
 
-@JsonTypeInfo(use=Id.CLASS, include=As.PROPERTY, property="class")
+@JsonTypeInfo(use=Id.NAME)
 public interface Area {
 	public static enum Emission { BURST, EMANATION, SPREAD, NONE }
 	public static enum Shape { CONE, CYLINDER, LINE, SPHERE }
@@ -20,7 +21,8 @@ public interface Area {
 		int distance;
 
 		public String toString() {
-			return distance + " ft. line from you";
+			final Range.__Pair p = new Range.__Pair(distance);
+			return StringHelper.format("{} {} line from you", p.value[0], p.measure);
 		}
 	}
 
@@ -42,24 +44,20 @@ public interface Area {
 		boolean aroundYou;
 
 		public String toString() {
+			final Range.__Pair p = new Range.__Pair(Math.max(5, radius));
 			// TODO size/level spheres like Otiluke’s Resilient Sphere PH258
-			final StringBuilder str = new StringBuilder();
-			if ( radius == 0 ) { str.append("5-ft.-diameter "); }
-			else { str.append(radius).append("-ft.-radius "); }
+			return StringHelper.format(
+					"{}-{}-{?diameter:radius} {} {?, centered around you:}", 
+					p.value[0], p.measure, radius == 0,
+					getEminationString(), aroundYou);
+		}
 
+		private String getEminationString() {
 			switch (emit) {
-			case NONE:
-				str.append("sphere");
-				break;
-			case EMANATION:
-				str.append("spherical ");
-			default:
-				str.append(emit);
-				break;
+			case NONE: return "sphere";
+			case EMANATION:	return "spherical " + emit;
+			default: return emit.toString();
 			}
-			if ( aroundYou ) { str.append(", centered around you");	}
-
-			return str.toString();
 		}
 	}
 
@@ -71,10 +69,9 @@ public interface Area {
 		
 		public String toString() {
 			// TODO Grow by level cylinder (e.g. Control Winds PH214)
-			final StringBuilder str = new StringBuilder("Cylinder (");
-			str.append(radius).append("-ft. radius, ");
-			str.append(height).append("-ft. high)");
-			return str.toString();
+			final Range.__Pair p = new Range.__Pair(radius, height);
+			return StringHelper.format("Cylinder ({}-{2} radius, {}-{} high)", 
+					p.value[0], p.value[1], p.measure);
 		}
 	}
 }

src/org/leumasjaffe/charsheet/model/magic/dimension/Range.java

@@ -15,12 +15,12 @@ import static org.leumasjaffe.charsheet.config.Constants.K_DISTANCE;
 import static org.leumasjaffe.charsheet.config.Constants.DistanceMeasurement.*;
 
 public interface Range {	
-	@FieldDefaults(level=AccessLevel.PRIVATE, makeFinal=true)
+	@FieldDefaults(level=AccessLevel.PUBLIC, makeFinal=true)
 	public static final class __Pair {
 		int[] value;
 		String measure;
 		
-		private __Pair(int... feet) {
+		public __Pair(int... feet) {
 			value = new int[feet.length];
 			final int div;
 			if (Config.get(K_DISTANCE, FEET) == SQUARES) {