diff -r 4feced261c68 -r de822cd3df3a project_files/Android-build/SDL-android-project/src/org/hedgewars/hedgeroid/BasicRoomState.java --- a/project_files/Android-build/SDL-android-project/src/org/hedgewars/hedgeroid/BasicRoomState.java Tue Jan 21 22:38:13 2014 +0100 +++ b/project_files/Android-build/SDL-android-project/src/org/hedgewars/hedgeroid/BasicRoomState.java Tue Jan 21 22:43:06 2014 +0100 @@ -37,125 +37,125 @@ * Common base implementation for a roomstate that will call listeners on every * change. The derived classes have to coordinate how state is changed to * complete the implementation of the RoomStateManager interface. - * + * * See {@link RoomStateManager} for a description of what this is for. */ public abstract class BasicRoomState implements RoomStateManager { - private final List observers = new LinkedList(); - - private boolean chief; - private String gameStyle; - private Scheme scheme; - private MapRecipe map; - private Weaponset weaponset; - private Map teams = Collections.emptyMap(); - - public final MapRecipe getMapRecipe() { - return map; - } + private final List observers = new LinkedList(); + + private boolean chief; + private String gameStyle; + private Scheme scheme; + private MapRecipe map; + private Weaponset weaponset; + private Map teams = Collections.emptyMap(); + + public final MapRecipe getMapRecipe() { + return map; + } + + public final boolean getChiefStatus() { + return chief; + } + + public final Scheme getScheme() { + return scheme; + } + + public final String getGameStyle() { + return gameStyle; + } - public final boolean getChiefStatus() { - return chief; - } + public final Weaponset getWeaponset() { + return weaponset; + } + + public final Map getTeams() { + return teams; + } - public final Scheme getScheme() { - return scheme; - } + public final void setWeaponset(Weaponset weaponset) { + if(!equal(weaponset, this.weaponset)) { + this.weaponset = weaponset; + for(RoomStateManager.Listener observer : observers) { + observer.onWeaponsetChanged(weaponset); + } + } + } - public final String getGameStyle() { - return gameStyle; - } + public final void setMapRecipe(MapRecipe map) { + if(!equal(map, this.map)) { + this.map = map; + for(RoomStateManager.Listener observer : observers) { + observer.onMapChanged(map); + } + } + } - public final Weaponset getWeaponset() { - return weaponset; - } - - public final Map getTeams() { - return teams; - } - - public final void setWeaponset(Weaponset weaponset) { - if(!equal(weaponset, this.weaponset)) { - this.weaponset = weaponset; - for(RoomStateManager.Listener observer : observers) { - observer.onWeaponsetChanged(weaponset); - } - } - } - - public final void setMapRecipe(MapRecipe map) { - if(!equal(map, this.map)) { - this.map = map; - for(RoomStateManager.Listener observer : observers) { - observer.onMapChanged(map); - } - } - } - - public final void setGameStyle(String gameStyle) { - if(!equal(gameStyle, this.gameStyle)) { - this.gameStyle = gameStyle; - for(RoomStateManager.Listener observer : observers) { - observer.onGameStyleChanged(gameStyle); - } - } - } - - public final void setScheme(Scheme scheme) { - if(!equal(scheme, this.scheme)) { - this.scheme = scheme; - for(RoomStateManager.Listener observer : observers) { - observer.onSchemeChanged(scheme); - } - } - } - - public final void setChief(boolean chief) { - if(chief != this.chief) { - this.chief = chief; - for(RoomStateManager.Listener observer : observers) { - observer.onChiefStatusChanged(chief); - } - } - } - - public final void putTeam(TeamInGame team) { - TeamInGame oldEntry = teams.get(team.team.name); - if(!equal(team, oldEntry)) { - Map changedMap = new TreeMap(teams); - changedMap.put(team.team.name, team); - teams = Collections.unmodifiableMap(changedMap); - for(RoomStateManager.Listener observer : observers) { - observer.onTeamsChanged(teams); - } - } - } - - public final void removeTeam(String teamname) { - if(teams.containsKey(teamname)) { - Map changedMap = new TreeMap(teams); - changedMap.remove(teamname); - teams = Collections.unmodifiableMap(changedMap); - for(RoomStateManager.Listener observer : observers) { - observer.onTeamsChanged(teams); - } - } - } - - public final void setTeams(Map newTeams) { - if(!newTeams.equals(teams)) { - teams = Collections.unmodifiableMap(new TreeMap(newTeams)); - for(RoomStateManager.Listener observer : observers) { - observer.onTeamsChanged(teams); - } - } - } - - public final void addListener(Listener observer) { - observers.add(observer); - } + public final void setGameStyle(String gameStyle) { + if(!equal(gameStyle, this.gameStyle)) { + this.gameStyle = gameStyle; + for(RoomStateManager.Listener observer : observers) { + observer.onGameStyleChanged(gameStyle); + } + } + } + + public final void setScheme(Scheme scheme) { + if(!equal(scheme, this.scheme)) { + this.scheme = scheme; + for(RoomStateManager.Listener observer : observers) { + observer.onSchemeChanged(scheme); + } + } + } + + public final void setChief(boolean chief) { + if(chief != this.chief) { + this.chief = chief; + for(RoomStateManager.Listener observer : observers) { + observer.onChiefStatusChanged(chief); + } + } + } - public final void removeListener(Listener observer) { - observers.remove(observer); - } + public final void putTeam(TeamInGame team) { + TeamInGame oldEntry = teams.get(team.team.name); + if(!equal(team, oldEntry)) { + Map changedMap = new TreeMap(teams); + changedMap.put(team.team.name, team); + teams = Collections.unmodifiableMap(changedMap); + for(RoomStateManager.Listener observer : observers) { + observer.onTeamsChanged(teams); + } + } + } + + public final void removeTeam(String teamname) { + if(teams.containsKey(teamname)) { + Map changedMap = new TreeMap(teams); + changedMap.remove(teamname); + teams = Collections.unmodifiableMap(changedMap); + for(RoomStateManager.Listener observer : observers) { + observer.onTeamsChanged(teams); + } + } + } + + public final void setTeams(Map newTeams) { + if(!newTeams.equals(teams)) { + teams = Collections.unmodifiableMap(new TreeMap(newTeams)); + for(RoomStateManager.Listener observer : observers) { + observer.onTeamsChanged(teams); + } + } + } + + public final void addListener(Listener observer) { + observers.add(observer); + } + + public final void removeListener(Listener observer) { + observers.remove(observer); + } }