ScrollPaneLayout fix

BobHanson · BobHanson · commit f8c99d530b0a · 2020-02-10T15:44:02.000-06:00
diff --git a/sources/net.sf.j2s.java.core/src/java/awt/LayoutManager.java b/sources/net.sf.j2s.java.core/src/java/awt/LayoutManager.java
@@ -64,11 +64,11 @@ public interface LayoutManager {
     /**
      * Calculates the preferred size dimensions for the specified
      * container, given the components it contains.
-     * @param parent the container to be laid out
+     * @param container the container to be laid out
      *
      * @see #minimumLayoutSize
      */
-    Dimension preferredLayoutSize(Container parent);
+    Dimension preferredLayoutSize(Container container);
 
     /**
      * Calculates the minimum size dimensions for the specified
diff --git a/sources/net.sf.j2s.java.core/src/javax/swing/ScrollPaneLayout.java b/sources/net.sf.j2s.java.core/src/javax/swing/ScrollPaneLayout.java
@@ -461,24 +461,25 @@ else if (key.equals(UPPER_RIGHT_CORNER)) {
      * <p>Note that the rowHeader is calculated as part of the preferred width
      * and the colHeader is calculated as part of the preferred size.
      *
-     * @param parent the <code>Container</code> that will be laid out
+     * @param container the <code>Container</code> that will be laid out
      * @return a <code>Dimension</code> object specifying the preferred size of the
      *         viewport and any scrollbars
      * @see ViewportLayout
      * @see LayoutManager
      */
-    public Dimension preferredLayoutSize(Container parent)
+    public Dimension preferredLayoutSize(Container container)
     {
         /* Sync the (now obsolete) policy fields with the
          * JScrollPane.
          */
-        JScrollPane scrollPane = (JScrollPane)parent;
+        JScrollPane scrollPane = (JScrollPane)container;
         vsbPolicy = scrollPane.getVerticalScrollBarPolicy();
         hsbPolicy = scrollPane.getHorizontalScrollBarPolicy();
 
         // BH -- this was a problem when the scrollpane was in a split pane in SetXMLControlElement test OSP
-        Insets insets = new Insets(0,0,0,0);//
-        // parent.getInsets(); because these are interior?
+        Insets insets = //new Insets(0,0,0,0);//
+        container.getInsets(); 
+        //because these are interior?
         int prefWidth = insets.left + insets.right;
         int prefHeight = insets.top + insets.bottom;
 
@@ -512,7 +513,7 @@ public Dimension preferredLayoutSize(Container parent)
 
         Border viewportBorder = scrollPane.getViewportBorder();
         if (viewportBorder != null) {
-            Insets vpbInsets = viewportBorder.getBorderInsets(parent);
+            Insets vpbInsets = viewportBorder.getBorderInsets(container);
             prefWidth += vpbInsets.left + vpbInsets.right;
             prefHeight += vpbInsets.top + vpbInsets.bottom;
         }
