From 0d514da1dbfd335cd0e6d8f31f5f65fd64506ab7 Mon Sep 17 00:00:00 2001
From: Nadya Zabrodina <Nadya.Zabrodina@jetbrains.com>
Date: Thu, 6 Feb 2014 12:44:04 +0400
Subject: [PATCH] style: unnecessary conditions and expressions simplified

---
 .../src/org/zmlx/hg4idea/provider/HgCheckoutProvider.java  | 7 +++----
 .../hg4idea/src/org/zmlx/hg4idea/util/HgHistoryUtil.java   | 3 ---
 .../testSrc/hg4idea/test/history/HgBrowseChangesTest.java  | 6 +++---
 3 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/plugins/hg4idea/src/org/zmlx/hg4idea/provider/HgCheckoutProvider.java b/plugins/hg4idea/src/org/zmlx/hg4idea/provider/HgCheckoutProvider.java
index a66333cc94a5..46b2f465e3a7 100644
--- a/plugins/hg4idea/src/org/zmlx/hg4idea/provider/HgCheckoutProvider.java
+++ b/plugins/hg4idea/src/org/zmlx/hg4idea/provider/HgCheckoutProvider.java
@@ -69,13 +69,12 @@ public class HgCheckoutProvider implements CheckoutProvider {
 
         // handle result
         HgCommandResult myCloneResult = clone.execute();
-        if (myCloneResult == null) {
-          new HgCommandResultNotifier(project).notifyError(null, "Clone failed", "Clone failed due to unknown error");
-        } else if (HgErrorUtil.hasErrorsInCommandExecution(myCloneResult)) {
+        if (myCloneResult == null || HgErrorUtil.hasErrorsInCommandExecution(myCloneResult)) {
           new HgCommandResultNotifier(project).notifyError(myCloneResult, "Clone failed", "Clone from " +
                                                                                           sourceRepositoryURL +
                                                                                           " failed.");
-        } else {
+        }
+        else {
           ApplicationManager.getApplication().invokeLater(new Runnable() {
             @Override
             public void run() {
diff --git a/plugins/hg4idea/src/org/zmlx/hg4idea/util/HgHistoryUtil.java b/plugins/hg4idea/src/org/zmlx/hg4idea/util/HgHistoryUtil.java
index 55627d754736..2847323b2174 100644
--- a/plugins/hg4idea/src/org/zmlx/hg4idea/util/HgHistoryUtil.java
+++ b/plugins/hg4idea/src/org/zmlx/hg4idea/util/HgHistoryUtil.java
@@ -197,9 +197,6 @@ public class HgHistoryUtil {
 
   @Nullable
   public static List<String> prepareHashes(@NotNull List<String> hashes) {
-    if (hashes.isEmpty()) {
-      return Collections.emptyList();
-    }
     List<String> hashArgs = new ArrayList<String>();
     for (String hash : hashes) {
       hashArgs.add("-r");
diff --git a/plugins/hg4idea/testSrc/hg4idea/test/history/HgBrowseChangesTest.java b/plugins/hg4idea/testSrc/hg4idea/test/history/HgBrowseChangesTest.java
index edfd46d63806..ea7850e3eae5 100644
--- a/plugins/hg4idea/testSrc/hg4idea/test/history/HgBrowseChangesTest.java
+++ b/plugins/hg4idea/testSrc/hg4idea/test/history/HgBrowseChangesTest.java
@@ -30,6 +30,7 @@ import java.util.List;
 import static com.intellij.openapi.vcs.Executor.cd;
 import static com.intellij.openapi.vcs.Executor.touch;
 import static hg4idea.test.HgExecutor.hg;
+import static java.util.Calendar.YEAR;
 
 /**
  * @author Nadya Zabrodina
@@ -52,10 +53,9 @@ public class HgBrowseChangesTest extends HgPlatformTest {
     hg("add");
     hg("commit -m add");
     java.util.Calendar now = java.util.Calendar.getInstance();
-    int year = java.util.Calendar.YEAR;
-    now.set(year, now.get(year) + 1);
+    now.add(YEAR, 1);
     dateBefore = ChangeBrowserSettings.DATE_FORMAT.format(now.getTime());
-    now.set(year, 1970);
+    now.set(YEAR, 1970);
     dateAfter = ChangeBrowserSettings.DATE_FORMAT.format(now.getTime());
   }