return new Rectangle(x, y, SwingUtilities.computeStringWidth(fm, s) + 4,
return new Rectangle(x, y, SwingUtilities.computeStringWidth(fm, s) + gap,
  Rectangle getCellBounds(int x, int y, Object cell)  {    if (cell != null)      {        String s = cell.toString();        Font f = tree.getFont();        FontMetrics fm = tree.getToolkit().getFontMetrics(f);        if (s != null)          return new Rectangle(x, y,                               SwingUtilities.computeStringWidth(fm, s) + 4,                               fm.getHeight());      }    return new Rectangle(x, y, 0, 0);  }