From adf94cac56524e788fa1a876ad51519e23f5a465 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Sat, 9 Nov 2002 23:42:01 +0000 Subject: [PATCH] ScrollPane.java (ScrollPane): Fixed test for valid display policy. * java/awt/ScrollPane.java (ScrollPane): Fixed test for valid display policy. From-SVN: r58963 --- libjava/ChangeLog | 3 +++ libjava/java/awt/ScrollPane.java | 8 ++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/libjava/ChangeLog b/libjava/ChangeLog index ce373cd5540..41907001bdc 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,5 +1,8 @@ 2002-11-09 Tom Tromey + * java/awt/ScrollPane.java (ScrollPane): Fixed test for valid + display policy. + * java/awt/List.java (processEvent): Added missing `else's. * java/awt/Window.java (show): validate() before showing. Make diff --git a/libjava/java/awt/ScrollPane.java b/libjava/java/awt/ScrollPane.java index 546f8e64d17..e558d0bc23f 100644 --- a/libjava/java/awt/ScrollPane.java +++ b/libjava/java/awt/ScrollPane.java @@ -1,5 +1,5 @@ /* ScrollPane.java -- Scrolling window - Copyright (C) 1999 Free Software Foundation, Inc. + Copyright (C) 1999, 2002 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -134,9 +134,9 @@ ScrollPane(int scrollbarDisplayPolicy) { this.scrollbarDisplayPolicy = scrollbarDisplayPolicy; - if ((scrollbarDisplayPolicy != SCROLLBARS_ALWAYS) || - (scrollbarDisplayPolicy != SCROLLBARS_AS_NEEDED) || - (scrollbarDisplayPolicy != SCROLLBARS_NEVER)) + if (scrollbarDisplayPolicy != SCROLLBARS_ALWAYS + && scrollbarDisplayPolicy != SCROLLBARS_AS_NEEDED + && scrollbarDisplayPolicy != SCROLLBARS_NEVER) throw new IllegalArgumentException("Bad scrollbarDisplayPolicy: " + scrollbarDisplayPolicy); -- 2.30.2