Author: fbricon Date: 2012-01-26 12:47:17 -0500 (Thu, 26 Jan 2012) New Revision: 38206 Added: trunk/maven/plugins/org.jboss.tools.maven.project.examples/src/org/jboss/tools/maven/project/examples/xpl/ trunk/maven/plugins/org.jboss.tools.maven.project.examples/src/org/jboss/tools/maven/project/examples/xpl/UpdateMavenProjectJob.java Modified: trunk/maven/plugins/org.jboss.tools.maven.project.examples/src/org/jboss/tools/maven/project/examples/MavenProjectExamplesActivator.java Log: JBIDE-10709 : copy UpdateMavenProjectJob from m2e 1.1 to ensure both forward (1.1) and backward (1.0) compatibility with m2e Modified: trunk/maven/plugins/org.jboss.tools.maven.project.examples/src/org/jboss/tools/maven/project/examples/MavenProjectExamplesActivator.java =================================================================== --- trunk/maven/plugins/org.jboss.tools.maven.project.examples/src/org/jboss/tools/maven/project/examples/MavenProjectExamplesActivator.java 2012-01-26 16:25:50 UTC (rev 38205) +++ trunk/maven/plugins/org.jboss.tools.maven.project.examples/src/org/jboss/tools/maven/project/examples/MavenProjectExamplesActivator.java 2012-01-26 17:47:17 UTC (rev 38206) @@ -19,8 +19,8 @@ import org.eclipse.m2e.core.embedder.IMaven; import org.eclipse.m2e.core.project.MavenProjectInfo; import org.eclipse.m2e.core.project.ProjectImportConfiguration; -import org.eclipse.m2e.core.ui.internal.UpdateConfigurationJob; import org.eclipse.ui.plugin.AbstractUIPlugin; +import org.jboss.tools.maven.project.examples.xpl.UpdateMavenProjectJob; import org.osgi.framework.BundleContext; /** @@ -78,6 +78,11 @@ getDefault().getLog().log(status); } + public static void log(String message) { + IStatus status = new Status(IStatus.INFO, PLUGIN_ID, message); + getDefault().getLog().log(status); + } + public static String getProjectName(MavenProjectInfo projectInfo, ProjectImportConfiguration configuration) throws CoreException { IWorkspace workspace = ResourcesPlugin.getWorkspace(); @@ -136,7 +141,7 @@ // ignore } } - Job updateJob = new UpdateConfigurationJob(selectedProjects , true, false); + Job updateJob = new UpdateMavenProjectJob(selectedProjects , true, false); updateJob.schedule(); try { updateJob.join(); Added: trunk/maven/plugins/org.jboss.tools.maven.project.examples/src/org/jboss/tools/maven/project/examples/xpl/UpdateMavenProjectJob.java =================================================================== --- trunk/maven/plugins/org.jboss.tools.maven.project.examples/src/org/jboss/tools/maven/project/examples/xpl/UpdateMavenProjectJob.java (rev 0) +++ trunk/maven/plugins/org.jboss.tools.maven.project.examples/src/org/jboss/tools/maven/project/examples/xpl/UpdateMavenProjectJob.java 2012-01-26 17:47:17 UTC (rev 38206) @@ -0,0 +1,160 @@ +/******************************************************************************* + * Copyright (c) 2010 Sonatype, Inc. + * 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: + * Sonatype, Inc. - initial API and implementation + *******************************************************************************/ + +package org.jboss.tools.maven.project.examples.xpl; + +import java.util.HashMap; +import java.util.Map; + +import org.eclipse.core.resources.IProject; +import org.eclipse.core.resources.IncrementalProjectBuilder; +import org.eclipse.core.resources.ResourcesPlugin; +import org.eclipse.core.resources.WorkspaceJob; +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.OperationCanceledException; +import org.eclipse.core.runtime.Status; +import org.eclipse.core.runtime.SubProgressMonitor; +import org.eclipse.m2e.core.MavenPlugin; +import org.eclipse.m2e.core.project.IMavenProjectRegistry; +import org.eclipse.m2e.core.project.IProjectConfigurationManager; +import org.eclipse.m2e.core.project.MavenUpdateRequest; +import org.eclipse.m2e.core.ui.internal.M2EUIPluginActivator; +import org.eclipse.m2e.core.ui.internal.Messages; +import org.eclipse.m2e.core.ui.internal.actions.OpenMavenConsoleAction; +import org.eclipse.m2e.core.ui.internal.util.M2EUIUtils; +import org.eclipse.osgi.util.NLS; +import org.eclipse.swt.widgets.Display; +import org.eclipse.ui.progress.IProgressConstants; +import org.jboss.tools.maven.project.examples.MavenProjectExamplesActivator; + +/** + * Class copied from org.eclipse.m2e.core.ui.internal.UpdateMavenProjectJob in m2e 1.1 + * to keep compatibility between m2e 1.0/1.1. + * + * @author Fred Bricon + * + * <ul> + * <li>added legacy constructor</li> + * <li>changed loggers</li> + * </ul> + */ +public class UpdateMavenProjectJob extends WorkspaceJob { + + private final IProject[] projects; + + private final boolean offline; + + private final boolean forceUpdateDependencies; + + private final boolean updateConfiguration; + + private final boolean rebuild; + + public UpdateMavenProjectJob(IProject[] projects, boolean offline, boolean forceUpdateDependencies) { + this(projects, offline, forceUpdateDependencies, + true /*updateConfiguration*/, true /*rebuild*/); + } + + public UpdateMavenProjectJob(IProject[] projects) { + this(projects, MavenPlugin.getMavenConfiguration().isOffline(), false /*forceUpdateDependencies*/, + true /*updateConfiguration*/, true /*rebuild*/); + } + + public UpdateMavenProjectJob(IProject[] projects, boolean offline, boolean forceUpdateDependencies, + boolean updateConfiguration, boolean rebuild) { + + super(Messages.UpdateSourcesAction_job_update_conf); + + this.projects = projects; + this.offline = offline; + this.forceUpdateDependencies = forceUpdateDependencies; + this.updateConfiguration = updateConfiguration; + this.rebuild = rebuild; + + setRule(MavenPlugin.getProjectConfigurationManager().getRule()); + } + + public IStatus runInWorkspace(IProgressMonitor monitor) { + IProjectConfigurationManager configurationManager = MavenPlugin.getProjectConfigurationManager(); + IMavenProjectRegistry projectRegistry = MavenPlugin.getMavenProjectRegistry(); + boolean autoBuilding = ResourcesPlugin.getWorkspace().isAutoBuilding(); + + setProperty(IProgressConstants.ACTION_PROPERTY, new OpenMavenConsoleAction()); + monitor.beginTask(getName(), projects.length); + + long l1 = System.currentTimeMillis(); + MavenProjectExamplesActivator.log("Update started"); //$NON-NLS-1$ + + MultiStatus status = null; + //project names to the errors encountered when updating them + Map<String, Throwable> updateErrors = new HashMap<String, Throwable>(); + + for(IProject project : projects) { + if(monitor.isCanceled()) { + throw new OperationCanceledException(); + } + + monitor.subTask(project.getName()); + SubProgressMonitor submonitor = new SubProgressMonitor(monitor, 1, SubProgressMonitor.SUPPRESS_SUBTASK_LABEL); + + try { + MavenUpdateRequest request = new MavenUpdateRequest(project, offline, forceUpdateDependencies); + if(updateConfiguration) { + configurationManager.updateProjectConfiguration(request, submonitor); + } else { + projectRegistry.refresh(request, submonitor); + } + // only rebuild projects that were successfully updated + if(rebuild) { + project.build(IncrementalProjectBuilder.CLEAN_BUILD, submonitor); + if(autoBuilding) { + // TODO this is not enough, in most cases we need to re-run the build several times + project.build(IncrementalProjectBuilder.INCREMENTAL_BUILD, submonitor); + } + } + } catch(CoreException ex) { + if(status == null) { + status = new MultiStatus(M2EUIPluginActivator.PLUGIN_ID, IStatus.ERROR, // + Messages.UpdateSourcesAction_error_cannot_update, null); + } + status.add(ex.getStatus()); + updateErrors.put(project.getName(), ex); + } catch(IllegalArgumentException e) { + status = new MultiStatus(M2EUIPluginActivator.PLUGIN_ID, IStatus.ERROR, // + Messages.UpdateSourcesAction_error_cannot_update, null); + updateErrors.put(project.getName(), e); + } + } + + if(updateErrors.size() > 0) { + handleErrors(updateErrors); + } + long l2 = System.currentTimeMillis(); + MavenProjectExamplesActivator.log(NLS.bind("Update completed: {0} sec", ((l2 - l1) / 1000))); //$NON-NLS-1$ + + return status != null ? status : Status.OK_STATUS; + } + + private void handleErrors(final Map<String, Throwable> updateErrors) { + final Display display = Display.getDefault(); + if(display != null) { + display.asyncExec(new Runnable() { + public void run() { + M2EUIUtils.showErrorsForProjectsDialog(display.getActiveShell(), Messages.UpdateSourcesAction_error_title, + Messages.UpdateSourcesAction_error_message, updateErrors); + } + }); + } + } +}