external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-15 18:28:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'apitype-static-init' into 'master'

Browse Source 
ApiType Tweaks

See merge request core-developers/forge!287
This commit is contained in:
Sol
2018-03-24 00:26:10 +00:00
parent 3c90fba52e ce99b1093a
commit edca8e15e1
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
forge-game/src/main/java/forge/game/ability/ApiType.java
View File

@@ -1,10 +1,10 @@
package forge.game.ability; package forge.game.ability;
import com.google.common.collect.Maps;
import forge.game.ability.effects.*; import forge.game.ability.effects.*;
import forge.util.ReflectionUtil; import forge.util.ReflectionUtil;
import java.util.HashMap;
import java.util.Map; import java.util.Map;
/** /**
@@ -164,7 +164,13 @@ public enum ApiType {
private final SpellAbilityEffect instanceEffect; private final SpellAbilityEffect instanceEffect;
private final Class<? extends SpellAbilityEffect> clsEffect; private final Class<? extends SpellAbilityEffect> clsEffect;
private static final Map<String, ApiType> allValues = Maps.newTreeMap(String.CASE_INSENSITIVE_ORDER); private static final Map<String, ApiType> allValues = new HashMap<>();
static {
for(ApiType t : ApiType.values()) {
allValues.put(t.name(), t);
}
}
ApiType(Class<? extends SpellAbilityEffect> clsEf) { this(clsEf, true); } ApiType(Class<? extends SpellAbilityEffect> clsEf) { this(clsEf, true); }
ApiType(Class<? extends SpellAbilityEffect> clsEf, final boolean isStateLess) { ApiType(Class<? extends SpellAbilityEffect> clsEf, final boolean isStateLess) {
@@ -173,10 +179,6 @@ public enum ApiType {
} }
public static ApiType smartValueOf(String value) { public static ApiType smartValueOf(String value) {
if (allValues.isEmpty())
for(ApiType c : ApiType.values())
allValues.put(c.toString(), c);
ApiType v = allValues.get(value); ApiType v = allValues.get(value);
if ( v == null ) if ( v == null )
throw new RuntimeException("Element " + value + " not found in ApiType enum"); throw new RuntimeException("Element " + value + " not found in ApiType enum");