diff --git a/platform/util/src/com/intellij/util/LineSeparator.java b/platform/util/src/com/intellij/util/LineSeparator.java index 961d2d2ec68e..7a064aa786f6 100644 --- a/platform/util/src/com/intellij/util/LineSeparator.java +++ b/platform/util/src/com/intellij/util/LineSeparator.java @@ -8,7 +8,6 @@ import com.intellij.openapi.util.SystemInfo; import com.intellij.openapi.util.text.StringUtil; import com.intellij.openapi.vfs.CharsetToolkit; import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; /** *
Identifies a line separator:
@@ -52,10 +51,6 @@ public enum LineSeparator {
return myBytes;
}
- public static boolean knownAndDifferent(@Nullable LineSeparator separator1, @Nullable LineSeparator separator2) {
- return separator1 != null && separator2 != null && !separator1.equals(separator2);
- }
-
@NotNull
public static LineSeparator getSystemLineSeparator() {
return SystemInfo.isWindows ? CRLF : LF;
diff --git a/platform/util/src/com/intellij/util/containers/ConcurrentRefHashMap.java b/platform/util/src/com/intellij/util/containers/ConcurrentRefHashMap.java
index 32a101f9e76e..d56b5153fdfb 100644
--- a/platform/util/src/com/intellij/util/containers/ConcurrentRefHashMap.java
+++ b/platform/util/src/com/intellij/util/containers/ConcurrentRefHashMap.java
@@ -319,7 +319,7 @@ abstract class ConcurrentRefHashMap