[customwars] r762 committed - Change add to set in ControllerManager

[codesite...@google.com]

Revision: 762
Author: ace.stef
Date: Tue Oct 16 11:27:44 2012
Log: Change add to set in ControllerManager
http://code.google.com/p/customwars/source/detail?r=762

Modified:
/trunk/v2/src/com/customwars/client/controller/ControllerManager.java
/trunk/v2/src/com/customwars/client/model/CWGameController.java

=======================================
--- /trunk/v2/src/com/customwars/client/controller/ControllerManager.java
Thu Apr 1 07:20:09 2010
+++ /trunk/v2/src/com/customwars/client/controller/ControllerManager.java
Tue Oct 16 11:27:44 2012
@@ -12,8 +12,6 @@
/**
* Manages every Controller in the game
* When a controller could not be found for a unit/city an
IllegalArgumentException is thrown
- *
- * @author stefan
*/
public class ControllerManager {
private Map<Unit, UnitController> unitControllers;
@@ -36,42 +34,51 @@
cityControllers.clear();
for (Player player : game.getAllPlayers()) {
if (!player.isNeutral()) {
- if (!player.isAi()) {
+ if (player.isAi()) {
for (City city : player.getAllCities()) {
- addHumanCityController(city);
+ setAICityController(city);
+ }
+ } else {
+ for (City city : player.getAllCities()) {
+ setHumanCityController(city);
}
}
}
}
}

- public void addHumanCityController(City city) {
- CityController unitController = new HumanCityController(city,
inGameContext);
- cityControllers.put(city, unitController);
+ public void setHumanCityController(City city) {
+ CityController cityController = new HumanCityController(city,
inGameContext);
+ cityControllers.put(city, cityController);
}

- public void addAICityController(City city) {
+ public void setAICityController(City city) {

}

public void initUnitControllers() {
unitControllers.clear();
for (Player player : game.getAllPlayers()) {
- if (!player.isNeutral())
- if (!player.isAi()) {
+ if (!player.isNeutral()) {
+ if (player.isAi()) {
+ for (Unit unit : player.getArmy()) {
+ setAIUnitController(unit);
+ }
+ } else {
for (Unit unit : player.getArmy()) {
- addHumanUnitController(unit);
+ setHumanUnitController(unit);
}
}
+ }
}
}

- public void addHumanUnitController(Unit unit) {
+ public void setHumanUnitController(Unit unit) {
UnitController unitController = new HumanUnitController(unit,
inGameContext);
unitControllers.put(unit, unitController);
}

- public void addAIUnitController(Unit unit) {
+ public void setAIUnitController(Unit unit) {

}

=======================================
--- /trunk/v2/src/com/customwars/client/model/CWGameController.java Tue Oct
16 10:46:08 2012
+++ /trunk/v2/src/com/customwars/client/model/CWGameController.java Tue Oct
16 11:27:44 2012
@@ -54,8 +54,13 @@

if (city.isCapturedBy(unit)) {
unit.setUnitState(UnitState.IDLE);
- controllerManager.addHumanCityController(city);
city.resetCapturing();
+
+ if(unit.getOwner().isAi()) {
+ controllerManager.setAICityController(city);
+ } else {
+ controllerManager.setHumanCityController(city);
+ }
return true;
} else {
return false;
@@ -208,9 +213,9 @@
t.setTerrain(city);

if (cityOwner.isAi()) {
- controllerManager.addAICityController(city);
+ controllerManager.setAICityController(city);
} else {
- controllerManager.addHumanCityController(city);
+ controllerManager.setHumanCityController(city);
}
}

@@ -262,9 +267,9 @@
producer.deCreaseConstructionMaterials();

if (player.isAi()) {
- controllerManager.addAIUnitController(unit);
+ controllerManager.setAIUnitController(unit);
} else {
- controllerManager.addHumanUnitController(unit);
+ controllerManager.setHumanUnitController(unit);
}
}

@@ -275,9 +280,9 @@
location.add(unit);

if (player.isAi()) {
- controllerManager.addAIUnitController(unit);
+ controllerManager.setAIUnitController(unit);
} else {
- controllerManager.addHumanUnitController(unit);
+ controllerManager.setHumanUnitController(unit);
}
}