You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pivot.apache.org by rw...@apache.org on 2017/12/23 04:43:27 UTC
svn commit: r1819111 - in /pivot/trunk:
wtk-terra/src/org/apache/pivot/wtk/skin/terra/
wtk/src/org/apache/pivot/wtk/skin/ wtk/test/org/apache/pivot/wtk/test/
Author: rwhitcomb
Date: Sat Dec 23 04:43:27 2017
New Revision: 1819111
URL: http://svn.apache.org/viewvc?rev=1819111&view=rev
Log:
PIVOT-1012: More work using "Utils" methods for (mostly null) parameter
validation.
Also add some tests of null and empty values to InsetsTest to make sure
the correct exception is thrown for these cases.
Add Insets setters using "(Sequence<?>)" that is now supported.
Modified:
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraFormSkin.java
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraFrameSkin.java
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraMenuBarItemSkin.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/BorderSkin.java
pivot/trunk/wtk/test/org/apache/pivot/wtk/test/InsetsTest.java
Modified: pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraFormSkin.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraFormSkin.java?rev=1819111&r1=1819110&r2=1819111&view=diff
==============================================================================
--- pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraFormSkin.java (original)
+++ pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraFormSkin.java Sat Dec 23 04:43:27 2017
@@ -27,6 +27,7 @@ import java.awt.geom.Path2D;
import org.apache.pivot.collections.ArrayList;
import org.apache.pivot.collections.Dictionary;
import org.apache.pivot.collections.Sequence;
+import org.apache.pivot.util.Utils;
import org.apache.pivot.wtk.ApplicationContext;
import org.apache.pivot.wtk.Bounds;
import org.apache.pivot.wtk.Component;
@@ -911,19 +912,17 @@ public class TerraFormSkin extends Conta
}
public void setPadding(Insets padding) {
- if (padding == null) {
- throw new IllegalArgumentException("padding is null.");
- }
+ Utils.checkNull(padding, "padding");
this.padding = padding;
invalidateComponent();
}
public final void setPadding(Dictionary<String, ?> padding) {
- if (padding == null) {
- throw new IllegalArgumentException("padding is null.");
- }
+ setPadding(new Insets(padding));
+ }
+ public final void setPadding(Sequence<?> padding) {
setPadding(new Insets(padding));
}
@@ -932,18 +931,10 @@ public class TerraFormSkin extends Conta
}
public final void setPadding(Number padding) {
- if (padding == null) {
- throw new IllegalArgumentException("padding is null.");
- }
-
- setPadding(padding.intValue());
+ setPadding(new Insets(padding));
}
public final void setPadding(String padding) {
- if (padding == null) {
- throw new IllegalArgumentException("padding is null.");
- }
-
setPadding(Insets.decode(padding));
}
@@ -952,18 +943,14 @@ public class TerraFormSkin extends Conta
}
public void setHorizontalSpacing(int horizontalSpacing) {
- if (horizontalSpacing < 0) {
- throw new IllegalArgumentException("horizontalSpacing is negative.");
- }
+ Utils.checkNonNegative(horizontalSpacing, "horizontalSpacing");
this.horizontalSpacing = horizontalSpacing;
invalidateComponent();
}
public final void setHorizontalSpacing(Number horizontalSpacing) {
- if (horizontalSpacing == null) {
- throw new IllegalArgumentException("horizontalSpacing is null.");
- }
+ Utils.checkNull(horizontalSpacing, "horizontalSpacing");
setHorizontalSpacing(horizontalSpacing.intValue());
}
@@ -973,18 +960,14 @@ public class TerraFormSkin extends Conta
}
public void setVerticalSpacing(int verticalSpacing) {
- if (verticalSpacing < 0) {
- throw new IllegalArgumentException("verticalSpacing is negative.");
- }
+ Utils.checkNonNegative(verticalSpacing, "verticalSpacing");
this.verticalSpacing = verticalSpacing;
invalidateComponent();
}
public final void setVerticalSpacing(Number verticalSpacing) {
- if (verticalSpacing == null) {
- throw new IllegalArgumentException("verticalSpacing is null.");
- }
+ Utils.checkNull(verticalSpacing, "verticalSpacing");
setVerticalSpacing(verticalSpacing.intValue());
}
@@ -994,18 +977,14 @@ public class TerraFormSkin extends Conta
}
public void setFlagIconOffset(int flagIconOffset) {
- if (flagIconOffset < 0) {
- throw new IllegalArgumentException("flagIconOffset is negative.");
- }
+ Utils.checkNonNegative(flagIconOffset, "flagIconOffset");
this.flagIconOffset = flagIconOffset;
invalidateComponent();
}
public final void setFlagIconOffset(Number flagIconOffset) {
- if (flagIconOffset == null) {
- throw new IllegalArgumentException("flagIconOffset is null.");
- }
+ Utils.checkNull(flagIconOffset, "flagIconOffset");
setFlagIconOffset(flagIconOffset.intValue());
}
@@ -1060,9 +1039,7 @@ public class TerraFormSkin extends Conta
}
public void setDelimiter(String delimiter) {
- if (delimiter == null) {
- throw new IllegalArgumentException("delimiter is null.");
- }
+ Utils.checkNull(delimiter, "delimiter");
this.delimiter = delimiter;
@@ -1093,11 +1070,7 @@ public class TerraFormSkin extends Conta
}
public final void setSeparatorColor(String separatorColor) {
- if (separatorColor == null) {
- throw new IllegalArgumentException("separatorColor is null.");
- }
-
- setSeparatorColor(GraphicsUtilities.decodeColor(separatorColor));
+ setSeparatorColor(GraphicsUtilities.decodeColor(separatorColor, "separatorColor"));
}
public Color getSeparatorHeadingColor() {
@@ -1113,11 +1086,7 @@ public class TerraFormSkin extends Conta
}
public final void setSeparatorHeadingColor(String separatorHeadingColor) {
- if (separatorHeadingColor == null) {
- throw new IllegalArgumentException("separatorHeadingColor is null.");
- }
-
- setSeparatorHeadingColor(GraphicsUtilities.decodeColor(separatorHeadingColor));
+ setSeparatorHeadingColor(GraphicsUtilities.decodeColor(separatorHeadingColor, "separatorHeadingColor"));
}
// Form events
Modified: pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraFrameSkin.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraFrameSkin.java?rev=1819111&r1=1819110&r2=1819111&view=diff
==============================================================================
--- pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraFrameSkin.java (original)
+++ pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraFrameSkin.java Sat Dec 23 04:43:27 2017
@@ -26,6 +26,7 @@ import java.awt.geom.Line2D;
import org.apache.pivot.collections.Dictionary;
import org.apache.pivot.collections.Sequence;
+import org.apache.pivot.util.Utils;
import org.apache.pivot.wtk.Bounds;
import org.apache.pivot.wtk.BoxPane;
import org.apache.pivot.wtk.Button;
@@ -650,19 +651,17 @@ public class TerraFrameSkin extends Wind
}
public void setPadding(Insets padding) {
- if (padding == null) {
- throw new IllegalArgumentException("padding is null.");
- }
+ Utils.checkNull(padding, "padding");
this.padding = padding;
invalidateComponent();
}
public final void setPadding(Dictionary<String, ?> padding) {
- if (padding == null) {
- throw new IllegalArgumentException("padding is null.");
- }
+ setPadding(new Insets(padding));
+ }
+ public final void setPadding(Sequence<?> padding) {
setPadding(new Insets(padding));
}
@@ -671,18 +670,10 @@ public class TerraFrameSkin extends Wind
}
public final void setPadding(Number padding) {
- if (padding == null) {
- throw new IllegalArgumentException("padding is null.");
- }
-
- setPadding(padding.intValue());
+ setPadding(new Insets(padding));
}
public final void setPadding(String padding) {
- if (padding == null) {
- throw new IllegalArgumentException("padding is null.");
- }
-
setPadding(Insets.decode(padding));
}
Modified: pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraMenuBarItemSkin.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraMenuBarItemSkin.java?rev=1819111&r1=1819110&r2=1819111&view=diff
==============================================================================
--- pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraMenuBarItemSkin.java (original)
+++ pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraMenuBarItemSkin.java Sat Dec 23 04:43:27 2017
@@ -123,10 +123,6 @@ public class TerraMenuBarItemSkin extend
}
public void setPopupBorderColor(String popupBorderColor) {
- if (popupBorderColor == null) {
- throw new IllegalArgumentException("popupBorderColor is null.");
- }
-
menuPopup.getStyles().put("borderColor", popupBorderColor);
}
}
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/BorderSkin.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/BorderSkin.java?rev=1819111&r1=1819110&r2=1819111&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/BorderSkin.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/BorderSkin.java Sat Dec 23 04:43:27 2017
@@ -337,7 +337,7 @@ public class BorderSkin extends Containe
* values recognized by Pivot}.
*/
public final void setColor(String color) {
- setColor(GraphicsUtilities.decodeColor(color));
+ setColor(GraphicsUtilities.decodeColor(color, "color"));
}
public Color getTitleColor() {
Modified: pivot/trunk/wtk/test/org/apache/pivot/wtk/test/InsetsTest.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/test/org/apache/pivot/wtk/test/InsetsTest.java?rev=1819111&r1=1819110&r2=1819111&view=diff
==============================================================================
--- pivot/trunk/wtk/test/org/apache/pivot/wtk/test/InsetsTest.java (original)
+++ pivot/trunk/wtk/test/org/apache/pivot/wtk/test/InsetsTest.java Sat Dec 23 04:43:27 2017
@@ -19,6 +19,7 @@ package org.apache.pivot.wtk.test;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
import org.junit.Test;
@@ -78,4 +79,22 @@ public class InsetsTest {
assertEquals(i5.toString(), "Insets [2, 2, 3, 3]");
}
+ @Test
+ public void testNullEmpty() {
+ try {
+ Insets.decode(null);
+ fail("Insets.decode of null string should fail!");
+ } catch (IllegalArgumentException iae) {
+ System.out.println("Valid exception: " + iae.getMessage());
+ assertEquals(iae.getMessage(), "padding/margin must not be null or empty.");
+ }
+
+ try {
+ Insets.decode("");
+ fail("Insets.decode of empty string should fail!");
+ } catch (IllegalArgumentException iae) {
+ System.out.println("Valid exception: " + iae.getMessage());
+ assertEquals(iae.getMessage(), "padding/margin must not be null or empty.");
+ }
+ }
}