EditingComponent in TreeCellEditor 1.2 to 1.5

Question

I have inherited some code and am faced with making a few changes and making sure it works with 1.5. It currently works with 1.2. I have a custom DefaultTreeCellEditor as shown below in part. In 1.5 editingComponent is null, so of course the call to addKeyListener fails. Whereas in 1.2 it is not. Looking at the source for DefaultTreeCellEditor I see that editingComponent gets set in DefaultTreeCellEditor.getTreeCellEditorComponent. So it appears that getTreeCellEditorComponent is not being called in 1.5. This Bug, http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=4280388, mentions getTreeCellEditorComponent, but I have not been able to figure out what I need to do, or stop doing, in order to have getTreeCellEditorComponent called for me.
Any help would be appreciated.
class SetupTreeCellEditor extends DefaultTreeCellEditor implements SetupEditorResources
  private static CellFocusListener  cellFocusHandler;
  private static CellKeyListener    cellKeyHandler;
  private static boolean            isEditingStopped = false;
  private static DefinitionCell     definitionCell;
  private static DefinitionNode     editingNode;
  private static String             oldCellName;
  private static String             newCellName;
  SetupTreeCellEditor(JTree tree, DefaultTreeCellRenderer cellRenderer)
    super(tree, cellRenderer);
    cellFocusHandler = new CellFocusListener();
    cellKeyHandler = new CellKeyListener();
  public boolean isCellEditable( EventObject event )
    DefinitionNode node = (DefinitionNode)tree.getLastSelectedPathComponent();
    if ( node == null )
      node = (DefinitionNode)tree.getModel().getRoot();
    return (node.isEditableNode() ? super.isCellEditable(event) : false);
  protected void prepareForEditing()
    super.prepareForEditing();
    editingNode = (DefinitionNode)tree.getLastSelectedPathComponent();
    definitionCell = editingNode.getDefinitionCell();
    oldCellName = definitionCell.getCellName();
    editingComponent.addKeyListener(cellKeyHandler);
    editingComponent.addFocusListener(cellFocusHandler);
    isEditingStopped = false;
.......snip........

Answer 1

This post http://forum.java.sun.com/thread.jspa?forumID=57&threadID=404172 indicates that getTreeCellEditorComponent will not be called unitl isCellEditable returns true. But isCellEditiable is what calls prepareForEditing.
The effort of getting a cell into edit mode, that is the clicks it takes to get there, runs through this code several times until edit conditions are right. One such condition is the existance of a valid editingComponent. So a if (editingComponent != null) wrapper was necessary to solve my problem.
The larger question remains though. What changed from 1.2 to 1.5 that made this necessary? And perhaps further, is prepareForEditing really the right place to add liteners to the editingComponent. A few more things to think about.... getTreeCellEditorComponent doesn't return the editingComponent rather it returns an instance of EditorContainer which contains editingComponent. And, both getTreeCellEditorComponent and isCellEditiable call prepareForEditing. That doesn't seem right, alas I haven't scoured the details.