Disable additional SpotBugs rules (#3982)

Author: shai-almog

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

@@ -140,10 +140,6 @@ public void actionPerformed(ActionEvent evt) {
                         break;
 
                     case Accepted:
-                        removeAll();
-                        revalidateLater();
-                        break;
-
                     case Canceled:
                         removeAll();
                         revalidateLater();

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

@@ -97,14 +97,24 @@ private void init(Hashtable props) {
      * {@inheritDoc}
      */
     public boolean equals(Object obj) {
-        return id.equals(((FBObject) obj).id);
+        if (this == obj) {
+            return true;
+        }
+        if (!(obj instanceof FBObject)) {
+            return false;
+        }
+        FBObject other = (FBObject) obj;
+        if (id == null) {
+            return other.id == null;
+        }
+        return id.equals(other.id);
     }
 
     /**
      * {@inheritDoc}
      */
     public int hashCode() {
-        return id.hashCode();
+        return id != null ? id.hashCode() : 0;
     }
 
 

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

@@ -683,15 +683,16 @@ public Map<String, Object> parseJSON(Reader i) throws IOException {
      */
     public Hashtable<String, Object> parse(Reader i) throws IOException {
         modern = false;
-        state = new Hashtable();
-        parseStack = new Vector();
+        Hashtable<String, Object> legacyState = new Hashtable<String, Object>();
+        state = legacyState;
+        parseStack = new Vector<Object>();
         currentKey = null;
         if (!strict) {
             String cleaned = JSONSanitizer.sanitize(Util.readToString(i));
             i = new CharArrayReader(cleaned.toCharArray());
         }
         parse(i, this);
-        return (Hashtable<String, Object>) state;
+        return legacyState;
     }
 
     private boolean isStackHash() {

CodenameOne/src/com/codename1/payment/Purchase.java

@@ -54,6 +54,7 @@ public abstract class Purchase {
     private static final String RECEIPTS_REFRESH_TIME_KEY = "CN1SubscriptionsDataRefreshTime.dat";
     private static final String PENDING_PURCHASE_KEY = "PendingPurchases.dat";
     private static final Object synchronizationLock = new Object();
+    private static final Object receiptsLock = new Object();
     private static ReceiptStore receiptStore;
     private static List<Receipt> receipts;
     private static Date receiptsRefreshTime;
@@ -131,7 +132,7 @@ public final void setReceiptStore(ReceiptStore store) {
      * @return List of receipts for purchases this app.
      */
     public final List<Receipt> getReceipts() {
-        synchronized (RECEIPTS_KEY) {
+        synchronized (receiptsLock) {
             if (receipts == null) {
                 if (Storage.getInstance().exists(RECEIPTS_KEY)) {
                     Receipt.registerExternalizable();
@@ -157,7 +158,7 @@ public final List<Receipt> getReceipts() {
      * @param data
      */
     private void setReceipts(List<Receipt> data) {
-        synchronized (RECEIPTS_KEY) {
+        synchronized (receiptsLock) {
             receipts = new ArrayList<Receipt>();
             receipts.addAll(data);
             Storage.getInstance().writeObject(RECEIPTS_KEY, receipts);
@@ -187,7 +188,7 @@ public final Receipt[] getReceipts(String... skus) {
      * @return
      */
     private Date getReceiptsRefreshTime() {
-        synchronized (RECEIPTS_KEY) {
+        synchronized (receiptsLock) {
             if (receiptsRefreshTime == null) {
                 if (Storage.getInstance().exists(RECEIPTS_REFRESH_TIME_KEY)) {
                     receiptsRefreshTime = (Date) Storage.getInstance().readObject(RECEIPTS_REFRESH_TIME_KEY);
@@ -205,7 +206,7 @@ private Date getReceiptsRefreshTime() {
      * @param time
      */
     private void setReceiptsRefreshTime(Date time) {
-        synchronized (RECEIPTS_KEY) {
+        synchronized (receiptsLock) {
             receiptsRefreshTime = time;
             Storage.getInstance().writeObject(RECEIPTS_REFRESH_TIME_KEY, receiptsRefreshTime);
         }
@@ -569,15 +570,16 @@ public void onSucess(Boolean value) {
 
                 public void run() {
 
-                    while (!complete[0]) {
-                        synchronized (complete) {
-                            try {
-                                complete.wait();
-                            } catch (Exception ex) {
-
+                        while (!complete[0]) {
+                            synchronized (complete) {
+                                try {
+                                    complete.wait();
+                                } catch (InterruptedException ex) {
+                                    Thread.currentThread().interrupt();
+                                    return;
+                                }
                             }
                         }
-                    }
                 }
 
             });
@@ -777,8 +779,9 @@ public void run() {
                         synchronized (complete) {
                             try {
                                 complete.wait();
-                            } catch (Exception ex) {
-
+                            } catch (InterruptedException ex) {
+                                Thread.currentThread().interrupt();
+                                return;
                             }
                         }
                     }

CodenameOne/src/com/codename1/processing/Result.java

@@ -433,7 +433,7 @@ public long getAsLong(final String path) throws IllegalArgumentException {
         if (s == null) {
             return 0;
         }
-        return new Double(Double.parseDouble(s)).longValue();
+        return (long) Double.parseDouble(s);
     }
 
     /**

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

@@ -476,7 +476,7 @@ public Object convert(Object source) {
                 return null;
             }
             if (source instanceof Boolean) {
-                return ((Boolean) source).booleanValue();
+                return source;
             }
             if (source instanceof String) {
                 String s = ((String) source).toLowerCase();

CodenameOne/src/com/codename1/push/PushBuilder.java

@@ -160,6 +160,7 @@ public String build() {
         switch (type) {
             case 0:
             case 1:
+            case 5:
                 sb.append(body);
                 break;
             case 2:
@@ -171,11 +172,7 @@ public String build() {
             case 4:
                 sb.append(title).append(";").append(body);
                 break;
-            case 5:
-                sb.append(body);
-                break;
             case 6:
-
             case 100:
                 sb.append(badge);
                 break;

CodenameOne/src/com/codename1/ui/BrowserComponent.java

@@ -1797,7 +1797,7 @@ public JSType getJSType() {
          * @return
          */
         public int getInt() {
-            return new Double(Double.parseDouble(value)).intValue();
+            return (int) Double.parseDouble(value);
         }
 
         /**

CodenameOne/src/com/codename1/ui/Component.java

@@ -2602,11 +2602,6 @@ public void run() {
 
                     switch (elevation) {
                         case 1:
-                            //drawShadow(g, img, relativeX, relativeY, 0, 1, 1, 0, 0, 0.14f);
-                            //drawShadow(g, img, relativeX, relativeY, 0, 2, 1, -1, 0, 0.12f);
-                            drawShadow(g, img, relativeX, relativeY, 0, 1, 3, 0, 0, 0.2f);
-                            break;
-
                         case 2:
                             //drawShadow(g, img, relativeX, relativeY, 0, 1, 1, 0, 0, 0.14f);
                             //drawShadow(g, img, relativeX, relativeY, 0, 2, 1, -1, 0, 0.12f);

CodenameOne/src/com/codename1/ui/Container.java

@@ -2951,17 +2951,13 @@ public Component getComponentAt(int x, int y) {
 
                     } else {
                         // No children found here
-                        if (top == null) {
-                            if (cmp.respondsToPointerEvents() || !(cmp instanceof Container)) {
-                                top = cmp;
-                            }
+                        if (top == null && cmp.respondsToPointerEvents()) {
+                            top = cmp;
                         }
                     }
                 } else {
                     if (top == null) {
-                        if (cmp.respondsToPointerEvents() || !(cmp instanceof Container)) {
-                            top = cmp;
-                        }
+                        top = cmp;
                     }
                 }
                 if (!overlaps) {