From 4100177a46d2877ca8ec08b6d1cc753fe6195e52 Mon Sep 17 00:00:00 2001
From: Kirill Likhodedov <Kirill.Likhodedov@jetbrains.com>
Date: Wed, 10 Sep 2014 15:15:53 +0400
Subject: [PATCH] [vcs] cleanup

---
 .../src/com/intellij/dvcs/repo/Repository.java      | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/platform/dvcs-api/src/com/intellij/dvcs/repo/Repository.java b/platform/dvcs-api/src/com/intellij/dvcs/repo/Repository.java
index c269d7ba993e..a71df5c39307 100644
--- a/platform/dvcs-api/src/com/intellij/dvcs/repo/Repository.java
+++ b/platform/dvcs-api/src/com/intellij/dvcs/repo/Repository.java
@@ -48,14 +48,9 @@ import org.jetbrains.annotations.Nullable;
  * If one needs a really 100 % up-to-date value, one should call {@link #update()} and then get...().
  * update() is a synchronous read from repository file (.git or .hg), so it is guaranteed to query the real value.
  * </p>
- *
- * @author Nadya Zabrodina
  */
 public interface Repository extends Disposable {
 
-
-
-
   /**
    * Current state of the repository.
    */
@@ -64,29 +59,35 @@ public interface Repository extends Disposable {
      * HEAD is on branch, no merge process is in progress (and no rebase as well).
      */
     NORMAL,
+
     /**
      * During merge (for instance, merge failed with conflicts that weren't immediately resolved).
      */
     MERGING {
+      @NotNull
       @Override
       public String toString() {
         return "Merging";
       }
     },
+
     /**
      * During rebase.
      */
     REBASING {
+      @NotNull
       @Override
       public String toString() {
         return "Rebasing";
       }
     },
+
     /**
      * Detached HEAD state, but not during rebase (for example, manual checkout of a commit hash).
      */
-    DETACHED;
+    DETACHED
   }
+
   @NotNull
   VirtualFile getRoot();