From fd41ee9a7dbfe3150b82a6765c0a111ddd955560 Mon Sep 17 00:00:00 2001
From: Dmitry Avdeev <Dmitry.Avdeev@jetbrains.com>
Date: Fri, 20 Feb 2015 13:05:13 +0300
Subject: [PATCH] getting rid of lock [cdr]

---
 .../fileEditor/impl/FileEditorProviderManagerImpl.java | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/FileEditorProviderManagerImpl.java b/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/FileEditorProviderManagerImpl.java
index 647f88952e96..2fffb9fc1f2c 100644
--- a/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/FileEditorProviderManagerImpl.java
+++ b/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/FileEditorProviderManagerImpl.java
@@ -50,10 +50,8 @@ import java.util.*;
 )
 public final class FileEditorProviderManagerImpl extends FileEditorProviderManager
   implements PersistentStateComponent<FileEditorProviderManagerImpl> {
-  private static final FileEditorProvider[] EMPTY_ARRAY = new FileEditorProvider[0];
-  private static final String SEPARATOR = ",";
 
-  private final List<FileEditorProvider> myProviders = new ArrayList<FileEditorProvider>();
+  private final List<FileEditorProvider> myProviders = ContainerUtil.createConcurrentList();
 
   public FileEditorProviderManagerImpl(@NotNull FileEditorProvider[] providers) {
     Extensions.getRootArea().getExtensionPoint(FileEditorProvider.EP_FILE_EDITOR_PROVIDER).addExtensionPointListener(
@@ -79,7 +77,7 @@ public final class FileEditorProviderManagerImpl extends FileEditorProviderManag
 
   @Override
   @NotNull
-  public synchronized FileEditorProvider[] getProviders(@NotNull final Project project, @NotNull final VirtualFile file) {
+  public FileEditorProvider[] getProviders(@NotNull final Project project, @NotNull final VirtualFile file) {
     // Collect all possible editors
     List<FileEditorProvider> sharedProviders = new ArrayList<FileEditorProvider>();
     boolean doNotShowTextEditor = false;
@@ -116,7 +114,7 @@ public final class FileEditorProviderManagerImpl extends FileEditorProviderManag
 
   @Override
   @Nullable
-  public synchronized FileEditorProvider getProvider(@NotNull String editorTypeId) {
+  public FileEditorProvider getProvider(@NotNull String editorTypeId) {
     for (FileEditorProvider provider : myProviders) {
       if (provider.getEditorTypeId().equals(editorTypeId)) {
         return provider;
@@ -168,7 +166,7 @@ public final class FileEditorProviderManagerImpl extends FileEditorProviderManag
   }
 
   private static String computeKey(FileEditorProvider[] providers) {
-    return StringUtil.join(ContainerUtil.map(providers, EDITOR_PROVIDER_STRING_FUNCTION), SEPARATOR);
+    return StringUtil.join(ContainerUtil.map(providers, EDITOR_PROVIDER_STRING_FUNCTION), ",");
   }
 
   @Nullable