[master] - short code update

Author: dzaiats

src/main/java/util/general/SystemHelper.java

@@ -3,55 +3,34 @@
 import java.awt.*;
 import java.io.File;
 import java.lang.reflect.Field;
-import java.util.Arrays;
 
-import static environment.EnvironmentFactory.*;
 import static util.validator.Constants.TARGET_AUTOMOTION_JSON;
 
 public class SystemHelper {
-
-    public final static String[] iOS_RETINA_DEVICES = {
-            "iPhone 4", "iPhone 4s",
-            "iPhone 5", "iPhone 5s",
-            "iPhone 6", "iPhone 6s",
-            "iPad Mini 2",
-            "iPad Mini 4",
-            "iPad Air 2",
-            "iPad Pro"
-    };
-
     /**
      * Verify is display is retina
      *
      * @return
      */
     public static boolean isRetinaDisplay() {
         boolean isRetina = false;
-        if (isMobile()) {
-            if (isIOS()) {
-                if (Arrays.asList(iOS_RETINA_DEVICES).contains(getDevice())) {
-                    isRetina = true;
-                }
-            }
-        } else {
-            try {
-                GraphicsDevice graphicsDevice = GraphicsEnvironment.getLocalGraphicsEnvironment().getDefaultScreenDevice();
+        try {
+            GraphicsDevice graphicsDevice = GraphicsEnvironment.getLocalGraphicsEnvironment().getDefaultScreenDevice();
 
-                try {
-                    Field field = graphicsDevice.getClass().getDeclaredField("scale");
-                    if (field != null) {
-                        field.setAccessible(true);
-                        Object scale = field.get(graphicsDevice);
-                        if (scale instanceof Integer && (Integer) scale == 2) {
-                            isRetina = true;
-                        }
+            try {
+                Field field = graphicsDevice.getClass().getDeclaredField("scale");
+                if (field != null) {
+                    field.setAccessible(true);
+                    Object scale = field.get(graphicsDevice);
+                    if (scale instanceof Integer && (Integer) scale == 2) {
+                        isRetina = true;
                     }
-                } catch (Exception e) {
-                    e.printStackTrace();
                 }
             } catch (Exception e) {
                 e.printStackTrace();
             }
+        } catch (Exception e) {
+            e.printStackTrace();
         }
         return isRetina;
     }

src/main/java/util/validator/ResponsiveUIValidator.java

@@ -19,6 +19,7 @@
 import java.io.*;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
@@ -726,15 +727,28 @@ int retinaValue(int value) {
             }
         } else {
             if (isIOS()) {
-                return 2 * value;
+                String[] iOS_RETINA_DEVICES = {
+                        "iPhone 4", "iPhone 4s",
+                        "iPhone 5", "iPhone 5s",
+                        "iPhone 6", "iPhone 6s",
+                        "iPad Mini 2",
+                        "iPad Mini 4",
+                        "iPad Air 2",
+                        "iPad Pro"
+                };
+                if (Arrays.asList(iOS_RETINA_DEVICES).contains(getDevice())) {
+                    return 2 * value;
+                } else {
+                    return value;
+                }
             } else {
                 return value;
             }
         }
     }
 
     int mobileY(int value) {
-        if (isMobile() && ((AppiumDriver)driver).getContext().startsWith("WEB")) {
+        if (isMobile() && ((AppiumDriver) driver).getContext().startsWith("WEB")) {
             if (isIOS()) {
                 if (isMobileTopBar) {
                     return value + 20;