From e5e9b2d3d0980077b64875875a6b7b4102698c11 Mon Sep 17 00:00:00 2001
From: Nadya Zabrodina <Nadya.Zabrodina@jetbrains.com>
Date: Thu, 3 Mar 2016 14:50:38 +0300
Subject: [PATCH] [hg]: rename get conflict list,  refactor mark resolved
 method

---
 .../zmlx/hg4idea/command/HgResolveCommand.java | 18 ++++++++++--------
 .../ui/HgRunConflictResolverDialog.java        |  2 +-
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/plugins/hg4idea/src/org/zmlx/hg4idea/command/HgResolveCommand.java b/plugins/hg4idea/src/org/zmlx/hg4idea/command/HgResolveCommand.java
index d77fcb8f97e1..f5a242bbacde 100644
--- a/plugins/hg4idea/src/org/zmlx/hg4idea/command/HgResolveCommand.java
+++ b/plugins/hg4idea/src/org/zmlx/hg4idea/command/HgResolveCommand.java
@@ -18,6 +18,8 @@ import com.intellij.openapi.vcs.FilePath;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.util.Consumer;
 import com.intellij.vcsUtil.VcsFileUtil;
+import com.intellij.vcsUtil.VcsUtil;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.zmlx.hg4idea.HgFile;
 import org.zmlx.hg4idea.execution.HgCommandExecutor;
@@ -44,24 +46,24 @@ public class HgResolveCommand {
     }
     final HgCommandExecutor executor = new HgCommandExecutor(myProject);
     executor.setSilent(true);
-    final HgCommandResult result = executor.executeInCurrentThread(repo, "resolve", Arrays.asList("--list"));
+    final HgCommandResult result = executor.executeInCurrentThread(repo, "resolve", Collections.singletonList("--list"));
     if (result == null) {
       return Collections.emptyMap();
     }
     return handleResult(repo, result);
   }
 
-  public void list(final VirtualFile repo, final Consumer<Map<HgFile, HgResolveStatusEnum>> resultHandler) {
+  public void getListAsynchronously(final VirtualFile repo, final Consumer<Map<HgFile, HgResolveStatusEnum>> resultHandler) {
     if (repo == null) {
-      resultHandler.consume(Collections.<HgFile, HgResolveStatusEnum>emptyMap());
+      resultHandler.consume(Collections.emptyMap());
     }
     final HgCommandExecutor executor = new HgCommandExecutor(myProject);
     executor.setSilent(true);
-    executor.execute(repo, "resolve", Arrays.asList("--list"), new HgCommandResultHandler() {
+    executor.execute(repo, "resolve", Collections.singletonList("--list"), new HgCommandResultHandler() {
       @Override
       public void process(@Nullable HgCommandResult result) {
         if (result == null) {
-          resultHandler.consume(Collections.<HgFile, HgResolveStatusEnum>emptyMap());
+          resultHandler.consume(Collections.emptyMap());
         }
 
         final Map<HgFile, HgResolveStatusEnum> resolveStatus = handleResult(repo, result);
@@ -85,11 +87,11 @@ public class HgResolveCommand {
     return resolveStatus;
   }
 
-  public void markResolved(VirtualFile repo, VirtualFile path) {
-    new HgCommandExecutor(myProject).execute(repo, "resolve", Arrays.asList("--mark", path.getPath()), null);
+  public void markResolved(@NotNull VirtualFile repo, @NotNull VirtualFile path) {
+    markResolved(repo, Collections.singleton(VcsUtil.getFilePath(path)));
   }
 
-  public void markResolved(VirtualFile repo, Collection<FilePath> paths) {
+  public void markResolved(@NotNull VirtualFile repo, @NotNull Collection<FilePath> paths) {
     for (List<String> chunk : VcsFileUtil.chunkPaths(repo, paths)) {
       final List<String> args = new ArrayList<String>();
       args.add("--mark");
diff --git a/plugins/hg4idea/src/org/zmlx/hg4idea/ui/HgRunConflictResolverDialog.java b/plugins/hg4idea/src/org/zmlx/hg4idea/ui/HgRunConflictResolverDialog.java
index 0196bd4a16cc..a335f84627eb 100644
--- a/plugins/hg4idea/src/org/zmlx/hg4idea/ui/HgRunConflictResolverDialog.java
+++ b/plugins/hg4idea/src/org/zmlx/hg4idea/ui/HgRunConflictResolverDialog.java
@@ -73,7 +73,7 @@ public class HgRunConflictResolverDialog extends DialogWrapper {
     VirtualFile repo = repositorySelector.getRepository().getRoot();
     HgResolveCommand command = new HgResolveCommand(project);
     final ModalityState modalityState = ApplicationManager.getApplication().getModalityStateForComponent(getRootPane());
-    command.list(repo, new Consumer<Map<HgFile, HgResolveStatusEnum>>() {
+    command.getListAsynchronously(repo, new Consumer<Map<HgFile, HgResolveStatusEnum>>() {
       @Override
       public void consume(Map<HgFile, HgResolveStatusEnum> status) {
         final DefaultListModel model = new DefaultListModel();