diff options
author | Dani Megert | 2010-08-24 10:53:20 +0000 |
---|---|---|
committer | Dani Megert | 2010-08-24 10:53:20 +0000 |
commit | a0bf47a2e100c8cb7ab9b633d447a0a2e8a2e354 (patch) | |
tree | 9b1a32115521ee4a3ea76c9c43a5895288fd2d32 | |
parent | 3b3d3e3e26c368cb683063261a7e70c864b0d2de (diff) | |
download | eclipse.platform.text-a0bf47a2e100c8cb7ab9b633d447a0a2e8a2e354.tar.gz eclipse.platform.text-a0bf47a2e100c8cb7ab9b633d447a0a2e8a2e354.tar.xz eclipse.platform.text-a0bf47a2e100c8cb7ab9b633d447a0a2e8a2e354.zip |
Backported fix for bug 268833: [rulers] NullPointerException in org.eclipse.jface.text.source.LineNumberRulerColumn.getWidthr361_v20100825-0800R3_6_2R3_6_1
-rw-r--r-- | org.eclipse.ui.editors/src/org/eclipse/ui/internal/texteditor/LineNumberColumn.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/texteditor/LineNumberColumn.java b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/texteditor/LineNumberColumn.java index fab3d4b0e..90e0aabbd 100644 --- a/org.eclipse.ui.editors/src/org/eclipse/ui/internal/texteditor/LineNumberColumn.java +++ b/org.eclipse.ui.editors/src/org/eclipse/ui/internal/texteditor/LineNumberColumn.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2006, 2008 IBM Corporation and others. + * Copyright (c) 2006, 2010 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 @@ -605,7 +605,7 @@ public class LineNumberColumn extends AbstractContributedRulerColumn implements ((IChangeRulerColumn) column).setModel(model); if (model != null) { ISourceViewer viewer= fViewer; - if (viewer != null && viewer.getAnnotationModel() == null) + if (viewer != null && viewer.getAnnotationModel() == null && column.getControl() != null) viewer.showAnnotations(true); } } |