Make DiscardChangesOperation work for non-resources

Uses the new ProjectUtil.refreshRepositoryResources from the parent
change to correctly refresh the resources that were possibly affected.

Change-Id: I1c2bc7fdc9a673d33d1cf84b43894937f2cd27c6
Signed-off-by: Robin Stocker <robin@nibor.org>
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>

1 files changed, 62 insertions, 62 deletions

diff --git a/org.eclipse.egit.core/src/org/eclipse/egit/core/op/DiscardChangesOperation.java b/org.eclipse.egit.core/src/org/eclipse/egit/core/op/DiscardChangesOperation.java
index a5b38ba251..f40e59c44e 100644
--- a/org.eclipse.egit.core/src/org/eclipse/egit/core/op/DiscardChangesOperation.java
+++ b/org.eclipse.egit.core/src/org/eclipse/egit/core/op/DiscardChangesOperation.java
@@ -1,7 +1,7 @@
 /*******************************************************************************
  * Copyright (C) 2010, Jens Baumgart <jens.baumgart@sap.com>
  * Copyright (C) 2010, Roland Grunberg <rgrunber@redhat.com>
- * Copyright (C) 2012, Robin Stocker <robin@nibor.org>
+ * Copyright (C) 2012, 2014 Robin Stocker <robin@nibor.org>
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -13,24 +13,21 @@
  *******************************************************************************/
 package org.eclipse.egit.core.op;
 
-import java.util.ArrayList;
 import java.util.Collection;
-import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 
 import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IResourceRuleFactory;
 import org.eclipse.core.resources.IWorkspace;
 import org.eclipse.core.resources.IWorkspaceRunnable;
 import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.NullProgressMonitor;
 import org.eclipse.core.runtime.SubProgressMonitor;
 import org.eclipse.core.runtime.jobs.ISchedulingRule;
-import org.eclipse.core.runtime.jobs.MultiRule;
 import org.eclipse.egit.core.Activator;
 import org.eclipse.egit.core.internal.CoreText;
 import org.eclipse.egit.core.internal.job.RuleUtil;
@@ -42,17 +39,16 @@ import org.eclipse.jgit.api.errors.GitAPIException;
 import org.eclipse.jgit.lib.Repository;
 
 /**
- * The operation discards changes on a set of resources. In case of a folder
- * resource all file resources in the sub tree are processed. Untracked files
- * are ignored.
+ * The operation discards changes on a set of resources (checkout with paths).
+ * In case of a folder resource all file resources in the sub tree are
+ * processed. Untracked files are ignored.
  */
 public class DiscardChangesOperation implements IEGitOperation {
 
-	String revision;
+	private final Map<Repository, Collection<String>> pathsByRepository;
+	private final ISchedulingRule schedulingRule;
 
-	IResource[] files;
-
-	ISchedulingRule schedulingRule;
+	private String revision;
 
 	/**
 	 * Construct a {@link DiscardChangesOperation} object.
@@ -70,11 +66,24 @@ public class DiscardChangesOperation implements IEGitOperation {
 	 * @param revision
 	 */
 	public DiscardChangesOperation(IResource[] files, String revision) {
-		this.files = new IResource[files.length];
-		System.arraycopy(files, 0, this.files, 0, files.length);
+		this(ResourceUtil.splitResourcesByRepository(files));
 		this.revision = revision;
-		schedulingRule = MultiRule.combine(calcRefreshRule(files),
-				RuleUtil.getRuleForRepositories(files));
+	}
+
+	/**
+	 * {@link DiscardChangesOperation} for absolute paths.
+	 *
+	 * @param paths
+	 */
+	public DiscardChangesOperation(Collection<IPath> paths) {
+		this(ResourceUtil.splitPathsByRepository(paths));
+	}
+
+	private DiscardChangesOperation(
+			Map<Repository, Collection<String>> pathsByRepository) {
+		this.pathsByRepository = pathsByRepository;
+		this.schedulingRule = RuleUtil.getRuleForRepositories(pathsByRepository
+				.keySet());
 	}
 
 	/*
@@ -86,21 +95,6 @@ public class DiscardChangesOperation implements IEGitOperation {
 		return schedulingRule;
 	}
 
-	private static ISchedulingRule calcRefreshRule(IResource[] resources) {
-		List<ISchedulingRule> rules = new ArrayList<ISchedulingRule>();
-		IResourceRuleFactory ruleFactory = ResourcesPlugin.getWorkspace()
-				.getRuleFactory();
-		for (IResource resource : resources) {
-			ISchedulingRule rule = ruleFactory.refreshRule(resource);
-			if (rule != null)
-				rules.add(rule);
-		}
-		if (rules.size() == 0)
-			return null;
-		else
-			return new MultiRule(rules.toArray(new IResource[rules.size()]));
-	}
-
 	public void execute(IProgressMonitor m) throws CoreException {
 		IProgressMonitor monitor;
 		if (m == null)
@@ -117,25 +111,35 @@ public class DiscardChangesOperation implements IEGitOperation {
 	}
 
 	private void discardChanges(IProgressMonitor monitor) throws CoreException {
-		monitor.beginTask(CoreText.DiscardChangesOperation_discardingChanges, 2);
+		monitor.beginTask(CoreText.DiscardChangesOperation_discardingChanges,
+				pathsByRepository.size() * 2);
 		boolean errorOccurred = false;
-		try {
-			discardChanges();
-		} catch (GitAPIException e) {
-			errorOccurred = true;
-			Activator.logError(CoreText.DiscardChangesOperation_discardFailed, e);
-		}
-		monitor.worked(1);
-		try {
-			ProjectUtil.refreshResources(files, new SubProgressMonitor(monitor,
-					1));
-		} catch (CoreException e) {
-			errorOccurred = true;
-			Activator.logError(CoreText.DiscardChangesOperation_refreshFailed,
-					e);
+
+		for (Entry<Repository, Collection<String>> entry : pathsByRepository
+				.entrySet()) {
+			Repository repository = entry.getKey();
+			Collection<String> paths = entry.getValue();
+
+			try {
+				discardChanges(repository, paths);
+			} catch (GitAPIException e) {
+				errorOccurred = true;
+				Activator.logError(
+						CoreText.DiscardChangesOperation_discardFailed, e);
+			}
+			monitor.worked(1);
+
+			try {
+				ProjectUtil.refreshRepositoryResources(repository, paths,
+						new SubProgressMonitor(monitor, 1));
+			} catch (CoreException e) {
+				errorOccurred = true;
+				Activator.logError(
+						CoreText.DiscardChangesOperation_refreshFailed, e);
+			}
 		}
-		monitor.worked(1);
 		monitor.done();
+
 		if (errorOccurred) {
 			IStatus status = Activator.error(
 					CoreText.DiscardChangesOperation_discardFailedSeeLog, null);
@@ -143,22 +147,18 @@ public class DiscardChangesOperation implements IEGitOperation {
 		}
 	}
 
-	private void discardChanges() throws GitAPIException {
-		Map<Repository, Collection<String>> pathsByRepository = ResourceUtil
-				.splitResourcesByRepository(files);
-		for (Entry<Repository, Collection<String>> entry : pathsByRepository.entrySet()) {
-			Repository repository = entry.getKey();
-			ResourceUtil.saveLocalHistory(repository);
-			Collection<String> paths = entry.getValue();
-			CheckoutCommand checkoutCommand = new Git(repository).checkout();
-			checkoutCommand.setStartPoint(this.revision);
-			if (paths.isEmpty() || paths.contains("")) //$NON-NLS-1$
-				checkoutCommand.setAllPaths(true);
-			else
-				for (String path : paths)
-					checkoutCommand.addPath(path);
-			checkoutCommand.call();
+	private void discardChanges(Repository repository, Collection<String> paths)
+			throws GitAPIException {
+		ResourceUtil.saveLocalHistory(repository);
+		CheckoutCommand checkoutCommand = new Git(repository).checkout();
+		checkoutCommand.setStartPoint(this.revision);
+		if (paths.isEmpty() || paths.contains("")) //$NON-NLS-1$
+			checkoutCommand.setAllPaths(true);
+		else {
+			for (String path : paths)
+				checkoutCommand.addPath(path);
 		}
+		checkoutCommand.call();
 	}
 
 }