2006-02-28 Lillian Angel <langel@redhat.com>

        * javax/swing/ViewportLayout.java
        (layoutContainer): Should not extend container to be
        minimum size. Mauve test shows that the preferred size
        and the size of the viewport can be set smaller than
        the minimum.

2 files changed, 8 insertions, 12 deletions

diff --git a/ChangeLog b/ChangeLog
index 67add85b6..47a34e3c5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2006-02-28  Lillian Angel  <langel@redhat.com>
 
+	* javax/swing/ViewportLayout.java
+	(layoutContainer): Should not extend container to be 
+	minimum size. Mauve test shows that the preferred size
+	and the size of the viewport can be set smaller than
+	the minimum.
+
+2006-02-28  Lillian Angel  <langel@redhat.com>
+
 	PR classpath/25675
 	* javax/swing/JList.java
 	(getPreferredScrollableViewportSize): Added a check to determine
diff --git a/javax/swing/ViewportLayout.java b/javax/swing/ViewportLayout.java
index a4b7a8a5d..674de959f 100644
--- a/javax/swing/ViewportLayout.java
+++ b/javax/swing/ViewportLayout.java
@@ -193,18 +193,6 @@ public class ViewportLayout implements LayoutManager, Serializable
     if (overextension > 0)
       portBounds.x -= overextension;
 
-    // If the calculated view size was smaller than the minimum size,
-    // extend till the minimum size.
-    if (viewPref.height<viewMinimum.height)
-      {
-        viewPref.height = viewMinimum.height;
-      }
-    
-    if (viewPref.width<viewMinimum.width)
-      {
-        viewPref.width = viewMinimum.width;
-      }
-
     port.setViewSize(viewPref);
     port.setViewPosition(portBounds.getLocation());
   }