diff --git a/src/net/sf/freecol/server/ai/NativeAIPlayer.java b/src/net/sf/freecol/server/ai/NativeAIPlayer.java index 7d0577f1d..11cccdefd 100644 --- a/src/net/sf/freecol/server/ai/NativeAIPlayer.java +++ b/src/net/sf/freecol/server/ai/NativeAIPlayer.java @@ -677,7 +677,7 @@ public final class NativeAIPlayer extends MissionAIPlayer { for (AIUnit au : getAIUnits()) { Mission mission = au.getMission(); String reason = (mission == null) ? null : mission.invalidReason(); - if (reason != null) au.setMission(null); + if (reason != null) au.changeMission(null); } } diff --git a/src/net/sf/freecol/server/ai/military/MilitaryCoordinator.java b/src/net/sf/freecol/server/ai/military/MilitaryCoordinator.java index d377e139e..6ec35dd6b 100644 --- a/src/net/sf/freecol/server/ai/military/MilitaryCoordinator.java +++ b/src/net/sf/freecol/server/ai/military/MilitaryCoordinator.java @@ -205,11 +205,11 @@ public final class MilitaryCoordinator { continue; } - artillery.setMission(new UnitSeekAndDestroyMission(artillery.getAIMain(), artillery, possibleTarget)); + artillery.changeMission(new UnitSeekAndDestroyMission(artillery.getAIMain(), artillery, possibleTarget)); artilleryUnits.remove(artillery); unusedUnits.remove(artillery); - escort.setMission(new EscortUnitMission(escort.getAIMain(), escort, artillery.getUnit())); + escort.changeMission(new EscortUnitMission(escort.getAIMain(), escort, artillery.getUnit())); dragoonUnits.remove(escort); unusedUnits.remove(escort); @@ -247,7 +247,7 @@ public final class MilitaryCoordinator { final PathNode path = dragoon.getUnit().findPath(enemy.getTile()); // TODO: add max turns to the search. if (path != null && path.getTurns() <= turns) { - dragoon.setMission(new UnitSeekAndDestroyMission(dragoon.getAIMain(), dragoon, enemy)); + dragoon.changeMission(new UnitSeekAndDestroyMission(dragoon.getAIMain(), dragoon, enemy)); unusedUnits.remove(dragoon); dragoonUnits.remove(dragoon); targetedEnemies.add(enemy); @@ -268,7 +268,7 @@ public final class MilitaryCoordinator { final PathNode path = dragoon.getUnit().findPath(enemy.getTile()); // TODO: add max turns to the search. if (path != null && path.getTurns() <= turns) { - dragoon.setMission(new UnitSeekAndDestroyMission(dragoon.getAIMain(), dragoon, enemy)); + dragoon.changeMission(new UnitSeekAndDestroyMission(dragoon.getAIMain(), dragoon, enemy)); unusedUnits.remove(dragoon); dragoonUnits.remove(dragoon); targetedEnemies.add(enemy); @@ -296,7 +296,7 @@ public final class MilitaryCoordinator { final PathNode path = dragoon.getUnit().findPath(enemy.getTile()); // TODO: add max turns to the search. if (path != null && path.getTurns() <= turns) { - dragoon.setMission(new UnitSeekAndDestroyMission(dragoon.getAIMain(), dragoon, enemy)); + dragoon.changeMission(new UnitSeekAndDestroyMission(dragoon.getAIMain(), dragoon, enemy)); unusedUnits.remove(dragoon); dragoonUnits.remove(dragoon); targetedEnemies.add(enemy); @@ -311,7 +311,7 @@ public final class MilitaryCoordinator { for (AIUnit unit : new HashSet<>(unusedUnits)) { final Mission mission = player.getDefendSettlementMission(unit, true, true); if (mission != null) { - unit.setMission(mission); + unit.changeMission(mission); unusedUnits.remove(unit); } } @@ -323,7 +323,7 @@ public final class MilitaryCoordinator { if (unit.getUnit().getTile() != null) { continue; } - unit.setMission(new DefendSettlementMission(unit.getAIMain(), unit, destination.getColony())); + unit.changeMission(new DefendSettlementMission(unit.getAIMain(), unit, destination.getColony())); unusedUnits.remove(unit); } } @@ -357,15 +357,14 @@ public final class MilitaryCoordinator { private void assignWanderHostile() { for (AIUnit unit : new HashSet<>(unusedUnits)) { - unit.setMission(new UnitWanderHostileMission(unit.getAIMain(), unit)); + unit.changeMission(new UnitWanderHostileMission(unit.getAIMain(), unit)); unusedUnits.remove(unit); } assert unusedUnits.isEmpty(); } private void placeDefender(AIUnit unit, AIColony colony) { - unit.setMission(null); - unit.setMission(new DefendSettlementMission(unit.getAIMain(), unit, colony.getColony())); + unit.changeMission(new DefendSettlementMission(unit.getAIMain(), unit, colony.getColony())); final List units = defenders.get(colony); units.add(unit); unusedUnits.remove(unit); diff --git a/test/src/net/sf/freecol/server/ai/MissionAssignmentTest.java b/test/src/net/sf/freecol/server/ai/MissionAssignmentTest.java index 50cce19bb..852dcb7c0 100644 --- a/test/src/net/sf/freecol/server/ai/MissionAssignmentTest.java +++ b/test/src/net/sf/freecol/server/ai/MissionAssignmentTest.java @@ -168,7 +168,7 @@ public class MissionAssignmentTest extends FreeColTestCase { assertTrue(colonyTile.getSettlement() == colony); assertTrue(colony.getOwner() == dutch); assertTrue(colony.getUnitCount() == 1); - aiUnit.setMission(null); + aiUnit.changeMission(null); assertEquals("DefendSettlementMission should be possible", null, DefendSettlementMission.invalidMissionReason(aiUnit)); assertEquals("DefendSettlementMission should work with colony", null, diff --git a/test/src/net/sf/freecol/server/ai/mission/PioneeringMissionTest.java b/test/src/net/sf/freecol/server/ai/mission/PioneeringMissionTest.java index 507e7e189..63c4e5b27 100644 --- a/test/src/net/sf/freecol/server/ai/mission/PioneeringMissionTest.java +++ b/test/src/net/sf/freecol/server/ai/mission/PioneeringMissionTest.java @@ -78,7 +78,7 @@ public class PioneeringMissionTest extends FreeColTestCase { colonistType); final AIUnit aiUnit = aiMain.getAIUnit(colonist); assertNotNull(aiUnit); - aiUnit.setMission(null); + aiUnit.changeMission(null); // Check there are improvements to be made. aiColony.updateTileImprovementPlans(lb); diff --git a/test/src/net/sf/freecol/server/ai/mission/PrivateerMissionTest.java b/test/src/net/sf/freecol/server/ai/mission/PrivateerMissionTest.java index e0de0030c..b0ebf3e73 100644 --- a/test/src/net/sf/freecol/server/ai/mission/PrivateerMissionTest.java +++ b/test/src/net/sf/freecol/server/ai/mission/PrivateerMissionTest.java @@ -105,7 +105,7 @@ public class PrivateerMissionTest extends FreeColTestCase { AIUnit privateerAI = aiMain.getAIUnit(privateer); assertNotNull("Setup error, could not get privateerAI", privateerAI); - privateerAI.setMission(null); + privateerAI.changeMission(null); assertFalse("Privateer has no mission", privateerAI.hasMission()); assertEquals("PrivateeringMission valid", null, PrivateerMission.invalidMissionReason(privateerAI)); diff --git a/test/src/net/sf/freecol/server/ai/mission/ScoutingMissionTest.java b/test/src/net/sf/freecol/server/ai/mission/ScoutingMissionTest.java index b4a09ab5f..fcc4a2456 100644 --- a/test/src/net/sf/freecol/server/ai/mission/ScoutingMissionTest.java +++ b/test/src/net/sf/freecol/server/ai/mission/ScoutingMissionTest.java @@ -79,7 +79,7 @@ public class ScoutingMissionTest extends FreeColTestCase { assertEquals(scoutRole, scout.getRole()); AIUnit aiUnit = aiMain.getAIUnit(scout); - aiUnit.setMission(null); + aiUnit.changeMission(null); assertNotNull("The scout should be an AI unit", aiUnit); assertEquals("Scout should have the scout role", scoutRole, scout.getRole()); diff --git a/test/src/net/sf/freecol/server/ai/mission/TransportMissionTest.java b/test/src/net/sf/freecol/server/ai/mission/TransportMissionTest.java index f9be73a19..8c116a3e7 100644 --- a/test/src/net/sf/freecol/server/ai/mission/TransportMissionTest.java +++ b/test/src/net/sf/freecol/server/ai/mission/TransportMissionTest.java @@ -296,7 +296,7 @@ public class TransportMissionTest extends FreeColTestCase { AIUnit wagon = aiMain.getAIUnit(wagonTrain); assertNotNull(wagon); - wagon.setMission(null); + wagon.changeMission(null); assertNull("Transport mission should be valid.", TransportMission.invalidMissionReason(wagon)); TransportMission mission = new TransportMission(aiMain, wagon);