From bb01906828d12cfbf440ed83139c7fa32fc1a66d Mon Sep 17 00:00:00 2001 From: Alena Laskavaia Date: Tue, 26 Jul 2016 12:35:06 -0400 Subject: [PATCH] fixed NPE Change-Id: I817d227711384551e88fc59c124ffead5284ef06 --- .../cdt/internal/ui/buildconsole/BuildConsolePage.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/BuildConsolePage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/BuildConsolePage.java index b576ccb110d..936780cf1f4 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/BuildConsolePage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/BuildConsolePage.java @@ -50,6 +50,7 @@ import org.eclipse.jface.viewers.ISelectionProvider; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.viewers.SelectionChangedEvent; import org.eclipse.jface.viewers.StructuredSelection; +import org.eclipse.swt.custom.StyledText; import org.eclipse.swt.graphics.Font; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; @@ -122,8 +123,8 @@ public class BuildConsolePage extends Page // actions private ClearOutputAction fClearOutputAction; - private Map fGlobalActions = new HashMap(10); - private List fSelectionActions = new ArrayList(3); + private Map fGlobalActions = new HashMap<>(10); + private List fSelectionActions = new ArrayList<>(3); private CopyBuildLogAction fSaveLogAction; // menus @@ -521,7 +522,10 @@ public class BuildConsolePage extends Page * tab width */ protected void setTabs(int tabs) { - getViewer().getTextWidget().setTabs(tabs); + StyledText textWidget = getViewer().getTextWidget(); + if (textWidget != null) { + textWidget.setTabs(tabs); + } } /**