Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlena Laskavaia2016-07-26 12:35:06 -0400
committerGerrit Code Review @ Eclipse.org2016-09-07 12:35:38 -0400
commitbb01906828d12cfbf440ed83139c7fa32fc1a66d (patch)
tree83c573a32efd2ad8ba2bb8985a50c59648e132b2
parent16c4e9af52609ae9db09beca97a11c182fb7890f (diff)
downloadorg.eclipse.cdt-cdt_9_0.tar.gz
org.eclipse.cdt-cdt_9_0.tar.xz
org.eclipse.cdt-cdt_9_0.zip
fixed NPEcdt_9_0
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/BuildConsolePage.java10
1 files 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 b576ccb110..936780cf1f 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<String, IAction> fGlobalActions = new HashMap<String, IAction>(10);
- private List<String> fSelectionActions = new ArrayList<String>(3);
+ private Map<String, IAction> fGlobalActions = new HashMap<>(10);
+ private List<String> 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);
+ }
}
/**

Back to the top