From 57d4081355adfe6a89f4a0dc741bcef20c00f130 Mon Sep 17 00:00:00 2001 From: Andrew Gvozdev Date: Wed, 13 Apr 2011 21:41:16 +0000 Subject: [PATCH] bug 342640: a helpful message --- .../eclipse/cdt/internal/ui/buildconsole/CBuildConsole.java | 4 ++++ .../eclipse/cdt/internal/ui/buildconsole/ConsoleMessages.java | 1 + .../cdt/internal/ui/buildconsole/ConsoleMessages.properties | 1 + 3 files changed, 6 insertions(+) diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/CBuildConsole.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/CBuildConsole.java index 3099e08da07..fb493943578 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/CBuildConsole.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/CBuildConsole.java @@ -13,6 +13,7 @@ package org.eclipse.cdt.internal.ui.buildconsole; import java.net.URL; import org.eclipse.core.resources.IProject; +import org.eclipse.core.runtime.Assert; import org.eclipse.core.runtime.CoreException; import org.eclipse.cdt.core.ConsoleOutputStream; @@ -57,14 +58,17 @@ public class CBuildConsole implements ICConsole { * @see org.eclipse.cdt.core.resources.IConsole#getOutputStream() */ public ConsoleOutputStream getOutputStream() throws CoreException { + Assert.isNotNull(project, ConsoleMessages.CBuildConsole_Console_Must_Be_Started_First); return fConsoleManager.getConsole(project).getOutputStream(); } public ConsoleOutputStream getInfoStream() throws CoreException { + Assert.isNotNull(project, ConsoleMessages.CBuildConsole_Console_Must_Be_Started_First); return fConsoleManager.getConsole(project).getInfoStream(); } public ConsoleOutputStream getErrorStream() throws CoreException { + Assert.isNotNull(project, ConsoleMessages.CBuildConsole_Console_Must_Be_Started_First); return fConsoleManager.getConsole(project).getErrorStream(); } } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/ConsoleMessages.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/ConsoleMessages.java index a144869ee3b..a30e5a559c7 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/ConsoleMessages.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/ConsoleMessages.java @@ -35,6 +35,7 @@ public final class ConsoleMessages extends NLS { public static String PreviousErrorAction_Tooltip; public static String NextErrorAction_Tooltip; public static String ShowErrorAction_Tooltip; + public static String CBuildConsole_Console_Must_Be_Started_First; public static String CopyLog_ActionTooltip; public static String CopyLog_BuildNotLogged; public static String CopyLog_ChooseDestination; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/ConsoleMessages.properties b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/ConsoleMessages.properties index 352bc5389ab..cc5b5321978 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/ConsoleMessages.properties +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/ConsoleMessages.properties @@ -22,6 +22,7 @@ BuildConsolePage_Copy_7=Copy BuildConsolePage_Select__All_Ctrl_A_12=Select &All@Ctrl+A BuildConsolePage_Select_All=Select All +CBuildConsole_Console_Must_Be_Started_First=Build Console must be started with a specific project before being used. CopyLog_ActionTooltip=Copy Build Log CopyLog_BuildNotLogged=No build was logged. Build the project or/and check the Logging page in project properties. CopyLog_ChooseDestination=Choose Log File Destination