java2script
diff --git a/‎sources/net.sf.j2s.java.core/src/javax/swing/CellRendererPane.java‎
Lines changed: 3 additions & 7 deletions b/‎sources/net.sf.j2s.java.core/src/javax/swing/CellRendererPane.java‎
Lines changed: 3 additions & 7 deletions
diff --git a/‎sources/net.sf.j2s.java.core/src/javax/swing/DefaultCellEditor.java‎
Lines changed: 6 additions & 5 deletions b/‎sources/net.sf.j2s.java.core/src/javax/swing/DefaultCellEditor.java‎
Lines changed: 6 additions & 5 deletions
diff --git a/‎sources/net.sf.j2s.java.core/src/javax/swing/DefaultListCellRenderer.java‎
Lines changed: 4 additions & 5 deletions b/‎sources/net.sf.j2s.java.core/src/javax/swing/DefaultListCellRenderer.java‎
Lines changed: 4 additions & 5 deletions
diff --git a/‎sources/net.sf.j2s.java.core/src/javax/swing/DefaultListModel.java‎
Lines changed: 1 addition & 1 deletion b/‎sources/net.sf.j2s.java.core/src/javax/swing/DefaultListModel.java‎
Lines changed: 1 addition & 1 deletion
@@ -106,13 +106,9 @@ public void update(Graphics g) { }
      * renderer components (CellRendererPane doesn't paint anyway).<
      */
     @Override
-		protected Component addImpl(Component x, Object constraints, int index) {
-        if (x.getParent() == this) {
-            return null;
-        }
-        else {
-            return addImplCont(x, constraints, index);
-        }
+		protected void addImpl(Component x, Object constraints, int index) {
+        if (x.getParent() != this)
+        	addImplCont(x, constraints, index);
     }
 
 
 
@@ -40,6 +40,7 @@
 import javax.swing.table.TableCellRenderer;
 import javax.swing.tree.TreeCellEditor;
 
+import swingjs.plaf.CellHolder;
 import swingjs.plaf.JSComponentUI;
 
 /**
@@ -105,11 +106,6 @@ public Object getCellEditorValue() {
         textField.addActionListener(delegate);
     }
 
-    private void setComponent(JComponent comp) {
-        editorComponent = comp;
-		((JSComponentUI) (Object) comp.getUI()).setRenderer(comp, 0, 0);
-	}
-
 	/**
      * Constructs a <code>DefaultCellEditor</code> object that uses a check box.
      *
@@ -424,4 +420,9 @@ public void itemStateChanged(ItemEvent e) {
         }
     }
 
+    private void setComponent(JComponent comp) {
+        CellHolder.setJ2SRendererComponent(editorComponent = comp);
+	}
+
+
 } // End of class JCellEditor
@@ -35,7 +35,6 @@
 import javax.swing.border.EmptyBorder;
 
 import sun.swing.DefaultLookup;
-import swingjs.plaf.JSComponentUI;
 
 
 /**
@@ -94,9 +93,9 @@ public DefaultListCellRenderer() {
         setOpaque(true);
         setBorder(getNoFocusBorder());
         setName("List.cellRenderer");
-        // JavaScript is a little slow on painting selection backgrounds, so we instead 
-        // set the background using CSS
-        ((JSComponentUI)getUI()).setAllowPaintedBackground(false);
+//        // JavaScript is a little slow on painting selection backgrounds, so we instead 
+//        // set the background using CSS
+//        ((JSComponentUI)getUI()).setAllowPaintedBackground(false);
     }
 
     private Border getNoFocusBorder() {
@@ -158,7 +157,7 @@ public JComponent getListCellRendererComponent(
 
         setEnabled(list.isEnabled());
         setFont(list.getFont());
-
+        getUI().setFont(getFont()); // SwingJS because propertyChangeListener is shut down.
         Border border = null;
         if (cellHasFocus) {
             if (isSelected) {
 
@@ -538,7 +538,7 @@ public void removeRange(int fromIndex, int toIndex) {
         fireIntervalRemoved(this, fromIndex, toIndex);
     }
 
-    /*
+    /*  (commented out in JDK8)
     public void addAll(Collection c) {
     }
Original file line number	Diff line number	Diff line change
`@@ -40,6 +40,7 @@`
`40`	`40`	`import javax.swing.table.TableCellRenderer;`
`41`	`41`	`import javax.swing.tree.TreeCellEditor;`
`42`	`42`
	`43`	`+import swingjs.plaf.CellHolder;`
`43`	`44`	`import swingjs.plaf.JSComponentUI;`
`44`	`45`
`45`	`46`	`/**`
`@@ -105,11 +106,6 @@ public Object getCellEditorValue() {`
`105`	`106`	`textField.addActionListener(delegate);`
`106`	`107`	`}`
`107`	`108`
`108`		`- private void setComponent(JComponent comp) {`
`109`		`- editorComponent = comp;`
`110`		`- ((JSComponentUI) (Object) comp.getUI()).setRenderer(comp, 0, 0);`
`111`		`- }`
`112`		`-`
`113`	`109`	`/**`
`114`	`110`	`* Constructs a <code>DefaultCellEditor</code> object that uses a check box.`
`115`	`111`	`*`
`@@ -424,4 +420,9 @@ public void itemStateChanged(ItemEvent e) {`
`424`	`420`	`}`
`425`	`421`	`}`
`426`	`422`
	`423`	`+ private void setComponent(JComponent comp) {`
	`424`	`+ CellHolder.setJ2SRendererComponent(editorComponent = comp);`
	`425`	`+ }`
	`426`	`+`
	`427`	`+`
`427`	`428`	`} // End of class JCellEditor`
Original file line number	Diff line number	Diff line change
`@@ -538,7 +538,7 @@ public void removeRange(int fromIndex, int toIndex) {`
`538`	`538`	`fireIntervalRemoved(this, fromIndex, toIndex);`
`539`	`539`	`}`
`540`	`540`
`541`		`- /*`
	`541`	`+ /* (commented out in JDK8)`
`542`	`542`	`public void addAll(Collection c) {`
`543`	`543`	`}`
`544`	`544`