Attachment #87446 for bug #129132

Lines 7-12 Link Here

(-)src/org/eclipse/ui/internal/ide/dialogs/IDEWorkspacePreferencePage.java (-16 / +31 lines)
7	*	7	*
8	* Contributors:	8	* Contributors:
9	* IBM Corporation - initial API and implementation	9	* IBM Corporation - initial API and implementation
		10	* ARM Ltd - ARM Ltd - prompt to save before manual build (bug 129132)
10	*******************************************************************************/	11	*******************************************************************************/
11	package org.eclipse.ui.internal.ide.dialogs;	12	package org.eclipse.ui.internal.ide.dialogs;
12		13
Lines 27-32 Link Here
27	import org.eclipse.jface.util.PropertyChangeEvent;	28	import org.eclipse.jface.util.PropertyChangeEvent;
28	import org.eclipse.osgi.util.NLS;	29	import org.eclipse.osgi.util.NLS;
29	import org.eclipse.swt.SWT;	30	import org.eclipse.swt.SWT;
		31	import org.eclipse.swt.events.SelectionEvent;
		32	import org.eclipse.swt.events.SelectionListener;
30	import org.eclipse.swt.layout.GridData;	33	import org.eclipse.swt.layout.GridData;
31	import org.eclipse.swt.layout.GridLayout;	34	import org.eclipse.swt.layout.GridLayout;
32	import org.eclipse.swt.widgets.Button;	35	import org.eclipse.swt.widgets.Button;
Lines 58-64 Link Here
58		61
59	private Button autoBuildButton;	62	private Button autoBuildButton;
60		63
61	private Button autoSaveAllButton;	64	private RadioGroupFieldEditor saveBeforeBuildEditor;
62		65
63	private IntegerFieldEditor saveInterval;	66	private IntegerFieldEditor saveInterval;
64		67
Lines 141-157 Link Here
141	}	144	}
142		145
143	protected void createSaveAllBeforeBuildPref(Composite composite) {	146	protected void createSaveAllBeforeBuildPref(Composite composite) {
144	autoSaveAllButton = new Button(composite, SWT.CHECK);	147	String[][] namesAndValues = {
145	autoSaveAllButton.setText(IDEWorkbenchMessages.IDEWorkspacePreference_savePriorToBuilding);	148	{ IDEWorkbenchMessages.Always, IDEInternalPreferences.PSPM_ALWAYS },
146	autoSaveAllButton.setToolTipText(IDEWorkbenchMessages.IDEWorkspacePreference_savePriorToBuildingToolTip);	149	{ IDEWorkbenchMessages.Never, IDEInternalPreferences.PSPM_NEVER },
147	autoSaveAllButton.setSelection(getIDEPreferenceStore().getBoolean(	150	{ IDEWorkbenchMessages.Prompt, IDEInternalPreferences.PSPM_PROMPT } };
148	IDEInternalPreferences.SAVE_ALL_BEFORE_BUILD));	151	saveBeforeBuildEditor = new RadioGroupFieldEditor(IDEInternalPreferences.SAVE_ALL_BEFORE_BUILD,
149	}	152	IDEWorkbenchMessages.IDEWorkspacePreference_savePriorToBuilding,
		153	3, namesAndValues, composite, true);
		154	saveBeforeBuildEditor.setPreferenceStore(getIDEPreferenceStore());
		155	saveBeforeBuildEditor.setPage(this);
		156	composite.setToolTipText(IDEWorkbenchMessages.IDEWorkspacePreference_savePriorToBuildingToolTip);
		157	saveBeforeBuildEditor.load();
		158	saveBeforeBuildEditor.setEnabled(!autoBuildButton.getSelection(), composite);
		159	}
150		160
151	protected void createAutoBuildPref(Composite composite) {	161	protected void createAutoBuildPref(final Composite composite) {
152	autoBuildButton = new Button(composite, SWT.CHECK);	162	autoBuildButton = new Button(composite, SWT.CHECK);
153	autoBuildButton.setText(IDEWorkbenchMessages.IDEWorkspacePreference_autobuild);	163	autoBuildButton.setText(IDEWorkbenchMessages.IDEWorkspacePreference_autobuild);
154	autoBuildButton.setToolTipText(IDEWorkbenchMessages.IDEWorkspacePreference_autobuildToolTip);	164	autoBuildButton.setToolTipText(IDEWorkbenchMessages.IDEWorkspacePreference_autobuildToolTip);
		165	autoBuildButton.addSelectionListener(new SelectionListener() {
		166
		167	public void widgetDefaultSelected(SelectionEvent e) {
		168	widgetSelected(e);
		169	}
		170
		171	public void widgetSelected(SelectionEvent e) {
		172	saveBeforeBuildEditor.setEnabled(!autoBuildButton.getSelection(), composite);
		173	}
		174
		175	});
155	autoBuildButton.setSelection(ResourcesPlugin.getWorkspace()	176	autoBuildButton.setSelection(ResourcesPlugin.getWorkspace()
156	.isAutoBuilding());	177	.isAutoBuilding());
157	}	178	}
Lines 326-335 Link Here
326	.getDefaultBoolean(ResourcesPlugin.PREF_AUTO_BUILDING);	347	.getDefaultBoolean(ResourcesPlugin.PREF_AUTO_BUILDING);
327	autoBuildButton.setSelection(autoBuild);	348	autoBuildButton.setSelection(autoBuild);
328		349
329	IPreferenceStore store = getIDEPreferenceStore();	350	saveBeforeBuildEditor.loadDefault();
330	autoSaveAllButton
331	.setSelection(store
332	.getDefaultBoolean(IDEInternalPreferences.SAVE_ALL_BEFORE_BUILD));
333	saveInterval.loadDefault();	351	saveInterval.loadDefault();
334		352
335		353
Lines 370-379 Link Here
370		388
371	IPreferenceStore store = getIDEPreferenceStore();	389	IPreferenceStore store = getIDEPreferenceStore();
372		390
373	// store the save all prior to build setting
374	store.setValue(IDEInternalPreferences.SAVE_ALL_BEFORE_BUILD,
375	autoSaveAllButton.getSelection());
376
377	// store the workspace save interval	391	// store the workspace save interval
378	// @issue we should drop our preference constant and let clients use	392	// @issue we should drop our preference constant and let clients use
379	// core's pref. ours is not up-to-date anyway if someone changes this	393	// core's pref. ours is not up-to-date anyway if someone changes this
Lines 408-413 Link Here
408	encodingEditor.store();	422	encodingEditor.store();
409	lineSeparatorEditor.store();	423	lineSeparatorEditor.store();
410	openReferencesEditor.store();	424	openReferencesEditor.store();
		425	saveBeforeBuildEditor.store();
411	return super.performOk();	426	return super.performOk();
412	}	427	}
413		428




 *******************************************************************************/
package org.eclipse.ui.internal.ide.dialogs;

import java.util.Arrays;

import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IncrementalProjectBuilder;
import org.eclipse.core.resources.ResourcesPlugin;

 * @since 3.0
 */
public class CleanDialog extends MessageDialog {

	private static final String DIALOG_SETTINGS_SECTION = "CleanDialogSettings"; //$NON-NLS-1$
	private static final String DIALOG_ORIGIN_X = "DIALOG_X_ORIGIN"; //$NON-NLS-1$
	private static final String DIALOG_ORIGIN_Y = "DIALOG_Y_ORIGIN"; //$NON-NLS-1$
	private static final String DIALOG_WIDTH = "DIALOG_WIDTH"; //$NON-NLS-1$
	private static final String DIALOG_HEIGHT = "DIALOG_HEIGHT"; //$NON-NLS-1$
	private static final String TOGGLE_SELECTED = "TOGGLE_SELECTED"; //$NON-NLS-1$
	private static final String BUILD_NOW = "BUILD_NOW"; //$NON-NLS-1$

	private Button allButton, selectedButton, buildNowButton;

	private CheckboxTableViewer projectNames;

	private Object[] selection;

	private IWorkbenchWindow window;

	/**
	 * Gets the text of the clean dialog, depending on whether the workspace is
	 * currently in autobuild mode.
	 * 
	 * @return String the question the user will be asked.
	 */
	private static String getQuestion() {
		boolean autoBuilding = ResourcesPlugin.getWorkspace().isAutoBuilding();
		if (autoBuilding) {
			return IDEWorkbenchMessages.CleanDialog_buildCleanAuto;
		}
		return IDEWorkbenchMessages.CleanDialog_buildCleanManual;
	}

	/**
	 * Creates a new clean dialog.
	 * 
	 * @param window
	 *            the window to create it in
	 * @param selection
	 *            the currently selected projects (may be empty)
	 */
	public CleanDialog(IWorkbenchWindow window, IProject[] selection) {
		super(window.getShell(), IDEWorkbenchMessages.CleanDialog_title, null,
				getQuestion(), NONE, new String[] { IDialogConstants.OK_LABEL,
						IDialogConstants.CANCEL_LABEL }, 0);
		this.window = window;
		this.selection = selection;
		if (this.selection == null) {
			this.selection = new Object[0];
		}
	}

	/*
	 * (non-Javadoc)
	 * 
	 * @see org.eclipse.jface.dialogs.Dialog#buttonPressed(int)
	 */
	protected void buttonPressed(int buttonId) {
		final boolean cleanAll = allButton.getSelection();
		final boolean buildAll = buildNowButton != null
				&& buildNowButton.getSelection();
		super.buttonPressed(buttonId);
		if (buttonId != IDialogConstants.OK_ID) {
			return;
		}
		// save all dirty editors
		// save dirty editors in projects to be cleaned
		if (cleanAll) {
			if (!BuildUtilities.saveEditors(null)) {
				return;
			}
		} else {
			if (!BuildUtilities.saveEditors(Arrays.asList(selection))) {
				return;
			}
		}

		// batching changes ensures that autobuild runs after cleaning
		// batching changes ensures that autobuild runs after cleaning
		WorkspaceJob cleanJob = new WorkspaceJob(
				IDEWorkbenchMessages.CleanDialog_taskName) {
			public boolean belongsTo(Object family) {
				return ResourcesPlugin.FAMILY_MANUAL_BUILD.equals(family);
			}

			public IStatus runInWorkspace(IProgressMonitor monitor)
					throws CoreException {
				doClean(cleanAll, monitor);
				// see if a build was requested
				if (buildAll) {
					// start an immediate workspace build
					GlobalBuildAction build = new GlobalBuildAction(window,
							IncrementalProjectBuilder.INCREMENTAL_BUILD);
					build.doBuild();
				}
				return Status.OK_STATUS;
			}
		};
		cleanJob.setRule(ResourcesPlugin.getWorkspace().getRuleFactory()
				.buildRule());
		cleanJob.setUser(true);
		cleanJob.schedule();
	}

	/*
	 * (non-Javadoc)
	 * 
	 * @see org.eclipse.jface.dialogs.MessageDialog#createCustomArea(org.eclipse.swt.widgets.Composite)
	 */
	protected Control createCustomArea(Composite parent) {
		Composite area = new Composite(parent, SWT.NONE);
		GridLayout layout = new GridLayout();
		layout.marginWidth = layout.marginHeight = 0;
		layout.numColumns = 2;
		layout.makeColumnsEqualWidth = true;
		area.setLayout(layout);
		area.setLayoutData(new GridData(GridData.FILL_BOTH));
		SelectionListener updateEnablement = new SelectionAdapter() {
			public void widgetSelected(SelectionEvent e) {
				updateEnablement();
			}
		};

		IDialogSettings settings = getDialogSettings(DIALOG_SETTINGS_SECTION);
		boolean selectSelectedButton = settings.getBoolean(TOGGLE_SELECTED);
		// first row
		allButton = new Button(area, SWT.RADIO);
		allButton.setText(IDEWorkbenchMessages.CleanDialog_cleanAllButton);
		allButton.setSelection(!selectSelectedButton);
		allButton.addSelectionListener(updateEnablement);
		selectedButton = new Button(area, SWT.RADIO);
		selectedButton
				.setText(IDEWorkbenchMessages.CleanDialog_cleanSelectedButton);
		selectedButton.setSelection(selectSelectedButton);
		selectedButton.addSelectionListener(updateEnablement);

		// second row
		createProjectSelectionTable(area);

		// third row
		// only prompt for immediate build if autobuild is off
		if (!ResourcesPlugin.getWorkspace().isAutoBuilding()) {
			buildNowButton = new Button(parent, SWT.CHECK);
			buildNowButton
					.setText(IDEWorkbenchMessages.CleanDialog_buildNowButton);
			String buildNow = settings.get(BUILD_NOW);
			buildNowButton.setSelection(buildNow == null
					|| Boolean.valueOf(buildNow).booleanValue());
			buildNowButton.setLayoutData(new GridData(
					GridData.HORIZONTAL_ALIGN_BEGINNING));
		}
		projectNames.getTable().setEnabled(selectSelectedButton);
		return area;
	}

	private void createProjectSelectionTable(Composite radioGroup) {
		projectNames = CheckboxTableViewer.newCheckList(radioGroup, SWT.BORDER);
		projectNames.setContentProvider(new WorkbenchContentProvider());
		projectNames.setLabelProvider(new WorkbenchLabelProvider());
		projectNames.setComparator(new ResourceComparator(
				ResourceComparator.NAME));
		projectNames.addFilter(new ViewerFilter() {
			private final IProject[] projectHolder = new IProject[1];

			public boolean select(Viewer viewer, Object parentElement,
					Object element) {
				if (!(element instanceof IProject)) {
					return false;
				}

					return false;
				}
				projectHolder[0] = project;
				return BuildUtilities.isEnabled(projectHolder,
						IncrementalProjectBuilder.CLEAN_BUILD);
			}
		});
		projectNames.setInput(ResourcesPlugin.getWorkspace().getRoot());
		GridData data = new GridData(GridData.FILL_BOTH);
		data.horizontalSpan = 2;
		data.widthHint = IDialogConstants.ENTRY_FIELD_WIDTH;
		data.heightHint = IDialogConstants.ENTRY_FIELD_WIDTH;
		projectNames.getTable().setLayoutData(data);
		projectNames.setCheckedElements(selection);
		// table is disabled to start because all button is selected
		projectNames.getTable().setEnabled(selectedButton.getSelection());
		projectNames.addCheckStateListener(new ICheckStateListener() {
			public void checkStateChanged(CheckStateChangedEvent event) {
				selection = projectNames.getCheckedElements();
				updateEnablement();


	/**
	 * Performs the actual clean operation.
	 * 
	 * @param cleanAll
	 *            if <code>true</true> clean all projects
	 * @param monitor The monitor that the build will report to
	 * @throws CoreException thrown if there is a problem from the
	 * core builder.
	 */
	protected void doClean(boolean cleanAll, IProgressMonitor monitor)
			throws CoreException {
		if (cleanAll) {
			ResourcesPlugin.getWorkspace().build(
					IncrementalProjectBuilder.CLEAN_BUILD, monitor);
		} else {
			try {
				monitor.beginTask(IDEWorkbenchMessages.CleanDialog_taskName,
						selection.length);
				for (int i = 0; i < selection.length; i++) {
					((IProject) selection[i]).build(
							IncrementalProjectBuilder.CLEAN_BUILD,
							new SubProgressMonitor(monitor, 1));
				}
			} finally {
				monitor.done();
			}
		}
	}

	/**
	 * Updates the enablement of the dialog's ok button based on the current
	 * choices in the dialog.
	 */
	protected void updateEnablement() {
		projectNames.getTable().setEnabled(selectedButton.getSelection());
		boolean enabled = allButton.getSelection() || selection.length > 0;
		getButton(OK).setEnabled(enabled);
	}

	/*
	 * (non-Javadoc)
	 * 
	 * @see org.eclipse.jface.window.Window#close()
	 */
	public boolean close() {
		persistDialogSettings(getShell(), DIALOG_SETTINGS_SECTION);
		return super.close();
	}

	/*
	 * (non-Javadoc)
	 * 
	 * @see org.eclipse.jface.window.Window#getInitialLocation(org.eclipse.swt.graphics.Point)
	 */
	protected Point getInitialLocation(Point initialSize) {
		Point p = getInitialLocation(DIALOG_SETTINGS_SECTION);
		return p != null ? p : super.getInitialLocation(initialSize);
	}

	/*
	 * (non-Javadoc)
	 * 
	 * @see org.eclipse.jface.window.Window#getInitialSize()
	 */
	protected Point getInitialSize() {
		Point p = super.getInitialSize();
		return getInitialSize(DIALOG_SETTINGS_SECTION, p);
	}

	/**
	 * Returns the initial location which is persisted in the Ant UI Plugin
	 * dialog settings under the provided dialog setttings section name. If
	 * location is not persisted in the settings, the <code>null</code> is
	 * returned.
	 * 
	 * @param dialogSettingsSectionName
	 *            The name of the dialog settings section
	 * @return The initial location or <code>null</code>
	 */
	public Point getInitialLocation(String dialogSettingsSectionName) {
		IDialogSettings settings = getDialogSettings(dialogSettingsSectionName);
		try {
			int x = settings.getInt(DIALOG_ORIGIN_X);
			int y = settings.getInt(DIALOG_ORIGIN_Y);
			return new Point(x, y);
		} catch (NumberFormatException e) {
		}
		return null;
	}

	private IDialogSettings getDialogSettings(String dialogSettingsSectionName) {
		IDialogSettings settings = IDEWorkbenchPlugin.getDefault()
				.getDialogSettings();
		IDialogSettings section = settings
				.getSection(dialogSettingsSectionName);
		if (section == null) {
			section = settings.addNewSection(dialogSettingsSectionName);
		}
		return section;
	}

	/**
	 * Persists the location and dimensions of the shell and other user settings
	 * in the plugin's dialog settings under the provided dialog settings
	 * section name
	 * 
	 * @param shell
	 *            The shell whose geometry is to be stored
	 * @param dialogSettingsSectionName
	 *            The name of the dialog settings section
	 */
	private void persistDialogSettings(Shell shell,
			String dialogSettingsSectionName) {
		Point shellLocation = shell.getLocation();
		Point shellSize = shell.getSize();
		IDialogSettings settings = getDialogSettings(dialogSettingsSectionName);
		settings.put(DIALOG_ORIGIN_X, shellLocation.x);
		settings.put(DIALOG_ORIGIN_Y, shellLocation.y);
		settings.put(DIALOG_WIDTH, shellSize.x);
		settings.put(DIALOG_HEIGHT, shellSize.y);

		if (buildNowButton != null) {
			settings.put(BUILD_NOW, buildNowButton.getSelection());
		}
		settings.put(TOGGLE_SELECTED, selectedButton.getSelection());
	}

	/**
	 * Returns the initial size which is the larger of the
	 * <code>initialSize</code> or the size persisted in the Ant UI Plugin
	 * dialog settings under the provided dialog setttings section name. If no
	 * size is persisted in the settings, the <code>initialSize</code> is
	 * returned.
	 * 
	 * @param initialSize
	 *            The initialSize to compare against
	 * @param dialogSettingsSectionName
	 *            The name of the dialog settings section
	 * @return the initial size
	 */
	private Point getInitialSize(String dialogSettingsSectionName,
			Point initialSize) {
		IDialogSettings settings = getDialogSettings(dialogSettingsSectionName);
		try {
			int x, y;
			x = settings.getInt(DIALOG_WIDTH);
			y = settings.getInt(DIALOG_HEIGHT);
			return new Point(Math.max(x, initialSize.x), Math.max(y,
					initialSize.y));
		} catch (NumberFormatException e) {
		}
		return initialSize;
	}

	/*
	 * (non-Javadoc)
	 * 
	 * @see org.eclipse.jface.dialogs.Dialog#isResizable()
	 */
	protected boolean isResizable() {
		return true;
	}
}




/*******************************************************************************
 * Copyright (c) 2000, 2007 IBM Corporation 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

 *
 * Contributors:
 *     IBM Corporation - initial API and implementation
 *     ARM Ltd - ARM Ltd - prompt to save before manual build (bug 129132)
 *******************************************************************************/
package org.eclipse.ui.actions;


import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.viewers.StructuredSelection;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.ui.IWorkbenchWindow;
import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.internal.ide.IDEInternalPreferences;
import org.eclipse.ui.internal.ide.IDEWorkbenchMessages;
import org.eclipse.ui.internal.ide.IDEWorkbenchPlugin;
import org.eclipse.ui.internal.ide.IIDEHelpContextIds;
import org.eclipse.ui.internal.ide.actions.BuildUtilities;


		return super.isEnabled();
	}
    
    /**
     * Returns whether the user's preference is set to automatically save modified
     * resources before a manual build is done.
     *
     * @return <code>true</code> if Save All Before Build is enabled
     */
    public static boolean isSaveAllSet() {
        IPreferenceStore store = IDEWorkbenchPlugin.getDefault()
                .getPreferenceStore();
        return store.getBoolean(IDEInternalPreferences.SAVE_ALL_BEFORE_BUILD);
    }

    /* (non-Javadoc)
     * Method declared on WorkspaceAction.
     *

		}

	    // Save all resources prior to doing build
        if (!BuildUtilities.saveEditors(projects)) {
        	return;
        }
        runInBackground(ResourcesPlugin.getWorkspace().getRuleFactory()
                .buildRule(), ResourcesPlugin.FAMILY_MANUAL_BUILD);
    }

Lines 1-5 Link Here

(-)extensions/org/eclipse/ui/actions/GlobalBuildAction.java (-2 / +5 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2000, 2006 IBM Corporation and others.	2	* Copyright (c) 2000, 2007 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials	3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0	4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at	5	* which accompanies this distribution, and is available at
Lines 7-12 Link Here
7	*	7	*
8	* Contributors:	8	* Contributors:
9	* IBM Corporation - initial API and implementation	9	* IBM Corporation - initial API and implementation
		10	* ARM Ltd - prompt to save before manual build (bug 129132)
10	*******************************************************************************/	11	*******************************************************************************/
11	package org.eclipse.ui.actions;	12	package org.eclipse.ui.actions;
12		13
Lines 237-243 Link Here
237	return;	238	return;
238	}	239	}
239	// Save all resources prior to doing build	240	// Save all resources prior to doing build
240	BuildUtilities.saveEditors(null);	241	if (!BuildUtilities.saveEditors(null)) {
		242	return;
		243	}
241	// Perform the build on all the projects	244	// Perform the build on all the projects
242	doBuildOperation();	245	doBuildOperation();
243	}	246	}




/*******************************************************************************
 * Copyright (c) 2004, 2007 IBM Corporation 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

 *
 * Contributors:
 *     IBM Corporation - initial API and implementation
 *     ARM Ltd - prompt to save before manual build (bug 129132)
 *******************************************************************************/
package org.eclipse.ui.internal.ide;



		// Internal preferences

		node.put(IDEInternalPreferences.SAVE_ALL_BEFORE_BUILD, 
				IDEInternalPreferences.PSPM_PROMPT);
		node.putInt(IDEInternalPreferences.SAVE_INTERVAL, 5); // 5 minutes
		node.putBoolean(IDEInternalPreferences.WELCOME_DIALOG, true);
		node.putBoolean(IDEInternalPreferences.REFRESH_WORKSPACE_ON_STARTUP,

Lines 1-5 Link Here

(-)src/org/eclipse/ui/internal/ide/actions/BuildUtilities.java (-15 / +50 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2004, 2006 IBM Corporation and others.	2	* Copyright (c) 2004, 2007 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials	3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0	4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at	5	* which accompanies this distribution, and is available at
Lines 7-17 Link Here
7	*	7	*
8	* Contributors:	8	* Contributors:
9	* IBM - Initial API and implementation	9	* IBM - Initial API and implementation
		10	* ARM Ltd - prompt to save before manual build (bug 129132)
10	*******************************************************************************/	11	*******************************************************************************/
11	package org.eclipse.ui.internal.ide.actions;	12	package org.eclipse.ui.internal.ide.actions;
12		13
		14	import java.util.ArrayList;
13	import java.util.Collection;	15	import java.util.Collection;
14	import java.util.HashSet;	16	import java.util.HashSet;
		17	import java.util.List;
15		18
16	import org.eclipse.core.resources.ICommand;	19	import org.eclipse.core.resources.ICommand;
17	import org.eclipse.core.resources.IFile;	20	import org.eclipse.core.resources.IFile;
Lines 22-36 Link Here
22	import org.eclipse.core.resources.ResourcesPlugin;	25	import org.eclipse.core.resources.ResourcesPlugin;
23	import org.eclipse.core.resources.mapping.ResourceMapping;	26	import org.eclipse.core.resources.mapping.ResourceMapping;
24	import org.eclipse.core.runtime.CoreException;	27	import org.eclipse.core.runtime.CoreException;
		28	import org.eclipse.jface.dialogs.ProgressMonitorDialog;
		29	import org.eclipse.jface.operation.IRunnableContext;
25	import org.eclipse.jface.viewers.ISelection;	30	import org.eclipse.jface.viewers.ISelection;
26	import org.eclipse.jface.viewers.IStructuredSelection;	31	import org.eclipse.jface.viewers.IStructuredSelection;
		32	import org.eclipse.jface.window.IShellProvider;
		33	import org.eclipse.swt.widgets.Shell;
27	import org.eclipse.ui.IEditorPart;	34	import org.eclipse.ui.IEditorPart;
28	import org.eclipse.ui.IWorkbenchPage;	35	import org.eclipse.ui.IWorkbenchPage;
29	import org.eclipse.ui.IWorkbenchPart;	36	import org.eclipse.ui.IWorkbenchPart;
30	import org.eclipse.ui.IWorkbenchWindow;	37	import org.eclipse.ui.IWorkbenchWindow;
31	import org.eclipse.ui.PlatformUI;	38	import org.eclipse.ui.PlatformUI;
32	import org.eclipse.ui.actions.BuildAction;
33	import org.eclipse.ui.ide.ResourceUtil;	39	import org.eclipse.ui.ide.ResourceUtil;
		40	import org.eclipse.ui.internal.EditorManager;
		41	import org.eclipse.ui.internal.ide.IDEInternalPreferences;
		42	import org.eclipse.ui.internal.ide.IDEWorkbenchPlugin;
34		43
35	/**	44	/**
36	* This class contains convenience methods used by the various build commands	45	* This class contains convenience methods used by the various build commands
Lines 150-181 Link Here
150	* of projects depending on the user's preference.	159	* of projects depending on the user's preference.
151	* @param projects The projects in which to save editors, or <code>null</code>	160	* @param projects The projects in which to save editors, or <code>null</code>
152	* to save editors in all projects.	161	* to save editors in all projects.
		162	* @return <code>true</code> if it is OK to continue with the build, or <code>false</code>
		163	* otherwise (i.e. if the user has canceled).
153	*/	164	*/
154	public static void saveEditors(Collection projects) {	165	public static boolean saveEditors(Collection projects) {
155	if (!BuildAction.isSaveAllSet()) {	166	String saveBeforeBuildSetting = IDEWorkbenchPlugin.getDefault().getPreferenceStore().getString(IDEInternalPreferences.SAVE_ALL_BEFORE_BUILD);
156	return;	167	if (saveBeforeBuildSetting.equals(IDEInternalPreferences.PSPM_NEVER)) {
		168	return true;
157	}	169	}
		170	final boolean confirmRequired = saveBeforeBuildSetting.equals(IDEInternalPreferences.PSPM_PROMPT);
		171	List dirtyEditors = new ArrayList();
		172
158	IWorkbenchWindow[] windows = PlatformUI.getWorkbench().getWorkbenchWindows();	173	IWorkbenchWindow[] windows = PlatformUI.getWorkbench().getWorkbenchWindows();
159	for (int i = 0; i < windows.length; i++) {	174	for (int i = 0; i < windows.length; i++) {
160	IWorkbenchPage[] pages = windows[i].getPages();	175	IWorkbenchPage[] pages = windows[i].getPages();
161	for (int j = 0; j < pages.length; j++) {	176	for (int j = 0; j < pages.length; j++) {
162	IWorkbenchPage page = pages[j];	177	IWorkbenchPage page = pages[j];
163	if (projects == null) {	178	IEditorPart[] editors = page.getDirtyEditors();
164	page.saveAllEditors(false);	179	for (int k = 0; k < editors.length; k++) {
165	} else {	180	IEditorPart editor = editors[k];
166	IEditorPart[] editors = page.getDirtyEditors();	181	if (projects == null) {
167	for (int k = 0; k < editors.length; k++) {	182	dirtyEditors.add(editor);
168	IEditorPart editor = editors[k];	183	}
		184	else {
169	IFile inputFile = ResourceUtil.getFile(editor.getEditorInput());	185	IFile inputFile = ResourceUtil.getFile(editor.getEditorInput());
170	if (inputFile != null) {	186	if (inputFile != null && projects.contains(inputFile.getProject())) {
171	if (projects.contains(inputFile.getProject())) {	187	dirtyEditors.add(editor);
172	page.saveEditor(editor, false);
173	}
174	}	188	}
175	}	189	}
176	}	190	}
177	}	191	}
178	}	192	}
		193
		194	/* Taken from org.eclipse.ui.internal.Workbench.saveAllEditors */
		195	IShellProvider shellProvider;
		196	IRunnableContext runnableContext;
		197	IWorkbenchWindow w = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
		198	if (w == null && windows.length > 0) {
		199	w = windows[0];
		200	}
		201	if (w != null) {
		202	shellProvider = w;
		203	runnableContext = w;
		204	} else {
		205	shellProvider = new IShellProvider() {
		206	public Shell getShell() {
		207	return null;
		208	}
		209	};
		210	runnableContext = new ProgressMonitorDialog(null);
		211	}
		212
		213	return EditorManager.saveAll(dirtyEditors, confirmRequired, false, true, runnableContext, shellProvider);
179	}	214	}
180		215
181	/**	216	/**

Return to bug 129132

Lines 1-5 Link Here

(-)extensions/org/eclipse/ui/actions/BuildAction.java (-17 / +5 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2000, 2006 IBM Corporation and others.	2	* Copyright (c) 2000, 2007 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials	3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0	4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at	5	* which accompanies this distribution, and is available at
Lines 7-12 Link Here
7	*	7	*
8	* Contributors:	8	* Contributors:
9	* IBM Corporation - initial API and implementation	9	* IBM Corporation - initial API and implementation
		10	* ARM Ltd - ARM Ltd - prompt to save before manual build (bug 129132)
10	*******************************************************************************/	11	*******************************************************************************/
11	package org.eclipse.ui.actions;	12	package org.eclipse.ui.actions;
12		13
Lines 25-39 Link Here
25	import org.eclipse.core.resources.ResourcesPlugin;	26	import org.eclipse.core.resources.ResourcesPlugin;
26	import org.eclipse.core.runtime.CoreException;	27	import org.eclipse.core.runtime.CoreException;
27	import org.eclipse.core.runtime.IProgressMonitor;	28	import org.eclipse.core.runtime.IProgressMonitor;
28	import org.eclipse.jface.preference.IPreferenceStore;
29	import org.eclipse.jface.viewers.IStructuredSelection;	29	import org.eclipse.jface.viewers.IStructuredSelection;
30	import org.eclipse.jface.viewers.StructuredSelection;	30	import org.eclipse.jface.viewers.StructuredSelection;
31	import org.eclipse.swt.widgets.Shell;	31	import org.eclipse.swt.widgets.Shell;
32	import org.eclipse.ui.IWorkbenchWindow;	32	import org.eclipse.ui.IWorkbenchWindow;
33	import org.eclipse.ui.PlatformUI;	33	import org.eclipse.ui.PlatformUI;
34	import org.eclipse.ui.internal.ide.IDEInternalPreferences;
35	import org.eclipse.ui.internal.ide.IDEWorkbenchMessages;	34	import org.eclipse.ui.internal.ide.IDEWorkbenchMessages;
36	import org.eclipse.ui.internal.ide.IDEWorkbenchPlugin;
37	import org.eclipse.ui.internal.ide.IIDEHelpContextIds;	35	import org.eclipse.ui.internal.ide.IIDEHelpContextIds;
38	import org.eclipse.ui.internal.ide.actions.BuildUtilities;	36	import org.eclipse.ui.internal.ide.actions.BuildUtilities;
39		37
Lines 206-223 Link Here
206	return super.isEnabled();	204	return super.isEnabled();
207	}	205	}
208		206
209	/**
210	* Returns whether the user's preference is set to automatically save modified
211	* resources before a manual build is done.
212	*
213	* @return <code>true</code> if Save All Before Build is enabled
214	*/
215	public static boolean isSaveAllSet() {
216	IPreferenceStore store = IDEWorkbenchPlugin.getDefault()
217	.getPreferenceStore();
218	return store.getBoolean(IDEInternalPreferences.SAVE_ALL_BEFORE_BUILD);
219	}
220
221	/* (non-Javadoc)	207	/* (non-Javadoc)
222	* Method declared on WorkspaceAction.	208	* Method declared on WorkspaceAction.
223	*	209	*
Lines 278-284 Link Here
278	}	264	}
279		265
280	// Save all resources prior to doing build	266	// Save all resources prior to doing build
281	BuildUtilities.saveEditors(projects);	267	if (!BuildUtilities.saveEditors(projects)) {
		268	return;
		269	}
282	runInBackground(ResourcesPlugin.getWorkspace().getRuleFactory()	270	runInBackground(ResourcesPlugin.getWorkspace().getRuleFactory()
283	.buildRule(), ResourcesPlugin.FAMILY_MANUAL_BUILD);	271	.buildRule(), ResourcesPlugin.FAMILY_MANUAL_BUILD);
284	}	272	}

Lines 1-5 Link Here

(-)src/org/eclipse/ui/internal/ide/IDEInternalPreferences.java (-2 / +3 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2000, 2006 IBM Corporation and others.	2	* Copyright (c) 2000, 2007 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials	3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0	4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at	5	* which accompanies this distribution, and is available at
Lines 7-12 Link Here
7	*	7	*
8	* Contributors:	8	* Contributors:
9	* IBM Corporation - initial API and implementation	9	* IBM Corporation - initial API and implementation
		10	* ARM Ltd - prompt to save before manual build (bug 129132)
10	*******************************************************************************/	11	*******************************************************************************/
11		12
12	package org.eclipse.ui.internal.ide;	13	package org.eclipse.ui.internal.ide;
Lines 17-23 Link Here
17	* The IDEInternalPreferences are the internal constants used by the Workbench.	18	* The IDEInternalPreferences are the internal constants used by the Workbench.
18	*/	19	*/
19	public interface IDEInternalPreferences {	20	public interface IDEInternalPreferences {
20	// (boolean) Save all dirty editors before running a full or incremental build	21	// (String) Save all dirty editors before running a full or incremental build
21	public static final String SAVE_ALL_BEFORE_BUILD = "SAVE_ALL_BEFORE_BUILD"; //$NON-NLS-1$	22	public static final String SAVE_ALL_BEFORE_BUILD = "SAVE_ALL_BEFORE_BUILD"; //$NON-NLS-1$
22		23
23	// (boolean) Refresh workspace on startup	24	// (boolean) Refresh workspace on startup

Lines 1-5 Link Here

(-)src/org/eclipse/ui/internal/ide/IDEPreferenceInitializer.java (-2 / +4 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2004, 2006 IBM Corporation and others.	2	* Copyright (c) 2004, 2007 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials	3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0	4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at	5	* which accompanies this distribution, and is available at
Lines 7-12 Link Here
7	*	7	*
8	* Contributors:	8	* Contributors:
9	* IBM Corporation - initial API and implementation	9	* IBM Corporation - initial API and implementation
		10	* ARM Ltd - prompt to save before manual build (bug 129132)
10	*******************************************************************************/	11	*******************************************************************************/
11	package org.eclipse.ui.internal.ide;	12	package org.eclipse.ui.internal.ide;
12		13
Lines 45-51 Link Here
45		46
46	// Internal preferences	47	// Internal preferences
47		48
48	node.putBoolean(IDEInternalPreferences.SAVE_ALL_BEFORE_BUILD, false);	49	node.put(IDEInternalPreferences.SAVE_ALL_BEFORE_BUILD,
		50	IDEInternalPreferences.PSPM_PROMPT);
49	node.putInt(IDEInternalPreferences.SAVE_INTERVAL, 5); // 5 minutes	51	node.putInt(IDEInternalPreferences.SAVE_INTERVAL, 5); // 5 minutes
50	node.putBoolean(IDEInternalPreferences.WELCOME_DIALOG, true);	52	node.putBoolean(IDEInternalPreferences.WELCOME_DIALOG, true);
51	node.putBoolean(IDEInternalPreferences.REFRESH_WORKSPACE_ON_STARTUP,	53	node.putBoolean(IDEInternalPreferences.REFRESH_WORKSPACE_ON_STARTUP,