? 17360_17362.PATCH
Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.3836
diff -u -r1.3836 ChangeLog
--- ChangeLog	13 Jun 2005 13:16:50 -0000	1.3836
+++ ChangeLog	16 Jun 2005 16:56:52 -0000
@@ -1,3 +1,17 @@
+2005-06-16  Lillian Angel  <address@hidden>
+
+	* javax/swing/JViewport.java
+	Fixed Bug #17360 and 17362.
+	(setView): the size of the JScrollPane container
+	is set to the preferredSize of the view that is added.
+ 
Index: javax/swing/JViewport.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/JViewport.java,v
retrieving revision 1.20
diff -u -r1.20 JViewport.java
--- javax/swing/JViewport.java	27 May 2005 21:12:46 -0000	1.20
+++ javax/swing/JViewport.java	16 Jun 2005 16:56:53 -0000
@@ -344,6 +344,12 @@
           viewListener = createViewListener();
         v.addComponentListener(viewListener);
         add(v);
+        
+        Dimension vd = v.getPreferredSize();
+    	Object p = getParent();
+    	if (p instanceof JScrollPane && !vd.equals( new Dimension() ))
+    		( (JScrollPane) p ).setPreferredSize( vd );
+        
         fireStateChanged();
       }
   }