1 files changed, 8 insertions, 9 deletions
diff --git a/libjava/classpath/javax/swing/table/DefaultTableCellRenderer.java b/libjava/classpath/javax/swing/table/DefaultTableCellRenderer.java
index 233528c7d67..0d9b62567f6 100644
--- a/libjava/classpath/javax/swing/table/DefaultTableCellRenderer.java
+++ b/libjava/classpath/javax/swing/table/DefaultTableCellRenderer.java
@@ -127,7 +127,8 @@ public class DefaultTableCellRenderer extends JLabel
    * Get the string value of the object and pass it to setText().
    *
    * @param table the JTable
-   * @param value the value of the object
+   * @param value the value of the object. For the text content,
+   *        null is rendered as an empty cell.
    * @param isSelected is the cell selected?
    * @param hasFocus has the cell the focus?
    * @param row the row to render
@@ -140,13 +141,7 @@ public class DefaultTableCellRenderer extends JLabel
                                                  boolean hasFocus,
                                                  int row, int column)
   {
-    if (value != null)
-      {
-        if (value instanceof JTextField)
-          return new JTextField(((JTextField)value).getText());
-        super.setText(value.toString());
-      }
-
+    setValue(value);
     setOpaque(true);
 
     if (table == null)
@@ -274,6 +269,10 @@ public class DefaultTableCellRenderer extends JLabel
    */
   protected void setValue(Object value)
   {
-    super.setText((value!=null) ? value.toString() : "");
+    if (value != null)
+      setText(value.toString());
+    else
+      // null is rendered as an empty cell.
+      setText("");
   }
 }