From d23add22b2696dcfd9634a745c6fde6b964e15a5 Mon Sep 17 00:00:00 2001 From: Vladimir Krivosheev Date: Fri, 13 Jan 2017 16:37:52 +0100 Subject: [PATCH] =?UTF-8?q?getAllPersistentTypes=20not=20required=20here?= =?UTF-8?q?=20=E2=80=94=20just=20use=20source=20keys?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../roots/impl/JavaModuleExternalPathsImpl.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/platform/projectModel-impl/src/com/intellij/openapi/roots/impl/JavaModuleExternalPathsImpl.java b/platform/projectModel-impl/src/com/intellij/openapi/roots/impl/JavaModuleExternalPathsImpl.java index fdec3bbdfd2a..66565ade9f17 100644 --- a/platform/projectModel-impl/src/com/intellij/openapi/roots/impl/JavaModuleExternalPathsImpl.java +++ b/platform/projectModel-impl/src/com/intellij/openapi/roots/impl/JavaModuleExternalPathsImpl.java @@ -23,12 +23,12 @@ import com.intellij.openapi.vfs.VirtualFile; import com.intellij.openapi.vfs.pointers.VirtualFilePointerContainer; import com.intellij.openapi.vfs.pointers.VirtualFilePointerManager; import com.intellij.util.ArrayUtil; +import gnu.trove.THashMap; import org.jdom.Element; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; import org.jetbrains.jps.model.serialization.java.JpsJavaModelSerializerExtension; -import java.util.HashMap; import java.util.Map; /** @@ -36,7 +36,7 @@ import java.util.Map; */ public class JavaModuleExternalPathsImpl extends JavaModuleExternalPaths { @NonNls private static final String ROOT_ELEMENT = JpsJavaModelSerializerExtension.ROOT_TAG; - private final Map myOrderRootPointerContainers = new HashMap<>(); + private final Map myOrderRootPointerContainers = new THashMap<>(); private JavaModuleExternalPathsImpl mySource; public JavaModuleExternalPathsImpl() { @@ -127,10 +127,10 @@ public class JavaModuleExternalPathsImpl extends JavaModuleExternalPaths { } } - private void copyContainersFrom(@NotNull JavaModuleExternalPathsImpl paths) { + private void copyContainersFrom(@NotNull JavaModuleExternalPathsImpl source) { myOrderRootPointerContainers.clear(); - for (PersistentOrderRootType orderRootType : OrderRootType.getAllPersistentTypes()) { - final VirtualFilePointerContainer otherContainer = paths.myOrderRootPointerContainers.get(orderRootType); + for (OrderRootType orderRootType : source.myOrderRootPointerContainers.keySet()) { + final VirtualFilePointerContainer otherContainer = source.myOrderRootPointerContainers.get(orderRootType); if (otherContainer != null) { myOrderRootPointerContainers.put(orderRootType, otherContainer.clone(this, null)); }