From 120fa64f3c46792d69d48b40563ffea9968ce8bc Mon Sep 17 00:00:00 2001
From: Omer <zipory.omer@gmail.com>
Date: Wed, 30 Oct 2019 14:32:57 +0200
Subject: [PATCH] Renamed "Closest" sort mode to "Centermost", Removed
 SpringFramework because its not needed

---
 Main/pom.xml                                        |  5 -----
 .../java/com/chameleonvision/web/ServerHandler.java | 13 +++----------
 .../src/views/CameraViewes/OutputTab.vue            |  2 +-
 3 files changed, 4 insertions(+), 16 deletions(-)

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 @@
             <artifactId>jackson-dataformat-msgpack</artifactId>
             <version>0.8.18</version>
         </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-beans</artifactId>
-            <version>5.1.9.RELEASE</version>
-        </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
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 @@
 <template>
     <div>
-        <CVselect name="SortMode" v-model="value.sortMode" :list="['Largest','Smallest','Highest','Lowest','Rightmost','Leftmost','Closest']" @input="handleInput('sortMode',value.sortMode)"></CVselect>
+        <CVselect name="SortMode" v-model="value.sortMode" :list="['Largest','Smallest','Highest','Lowest','Rightmost','Leftmost','Centermost']" @input="handleInput('sortMode',value.sortMode)"></CVselect>
         <span>Calibrate:</span><v-divider dark color="white"></v-divider>
         <v-row align="center" justify="start">
             <v-col style="padding-right:0px" :cols="3">