From 148548b5a317010401a3eba151cf04ead862046b Mon Sep 17 00:00:00 2001 From: Andrey Loskutov Date: Sun, 23 Aug 2015 17:53:19 +0200 Subject: [PATCH] Don't use FileNode objects as parent elements in the tree Bug: 475669 Change-Id: I1795d0145cd61f1894cc115b17794d0626ef0a55 Signed-off-by: Andrey Loskutov --- .../org/eclipse/egit/ui/internal/dialogs/FileTreeContentProvider.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/FileTreeContentProvider.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/FileTreeContentProvider.java index 6c8287d5d..4755c9f74 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/FileTreeContentProvider.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/FileTreeContentProvider.java @@ -275,7 +275,8 @@ public class FileTreeContentProvider implements ITreeContentProvider { String segment = path.segment(i); Node foundNode = null; for (Node node : parentNode.getChildren()) { - if (node.getName().equals(segment)) { + if (node.getName().equals(segment) + && !(node instanceof FileNode)) { foundNode = node; break; } -- 2.11.4.GIT