Browse Source

Moving constants describing distance measurement into Constants.java

Sam Jaffe 8 years ago
parent
commit
d352b02f98

+ 0 - 1
src/org/leumasjaffe/charsheet/config/Config.java

@@ -7,7 +7,6 @@ import lombok.experimental.UtilityClass;
 
 @UtilityClass
 public class Config {
-	public final String DISTANCE = "Distance Measurement Unit";
 	Map<String, Object> properties = new HashMap<>();
 	
 	public void set(String k, Object v) {

+ 14 - 0
src/org/leumasjaffe/charsheet/config/Constants.java

@@ -0,0 +1,14 @@
+package org.leumasjaffe.charsheet.config;
+
+import lombok.AccessLevel;
+import lombok.experimental.FieldDefaults;
+import lombok.experimental.UtilityClass;
+
+@UtilityClass
+@FieldDefaults(level=AccessLevel.PUBLIC, makeFinal=true)
+public final class Constants {
+	static String NO_FLAT_FOOTED = "Keeps Dexterity When Flat-footed";
+	
+	String DISTANCE = "Distance Measurement Unit";
+	static int DISTANCE_MEASUREMENT_FEET = 0x0, DISTANCE_MEASUREMENT_SQUARES = 0x1;
+}

+ 5 - 5
src/org/leumasjaffe/charsheet/model/magic/Range.java

@@ -13,18 +13,18 @@ import lombok.NonNull;
 import lombok.RequiredArgsConstructor;
 import lombok.experimental.FieldDefaults;
 
-public interface Range {
-	public static final int DISTANCE_MEASUREMENT_FEET = 0x0, DISTANCE_MEASUREMENT_SQUARES = 0x1;
-	
+import static org.leumasjaffe.charsheet.config.Constants.*;
+
+public interface Range {	
 	@FieldDefaults(level=AccessLevel.PUBLIC, makeFinal=true)
 	public static final class __Pair {
 		int[] value;
 		String measure;
 		
-		__Pair(int... feet) {
+		private __Pair(int... feet) {
 			value = new int[feet.length];
 			final int div;
-			if (Config.<Integer>get(Config.DISTANCE, DISTANCE_MEASUREMENT_FEET).equals(DISTANCE_MEASUREMENT_SQUARES)) {
+			if (Config.<Integer>get(DISTANCE, DISTANCE_MEASUREMENT_FEET).equals(DISTANCE_MEASUREMENT_SQUARES)) {
 				div = 5;
 				measure = "squares";
 			} else {