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

fix for Set as value of Map, make sure the set is new

Browse source
This commit is contained in:
Ingmar Goudt 2019-12-29 21:05:28 +01:00
parent ce23f6900d
commit 1a8723697e
1 changed files with 22 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
Mage/src/main/java/mage/watchers/Watcher.java
View file

@ -5,12 +5,10 @@ import mage.constants.WatcherScope;
import mage.game.Game; import mage.game.Game;
import mage.game.events.GameEvent; import mage.game.events.GameEvent;
import org.apache.log4j.Logger; import org.apache.log4j.Logger;
import sun.reflect.generics.reflectiveObjects.ParameterizedTypeImpl;
import java.io.Serializable; import java.io.Serializable;
import java.lang.reflect.Constructor; import java.lang.reflect.*;
import java.lang.reflect.Field;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Modifier;
import java.util.*; import java.util.*;
/** /**
@ -97,12 +95,11 @@ public abstract class Watcher implements Serializable {
Object[] args = new Object[constructor.getParameterCount()]; Object[] args = new Object[constructor.getParameterCount()];
for (int index = 0; index < constructor.getParameterTypes().length; index++) { for (int index = 0; index < constructor.getParameterTypes().length; index++) {
Class<?> parameterType = constructor.getParameterTypes()[index]; Class<?> parameterType = constructor.getParameterTypes()[index];
if(parameterType.isPrimitive()){ if (parameterType.isPrimitive()) {
if(parameterType.getSimpleName().equalsIgnoreCase("boolean")){ if (parameterType.getSimpleName().equalsIgnoreCase("boolean")) {
args[index]=false; args[index] = false;
} }
} } else {
else {
args[index] = null; args[index] = null;
} }
@ -119,8 +116,22 @@ public abstract class Watcher implements Serializable {
((Set) field.get(watcher)).clear(); ((Set) field.get(watcher)).clear();
((Set) field.get(watcher)).addAll((Set) field.get(this)); ((Set) field.get(watcher)).addAll((Set) field.get(this));
} else if (field.getType() == Map.class) { } else if (field.getType() == Map.class) {
((Map) field.get(watcher)).clear(); Map target = ((Map) field.get(watcher));
((Map) field.get(watcher)).putAll((Map) field.get(this)); target.clear();
Map source = (Map) field.get(this);
ParameterizedType parameterizedType = (ParameterizedType) field.getGenericType();
Type valueType = parameterizedType.getActualTypeArguments()[1];
if (valueType instanceof ParameterizedTypeImpl && ((ParameterizedTypeImpl) valueType).getRawType().getSimpleName().contains("Set")) {
source.entrySet().forEach(kv -> {
Object key = ((Map.Entry) kv).getKey();
Set value = (Set) ((Map.Entry) kv).getValue();
target.put(key, new HashSet<>(value));
});
}
else {
((Map) field.get(watcher)).putAll((Map) field.get(this));
}
} else if (field.getType() == List.class) { } else if (field.getType() == List.class) {
((List) field.get(watcher)).clear(); ((List) field.get(watcher)).clear();
((List) field.get(watcher)).addAll((List) field.get(this)); ((List) field.get(watcher)).addAll((List) field.get(this));