Aligned base read/write class names.

This commit is contained in:
Willem Cazander 2022-01-29 05:33:58 +01:00
parent 090985f6fe
commit 4e47d59099
13 changed files with 23 additions and 23 deletions

View file

@ -24,7 +24,7 @@ public class Base2Terminator {
int v1 = data[3] + (data[4] << SHIFT_8) + (data[5] << SHIFT_16); int v1 = data[3] + (data[4] << SHIFT_8) + (data[5] << SHIFT_16);
int v2 = data[6] + (data[7] << SHIFT_8) + (data[8] << SHIFT_16); int v2 = data[6] + (data[7] << SHIFT_8) + (data[8] << SHIFT_16);
List<T08PartOctal> octals = base2ReadOctals(v0, v1, v2); List<T08PartOctal> octals = base2ReadOctals(v0, v1, v2);
output.add(new V072Tong(new T08PartOctalIterator(octals.iterator()))); output.add(new V072Tong(new T08PartOctalBaseIterator(octals.iterator())));
totalBytes += BLOCK_TONG_SIZE; totalBytes += BLOCK_TONG_SIZE;
} }
return totalBytes; return totalBytes;
@ -43,7 +43,7 @@ public class Base2Terminator {
int v4 = data[12] + (data[13] << SHIFT_8) + (data[14] << SHIFT_16); int v4 = data[12] + (data[13] << SHIFT_8) + (data[14] << SHIFT_16);
int v5 = data[15] + (data[16] << SHIFT_8) + (data[17] << SHIFT_16); int v5 = data[15] + (data[16] << SHIFT_8) + (data[17] << SHIFT_16);
List<T08PartOctal> octals = base2ReadOctals(v0, v1, v2, v3, v4, v5); List<T08PartOctal> octals = base2ReadOctals(v0, v1, v2, v3, v4, v5);
output.add(new V144Tocta(new T08PartOctalIterator(octals.iterator()))); output.add(new V144Tocta(new T08PartOctalBaseIterator(octals.iterator())));
totalBytes += BLOCK_TOCTA_SIZE; totalBytes += BLOCK_TOCTA_SIZE;
} }
return totalBytes; return totalBytes;

View file

@ -15,9 +15,9 @@ public interface BaseNumber<V extends BaseNumber<V>> {
void fillOctalValues(T08PartOctalBaseAppender appender); void fillOctalValues(T08PartOctalBaseAppender appender);
default T08PartOctalIterator cloneIterator() { default T08PartOctalBaseIterator cloneIterator() {
List<T08PartOctal> octals = new ArrayList<>(); List<T08PartOctal> octals = new ArrayList<>();
fillOctalValues(new T08PartOctalBaseAppender(octals)); fillOctalValues(new T08PartOctalBaseAppender(octals));
return new T08PartOctalIterator(octals.iterator()); return new T08PartOctalBaseIterator(octals.iterator());
} }
} }

View file

@ -2,11 +2,11 @@ package love.distributedrebirth.demo4d.base2t;
import java.util.Iterator; import java.util.Iterator;
public final class T08PartOctalIterator implements Iterator<T08PartOctal> { public final class T08PartOctalBaseIterator implements Iterator<T08PartOctal> {
private final Iterator<T08PartOctal> iterator; private final Iterator<T08PartOctal> iterator;
public T08PartOctalIterator(Iterator<T08PartOctal> iterator) { public T08PartOctalBaseIterator(Iterator<T08PartOctal> iterator) {
this.iterator = iterator; this.iterator = iterator;
} }

View file

@ -8,7 +8,7 @@ public final class V003Timble implements BaseNumber<V003Timble> {
this(T08PartOctal.PART_1); this(T08PartOctal.PART_1);
} }
public V003Timble(T08PartOctalIterator values) { public V003Timble(T08PartOctalBaseIterator values) {
this(values.next()); this(values.next());
} }

View file

@ -8,7 +8,7 @@ public final class V006Tixte implements BaseNumber<V006Tixte> {
this(new V003Timble(), new V003Timble()); this(new V003Timble(), new V003Timble());
} }
public V006Tixte(T08PartOctalIterator values) { public V006Tixte(T08PartOctalBaseIterator values) {
this(new V003Timble(values), new V003Timble(values)); this(new V003Timble(values), new V003Timble(values));
} }

View file

@ -8,7 +8,7 @@ public final class V009Tyte implements BaseNumberTyte<V009Tyte> {
this(new V003Timble(), new V003Timble(), new V003Timble()); this(new V003Timble(), new V003Timble(), new V003Timble());
} }
public V009Tyte(T08PartOctalIterator values) { public V009Tyte(T08PartOctalBaseIterator values) {
this(new V003Timble(values), new V003Timble(values), new V003Timble(values)); this(new V003Timble(values), new V003Timble(values), new V003Timble(values));
} }

View file

@ -2,11 +2,11 @@ package love.distributedrebirth.demo4d.base2t;
import java.util.Iterator; import java.util.Iterator;
public final class V009TyteIterator implements Iterator<V009Tyte> { public final class V009TyteBaseIterator implements Iterator<V009Tyte> {
private final Iterator<V009Tyte> iterator; private final Iterator<V009Tyte> iterator;
public V009TyteIterator(Iterator<V009Tyte> iterator) { public V009TyteBaseIterator(Iterator<V009Tyte> iterator) {
this.iterator = iterator; this.iterator = iterator;
} }

View file

@ -8,11 +8,11 @@ public final class V018Tord implements BaseNumberTyte<V018Tord> {
this(new V009Tyte(), new V009Tyte()); this(new V009Tyte(), new V009Tyte());
} }
public V018Tord(T08PartOctalIterator values) { public V018Tord(T08PartOctalBaseIterator values) {
this(new V009Tyte(values), new V009Tyte(values)); this(new V009Tyte(values), new V009Tyte(values));
} }
public V018Tord(V009TyteIterator values) { public V018Tord(V009TyteBaseIterator values) {
this(values.next(), values.next()); this(values.next(), values.next());
} }

View file

@ -8,11 +8,11 @@ public final class V027Temvig implements BaseNumberTyte<V027Temvig> {
this(new V009Tyte(), new V009Tyte(), new V009Tyte()); this(new V009Tyte(), new V009Tyte(), new V009Tyte());
} }
public V027Temvig(T08PartOctalIterator values) { public V027Temvig(T08PartOctalBaseIterator values) {
this(new V009Tyte(values), new V009Tyte(values), new V009Tyte(values)); this(new V009Tyte(values), new V009Tyte(values), new V009Tyte(values));
} }
public V027Temvig(V009TyteIterator values) { public V027Temvig(V009TyteBaseIterator values) {
this(values.next(), values.next(), values.next()); this(values.next(), values.next(), values.next());
} }

View file

@ -8,11 +8,11 @@ public final class V036Teger implements BaseNumberTyte<V036Teger> {
this(new V018Tord(), new V018Tord()); this(new V018Tord(), new V018Tord());
} }
public V036Teger(T08PartOctalIterator values) { public V036Teger(T08PartOctalBaseIterator values) {
this(new V018Tord(values), new V018Tord(values)); this(new V018Tord(values), new V018Tord(values));
} }
public V036Teger(V009TyteIterator values) { public V036Teger(V009TyteBaseIterator values) {
this(new V018Tord(values), new V018Tord(values)); this(new V018Tord(values), new V018Tord(values));
} }

View file

@ -8,11 +8,11 @@ public final class V072Tong implements BaseNumberTyte<V072Tong> {
this(new V036Teger(), new V036Teger()); this(new V036Teger(), new V036Teger());
} }
public V072Tong(T08PartOctalIterator values) { public V072Tong(T08PartOctalBaseIterator values) {
this(new V036Teger(values), new V036Teger(values)); this(new V036Teger(values), new V036Teger(values));
} }
public V072Tong(V009TyteIterator values) { public V072Tong(V009TyteBaseIterator values) {
this(new V036Teger(values), new V036Teger(values)); this(new V036Teger(values), new V036Teger(values));
} }

View file

@ -8,11 +8,11 @@ public final class V144Tocta implements BaseNumberTyte<V144Tocta> {
this(new V072Tong(), new V072Tong()); this(new V072Tong(), new V072Tong());
} }
public V144Tocta(T08PartOctalIterator values) { public V144Tocta(T08PartOctalBaseIterator values) {
this(new V072Tong(values), new V072Tong(values)); this(new V072Tong(values), new V072Tong(values));
} }
public V144Tocta(V009TyteIterator values) { public V144Tocta(V009TyteBaseIterator values) {
this(new V072Tong(values), new V072Tong(values)); this(new V072Tong(values), new V072Tong(values));
} }

View file

@ -5,7 +5,7 @@ import java.util.List;
import love.distributedrebirth.demo4d.base2t.V009Tyte; import love.distributedrebirth.demo4d.base2t.V009Tyte;
import love.distributedrebirth.demo4d.base2t.V009TyteBaseAppender; import love.distributedrebirth.demo4d.base2t.V009TyteBaseAppender;
import love.distributedrebirth.demo4d.base2t.V009TyteIterator; import love.distributedrebirth.demo4d.base2t.V009TyteBaseIterator;
import love.distributedrebirth.demo4d.base2t.V144Tocta; import love.distributedrebirth.demo4d.base2t.V144Tocta;
public class GroßGetậl { public class GroßGetậl {
@ -43,7 +43,7 @@ public class GroßGetậl {
for (int i=0;i<DENOMINATOR_SIZE;i++) { for (int i=0;i<DENOMINATOR_SIZE;i++) {
tytes.add(denominator[i]); tytes.add(denominator[i]);
} }
V009TyteIterator iterator = new V009TyteIterator(tytes.iterator()); V009TyteBaseIterator iterator = new V009TyteBaseIterator(tytes.iterator());
V144Tocta result = new V144Tocta(iterator); V144Tocta result = new V144Tocta(iterator);
return result; return result;
} }