Attachment 192743 Details for Bug 342069 – example patch

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

[patch] example patch

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

on 2011-04-07 10:09:50 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Andrew Gvozdev

Created: 2011-04-07 10:09:50 EDT

Size: 6.08 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.cdt.make.core
>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	7 Apr 2011 14:07:13 -0000
>@@ -52,7 +52,7 @@
>  */
> public class DefaultRunSIProvider implements IExternalScannerInfoProvider {
>     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$
>+    public 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$
> 
>     protected IResource resource;
>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	7 Apr 2011 14:07:13 -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 {
>#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	7 Apr 2011 14:07:13 -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);
>+	}
>+}
>#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	7 Apr 2011 14:07:14 -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