? a.diff
Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.3863
diff -u -r1.3863 ChangeLog
--- ChangeLog	17 Jun 2005 11:53:50 -0000	1.3863
+++ ChangeLog	17 Jun 2005 14:16:55 -0000
@@ -1,3 +1,11 @@
+
+2005-06-17  Lillian Angel  <address@hidden>
+
+        * javax/swing/JScrollPane.java
+	(JScrollPane): Viewport was not being set when 
+	the view was null. Whenever a view would be added to container it
+	would not appear. This was changed to use setViewportView.
+
 2005-06-17  Anthony Balkissoon  <address@hidden>
 
 	* javax/swing/JApplet.java,
@@ -235,6 +243,7 @@
 	(createDefaultDivider): Implemented new method. This creates
 	the Metal divider for JSplitPane.
 
+>>>>>>> 1.3863
 2005-06-13  Roman Kennke  <address@hidden>
 
 	* javax/swing/JSpinner.java
Index: javax/swing/JScrollPane.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/JScrollPane.java,v
retrieving revision 1.20
diff -u -r1.20 JScrollPane.java
--- javax/swing/JScrollPane.java	14 Jun 2005 22:29:45 -0000	1.20
+++ javax/swing/JScrollPane.java	17 Jun 2005 14:17:00 -0000
@@ -588,9 +588,7 @@
     setVerticalScrollBar(createVerticalScrollBar());
     setHorizontalScrollBarPolicy(hsbPolicy);
     setHorizontalScrollBar(createHorizontalScrollBar());
-    viewport = createViewport();
-    if (view != null)
-      viewport.setView(view);
+	setViewportView(view);
     setLayout(new ScrollPaneLayout());
     setOpaque(false);
     updateUI();