Attachment 162652 Details for Bug 170590 – patch 1

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

[patch] patch 1

bug170590.patch (text/plain), 4.72 KB, created by James Blackburn

on 2010-03-22 06:33:41 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: James Blackburn

Created: 2010-03-22 06:33:41 EDT

Size: 4.72 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.cdt.ui
>Index: src/org/eclipse/cdt/internal/ui/cview/BuildGroup.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.cdt/all/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/BuildGroup.java,v
>retrieving revision 1.14
>diff -u -r1.14 BuildGroup.java
>--- src/org/eclipse/cdt/internal/ui/cview/BuildGroup.java	9 Oct 2009 12:08:51 -0000	1.14
>+++ src/org/eclipse/cdt/internal/ui/cview/BuildGroup.java	22 Mar 2010 10:31:11 -0000
>@@ -10,9 +10,15 @@
>  *******************************************************************************/
> package org.eclipse.cdt.internal.ui.cview;
> 
>+import java.util.Arrays;
>+import java.util.Collection;
>+import java.util.HashSet;
> import java.util.Iterator;
>+import java.util.List;
>+import java.util.Set;
> 
> import org.eclipse.core.resources.ICommand;
>+import org.eclipse.core.resources.IFile;
> import org.eclipse.core.resources.IProject;
> import org.eclipse.core.resources.IResource;
> import org.eclipse.core.resources.IncrementalProjectBuilder;
>@@ -25,9 +31,14 @@
> import org.eclipse.jface.window.IShellProvider;
> import org.eclipse.swt.events.KeyEvent;
> import org.eclipse.ui.IActionBars;
>+import org.eclipse.ui.IEditorPart;
>+import org.eclipse.ui.IWorkbenchPage;
> import org.eclipse.ui.IWorkbenchPartSite;
>+import org.eclipse.ui.IWorkbenchWindow;
>+import org.eclipse.ui.PlatformUI;
> import org.eclipse.ui.actions.BuildAction;
> import org.eclipse.ui.ide.IDEActionFactory;
>+import org.eclipse.ui.ide.ResourceUtil;
> 
> import org.eclipse.cdt.core.CCorePlugin;
> 
>@@ -38,7 +49,12 @@
> 
> 	/**
> 	 * An internal class which overrides the 'shouldPerformResourcePruning'
>-	 * method so that referenced projects aren't build twice 
>+	 * method so that referenced projects aren't build twice . (The CDT
>+	 * managedbuild builds CDT reference project configuration as part of
>+	 * building the top-level project).
>+	 *
>+	 * Also ensure that files in referenced projects are saved automatically
>+	 * before build.
> 	 */
> 	public static class CDTBuildAction extends BuildAction {
> 	    public CDTBuildAction(IShellProvider shell, int kind) {
>@@ -47,12 +63,70 @@
> 	    @Override
> 	    protected boolean shouldPerformResourcePruning() {
> 	    	// If the selected resources aren't new-style CDT projects, then
>-	    	// fall-back to parent behaviour
>+	    	// fall-back to parent behaviour. 
>+	    	// For CDT projects, we only want 'build' to be called on the top-level
>+	    	// selected project(s)
> 	    	for (Object res : getSelectedResources())
> 	    		if (!(res instanceof IProject) || !CCorePlugin.getDefault().isNewStyleProject((IProject)res))
> 	    			return super.shouldPerformResourcePruning();
> 	    	return false;
> 	    }
>+	    @Override
>+	    @SuppressWarnings("unchecked")
>+	    public void run() {
>+	    	// Ensure we correctly save files in all referenced projects before build
>+	    	Set<IProject> prjs = new HashSet<IProject>();
>+	    	for (IResource resource : (List<IResource>)getSelectedResources()) {
>+	    		IProject project = resource.getProject();
>+	    		if (project != null) {
>+	    			prjs.add(project);
>+	    			try {
>+	    				prjs.addAll(Arrays.asList(project.getReferencedProjects()));
>+	    			} catch (CoreException e) {
>+	    				// Project not accessible or not open
>+	    			}
>+	    		}
>+	    	}
>+	    	saveEditors(prjs);
>+
>+	    	// Now delegate to the parent
>+	    	super.run();
>+	    }
>+
>+	    /**
>+	     * Taken from inaccessible o.e.ui.ide.BuildUtilities.java
>+	     *
>+	     * Causes all editors to save any modified resources in the provided collection
>+	     * of projects depending on the user's preference.
>+	     * @param projects The projects in which to save editors, or <code>null</code>
>+	     * to save editors in all projects.
>+	     */
>+	    private static void saveEditors(Collection<IProject> projects) {
>+	    	if (!BuildAction.isSaveAllSet()) {
>+	    		return;
>+	    	}
>+	    	IWorkbenchWindow[] windows = PlatformUI.getWorkbench().getWorkbenchWindows();
>+	    	for (int i = 0; i < windows.length; i++) {
>+	    		IWorkbenchPage[] pages = windows[i].getPages();
>+	    		for (int j = 0; j < pages.length; j++) {
>+	    			IWorkbenchPage page = pages[j];
>+	    			if (projects == null) {
>+	    				page.saveAllEditors(false);
>+	    			} else {
>+	    				IEditorPart[] editors = page.getDirtyEditors();
>+	    				for (int k = 0; k < editors.length; k++) {
>+	    					IEditorPart editor = editors[k];
>+	    					IFile inputFile = ResourceUtil.getFile(editor.getEditorInput());
>+	    					if (inputFile != null) {
>+	    						if (projects.contains(inputFile.getProject())) {
>+	    							page.saveEditor(editor, false);
>+	    						}
>+	    					}
>+	    				}
>+	    			}
>+	    		}
>+	    	}
>+	    }
> 	}
> 
> 	private static class RebuildAction extends CDTBuildAction {

Flags:

jamesblackburn+eclipse: iplog-

Actions: View | Diff

Attachments on bug 170590: 162652