From a346c5d21d0754eb9773be8bcb30b02e640bfe94 Mon Sep 17 00:00:00 2001 From: Pavel Porvatov Date: Mon, 7 Nov 2011 16:50:41 +0400 Subject: [PATCH] 7080203: JTree.getSelectionPaths() now returns empty array instead of null Reviewed-by: malenkov --- jdk/src/share/classes/javax/swing/JTree.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/jdk/src/share/classes/javax/swing/JTree.java b/jdk/src/share/classes/javax/swing/JTree.java index 13a40562ebe..c5ca4b6dc70 100644 --- a/jdk/src/share/classes/javax/swing/JTree.java +++ b/jdk/src/share/classes/javax/swing/JTree.java @@ -1838,7 +1838,9 @@ public class JTree extends JComponent implements Scrollable, Accessible * nodes, or null if nothing is currently selected */ public TreePath[] getSelectionPaths() { - return getSelectionModel().getSelectionPaths(); + TreePath[] selectionPaths = getSelectionModel().getSelectionPaths(); + + return (selectionPaths != null && selectionPaths.length > 0) ? selectionPaths : null; } /**