From 2dd21e1213340be2cdf1de72965ce957ddc85cca Mon Sep 17 00:00:00 2001
From: Kirill Likhodedov <Kirill.Likhodedov@jetbrains.com>
Date: Mon, 4 Jun 2012 16:21:59 +0400
Subject: [PATCH] [merge] Fix LineBlocksTest: TextDiffTypeEnum can be null.

---
 .../src/com/intellij/openapi/diff/impl/util/TextDiffType.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/platform/platform-impl/src/com/intellij/openapi/diff/impl/util/TextDiffType.java b/platform/platform-impl/src/com/intellij/openapi/diff/impl/util/TextDiffType.java
index 5c7595d8ae60..1d24fc30a1e7 100644
--- a/platform/platform-impl/src/com/intellij/openapi/diff/impl/util/TextDiffType.java
+++ b/platform/platform-impl/src/com/intellij/openapi/diff/impl/util/TextDiffType.java
@@ -52,7 +52,7 @@ public class TextDiffType implements DiffStatusBar.LegendTypeDescriptor {
   private final String myDisplayName;
   private final boolean myApplied;
 
-  public static TextDiffType create(@NotNull final TextDiffTypeEnum type) {
+  public static TextDiffType create(@Nullable final TextDiffTypeEnum type) {
     if (TextDiffTypeEnum.INSERT.equals(type)) {
       return INSERT;
     } else if (TextDiffTypeEnum.CHANGED.equals(type)) {