diff --git a/Main/pom.xml b/Main/pom.xml index 456b1a8bf..de85746e3 100644 --- a/Main/pom.xml +++ b/Main/pom.xml @@ -101,11 +101,6 @@ jackson-dataformat-msgpack 0.8.18 - - org.springframework - spring-beans - 5.1.9.RELEASE - org.apache.commons commons-lang3 diff --git a/Main/src/main/java/com/chameleonvision/web/ServerHandler.java b/Main/src/main/java/com/chameleonvision/web/ServerHandler.java index c2e52a55d..532702c44 100644 --- a/Main/src/main/java/com/chameleonvision/web/ServerHandler.java +++ b/Main/src/main/java/com/chameleonvision/web/ServerHandler.java @@ -14,7 +14,6 @@ import io.javalin.websocket.*; import org.apache.commons.lang3.ArrayUtils; import org.msgpack.jackson.dataformat.MessagePackFactory; -import org.springframework.beans.BeanUtils; import java.io.IOException; import java.lang.reflect.Field; @@ -152,16 +151,10 @@ public class ServerHandler { private void setField(Object obj, String fieldName, Object value) { try { Field field = obj.getClass().getField(fieldName); - if (BeanUtils.isSimpleValueType(field.getType())) { - if (field.getType().isEnum()) { - field.set(obj, field.getType().getEnumConstants()[(Integer) value]); - } else { - field.set(obj, value); - } - } else if (field.getType() == List.class) { -// if(((ParameterizedType)field.getGenericType()).getActualTypeArguments()[0] == Double.class){ + if (field.getType().isEnum()) + field.set(obj, field.getType().getEnumConstants()[(Integer) value]); + else field.set(obj, value); - } } catch (NoSuchFieldException | IllegalAccessException ex) { ex.printStackTrace(); } diff --git a/chameleon-client/src/views/CameraViewes/OutputTab.vue b/chameleon-client/src/views/CameraViewes/OutputTab.vue index 822c87947..56ab0a4aa 100644 --- a/chameleon-client/src/views/CameraViewes/OutputTab.vue +++ b/chameleon-client/src/views/CameraViewes/OutputTab.vue @@ -1,6 +1,6 @@