From a8cc9af35f01b8ce4347e31269ece9387cb31fea Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Sat, 20 Sep 2003 21:30:39 +0000 Subject: [PATCH] Component.java: Indentation cleanup from Classpath. * java/awt/Component.java: Indentation cleanup from Classpath. 2003-09-20 Dalibor Topic * java/awt/BasicStroke.java (BasicStroke): Fixed illegal argument checking to follow 1.4.2 spec. From-SVN: r71612 --- libjava/ChangeLog | 9 +++++++ libjava/java/awt/BasicStroke.java | 44 +++++++++++++++++++++++++------ libjava/java/awt/Component.java | 12 ++++----- 3 files changed, 51 insertions(+), 14 deletions(-) diff --git a/libjava/ChangeLog b/libjava/ChangeLog index b0cc71f5b47..62aa03d8eb2 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,12 @@ +2003-09-20 Tom Tromey + + * java/awt/Component.java: Indentation cleanup from Classpath. + +2003-09-20 Dalibor Topic + + * java/awt/BasicStroke.java (BasicStroke): Fixed illegal argument + checking to follow 1.4.2 spec. + 2003-08-11 Ingo Proetel * gnu/java/rmi/server/UnicastRef.java: make constructor public and check if serverobject diff --git a/libjava/java/awt/BasicStroke.java b/libjava/java/awt/BasicStroke.java index 3d0a2e74506..2978c6401d7 100644 --- a/libjava/java/awt/BasicStroke.java +++ b/libjava/java/awt/BasicStroke.java @@ -67,7 +67,8 @@ public class BasicStroke implements Stroke * @param join May be either JOIN_ROUND, JOIN_BEVEL, or JOIN_MITER. * @param miterlimit the limit to trim the miter join. The miterlimit must be * greater than or equal to 1.0f. - * @param dash The array representing the dashing pattern. + * @param dash The array representing the dashing pattern. There must be at + * least one non-zero entry. * @param dash_phase is negative and dash is not null. * * @exception IllegalArgumentException If one input parameter doesn't meet @@ -76,13 +77,40 @@ public class BasicStroke implements Stroke public BasicStroke(float width, int cap, int join, float miterlimit, float[] dash, float dashPhase) { - if (width < 0 || - miterlimit < 1.0f || - cap < CAP_BUTT || - cap > CAP_SQUARE || - join < JOIN_MITER || - join > JOIN_BEVEL) - throw new IllegalArgumentException(); + if (width < 0.0f ) + throw new IllegalArgumentException("width " + width + " < 0"); + else if (cap < CAP_BUTT || cap > CAP_SQUARE) + throw new IllegalArgumentException("cap " + cap + " out of range [" + + CAP_BUTT + ".." + CAP_SQUARE + "]"); + else if (miterlimit < 1.0f && join == JOIN_MITER) + throw new IllegalArgumentException("miterlimit " + miterlimit + + " < 1.0f while join == JOIN_MITER"); + else if (join < JOIN_MITER || join > JOIN_BEVEL) + throw new IllegalArgumentException("join " + join + " out of range [" + + JOIN_MITER + ".." + JOIN_BEVEL + + "]"); + else if (dashPhase < 0.0f && dash != null) + throw new IllegalArgumentException("dashPhase " + dashPhase + + " < 0.0f while dash != null"); + else if (dash != null) + if (dash.length == 0) + throw new IllegalArgumentException("dash.length is 0"); + else + { + boolean allZero = true; + + for ( int i = 0; i < dash.length; ++i) + { + if (dash[i] != 0.0f) + { + allZero = false; + break; + } + } + + if (allZero) + throw new IllegalArgumentException("all dashes are 0.0f"); + } this.width = width; this.cap = cap; diff --git a/libjava/java/awt/Component.java b/libjava/java/awt/Component.java index 11663a7d122..d70ed50be1c 100644 --- a/libjava/java/awt/Component.java +++ b/libjava/java/awt/Component.java @@ -1870,12 +1870,12 @@ public abstract class Component { Image returnValue = null; if (!GraphicsEnvironment.isHeadless ()) - { - if (isLightweight () && parent != null) - returnValue = parent.createImage (width, height); - else if (peer != null) - returnValue = peer.createImage (width, height); - } + { + if (isLightweight () && parent != null) + returnValue = parent.createImage (width, height); + else if (peer != null) + returnValue = peer.createImage (width, height); + } return returnValue; }