### Eclipse Workspace Patch 1.0 #P org.eclipse.ui.ide Index: extensions/org/eclipse/ui/actions/GlobalBuildAction.java =================================================================== RCS file: /cvsroot/eclipse/org.eclipse.ui.ide/extensions/org/eclipse/ui/actions/GlobalBuildAction.java,v retrieving revision 1.32 diff -u -r1.32 GlobalBuildAction.java --- extensions/org/eclipse/ui/actions/GlobalBuildAction.java 1 Apr 2009 16:15:02 -0000 1.32 +++ extensions/org/eclipse/ui/actions/GlobalBuildAction.java 23 Apr 2009 15:23:26 -0000 @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2008 IBM Corporation and others. + * Copyright (c) 2000, 2009 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 @@ -10,30 +10,24 @@ *******************************************************************************/ package org.eclipse.ui.actions; -import org.eclipse.osgi.util.NLS; - -import org.eclipse.swt.widgets.Shell; - +import org.eclipse.core.resources.IProject; +import org.eclipse.core.resources.IncrementalProjectBuilder; +import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.Assert; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.MultiStatus; +import org.eclipse.core.runtime.Status; import org.eclipse.core.runtime.SubProgressMonitor; import org.eclipse.core.runtime.jobs.Job; - -import org.eclipse.core.resources.IProject; -import org.eclipse.core.resources.IncrementalProjectBuilder; -import org.eclipse.core.resources.ResourcesPlugin; - import org.eclipse.jface.action.Action; import org.eclipse.jface.dialogs.ErrorDialog; import org.eclipse.jface.dialogs.MessageDialog; - +import org.eclipse.osgi.util.NLS; +import org.eclipse.swt.widgets.Shell; import org.eclipse.ui.IWorkbench; import org.eclipse.ui.IWorkbenchCommandConstants; import org.eclipse.ui.IWorkbenchWindow; -import org.eclipse.ui.PlatformUI; import org.eclipse.ui.internal.ide.IDEInternalWorkbenchImages; import org.eclipse.ui.internal.ide.IDEWorkbenchMessages; import org.eclipse.ui.internal.ide.IDEWorkbenchPlugin; @@ -179,19 +173,16 @@ * @see org.eclipse.core.runtime.jobs.Job#run(org.eclipse.core.runtime.IProgressMonitor) */ protected IStatus run(IProgressMonitor monitor) { - final MultiStatus status = new MultiStatus( - PlatformUI.PLUGIN_ID, 0, IDEWorkbenchMessages.GlobalBuildAction_buildProblems, - null); monitor.beginTask(getOperationMessage(), 100); try { ResourcesPlugin.getWorkspace().build(buildType, new SubProgressMonitor(monitor, 100)); } catch (CoreException e) { - status.add(e.getStatus()); + return e.getStatus(); } finally { monitor.done(); } - return status; + return Status.OK_STATUS; } /* #P org.eclipse.core.resources Index: src/org/eclipse/core/internal/utils/messages.properties =================================================================== RCS file: /cvsroot/eclipse/org.eclipse.core.resources/src/org/eclipse/core/internal/utils/messages.properties,v retrieving revision 1.131 diff -u -r1.131 messages.properties --- src/org/eclipse/core/internal/utils/messages.properties 10 Apr 2009 09:28:24 -0000 1.131 +++ src/org/eclipse/core/internal/utils/messages.properties 23 Apr 2009 15:23:26 -0000 @@ -24,7 +24,7 @@ events_builderError = Errors running builder ''{0}'' on project ''{1}''. events_building_0 = Building workspace events_building_1 = Building ''{0}'' -events_errors = Errors during build. +events_errors = Errors occurred during the build. events_instantiate_1 = Error instantiating builder ''{0}''. events_invoking_1 = Invoking builder on ''{0}''. events_invoking_2 = Invoking ''{0}'' on ''{1}''. Index: src/org/eclipse/core/internal/events/BuildManager.java =================================================================== RCS file: /cvsroot/eclipse/org.eclipse.core.resources/src/org/eclipse/core/internal/events/BuildManager.java,v retrieving revision 1.107 diff -u -r1.107 BuildManager.java --- src/org/eclipse/core/internal/events/BuildManager.java 20 Oct 2008 18:04:09 -0000 1.107 +++ src/org/eclipse/core/internal/events/BuildManager.java 23 Apr 2009 15:23:26 -0000 @@ -613,17 +613,11 @@ builderName = currentBuilder.getClass().getName(); String pluginId = currentBuilder.getPluginId(); String message = NLS.bind(Messages.events_builderError, builderName, currentBuilder.getProject().getName()); - status.add(new Status(IStatus.WARNING, pluginId, IResourceStatus.BUILD_FAILED, message, null)); + status.add(new Status(IStatus.ERROR, pluginId, IResourceStatus.BUILD_FAILED, message, e)); //add the exception status to the MultiStatus if (e instanceof CoreException) status.add(((CoreException) e).getStatus()); - else { - message = e.getMessage(); - if (message == null) - message = NLS.bind(Messages.events_unknown, e.getClass().getName(), builderName); - status.add(new Status(IStatus.WARNING, pluginId, IResourceStatus.BUILD_FAILED, message, e)); - } } public void run() throws Exception {