Attachment 192872 Details for Bug 342069 – patch 2

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] patch 2

patch.txt (text/plain), 22.09 KB, created by Andrew Gvozdev

on 2011-04-08 15:06:27 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Andrew Gvozdev

Created: 2011-04-08 15:06:27 EDT

Size: 22.09 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.cdt.make.core
>Index: src/org/eclipse/cdt/make/core/messages/Messages.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.cdt/all/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/core/messages/Messages.java,v
>retrieving revision 1.3
>diff -u -r1.3 Messages.java
>--- src/org/eclipse/cdt/make/core/messages/Messages.java	8 Feb 2010 02:18:40 -0000	1.3
>+++ src/org/eclipse/cdt/make/core/messages/Messages.java	8 Apr 2011 19:01:54 -0000
>@@ -18,8 +18,9 @@
>  */
> public class Messages extends NLS {
> 	private static final String BUNDLE_NAME = "org.eclipse.cdt.make.core.messages.messages"; //$NON-NLS-1$
>-	public static String SCMarkerGenerator_0;
>-	public static String SCMarkerGenerator_1;
>+	public static String SCMarkerGenerator_Add_Markers;
>+	public static String SCMarkerGenerator_Error_Adding_Markers;
>+	public static String SCMarkerGenerator_Discovery_Options_Page;
> 	static {
> 		// initialize resource bundle
> 		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
>Index: src/org/eclipse/cdt/make/core/messages/messages.properties
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.cdt/all/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/core/messages/messages.properties,v
>retrieving revision 1.2
>diff -u -r1.2 messages.properties
>--- src/org/eclipse/cdt/make/core/messages/messages.properties	18 Mar 2009 17:44:47 -0000	1.2
>+++ src/org/eclipse/cdt/make/core/messages/messages.properties	8 Apr 2011 19:01:54 -0000
>@@ -8,5 +8,6 @@
> # Contributors:
> #     IBM Corporation - initial API and implementation
> ###############################################################################
>-SCMarkerGenerator_0=Add markers to project
>-SCMarkerGenerator_1=Error adding markers.
>+SCMarkerGenerator_Add_Markers=Add Scanner Discovery markers
>+SCMarkerGenerator_Error_Adding_Markers=Error adding markers.
>+SCMarkerGenerator_Discovery_Options_Page=[Discovery Options] page in project properties
>Index: src/org/eclipse/cdt/make/internal/core/MakeMessages.properties
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.cdt/all/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/MakeMessages.properties,v
>retrieving revision 1.16
>diff -u -r1.16 MakeMessages.properties
>--- src/org/eclipse/cdt/make/internal/core/MakeMessages.properties	26 Oct 2010 19:27:02 -0000	1.16
>+++ src/org/eclipse/cdt/make/internal/core/MakeMessages.properties	8 Apr 2011 19:01:54 -0000
>@@ -38,9 +38,11 @@
> 
> ExternalScannerInfoProvider.Provider_Error=Error launching external scanner info generator ({0})
> ExternalScannerInfoProvider.Reading_Specs=Reading specs ... 
>-ExternalScannerInfoProvider.Invoking_Command=Invoking Command: 
>+ExternalScannerInfoProvider.Invoking_Command=Getting built-in compiler specs: 
> ExternalScannerInfoProvider.Parsing_Output=Parsing output ... 
> ExternalScannerInfoProvider.Creating_Markers=Generating markers ... 
>+ExternalScannerInfoProvider.Program_Not_In_Path=Program "{0}" is not found in PATH
>+ExternalScannerInfoProvider.Error_Prefix=Error: 
> 
> ScannerInfoCollector.Processing=Processing discovered scanner configuration ... 
> ScannerInfoCollector.Updating=Updating Scanner Configuration for project 
>Index: src/org/eclipse/cdt/make/internal/core/scannerconfig2/DefaultRunSIProvider.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.cdt/all/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig2/DefaultRunSIProvider.java,v
>retrieving revision 1.23
>diff -u -r1.23 DefaultRunSIProvider.java
>--- src/org/eclipse/cdt/make/internal/core/scannerconfig2/DefaultRunSIProvider.java	26 Oct 2010 19:27:06 -0000	1.23
>+++ src/org/eclipse/cdt/make/internal/core/scannerconfig2/DefaultRunSIProvider.java	8 Apr 2011 19:01:54 -0000
>@@ -37,6 +37,7 @@
> import org.eclipse.cdt.make.internal.core.scannerconfig.ScannerInfoConsoleParserFactory;
> import org.eclipse.cdt.make.internal.core.scannerconfig.util.TraceUtil;
> import org.eclipse.cdt.utils.EFSExtensionManager;
>+import org.eclipse.cdt.utils.PathUtil;
> import org.eclipse.core.resources.IProject;
> import org.eclipse.core.resources.IResource;
> import org.eclipse.core.runtime.IPath;
>@@ -44,6 +45,9 @@
> import org.eclipse.core.runtime.NullProgressMonitor;
> import org.eclipse.core.runtime.Path;
> import org.eclipse.core.runtime.SubProgressMonitor;
>+import org.eclipse.core.runtime.preferences.IEclipsePreferences;
>+import org.eclipse.core.runtime.preferences.InstanceScope;
>+import org.osgi.service.prefs.BackingStoreException;
> 
> /**
>  * New default external scanner info provider of type 'run'
>@@ -51,9 +55,13 @@
>  * @author vhirsl
>  */
> public class DefaultRunSIProvider implements IExternalScannerInfoProvider {
>+	/** console id which should match the definition in extension point */
>+	public static final String EXTERNAL_SI_PROVIDER_CONSOLE_ID = "org.eclipse.cdt.make.core.ExternalScannerInfoProviderConsole"; //$NON-NLS-1$
>+	private static final String PREF_CONSOLE_ENABLED = "org.eclipse.cdt.make.core.scanner.discovery.console.enabled"; //$NON-NLS-1$
>     private static final String EXTERNAL_SI_PROVIDER_ERROR = "ExternalScannerInfoProvider.Provider_Error"; //$NON-NLS-1$
>-    private static final String EXTERNAL_SI_PROVIDER_CONSOLE_ID = MakeCorePlugin.getUniqueIdentifier() + ".ExternalScannerInfoProviderConsole"; //$NON-NLS-1$
>     private static final String LANG_ENV_VAR = "LANG"; //$NON-NLS-1$
>+	private static final String NEWLINE = System.getProperty("line.separator", "\n"); //$NON-NLS-1$ //$NON-NLS-2$
>+	private static final String PATH_ENV = "PATH"; //$NON-NLS-1$
> 
>     protected IResource resource;
>     protected String providerId;
>@@ -96,7 +104,11 @@
>         monitor.beginTask(MakeMessages.getString("ExternalScannerInfoProvider.Reading_Specs"), 100); //$NON-NLS-1$
>         
>         try {
>-            IConsole console = CCorePlugin.getDefault().getConsole(EXTERNAL_SI_PROVIDER_CONSOLE_ID);
>+            String consoleId = EXTERNAL_SI_PROVIDER_CONSOLE_ID;
>+            if (!isConsoleEnabled())
>+                consoleId = EXTERNAL_SI_PROVIDER_CONSOLE_ID+".disabled"; // do not show in Console view //$NON-NLS-1$
>+            
>+            IConsole console = CCorePlugin.getDefault().getConsole(consoleId);
>             console.start(currentProject);
>             OutputStream cos = console.getOutputStream();
> 
>@@ -138,13 +150,39 @@
>                 errMsg = launcher.getErrorMessage();
>             }
> 
>-            if (errMsg != null) {
>-                String errorDesc = MakeMessages.getFormattedString(EXTERNAL_SI_PROVIDER_ERROR, 
>-                        fCompileCommand.toString() + ca);
>-                markerGenerator.addMarker(currentProject, -1, errorDesc, IMarkerGenerator.SEVERITY_WARNING, null);
>-            }
>+			if (errMsg != null) {
>+				String buildCommandStr = fCompileCommand.toString();
>+				String errorDesc = MakeMessages.getFormattedString(EXTERNAL_SI_PROVIDER_ERROR,
>+						buildCommandStr + ca);
>+				consoleOut.write((errorDesc + NEWLINE).getBytes());
>+				consoleOut.flush();
>+
>+				// Launching failed, trying to figure out possible cause
>+				String errorPrefix = MakeMessages.getString("ExternalScannerInfoProvider.Error_Prefix"); //$NON-NLS-1$
>+				Properties envMap = getEnvMap(launcher, env);
>+				String envPath = envMap.getProperty(PATH_ENV);
>+				if (envPath == null) {
>+					envPath = System.getenv(PATH_ENV);
>+				}
>+				StringBuffer buf = new StringBuffer();
>+				if (PathUtil.findProgramLocation(buildCommandStr, envPath) == null) {
>+					buf.append(errMsg).append(NEWLINE);
>+					errMsg = MakeMessages.getFormattedString("ExternalScannerInfoProvider.Program_Not_In_Path", buildCommandStr); //$NON-NLS-1$
>+					buf.append(errorPrefix).append(errMsg).append(NEWLINE);
>+					buf.append(NEWLINE);
>+					buf.append(PATH_ENV + "=[" + envPath + "]").append(NEWLINE); //$NON-NLS-1$//$NON-NLS-2$
>+				} else {
>+					buf.append(errorPrefix).append(errMsg).append(NEWLINE);
>+				}
>+				consoleErr.write(buf.toString().getBytes());
>+				consoleErr.flush();
>+
>+				if (!isConsoleEnabled()) {
>+					monitor.subTask(MakeMessages.getString("ExternalScannerInfoProvider.Creating_Markers")); //$NON-NLS-1$
>+					markerGenerator.addMarker(currentProject, -1, errorDesc, IMarkerGenerator.SEVERITY_WARNING, null);
>+				}
>+			}
> 
>-            monitor.subTask(MakeMessages.getString("ExternalScannerInfoProvider.Creating_Markers")); //$NON-NLS-1$
>             consoleOut.close();
>             consoleErr.close();
>             cos.close();
>@@ -212,8 +250,8 @@
>         return ca;
>     }
> 
>-    protected String[] setEnvironment(ICommandLauncher launcher, Properties initialEnv) {
>-        // Set the environmennt, some scripts may need the CWD var to be set.
>+	private Properties getEnvMap(ICommandLauncher launcher, Properties initialEnv) {
>+		// Set the environmennt, some scripts may need the CWD var to be set.
>         Properties props = initialEnv != null ? initialEnv : launcher.getEnvironment();
>         
>         if (fWorkingDirectory != null) {
>@@ -229,6 +267,11 @@
>         if (props.containsKey(LANG_ENV_VAR)) {
>             props.put(LANG_ENV_VAR, "en_US.UTF-8"); //$NON-NLS-1$
>         }
>+		return props;
>+	}
>+
>+    protected String[] setEnvironment(ICommandLauncher launcher, Properties initialEnv) {
>+        Properties props = getEnvMap(launcher, initialEnv);
>         String[] env = null;
>         ArrayList<String> envList = new ArrayList<String>();
>         Enumeration<?> names = props.propertyNames();
>@@ -242,4 +285,30 @@
>         return env;
>     }
> 
>+
>+	/**
>+	 * Set preference to stream output of scanner discovery to a console.
>+	 */
>+	public static void setConsoleEnabled(boolean value) {
>+		IEclipsePreferences node = InstanceScope.INSTANCE.getNode(MakeCorePlugin.PLUGIN_ID);
>+		node.putBoolean(PREF_CONSOLE_ENABLED, value);
>+		try {
>+			node.flush();
>+		} catch (BackingStoreException e) {
>+			// TODO Auto-generated catch block
>+			e.printStackTrace();
>+		}
>+	}
>+
>+	/**
>+	 * Check preference to stream output of scanner discovery to a console.
>+	 * 
>+	 * @return boolean preference value
>+	 */
>+	public static boolean isConsoleEnabled() {
>+		boolean value = InstanceScope.INSTANCE.getNode(MakeCorePlugin.PLUGIN_ID)
>+				.getBoolean(PREF_CONSOLE_ENABLED, true);
>+		return value;
>+	}
>+	
> }
>Index: src/org/eclipse/cdt/make/internal/core/scannerconfig2/DefaultSIFileReader.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.cdt/all/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig2/DefaultSIFileReader.java,v
>retrieving revision 1.13
>diff -u -r1.13 DefaultSIFileReader.java
>--- src/org/eclipse/cdt/make/internal/core/scannerconfig2/DefaultSIFileReader.java	29 Apr 2010 17:38:12 -0000	1.13
>+++ src/org/eclipse/cdt/make/internal/core/scannerconfig2/DefaultSIFileReader.java	8 Apr 2011 19:01:54 -0000
>@@ -44,10 +44,7 @@
>  * @author vhirsl
>  */
> public class DefaultSIFileReader implements IExternalScannerInfoProvider {
>-    private static final String EXTERNAL_SI_PROVIDER_CONSOLE_ID = MakeCorePlugin.getUniqueIdentifier() + ".ExternalScannerInfoProviderConsole"; //$NON-NLS-1$
>-
>     private long fileSize = 0;
>-    
>     private SCMarkerGenerator markerGenerator = new SCMarkerGenerator();
> 
>     public boolean invokeProvider(IProgressMonitor monitor, IResource resource,
>@@ -72,7 +69,7 @@
>         
>         try {
> 	        // output
>-	        IConsole console = CCorePlugin.getDefault().getConsole(EXTERNAL_SI_PROVIDER_CONSOLE_ID);
>+	        IConsole console = CCorePlugin.getDefault().getConsole(DefaultRunSIProvider.EXTERNAL_SI_PROVIDER_CONSOLE_ID);
> 	        console.start(project);
> 	        OutputStream ostream;
> 	        try {
>Index: src/org/eclipse/cdt/make/internal/core/scannerconfig2/SCMarkerGenerator.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.cdt/all/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig2/SCMarkerGenerator.java,v
>retrieving revision 1.12
>diff -u -r1.12 SCMarkerGenerator.java
>--- src/org/eclipse/cdt/make/internal/core/scannerconfig2/SCMarkerGenerator.java	29 Apr 2010 18:19:37 -0000	1.12
>+++ src/org/eclipse/cdt/make/internal/core/scannerconfig2/SCMarkerGenerator.java	8 Apr 2011 19:01:54 -0000
>@@ -74,7 +74,7 @@
>             // we have to add the marker in the job or we can deadlock other
>             // threads that are responding to a resource delta by doing something
>             // that accesses the project description
>-            Job markerJob = new Job(Messages.SCMarkerGenerator_0) {
>+            Job markerJob = new Job(Messages.SCMarkerGenerator_Add_Markers) {
> 
> 				@Override
> 				protected IStatus run(IProgressMonitor monitor) {
>@@ -83,18 +83,13 @@
> 						marker = problemMarkerInfo.file.createMarker(ICModelMarker.C_MODEL_PROBLEM_MARKER);
> 						marker.setAttribute(IMarker.MESSAGE, problemMarkerInfo.description);
> 			            marker.setAttribute(IMarker.SEVERITY, mapMarkerSeverity(problemMarkerInfo.severity));
>-			            marker.setAttribute(IMarker.LINE_NUMBER, problemMarkerInfo.lineNumber);
>-			            marker.setAttribute(IMarker.CHAR_START, -1);
>-			            marker.setAttribute(IMarker.CHAR_END, -1);
> 			            
> 			            if (problemMarkerInfo.variableName != null) {
> 			                marker.setAttribute(ICModelMarker.C_MODEL_MARKER_VARIABLE, problemMarkerInfo.variableName);
> 			            }
>-			            if (problemMarkerInfo.externalPath != null) {
>-			                marker.setAttribute(ICModelMarker.C_MODEL_MARKER_EXTERNAL_LOCATION, problemMarkerInfo.externalPath.toOSString());
>-			            }
>+			            marker.setAttribute(IMarker.LOCATION, Messages.SCMarkerGenerator_Discovery_Options_Page);
> 					} catch (CoreException e) {
>-						return new Status(Status.ERROR, MakeCorePlugin.getUniqueIdentifier(), Messages.SCMarkerGenerator_1, e);
>+						return new Status(Status.ERROR, MakeCorePlugin.getUniqueIdentifier(), Messages.SCMarkerGenerator_Error_Adding_Markers, e);
> 					}
> 		            
> 					return Status.OK_STATUS;
>#P org.eclipse.cdt.make.ui
>Index: plugin.xml
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.cdt/all/org.eclipse.cdt.make.ui/plugin.xml,v
>retrieving revision 1.88
>diff -u -r1.88 plugin.xml
>--- plugin.xml	14 Feb 2011 17:53:43 -0000	1.88
>+++ plugin.xml	8 Apr 2011 19:01:55 -0000
>@@ -440,6 +440,13 @@
>             name="%GCCPerFileProfile.name"
>             profileId="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile"/>
>    </extension>
>+   <extension
>+         point="org.eclipse.cdt.core.CBuildConsole">
>+      <CBuildConsole
>+            class="org.eclipse.cdt.make.internal.ui.scannerconfig.ScannerDiscoveryConsole"
>+            id="org.eclipse.cdt.make.core.ExternalScannerInfoProviderConsole">
>+      </CBuildConsole>
>+   </extension>
> 
>    <extension
>          point="org.eclipse.cdt.ui.cPropertyTab">
>Index: src/org/eclipse/cdt/make/internal/ui/scannerconfig/ScannerDiscoveryConsole.java
>===================================================================
>RCS file: src/org/eclipse/cdt/make/internal/ui/scannerconfig/ScannerDiscoveryConsole.java
>diff -N src/org/eclipse/cdt/make/internal/ui/scannerconfig/ScannerDiscoveryConsole.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/cdt/make/internal/ui/scannerconfig/ScannerDiscoveryConsole.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,25 @@
>+/*******************************************************************************
>+ *  Copyright (c) 2011 Andrew Gvozdev 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:
>+ *  Andrew Gvozdev - Initial API and implementation
>+ *******************************************************************************/
>+package org.eclipse.cdt.make.internal.ui.scannerconfig;
>+
>+import org.eclipse.cdt.internal.ui.buildconsole.CBuildConsole;
>+import org.eclipse.cdt.make.internal.core.scannerconfig2.DefaultRunSIProvider;
>+import org.eclipse.cdt.ui.IBuildConsoleManager;
>+
>+public class ScannerDiscoveryConsole extends CBuildConsole {
>+	IBuildConsoleManager fConsoleManager;
>+
>+	private static final String CONTEXT_MENU_ID = DefaultRunSIProvider.EXTERNAL_SI_PROVIDER_CONSOLE_ID;
>+
>+	public ScannerDiscoveryConsole() {
>+		super("Scanner Discovery Console", CONTEXT_MENU_ID);
>+	}
>+}
>Index: src/org/eclipse/cdt/make/ui/dialogs/GCCPerProjectSCDProfilePage.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.cdt/all/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/dialogs/GCCPerProjectSCDProfilePage.java,v
>retrieving revision 1.15
>diff -u -r1.15 GCCPerProjectSCDProfilePage.java
>--- src/org/eclipse/cdt/make/ui/dialogs/GCCPerProjectSCDProfilePage.java	8 Feb 2010 04:20:14 -0000	1.15
>+++ src/org/eclipse/cdt/make/ui/dialogs/GCCPerProjectSCDProfilePage.java	8 Apr 2011 19:01:55 -0000
>@@ -59,9 +59,18 @@
>     private Button sipEnabledButton;
>     private Text sipRunCommandText;
>     private Text sipRunArgsText;
>+    private Button sipConsoleEnabledButton;
>     
>     private boolean isValid = true;
> 
>+	/**
>+	 * Static variable corresponding to global preference to show scanner
>+	 * discovery console.
>+	 * 
>+	 * @since 7.1
>+	 */
>+	public static boolean isSIConsoleEnabled = false;
>+
>     /* (non-Javadoc)
>      * @see org.eclipse.cdt.ui.dialogs.AbstractCOptionPage#createControl(org.eclipse.swt.widgets.Composite)
>      */
>@@ -213,6 +222,17 @@
>             }
>         });
>         
>+        // si provider console enabled checkbox
>+        sipConsoleEnabledButton = ControlFactory.createCheckBox(profileGroup, "Stream output to a dedicated console in the Console view (global preference)");
>+        ((GridData)sipConsoleEnabledButton.getLayoutData()).horizontalSpan = 3;
>+        ((GridData)sipConsoleEnabledButton.getLayoutData()).grabExcessHorizontalSpace = true;
>+        sipConsoleEnabledButton.addSelectionListener(new SelectionAdapter() {
>+            @Override
>+            public void widgetSelected(SelectionEvent e) {
>+            	isSIConsoleEnabled = sipConsoleEnabledButton.getSelection();
>+            	return;
>+            }
>+        });
> 
>         setControl(page);
>         // set the shell variable; must be after setControl
>@@ -298,6 +318,7 @@
>         sipEnabledButton.setSelection(builderInfo.isProviderOutputParserEnabled(providerId));
>         sipRunCommandText.setText(builderInfo.getProviderRunCommand(providerId));
>         sipRunArgsText.setText(builderInfo.getProviderRunArguments(providerId));
>+        sipConsoleEnabledButton.setSelection(isSIConsoleEnabled);
>     }
>     
>     private String getProviderIDForSelectedProfile() {
>#P org.eclipse.cdt.managedbuilder.ui
>Index: src/org/eclipse/cdt/managedbuilder/ui/properties/DiscoveryTab.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.cdt/all/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/DiscoveryTab.java,v
>retrieving revision 1.37
>diff -u -r1.37 DiscoveryTab.java
>--- src/org/eclipse/cdt/managedbuilder/ui/properties/DiscoveryTab.java	21 Mar 2011 17:39:51 -0000	1.37
>+++ src/org/eclipse/cdt/managedbuilder/ui/properties/DiscoveryTab.java	8 Apr 2011 19:01:55 -0000
>@@ -36,9 +36,11 @@
> import org.eclipse.cdt.make.core.scannerconfig.InfoContext;
> import org.eclipse.cdt.make.internal.core.scannerconfig.DiscoveredPathInfo;
> import org.eclipse.cdt.make.internal.core.scannerconfig.DiscoveredScannerInfoStore;
>+import org.eclipse.cdt.make.internal.core.scannerconfig2.DefaultRunSIProvider;
> import org.eclipse.cdt.make.internal.core.scannerconfig2.SCProfileInstance;
> import org.eclipse.cdt.make.internal.core.scannerconfig2.ScannerConfigProfileManager;
> import org.eclipse.cdt.make.ui.dialogs.AbstractDiscoveryPage;
>+import org.eclipse.cdt.make.ui.dialogs.GCCPerProjectSCDProfilePage;
> import org.eclipse.cdt.managedbuilder.core.IConfiguration;
> import org.eclipse.cdt.managedbuilder.core.IInputType;
> import org.eclipse.cdt.managedbuilder.core.IResourceInfo;
>@@ -539,6 +541,8 @@
> 	 * 
> 	 */
> 	private void initializeProfilePageMap() {
>+		GCCPerProjectSCDProfilePage.isSIConsoleEnabled = DefaultRunSIProvider.isConsoleEnabled();
>+		
> 		pagesList = new ArrayList<DiscoveryProfilePageConfiguration>(5);
> 		IExtensionPoint point = Platform.getExtensionRegistry().getExtensionPoint(NAMESPACE, POINT);
> 		if (point == null)
>@@ -605,11 +609,14 @@
> 		}
> 
> 		clearChangedDiscoveredInfos();
>+		
>+		DefaultRunSIProvider.setConsoleEnabled(GCCPerProjectSCDProfilePage.isSIConsoleEnabled);
> 	}
> 
> 	@Override
> 	protected void performOK() {
> 		performOK(true);
>+		DefaultRunSIProvider.setConsoleEnabled(GCCPerProjectSCDProfilePage.isSIConsoleEnabled);
> 	}
> 
> 	private void performOK(boolean ok) {
>@@ -765,6 +772,8 @@
> 			}
> 		}
> 		updateData();
>+		
>+		DefaultRunSIProvider.setConsoleEnabled(false);
> 	}
> 
> 	@Override
>#P org.eclipse.cdt.ui
>Index: src/org/eclipse/cdt/internal/ui/buildconsole/CBuildConsole.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.cdt/all/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/CBuildConsole.java,v
>retrieving revision 1.5
>diff -u -r1.5 CBuildConsole.java
>--- src/org/eclipse/cdt/internal/ui/buildconsole/CBuildConsole.java	23 Jun 2006 17:52:12 -0000	1.5
>+++ src/org/eclipse/cdt/internal/ui/buildconsole/CBuildConsole.java	8 Apr 2011 19:01:56 -0000
>@@ -27,6 +27,11 @@
> 	public CBuildConsole() {
> 		fConsoleManager = CUIPlugin.getDefault().getConsoleManager();
> 	}
>+	
>+	public CBuildConsole(String consoleName, String contextId) {
>+		fConsoleManager = CUIPlugin.getDefault().getConsoleManager(consoleName, contextId);
>+	}
>+
> 
> 	public void start(IProject project ) {
> 		this.project = project;

Flags:

angvoz.dev: iplog-

Actions: View | Diff

Attachments on bug 342069: 192743 | 192872