Fixed regression due to usage of wrong APIs

Author: shai-almog

CodenameOne/src/com/codename1/io/rest/RequestBuilder.java

@@ -23,6 +23,7 @@
  */
 package com.codename1.io.rest;
 
+import com.codename1.compat.java.util.Objects;
 import com.codename1.io.ConnectionRequest;
 import com.codename1.io.Data;
 import com.codename1.io.JSONParser;
@@ -48,7 +49,6 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Objects;
 
 /**
  * This class is used to build, invoke the http request and to get the http

CodenameOne/src/com/codename1/properties/PropertyXMLElement.java

@@ -23,14 +23,14 @@
 
 package com.codename1.properties;
 
+import com.codename1.compat.java.util.Objects;
 import com.codename1.io.Util;
 import com.codename1.xml.Element;
 
 import java.util.Enumeration;
 import java.util.Hashtable;
 import java.util.Iterator;
 import java.util.NoSuchElementException;
-import java.util.Objects;
 import java.util.Vector;
 
 /**

CodenameOne/src/com/codename1/ui/layouts/mig/UnitValue.java

@@ -33,12 +33,12 @@
  *         Date: 2006-sep-08
  */
 
+import com.codename1.compat.java.util.Objects;
 import com.codename1.util.MathUtil;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.Objects;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
 
 public final class UnitValue {
     /**
@@ -242,7 +242,7 @@ private UnitValue(float value, String unitStr, int unit, boolean isHor, int oper
         if (oper < STATIC || oper > MID)
             throw new IllegalArgumentException("Unknown Operation: " + oper);
 
-        if (oper > STATIC && (sub1 == null || sub2 == null))
+        if (oper > STATIC && (sub1 == null || sub2 == null))
             throw new IllegalArgumentException(oper + " Operation may not have null sub-UnitValues.");
 
         this.value = value;
@@ -619,33 +619,33 @@ public String getConstraintString() {
         return LayoutUtil.getCCString(this);
     }
 
-    public int hashCode() {
-        int result = 17;
-        result = 31 * result + Float.floatToIntBits(value);
-        result = 31 * result + unit;
-        result = 31 * result + oper;
-        result = 31 * result + (isHor ? 1 : 0);
-        result = 31 * result + (unitStr != null ? unitStr.hashCode() : 0);
-        result = 31 * result + (linkId != null ? linkId.hashCode() : 0);
-        result = 31 * result + Arrays.hashCode(subUnits);
-        return result;
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (this == obj) {
-            return true;
-        }
-        if (!(obj instanceof UnitValue)) {
-            return false;
-        }
-        UnitValue other = (UnitValue) obj;
-        return Float.compare(value, other.value) == 0
-                && unit == other.unit
-                && oper == other.oper
-                && isHor == other.isHor
-                && Objects.equals(unitStr, other.unitStr)
-                && Objects.equals(linkId, other.linkId)
-                && Arrays.equals(subUnits, other.subUnits);
-    }
-}
+    public int hashCode() {
+        int result = 17;
+        result = 31 * result + Float.floatToIntBits(value);
+        result = 31 * result + unit;
+        result = 31 * result + oper;
+        result = 31 * result + (isHor ? 1 : 0);
+        result = 31 * result + (unitStr != null ? unitStr.hashCode() : 0);
+        result = 31 * result + (linkId != null ? linkId.hashCode() : 0);
+        result = 31 * result + Arrays.hashCode(subUnits);
+        return result;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj) {
+            return true;
+        }
+        if (!(obj instanceof UnitValue)) {
+            return false;
+        }
+        UnitValue other = (UnitValue) obj;
+        return Float.compare(value, other.value) == 0
+                && unit == other.unit
+                && oper == other.oper
+                && isHor == other.isHor
+                && Objects.equals(unitStr, other.unitStr)
+                && Objects.equals(linkId, other.linkId)
+                && Arrays.equals(subUnits, other.subUnits);
+    }
+}