Index: java/awt/FontMetrics.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/awt/FontMetrics.java,v
retrieving revision 1.15
diff -u -r1.15 FontMetrics.java
--- java/awt/FontMetrics.java	17 Aug 2005 09:05:58 -0000	1.15
+++ java/awt/FontMetrics.java	17 Aug 2005 13:44:01 -0000
@@ -193,8 +193,7 @@
    */
   public int charWidth(int ch)
   {
-    char[] chars = Character.toChars(ch);
-    return charsWidth(chars, 0, chars.length);
+    return charWidth((char) ch);
   }
 
   /**
Index: javax/swing/tree/DefaultTreeCellRenderer.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/tree/DefaultTreeCellRenderer.java,v
retrieving revision 1.16
diff -u -r1.16 DefaultTreeCellRenderer.java
--- javax/swing/tree/DefaultTreeCellRenderer.java	9 Aug 2005 18:18:44 -0000	1.16
+++ javax/swing/tree/DefaultTreeCellRenderer.java	17 Aug 2005 13:44:03 -0000
@@ -391,7 +391,7 @@
       this.selected = selected;
       this.hasFocus = hasFocus;
       setHorizontalAlignment(LEFT);
-      setOpaque(false);
+      setOpaque(true);
       setVerticalAlignment(TOP);
       setEnabled(true);
       super.setFont(UIManager.getLookAndFeelDefaults().getFont("Tree.font"));
@@ -400,13 +400,13 @@
 		{
 			super.setBackground(getBackgroundSelectionColor());
 			setForeground(getTextSelectionColor());
-      setBorder(UIManager.getLookAndFeelDefaults().getBorder("Tree.selectionBorder"));
+            setBorder(UIManager.getLookAndFeelDefaults().getBorder("Tree.selectionBorder"));
 		}
 		else
 		{
 			super.setBackground(getBackgroundNonSelectionColor());
 			setForeground(getTextNonSelectionColor());
-      setBorder(UIManager.getLookAndFeelDefaults().getBorder("Tree.nonSelectionBorder"));
+            setBorder(UIManager.getLookAndFeelDefaults().getBorder("Tree.nonSelectionBorder"));
 		}
 
 		return this;