From 362106a8ac9b8f9a962ecdbbf212dedf2c33211b Mon Sep 17 00:00:00 2001 From: Sebastian Zarnekow Date: Mon, 21 Jan 2013 11:52:41 +0100 Subject: [PATCH] [diagnostics] NPE guards in AbstractDiagnostic --- .../xtext/diagnostics/AbstractDiagnostic.java | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/diagnostics/AbstractDiagnostic.java b/plugins/org.eclipse.xtext/src/org/eclipse/xtext/diagnostics/AbstractDiagnostic.java index 80f07e06d..f6ac185a7 100644 --- a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/diagnostics/AbstractDiagnostic.java +++ b/plugins/org.eclipse.xtext/src/org/eclipse/xtext/diagnostics/AbstractDiagnostic.java @@ -24,11 +24,17 @@ public abstract class AbstractDiagnostic implements Diagnostic { public abstract String[] getData(); public int getLength() { - return getNode().getLength(); + INode node = getNode(); + if (node != null) + return node.getLength(); + return 1; } public int getOffset() { - return getNode().getOffset(); + INode node = getNode(); + if (node != null) + return node.getOffset(); + return 0; } public int getColumn() { @@ -36,7 +42,10 @@ public abstract class AbstractDiagnostic implements Diagnostic { } public int getLine() { - return getNode().getStartLine(); + INode node = getNode(); + if (node != null) + return node.getStartLine(); + return -1; } public String getLocation() {