From 4e47d59099fce8d766dec56ebd55b5f7f368fdd1 Mon Sep 17 00:00:00 2001 From: Willem Cazander Date: Sat, 29 Jan 2022 05:33:58 +0100 Subject: [PATCH] Aligned base read/write class names. --- .../distributedrebirth/demo4d/base2t/Base2Terminator.java | 4 ++-- .../src/love/distributedrebirth/demo4d/base2t/BaseNumber.java | 4 ++-- ...08PartOctalIterator.java => T08PartOctalBaseIterator.java} | 4 ++-- .../src/love/distributedrebirth/demo4d/base2t/V003Timble.java | 2 +- core/src/love/distributedrebirth/demo4d/base2t/V006Tixte.java | 2 +- core/src/love/distributedrebirth/demo4d/base2t/V009Tyte.java | 2 +- .../{V009TyteIterator.java => V009TyteBaseIterator.java} | 4 ++-- core/src/love/distributedrebirth/demo4d/base2t/V018Tord.java | 4 ++-- .../src/love/distributedrebirth/demo4d/base2t/V027Temvig.java | 4 ++-- core/src/love/distributedrebirth/demo4d/base2t/V036Teger.java | 4 ++-- core/src/love/distributedrebirth/demo4d/base2t/V072Tong.java | 4 ++-- core/src/love/distributedrebirth/demo4d/base2t/V144Tocta.java | 4 ++-- .../love/distributedrebirth/demo4d/fraction4d/GroßGetậl.java | 4 ++-- 13 files changed, 23 insertions(+), 23 deletions(-) rename core/src/love/distributedrebirth/demo4d/base2t/{T08PartOctalIterator.java => T08PartOctalBaseIterator.java} (67%) rename core/src/love/distributedrebirth/demo4d/base2t/{V009TyteIterator.java => V009TyteBaseIterator.java} (69%) diff --git a/core/src/love/distributedrebirth/demo4d/base2t/Base2Terminator.java b/core/src/love/distributedrebirth/demo4d/base2t/Base2Terminator.java index 0023d628..797cf95b 100644 --- a/core/src/love/distributedrebirth/demo4d/base2t/Base2Terminator.java +++ b/core/src/love/distributedrebirth/demo4d/base2t/Base2Terminator.java @@ -24,7 +24,7 @@ public class Base2Terminator { int v1 = data[3] + (data[4] << SHIFT_8) + (data[5] << SHIFT_16); int v2 = data[6] + (data[7] << SHIFT_8) + (data[8] << SHIFT_16); List 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; } return totalBytes; @@ -43,7 +43,7 @@ public class Base2Terminator { int v4 = data[12] + (data[13] << SHIFT_8) + (data[14] << SHIFT_16); int v5 = data[15] + (data[16] << SHIFT_8) + (data[17] << SHIFT_16); List 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; } return totalBytes; diff --git a/core/src/love/distributedrebirth/demo4d/base2t/BaseNumber.java b/core/src/love/distributedrebirth/demo4d/base2t/BaseNumber.java index aadbf1ac..3b819dce 100644 --- a/core/src/love/distributedrebirth/demo4d/base2t/BaseNumber.java +++ b/core/src/love/distributedrebirth/demo4d/base2t/BaseNumber.java @@ -15,9 +15,9 @@ public interface BaseNumber> { void fillOctalValues(T08PartOctalBaseAppender appender); - default T08PartOctalIterator cloneIterator() { + default T08PartOctalBaseIterator cloneIterator() { List octals = new ArrayList<>(); fillOctalValues(new T08PartOctalBaseAppender(octals)); - return new T08PartOctalIterator(octals.iterator()); + return new T08PartOctalBaseIterator(octals.iterator()); } } diff --git a/core/src/love/distributedrebirth/demo4d/base2t/T08PartOctalIterator.java b/core/src/love/distributedrebirth/demo4d/base2t/T08PartOctalBaseIterator.java similarity index 67% rename from core/src/love/distributedrebirth/demo4d/base2t/T08PartOctalIterator.java rename to core/src/love/distributedrebirth/demo4d/base2t/T08PartOctalBaseIterator.java index 61a7f0f5..1ab24047 100644 --- a/core/src/love/distributedrebirth/demo4d/base2t/T08PartOctalIterator.java +++ b/core/src/love/distributedrebirth/demo4d/base2t/T08PartOctalBaseIterator.java @@ -2,11 +2,11 @@ package love.distributedrebirth.demo4d.base2t; import java.util.Iterator; -public final class T08PartOctalIterator implements Iterator { +public final class T08PartOctalBaseIterator implements Iterator { private final Iterator iterator; - public T08PartOctalIterator(Iterator iterator) { + public T08PartOctalBaseIterator(Iterator iterator) { this.iterator = iterator; } diff --git a/core/src/love/distributedrebirth/demo4d/base2t/V003Timble.java b/core/src/love/distributedrebirth/demo4d/base2t/V003Timble.java index be0a4b71..92af787c 100644 --- a/core/src/love/distributedrebirth/demo4d/base2t/V003Timble.java +++ b/core/src/love/distributedrebirth/demo4d/base2t/V003Timble.java @@ -8,7 +8,7 @@ public final class V003Timble implements BaseNumber { this(T08PartOctal.PART_1); } - public V003Timble(T08PartOctalIterator values) { + public V003Timble(T08PartOctalBaseIterator values) { this(values.next()); } diff --git a/core/src/love/distributedrebirth/demo4d/base2t/V006Tixte.java b/core/src/love/distributedrebirth/demo4d/base2t/V006Tixte.java index cb4625ca..2097b463 100644 --- a/core/src/love/distributedrebirth/demo4d/base2t/V006Tixte.java +++ b/core/src/love/distributedrebirth/demo4d/base2t/V006Tixte.java @@ -8,7 +8,7 @@ public final class V006Tixte implements BaseNumber { this(new V003Timble(), new V003Timble()); } - public V006Tixte(T08PartOctalIterator values) { + public V006Tixte(T08PartOctalBaseIterator values) { this(new V003Timble(values), new V003Timble(values)); } diff --git a/core/src/love/distributedrebirth/demo4d/base2t/V009Tyte.java b/core/src/love/distributedrebirth/demo4d/base2t/V009Tyte.java index 7094fdd1..05096fe8 100644 --- a/core/src/love/distributedrebirth/demo4d/base2t/V009Tyte.java +++ b/core/src/love/distributedrebirth/demo4d/base2t/V009Tyte.java @@ -8,7 +8,7 @@ public final class V009Tyte implements BaseNumberTyte { 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)); } diff --git a/core/src/love/distributedrebirth/demo4d/base2t/V009TyteIterator.java b/core/src/love/distributedrebirth/demo4d/base2t/V009TyteBaseIterator.java similarity index 69% rename from core/src/love/distributedrebirth/demo4d/base2t/V009TyteIterator.java rename to core/src/love/distributedrebirth/demo4d/base2t/V009TyteBaseIterator.java index de6ab6f5..eaba21ed 100644 --- a/core/src/love/distributedrebirth/demo4d/base2t/V009TyteIterator.java +++ b/core/src/love/distributedrebirth/demo4d/base2t/V009TyteBaseIterator.java @@ -2,11 +2,11 @@ package love.distributedrebirth.demo4d.base2t; import java.util.Iterator; -public final class V009TyteIterator implements Iterator { +public final class V009TyteBaseIterator implements Iterator { private final Iterator iterator; - public V009TyteIterator(Iterator iterator) { + public V009TyteBaseIterator(Iterator iterator) { this.iterator = iterator; } diff --git a/core/src/love/distributedrebirth/demo4d/base2t/V018Tord.java b/core/src/love/distributedrebirth/demo4d/base2t/V018Tord.java index 2aef6615..6991ea8f 100644 --- a/core/src/love/distributedrebirth/demo4d/base2t/V018Tord.java +++ b/core/src/love/distributedrebirth/demo4d/base2t/V018Tord.java @@ -8,11 +8,11 @@ public final class V018Tord implements BaseNumberTyte { this(new V009Tyte(), new V009Tyte()); } - public V018Tord(T08PartOctalIterator values) { + public V018Tord(T08PartOctalBaseIterator values) { this(new V009Tyte(values), new V009Tyte(values)); } - public V018Tord(V009TyteIterator values) { + public V018Tord(V009TyteBaseIterator values) { this(values.next(), values.next()); } diff --git a/core/src/love/distributedrebirth/demo4d/base2t/V027Temvig.java b/core/src/love/distributedrebirth/demo4d/base2t/V027Temvig.java index b017e1a6..89681dc3 100644 --- a/core/src/love/distributedrebirth/demo4d/base2t/V027Temvig.java +++ b/core/src/love/distributedrebirth/demo4d/base2t/V027Temvig.java @@ -8,11 +8,11 @@ public final class V027Temvig implements BaseNumberTyte { 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)); } - public V027Temvig(V009TyteIterator values) { + public V027Temvig(V009TyteBaseIterator values) { this(values.next(), values.next(), values.next()); } diff --git a/core/src/love/distributedrebirth/demo4d/base2t/V036Teger.java b/core/src/love/distributedrebirth/demo4d/base2t/V036Teger.java index d32eba64..8d028a4d 100644 --- a/core/src/love/distributedrebirth/demo4d/base2t/V036Teger.java +++ b/core/src/love/distributedrebirth/demo4d/base2t/V036Teger.java @@ -8,11 +8,11 @@ public final class V036Teger implements BaseNumberTyte { this(new V018Tord(), new V018Tord()); } - public V036Teger(T08PartOctalIterator values) { + public V036Teger(T08PartOctalBaseIterator values) { this(new V018Tord(values), new V018Tord(values)); } - public V036Teger(V009TyteIterator values) { + public V036Teger(V009TyteBaseIterator values) { this(new V018Tord(values), new V018Tord(values)); } diff --git a/core/src/love/distributedrebirth/demo4d/base2t/V072Tong.java b/core/src/love/distributedrebirth/demo4d/base2t/V072Tong.java index 033bb0f3..df4447f4 100644 --- a/core/src/love/distributedrebirth/demo4d/base2t/V072Tong.java +++ b/core/src/love/distributedrebirth/demo4d/base2t/V072Tong.java @@ -8,11 +8,11 @@ public final class V072Tong implements BaseNumberTyte { this(new V036Teger(), new V036Teger()); } - public V072Tong(T08PartOctalIterator values) { + public V072Tong(T08PartOctalBaseIterator values) { this(new V036Teger(values), new V036Teger(values)); } - public V072Tong(V009TyteIterator values) { + public V072Tong(V009TyteBaseIterator values) { this(new V036Teger(values), new V036Teger(values)); } diff --git a/core/src/love/distributedrebirth/demo4d/base2t/V144Tocta.java b/core/src/love/distributedrebirth/demo4d/base2t/V144Tocta.java index f21baf41..71aabe34 100644 --- a/core/src/love/distributedrebirth/demo4d/base2t/V144Tocta.java +++ b/core/src/love/distributedrebirth/demo4d/base2t/V144Tocta.java @@ -8,11 +8,11 @@ public final class V144Tocta implements BaseNumberTyte { this(new V072Tong(), new V072Tong()); } - public V144Tocta(T08PartOctalIterator values) { + public V144Tocta(T08PartOctalBaseIterator values) { this(new V072Tong(values), new V072Tong(values)); } - public V144Tocta(V009TyteIterator values) { + public V144Tocta(V009TyteBaseIterator values) { this(new V072Tong(values), new V072Tong(values)); } diff --git a/core/src/love/distributedrebirth/demo4d/fraction4d/GroßGetậl.java b/core/src/love/distributedrebirth/demo4d/fraction4d/GroßGetậl.java index 456b9b3c..f6265024 100644 --- a/core/src/love/distributedrebirth/demo4d/fraction4d/GroßGetậl.java +++ b/core/src/love/distributedrebirth/demo4d/fraction4d/GroßGetậl.java @@ -5,7 +5,7 @@ import java.util.List; import love.distributedrebirth.demo4d.base2t.V009Tyte; import love.distributedrebirth.demo4d.base2t.V009TyteBaseAppender; -import love.distributedrebirth.demo4d.base2t.V009TyteIterator; +import love.distributedrebirth.demo4d.base2t.V009TyteBaseIterator; import love.distributedrebirth.demo4d.base2t.V144Tocta; public class GroßGetậl { @@ -43,7 +43,7 @@ public class GroßGetậl { for (int i=0;i