Fix spotbugs dead stores and parsing warnings

CodenameOne/src/com/codename1/charts/ChartComponent.java

@@ -869,15 +869,14 @@ private void zoomTransition(double minX, double maxX, double minY, double maxY,
         } else {
             Shape currentViewPort = screenToChartShape(new Rectangle(getAbsoluteX(), getAbsoluteY(), getWidth(), getHeight()));
             float[] currentRect = currentViewPort.getBounds2D();
-            float[] newRect = new float[]{(float) minX, (float) (maxX - minX), (float) minY, (float) (maxY - minY)};
 
             float currentAspect = currentRect[2] / currentRect[3];
-            float newAspect = 1.0f;
-            Rectangle newViewPort = new Rectangle((int) newRect[0], (int) newRect[1], (int) newRect[2], (int) newRect[3]);
-            if (newAspect != currentAspect) {
-                newViewPort.setHeight((int) (((double) newViewPort.getWidth()) / currentAspect));
-                newRect = newViewPort.getBounds2D();
-                newAspect = newRect[2] / newRect[3];
+            Rectangle newViewPort = new Rectangle((int) minX, (int) (maxX - minX), (int) minY, (int) (maxY - minY));
+            if (newViewPort.getHeight() != 0) {
+                float newAspect = (float) newViewPort.getWidth() / (float) newViewPort.getHeight();
+                if (newAspect != currentAspect) {
+                    newViewPort.setHeight((int) (((double) newViewPort.getWidth()) / currentAspect));
+                }
             }
 
             ZoomTransition zt = new ZoomTransition(currentViewPort.getBounds(), newViewPort, duration);

CodenameOne/src/com/codename1/charts/views/XYChart.java

@@ -278,9 +278,10 @@ public void draw(Canvas canvas, int x, int y, int width, int height, Paint paint
                         seriesRenderer.isDisplayBoundingPoints());
                 int startIndex = -1;
 
-                for (Double value : range.keySet()) {
-                    double xValue = value;
-                    Double rValue = range.get(value);
+                for (Map.Entry<Double, Double> entry : range.entrySet()) {
+                    Double value = entry.getKey();
+                    double xValue = value.doubleValue();
+                    Double rValue = entry.getValue();
                     double yValue = rValue.doubleValue();
                     if (startIndex < 0 && (!isNullValue(yValue) || isRenderNullValues())) {
                         startIndex = series.getIndexForKey(xValue);

CodenameOne/src/com/codename1/components/Ads.java

@@ -217,6 +217,7 @@ public String getAd() {
      * @param ad the ad to set
      */
     public void setAd(String ad) {
+        this.ad = ad;
         HTMLComponent html = new HTMLComponent(new AsyncDocumentRequestHandlerImpl() {
 
             protected ConnectionRequest createConnectionRequest(DocumentInfo docInfo, IOCallback callback, Object[] response) {

CodenameOne/src/com/codename1/components/ButtonList.java

@@ -131,6 +131,7 @@ protected void onReady(Runnable r) {
      * buttons.
      */
     protected void fireReady() {
+        ready = true;
         for (Runnable r : onReady) {
             r.run();
         }

CodenameOne/src/com/codename1/facebook/User.java

@@ -210,9 +210,29 @@ private void init(Hashtable toCopy) {
         email = (String) toCopy.get("email");
         website = (String) toCopy.get("website");
         bio = (String) toCopy.get("bio");
+        quotes = (String) toCopy.get("quotes");
         gender = (String) toCopy.get("gender");
         relationship_status = (String) toCopy.get("relationship_status");
-        //timezone = Long.parseLong((String) toCopy.get("timezone"));
+        Object tz = toCopy.get("timezone");
+        if (tz instanceof Integer) {
+            timezone = ((Integer) tz).longValue();
+        } else if (tz instanceof Long) {
+            timezone = ((Long) tz).longValue();
+        } else if (tz instanceof Short) {
+            timezone = ((Short) tz).shortValue();
+        } else if (tz instanceof Byte) {
+            timezone = ((Byte) tz).byteValue();
+        } else if (tz instanceof Double) {
+            timezone = (long) ((Double) tz).doubleValue();
+        } else if (tz instanceof Float) {
+            timezone = (long) ((Float) tz).floatValue();
+        } else if (tz instanceof String) {
+            try {
+                timezone = Long.parseLong((String) tz);
+            } catch (NumberFormatException ignore) {
+                timezone = 0;
+            }
+        }
         last_updated = (String) toCopy.get("last_updated");
         locale = (String) toCopy.get("locale");
         Hashtable l = (Hashtable) toCopy.get("location");

CodenameOne/src/com/codename1/io/ConnectionRequest.java

@@ -1609,19 +1609,20 @@ protected void postResponse() {
     protected String createRequestURL() {
         if (!post && requestArguments != null) {
             StringBuilder b = new StringBuilder(url);
-            Iterator e = requestArguments.keySet().iterator();
-            if (e.hasNext()) {
+            Iterator entries = requestArguments.entrySet().iterator();
+            if (entries.hasNext()) {
                 b.append("?");
             }
-            while (e.hasNext()) {
-                String key = (String) e.next();
-                Object requestVal = requestArguments.get(key);
+            while (entries.hasNext()) {
+                Map.Entry entry = (Map.Entry) entries.next();
+                String key = (String) entry.getKey();
+                Object requestVal = entry.getValue();
                 if (requestVal instanceof String) {
                     String value = (String) requestVal;
                     b.append(key);
                     b.append("=");
                     b.append(value);
-                    if (e.hasNext()) {
+                    if (entries.hasNext()) {
                         b.append("&");
                     }
                     continue;
@@ -1637,7 +1638,7 @@ protected String createRequestURL() {
                 b.append(key);
                 b.append("=");
                 b.append(val[vlen - 1]);
-                if (e.hasNext()) {
+                if (entries.hasNext()) {
                     b.append("&");
                 }
             }
@@ -1655,16 +1656,17 @@ protected String createRequestURL() {
     protected void buildRequestBody(OutputStream os) throws IOException {
         if (post && requestArguments != null) {
             StringBuilder val = new StringBuilder();
-            Iterator e = requestArguments.keySet().iterator();
-            while (e.hasNext()) {
-                String key = (String) e.next();
-                Object requestVal = requestArguments.get(key);
+            Iterator entries = requestArguments.entrySet().iterator();
+            while (entries.hasNext()) {
+                Map.Entry entry = (Map.Entry) entries.next();
+                String key = (String) entry.getKey();
+                Object requestVal = entry.getValue();
                 if (requestVal instanceof String) {
                     String value = (String) requestVal;
                     val.append(key);
                     val.append("=");
                     val.append(value);
-                    if (e.hasNext()) {
+                    if (entries.hasNext()) {
                         val.append("&");
                     }
                     continue;
@@ -1680,7 +1682,7 @@ protected void buildRequestBody(OutputStream os) throws IOException {
                 val.append(key);
                 val.append("=");
                 val.append(valArray[vlen - 1]);
-                if (e.hasNext()) {
+                if (entries.hasNext()) {
                     val.append("&");
                 }
             }
@@ -2314,10 +2316,11 @@ public boolean equals(Object o) {
             if (r.url == url) {
                 if (requestArguments != null) {
                     if (r.requestArguments != null && requestArguments.size() == r.requestArguments.size()) {
-                        Iterator e = requestArguments.keySet().iterator();
-                        while (e.hasNext()) {
-                            Object key = e.next();
-                            Object value = requestArguments.get(key);
+                        Iterator entries = requestArguments.entrySet().iterator();
+                        while (entries.hasNext()) {
+                            Map.Entry entry = (Map.Entry) entries.next();
+                            Object key = entry.getKey();
+                            Object value = entry.getValue();
                             Object otherValue = r.requestArguments.get(key);
                             if (!value.equals(otherValue)) {
                                 return false;

CodenameOne/src/com/codename1/io/MultipartRequest.java

@@ -32,6 +32,7 @@
 import java.util.Hashtable;
 import java.util.Iterator;
 import java.util.LinkedHashMap;
+import java.util.Map;
 import java.util.Vector;
 
 /**
@@ -247,7 +248,7 @@ public void addArgument(String name, String value) {
 
     protected long calculateContentLength() {
         long length = 0L;
-        Iterator e = args.keySet().iterator();
+        Iterator entries = args.entrySet().iterator();
 
         long dLength = "Content-Disposition: form-data; name=\"\"; filename=\"\"".length() + 2; // 2 = CRLF
         long ctLength = "Content-Type: ".length() + 2; // 2 = CRLF
@@ -258,9 +259,10 @@ protected long calculateContentLength() {
         ctLength = "Content-Type: text/plain; charset=UTF-8".length() + 4; // 4 = 2 * CRLF
         long baseTextLength = dLength + ctLength + bLength + 2;  // 2 = CRLF at end of part
 
-        while (e.hasNext()) {
-            String key = (String) e.next();
-            Object value = args.get(key);
+        while (entries.hasNext()) {
+            Map.Entry entry = (Map.Entry) entries.next();
+            String key = (String) entry.getKey();
+            Object value = entry.getValue();
             if (value instanceof String) {
                 length += baseTextLength;
                 length += key.length();
@@ -319,13 +321,14 @@ protected long calculateContentLength() {
     protected void buildRequestBody(OutputStream os) throws IOException {
         Writer writer = null;
         writer = new OutputStreamWriter(os, "UTF-8");
-        Iterator e = args.keySet().iterator();
-        while (e.hasNext()) {
+        Iterator entries = args.entrySet().iterator();
+        while (entries.hasNext()) {
             if (shouldStop()) {
                 break;
             }
-            String key = (String) e.next();
-            Object value = args.get(key);
+            Map.Entry entry = (Map.Entry) entries.next();
+            String key = (String) entry.getKey();
+            Object value = entry.getValue();
 
             writer.write("--");
             writer.write(boundary);

CodenameOne/src/com/codename1/io/NetworkManager.java

@@ -829,10 +829,18 @@ private boolean runCurrentRequest(@Async.Execute ConnectionRequest req) {
                         }
                         pending.addElement(currentRequest);
                         LOCK.notify();
-                        try {
-                            LOCK.wait(30);
-                        } catch (InterruptedException ex) {
-                            ex.printStackTrace();
+                        long end = System.currentTimeMillis() + 30;
+                        while (true) {
+                            long remaining = end - System.currentTimeMillis();
+                            if (remaining <= 0) {
+                                break;
+                            }
+                            try {
+                                LOCK.wait(remaining);
+                                break;
+                            } catch (InterruptedException ex) {
+                                ex.printStackTrace();
+                            }
                         }
                     }
                 }
@@ -964,7 +972,7 @@ public void run() {
                             // prevent waiting when there is still a pending request
                             // this can occur with a race condition since the synchronize
                             // scope is limited to prevent blocking on add...
-                            if (pending.size() == 0) {
+                            while (pending.size() == 0 && running && !stopped) {
                                 LOCK.wait();
                             }
                         } catch (InterruptedException ex) {

CodenameOne/src/com/codename1/io/Properties.java

@@ -33,6 +33,7 @@
 import java.util.HashMap;
 import java.util.Hashtable;
 import java.util.Iterator;
+import java.util.Map;
 import java.util.Set;
 
 /**
@@ -387,15 +388,14 @@ private <K> void selectProperties(Hashtable<K, Object> selectProperties, final b
         if (defaults != null) {
             defaults.selectProperties(selectProperties, isStringOnly);
         }
-        Iterator<String> keys = keySet().iterator();
-        while (keys.hasNext()) {
+        for (Map.Entry<String, String> entry : entrySet()) {
             @SuppressWarnings("unchecked")
-            K key = (K) keys.next();
+            K key = (K) entry.getKey();
             if (isStringOnly && !(key instanceof String)) {
                 // Only select property with string key and value
                 continue;
             }
-            Object value = get(key);
+            Object value = entry.getValue();
             selectProperties.put(key, value);
         }
     }

CodenameOne/src/com/codename1/io/URL.java

@@ -273,8 +273,8 @@ public void connect() throws IOException {
             connection = impl.connect(url, doInput, doOutput);
             impl.setHttpMethod(connection, requestMethod);
             if (properties != null && !properties.isEmpty()) {
-                for (String key : properties.keySet()) {
-                    impl.setHeader(connection, key, properties.get(key));
+                for (Map.Entry<String, String> entry : properties.entrySet()) {
+                    impl.setHeader(connection, entry.getKey(), entry.getValue());
                 }
             }
         }

CodenameOne/src/com/codename1/io/Util.java

@@ -410,9 +410,10 @@ public static void writeObject(Object o, DataOutputStream out) throws IOExceptio
             Map v = (Map) o;
             out.writeUTF("java.util.Map");
             out.writeInt(v.size());
-            for (Object key : v.keySet()) {
-                writeObject(key, out);
-                writeObject(v.get(key), out);
+            for (Object entryObj : v.entrySet()) {
+                Map.Entry entry = (Map.Entry) entryObj;
+                writeObject(entry.getKey(), out);
+                writeObject(entry.getValue(), out);
             }
             return;
         }
@@ -1640,9 +1641,18 @@ public static void sleep(int t) {
      */
     public static void wait(Object o, int t) {
         synchronized (o) {
-            try {
-                o.wait(t);
-            } catch (InterruptedException e) {
+            long end = System.currentTimeMillis() + t;
+            while (true) {
+                long remaining = end - System.currentTimeMillis();
+                if (remaining <= 0) {
+                    return;
+                }
+                try {
+                    o.wait(remaining);
+                    return;
+                } catch (InterruptedException e) {
+                    // retry until timeout elapses
+                }
             }
         }
     }
@@ -1655,9 +1665,14 @@ public static void wait(Object o, int t) {
      */
     public static void wait(Object o) {
         synchronized (o) {
-            try {
-                o.wait();
-            } catch (InterruptedException e) {
+            boolean waiting = true;
+            while (waiting) {
+                try {
+                    o.wait();
+                    waiting = false;
+                } catch (InterruptedException e) {
+                    // ignore and continue waiting
+                }
             }
         }
     }

CodenameOne/src/com/codename1/io/gzip/Adler32.java

@@ -92,7 +92,6 @@ public void update(byte[] buf, int index, int len) {
         int len2 = len % NMAX;
         while (len1-- > 0) {
             int k = NMAX;
-            len -= k;
             while (k-- > 0) {
                 s1 += buf[index++] & 0xff;
                 s2 += s1;
@@ -102,7 +101,6 @@ public void update(byte[] buf, int index, int len) {
         }
 
         int k = len2;
-        len -= k;
         while (k-- > 0) {
             s1 += buf[index++] & 0xff;
             s2 += s1;

CodenameOne/src/com/codename1/io/gzip/Deflate.java

@@ -1204,7 +1204,7 @@ int deflate_slow(int flush) {
         }
 
         if (match_available != 0) {
-            bflush = _tr_tally(0, window[strstart - 1] & 0xff);
+            _tr_tally(0, window[strstart - 1] & 0xff);
             match_available = 0;
         }
         flush_block_only(flush == Z_FINISH);

CodenameOne/src/com/codename1/io/gzip/InfCodes.java

@@ -410,8 +410,6 @@ int proc(int r) {
                     s.write = q;
                     r = s.inflate_flush(r);
                     q = s.write;
-                    m = q < s.read ? s.read - q - 1 : s.end - q;
-
                     if (s.read != s.write) {
                         s.bitb = b;
                         s.bitk = k;

CodenameOne/src/com/codename1/io/gzip/Inflate.java

@@ -276,8 +276,6 @@ int inflate(int f) {
                 case DICT4:
 
                     if (z.avail_in == 0) return r;
-                    r = f;
-
                     z.avail_in--;
                     z.total_in++;
                     this.need = ((long) (z.next_in[z.next_in_index++] & 0xff) << 24) & 0xff000000L;
@@ -718,15 +716,13 @@ private int readBytes(int r, int f) throws Return {
         if (tmp_string == null) {
             tmp_string = new java.io.ByteArrayOutputStream();
         }
-        int b = 0;
         while (this.need > 0) {
             if (z.avail_in == 0) {
                 throw new Return(r);
             }
             r = f;
             z.avail_in--;
             z.total_in++;
-            b = z.next_in[z.next_in_index];
             tmp_string.write(z.next_in, z.next_in_index, 1);
             z.adler.update(z.next_in, z.next_in_index, 1);
             z.next_in_index++;