github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2025-01-13 11:01:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #2760 from ingmargoudt/master

Browse source 
some rewrites to reference putIfAbsent
This commit is contained in:
LevelX2 2017-01-11 07:36:12 +01:00 committed by GitHub
commit 17dbd996d2
6 changed files with 17 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Mage/src/main/java/mage/cards/CardsImpl.java
View file

@ -230,9 +230,7 @@ public class CardsImpl extends LinkedHashSet<UUID> implements Cards, Serializabl
Map<String, Card> cards = new HashMap<>(); Map<String, Card> cards = new HashMap<>();
for (UUID cardId : this) { for (UUID cardId : this) {
Card card = game.getCard(cardId); Card card = game.getCard(cardId);
if (!cards.containsKey(card.getName())) { cards.putIfAbsent(card.getName(), card);
cards.put(card.getName(), card);
}
} }
return cards.values(); return cards.values();
} }

25
Mage/src/main/java/mage/counters/Counters.java
View file

@ -35,15 +35,15 @@ import java.util.List;
import java.util.Map; import java.util.Map;
/** /**
*
* @author BetaSteward_at_googlemail.com * @author BetaSteward_at_googlemail.com
*/ */
public class Counters extends HashMap<String, Counter> implements Serializable { public class Counters extends HashMap<String, Counter> implements Serializable {
public Counters() {} public Counters() {
}
public Counters(final Counters counters) { public Counters(final Counters counters) {
for (Map.Entry<String, Counter> entry: counters.entrySet()) { for (Map.Entry<String, Counter> entry : counters.entrySet()) {
this.put(entry.getKey(), entry.getValue().copy()); this.put(entry.getKey(), entry.getValue().copy());
} }
} }
@ -53,16 +53,12 @@ public class Counters extends HashMap<String, Counter> implements Serializable {
} }
public void addCounter(String name) { public void addCounter(String name) {
if (!this.containsKey(name)) { putIfAbsent(name, new Counter(name));
this.put(name, new Counter(name));
}
this.get(name).increase(); this.get(name).increase();
} }
public void addCounter(String name, int amount) { public void addCounter(String name, int amount) {
if (!this.containsKey(name)) { putIfAbsent(name, new Counter(name));
this.put(name, new Counter(name));
}
this.get(name).add(amount); this.get(name).add(amount);
} }
@ -100,13 +96,14 @@ public class Counters extends HashMap<String, Counter> implements Serializable {
return false; return false;
} }
public void removeAllCounters(CounterType counterType){ public void removeAllCounters(CounterType counterType) {
removeAllCounters(counterType.getName()); removeAllCounters(counterType.getName());
} }
public void removeAllCounters(String name){ public void removeAllCounters(String name) {
if (this.containsKey(name)){ if (this.containsKey(name)) {
this.remove(name); this.remove(name);
} }
} }
@ -130,9 +127,9 @@ public class Counters extends HashMap<String, Counter> implements Serializable {
public List<BoostCounter> getBoostCounters() { public List<BoostCounter> getBoostCounters() {
List<BoostCounter> boosters = new ArrayList<>(); List<BoostCounter> boosters = new ArrayList<>();
for (Counter counter: this.values()) { for (Counter counter : this.values()) {
if (counter instanceof BoostCounter) { if (counter instanceof BoostCounter) {
boosters.add((BoostCounter)counter); boosters.add((BoostCounter) counter);
} }
} }
return boosters; return boosters;

4
Mage/src/main/java/mage/game/LookedAt.java
View file

@ -64,9 +64,7 @@ public class LookedAt extends HashMap<String, Cards> implements Serializable, Co
} }
public Cards createLookedAt(String name) { public Cards createLookedAt(String name) {
if (!this.containsKey(name)) { putIfAbsent(name, new CardsImpl());
this.put(name, new CardsImpl());
}
return this.get(name); return this.get(name);
} }

4
Mage/src/main/java/mage/players/Library.java
View file

@ -208,9 +208,7 @@ public class Library implements Serializable {
Map<String, Card> cards = new HashMap<>(); Map<String, Card> cards = new HashMap<>();
for (UUID cardId : library) { for (UUID cardId : library) {
Card card = game.getCard(cardId); Card card = game.getCard(cardId);
if (!cards.containsKey(card.getName())) { cards.putIfAbsent(card.getName(), card);
cards.put(card.getName(), card);
}
} }
return cards.values(); return cards.values();
} }

4
Mage/src/main/java/mage/players/PlayerImpl.java
View file

@ -2748,9 +2748,7 @@ public abstract class PlayerImpl implements Player, Serializable {
for (Permanent permanent : game.getBattlefield().getAllActivePermanents(playerId)) { for (Permanent permanent : game.getBattlefield().getAllActivePermanents(playerId)) {
LinkedHashMap<UUID, ActivatedAbility> useableAbilities = getUseableActivatedAbilities(permanent, Zone.BATTLEFIELD, game); LinkedHashMap<UUID, ActivatedAbility> useableAbilities = getUseableActivatedAbilities(permanent, Zone.BATTLEFIELD, game);
for (ActivatedAbility ability : useableAbilities.values()) { for (ActivatedAbility ability : useableAbilities.values()) {
if (!playableActivated.containsKey(ability.toString())) { playableActivated.putIfAbsent(ability.toString(), ability);
playableActivated.put(ability.toString(), ability);
}
} }
} }
// activated abilities from stack objects // activated abilities from stack objects

4
Mage/src/main/java/mage/watchers/Watchers.java
View file

@ -50,9 +50,7 @@ public class Watchers extends HashMap<String, Watcher> {
} }
public void add(Watcher watcher) { public void add(Watcher watcher) {
if (!this.containsKey(watcher.getKey())) { putIfAbsent(watcher.getKey(), watcher);
this.put(watcher.getKey(), watcher);
}
} }
public void watch(GameEvent event, Game game) { public void watch(GameEvent event, Game game) {