Fixed a bug and excluded some spotbugs tests

Author: shai-almog

CodenameOne/src/com/codename1/capture/Capture.java

@@ -267,7 +267,10 @@ public void run() {
             while (!completed) {
                 synchronized (this) {
                     try {
-                        this.wait();
+                        // we need to recheck the condition within the synchronized block (double locking)
+                        if(!completed) {
+                            this.wait();
+                        }
                     } catch (InterruptedException ex) {
                     }
                 }

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

@@ -260,6 +260,10 @@ static Motion getRippleMotion() {
         return rippleMotion;
     }
 
+    static void setRippleMotion(Motion m) {
+        rippleMotion = m;
+    }
+
     /**
      * Sets the title after invoking the constructor
      *
@@ -3107,8 +3111,9 @@ static void setRippleComponent(Component cmp) {
 
     private void initRippleEffect(int x, int y, Component cmp) {
         if (cmp.isRippleEffect()) {
-            rippleMotion = Motion.createEaseInMotion(0, 1000, 800);
-            rippleMotion.start();
+            Motion motion = Motion.createEaseInMotion(0, 1000, 800);
+            motion.start();
+            setRippleMotion(motion);
             setRippleComponent(cmp);
             rippleX = x;
             rippleY = y;
@@ -3391,7 +3396,7 @@ public void pointerDragged(int x, int y) {
             }
         }
 
-        rippleMotion = null;
+        setRippleMotion(null);
 
         if (dragged != null) {
             LeadUtil.pointerDragged(dragged, x, y);
@@ -3463,7 +3468,7 @@ public void pointerDragged(int[] x, int[] y) {
             }
         }
 
-        rippleMotion = null;
+        setRippleMotion(null);
 
         if (dragged != null) {
             LeadUtil.pointerDragged(dragged, x, y);
@@ -3668,7 +3673,7 @@ private boolean fireReleaseListeners(int x, int y) {
     public void pointerReleased(int x, int y) {
         try {
             Component origPressedCmp = pressedCmp;
-            rippleMotion = null;
+            setRippleMotion(null);
             setPressedCmp(null);
             boolean isScrollWheeling = Display.impl.isScrollWheeling();
             Container actual = getActualPane(formLayeredPane, x, y);

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

@@ -118,12 +118,12 @@ public final class PlatformDefaults {
      * to specify the visual padding.
      * <p>
      */
-    public static final String VISUAL_PADDING_PROPERTY = "visualPadding";
+    public static final String VISUAL_PADDING_PROPERTY = "visualPadding";
     static BoundSize RELATED_X = null, RELATED_Y = null, UNRELATED_X = null, UNRELATED_Y = null;
     private static int DEF_H_UNIT = UnitValue.LPX;
     private static int DEF_V_UNIT = UnitValue.LPY;
     private static InCellGapProvider GAP_PROVIDER = null;
-    private static volatile int MOD_COUNT = 0;
+    private static int MOD_COUNT = 0;
     private static int CUR_PLAF = WINDOWS_XP;
     private static String BUTTON_FORMAT = null;
     private static BoundSize DEF_VGAP = null, DEF_HGAP = null;
@@ -342,7 +342,7 @@ public static Float getHorizontalScaleFactor() {
     public static void setHorizontalScaleFactor(Float f) {
         if (!LayoutUtil.equals(horScale, f)) {
             horScale = f;
-            MOD_COUNT++;
+            incModeCount();
         }
     }
 
@@ -371,7 +371,7 @@ public static Float getVerticalScaleFactor() {
     public static void setVerticalScaleFactor(Float f) {
         if (!LayoutUtil.equals(verScale, f)) {
             verScale = f;
-            MOD_COUNT++;
+            incModeCount();
         }
     }
 
@@ -401,7 +401,7 @@ public static void setLogicalPixelBase(int base) {
                 throw new IllegalArgumentException("Unrecognized base: " + base);
 
             LP_BASE = base;
-            MOD_COUNT++;
+            incModeCount();
         }
     }
 
@@ -465,7 +465,7 @@ public static void setGridCellGap(UnitValue x, UnitValue y) {
         if (y != null)
             DEF_VGAP = new BoundSize(y, y, null, null);
 
-        MOD_COUNT++;
+        incModeCount();
     }
 
     /**
@@ -484,7 +484,7 @@ public static UnitValue getMinimumButtonWidth() {
      */
     public static void setMinimumButtonWidth(UnitValue width) {
         BUTT_WIDTH = width;
-        MOD_COUNT++;
+        incModeCount();
     }
 
     /**
@@ -525,7 +525,7 @@ public static void setUnitValue(String[] unitStrings, UnitValue x, UnitValue y)
             if (y != null)
                 VER_DEFS.put(s, y);
         }
-        MOD_COUNT++;
+        incModeCount();
     }
 
     /**
@@ -587,7 +587,7 @@ public static String getButtonOrder() {
      */
     public static void setButtonOrder(String order) {
         BUTTON_FORMAT = order;
-        MOD_COUNT++;
+        incModeCount();
     }
 
     /**
@@ -678,7 +678,7 @@ public static void setDialogInsets(UnitValue top, UnitValue left, UnitValue bott
         if (right != null)
             DIALOG_INS[3] = right;
 
-        MOD_COUNT++;
+        incModeCount();
     }
 
     /**
@@ -712,7 +712,7 @@ public static void setPanelInsets(UnitValue top, UnitValue left, UnitValue botto
         if (right != null)
             PANEL_INS[3] = right;
 
-        MOD_COUNT++;
+        incModeCount();
     }
 
     /**
@@ -777,6 +777,10 @@ public static int getModCount() {
         return MOD_COUNT;
     }
 
+    private static void incModeCount() {
+        MOD_COUNT++;
+    }
+
     /**
      * Returns the current default unit. The default unit is the unit used if no unit is set. E.g. "width 10".
      *

CodenameOne/src/com/codename1/ui/plaf/CSSBorder.java

@@ -627,6 +627,10 @@ public boolean isBackgroundPainter() {
         return true;
     }
 
+    private static void setContext(Context ctx) {
+        context = ctx;
+    }
+
     /**
      * {@inheritDoc }
      */
@@ -647,7 +651,7 @@ public void paintBorderBackground(Graphics g, Component c) {
             calculateContentRect(c.getWidth(), c.getHeight(), contentRect);
             contentRect.setX(contentRect.getX() + c.getX());
             contentRect.setY(contentRect.getY() + c.getY());
-            context = new Context(c, contentRect);
+            setContext(new Context(c, contentRect));
             String borderPathKey = "$$CSSBorderPath";
             GeneralPath p = (GeneralPath) c.getClientProperty(borderPathKey);
             if (p == null) {

maven/core-unittests/spotbugs-exclude.xml

@@ -75,6 +75,27 @@
         <Bug pattern="CN_IDIOM_NO_SUPER_CALL"/>
     </Match>
 
+    <!--
+    This fails on writing to a static field from a non-static method.
+    This is a bad practice in general because it could indicate a state
+    that changes across threads. However, in our case, we have many such
+    fields and threads are typically mostly the EDT. The risk is much lower
+    as a result.
+    -->
+    <Match>
+        <Bug pattern="ST_WRITE_TO_STATIC_FROM_INSTANCE_METHOD"/>
+    </Match>
+
+    <!--
+    Since the code runs on the clientside performance is more important than
+    abstraction. We don't always copy values or wrap them in immutable data.
+    -->
+    <Match>
+        <Bug pattern="EI_EXPOSE_REP"/>
+    </Match>
+    <Match>
+        <Bug pattern="EI_EXPOSE_REP2"/>
+    </Match>
 
     <!-- Match>
         <Bug pattern="UI_INHERITANCE_UNSAFE_GETRESOURCE"/>
@@ -104,6 +125,13 @@
         <Bug pattern="ES_COMPARING_STRINGS_WITH_EQ" />
     </Match>
 
+    <!-- The API should return null when the value isn't found -->
+    <Match>
+        <Class name="~com\.codename1\.plaf\.UIManager" />
+        <Method name="isThemeConstant" />
+        <Bug pattern="NP_BOOLEAN_RETURN_NULL" />
+    </Match>
+
     <!-- Deprecated classes that should be excluded from checks -->
     <Match>
         <Class name="~com\.codename1\.db\.ThreadSafeDatabase.*" />