Attachment #192743 for bug #342069

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

Lines 52-58 Link Here

(-)src/org/eclipse/cdt/make/internal/core/scannerconfig2/DefaultRunSIProvider.java (-1 / +1 lines)
52	*/	52	*/
53	public class DefaultRunSIProvider implements IExternalScannerInfoProvider {	53	public class DefaultRunSIProvider implements IExternalScannerInfoProvider {
54	private static final String EXTERNAL_SI_PROVIDER_ERROR = "ExternalScannerInfoProvider.Provider_Error"; //$NON-NLS-1$	54	private static final String EXTERNAL_SI_PROVIDER_ERROR = "ExternalScannerInfoProvider.Provider_Error"; //$NON-NLS-1$
55	private static final String EXTERNAL_SI_PROVIDER_CONSOLE_ID = MakeCorePlugin.getUniqueIdentifier() + ".ExternalScannerInfoProviderConsole"; //$NON-NLS-1$	55	public static final String EXTERNAL_SI_PROVIDER_CONSOLE_ID = MakeCorePlugin.getUniqueIdentifier() + ".ExternalScannerInfoProviderConsole"; //$NON-NLS-1$
56	private static final String LANG_ENV_VAR = "LANG"; //$NON-NLS-1$	56	private static final String LANG_ENV_VAR = "LANG"; //$NON-NLS-1$
57		57
58	protected IResource resource;	58	protected IResource resource;




 * @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,

        
        try {
	        // output
	        IConsole console = CCorePlugin.getDefault().getConsole(DefaultRunSIProvider.EXTERNAL_SI_PROVIDER_CONSOLE_ID);
	        console.start(project);
	        OutputStream ostream;
	        try {

Lines 440-445 Link Here

(-)plugin.xml (+7 lines)
440	name="%GCCPerFileProfile.name"	440	name="%GCCPerFileProfile.name"
441	profileId="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile"/>	441	profileId="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile"/>
442	</extension>	442	</extension>
		443	<extension
		444	point="org.eclipse.cdt.core.CBuildConsole">
		445	<CBuildConsole
		446	class="org.eclipse.cdt.make.internal.ui.scannerconfig.ScannerDiscoveryConsole"
		447	id="org.eclipse.cdt.make.core.ExternalScannerInfoProviderConsole">
		448	</CBuildConsole>
		449	</extension>
443		450
444	<extension	451	<extension
445	point="org.eclipse.cdt.ui.cPropertyTab">	452	point="org.eclipse.cdt.ui.cPropertyTab">




/*******************************************************************************
 *  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);
	}
}

Lines 27-32 Link Here

(-)src/org/eclipse/cdt/internal/ui/buildconsole/CBuildConsole.java (+5 lines)
27	public CBuildConsole() {	27	public CBuildConsole() {
28	fConsoleManager = CUIPlugin.getDefault().getConsoleManager();	28	fConsoleManager = CUIPlugin.getDefault().getConsoleManager();
29	}	29	}
		30
		31	public CBuildConsole(String consoleName, String contextId) {
		32	fConsoleManager = CUIPlugin.getDefault().getConsoleManager(consoleName, contextId);
		33	}
		34
30		35
31	public void start(IProject project ) {	36	public void start(IProject project ) {
32	this.project = project;	37	this.project = project;

Return to bug 342069

Lines 44-53 Link Here

(-)src/org/eclipse/cdt/make/internal/core/scannerconfig2/DefaultSIFileReader.java (-4 / +1 lines)
44	* @author vhirsl	44	* @author vhirsl
45	*/	45	*/
46	public class DefaultSIFileReader implements IExternalScannerInfoProvider {	46	public class DefaultSIFileReader implements IExternalScannerInfoProvider {
47	private static final String EXTERNAL_SI_PROVIDER_CONSOLE_ID = MakeCorePlugin.getUniqueIdentifier() + ".ExternalScannerInfoProviderConsole"; //$NON-NLS-1$
48
49	private long fileSize = 0;	47	private long fileSize = 0;
50
51	private SCMarkerGenerator markerGenerator = new SCMarkerGenerator();	48	private SCMarkerGenerator markerGenerator = new SCMarkerGenerator();
52		49
53	public boolean invokeProvider(IProgressMonitor monitor, IResource resource,	50	public boolean invokeProvider(IProgressMonitor monitor, IResource resource,
Lines 72-78 Link Here
72		69
73	try {	70	try {
74	// output	71	// output
75	IConsole console = CCorePlugin.getDefault().getConsole(EXTERNAL_SI_PROVIDER_CONSOLE_ID);	72	IConsole console = CCorePlugin.getDefault().getConsole(DefaultRunSIProvider.EXTERNAL_SI_PROVIDER_CONSOLE_ID);
76	console.start(project);	73	console.start(project);
77	OutputStream ostream;	74	OutputStream ostream;
78	try {	75	try {

Added Link Here

(-)src/org/eclipse/cdt/make/internal/ui/scannerconfig/ScannerDiscoveryConsole.java (+25 lines)
1	/*******************************************************************************
2	* Copyright (c) 2011 Andrew Gvozdev and others.
3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at
6	* http://www.eclipse.org/legal/epl-v10.html
7	*
8	* Contributors:
9	* Andrew Gvozdev - Initial API and implementation
10	*******************************************************************************/
11	package org.eclipse.cdt.make.internal.ui.scannerconfig;
12
13	import org.eclipse.cdt.internal.ui.buildconsole.CBuildConsole;
14	import org.eclipse.cdt.make.internal.core.scannerconfig2.DefaultRunSIProvider;
15	import org.eclipse.cdt.ui.IBuildConsoleManager;
16
17	public class ScannerDiscoveryConsole extends CBuildConsole {
18	IBuildConsoleManager fConsoleManager;
19
20	private static final String CONTEXT_MENU_ID = DefaultRunSIProvider.EXTERNAL_SI_PROVIDER_CONSOLE_ID;
21
22	public ScannerDiscoveryConsole() {
23	super("Scanner Discovery Console", CONTEXT_MENU_ID);
24	}
25	}