Limit bbc to one line

This commit is contained in:
Willem Cazander 2022-02-01 23:37:28 +01:00
parent caf31e2f96
commit 67d0ad3b49
12 changed files with 12 additions and 60 deletions

View file

@ -17,6 +17,7 @@ public enum T02PartBinary implements BassBone<T02PartBinary> {
PART_2("","1", "", "high"), PART_2("","1", "", "high"),
; ;
public BassBoneCoffin GET_BBC() { return bbc; }
public static int LENGTH() { return values().length; }; public static int LENGTH() { return values().length; };
private final BassBoneCoffin bbc = BassBoneCoffin.newInstance(); private final BassBoneCoffin bbc = BassBoneCoffin.newInstance();
@ -28,9 +29,4 @@ public enum T02PartBinary implements BassBone<T02PartBinary> {
GET_BBC().GET_MAP_OBJ(BassBoneStoreKey.MAP_TONE); GET_BBC().GET_MAP_OBJ(BassBoneStoreKey.MAP_TONE);
GET_BBC().GET_MAP_OBJ(BassBoneStoreKey.MAP_CHINA); GET_BBC().GET_MAP_OBJ(BassBoneStoreKey.MAP_CHINA);
} }
@Override
public BassBoneCoffin GET_BBC() {
return bbc;
}
} }

View file

@ -18,6 +18,7 @@ public enum T03PartTrit implements BassBone<T03PartTrit> {
PART_3("˨","2","","3"), PART_3("˨","2","","3"),
; ;
public BassBoneCoffin GET_BBC() { return bbc; }
public static int LENGTH() { return values().length; }; public static int LENGTH() { return values().length; };
private final BassBoneCoffin bbc = BassBoneCoffin.newInstance(); private final BassBoneCoffin bbc = BassBoneCoffin.newInstance();
@ -29,9 +30,4 @@ public enum T03PartTrit implements BassBone<T03PartTrit> {
GET_BBC().GET_MAP_OBJ(BassBoneStoreKey.MAP_TONE); GET_BBC().GET_MAP_OBJ(BassBoneStoreKey.MAP_TONE);
GET_BBC().GET_MAP_OBJ(BassBoneStoreKey.MAP_CHINA); GET_BBC().GET_MAP_OBJ(BassBoneStoreKey.MAP_CHINA);
} }
@Override
public BassBoneCoffin GET_BBC() {
return bbc;
}
} }

View file

@ -21,6 +21,7 @@ public enum T04PartQuad implements BassBoneAlt1<T04PartQuad> {
PART_4("˩","3","","south","S"), PART_4("˩","3","","south","S"),
; ;
public BassBoneCoffin GET_BBC() { return bbc; }
public static int LENGTH() { return values().length; }; public static int LENGTH() { return values().length; };
private final BassBoneCoffin bbc = BassBoneCoffin.newInstance(); private final BassBoneCoffin bbc = BassBoneCoffin.newInstance();
@ -34,11 +35,6 @@ public enum T04PartQuad implements BassBoneAlt1<T04PartQuad> {
GET_BBC().GET_MAP_OBJ(BassBoneStoreKey.MAP_CHINA); GET_BBC().GET_MAP_OBJ(BassBoneStoreKey.MAP_CHINA);
} }
@Override
public BassBoneCoffin GET_BBC() {
return bbc;
}
public T02PartBinary splitPartBinary(T02PartBinary part) { public T02PartBinary splitPartBinary(T02PartBinary part) {
return T02PartBinary.values()[(ordinal() >> part.ordinal()) & 1]; return T02PartBinary.values()[(ordinal() >> part.ordinal()) & 1];
} }

View file

@ -25,6 +25,7 @@ public enum T06PartSeximal implements BassBoneAlt1<T06PartSeximal> {
PART_6("","5","","9","X"), PART_6("","5","","9","X"),
; ;
public BassBoneCoffin GET_BBC() { return bbc; }
public static int LENGTH() { return values().length; }; public static int LENGTH() { return values().length; };
private final BassBoneCoffin bbc = BassBoneCoffin.newInstance(); private final BassBoneCoffin bbc = BassBoneCoffin.newInstance();
@ -38,11 +39,6 @@ public enum T06PartSeximal implements BassBoneAlt1<T06PartSeximal> {
GET_BBC().GET_MAP_OBJ(BassBoneStoreKey.MAP_CHINA); GET_BBC().GET_MAP_OBJ(BassBoneStoreKey.MAP_CHINA);
} }
@Override
public BassBoneCoffin GET_BBC() {
return bbc;
}
public T02PartBinary splitPartBinary() { public T02PartBinary splitPartBinary() {
return T02PartBinary.values()[ordinal() & 1]; return T02PartBinary.values()[ordinal() & 1];
} }

View file

@ -24,6 +24,7 @@ public enum T07PartPlanIt implements BassBoneAlt1<T07PartPlanIt> {
PART_7("˩","7","♈︎","aries","白羊座"), PART_7("˩","7","♈︎","aries","白羊座"),
; ;
public BassBoneCoffin GET_BBC() { return bbc; }
public static int LENGTH() { return values().length; }; public static int LENGTH() { return values().length; };
private final BassBoneCoffin bbc = BassBoneCoffin.newInstance(); private final BassBoneCoffin bbc = BassBoneCoffin.newInstance();
@ -36,9 +37,4 @@ public enum T07PartPlanIt implements BassBoneAlt1<T07PartPlanIt> {
GET_BBC().GET_MAP_OBJ(BassBoneStoreKey.MAP_TONE); GET_BBC().GET_MAP_OBJ(BassBoneStoreKey.MAP_TONE);
GET_BBC().GET_MAP_OBJ(BassBoneStoreKey.MAP_CHINA); GET_BBC().GET_MAP_OBJ(BassBoneStoreKey.MAP_CHINA);
} }
@Override
public BassBoneCoffin GET_BBC() {
return bbc;
}
} }

View file

@ -28,6 +28,7 @@ public enum T08PartOctal implements BassBoneAlt2<T08PartOctal>,BassBoneShiftBits
PART_8("","7","","feet", "˧˩˩","˩˩˧", 21), PART_8("","7","","feet", "˧˩˩","˩˩˧", 21),
; ;
public BassBoneCoffin GET_BBC() { return bbc; }
public static int LENGTH() { return values().length; }; public static int LENGTH() { return values().length; };
public static int BIT_COUNT = 3; public static int BIT_COUNT = 3;
private static final byte BITMASK = 0x07; private static final byte BITMASK = 0x07;
@ -45,11 +46,6 @@ public enum T08PartOctal implements BassBoneAlt2<T08PartOctal>,BassBoneShiftBits
GET_BBC().GET_MAP_OBJ(BassBoneStoreKey.MAP_CHINA); GET_BBC().GET_MAP_OBJ(BassBoneStoreKey.MAP_CHINA);
} }
@Override
public BassBoneCoffin GET_BBC() {
return bbc;
}
public static T08PartOctal indexOf(T08PartOctal group, int value) { public static T08PartOctal indexOf(T08PartOctal group, int value) {
return T08PartOctal.values()[(value >> group.getShiftBits()) & BITMASK]; return T08PartOctal.values()[(value >> group.getShiftBits()) & BITMASK];
} }

View file

@ -33,6 +33,7 @@ public enum T10PartDecimal implements BassBoneAlt4<T10PartDecimal> {
PART_10("","θ","","nine", "","\u1049","",""), PART_10("","θ","","nine", "","\u1049","",""),
; ;
public BassBoneCoffin GET_BBC() { return bbc; }
public static int LENGTH() { return values().length; }; public static int LENGTH() { return values().length; };
private final BassBoneCoffin bbc = BassBoneCoffin.newInstance(); private final BassBoneCoffin bbc = BassBoneCoffin.newInstance();
@ -49,9 +50,4 @@ public enum T10PartDecimal implements BassBoneAlt4<T10PartDecimal> {
GET_BBC().GET_MAP_OBJ(BassBoneStoreKey.MAP_TONE); GET_BBC().GET_MAP_OBJ(BassBoneStoreKey.MAP_TONE);
GET_BBC().GET_MAP_OBJ(BassBoneStoreKey.MAP_CHINA); GET_BBC().GET_MAP_OBJ(BassBoneStoreKey.MAP_CHINA);
} }
@Override
public BassBoneCoffin GET_BBC() {
return bbc;
}
} }

View file

@ -28,6 +28,7 @@ public enum T11PartUndecimal implements BassBoneAlt1<T11PartUndecimal> {
PART_11("˩","=","","mate", ""), PART_11("˩","=","","mate", ""),
; ;
public BassBoneCoffin GET_BBC() { return bbc; }
public static int LENGTH() { return values().length; }; public static int LENGTH() { return values().length; };
private final BassBoneCoffin bbc = BassBoneCoffin.newInstance(); private final BassBoneCoffin bbc = BassBoneCoffin.newInstance();
@ -40,9 +41,4 @@ public enum T11PartUndecimal implements BassBoneAlt1<T11PartUndecimal> {
GET_BBC().GET_MAP_OBJ(BassBoneStoreKey.MAP_TONE); GET_BBC().GET_MAP_OBJ(BassBoneStoreKey.MAP_TONE);
GET_BBC().GET_MAP_OBJ(BassBoneStoreKey.MAP_CHINA); GET_BBC().GET_MAP_OBJ(BassBoneStoreKey.MAP_CHINA);
} }
@Override
public BassBoneCoffin GET_BBC() {
return bbc;
}
} }

View file

@ -29,6 +29,7 @@ public enum T12PartUncial implements BassBoneAlt1<T12PartUncial> {
PART_12("","B","","nozero", "\u218b"), // TURNED DIGIT THREE PART_12("","B","","nozero", "\u218b"), // TURNED DIGIT THREE
; ;
public BassBoneCoffin GET_BBC() { return bbc; }
public static int LENGTH() { return values().length; }; public static int LENGTH() { return values().length; };
private final BassBoneCoffin bbc = BassBoneCoffin.newInstance(); private final BassBoneCoffin bbc = BassBoneCoffin.newInstance();
@ -41,9 +42,4 @@ public enum T12PartUncial implements BassBoneAlt1<T12PartUncial> {
GET_BBC().GET_MAP_OBJ(BassBoneStoreKey.MAP_TONE); GET_BBC().GET_MAP_OBJ(BassBoneStoreKey.MAP_TONE);
GET_BBC().GET_MAP_OBJ(BassBoneStoreKey.MAP_CHINA); GET_BBC().GET_MAP_OBJ(BassBoneStoreKey.MAP_CHINA);
} }
@Override
public BassBoneCoffin GET_BBC() {
return bbc;
}
} }

View file

@ -33,6 +33,7 @@ public enum T16PartHex implements BassBoneAlt1<T16PartHex> {
PART_16("","F","","sulfur", "D"), PART_16("","F","","sulfur", "D"),
; ;
public BassBoneCoffin GET_BBC() { return bbc; }
public static int LENGTH() { return values().length; }; public static int LENGTH() { return values().length; };
private final BassBoneCoffin bbc = BassBoneCoffin.newInstance(); private final BassBoneCoffin bbc = BassBoneCoffin.newInstance();
@ -46,11 +47,6 @@ public enum T16PartHex implements BassBoneAlt1<T16PartHex> {
GET_BBC().GET_MAP_OBJ(BassBoneStoreKey.MAP_CHINA); GET_BBC().GET_MAP_OBJ(BassBoneStoreKey.MAP_CHINA);
} }
@Override
public BassBoneCoffin GET_BBC() {
return bbc;
}
public T02PartBinary splitPartBinary(T04PartQuad part) { public T02PartBinary splitPartBinary(T04PartQuad part) {
return T02PartBinary.values()[(ordinal() >> part.ordinal()) & 1]; return T02PartBinary.values()[(ordinal() >> part.ordinal()) & 1];
} }

View file

@ -46,6 +46,7 @@ public enum T20PartScore implements BassBoneAlt3<T20PartScore> {
PART_20("","y", "","yocto","J","K","X"), PART_20("","y", "","yocto","J","K","X"),
; ;
public BassBoneCoffin GET_BBC() { return bbc; }
public static int LENGTH() { return values().length; }; public static int LENGTH() { return values().length; };
private final BassBoneCoffin bbc = BassBoneCoffin.newInstance(); private final BassBoneCoffin bbc = BassBoneCoffin.newInstance();
private static final Map<String, T20PartScore> OPENLC_MAP = Collections.unmodifiableMap( private static final Map<String, T20PartScore> OPENLC_MAP = Collections.unmodifiableMap(
@ -64,11 +65,6 @@ public enum T20PartScore implements BassBoneAlt3<T20PartScore> {
GET_BBC().GET_MAP_OBJ(BassBoneStoreKey.MAP_CHINA); GET_BBC().GET_MAP_OBJ(BassBoneStoreKey.MAP_CHINA);
} }
@Override
public BassBoneCoffin GET_BBC() {
return bbc;
}
public T20PartScore staticValueOfOpenLC(String openLCKey) { public T20PartScore staticValueOfOpenLC(String openLCKey) {
return OPENLC_MAP.get(openLCKey); return OPENLC_MAP.get(openLCKey);
} }

View file

@ -78,6 +78,7 @@ public enum T60Sexagesimal implements BassBone<T60Sexagesimal> {
PART_60("꜑꜑꜏","οϚ","","apple"), PART_60("꜑꜑꜏","οϚ","","apple"),
; ;
public BassBoneCoffin GET_BBC() { return bbc; }
public static int LENGTH() { return values().length; }; public static int LENGTH() { return values().length; };
private final BassBoneCoffin bbc = BassBoneCoffin.newInstance(); private final BassBoneCoffin bbc = BassBoneCoffin.newInstance();
@ -89,9 +90,4 @@ public enum T60Sexagesimal implements BassBone<T60Sexagesimal> {
GET_BBC().GET_MAP_OBJ(BassBoneStoreKey.MAP_TONE); GET_BBC().GET_MAP_OBJ(BassBoneStoreKey.MAP_TONE);
GET_BBC().GET_MAP_OBJ(BassBoneStoreKey.MAP_CHINA); GET_BBC().GET_MAP_OBJ(BassBoneStoreKey.MAP_CHINA);
} }
@Override
public BassBoneCoffin GET_BBC() {
return bbc;
}
} }