Imported GNU Classpath 0.90

       * scripts/makemake.tcl: Set gnu/java/awt/peer/swing to ignore.
       * gnu/classpath/jdwp/VMFrame.java (SIZE): New constant.
       * java/lang/VMCompiler.java: Use gnu.java.security.hash.MD5.
       * java/lang/Math.java: New override file.
       * java/lang/Character.java: Merged from Classpath.
       (start, end): Now 'int's.
       (canonicalName): New field.
       (CANONICAL_NAME, NO_SPACES_NAME, CONSTANT_NAME): New constants.
       (UnicodeBlock): Added argument.
       (of): New overload.
       (forName): New method.
       Updated unicode blocks.
       (sets): Updated.
       * sources.am: Regenerated.
       * Makefile.in: Likewise.


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

1 files changed, 13 insertions, 13 deletions

diff --git a/libjava/classpath/javax/swing/ScrollPaneLayout.java b/libjava/classpath/javax/swing/ScrollPaneLayout.java
index edf1f1f4292..b00b5c4e7ae 100644
--- a/libjava/classpath/javax/swing/ScrollPaneLayout.java
+++ b/libjava/classpath/javax/swing/ScrollPaneLayout.java
@@ -285,20 +285,20 @@ public class ScrollPaneLayout
     // Sun's implementation simply throws a ClassCastException if
     // parent is no JScrollPane, so do we.
     JScrollPane sc = (JScrollPane) parent;
-    Dimension viewportSize = viewport.getMinimumSize();
-    int width = viewportSize.width;
-    int height = viewportSize.height;
-    if (hsb != null && hsb.isVisible())
-      height += hsb.getMinimumSize().height;
-    if (vsb != null && vsb.isVisible())
-      width += vsb.getMinimumSize().width;
-    if (rowHead != null && rowHead.isVisible())
-      width += rowHead.getMinimumSize().width;
-    if (colHead != null && colHead.isVisible())
-      height += colHead.getMinimumSize().height;
     Insets i = sc.getInsets();
-    return new Dimension(width + i.left + i.right,
-                         height + i.top + i.bottom);
+    Dimension viewportMinSize = sc.getViewport().getMinimumSize();
+
+    int width = i.left + i.right + viewportMinSize.width;
+    if (sc.getVerticalScrollBarPolicy()
+        != JScrollPane.VERTICAL_SCROLLBAR_NEVER)
+      width += sc.getVerticalScrollBar().getMinimumSize().width;
+
+    int height = i.top + i.bottom + viewportMinSize.height;
+    if (sc.getHorizontalScrollBarPolicy()
+        != JScrollPane.HORIZONTAL_SCROLLBAR_NEVER)
+      height += sc.getHorizontalScrollBar().getMinimumSize().height;
+
+    return new Dimension(width, height);
   }
 
   /**