|
|
@@ -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 {
|