diff --git a/java/compiler/impl/src/com/intellij/compiler/chainsSearch/context/ChainCompletionContext.java b/java/compiler/impl/src/com/intellij/compiler/chainsSearch/context/ChainCompletionContext.java index b1f590a5cd4b..5234775f3278 100644 --- a/java/compiler/impl/src/com/intellij/compiler/chainsSearch/context/ChainCompletionContext.java +++ b/java/compiler/impl/src/com/intellij/compiler/chainsSearch/context/ChainCompletionContext.java @@ -92,8 +92,8 @@ public class ChainCompletionContext { myResolveScope = context.getResolveScope(); myProject = context.getProject(); myResolveHelper = PsiResolveHelper.SERVICE.getInstance(myProject); - myQualifierClassResolver = FactoryMap.createMap(sign -> sign.resolveQualifier(myProject, myResolveScope, accessValidator())); - myResolver = FactoryMap.createMap(sign -> sign.resolve(myProject, myResolveScope, accessValidator())); + myQualifierClassResolver = FactoryMap.create(sign1 -> sign1.resolveQualifier(myProject, myResolveScope, accessValidator())); + myResolver = FactoryMap.create(sign -> sign.resolve(myProject, myResolveScope, accessValidator())); } @NotNull diff --git a/java/idea-ui/src/com/intellij/ide/projectWizard/ProjectTypeStep.java b/java/idea-ui/src/com/intellij/ide/projectWizard/ProjectTypeStep.java index 575257caf028..85c8be48a693 100644 --- a/java/idea-ui/src/com/intellij/ide/projectWizard/ProjectTypeStep.java +++ b/java/idea-ui/src/com/intellij/ide/projectWizard/ProjectTypeStep.java @@ -94,7 +94,7 @@ public class ProjectTypeStep extends ModuleWizardStep implements SettingsStep, D private final AddSupportForFrameworksPanel myFrameworksPanel; private final ModuleBuilder.ModuleConfigurationUpdater myConfigurationUpdater; @SuppressWarnings("MismatchedQueryAndUpdateOfCollection") - private final Map myBuilders = FactoryMap.createMap(key -> (ModuleBuilder)key.createModuleBuilder()); + private final Map myBuilders = FactoryMap.create(key -> (ModuleBuilder)key.createModuleBuilder()); private final Map myCustomSteps = new THashMap<>(); private final MultiMap myTemplatesMap; private JPanel myPanel; diff --git a/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/LiveVariablesAnalyzer.java b/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/LiveVariablesAnalyzer.java index 18f2f5f36fc0..45c8f27f2c89 100644 --- a/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/LiveVariablesAnalyzer.java +++ b/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/LiveVariablesAnalyzer.java @@ -42,7 +42,8 @@ public class LiveVariablesAnalyzer { private final Instruction[] myInstructions; private final MultiMap myForwardMap; private final MultiMap myBackwardMap; - @SuppressWarnings("MismatchedQueryAndUpdateOfCollection") private final Map> myClosureReads = FactoryMap.createMap(closure-> { + @SuppressWarnings("MismatchedQueryAndUpdateOfCollection") private final Map> myClosureReads = + FactoryMap.create(closure -> { final Set result = ContainerUtil.newLinkedHashSet(); closure.accept(new PsiRecursiveElementWalkingVisitor() { @Override @@ -57,8 +58,7 @@ public class LiveVariablesAnalyzer { } }); return ContainerUtil.newArrayList(result); - } - ); + }); public LiveVariablesAnalyzer(ControlFlow flow, DfaValueFactory factory) { myFactory = factory; diff --git a/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/value/DfaValueFactory.java b/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/value/DfaValueFactory.java index dd78813a1f92..4e184cc12f20 100644 --- a/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/value/DfaValueFactory.java +++ b/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/value/DfaValueFactory.java @@ -205,7 +205,7 @@ public class DfaValueFactory { } private final Map>, DfaControlTransferValue> myControlTransfers = - FactoryMap.createMap(p -> new DfaControlTransferValue(this, p.first, p.second)); + FactoryMap.create(p -> new DfaControlTransferValue(this, p.first, p.second)); private final DfaVariableValue.Factory myVarFactory; private final DfaConstValue.Factory myConstFactory; diff --git a/java/java-analysis-impl/src/com/intellij/codeInspection/dependencyViolation/DependencyInspectionBase.java b/java/java-analysis-impl/src/com/intellij/codeInspection/dependencyViolation/DependencyInspectionBase.java index 5e961738121f..46f3cc39c8f4 100644 --- a/java/java-analysis-impl/src/com/intellij/codeInspection/dependencyViolation/DependencyInspectionBase.java +++ b/java/java-analysis-impl/src/com/intellij/codeInspection/dependencyViolation/DependencyInspectionBase.java @@ -78,7 +78,7 @@ public class DependencyInspectionBase extends BaseJavaBatchLocalInspectionTool { DependenciesBuilder.analyzeFileDependencies(file, new DependenciesBuilder.DependencyProcessor() { @SuppressWarnings("MismatchedQueryAndUpdateOfCollection") private final Map violations = - FactoryMap.createMap(dependencyFile -> validationManager.getViolatorDependencyRules(file, dependencyFile)); + FactoryMap.create(dependencyFile -> validationManager.getViolatorDependencyRules(file, dependencyFile)); @Override public void process(PsiElement place, PsiElement dependency) { diff --git a/java/java-psi-impl/src/com/intellij/psi/scope/conflictResolvers/JavaMethodsConflictResolver.java b/java/java-psi-impl/src/com/intellij/psi/scope/conflictResolvers/JavaMethodsConflictResolver.java index d5109bd7212f..781f5f2e93f4 100644 --- a/java/java-psi-impl/src/com/intellij/psi/scope/conflictResolvers/JavaMethodsConflictResolver.java +++ b/java/java-psi-impl/src/com/intellij/psi/scope/conflictResolvers/JavaMethodsConflictResolver.java @@ -77,7 +77,7 @@ public class JavaMethodsConflictResolver implements PsiConflictResolver{ if (conflicts.isEmpty()) return null; if (conflicts.size() == 1) return conflicts.get(0); - final Map map = FactoryMap.createMap(key -> key.getSubstitutor(false)); + final Map map = FactoryMap.create(key -> key.getSubstitutor(false)); boolean atLeastOneMatch = checkParametersNumber(conflicts, getActualParametersLength(), map, true); if (conflicts.size() == 1) return conflicts.get(0); diff --git a/platform/core-impl/src/com/intellij/openapi/vfs/impl/jar/CoreJarHandler.java b/platform/core-impl/src/com/intellij/openapi/vfs/impl/jar/CoreJarHandler.java index 37241abcca50..93d48e3194b3 100644 --- a/platform/core-impl/src/com/intellij/openapi/vfs/impl/jar/CoreJarHandler.java +++ b/platform/core-impl/src/com/intellij/openapi/vfs/impl/jar/CoreJarHandler.java @@ -40,7 +40,7 @@ public class CoreJarHandler extends ZipHandler { Map entries = new HashMap<>(); final Map entriesMap = getEntriesMap(); - final Map> childrenMap = FactoryMap.createMap(key -> new ArrayList<>()); + final Map> childrenMap = FactoryMap.create(key -> new ArrayList<>()); for (EntryInfo info : entriesMap.values()) { CoreJarVirtualFile file = getOrCreateFile(info, entries); VirtualFile parent = file.getParent(); diff --git a/platform/dvcs-impl/src/com/intellij/dvcs/branch/DvcsTaskHandler.java b/platform/dvcs-impl/src/com/intellij/dvcs/branch/DvcsTaskHandler.java index efec6da1187d..64ab7ef80644 100644 --- a/platform/dvcs-impl/src/com/intellij/dvcs/branch/DvcsTaskHandler.java +++ b/platform/dvcs-impl/src/com/intellij/dvcs/branch/DvcsTaskHandler.java @@ -106,7 +106,7 @@ public abstract class DvcsTaskHandler extends VcsTaskHandl public TaskInfo[] getCurrentTasks() { List repositories = myRepositoryManager.getRepositories(); @SuppressWarnings("MismatchedQueryAndUpdateOfCollection") - Map tasks = FactoryMap.createMap(key -> new TaskInfo(key, new ArrayList<>())); + Map tasks = FactoryMap.create(key -> new TaskInfo(key, new ArrayList<>())); for (R repository : repositories) { String branch = getActiveBranch(repository); if (branch != null) { diff --git a/platform/editor-ui-ex/src/com/intellij/openapi/editor/ex/util/LayeredLexerEditorHighlighter.java b/platform/editor-ui-ex/src/com/intellij/openapi/editor/ex/util/LayeredLexerEditorHighlighter.java index 14796c99580d..998a859ae239 100644 --- a/platform/editor-ui-ex/src/com/intellij/openapi/editor/ex/util/LayeredLexerEditorHighlighter.java +++ b/platform/editor-ui-ex/src/com/intellij/openapi/editor/ex/util/LayeredLexerEditorHighlighter.java @@ -140,11 +140,10 @@ public class LayeredLexerEditorHighlighter extends LexerEditorHighlighter { @Override protected TokenProcessor createTokenProcessor(final int startIndex) { return new TokenProcessor() { - final Map docTexts = FactoryMap.createMap(key-> { - final MappedRange predecessor = key.findPredecessor(startIndex); - return new LightMapper(key, predecessor != null ? predecessor.range.getEndOffset() : 0); - } - ); + final Map docTexts = FactoryMap.create(key -> { + final MappedRange predecessor = key.findPredecessor(startIndex); + return new LightMapper(key, predecessor != null ? predecessor.range.getEndOffset() : 0); + }); @Override public void addToken(final int i, final int startOffset, final int endOffset, final int data, final IElementType tokenType) { @@ -232,8 +231,8 @@ public class LayeredLexerEditorHighlighter extends LexerEditorHighlighter { @Override public void remove(int startIndex, int endIndex) { - Map mins = FactoryMap.createMap(key -> Integer.MAX_VALUE); - Map maxs = FactoryMap.createMap(key -> 0); + Map mins = FactoryMap.create(key -> Integer.MAX_VALUE); + Map maxs = FactoryMap.create(key -> 0); for (int i = startIndex; i < endIndex; i++) { final MappedRange range = myRanges[i]; diff --git a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/project/manage/ExternalProjectsState.java b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/project/manage/ExternalProjectsState.java index 9400f246b9ba..ecfd4f646476 100644 --- a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/project/manage/ExternalProjectsState.java +++ b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/project/manage/ExternalProjectsState.java @@ -30,7 +30,7 @@ import java.util.Map; * @since 10/23/2014 */ public class ExternalProjectsState { - private final Map myExternalSystemsState = FactoryMap.createMap(key-> new State()); + private final Map myExternalSystemsState = FactoryMap.create(key -> new State()); @Property(surroundWithTag = false) @MapAnnotation(surroundWithTag = false, surroundValueWithTag = false, surroundKeyWithTag = false, diff --git a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/project/manage/ExternalSystemTaskActivator.java b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/project/manage/ExternalSystemTaskActivator.java index 4b46c9ff22d2..900db53fc668 100644 --- a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/project/manage/ExternalSystemTaskActivator.java +++ b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/project/manage/ExternalSystemTaskActivator.java @@ -139,14 +139,13 @@ public class ExternalSystemTaskActivator { //noinspection MismatchedQueryAndUpdateOfCollection Map> lazyConfigurationsMap = - FactoryMap.createMap(key-> { - final AbstractExternalSystemTaskConfigurationType configurationType = - ExternalSystemUtil.findConfigurationType(key); - if (configurationType == null) return null; - return ContainerUtil.map2Map(RunManager.getInstance(myProject).getConfigurationSettingsList(configurationType), - configurationSettings -> Pair.create(configurationSettings.getName(), configurationSettings)); - } - ); + FactoryMap.create(key -> { + final AbstractExternalSystemTaskConfigurationType configurationType = + ExternalSystemUtil.findConfigurationType(key); + if (configurationType == null) return null; + return ContainerUtil.map2Map(RunManager.getInstance(myProject).getConfigurationSettingsList(configurationType), + configurationSettings1 -> Pair.create(configurationSettings1.getName(), configurationSettings1)); + }); for (final ExternalProjectsStateProvider.TasksActivation activation : stateProvider.getAllTasksActivation()) { final boolean hashPath = modules.contains(activation.projectPath); diff --git a/platform/lang-impl/src/com/intellij/codeInspection/offlineViewer/OfflineInspectionRVContentProvider.java b/platform/lang-impl/src/com/intellij/codeInspection/offlineViewer/OfflineInspectionRVContentProvider.java index a7724bd04e41..a6ba38304f0b 100644 --- a/platform/lang-impl/src/com/intellij/codeInspection/offlineViewer/OfflineInspectionRVContentProvider.java +++ b/platform/lang-impl/src/com/intellij/codeInspection/offlineViewer/OfflineInspectionRVContentProvider.java @@ -40,7 +40,7 @@ import java.util.function.Function; public class OfflineInspectionRVContentProvider extends InspectionRVContentProvider { private final Map>> myContent; private final Map> myResolvedDescriptor = - FactoryMap.createMap(key -> new THashMap<>()); + FactoryMap.create(key -> new THashMap<>()); public OfflineInspectionRVContentProvider(@NotNull Map>> content, @NotNull Project project) { diff --git a/platform/lang-impl/src/com/intellij/codeInspection/ui/InspectionViewSuppressActionHolder.java b/platform/lang-impl/src/com/intellij/codeInspection/ui/InspectionViewSuppressActionHolder.java index 26acd7b726c2..d1e2b48c2b4c 100644 --- a/platform/lang-impl/src/com/intellij/codeInspection/ui/InspectionViewSuppressActionHolder.java +++ b/platform/lang-impl/src/com/intellij/codeInspection/ui/InspectionViewSuppressActionHolder.java @@ -39,7 +39,8 @@ import java.util.stream.Collectors; import java.util.stream.Stream; public class InspectionViewSuppressActionHolder { - private final Map> mySuppressActions = FactoryMap.createMap(__ -> new THashMap<>()); + private final Map> mySuppressActions = + FactoryMap.create(__ -> new THashMap<>()); private final Interner> myActionSetInterner = new Interner<>(); @NotNull diff --git a/platform/lang-impl/src/com/intellij/framework/detection/impl/exclude/DetectionExcludesConfigurationImpl.java b/platform/lang-impl/src/com/intellij/framework/detection/impl/exclude/DetectionExcludesConfigurationImpl.java index aef99f2750e5..e60368210381 100644 --- a/platform/lang-impl/src/com/intellij/framework/detection/impl/exclude/DetectionExcludesConfigurationImpl.java +++ b/platform/lang-impl/src/com/intellij/framework/detection/impl/exclude/DetectionExcludesConfigurationImpl.java @@ -51,7 +51,7 @@ public class DetectionExcludesConfigurationImpl extends DetectionExcludesConfigu myProject = project; myPointerManager = pointerManager; myExcludedFrameworks = new HashSet<>(); - myExcludedFiles = FactoryMap.createMap(key -> myPointerManager.createContainer(DetectionExcludesConfigurationImpl.this)); + myExcludedFiles = FactoryMap.create(key -> myPointerManager.createContainer(this)); } @Override diff --git a/platform/lang-impl/src/com/intellij/ide/util/DeleteUtil.java b/platform/lang-impl/src/com/intellij/ide/util/DeleteUtil.java index 2f8d0ca61723..c5bc50e9c2e9 100644 --- a/platform/lang-impl/src/com/intellij/ide/util/DeleteUtil.java +++ b/platform/lang-impl/src/com/intellij/ide/util/DeleteUtil.java @@ -40,7 +40,7 @@ public class DeleteUtil { return MessageFormat.format(messageTemplate, type + (StringUtil.isEmptyOrSpaces(name) ? "" : " \"" + name + "\"")); } - Map countMap = FactoryMap.createMap(key -> 0); + Map countMap = FactoryMap.create(key -> 0); Map pluralToSingular = new HashMap<>(); int directoryCount = 0; String containerType = null; diff --git a/platform/lang-impl/src/com/intellij/ide/util/MemberChooser.java b/platform/lang-impl/src/com/intellij/ide/util/MemberChooser.java index bab83fa2d6f9..2783698014b4 100644 --- a/platform/lang-impl/src/com/intellij/ide/util/MemberChooser.java +++ b/platform/lang-impl/src/com/intellij/ide/util/MemberChooser.java @@ -206,28 +206,27 @@ public class MemberChooser extends DialogWrapper implemen final DefaultMutableTreeNode rootNode = new DefaultMutableTreeNode(); final Ref count = new Ref<>(0); Ref> mapRef = new Ref<>(); - mapRef.set(FactoryMap.createMap(key-> { - ParentNode node = null; - DefaultMutableTreeNode parentNode = rootNode; + mapRef.set(FactoryMap.create(key -> { + ParentNode node = null; + DefaultMutableTreeNode parentNode1 = rootNode; - if (supportsNestedContainers() && key instanceof ClassMember) { - MemberChooserObject parentNodeDelegate = ((ClassMember)key).getParentNodeDelegate(); + if (supportsNestedContainers() && key instanceof ClassMember) { + MemberChooserObject parentNodeDelegate = ((ClassMember)key).getParentNodeDelegate(); - if (parentNodeDelegate != null) { - parentNode = mapRef.get().get(parentNodeDelegate); - } + if (parentNodeDelegate != null) { + parentNode1 = mapRef.get().get(parentNodeDelegate); } - if (isContainerNode(key)) { - final ContainerNode containerNode = new ContainerNode(parentNode, key, count); - node = containerNode; - myContainerNodes.add(containerNode); - } - if (node == null) { - node = new ParentNode(parentNode, key, count); - } - return node; } - )); + if (isContainerNode(key)) { + final ContainerNode containerNode = new ContainerNode(parentNode1, key, count); + node = containerNode; + myContainerNodes.add(containerNode); + } + if (node == null) { + node = new ParentNode(parentNode1, key, count); + } + return node; + })); final Map map = mapRef.get(); for (T object : myElements) { final ParentNode parentNode = map.get(object.getParentNodeDelegate()); diff --git a/platform/lang-impl/src/com/intellij/psi/impl/include/FileIncludeIndex.java b/platform/lang-impl/src/com/intellij/psi/impl/include/FileIncludeIndex.java index ce6bf34af344..fa0e9bc20e66 100644 --- a/platform/lang-impl/src/com/intellij/psi/impl/include/FileIncludeIndex.java +++ b/platform/lang-impl/src/com/intellij/psi/impl/include/FileIncludeIndex.java @@ -82,7 +82,7 @@ public class FileIncludeIndex extends FileBasedIndexExtension> map(@NotNull FileContent inputData) { - Map> map = FactoryMap.createMap(key -> new ArrayList<>()); + Map> map = FactoryMap.create(key -> new ArrayList<>()); for (FileIncludeProvider provider : Holder.myProviders) { if (!provider.acceptFile(inputData.getFile())) continue; diff --git a/platform/lang-impl/src/com/intellij/psi/util/proximity/PsiProximityComparator.java b/platform/lang-impl/src/com/intellij/psi/util/proximity/PsiProximityComparator.java index bffb6d5dbbbf..33cb69897739 100644 --- a/platform/lang-impl/src/com/intellij/psi/util/proximity/PsiProximityComparator.java +++ b/platform/lang-impl/src/com/intellij/psi/util/proximity/PsiProximityComparator.java @@ -51,7 +51,7 @@ public class PsiProximityComparator implements Comparator { public PsiProximityComparator(@Nullable PsiElement context) { myContext = context; myContextModule = context == null ? null : ModuleUtilCore.findModuleForPsiElement(context); - myProximities = FactoryMap.createMap(key -> getProximity(key, myContext)); + myProximities = FactoryMap.create(key -> getProximity(key, myContext)); } @Override diff --git a/platform/lang-impl/src/com/intellij/util/gist/VirtualFileGistImpl.java b/platform/lang-impl/src/com/intellij/util/gist/VirtualFileGistImpl.java index 95d97ab262b1..b6a06fb9a2eb 100644 --- a/platform/lang-impl/src/com/intellij/util/gist/VirtualFileGistImpl.java +++ b/platform/lang-impl/src/com/intellij/util/gist/VirtualFileGistImpl.java @@ -91,8 +91,8 @@ class VirtualFileGistImpl implements VirtualFileGist { } @SuppressWarnings("MismatchedQueryAndUpdateOfCollection") - private static final Map, FileAttribute> ourAttributes = FactoryMap.createMap( - key -> new FileAttribute(key.first, key.second, false)); + private static final Map, FileAttribute> ourAttributes = + FactoryMap.create(key -> new FileAttribute(key.first, key.second, false)); private FileAttribute getFileAttribute(@Nullable Project project) { synchronized (ourAttributes) { diff --git a/platform/platform-impl/src/com/intellij/ide/UiActivityMonitorImpl.java b/platform/platform-impl/src/com/intellij/ide/UiActivityMonitorImpl.java index 9dbb46d556f7..c1304f838b3a 100644 --- a/platform/platform-impl/src/com/intellij/ide/UiActivityMonitorImpl.java +++ b/platform/platform-impl/src/com/intellij/ide/UiActivityMonitorImpl.java @@ -32,7 +32,7 @@ import javax.swing.*; import java.util.*; public class UiActivityMonitorImpl extends UiActivityMonitor implements ModalityStateListener, Disposable { - private final Map myObjects = FactoryMap.createMap(this::create); + private final Map myObjects = FactoryMap.create(this::create); @NotNull private BusyContainer create(Project key) { diff --git a/platform/platform-impl/src/com/intellij/openapi/wm/impl/IdeGlassPaneImpl.java b/platform/platform-impl/src/com/intellij/openapi/wm/impl/IdeGlassPaneImpl.java index 30aaed7d3175..be0e93a6df64 100644 --- a/platform/platform-impl/src/com/intellij/openapi/wm/impl/IdeGlassPaneImpl.java +++ b/platform/platform-impl/src/com/intellij/openapi/wm/impl/IdeGlassPaneImpl.java @@ -39,7 +39,6 @@ import com.intellij.util.ui.EmptyClipboardOwner; import com.intellij.util.ui.MouseEventAdapter; import com.intellij.util.ui.UIUtil; import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; import javax.swing.*; import javax.swing.text.html.HTMLEditorKit; @@ -71,7 +70,7 @@ public class IdeGlassPaneImpl extends JPanel implements IdeGlassPaneEx, IdeEvent }); private final JRootPane myRootPane; - private final Map myNamedPainters = FactoryMap.createMap(key -> new PaintersHelper(IdeGlassPaneImpl.this)); + private final Map myNamedPainters = FactoryMap.create(key -> new PaintersHelper(this)); private boolean myPreprocessorActive; private final Map myListener2Cursor = new LinkedHashMap<>(); diff --git a/platform/usageView/src/com/intellij/usages/ChunkExtractor.java b/platform/usageView/src/com/intellij/usages/ChunkExtractor.java index e97a5dcdc1fb..9393db086500 100644 --- a/platform/usageView/src/com/intellij/usages/ChunkExtractor.java +++ b/platform/usageView/src/com/intellij/usages/ChunkExtractor.java @@ -92,7 +92,7 @@ public class ChunkExtractor { @NotNull @Override protected Map create() { - return FactoryMap.createMap(psiFile -> new ChunkExtractor(psiFile)); + return FactoryMap.create(psiFile -> new ChunkExtractor(psiFile)); } }; } diff --git a/platform/util/src/com/intellij/util/containers/FactoryMap.java b/platform/util/src/com/intellij/util/containers/FactoryMap.java index e661fb1ee5f7..a16d71558746 100644 --- a/platform/util/src/com/intellij/util/containers/FactoryMap.java +++ b/platform/util/src/com/intellij/util/containers/FactoryMap.java @@ -40,7 +40,7 @@ public abstract class FactoryMap implements Map { private Map myMap; /** - * Use {@link #createMap(Function)} instead + * Use {@link #create(Function)} instead */ @Deprecated public FactoryMap() { @@ -181,8 +181,17 @@ public abstract class FactoryMap implements Map { }); } + /** + * Use {@link #create(Function)} instead. TODO to be removed in IDEA 2018 + */ + @Deprecated @NotNull - public static Map createMap(@NotNull final Function computeValue) { + public static FactoryMap createMap(@NotNull final Function computeValue) { + return (FactoryMap)create(computeValue); + } + + @NotNull + public static Map create(@NotNull final Function computeValue) { //noinspection deprecation return new FactoryMap() { @Nullable diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/TreeModelBuilder.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/TreeModelBuilder.java index 1c09f68912df..bcc6d92ff8cb 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/TreeModelBuilder.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/TreeModelBuilder.java @@ -30,7 +30,6 @@ import com.intellij.util.containers.FactoryMap; import com.intellij.util.containers.MultiMap; import com.intellij.util.ui.tree.TreeUtil; import com.intellij.vcsUtil.VcsUtil; -import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -74,10 +73,10 @@ public class TreeModelBuilder { myShowFlatten = showFlatten; myRoot = ChangesBrowserNode.createRoot(myProject); myModel = new DefaultTreeModel(myRoot); - myGroupingPoliciesCache = FactoryMap.createMap(key-> { - ChangesGroupingPolicyFactory factory = ChangesGroupingPolicyFactory.getInstance(myProject); - return factory != null ? factory.createGroupingPolicy(myModel) : null; - }); + myGroupingPoliciesCache = FactoryMap.create(key -> { + ChangesGroupingPolicyFactory factory = ChangesGroupingPolicyFactory.getInstance(myProject); + return factory != null ? factory.createGroupingPolicy(myModel) : null; + }); myFoldersCache = new HashMap<>(); } diff --git a/plugins/devkit/src/dom/index/RegistrationIndexer.java b/plugins/devkit/src/dom/index/RegistrationIndexer.java index 45b97eb34f5d..cea4c0a3363c 100644 --- a/plugins/devkit/src/dom/index/RegistrationIndexer.java +++ b/plugins/devkit/src/dom/index/RegistrationIndexer.java @@ -52,7 +52,7 @@ class RegistrationIndexer { final DomFileElement fileElement = DescriptorUtil.getIdeaPlugin((XmlFile)file); if (fileElement == null) return Collections.emptyMap(); - myValueMap = FactoryMap.createMap(s -> new SmartList<>()); + myValueMap = FactoryMap.create(s -> new SmartList<>()); process(fileElement.getRootElement()); return myValueMap; diff --git a/plugins/google-app-engine/jps-plugin/src/org/jetbrains/jps/appengine/build/EnhancerProcessHandlerBase.java b/plugins/google-app-engine/jps-plugin/src/org/jetbrains/jps/appengine/build/EnhancerProcessHandlerBase.java index ddf62b572e29..11b8e219b002 100644 --- a/plugins/google-app-engine/jps-plugin/src/org/jetbrains/jps/appengine/build/EnhancerProcessHandlerBase.java +++ b/plugins/google-app-engine/jps-plugin/src/org/jetbrains/jps/appengine/build/EnhancerProcessHandlerBase.java @@ -37,7 +37,7 @@ import java.util.Map; public abstract class EnhancerProcessHandlerBase extends BaseOSProcessHandler { private static final Logger LOG = Logger.getInstance("#com.intellij.appengine.enhancement.EnhancerProcessHandler"); private Map myParsers = - FactoryMap.createMap(key -> new EnhancerOutputParser(ProcessOutputTypes.STDERR.equals(key))); + FactoryMap.create(key -> new EnhancerOutputParser(ProcessOutputTypes.STDERR.equals(key))); public EnhancerProcessHandlerBase(Process process, @NotNull String commandLine, Charset charset) { super(process, commandLine, charset); diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/config/GradleResourceCompilerConfigurationGenerator.java b/plugins/gradle/src/org/jetbrains/plugins/gradle/config/GradleResourceCompilerConfigurationGenerator.java index 0a6743803fa5..9881d9aef924 100644 --- a/plugins/gradle/src/org/jetbrains/plugins/gradle/config/GradleResourceCompilerConfigurationGenerator.java +++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/config/GradleResourceCompilerConfigurationGenerator.java @@ -149,8 +149,8 @@ public class GradleResourceCompilerConfigurationGenerator { final Map affectedGradleModuleConfigurations = ContainerUtil.newTroveMap(); //noinspection MismatchedQueryAndUpdateOfCollection - final Map lazyExternalProjectMap = FactoryMap.createMap( - gradleProjectPath -> externalProjectDataCache.getRootExternalProject(GradleConstants.SYSTEM_ID, new File(gradleProjectPath))); + final Map lazyExternalProjectMap = FactoryMap.create( + gradleProjectPath1 -> externalProjectDataCache.getRootExternalProject(GradleConstants.SYSTEM_ID, new File(gradleProjectPath1))); for (Module module : context.getCompileScope().getAffectedModules()) { if (!ExternalSystemApiUtil.isExternalSystemAwareModule(GradleConstants.SYSTEM_ID, module)) continue; diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/transformations/TransformationContextImpl.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/transformations/TransformationContextImpl.java index ade2f1b3a539..06ed36c437b4 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/transformations/TransformationContextImpl.java +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/transformations/TransformationContextImpl.java @@ -55,7 +55,7 @@ public class TransformationContextImpl implements TransformationContext { private final List myImplementsTypes = ContainerUtil.newArrayList(); private final List myExtendsTypes = ContainerUtil.newArrayList(); private final MemberBuilder myMemberBuilder = new MemberBuilder(this); - private final Map> mySignaturesCache = FactoryMap.createMap(name -> { + private final Map> mySignaturesCache = FactoryMap.create(name -> { THashSet result = new THashSet<>(METHOD_PARAMETERS_ERASURE_EQUALITY); for (PsiMethod existingMethod : myMethods) { if (existingMethod.getName().equals(name)) { diff --git a/plugins/java-i18n/src/com/intellij/codeInspection/i18n/inconsistentResourceBundle/InconsistentResourceBundleInspection.java b/plugins/java-i18n/src/com/intellij/codeInspection/i18n/inconsistentResourceBundle/InconsistentResourceBundleInspection.java index 4ce4dd5fcf5d..da947c5c01a4 100644 --- a/plugins/java-i18n/src/com/intellij/codeInspection/i18n/inconsistentResourceBundle/InconsistentResourceBundleInspection.java +++ b/plugins/java-i18n/src/com/intellij/codeInspection/i18n/inconsistentResourceBundle/InconsistentResourceBundleInspection.java @@ -156,7 +156,7 @@ public class InconsistentResourceBundleInspection extends GlobalSimpleInspection parents.put(f, parent); } } - final Map> propertiesFilesNamesMaps = FactoryMap.createMap(key -> key.getNamesMap()); + final Map> propertiesFilesNamesMaps = FactoryMap.create(key -> key.getNamesMap()); Map> keysUpToParent = new THashMap<>(); for (PropertiesFile f : files) { Set keys = new THashSet<>(propertiesFilesNamesMaps.get(f).keySet()); diff --git a/python/psi-api/src/com/jetbrains/python/psi/types/PyTypeProviderBase.java b/python/psi-api/src/com/jetbrains/python/psi/types/PyTypeProviderBase.java index a4ad86d77fc0..713da4fd8e60 100644 --- a/python/psi-api/src/com/jetbrains/python/psi/types/PyTypeProviderBase.java +++ b/python/psi-api/src/com/jetbrains/python/psi/types/PyTypeProviderBase.java @@ -38,7 +38,7 @@ public class PyTypeProviderBase implements PyTypeProvider { .orElse(null); @SuppressWarnings({"MismatchedQueryAndUpdateOfCollection"}) - private final Map myMethodToReturnTypeMap = FactoryMap.createMap(key -> new ReturnTypeDescriptor()); + private final Map myMethodToReturnTypeMap = FactoryMap.create(key -> new ReturnTypeDescriptor()); @Nullable @Override diff --git a/python/python-community-configure/src/com/jetbrains/python/configuration/PythonSdkDetailsDialog.java b/python/python-community-configure/src/com/jetbrains/python/configuration/PythonSdkDetailsDialog.java index a66d97db6447..8200654ee3d6 100644 --- a/python/python-community-configure/src/com/jetbrains/python/configuration/PythonSdkDetailsDialog.java +++ b/python/python-community-configure/src/com/jetbrains/python/configuration/PythonSdkDetailsDialog.java @@ -74,7 +74,7 @@ public class PythonSdkDetailsDialog extends DialogWrapper { private final PyConfigurableInterpreterList myInterpreterList; private final ProjectSdksModel myProjectSdksModel; - private Map myModificators = FactoryMap.createMap(sdk -> sdk.getSdkModificator()); + private Map myModificators = FactoryMap.create(sdk -> sdk.getSdkModificator()); private Set myModifiedModificators = new HashSet<>(); private final Project myProject; diff --git a/python/src/com/jetbrains/python/highlighting/PySyntaxHighlighterFactory.java b/python/src/com/jetbrains/python/highlighting/PySyntaxHighlighterFactory.java index 1deb2bd84f98..d854e6d066fd 100644 --- a/python/src/com/jetbrains/python/highlighting/PySyntaxHighlighterFactory.java +++ b/python/src/com/jetbrains/python/highlighting/PySyntaxHighlighterFactory.java @@ -34,9 +34,9 @@ import java.util.Map; */ public class PySyntaxHighlighterFactory extends SyntaxHighlighterFactory { @SuppressWarnings({"MismatchedQueryAndUpdateOfCollection"}) - private final Map myMap = FactoryMap.createMap(key -> new PyHighlighter(key)); + private final Map myMap = FactoryMap.create(key -> new PyHighlighter(key)); - private final Map myConsoleMap = FactoryMap.createMap(key -> new PyHighlighter(key) { + private final Map myConsoleMap = FactoryMap.create(key -> new PyHighlighter(key) { @Override protected PythonHighlightingLexer createHighlightingLexer(LanguageLevel languageLevel) { return new PyConsoleHighlightingLexer(languageLevel); diff --git a/xml/dom-impl/src/com/intellij/util/xml/ModelMergerImpl.java b/xml/dom-impl/src/com/intellij/util/xml/ModelMergerImpl.java index 58497eb5ec66..2f4880e0fdb1 100644 --- a/xml/dom-impl/src/com/intellij/util/xml/ModelMergerImpl.java +++ b/xml/dom-impl/src/com/intellij/util/xml/ModelMergerImpl.java @@ -352,12 +352,11 @@ public class ModelMergerImpl implements ModelMerger { if (returnType.isInterface()) { final List orderedPrimaryKeys = new SmartList<>(); - final Map>> map = FactoryMap.createMap(key-> { - orderedPrimaryKeys.add(key); - return new SmartList<>(); - } - ); - final Map counts = FactoryMap.createMap(key -> new int[implementations.size()]); + final Map>> map = FactoryMap.create(key -> { + orderedPrimaryKeys.add(key); + return new SmartList<>(); + }); + final Map counts = FactoryMap.create(key -> new int[implementations.size()]); for (int i = 0; i < implementations.size(); i++) { Object t = implementations.get(i); final Object o = method.invoke(t, args); diff --git a/xml/dom-impl/src/com/intellij/util/xml/impl/DomApplicationComponent.java b/xml/dom-impl/src/com/intellij/util/xml/impl/DomApplicationComponent.java index 4ac9f2719c9b..f30904389144 100644 --- a/xml/dom-impl/src/com/intellij/util/xml/impl/DomApplicationComponent.java +++ b/xml/dom-impl/src/com/intellij/util/xml/impl/DomApplicationComponent.java @@ -42,7 +42,7 @@ import static com.intellij.util.containers.ContainerUtil.newArrayList; * @author peter */ public class DomApplicationComponent { - private final Map> myRootTagName2FileDescription = FactoryMap.createMap(key -> new THashSet<>()); + private final Map> myRootTagName2FileDescription = FactoryMap.create(key -> new THashSet<>()); private final Set myAcceptingOtherRootTagNamesDescriptions = new THashSet<>(); private final ImplementationClassCache myCachedImplementationClasses = new ImplementationClassCache(DomImplementationClassEP.EP_NAME); private final TypeChooserManager myTypeChooserManager = new TypeChooserManager(); diff --git a/xml/dom-impl/src/com/intellij/util/xml/impl/StaticGenericInfoBuilder.java b/xml/dom-impl/src/com/intellij/util/xml/impl/StaticGenericInfoBuilder.java index 1ab7b35bf71e..f5b04276f10f 100644 --- a/xml/dom-impl/src/com/intellij/util/xml/impl/StaticGenericInfoBuilder.java +++ b/xml/dom-impl/src/com/intellij/util/xml/impl/StaticGenericInfoBuilder.java @@ -52,7 +52,7 @@ public class StaticGenericInfoBuilder { private final Map myCompositeCollectionGetters = new THashMap<>(); private final Map> myCompositeCollectionAdders = new THashMap<>(); private final Map>> myFixedChildrenGetters = - FactoryMap.createMap(key -> new TIntObjectHashMap<>()); + FactoryMap.create(key -> new TIntObjectHashMap<>()); private final Map myAttributes = new THashMap<>(); private boolean myValueElement;