From 71c112823abe2e15cdf8dbc25f9e420553a31252 Mon Sep 17 00:00:00 2001 From: Tania Bento Date: Wed, 6 Dec 2006 15:18:59 +0000 Subject: 2006-12-06 Tania Bento * javax/swing/border/CompoundBorder.java: (isBorderOpaque): If inside and outside border both have a null value, return true. --- ChangeLog | 6 ++++++ javax/swing/border/CompoundBorder.java | 7 +++++++ 2 files changed, 13 insertions(+) diff --git a/ChangeLog b/ChangeLog index 2ca8accac..7235a4547 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2006-12-06 Tania Bento + + * javax/swing/border/CompoundBorder.java: + (isBorderOpaque): If inside and outside border both have a null + value, return true. + 2006-12-06 Chris Burdess Fixes PR 29272. diff --git a/javax/swing/border/CompoundBorder.java b/javax/swing/border/CompoundBorder.java index 2ee639cf9..63a9a553d 100644 --- a/javax/swing/border/CompoundBorder.java +++ b/javax/swing/border/CompoundBorder.java @@ -115,6 +115,13 @@ public class CompoundBorder extends AbstractBorder */ public boolean isBorderOpaque() { + // Although the API specification states that this method + // returns true if both the inside and outside borders are non-null + // and opaque, and false otherwise, a mauve test shows that if both + // the inside or outside borders are null, then true is returned. + if ((insideBorder == null) && (outsideBorder == null)) + return true; + // While it would be safe to assume true for the opacity of // a null border, this behavior would not be according to // the API specification. Also, it is pathological to have -- cgit v1.2.1