Fixed RoundRectBorder.equals() so that it correctly reports borders w…

…ith differnt topLeft,topRight,bottomLeft,bottomRight modes as being unequal. This fixes issues where you change the border of a style but it has no effect, because the style does an equality test inside setBorder() to only change the border if it isn't the same as the existing border.

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

@@ -405,7 +405,23 @@ private void updateBorderForPosition() {
         Border border = getStyle().getBorder();
         if (border instanceof RoundRectBorder) {
             RoundRectBorder b = (RoundRectBorder)border;
-
+            RoundRectBorder nb = RoundRectBorder.create();
+            nb.bezierCorners(b.isBezierCorners());
+            nb.bottomLeftMode(b.isBottomLeft());
+            nb.bottomRightMode(b.isBottomRight());
+            nb.topRightMode(b.isTopRight());
+            nb.topLeftMode(b.isTopLeft());
+            nb.cornerRadius(b.getCornerRadius());
+            nb.shadowBlur(b.getShadowBlur());
+            nb.shadowColor(b.getShadowColor());
+            nb.shadowOpacity(b.getShadowOpacity());
+            nb.shadowSpread(b.getShadowSpread());
+            nb.shadowX(b.getShadowX());
+            nb.shadowY(b.getShadowY());
+            nb.strokeColor(b.getStrokeColor());
+            nb.strokeOpacity(b.getStrokeOpacity());
+            nb.stroke(b.getStrokeThickness(), b.isStrokeMM());
+            b = nb;
             switch (getPositionInt()) {
                 case C:
                     b.bottomRightMode(true);
@@ -436,10 +452,12 @@ private void updateBorderForPosition() {
                     b.topLeftMode(false);
                     b.topRightMode(false);
                     b.bottomLeftMode(true);
-                    b.bottomLeftMode(false);
+                    b.bottomRightMode(true);
                     break;
 
             }
+            getStyle().setBorder(b);
+
         }
 
     }

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

@@ -874,12 +874,7 @@ public boolean isBottomOnlyMode() {
         return (!topLeft) && (!topRight) && bottomLeft && bottomRight;
     }
 
-    @Override
-    public int hashCode() {
-        int hash = 5;
-        hash = 43 * hash + strokeColor;
-        return hash;
-    }
+
 
     @Override
     public boolean equals(Object obj) {
@@ -923,9 +918,43 @@ public boolean equals(Object obj) {
         if (this.bezierCorners != other.bezierCorners) {
             return false;
         }
+        if (this.topLeft != other.topLeft) {
+            return false;
+        }
+        if (this.topRight != other.topRight) {
+            return false;
+        }
+        if (this.bottomLeft != other.bottomLeft) {
+            return false;
+        }
+        if (this.bottomRight != other.bottomRight) {
+            return false;
+        }
         return true;
     }
 
+    @Override
+    public int hashCode() {
+        int hash = 5;
+        hash = 79 * hash + this.strokeColor;
+        hash = 79 * hash + this.strokeOpacity;
+        hash = 79 * hash + Float.floatToIntBits(this.strokeThickness);
+        hash = 79 * hash + (this.strokeMM ? 1 : 0);
+        hash = 79 * hash + Float.floatToIntBits(this.shadowSpread);
+        hash = 79 * hash + this.shadowOpacity;
+        hash = 79 * hash + this.shadowColor;
+        hash = 79 * hash + Float.floatToIntBits(this.shadowX);
+        hash = 79 * hash + Float.floatToIntBits(this.shadowY);
+        hash = 79 * hash + Float.floatToIntBits(this.shadowBlur);
+        hash = 79 * hash + Float.floatToIntBits(this.cornerRadius);
+        hash = 79 * hash + (this.bezierCorners ? 1 : 0);
+        hash = 79 * hash + (this.topLeft ? 1 : 0);
+        hash = 79 * hash + (this.topRight ? 1 : 0);
+        hash = 79 * hash + (this.bottomLeft ? 1 : 0);
+        hash = 79 * hash + (this.bottomRight ? 1 : 0);
+        return hash;
+    }
+
     /**
      * Returns true if this border corner is round and false if it's square
      * @return the topLeft value

Samples/samples/RoundRectBorderTest/RoundRectBorderTest.java

@@ -89,9 +89,13 @@ public void start() {
 
         l = l("Border Radius 10");
         l.getStyle().setBorder(b().cornerRadius(10f));
-        hi.add(l);
 
 
+        hi.add(l);
+
+        l = l("Bottom left and right");
+        l.getStyle().setBorder(b().bottomLeftMode(true).bottomRightMode(true).topLeftMode(false).topRightMode(false));
+        hi.add(l);
 
         hi.show();
     }

tests/core/test/com/codename1/ui/RoundRectBorderTest.java

@@ -7,6 +7,7 @@
 
 import com.codename1.testing.AbstractTest;
 import com.codename1.ui.plaf.RoundRectBorder;
+import com.codename1.ui.plaf.Style;
 
 /**
  *
@@ -29,6 +30,27 @@ public boolean runTest() throws Exception {
         assertTrue(!border.isBezierCorners(), "Setting bezier corners to false failed.");
         border.bezierCorners(true);
         assertTrue(border.isBezierCorners(), "Setting bezier corners to true failed.");
+
+        assertEqual(RoundRectBorder.create(), RoundRectBorder.create(), "Default roundRect borders should be equal");
+        assertNotEqual(RoundRectBorder.create().topLeftMode(true), RoundRectBorder.create().topLeftMode(false), "RoundRectBorder should be unequal if topLeftMode not equal");
+        assertNotEqual(RoundRectBorder.create().topRightMode(true), RoundRectBorder.create().topRightMode(false), "RoundRectBorder should be unequal if topRightMode not equal");
+        assertNotEqual(RoundRectBorder.create().bottomRightMode(true), RoundRectBorder.create().bottomRightMode(false), "RoundRectBorder should be unequal if bottomRightMode not equal");
+        assertNotEqual(RoundRectBorder.create().bottomLeftMode(true), RoundRectBorder.create().bottomLeftMode(false), "RoundRectBorder should be unequal if bottomLeftMode not equal");
+        assertNotEqual(RoundRectBorder.create().cornerRadius(2), RoundRectBorder.create().cornerRadius(3), "RoundRectBorder should be unequal if cornerRadius not equal");
+
+        Style s = new Style();
+        RoundRectBorder b1 = RoundRectBorder.create();
+        s.setBorder(b1);
+        assertTrue(b1 == s.getBorder(), "Failed to set RoundRectBorder on style");
+
+        RoundRectBorder b2 = RoundRectBorder.create();
+        s.setBorder(b2);
+            // This shouldn't actually change the border because b1.equals(b2)
+        assertTrue(b1 == s.getBorder(), "Shouldn't have overwritten RoundRectBorder on style because it is equal to old style");
+        b2.cornerRadius(b2.getCornerRadius()+1);
+        s.setBorder(b2);
+        assertTrue(b2 == s.getBorder(), "Border should have been changed to new RoundRectBorder because the border was changed.");
+
         return true;
 
     }