--- /home/cpdev/src/classpath/javax/swing/JScrollPane.java	2005-07-05 17:33:11.000000000 +0000
+++ javax/swing/JScrollPane.java	2005-06-30 05:35:10.000000000 +0000
@@ -54,9 +54,6 @@
 import javax.swing.plaf.UIResource;
 
 /**
- * A component that embeds another component and enables it to be scrolled
- * both in horizontal and vertical direction.
- *
  * <table>
  * <tr><th>Property                    </th><th>Stored in       </th><th>Bound?</th></tr>
  * <tr><td>columnHeader                </td><td>scrollPane      </td><td>yes   </td></tr>
@@ -567,25 +564,11 @@
   }
 
 
-  /**
-   * Creates a new <code>JScrollPane</code> without a view. The scrollbar
-   * policy is set to {@link #VERTICAL_SCROLLBAR_AS_NEEDED} and
-   * {@link #HORIZONTAL_SCROLLBAR_AS_NEEDED}.
-   *
-   * @param view the component that is embedded inside the JScrollPane
-   */
   public JScrollPane() 
   {
     this(null);
   }
-
-  /**
-   * Creates a new <code>JScrollPane</code> that embeds the specified
-   * <code>view</code> component, displaying vertical and horizontal scrollbars
-   * as needed.
-   *
-   * @param view the component that is embedded inside the JScrollPane
-   */
+    
   public JScrollPane(Component view) 
   {
     this(view, 
@@ -593,40 +576,11 @@
          HORIZONTAL_SCROLLBAR_AS_NEEDED);
   }
 
-  /**
-   * Creates a new <code>JScrollPane</code> without a view; The scrollbar
-   * policies are set to <code>vsbPolicy</code> and <code>hsbPolicy</code>.
-   *
-   * @param vsbPolicy the vertical scrollbar policy to set
-   * @param hsbPolicy the vertical scrollbar policy to set
-   *
-   * @see {@link ScrollPaneConstants#HORIZONTAL_SCROLLBAR_ALWAYS}
-   * @see {@link ScrollPaneConstants#HORIZONTAL_SCROLLBAR_AS_NEEDED}
-   * @see {@link ScrollPaneConstants#HORIZONTAL_SCROLLBAR_NEVER}
-   * @see {@link ScrollPaneConstants#VERTICAL_SCROLLBAR_ALWAYS}
-   * @see {@link ScrollPaneConstants#VERTICAL_SCROLLBAR_AS_NEEDED}
-   * @see {@link ScrollPaneConstants#VERTICAL_SCROLLBAR_NEVER}
-   */
   public JScrollPane(int vsbPolicy, int hsbPolicy) 
   {
     this(null, vsbPolicy, hsbPolicy);
   }
 
-  /**
-   * Creates a new <code>JScrollPane</code> that embeds the specified
-   * <code>view</code> component; The scrollbar
-   * policies are set to <code>vsbPolicy</code> and <code>hsbPolicy</code>.
-   *
-   * @param vsbPolicy the vertical scrollbar policy to set
-   * @param hsbPolicy the vertical scrollbar policy to set
-   *
-   * @see {@link ScrollPaneConstants#HORIZONTAL_SCROLLBAR_ALWAYS}
-   * @see {@link ScrollPaneConstants#HORIZONTAL_SCROLLBAR_AS_NEEDED}
-   * @see {@link ScrollPaneConstants#HORIZONTAL_SCROLLBAR_NEVER}
-   * @see {@link ScrollPaneConstants#VERTICAL_SCROLLBAR_ALWAYS}
-   * @see {@link ScrollPaneConstants#VERTICAL_SCROLLBAR_AS_NEEDED}
-   * @see {@link ScrollPaneConstants#VERTICAL_SCROLLBAR_NEVER}
-   */
   public JScrollPane(Component view, int vsbPolicy, int hsbPolicy) 
   {
     scrollListener = createScrollListener();
@@ -634,11 +588,7 @@
     setVerticalScrollBar(createVerticalScrollBar());
     setHorizontalScrollBarPolicy(hsbPolicy);
     setHorizontalScrollBar(createHorizontalScrollBar());
-    viewport = createViewport();
-    if (view != null)
-      getViewport().setView(view);
-    viewport.addChangeListener(scrollListener);
-    add(viewport,0);
+    setViewportView(view);
     setLayout(new ScrollPaneLayout());
     setOpaque(false);
     updateUI();
@@ -695,8 +645,6 @@
     extends JScrollBar
     implements UIResource
   {
-    private static final long serialVersionUID = -42032395320987283L;
-
     public ScrollBar(int orientation)
     {
       super(orientation);