* java/awt/ScrollPane.java (ScrollPane): Fixed test for valid

	display policy.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@58963 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index ce373cd..4190700 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,5 +1,8 @@
 2002-11-09  Tom Tromey  <tromey@redhat.com>
 
+       * 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 546f8e6..e558d0b 100644 (file)
--- 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);