jdk-sandbox: comparison jdk/src/java.desktop/share/classes/javax/swing/JTree.java

equal deleted inserted replaced

-:86a1284f1128
+:f9edd0824de6
 /*
-* Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 *
 * This code is free software; you can redistribute it and/or modify it
 * under the terms of the GNU General Public License version 2 only, as
 * published by the Free Software Foundation.  Oracle designates this
 if(treeModel != null) {
 if(treeModelListener == null)
 treeModelListener = createTreeModelListener();
 if(treeModelListener != null)
 treeModel.addTreeModelListener(treeModelListener);
 // Mark the root as expanded, if it isn't a leaf.
-if(treeModel.getRoot() != null &&
+Object treeRoot = treeModel.getRoot();
-!treeModel.isLeaf(treeModel.getRoot())) {
+if(treeRoot != null &&
-expandedState.put(new TreePath(treeModel.getRoot()),
+!treeModel.isLeaf(treeRoot)) {
-Boolean.TRUE);
+expandedState.put(new TreePath(treeRoot),
+Boolean.TRUE);
 }
 }
 firePropertyChange(TREE_MODEL_PROPERTY, oldModel, treeModel);
 invalidate();
 }
 /**
 * Expands the root path, assuming the current TreeModel has been set.
 */
 private void expandRoot() {
-TreeModel              model = getModel();
+TreeModel   model = getModel();
 if(model != null && model.getRoot() != null) {
 expandPath(new TreePath(model.getRoot()));
 }
 }
 if(model == null)
 return null;
 int          count = indexs.length;
 Object       parent = model.getRoot();
+if (parent == null)
+return null;
 TreePath     parentPath = new TreePath(parent);
 for(int counter = 0; counter < count; counter++) {
 parent = model.getChild(parent, indexs[counter]);
 if(parent == null)
 return null;
 parentPath = parentPath.pathByAddingChild(parent);
 return;
 if (parent.getPathCount() == 1) {
 // New root, remove everything!
 clearToggledPaths();
-if(treeModel.getRoot() != null &&
-!treeModel.isLeaf(treeModel.getRoot())) {
+Object treeRoot = treeModel.getRoot();
+if(treeRoot != null &&
+!treeModel.isLeaf(treeRoot)) {
 // Mark the root as expanded, if it isn't a leaf.
 expandedState.put(parent, Boolean.TRUE);
 }
 }
 else if(expandedState.get(parent) != null) {
 // and then get the renderer component and return it
 TreeModel model = JTree.this.getModel();
 if (model == null) {
 return null;
 }
-TreePath path = new TreePath(model.getRoot());
+Object treeRoot = model.getRoot();
+if (treeRoot == null) {
+return null;
+}
+TreePath path = new TreePath(treeRoot);
 if (JTree.this.isVisible(path)) {
 TreeCellRenderer r = JTree.this.getCellRenderer();
 TreeUI ui = JTree.this.getUI();
 if (ui != null) {
 int row = ui.getRowForPath(JTree.this, path);
 && (lsr == row);
 boolean selected = JTree.this.isPathSelected(path);
 boolean expanded = JTree.this.isExpanded(path);
 return r.getTreeCellRendererComponent(JTree.this,
-model.getRoot(), selected, expanded,
+treeRoot, selected, expanded,
-model.isLeaf(model.getRoot()), row, hasFocus);
+model.isLeaf(treeRoot), row, hasFocus);
 }
 }
 return null;
 }
 }
 if (isRootVisible()) {
 return 1;    // the root node
 }
+Object treeRoot = model.getRoot();
+if (treeRoot == null)
+return 0;
 // return the root's first set of children count
-return model.getChildCount(model.getRoot());
+return model.getChildCount(treeRoot);
 }
 /**
 * Return the nth Accessible child of the object.
 *
 public Accessible getAccessibleChild(int i) {
 TreeModel model = JTree.this.getModel();
 if (model == null) {
 return null;
 }
+Object treeRoot = model.getRoot();
+if (treeRoot == null) {
+return null;
+}
 if (isRootVisible()) {
 if (i == 0) {    // return the root node Accessible
-Object[] objPath = { model.getRoot() };
+Object[] objPath = { treeRoot };
 TreePath path = new TreePath(objPath);
 return new AccessibleJTreeNode(JTree.this, path, JTree.this);
 } else {
 return null;
 }
 }
 // return Accessible for one of root's child nodes
-int count = model.getChildCount(model.getRoot());
+int count = model.getChildCount(treeRoot);
 if (i < 0 || i >= count) {
 return null;
 }
-Object obj = model.getChild(model.getRoot(), i);
+Object obj = model.getChild(treeRoot, i);
-Object[] objPath = { model.getRoot(), obj };
+if (obj == null)
+return null;
+Object[] objPath = {treeRoot, obj };
 TreePath path = new TreePath(objPath);
 return new AccessibleJTreeNode(JTree.this, path, JTree.this);
 }
 /**
 * @return the number of items currently selected.
 */
 public int getAccessibleSelectionCount() {
 Object[] rootPath = new Object[1];
 rootPath[0] = treeModel.getRoot();
+if (rootPath[0] == null)
+return 0;
 TreePath childPath = new TreePath(rootPath);
 if (JTree.this.isPathSelected(childPath)) {
 return 1;
 } else {
 return 0;
 public Accessible getAccessibleSelection(int i) {
 // The JTree can have only one accessible child, the root.
 if (i == 0) {
 Object[] rootPath = new Object[1];
 rootPath[0] = treeModel.getRoot();
+if (rootPath[0] == null)
+return null;
 TreePath childPath = new TreePath(rootPath);
 if (JTree.this.isPathSelected(childPath)) {
 return new AccessibleJTreeNode(JTree.this, childPath, JTree.this);
 }
 }
 public boolean isAccessibleChildSelected(int i) {
 // The JTree can have only one accessible child, the root.
 if (i == 0) {
 Object[] rootPath = new Object[1];
 rootPath[0] = treeModel.getRoot();
+if (rootPath[0] == null)
+return false;
 TreePath childPath = new TreePath(rootPath);
 return JTree.this.isPathSelected(childPath);
 } else {
 return false;
 }
 */
 public void addAccessibleSelection(int i) {
 TreeModel model = JTree.this.getModel();
 if (model != null) {
 if (i == 0) {
 Object[] objPath = {model.getRoot()};
+if (objPath[0] == null)
+return;
 TreePath path = new TreePath(objPath);
 JTree.this.addSelectionPath(path);
 }
 }
 }
 public void removeAccessibleSelection(int i) {
 TreeModel model = JTree.this.getModel();
 if (model != null) {
 if (i == 0) {
 Object[] objPath = {model.getRoot()};
+if (objPath[0] == null)
+return;
 TreePath path = new TreePath(objPath);
 JTree.this.removeSelectionPath(path);
 }
 }
 }
 */
 public void selectAllAccessibleSelection() {
 TreeModel model = JTree.this.getModel();
 if (model != null) {
 Object[] objPath = {model.getRoot()};
+if (objPath[0] == null)
+return;
 TreePath path = new TreePath(objPath);
 JTree.this.addSelectionPath(path);
 }
 }

changeset 29250	f9edd0824de6
parent 28059	e576535359cc
child 31657	6b5f36a9a3c0