From: Robin Rosenberg Date: Mon, 07 May 2007 21:29:34 GMT Subject: [EGIT PATCH 04/10] Bug: Do not crash when showing diff for first version of a file Message-ID: <20070507212933.21546.44917.stgit@lathund.dewire.com> In-Reply-To: <20070507212636.21546.29280.stgit@lathund.dewire.com> We crashed because the right side did not contain any information Signed-off-by: Robin Rosenberg --- .../spearce/egit/ui/internal/GitResourceNode.java | 28 ++++++++++++++--------- 1 files changed, 17 insertions(+), 11 deletions(-) diff --git a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/GitResourceNode.java b/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/GitResourceNode.java index bdf8902..010b738 100644 --- a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/GitResourceNode.java +++ b/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/GitResourceNode.java @@ -70,7 +70,10 @@ public class GitResourceNode extends BufferedContent implements IStructureCompar } public String getName() { - return entry.getFullName(); + if (entry != null) + return entry.getFullName(); + else + return ""; } public Image getImage() { @@ -81,16 +84,19 @@ public class GitResourceNode extends BufferedContent implements IStructureCompar if (entry instanceof Tree) return ITypedElement.FOLDER_TYPE; else { - String name = entry.getName(); - if (name != null) { - int index = name.lastIndexOf('.'); - if (index == -1) - return ""; //$NON-NLS-1$ - if (index == (name.length() - 1)) - return ""; //$NON-NLS-1$ - return name.substring(index + 1); - } - return ""; + if (entry != null) { + String name = entry.getName(); + if (name != null) { + int index = name.lastIndexOf('.'); + if (index == -1) + return ""; //$NON-NLS-1$ + if (index == (name.length() - 1)) + return ""; //$NON-NLS-1$ + return name.substring(index + 1); + } + return ""; + } else + return ""; } }