From 6322d5c36d70d92eb9c5ff8001ecc402aade4ce1 Mon Sep 17 00:00:00 2001
From: Nadya Zabrodina <Nadya.Zabrodina@jetbrains.com>
Date: Wed, 2 Mar 2016 19:46:46 +0300
Subject: [PATCH] [hg] rename branch creation method

---
 .../src/org/zmlx/hg4idea/HgTaskHandler.java        |  2 +-
 .../zmlx/hg4idea/branch/HgBranchPopupActions.java  |  2 +-
 .../zmlx/hg4idea/command/HgBookmarkCommand.java    | 14 +++++++-------
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/plugins/hg4idea/src/org/zmlx/hg4idea/HgTaskHandler.java b/plugins/hg4idea/src/org/zmlx/hg4idea/HgTaskHandler.java
index d6dbc8f33ec7..843c14cc3c6b 100644
--- a/plugins/hg4idea/src/org/zmlx/hg4idea/HgTaskHandler.java
+++ b/plugins/hg4idea/src/org/zmlx/hg4idea/HgTaskHandler.java
@@ -58,7 +58,7 @@ public class HgTaskHandler extends DvcsTaskHandler<HgRepository> {
 
   @Override
   protected void checkoutAsNewBranch(@NotNull String name, @NotNull List<HgRepository> repositories) {
-    HgBookmarkCommand.createBookmark(repositories, name, true);
+    HgBookmarkCommand.createBookmarkAsynchronously(repositories, name, true);
   }
 
   @Override
diff --git a/plugins/hg4idea/src/org/zmlx/hg4idea/branch/HgBranchPopupActions.java b/plugins/hg4idea/src/org/zmlx/hg4idea/branch/HgBranchPopupActions.java
index 98504387d551..bc660bc216da 100644
--- a/plugins/hg4idea/src/org/zmlx/hg4idea/branch/HgBranchPopupActions.java
+++ b/plugins/hg4idea/src/org/zmlx/hg4idea/branch/HgBranchPopupActions.java
@@ -221,7 +221,7 @@ public class HgBranchPopupActions {
       if (bookmarkDialog.showAndGet()) {
         final String name = bookmarkDialog.getName();
         if (!StringUtil.isEmptyOrSpaces(name)) {
-          HgBookmarkCommand.createBookmark(myRepositories, name, bookmarkDialog.isActive());
+          HgBookmarkCommand.createBookmarkAsynchronously(myRepositories, name, bookmarkDialog.isActive());
         }
       }
     }
diff --git a/plugins/hg4idea/src/org/zmlx/hg4idea/command/HgBookmarkCommand.java b/plugins/hg4idea/src/org/zmlx/hg4idea/command/HgBookmarkCommand.java
index ec8408e5f0bd..c8684bf03cda 100644
--- a/plugins/hg4idea/src/org/zmlx/hg4idea/command/HgBookmarkCommand.java
+++ b/plugins/hg4idea/src/org/zmlx/hg4idea/command/HgBookmarkCommand.java
@@ -43,20 +43,20 @@ public class HgBookmarkCommand {
     };
   }
 
-  public void createBookmark(boolean isActive) throws HgCommandException {
+  public void createBookmarkAsynchronously(boolean isActive) throws HgCommandException {
     if (isActive) {
-      executeBookmarkCommand();
+      executeBookmarkCommandAsynchronously();
     }
     else {
-      executeBookmarkCommand("--inactive");
+      executeBookmarkCommandAsynchronously("--inactive");
     }
   }
 
-  public static void createBookmark(@NotNull List<HgRepository> repositories, @NotNull String name, boolean isActive) {
+  public static void createBookmarkAsynchronously(@NotNull List<HgRepository> repositories, @NotNull String name, boolean isActive) {
     for (HgRepository repository : repositories) {
       Project project = repository.getProject();
       try {
-        new HgBookmarkCommand(project, repository.getRoot(), name).createBookmark(isActive);
+        new HgBookmarkCommand(project, repository.getRoot(), name).createBookmarkAsynchronously(isActive);
       }
       catch (HgCommandException exception) {
         HgErrorUtil.handleException(project, exception);
@@ -65,10 +65,10 @@ public class HgBookmarkCommand {
   }
 
   public void deleteBookmark() throws HgCommandException {
-    executeBookmarkCommand("-d");  //delete
+    executeBookmarkCommandAsynchronously("-d");  //delete
   }
 
-  private void executeBookmarkCommand(@NotNull String... args) throws HgCommandException {
+  private void executeBookmarkCommandAsynchronously(@NotNull String... args) throws HgCommandException {
     if (StringUtil.isEmptyOrSpaces(myBookmarkName)) {
       throw new HgCommandException("bookmark name is empty");
     }