Fixed bug 423705: NPE in JFaceTextUtil.widgetLine2ModelLineI20140123-1600I20140122-2000I20140122-0800I20140121-2000I20140121-0800I20140120-2000I20140120-0800I20140119-2000I20140115-1300I20140114-0800I20140107-0800I20131231-0800I20131224-0800I20131217-0800I20131212-1600I20131211-2000I20131211-0800I20131210-2000

1 files changed, 5 insertions, 1 deletions

diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/JFaceTextUtil.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/JFaceTextUtil.java
index df8d0f9d072..4736386ab0b 100644
--- a/org.eclipse.jface.text/src/org/eclipse/jface/text/JFaceTextUtil.java
+++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/JFaceTextUtil.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2006, 2009 IBM Corporation and others.
+ * Copyright (c) 2006, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -199,6 +199,8 @@ public final class JFaceTextUtil {
 			try {
 				IRegion r= viewer.getVisibleRegion();
 				IDocument d= viewer.getDocument();
+				if (d == null)
+					return -1;
 				modelLine= widgetLine + d.getLineOfOffset(r.getOffset());
 			} catch (BadLocationException x) {
 				modelLine= widgetLine;
@@ -225,6 +227,8 @@ public final class JFaceTextUtil {
 		} else {
 			IRegion region= viewer.getVisibleRegion();
 			IDocument document= viewer.getDocument();
+			if (document == null)
+				return -1;
 			try {
 				int visibleStartLine= document.getLineOfOffset(region.getOffset());
 				int visibleEndLine= document.getLineOfOffset(region.getOffset() + region.getLength());