diff --git a/core/org.eclipse.cdt.ui/plugin.properties b/core/org.eclipse.cdt.ui/plugin.properties index e358445b590..68ac02e3987 100644 --- a/core/org.eclipse.cdt.ui/plugin.properties +++ b/core/org.eclipse.cdt.ui/plugin.properties @@ -272,8 +272,9 @@ ActionDefinition.showQuickTypeHierarchy.description= Shows quick type hierarchy CElementWorkingSetPage.name = C/C++ -BuildConsoleFontDefinition.description= The C-Build console font is used by the C-Build console -BuildConsoleFontDefinition.label= C-Build Console Text Font +BuildConsole.name=CDT Build Console +BuildConsoleFontDefinition.description= The CDT Build Console font is used by the CDT Build Console +BuildConsoleFontDefinition.label= CDT Build Console Text Font ActionDefinition.GotoNextMember.name = Go to Next Member ActionDefinition.GotoNextMember.description = Move the caret to the next member of the translation unit diff --git a/core/org.eclipse.cdt.ui/plugin.xml b/core/org.eclipse.cdt.ui/plugin.xml index 997e8708b60..58b1a61a2f9 100644 --- a/core/org.eclipse.cdt.ui/plugin.xml +++ b/core/org.eclipse.cdt.ui/plugin.xml @@ -3597,4 +3597,11 @@ + + + + diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/CPluginResources.properties b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/CPluginResources.properties index 2512fc3b999..c227a634a1a 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/CPluginResources.properties +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/CPluginResources.properties @@ -155,7 +155,7 @@ CProjectPropertyPage.closedproject=C information is not available for a closed p # ------- Building ------- -BuildConsole.name=C-Build +BuildConsole.name=CDT Build Console CBuilder.build_error=Could not execute builder "{0}" configured in the project property page. # ------- Properties------- diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/BuildConsoleFactory.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/BuildConsoleFactory.java new file mode 100644 index 00000000000..440a175ea99 --- /dev/null +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/BuildConsoleFactory.java @@ -0,0 +1,30 @@ +/******************************************************************************* + * Copyright (c) 2010 Ericsson 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 + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Ericsson - initial API and implementation + *******************************************************************************/ +package org.eclipse.cdt.internal.ui.buildconsole; + +import org.eclipse.ui.console.IConsoleFactory; + +import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.cdt.ui.IBuildConsoleManager; + +/** + * A console factory to allow the user to open the build console + * before actually doing a build. + */ +public class BuildConsoleFactory implements IConsoleFactory { + public void openConsole() { + IBuildConsoleManager manager = CUIPlugin.getDefault().getConsoleManager(); + if (manager instanceof BuildConsoleManager) { + ((BuildConsoleManager)manager).showConsole(); + } + } + +} 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 a138272f75a..0ef40d27c0e 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 @@ -554,6 +554,8 @@ public class BuildConsolePage extends Page */ void moveToError(int position) { IProject project = getProject(); + if (project == null) return; + IBuildConsoleManager consoleManager = CUIPlugin.getDefault().getConsoleManager(); IConsole console = consoleManager.getConsole(project); if ( console instanceof BuildConsolePartitioner) { 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 996397476b8..64a1f716584 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 @@ -21,7 +21,7 @@ BuildConsolePage_Select__All_Ctrl_A_12=Select &All@Ctrl+A BuildConsolePage_Select_All=Select All CopyLog_ActionTooltip=Copy Build Log -CopyLog_BuildNotLogged=Last build was not logged. Check Logging page in project properties. +CopyLog_BuildNotLogged=No build was logged. Build the project or/and check the Logging page in project properties. CopyLog_ChooseDestination=Choose Log File Destination CopyLog_ErrorCopyingFile=Error Copying a File CopyLog_ErrorWhileCopyingLog=Error while copying working log file: diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/CopyBuildLogAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/CopyBuildLogAction.java index e0aed6a7802..69814d41c2f 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/CopyBuildLogAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/CopyBuildLogAction.java @@ -47,7 +47,7 @@ public class CopyBuildLogAction extends Action { @Override public void run() { IProject project = fConsolePage.getProject(); - if (!project.isAccessible()) + if (project == null || !project.isAccessible()) return; IBuildConsoleManager consoleManager = CUIPlugin.getDefault().getConsoleManager(); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/ShowErrorAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/ShowErrorAction.java index 85822d0805f..51f3ed33c8e 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/ShowErrorAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/ShowErrorAction.java @@ -45,6 +45,8 @@ public class ShowErrorAction extends Action { super.run(); if ( isChecked() ) { IProject project = fConsolePage.getProject(); + if (project == null) return; + IBuildConsoleManager consoleManager = CUIPlugin.getDefault().getConsoleManager(); IConsole console = consoleManager.getConsole(project); if ( console instanceof BuildConsolePartitioner) {