Index: javax/swing/ViewportLayout.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/ViewportLayout.java,v
retrieving revision 1.18
diff -u -r1.18 ViewportLayout.java
--- javax/swing/ViewportLayout.java	26 Oct 2005 19:40:26 -0000	1.18
+++ javax/swing/ViewportLayout.java	6 Dec 2005 14:30:07 -0000
@@ -153,7 +153,6 @@
       }
     else
       {
-        viewPref.height = viewMinimum.height;
         int overextension = portLowerRight.y - viewPref.height;
         if (overextension > 0)
             portBounds.y -= overextension;
@@ -168,13 +167,17 @@
       }
     else
       {
-        viewPref.width = viewMinimum.width;
         int overextension = portLowerRight.x - viewPref.width;
         if (overextension > 0)
             portBounds.x -= overextension;
       }
 
     port.setViewPosition(portBounds.getLocation());
+    // TODO: I doubt that the size should really be touched here, except when
+    // the view is somehow smaller than its minimumSize. I would think that
+    // when the size of a view is set manually to a fixed value, that this
+    // value should be left unchanged, and not reset to the preferred or
+    // minimum size. -- Roman Kennke
     port.setViewSize(viewPref);
   }
 }