/[classpath]/classpath/javax/swing/plaf/basic/BasicTreeUI.java
ViewVC logotype

Diff of /classpath/javax/swing/plaf/basic/BasicTreeUI.java

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.48 by langel, Mon Jul 25 17:37:48 2005 UTC revision 1.49 by langel, Thu Jul 28 19:37:54 2005 UTC
# Line 588  public class BasicTreeUI Line 588  public class BasicTreeUI
588           TreeModel mod = tree.getModel();           TreeModel mod = tree.getModel();
589           DefaultMutableTreeNode root = (DefaultMutableTreeNode) mod.getRoot();           DefaultMutableTreeNode root = (DefaultMutableTreeNode) mod.getRoot();
590           if (!tree.isRootVisible()           if (!tree.isRootVisible()
591                 && tree.isExpanded(new TreePath(((DefaultMutableTreeNode) root)                 && tree.isExpanded(new TreePath(root)))
                      .getPath())))  
592              root = root.getNextNode();              root = root.getNextNode();
593    
594           Point loc = getCellLocation(0, 0, tree, mod, cell, root);           Point loc = getCellLocation(0, 0, tree, mod, cell, root);
# Line 973  public class BasicTreeUI Line 972  public class BasicTreeUI
972        tree.removeKeyListener(keyListener);        tree.removeKeyListener(keyListener);
973        tree.removePropertyChangeListener(selectionModelPropertyChangeListener);        tree.removePropertyChangeListener(selectionModelPropertyChangeListener);
974        tree.removeComponentListener(componentListener);        tree.removeComponentListener(componentListener);
       tree.getCellEditor().removeCellEditorListener(cellEditorListener);  
975        tree.removeTreeExpansionListener(treeExpansionListener);        tree.removeTreeExpansionListener(treeExpansionListener);
976        tree.getModel().removeTreeModelListener(treeModelListener);        
977          TreeCellEditor tce = tree.getCellEditor();
978          if (tce != null)
979             tce.removeCellEditorListener(cellEditorListener);
980          TreeModel tm = tree.getModel();
981          if (tm != null)
982             tm.removeTreeModelListener(treeModelListener);
983     }     }
984    
985     /**     /**
# Line 1179  public class BasicTreeUI Line 1183  public class BasicTreeUI
1183        tree = (JTree) c;        tree = (JTree) c;
1184        setModel(tree.getModel());        setModel(tree.getModel());
1185        tree.setRootVisible(true);        tree.setRootVisible(true);
1186        tree.expandPath(new TreePath(((DefaultMutableTreeNode)        tree.expandPath(new TreePath(tree.getModel().getRoot()));
             (tree.getModel()).getRoot()).getPath()));  
1187        treeSelectionModel = tree.getSelectionModel();        treeSelectionModel = tree.getSelectionModel();
1188        installListeners();        installListeners();
1189        installKeyboardActions();        installKeyboardActions();
# Line 1233  public class BasicTreeUI Line 1236  public class BasicTreeUI
1236        Object root = mod.getRoot();        Object root = mod.getRoot();
1237                
1238        if (!tree.isRootVisible())        if (!tree.isRootVisible())
1239           tree.expandPath(new TreePath(((DefaultMutableTreeNode) root)           tree.expandPath(new TreePath(root));
                .getPath()));  
1240                
1241        paintRecursive(g, 0, 0, 0, 0, tree, mod, root);        paintRecursive(g, 0, 0, 0, 0, tree, mod, root);
1242                
# Line 1299  public class BasicTreeUI Line 1301  public class BasicTreeUI
1301     public Dimension getPreferredSize(JComponent c, boolean checkConsistancy)     public Dimension getPreferredSize(JComponent c, boolean checkConsistancy)
1302     {     {
1303        // FIXME: checkConsistancy not implemented, c not used        // FIXME: checkConsistancy not implemented, c not used
1304        DefaultMutableTreeNode node = ((DefaultMutableTreeNode) (tree.getModel())        TreeNode node = ((TreeNode) (tree.getModel())
1305              .getRoot());              .getRoot());
1306        int maxWidth = 0;        int maxWidth = 0;
1307        int count = 0;        int count = 0;
# Line 1309  public class BasicTreeUI Line 1311  public class BasicTreeUI
1311           while (node != null)           while (node != null)
1312           {           {
1313              count++;              count++;
1314              DefaultMutableTreeNode nextNode = getNextVisibleNode(node);              DefaultMutableTreeNode nextNode = getNextVisibleNode(
1315                      new DefaultMutableTreeNode(node));
1316              if (nextNode != null)              if (nextNode != null)
1317                 maxWidth = Math.max(maxWidth, (int) (getCellBounds(0, 0, nextNode)                 maxWidth = Math.max(maxWidth, (int) (getCellBounds(0, 0, nextNode)
1318                       .getWidth()));                       .getWidth()));
1319              node = nextNode;              node = nextNode;
1320           }           }
1321        }        }
         
1322        return new Dimension(maxWidth, (getRowHeight() * count));        return new Dimension(maxWidth, (getRowHeight() * count));
1323     }     }
1324    
# Line 2507  public class BasicTreeUI Line 2509  public class BasicTreeUI
2509           Font f = tree.getFont();           Font f = tree.getFont();
2510           FontMetrics fm = tree.getToolkit().getFontMetrics(tree.getFont());           FontMetrics fm = tree.getToolkit().getFontMetrics(tree.getFont());
2511    
2512           return new Rectangle(x, y, SwingUtilities.computeStringWidth(fm, s) + 4,           if (s != null)
2513                 fm.getHeight());              return new Rectangle(x, y, SwingUtilities.computeStringWidth(fm, s) + 4,
2514                      fm.getHeight());
2515        }        }
2516        return null;        return new Rectangle(x, y, 0, 0);
2517     }     }
2518        
2519     /**     /**
# Line 2533  public class BasicTreeUI Line 2536  public class BasicTreeUI
2536        int rowHeight = getRowHeight();        int rowHeight = getRowHeight();
2537        if (startNode == null || startNode.equals(node))        if (startNode == null || startNode.equals(node))
2538        {        {
2539           if (!tree.isRootVisible() && tree.isExpanded(new TreePath((           if (!tree.isRootVisible() && tree.isExpanded(new TreePath(mod.getRoot())))
                (DefaultMutableTreeNode) mod.getRoot()).getPath())))  
2540              return new Point(x + ((((DefaultMutableTreeNode) node).getLevel())              return new Point(x + ((((DefaultMutableTreeNode) node).getLevel())
2541                    * rightChildIndent), y);                    * rightChildIndent), y);
2542                    

Legend:
Removed from v.1.48  
changed lines
  Added in v.1.49

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26