Simplify toString for range with level up using new formatter conditionals.

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

@@ -109,11 +109,15 @@ public interface Range {
 		}
 		
 		public String toString() {
-			final __Pair p1 = new __Pair(range, per);
-			final StringBuilder str = new StringBuilder(StringHelper.format(" ({} {2} + {} {2}/", p1.value[0], p1.value[1], p1.measure));
-			if ( step == 1 ) { str.append("level"); }
-			else { str.append(step).append(" levels"); }
-			str.append(')');
+//			final __Pair p1 = new __Pair(range, per);
+//			final StringBuilder str = new StringBuilder(StringHelper.format(" ({} {2} + {} {2}/", p1.value[0], p1.value[1], p1.measure));
+//			if ( step == 1 ) { str.append("level"); }
+//			else { str.append(step).append(" levels"); }
+//			str.append(')');
+//			return str.toString();
+			final __Pair p = new __Pair(range, per);
+			final StringBuilder str = new StringBuilder(StringHelper.format("{} ({} {3} + {} {}/{?level:{} levels})",
+					name, p.value[0], p.value[1], p.measure, step == 1, step));
 			return str.toString();
 		}
 	}