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/11/14 00:40:53 UTC
svn commit: r1815170 - in /pivot/trunk/wtk/src/org/apache/pivot/wtk:
BrowserApplicationContext.java Component.java
Author: rwhitcomb
Date: Tue Nov 14 00:40:53 2017
New Revision: 1815170
URL: http://svn.apache.org/viewvc?rev=1815170&view=rev
Log:
PIVOT-1012: Use "Utils" methods for more parameter validation.
Modified:
pivot/trunk/wtk/src/org/apache/pivot/wtk/BrowserApplicationContext.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/Component.java
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/BrowserApplicationContext.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/BrowserApplicationContext.java?rev=1815170&r1=1815169&r2=1815170&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/BrowserApplicationContext.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/BrowserApplicationContext.java Tue Nov 14 00:40:53 2017
@@ -30,6 +30,7 @@ import netscape.javascript.JSObject;
import org.apache.pivot.collections.ArrayList;
import org.apache.pivot.collections.HashMap;
import org.apache.pivot.collections.immutable.ImmutableMap;
+import org.apache.pivot.util.Utils;
/**
* Application context used to execute applications in a web browser.
@@ -355,9 +356,7 @@ public final class BrowserApplicationCon
* @throws IllegalArgumentException if the name is {@code null}.
*/
public static Application getApplication(String name) {
- if (name == null) {
- throw new IllegalArgumentException("name is null.");
- }
+ Utils.checkNull(name, "name");
Application application = null;
for (HostApplet hostApplet : hostApplets) {
@@ -378,9 +377,7 @@ public final class BrowserApplicationCon
* @return The result of the script evaluation.
*/
public static Object eval(String script, Application application) {
- if (application == null) {
- throw new IllegalArgumentException("application is null.");
- }
+ Utils.checkNull(application, "application");
HostApplet applicationHostApplet = null;
for (HostApplet hostApplet : hostApplets) {
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/Component.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/Component.java?rev=1815170&r1=1815169&r2=1815170&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/Component.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/Component.java Tue Nov 14 00:40:53 2017
@@ -848,13 +848,8 @@ public abstract class Component implemen
*/
@Override
public void setSize(int width, int height) {
- if (width < 0) {
- throw new IllegalArgumentException("width is negative.");
- }
-
- if (height < 0) {
- throw new IllegalArgumentException("height is negative.");
- }
+ Utils.checkNonNegative(width, "width");
+ Utils.checkNonNegative(height, "height");
int previousWidth = getWidth();
int previousHeight = getHeight();
@@ -1141,9 +1136,7 @@ public abstract class Component implemen
int previousMaximumWidth = this.maximumWidth;
if (previousMinimumWidth != minimumWidth || previousMaximumWidth != maximumWidth) {
- if (minimumWidth < 0) {
- throw new IllegalArgumentException("minimumWidth is negative.");
- }
+ Utils.checkNonNegative(minimumWidth, "minimumWidth");
if (minimumWidth > maximumWidth) {
throw new IllegalArgumentException("minimumWidth is greater than maximumWidth.");
@@ -1222,9 +1215,7 @@ public abstract class Component implemen
int previousMaximumHeight = this.maximumHeight;
if (previousMinimumHeight != minimumHeight || previousMaximumHeight != maximumHeight) {
- if (minimumHeight < 0) {
- throw new IllegalArgumentException("minimumHeight is negative.");
- }
+ Utils.checkNonNegative(minimumHeight, "minimumHeight");
if (minimumHeight > maximumHeight) {
throw new IllegalArgumentException("minimumHeight is greater than maximumHeight.");