From 0f909039fe4c8dd67104e8024651ed487784bbce Mon Sep 17 00:00:00 2001 From: OLEGSHA Date: Fri, 6 Aug 2021 11:02:43 +0300 Subject: [PATCH] Renamed ReusableServerContext to DefaultServerContext --- ...Context.java => DefaultServerContext.java} | 28 ++++++++-------- ...java => DefaultServerContextBuilders.java} | 18 +++++------ ...mpl.java => DefaultServerContextImpl.java} | 32 +++++++++---------- 3 files changed, 39 insertions(+), 39 deletions(-) rename src/main/java/ru/windcorp/progressia/server/world/context/impl/{ReusableServerContext.java => DefaultServerContext.java} (79%) rename src/main/java/ru/windcorp/progressia/server/world/context/impl/{ReusableServerContextBuilders.java => DefaultServerContextBuilders.java} (79%) rename src/main/java/ru/windcorp/progressia/server/world/context/impl/{ReusableServerContextImpl.java => DefaultServerContextImpl.java} (93%) diff --git a/src/main/java/ru/windcorp/progressia/server/world/context/impl/ReusableServerContext.java b/src/main/java/ru/windcorp/progressia/server/world/context/impl/DefaultServerContext.java similarity index 79% rename from src/main/java/ru/windcorp/progressia/server/world/context/impl/ReusableServerContext.java rename to src/main/java/ru/windcorp/progressia/server/world/context/impl/DefaultServerContext.java index d32974c..afeadea 100644 --- a/src/main/java/ru/windcorp/progressia/server/world/context/impl/ReusableServerContext.java +++ b/src/main/java/ru/windcorp/progressia/server/world/context/impl/DefaultServerContext.java @@ -44,14 +44,14 @@ import ru.windcorp.progressia.server.world.context.*; * Use wrappers to alter these properties. *

* This class defines the outward-facing safe interface of the actual - * implementation located in {@link ReusableServerContextImpl}. The reasoning + * implementation located in {@link DefaultServerContextImpl}. The reasoning * for creating a subclass is to allow a single instance to implement both - * {@linkplain ReusableServerContextBuilders builder interfaces} and the context + * {@linkplain DefaultServerContextBuilders builder interfaces} and the context * interface without causing confusion around object states. * * @author javapony */ -public abstract class ReusableServerContext extends AbstractContextRO +public abstract class DefaultServerContext extends AbstractContextRO implements ServerTileContext { /** @@ -87,9 +87,9 @@ public abstract class ReusableServerContext extends AbstractContextRO reference) { + default DefaultServerContext at(TileGenericReferenceRO reference) { if (!reference.isValid()) { throw new IllegalArgumentException("Reference " + reference + " is invalid"); } @@ -54,12 +54,12 @@ public interface ReusableServerContextBuilders { } - public interface WithLocation extends ReusableServerContextBuilders { + public interface WithLocation extends DefaultServerContextBuilders { WithTileStack on(RelFace side); WithTileStack on(BlockFace side); - default ReusableServerContext on(TileGenericReferenceRO reference) { + default DefaultServerContext on(TileGenericReferenceRO reference) { if (!reference.isValid()) { throw new IllegalArgumentException("Reference " + reference + " is invalid"); } @@ -70,11 +70,11 @@ public interface ReusableServerContextBuilders { } - public interface WithTileStack extends ReusableServerContextBuilders { + public interface WithTileStack extends DefaultServerContextBuilders { - ReusableServerContext index(int index); + DefaultServerContext index(int index); - default ReusableServerContext index(TileGenericReferenceRO reference) { + default DefaultServerContext index(TileGenericReferenceRO reference) { if (!reference.isValid()) { throw new IllegalArgumentException("Reference " + reference + " is invalid"); } diff --git a/src/main/java/ru/windcorp/progressia/server/world/context/impl/ReusableServerContextImpl.java b/src/main/java/ru/windcorp/progressia/server/world/context/impl/DefaultServerContextImpl.java similarity index 93% rename from src/main/java/ru/windcorp/progressia/server/world/context/impl/ReusableServerContextImpl.java rename to src/main/java/ru/windcorp/progressia/server/world/context/impl/DefaultServerContextImpl.java index 2994205..a391dd0 100644 --- a/src/main/java/ru/windcorp/progressia/server/world/context/impl/ReusableServerContextImpl.java +++ b/src/main/java/ru/windcorp/progressia/server/world/context/impl/DefaultServerContextImpl.java @@ -39,15 +39,15 @@ import ru.windcorp.progressia.server.world.block.BlockLogic; import ru.windcorp.progressia.server.world.context.ServerTileContext; import ru.windcorp.progressia.server.world.tile.TileLogic; -class ReusableServerContextImpl extends ReusableServerContext - implements ReusableServerContextBuilders.Empty, ReusableServerContextBuilders.WithWorld, - ReusableServerContextBuilders.WithLocation, ReusableServerContextBuilders.WithTileStack { +class DefaultServerContextImpl extends DefaultServerContext + implements DefaultServerContextBuilders.Empty, DefaultServerContextBuilders.WithWorld, + DefaultServerContextBuilders.WithLocation, DefaultServerContextBuilders.WithTileStack { /* * STATE MANAGEMENT & UTIL */ - public ReusableServerContextImpl() { + public DefaultServerContextImpl() { reuse(); } @@ -89,7 +89,7 @@ class ReusableServerContextImpl extends ReusableServerContext /** * The Logic view returned by {@link #logic()}. */ - protected final ReusableServerContextImpl.Logic logic = new Logic(); + protected final DefaultServerContextImpl.Logic logic = new Logic(); /** * Returns the Role currently assumed by this object. @@ -217,7 +217,7 @@ class ReusableServerContextImpl extends ReusableServerContext */ @Override - public ReusableServerContext build() { + public DefaultServerContext build() { assert requireBuilderRole(null); isBuilder = false; return this; @@ -270,7 +270,7 @@ class ReusableServerContextImpl extends ReusableServerContext */ @Override - public ReusableServerContext index(int index) { + public DefaultServerContext index(int index) { requireBuilderRole(Role.TILE_STACK); frame.layer = index; return build(); @@ -538,7 +538,7 @@ class ReusableServerContextImpl extends ReusableServerContext @Override public boolean isTagValid(Vec3i location, BlockFace face, int tag) { - return ReusableServerContextImpl.this.isTagValid(location, face, tag); + return DefaultServerContextImpl.this.isTagValid(location, face, tag); } @Override @@ -573,7 +573,7 @@ class ReusableServerContextImpl extends ReusableServerContext @Override public int getTag() { - return ReusableServerContextImpl.this.getTag(); + return DefaultServerContextImpl.this.getTag(); } @Override @@ -592,25 +592,25 @@ class ReusableServerContextImpl extends ReusableServerContext @Override public Logic push(Vec3i location) { - ReusableServerContextImpl.this.push(location); + DefaultServerContextImpl.this.push(location); return this; } @Override public Logic push(Vec3i location, RelFace face) { - ReusableServerContextImpl.this.push(location, face); + DefaultServerContextImpl.this.push(location, face); return this; } @Override public Logic push(Vec3i location, RelFace face, int layer) { - ReusableServerContextImpl.this.push(location, face, layer); + DefaultServerContextImpl.this.push(location, face, layer); return this; } @Override public void pop() { - ReusableServerContextImpl.this.pop(); + DefaultServerContextImpl.this.pop(); } /* @@ -618,13 +618,13 @@ class ReusableServerContextImpl extends ReusableServerContext */ @Override - public ReusableServerContext data() { - return ReusableServerContextImpl.this; + public DefaultServerContext data() { + return DefaultServerContextImpl.this; } @Override public String toString() { - return ReusableServerContextImpl.this + ".Logic"; + return DefaultServerContextImpl.this + ".Logic"; } }