From 3d2a005c27299867c8538ef7a9bde52efc4385d4 Mon Sep 17 00:00:00 2001 From: Andreas Eberle Date: Sun, 26 Apr 2015 10:59:19 +0200 Subject: [PATCH] Renamed AbstractNewMovableGrid to AbstractMovableGrid to unify naming. --- .../src/jsettlers/logic/buildings/IBuildingsGrid.java | 4 ++-- .../src/jsettlers/logic/map/newGrid/MainGrid.java | 6 +++--- jsettlers.logic/src/jsettlers/logic/movable/Movable.java | 6 +++--- ...AbstractNewMovableGrid.java => AbstractMovableGrid.java} | 2 +- .../jsettlers/logic/movable/testmap/MovableTestsMap.java | 6 +++--- 5 files changed, 12 insertions(+), 12 deletions(-) rename jsettlers.logic/src/jsettlers/logic/movable/interfaces/{AbstractNewMovableGrid.java => AbstractMovableGrid.java} (97%) diff --git a/jsettlers.logic/src/jsettlers/logic/buildings/IBuildingsGrid.java b/jsettlers.logic/src/jsettlers/logic/buildings/IBuildingsGrid.java index 5601d6a3c5..678b74fba8 100644 --- a/jsettlers.logic/src/jsettlers/logic/buildings/IBuildingsGrid.java +++ b/jsettlers.logic/src/jsettlers/logic/buildings/IBuildingsGrid.java @@ -14,7 +14,7 @@ import jsettlers.logic.map.newGrid.partition.manager.manageables.interfaces.IBarrack; import jsettlers.logic.map.newGrid.partition.manager.manageables.interfaces.IDiggerRequester; import jsettlers.logic.movable.Movable; -import jsettlers.logic.movable.interfaces.AbstractNewMovableGrid; +import jsettlers.logic.movable.interfaces.AbstractMovableGrid; import jsettlers.logic.player.Player; import jsettlers.logic.stack.IRequestsStackGrid; @@ -63,7 +63,7 @@ public interface IBuildingsGrid { MapObjectsManager getMapObjectsManager(); - AbstractNewMovableGrid getMovableGrid(); + AbstractMovableGrid getMovableGrid(); void requestDiggers(IDiggerRequester requester, byte amount); diff --git a/jsettlers.logic/src/jsettlers/logic/map/newGrid/MainGrid.java b/jsettlers.logic/src/jsettlers/logic/map/newGrid/MainGrid.java index 7ccbc10cc9..3e1d193692 100644 --- a/jsettlers.logic/src/jsettlers/logic/map/newGrid/MainGrid.java +++ b/jsettlers.logic/src/jsettlers/logic/map/newGrid/MainGrid.java @@ -88,7 +88,7 @@ import jsettlers.logic.map.save.MapFileHeader.MapType; import jsettlers.logic.map.save.MapList; import jsettlers.logic.movable.Movable; -import jsettlers.logic.movable.interfaces.AbstractNewMovableGrid; +import jsettlers.logic.movable.interfaces.AbstractMovableGrid; import jsettlers.logic.movable.interfaces.IAttackable; import jsettlers.logic.objects.arrow.ArrowObject; import jsettlers.logic.objects.stack.StackMapObject; @@ -917,7 +917,7 @@ public boolean isInBounds(int x, int y) { } } - final class MovablePathfinderGrid extends AbstractNewMovableGrid { + final class MovablePathfinderGrid extends AbstractMovableGrid { private static final long serialVersionUID = 4006228724969442801L; private transient PathfinderGrid pathfinderGrid; @@ -1415,7 +1415,7 @@ public final MapObjectsManager getMapObjectsManager() { } @Override - public final AbstractNewMovableGrid getMovableGrid() { + public final AbstractMovableGrid getMovableGrid() { return movablePathfinderGrid; } diff --git a/jsettlers.logic/src/jsettlers/logic/movable/Movable.java b/jsettlers.logic/src/jsettlers/logic/movable/Movable.java index 970e4b1249..3f52adbcda 100644 --- a/jsettlers.logic/src/jsettlers/logic/movable/Movable.java +++ b/jsettlers.logic/src/jsettlers/logic/movable/Movable.java @@ -22,7 +22,7 @@ import jsettlers.logic.buildings.military.IOccupyableBuilding; import jsettlers.logic.constants.Constants; import jsettlers.logic.constants.MatchConstants; -import jsettlers.logic.movable.interfaces.AbstractNewMovableGrid; +import jsettlers.logic.movable.interfaces.AbstractMovableGrid; import jsettlers.logic.movable.interfaces.AbstractStrategyGrid; import jsettlers.logic.movable.interfaces.IAttackable; import jsettlers.logic.movable.interfaces.IAttackableMovable; @@ -48,7 +48,7 @@ public final class Movable implements IScheduledTimerable, IPathCalculatable, II private static final ConcurrentLinkedQueue allMovables = new ConcurrentLinkedQueue(); private static int nextID = Integer.MIN_VALUE; - private final AbstractNewMovableGrid grid; + private final AbstractMovableGrid grid; private final int id; private EMovableState state = EMovableState.DOING_NOTHING; @@ -80,7 +80,7 @@ public final class Movable implements IScheduledTimerable, IPathCalculatable, II private transient boolean selected = false; private transient boolean soundPlayed = false; - public Movable(AbstractNewMovableGrid grid, EMovableType movableType, ShortPoint2D position, Player player) { + public Movable(AbstractMovableGrid grid, EMovableType movableType, ShortPoint2D position, Player player) { this.grid = grid; this.position = position; this.player = player; diff --git a/jsettlers.logic/src/jsettlers/logic/movable/interfaces/AbstractNewMovableGrid.java b/jsettlers.logic/src/jsettlers/logic/movable/interfaces/AbstractMovableGrid.java similarity index 97% rename from jsettlers.logic/src/jsettlers/logic/movable/interfaces/AbstractNewMovableGrid.java rename to jsettlers.logic/src/jsettlers/logic/movable/interfaces/AbstractMovableGrid.java index 3b376ad6d7..d23e05c2a2 100644 --- a/jsettlers.logic/src/jsettlers/logic/movable/interfaces/AbstractNewMovableGrid.java +++ b/jsettlers.logic/src/jsettlers/logic/movable/interfaces/AbstractMovableGrid.java @@ -14,7 +14,7 @@ * @author Andreas Eberle * */ -public abstract class AbstractNewMovableGrid extends AbstractStrategyGrid { +public abstract class AbstractMovableGrid extends AbstractStrategyGrid { private static final long serialVersionUID = -236805842467532505L; /** diff --git a/jsettlers.tests/tools/jsettlers/logic/movable/testmap/MovableTestsMap.java b/jsettlers.tests/tools/jsettlers/logic/movable/testmap/MovableTestsMap.java index f21f1ec7a7..a2d2c507c6 100644 --- a/jsettlers.tests/tools/jsettlers/logic/movable/testmap/MovableTestsMap.java +++ b/jsettlers.tests/tools/jsettlers/logic/movable/testmap/MovableTestsMap.java @@ -27,7 +27,7 @@ import jsettlers.logic.map.newGrid.partition.manager.manageables.IManageableWorker; import jsettlers.logic.map.newGrid.partition.manager.materials.interfaces.IMaterialRequest; import jsettlers.logic.movable.Movable; -import jsettlers.logic.movable.interfaces.AbstractNewMovableGrid; +import jsettlers.logic.movable.interfaces.AbstractMovableGrid; import jsettlers.logic.movable.interfaces.IAttackable; import jsettlers.logic.objects.stack.StackMapObject; import jsettlers.logic.player.Player; @@ -124,7 +124,7 @@ public boolean isFogOfWarVisible(int x, int y) { public void setBackgroundListener(IGraphicsBackgroundListener backgroundListener) { } - private final AbstractNewMovableGrid movableGrid = new AbstractNewMovableGrid() { + private final AbstractMovableGrid movableGrid = new AbstractMovableGrid() { private static final long serialVersionUID = 610513829074598238L; @Override @@ -397,7 +397,7 @@ public boolean isValidNextPathPosition(IPathCalculatable pathCalculatable, Short }; - public AbstractNewMovableGrid getMovableGrid() { + public AbstractMovableGrid getMovableGrid() { return movableGrid; }