diff --git a/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightUtil.java b/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightUtil.java index 7bc800109621..31424f9d167a 100644 --- a/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightUtil.java +++ b/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightUtil.java @@ -1333,7 +1333,7 @@ public class HighlightUtil extends HighlightUtilBase { final int idx = ArrayUtilRt.find(allCatchSections, catchSection); if (idx <= 0) return null; - final Collection thrownTypes = ContainerUtil.newHashSet(thrownInTryStatement); + final Collection thrownTypes = new java.util.HashSet<>(thrownInTryStatement); final PsiManager manager = containingFile.getManager(); final GlobalSearchScope parameterResolveScope = parameter.getResolveScope(); thrownTypes.add(PsiType.getJavaLangError(manager, parameterResolveScope)); @@ -1350,7 +1350,7 @@ public class HighlightUtil extends HighlightUtilBase { final Collection caught = ContainerUtil.findAll(thrownTypes, type -> catchType.isAssignableFrom(type) || type.isAssignableFrom(catchType)); if (caught.isEmpty()) continue; - final Collection caughtCopy = ContainerUtil.newHashSet(caught); + final Collection caughtCopy = new java.util.HashSet<>(caught); // exclude all which are caught by previous catch sections for (int i = 0; i < idx; i++) { diff --git a/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/StateMerger.java b/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/StateMerger.java index fbb4f305af66..ddfec586aceb 100644 --- a/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/StateMerger.java +++ b/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/StateMerger.java @@ -195,7 +195,7 @@ class StateMerger { @NotNull Set memberFacts, @NotNull DfaMemoryStateImpl state) { Set otherInequalities = ContainerUtil.newLinkedHashSet(); - Set eqValues = ContainerUtil.newHashSet(state.getEquivalentValues(removedFact.myArg)); + Set eqValues = new HashSet<>(state.getEquivalentValues(removedFact.myArg)); for (Fact candidate : memberFacts) { if (!(candidate instanceof EqualityFact)) continue; EqualityFact equality = (EqualityFact)candidate; diff --git a/java/java-impl/src/com/intellij/psi/impl/JavaPsiImplementationHelperImpl.java b/java/java-impl/src/com/intellij/psi/impl/JavaPsiImplementationHelperImpl.java index 929d1fd09ea8..53b198096670 100644 --- a/java/java-impl/src/com/intellij/psi/impl/JavaPsiImplementationHelperImpl.java +++ b/java/java-impl/src/com/intellij/psi/impl/JavaPsiImplementationHelperImpl.java @@ -82,7 +82,7 @@ public class JavaPsiImplementationHelperImpl extends JavaPsiImplementationHelper ProjectFileIndex idx = ProjectRootManager.getInstance(myProject).getFileIndex(); if (vFile != null && idx.isInLibrarySource(vFile)) { GlobalSearchScope librariesScope = LibraryScopeCache.getInstance(myProject).getLibrariesOnlyScope(); - Set originalEntries = ContainerUtil.newHashSet(idx.getOrderEntriesForFile(vFile)); + Set originalEntries = new HashSet<>(idx.getOrderEntriesForFile(vFile)); for (T candidate : candidateFinder.apply(librariesScope)) { PsiFile candidateFile = candidate.getContainingFile(); if (candidateFile != null) { diff --git a/java/java-psi-api/src/com/intellij/codeInsight/NullableNotNullManager.java b/java/java-psi-api/src/com/intellij/codeInsight/NullableNotNullManager.java index f4eca95ee223..104a409e2d50 100644 --- a/java/java-psi-api/src/com/intellij/codeInsight/NullableNotNullManager.java +++ b/java/java-psi-api/src/com/intellij/codeInsight/NullableNotNullManager.java @@ -359,7 +359,7 @@ public abstract class NullableNotNullManager { @NotNull protected Set getAllNullabilityAnnotationsWithNickNames() { - Set qNames = ContainerUtil.newHashSet(getNullablesWithNickNames()); + Set qNames = new HashSet<>(getNullablesWithNickNames()); qNames.addAll(getNotNullsWithNickNames()); return Collections.unmodifiableSet(qNames); } diff --git a/java/java-psi-api/src/com/intellij/psi/search/PackageScope.java b/java/java-psi-api/src/com/intellij/psi/search/PackageScope.java index a5294505c9ae..e2dd6476aa22 100644 --- a/java/java-psi-api/src/com/intellij/psi/search/PackageScope.java +++ b/java/java-psi-api/src/com/intellij/psi/search/PackageScope.java @@ -27,9 +27,9 @@ import com.intellij.psi.JavaPsiFacade; import com.intellij.psi.PsiClassOwner; import com.intellij.psi.PsiFile; import com.intellij.psi.PsiPackage; -import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.NotNull; +import java.util.HashSet; import java.util.Set; public class PackageScope extends GlobalSearchScope { @@ -48,8 +48,7 @@ public class PackageScope extends GlobalSearchScope { Project project = myPackage.getProject(); myPackageQualifiedName = myPackage.getQualifiedName(); - myDirs = ContainerUtil.newHashSet( - PackageIndex.getInstance(project).getDirsByPackageName(myPackageQualifiedName, true).findAll()); + myDirs = new HashSet<>(PackageIndex.getInstance(project).getDirsByPackageName(myPackageQualifiedName, true).findAll()); myIncludeLibraries = includeLibraries; myPartOfPackagePrefix = JavaPsiFacade.getInstance(getProject()).isPartOfPackagePrefix(myPackageQualifiedName); diff --git a/java/openapi/src/com/intellij/codeInsight/NullableNotNullDialog.java b/java/openapi/src/com/intellij/codeInsight/NullableNotNullDialog.java index 5e0ad4032f1b..ba7f617b58f4 100644 --- a/java/openapi/src/com/intellij/codeInsight/NullableNotNullDialog.java +++ b/java/openapi/src/com/intellij/codeInsight/NullableNotNullDialog.java @@ -8,7 +8,6 @@ import com.intellij.openapi.project.Project; import com.intellij.openapi.project.ProjectManager; import com.intellij.openapi.ui.DialogWrapper; import com.intellij.openapi.ui.Splitter; -import com.intellij.util.containers.ContainerUtil; import com.intellij.util.ui.JBUI; import org.jetbrains.annotations.NotNull; @@ -17,6 +16,7 @@ import java.awt.*; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.util.Collections; +import java.util.HashSet; public class NullableNotNullDialog extends DialogWrapper { private final Project myProject; @@ -43,7 +43,7 @@ public class NullableNotNullDialog extends DialogWrapper { "NotNull", manager.getDefaultNotNull(), manager.getNotNulls(), NullableNotNullManager.DEFAULT_NOT_NULLS, - ContainerUtil.newHashSet(manager.getInstrumentedNotNulls()), showInstrumentationOptions, true); + new HashSet<>(manager.getInstrumentedNotNulls()), showInstrumentationOptions, true); init(); setTitle("Nullable/NotNull Configuration"); diff --git a/json/src/com/jetbrains/jsonSchema/impl/JsonSchemaAnnotatorChecker.java b/json/src/com/jetbrains/jsonSchema/impl/JsonSchemaAnnotatorChecker.java index 1e5dd51b2ec1..6dc8cd86cbf5 100644 --- a/json/src/com/jetbrains/jsonSchema/impl/JsonSchemaAnnotatorChecker.java +++ b/json/src/com/jetbrains/jsonSchema/impl/JsonSchemaAnnotatorChecker.java @@ -317,7 +317,7 @@ class JsonSchemaAnnotatorChecker { for (Map.Entry> entry : dependencies.entrySet()) { if (set.contains(entry.getKey())) { final List list = entry.getValue(); - HashSet deps = ContainerUtil.newHashSet(list); + HashSet deps = new HashSet<>(list); deps.removeAll(set); if (!deps.isEmpty()) { JsonValidationError.MissingMultiplePropsIssueData data = createMissingPropertiesData(schema, deps); @@ -870,7 +870,7 @@ class JsonSchemaAnnotatorChecker { // also check maybe some currently not checked properties like format are different with schemes // todo note that JsonSchemaObject#equals is broken by design, so normally it shouldn't be used until rewritten // but for now we use it here to avoid similar schemas being marked as duplicates - if (ContainerUtil.newHashSet(correct).size() > 1 && !schemesDifferWithNotCheckedProperties(correct)) { + if (new HashSet<>(correct).size() > 1 && !schemesDifferWithNotCheckedProperties(correct)) { error("Validates to more than one variant", value.getDelegate(), JsonErrorPriority.MEDIUM_PRIORITY); } } diff --git a/json/src/com/jetbrains/jsonSchema/impl/JsonSchemaObject.java b/json/src/com/jetbrains/jsonSchema/impl/JsonSchemaObject.java index aea101dfa23d..b07077b2f1e6 100644 --- a/json/src/com/jetbrains/jsonSchema/impl/JsonSchemaObject.java +++ b/json/src/com/jetbrains/jsonSchema/impl/JsonSchemaObject.java @@ -511,7 +511,7 @@ public class JsonSchemaObject { private void addAdditionalPropsNotAllowedFor(String url, String pointer) { Set newSet = myAdditionalPropertiesNotAllowedFor == null ? ContainerUtil.newHashSet() - : ContainerUtil.newHashSet(myAdditionalPropertiesNotAllowedFor); + : new HashSet<>(myAdditionalPropertiesNotAllowedFor); newSet.add(url + pointer); myAdditionalPropertiesNotAllowedFor = newSet; } diff --git a/platform/core-api/src/com/intellij/psi/search/NonClasspathDirectoriesScope.java b/platform/core-api/src/com/intellij/psi/search/NonClasspathDirectoriesScope.java index 38258b9be3f0..ebdce78c576c 100644 --- a/platform/core-api/src/com/intellij/psi/search/NonClasspathDirectoriesScope.java +++ b/platform/core-api/src/com/intellij/psi/search/NonClasspathDirectoriesScope.java @@ -20,10 +20,10 @@ import com.intellij.openapi.module.Module; import com.intellij.openapi.util.text.StringUtil; import com.intellij.openapi.vfs.VfsUtilCore; import com.intellij.openapi.vfs.VirtualFile; -import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.NotNull; import java.util.Collection; +import java.util.HashSet; import java.util.List; import java.util.Set; @@ -34,7 +34,7 @@ public class NonClasspathDirectoriesScope extends GlobalSearchScope { private final Set myRoots; public NonClasspathDirectoriesScope(@NotNull Collection roots) { - myRoots = ContainerUtil.newHashSet(roots); + myRoots = new HashSet<>(roots); } @Override diff --git a/platform/diff-impl/src/com/intellij/diff/tools/util/base/TextDiffViewerUtil.java b/platform/diff-impl/src/com/intellij/diff/tools/util/base/TextDiffViewerUtil.java index d7e141bbc698..5303602c1ad7 100644 --- a/platform/diff-impl/src/com/intellij/diff/tools/util/base/TextDiffViewerUtil.java +++ b/platform/diff-impl/src/com/intellij/diff/tools/util/base/TextDiffViewerUtil.java @@ -45,9 +45,7 @@ import org.jetbrains.annotations.NotNull; import javax.swing.*; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; +import java.util.*; import static com.intellij.diff.util.DiffUtil.isUserDataFlagSet; import static com.intellij.util.containers.ContainerUtil.list; @@ -110,7 +108,7 @@ public class TextDiffViewerUtil { public static void installDocumentListeners(@NotNull DocumentListener listener, @NotNull List documents, @NotNull Disposable disposable) { - for (Document document : ContainerUtil.newHashSet(documents)) { + for (Document document : new HashSet<>((Collection)documents)) { document.addDocumentListener(listener, disposable); } } @@ -160,7 +158,7 @@ public class TextDiffViewerUtil { }); if (properties.size() < 2) return true; - return ContainerUtil.newHashSet(properties).size() == 1; + return new HashSet<>(properties).size() == 1; } // diff --git a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/ui/ExternalProjectDataSelectorDialog.java b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/ui/ExternalProjectDataSelectorDialog.java index 79680fcf6bbe..dbbfaf4d8c23 100644 --- a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/ui/ExternalProjectDataSelectorDialog.java +++ b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/ui/ExternalProjectDataSelectorDialog.java @@ -433,7 +433,7 @@ public class ExternalProjectDataSelectorDialog extends DialogWrapper { @NotNull private static Set> getPublicKeys() { - Set> result = ContainerUtil.newHashSet(DATA_KEYS); + Set> result = new HashSet<>(DATA_KEYS); for (ExternalProjectStructureCustomizer customizer : ExternalProjectStructureCustomizer.EP_NAME.getExtensions()) { result.addAll(customizer.getPublicDataKeys()); } @@ -442,7 +442,7 @@ public class ExternalProjectDataSelectorDialog extends DialogWrapper { @NotNull private static Set> getIgnorableKeys() { - Set> result = ContainerUtil.newHashSet(DATA_KEYS); + Set> result = new HashSet<>(DATA_KEYS); for (ExternalProjectStructureCustomizer customizer : ExternalProjectStructureCustomizer.EP_NAME.getExtensions()) { result.addAll(customizer.getIgnorableDataKeys()); } diff --git a/platform/lang-impl/src/com/intellij/codeInsight/template/postfix/templates/PostfixTemplatesUtils.java b/platform/lang-impl/src/com/intellij/codeInsight/template/postfix/templates/PostfixTemplatesUtils.java index 20b1254c6e20..c5534df05465 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/template/postfix/templates/PostfixTemplatesUtils.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/template/postfix/templates/PostfixTemplatesUtils.java @@ -41,7 +41,7 @@ public abstract class PostfixTemplatesUtils { */ @NotNull public static Set getAvailableTemplates(@NotNull PostfixTemplateProvider provider) { - Set result = ContainerUtil.newHashSet(provider.getTemplates()); + Set result = new HashSet<>(provider.getTemplates()); for (PostfixTemplate template : PostfixTemplateStorage.getInstance().getTemplates(provider)) { if (template instanceof PostfixChangedBuiltinTemplate) { result.remove(((PostfixChangedBuiltinTemplate)template).getBuiltinTemplate()); diff --git a/platform/lang-impl/src/com/intellij/execution/console/ConsoleConfigurable.java b/platform/lang-impl/src/com/intellij/execution/console/ConsoleConfigurable.java index 2541545aa6ad..ac688e714d9b 100644 --- a/platform/lang-impl/src/com/intellij/execution/console/ConsoleConfigurable.java +++ b/platform/lang-impl/src/com/intellij/execution/console/ConsoleConfigurable.java @@ -30,6 +30,7 @@ import javax.swing.*; import javax.swing.event.DocumentEvent; import java.awt.*; import java.util.ArrayList; +import java.util.HashSet; import java.util.List; /** @@ -128,8 +129,8 @@ public class ConsoleConfigurable implements SearchableConfigurable, Configurable @Override public boolean isModified() { EditorSettingsExternalizable editorSettings = EditorSettingsExternalizable.getInstance(); - boolean isModified = !ContainerUtil.newHashSet(myNegativePanel.getListItems()).equals(ContainerUtil.newHashSet(mySettings.getNegativePatterns())); - isModified |= !ContainerUtil.newHashSet(myPositivePanel.getListItems()).equals(ContainerUtil.newHashSet(mySettings.getPositivePatterns())); + boolean isModified = !ContainerUtil.newHashSet(myNegativePanel.getListItems()).equals(new HashSet<>(mySettings.getNegativePatterns())); + isModified |= !ContainerUtil.newHashSet(myPositivePanel.getListItems()).equals(new HashSet<>(mySettings.getPositivePatterns())); isModified |= isModified(myCbUseSoftWrapsAtConsole, editorSettings.isUseSoftWraps(SoftWrapAppliancePlaces.CONSOLE)); UISettings uiSettings = UISettings.getInstance(); isModified |= isModified(myCommandsHistoryLimitField, uiSettings.getConsoleCommandHistoryLimit()); diff --git a/platform/lang-impl/src/com/intellij/formatting/AlignmentImpl.java b/platform/lang-impl/src/com/intellij/formatting/AlignmentImpl.java index 3c5ecb375d44..e8fe9bc62f78 100644 --- a/platform/lang-impl/src/com/intellij/formatting/AlignmentImpl.java +++ b/platform/lang-impl/src/com/intellij/formatting/AlignmentImpl.java @@ -16,14 +16,10 @@ package com.intellij.formatting; -import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; -import java.util.Set; +import java.util.*; public class AlignmentImpl extends Alignment { private static final List EMPTY = Collections.emptyList(); @@ -137,7 +133,7 @@ public class AlignmentImpl extends Alignment { } public Set getOffsetResponsibleBlocks() { - return ContainerUtil.newHashSet(myOffsetRespBlocks); + return new HashSet<>(myOffsetRespBlocks); } @NotNull diff --git a/platform/lang-impl/src/com/intellij/openapi/roots/ui/configuration/ContentEntryEditor.java b/platform/lang-impl/src/com/intellij/openapi/roots/ui/configuration/ContentEntryEditor.java index 328854a13482..60726c405b8f 100644 --- a/platform/lang-impl/src/com/intellij/openapi/roots/ui/configuration/ContentEntryEditor.java +++ b/platform/lang-impl/src/com/intellij/openapi/roots/ui/configuration/ContentEntryEditor.java @@ -38,6 +38,7 @@ import java.awt.*; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.util.EventListener; +import java.util.HashSet; import java.util.List; import java.util.Set; @@ -303,7 +304,7 @@ public abstract class ContentEntryEditor implements ContentRootPanel.ActionCallb public static boolean isExcludedOrUnderExcludedDirectory(@Nullable Project project, @NotNull ContentEntry entry, @NotNull VirtualFile file) { - Set excludedUrls = ContainerUtil.newHashSet(entry.getExcludeFolderUrls()); + Set excludedUrls = new HashSet<>(entry.getExcludeFolderUrls()); if (project != null) { for (DirectoryIndexExcludePolicy policy : DirectoryIndexExcludePolicy.getExtensions(project)) { ContainerUtil.addAll(excludedUrls, policy.getExcludeUrlsForProject()); diff --git a/platform/lang-impl/src/com/intellij/profile/codeInspection/ui/inspectionsTree/InspectionsConfigTreeTable.java b/platform/lang-impl/src/com/intellij/profile/codeInspection/ui/inspectionsTree/InspectionsConfigTreeTable.java index 20a85e93c420..0aea38d9d274 100644 --- a/platform/lang-impl/src/com/intellij/profile/codeInspection/ui/inspectionsTree/InspectionsConfigTreeTable.java +++ b/platform/lang-impl/src/com/intellij/profile/codeInspection/ui/inspectionsTree/InspectionsConfigTreeTable.java @@ -42,7 +42,9 @@ import javax.swing.tree.TreeNode; import javax.swing.tree.TreePath; import java.awt.*; import java.awt.datatransfer.Transferable; -import java.awt.event.*; +import java.awt.event.KeyEvent; +import java.awt.event.MouseAdapter; +import java.awt.event.MouseEvent; import java.util.List; import java.util.*; import java.util.stream.Stream; @@ -485,7 +487,7 @@ public class InspectionsConfigTreeTable extends TreeTable { result.put(currentScope, currentSeverity); } else { - Set toolsToCheck = ContainerUtil.newHashSet(allScopes.keySet()); + Set toolsToCheck = new HashSet<>(allScopes.keySet()); toolsToCheck.removeAll(currentSeverityAndOccurrences.getOccurrences().keySet()); boolean doContinue = false; final Map lowerScopeOccurrences = myScopeToAverageSeverityMap.get(myDefaultScopeName).getOccurrences(); diff --git a/platform/lang-impl/src/com/intellij/psi/codeStyle/extractor/ui/ExtractedSettingsDialog.java b/platform/lang-impl/src/com/intellij/psi/codeStyle/extractor/ui/ExtractedSettingsDialog.java index 1a5fc24c8894..087972814ce5 100644 --- a/platform/lang-impl/src/com/intellij/psi/codeStyle/extractor/ui/ExtractedSettingsDialog.java +++ b/platform/lang-impl/src/com/intellij/psi/codeStyle/extractor/ui/ExtractedSettingsDialog.java @@ -34,10 +34,8 @@ import javax.swing.tree.TreePath; import java.awt.*; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; -import java.util.Collection; -import java.util.Enumeration; import java.util.List; -import java.util.Map; +import java.util.*; /** * @author Roman.Shein @@ -294,7 +292,7 @@ public class ExtractedSettingsDialog extends DialogWrapper { protected JComponent buildExtractedSettingsTree() { - Collection unusedValues = ContainerUtil.newHashSet(myValues); + Collection unusedValues = new HashSet<>(myValues); myRoot = new DefaultMutableTreeNode(); for (Map.Entry>> typeEntry : myNameProvider.mySettings.entrySet()) { diff --git a/platform/lang-impl/src/com/intellij/util/ui/tree/PerFileConfigurableBase.java b/platform/lang-impl/src/com/intellij/util/ui/tree/PerFileConfigurableBase.java index 4c38e379c951..9d6116c0a67a 100644 --- a/platform/lang-impl/src/com/intellij/util/ui/tree/PerFileConfigurableBase.java +++ b/platform/lang-impl/src/com/intellij/util/ui/tree/PerFileConfigurableBase.java @@ -236,7 +236,7 @@ public abstract class PerFileConfigurableBase implements SearchableConfigurab } private void doAddFiles(@NotNull List files) { - Set chosen = ContainerUtil.newHashSet(files); + Set chosen = new HashSet<>(files); if (chosen.isEmpty()) return; Set set = myModel.data.stream().map(o -> o.first).collect(Collectors.toSet()); for (VirtualFile file : chosen) { diff --git a/platform/platform-impl/src/com/intellij/ide/actions/Switcher.java b/platform/platform-impl/src/com/intellij/ide/actions/Switcher.java index 235ded2142f0..a2cf35733bbe 100644 --- a/platform/platform-impl/src/com/intellij/ide/actions/Switcher.java +++ b/platform/platform-impl/src/com/intellij/ide/actions/Switcher.java @@ -756,7 +756,7 @@ public class Switcher extends AnAction implements DumbAware { List recentFiles = EditorHistoryManager.getInstance(project).getFileList(); VirtualFile[] openFiles = FileEditorManager.getInstance(project).getOpenFiles(); - Set recentFilesSet = ContainerUtil.newHashSet(recentFiles); + Set recentFilesSet = new HashSet<>(recentFiles); Set openFilesSet = ContainerUtil.newHashSet(openFiles); // Add missing FileEditor tabs right after the last one, that is available via "Recent Files" diff --git a/platform/platform-impl/src/com/intellij/openapi/vfs/impl/local/FileWatcher.java b/platform/platform-impl/src/com/intellij/openapi/vfs/impl/local/FileWatcher.java index ec55bfdde19c..2e79da2df805 100644 --- a/platform/platform-impl/src/com/intellij/openapi/vfs/impl/local/FileWatcher.java +++ b/platform/platform-impl/src/com/intellij/openapi/vfs/impl/local/FileWatcher.java @@ -21,11 +21,11 @@ import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.TestOnly; import java.io.File; -import java.util.Collection; -import java.util.Collections; -import java.util.List; -import java.util.Set; -import java.util.concurrent.*; +import java.util.*; +import java.util.concurrent.CancellationException; +import java.util.concurrent.ExecutionException; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Future; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicReference; import java.util.function.Consumer; @@ -149,7 +149,7 @@ public class FileWatcher { Set result = null; for (Collection roots : manualWatchRoots) { if (result == null) { - result = ContainerUtil.newHashSet(roots); + result = new HashSet<>(roots); } else { result.retainAll(roots); @@ -218,7 +218,7 @@ public class FileWatcher { @Override public void notifyManualWatchRoots(@NotNull Collection roots) { - myManualWatchRoots.add(roots.isEmpty() ? Collections.emptySet() : ContainerUtil.newHashSet(roots)); + myManualWatchRoots.add(roots.isEmpty() ? Collections.emptySet() : new HashSet<>(roots)); notifyOnEvent(OTHER); } diff --git a/platform/platform-impl/src/com/intellij/ui/docking/impl/DockManagerImpl.java b/platform/platform-impl/src/com/intellij/ui/docking/impl/DockManagerImpl.java index 5097eafd596b..cca9bd2c0dd2 100644 --- a/platform/platform-impl/src/com/intellij/ui/docking/impl/DockManagerImpl.java +++ b/platform/platform-impl/src/com/intellij/ui/docking/impl/DockManagerImpl.java @@ -32,7 +32,6 @@ import com.intellij.ui.components.panels.VerticalBox; import com.intellij.ui.docking.*; import com.intellij.ui.tabs.newImpl.JBTabsImpl; import com.intellij.util.IconUtil; -import com.intellij.util.containers.ContainerUtil; import com.intellij.util.ui.UIUtil; import com.intellij.util.ui.update.UiNotifyConnector; import org.jdom.Element; @@ -47,8 +46,8 @@ import java.awt.event.MouseEvent; import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; import java.awt.image.BufferedImage; -import java.util.*; import java.util.List; +import java.util.*; @State(name = "DockManager", storages = @Storage(StoragePathMacros.WORKSPACE_FILE)) @@ -111,7 +110,7 @@ public class DockManagerImpl extends DockManager implements PersistentStateCompo @Override public Set getContainers() { - return Collections.unmodifiableSet(ContainerUtil.newHashSet(myContainers)); + return Collections.unmodifiableSet(new HashSet<>(myContainers)); } @Override diff --git a/platform/platform-impl/src/com/intellij/ui/popup/PopupListAdapter.java b/platform/platform-impl/src/com/intellij/ui/popup/PopupListAdapter.java index 478a47f41df9..3aedc714a0eb 100644 --- a/platform/platform-impl/src/com/intellij/ui/popup/PopupListAdapter.java +++ b/platform/platform-impl/src/com/intellij/ui/popup/PopupListAdapter.java @@ -14,7 +14,6 @@ import com.intellij.ui.components.JBScrollPane; import com.intellij.ui.speedSearch.ListWithFilter; import com.intellij.util.BooleanFunction; import com.intellij.util.Consumer; -import com.intellij.util.containers.ContainerUtil; import com.intellij.util.ui.UIUtil; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; @@ -26,6 +25,7 @@ import java.awt.event.InputEvent; import java.awt.event.KeyEvent; import java.awt.event.MouseListener; import java.util.Collections; +import java.util.HashSet; import java.util.List; import java.util.Set; @@ -66,7 +66,7 @@ class PopupListAdapter implements PopupChooserBuilder.PopupComponentAdapter> callback) { myBuilder.setItemChoosenCallback(() -> { List list = myList.getSelectedValuesList(); - callback.consume(list != null ? ContainerUtil.newHashSet(list) : Collections.emptySet()); + callback.consume(list != null ? new HashSet<>(list) : Collections.emptySet()); }); } diff --git a/platform/platform-impl/src/com/intellij/util/ui/SwingHelper.java b/platform/platform-impl/src/com/intellij/util/ui/SwingHelper.java index c7aab04624c5..c8923ddc77ea 100644 --- a/platform/platform-impl/src/com/intellij/util/ui/SwingHelper.java +++ b/platform/platform-impl/src/com/intellij/util/ui/SwingHelper.java @@ -339,7 +339,7 @@ public class SwingHelper { public static void setHistory(@NotNull TextFieldWithHistory textFieldWithHistory, @NotNull List history, boolean mergeWithPrevHistory) { - Set newHistorySet = ContainerUtil.newHashSet(history); + Set newHistorySet = new HashSet<>(history); List prevHistory = textFieldWithHistory.getHistory(); List mergedHistory = ContainerUtil.newArrayListWithCapacity(history.size()); if (mergeWithPrevHistory) { diff --git a/platform/util/src/com/intellij/util/containers/ContainerUtil.java b/platform/util/src/com/intellij/util/containers/ContainerUtil.java index 8bbe1e62201f..21a6d94d6e03 100644 --- a/platform/util/src/com/intellij/util/containers/ContainerUtil.java +++ b/platform/util/src/com/intellij/util/containers/ContainerUtil.java @@ -306,6 +306,16 @@ public class ContainerUtil extends ContainerUtilRt { return ContainerUtilRt.newHashSet(iterable); } + /** + * @deprecated simply use {@code new HashSet<>(collection)}. + */ + @NotNull + @Contract(pure=true) + @Deprecated + public static HashSet newHashSet(@NotNull Collection collection) { + return new HashSet<>(collection); + } + @NotNull public static HashSet newHashSet(@NotNull Iterator iterator) { return ContainerUtilRt.newHashSet(iterator); diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/RollbackAction.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/RollbackAction.java index 71ae3a610a30..d660080f6f1e 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/RollbackAction.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/RollbackAction.java @@ -59,7 +59,7 @@ public class RollbackAction extends AnAction implements DumbAware, UpdateInBackg private static boolean hasReversibleFiles(@NotNull AnActionEvent e) { ChangeListManager manager = ChangeListManager.getInstance(e.getRequiredData(CommonDataKeys.PROJECT)); - Set modifiedWithoutEditing = ContainerUtil.newHashSet(manager.getModifiedWithoutEditing()); + Set modifiedWithoutEditing = new HashSet<>(manager.getModifiedWithoutEditing()); return notNullize(e.getData(VcsDataKeys.VIRTUAL_FILE_STREAM)).anyMatch( file -> manager.haveChangesUnder(file) != ThreeState.NO || manager.isFileAffected(file) || modifiedWithoutEditing.contains(file)); @@ -68,7 +68,7 @@ public class RollbackAction extends AnAction implements DumbAware, UpdateInBackg private static boolean currentChangelistNotEmpty(Project project) { ChangeListManager clManager = ChangeListManager.getInstance(project); ChangeList list = clManager.getDefaultChangeList(); - return list != null && !list.getChanges().isEmpty(); + return !list.getChanges().isEmpty(); } @Override diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/ChangesCacheFile.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/ChangesCacheFile.java index e5bf4ad4d18e..da8312a662ec 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/ChangesCacheFile.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/ChangesCacheFile.java @@ -842,7 +842,7 @@ public class ChangesCacheFile { if (!revisionDependentFiles.isEmpty()) { // lots of same files could be collected - make set of unique files - HashSet uniqueFiles = ContainerUtil.newHashSet(revisionDependentFiles.values()); + HashSet uniqueFiles = new HashSet<>(revisionDependentFiles.values()); // bulk-get all needed revisions at once Map revisions = myDiffProvider instanceof DiffProviderEx ? ((DiffProviderEx)myDiffProvider).getCurrentRevisions(uniqueFiles) diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/CommitChangeListDialog.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/CommitChangeListDialog.java index 18260ba08c60..ec6df6bce60c 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/CommitChangeListDialog.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/CommitChangeListDialog.java @@ -219,7 +219,7 @@ public class CommitChangeListDialog extends DialogWrapper implements CheckinProj } } - boolean isDefaultChangeListFullyIncluded = newHashSet(changes).containsAll(defaultList.getChanges()); + boolean isDefaultChangeListFullyIncluded = new HashSet<>(changes).containsAll(defaultList.getChanges()); DialogCommitWorkflow workflow = new DialogCommitWorkflow(project, included, initialSelection, executors, showVcsCommit, forceCommitInVcs, affectedVcses, isDefaultChangeListFullyIncluded, comment, customResultHandler); diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/impl/projectlevelman/FileWatchRequestModifier.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/impl/projectlevelman/FileWatchRequestModifier.java index 81463cbb1825..95a13b5cf082 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/impl/projectlevelman/FileWatchRequestModifier.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/impl/projectlevelman/FileWatchRequestModifier.java @@ -22,7 +22,10 @@ import com.intellij.openapi.vcs.VcsDirectoryMapping; import com.intellij.openapi.vfs.LocalFileSystem; import com.intellij.util.containers.ContainerUtil; -import java.util.*; +import java.util.Collection; +import java.util.List; +import java.util.Map; +import java.util.Set; import static com.intellij.util.containers.ContainerUtil.newHashMap; import static com.intellij.util.containers.ContainerUtil.newLinkedList; @@ -79,7 +82,7 @@ public class FileWatchRequestModifier implements Runnable { myDirectoryMappingWatches.put(mapping, request); } else { - LOG.error("root=" + request.getRootPath() + " toAdd=" + ContainerUtil.newHashSet(toAdd.keySet())); + LOG.error("root=" + request.getRootPath() + " toAdd=" + toAdd.keySet()); } } } diff --git a/platform/vcs-log/graph/src/com/intellij/vcs/log/graph/utils/LinearGraphUtils.java b/platform/vcs-log/graph/src/com/intellij/vcs/log/graph/utils/LinearGraphUtils.java index 8500e30adf6f..97033b8c5b8c 100644 --- a/platform/vcs-log/graph/src/com/intellij/vcs/log/graph/utils/LinearGraphUtils.java +++ b/platform/vcs-log/graph/src/com/intellij/vcs/log/graph/utils/LinearGraphUtils.java @@ -27,6 +27,7 @@ import org.jetbrains.annotations.Nullable; import java.awt.*; import java.util.Collection; +import java.util.HashSet; import java.util.List; import java.util.Set; @@ -150,6 +151,6 @@ public class LinearGraphUtils { @NotNull public static Set convertIdsToNodeIndexes(@NotNull final LinearGraph graph, @NotNull Collection ids) { List result = ContainerUtil.mapNotNull(ids, id -> graph.getNodeIndex(id)); - return ContainerUtil.newHashSet(result); + return new HashSet<>(result); } } diff --git a/platform/vcs-log/impl/src/com/intellij/vcs/log/statistics/VcsLogFeaturesCollector.java b/platform/vcs-log/impl/src/com/intellij/vcs/log/statistics/VcsLogFeaturesCollector.java index 50dd788b805a..4b7f62f5ac7a 100644 --- a/platform/vcs-log/impl/src/com/intellij/vcs/log/statistics/VcsLogFeaturesCollector.java +++ b/platform/vcs-log/impl/src/com/intellij/vcs/log/statistics/VcsLogFeaturesCollector.java @@ -67,8 +67,8 @@ public class VcsLogFeaturesCollector extends ProjectUsagesCollector { } } - Set currentColumns = ContainerUtil.newHashSet(properties.get(CommonUiProperties.COLUMN_ORDER)); - Set defaultColumns = ContainerUtil.newHashSet(defaultProperties.get(CommonUiProperties.COLUMN_ORDER)); + Set currentColumns = new HashSet<>(properties.get(CommonUiProperties.COLUMN_ORDER)); + Set defaultColumns = new HashSet<>(defaultProperties.get(CommonUiProperties.COLUMN_ORDER)); for (int column : GraphTableModel.DYNAMIC_COLUMNS) { if (currentColumns.contains(column) != defaultColumns.contains(column)) { usages.add(StatisticsUtilKt.getBooleanUsage(StringUtil.toLowerCase(GraphTableModel.COLUMN_NAMES[column]) + "Column", diff --git a/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/frame/DetailsPanel.java b/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/frame/DetailsPanel.java index 5327d661032c..2ff7e6453061 100644 --- a/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/frame/DetailsPanel.java +++ b/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/frame/DetailsPanel.java @@ -49,10 +49,8 @@ import org.jetbrains.annotations.Nullable; import javax.swing.*; import java.awt.*; -import java.util.Arrays; -import java.util.Collection; import java.util.List; -import java.util.Set; +import java.util.*; import static com.intellij.vcs.log.ui.frame.CommitPresentationUtil.buildPresentation; @@ -194,8 +192,7 @@ public class DetailsPanel extends JPanel implements EditorColorsListener, Dispos myResolveIndicator = BackgroundTaskUtil.executeOnPooledThread(this, () -> { MultiMap resolvedHashes = MultiMap.createSmart(); - Set fullHashes = - ContainerUtil.newHashSet(ContainerUtil.filter(unResolvedHashes, h -> h.length() == VcsLogUtil.FULL_HASH_LENGTH)); + Set fullHashes = new HashSet<>(ContainerUtil.filter(unResolvedHashes, h -> h.length() == VcsLogUtil.FULL_HASH_LENGTH)); for (String fullHash : fullHashes) { Hash hash = HashImpl.build(fullHash); for (VirtualFile root : myLogData.getRoots()) { diff --git a/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/highlighters/MyCommitsHighlighter.java b/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/highlighters/MyCommitsHighlighter.java index 18df53e0fcb7..d12026de10db 100644 --- a/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/highlighters/MyCommitsHighlighter.java +++ b/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/highlighters/MyCommitsHighlighter.java @@ -19,12 +19,13 @@ import com.intellij.util.NotNullFunction; import com.intellij.util.containers.ContainerUtil; import com.intellij.vcs.log.*; import com.intellij.vcs.log.data.VcsLogData; -import com.intellij.vcs.log.visible.filters.VcsLogUserFilterImpl; import com.intellij.vcs.log.util.VcsUserUtil; +import com.intellij.vcs.log.visible.filters.VcsLogUserFilterImpl; import org.jetbrains.annotations.NotNull; import java.util.Collection; import java.util.Collections; +import java.util.HashSet; import java.util.Set; public class MyCommitsHighlighter implements VcsLogHighlighter { @@ -58,8 +59,8 @@ public class MyCommitsHighlighter implements VcsLogHighlighter { // returns true if only one user commits to this repository private boolean isSingleUser() { NotNullFunction nameToString = user -> VcsUserUtil.getNameInStandardForm(VcsUserUtil.getShortPresentation(user)); - Set allUserNames = ContainerUtil.newHashSet(ContainerUtil.map(myLogData.getAllUsers(), nameToString)); - Set currentUserNames = ContainerUtil.newHashSet(ContainerUtil.map(myLogData.getCurrentUser().values(), nameToString)); + Set allUserNames = new HashSet<>(ContainerUtil.map(myLogData.getAllUsers(), nameToString)); + Set currentUserNames = new HashSet<>(ContainerUtil.map(myLogData.getCurrentUser().values(), nameToString)); return allUserNames.size() == currentUserNames.size() && currentUserNames.containsAll(allUserNames); } diff --git a/platform/vcs-log/impl/test/com/intellij/vcs/log/VcsLogUserFilterTest.java b/platform/vcs-log/impl/test/com/intellij/vcs/log/VcsLogUserFilterTest.java index cb9b3eccd5a2..1ea83528a4da 100644 --- a/platform/vcs-log/impl/test/com/intellij/vcs/log/VcsLogUserFilterTest.java +++ b/platform/vcs-log/impl/test/com/intellij/vcs/log/VcsLogUserFilterTest.java @@ -146,7 +146,7 @@ public abstract class VcsLogUserFilterTest { @NotNull MultiMap commits, @NotNull List metadata, @NotNull StringBuilder builder) throws VcsException { - Set expectedCommits = ContainerUtil.newHashSet(commits.get(user)); + Set expectedCommits = new HashSet<>(commits.get(user)); for (VcsUser synonym : synonymUsers) { expectedCommits.addAll(commits.get(synonym)); } @@ -211,7 +211,7 @@ public abstract class VcsLogUserFilterTest { } private static boolean hasSameElements(@NotNull Collection collection, @NotNull Collection expected) { - return ContainerUtil.newHashSet(expected).equals(ContainerUtil.newHashSet(collection)); + return new HashSet<>(expected).equals(new HashSet<>(collection)); } @NotNull diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/actions/AttachToProcessActionBase.java b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/actions/AttachToProcessActionBase.java index 72fa6d5b6988..f56c1356b97c 100644 --- a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/actions/AttachToProcessActionBase.java +++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/actions/AttachToProcessActionBase.java @@ -166,7 +166,7 @@ public abstract class AttachToProcessActionBase extends AnAction { for (XAttachHostProvider hostProvider : XAttachHostProvider.EP.getExtensionList()) { indicator.checkCanceled(); //noinspection unchecked - Set hosts = ContainerUtil.newHashSet(hostProvider.getAvailableHosts(project)); + Set hosts = new HashSet<>(hostProvider.getAvailableHosts(project)); for (XAttachHost host : hosts) { //noinspection unchecked diff --git a/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/Configuration.java b/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/Configuration.java index 5809329be140..27d582912c15 100644 --- a/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/Configuration.java +++ b/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/Configuration.java @@ -322,7 +322,7 @@ public class Configuration extends SimpleModificationTracker implements Persiste }); }; for (String key : ContainerUtil.newTreeSet(myInjections.keySet())) { - Set injections = ContainerUtil.newHashSet(myInjections.get(key)); + Set injections = new HashSet<>(myInjections.get(key)); injections.removeAll(getDefaultInjections()); for (BaseInjection injection : ContainerUtil.sorted(injections, comparator)) { element.addContent(injection.getState()); diff --git a/plugins/git4idea/src/git4idea/rebase/GitRebaseProcess.java b/plugins/git4idea/src/git4idea/rebase/GitRebaseProcess.java index 6cbe8a9ebb51..8069eea97549 100644 --- a/plugins/git4idea/src/git4idea/rebase/GitRebaseProcess.java +++ b/plugins/git4idea/src/git4idea/rebase/GitRebaseProcess.java @@ -397,7 +397,7 @@ public class GitRebaseProcess { @Contract("_, !null -> !null") private static T getItemIfAllTheSame(@NotNull Collection collection, @Nullable T defaultItem) { - return newHashSet(collection).size() == 1 ? getFirstItem(collection) : defaultItem; + return new HashSet<>(collection).size() == 1 ? getFirstItem(collection) : defaultItem; } private void notifyNotAllConflictsResolved(@NotNull GitRepository conflictingRepository, diff --git a/plugins/gradle/java/src/integrations/javaee/JavaEEGradleProjectResolverExtension.java b/plugins/gradle/java/src/integrations/javaee/JavaEEGradleProjectResolverExtension.java index d17e87230f95..3756cfc8bbbf 100644 --- a/plugins/gradle/java/src/integrations/javaee/JavaEEGradleProjectResolverExtension.java +++ b/plugins/gradle/java/src/integrations/javaee/JavaEEGradleProjectResolverExtension.java @@ -41,10 +41,7 @@ import org.jetbrains.plugins.gradle.service.project.ProjectResolverContext; import org.jetbrains.plugins.gradle.util.GradleConstants; import java.io.File; -import java.util.Collection; -import java.util.List; -import java.util.Map; -import java.util.Set; +import java.util.*; import static com.intellij.openapi.externalSystem.util.ExternalSystemApiUtil.findAllRecursively; import static com.intellij.openapi.externalSystem.util.ExternalSystemApiUtil.toCanonicalPath; @@ -90,7 +87,7 @@ public class JavaEEGradleProjectResolverExtension extends AbstractProjectResolve ExternalProject externalProject = resolverCtx.getExtraProject(gradleModule, ExternalProject.class); if (externalProject != null) { if (externalProject.getArtifactsByConfiguration().get("archives") != null) { - final Set archivesArtifacts = ContainerUtil.newHashSet(externalProject.getArtifactsByConfiguration().get("archives")); + final Set archivesArtifacts = new HashSet<>(externalProject.getArtifactsByConfiguration().get("archives")); final Set testsArtifacts = externalProject.getArtifactsByConfiguration().get("tests"); if (testsArtifacts != null) { archivesArtifacts.removeAll(testsArtifacts); diff --git a/plugins/gradle/java/src/integrations/maven/MavenRepositoriesHolder.java b/plugins/gradle/java/src/integrations/maven/MavenRepositoriesHolder.java index 7db2b17704c0..46258b8a7300 100644 --- a/plugins/gradle/java/src/integrations/maven/MavenRepositoriesHolder.java +++ b/plugins/gradle/java/src/integrations/maven/MavenRepositoriesHolder.java @@ -25,6 +25,7 @@ import org.jetbrains.plugins.gradle.util.GradleConstants; import javax.swing.event.HyperlinkEvent; import java.util.Collections; +import java.util.HashSet; import java.util.List; import java.util.Set; @@ -53,7 +54,7 @@ public class MavenRepositoriesHolder { UNINDEXED_MAVEN_REPOSITORIES_NOTIFICATION_GROUP, NotificationSource.PROJECT_SYNC, GradleConstants.SYSTEM_ID); } else { - myNotIndexedUrls = ContainerUtil.newHashSet(repositories); + myNotIndexedUrls = new HashSet<>(repositories); } } @@ -125,7 +126,7 @@ public class MavenRepositoriesHolder { } public void update(Set remoteRepositories) { - myRemoteRepositories = ContainerUtil.newHashSet(remoteRepositories); + myRemoteRepositories = new HashSet<>(remoteRepositories); } public Set getRemoteRepositories() { diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/service/project/GradleProjectResolver.java b/plugins/gradle/src/org/jetbrains/plugins/gradle/service/project/GradleProjectResolver.java index 2ea6d6c43f84..c9918efcda18 100644 --- a/plugins/gradle/src/org/jetbrains/plugins/gradle/service/project/GradleProjectResolver.java +++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/service/project/GradleProjectResolver.java @@ -661,7 +661,7 @@ public class GradleProjectResolver implements ExternalSystemProjectResolver paths = ContainerUtil.newHashSet(sourceSetRoots.keySet()); + Set paths = new HashSet<>(sourceSetRoots.keySet()); for (String path : paths) { if (FileUtil.isAncestor(rootPath, path, true)) { Collection values = sourceSetRoots.remove(path); diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/resolve/processors/SubstitutorComputer.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/resolve/processors/SubstitutorComputer.java index d481993e9d2c..729d2df029d6 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/resolve/processors/SubstitutorComputer.java +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/resolve/processors/SubstitutorComputer.java @@ -41,7 +41,6 @@ import org.jetbrains.plugins.groovy.lang.psi.util.PsiUtil; import java.util.*; import static com.intellij.util.containers.ContainerUtil.emptyList; -import static com.intellij.util.containers.ContainerUtil.newHashSet; import static org.jetbrains.plugins.groovy.lang.sam.SamConversionKt.findSingleAbstractMethod; import static org.jetbrains.plugins.groovy.lang.sam.SamConversionKt.isSamConversionAllowed; @@ -83,7 +82,7 @@ public class SubstitutorComputer { myExitPoints = VolatileNotNullLazyValue.createValue(() -> { if (canBeExitPoint(place)) { GrControlFlowOwner flowOwner = ControlFlowUtils.findControlFlowOwner(place); - return newHashSet(ControlFlowUtils.collectReturns(flowOwner)); + return new HashSet<>(ControlFlowUtils.collectReturns(flowOwner)); } else { return emptyList(); diff --git a/plugins/groovy/src/org/intellij/plugins/intelliLang/inject/groovy/PatternEditorContextMembersProvider.java b/plugins/groovy/src/org/intellij/plugins/intelliLang/inject/groovy/PatternEditorContextMembersProvider.java index 9dad702ecc91..27b8dde1eea4 100644 --- a/plugins/groovy/src/org/intellij/plugins/intelliLang/inject/groovy/PatternEditorContextMembersProvider.java +++ b/plugins/groovy/src/org/intellij/plugins/intelliLang/inject/groovy/PatternEditorContextMembersProvider.java @@ -45,6 +45,7 @@ import org.jetbrains.annotations.Nullable; import org.jetbrains.plugins.groovy.GroovyFileType; import org.jetbrains.plugins.groovy.lang.resolve.NonCodeMembersContributor; +import java.util.HashSet; import java.util.List; import java.util.Set; @@ -162,7 +163,7 @@ public class PatternEditorContextMembersProvider extends NonCodeMembersContribut return true; }, searcher.getPattern(), UsageSearchContext.IN_FOREIGN_LANGUAGES, scope, searcher.isCaseSensitive()); } - return ContainerUtil.newHashSet(roots); + return new HashSet<>(roots); } } diff --git a/plugins/java-i18n/src/com/intellij/codeInspection/SuspiciousLocalesLanguagesInspection.java b/plugins/java-i18n/src/com/intellij/codeInspection/SuspiciousLocalesLanguagesInspection.java index a35c6031041d..bde0b0836381 100644 --- a/plugins/java-i18n/src/com/intellij/codeInspection/SuspiciousLocalesLanguagesInspection.java +++ b/plugins/java-i18n/src/com/intellij/codeInspection/SuspiciousLocalesLanguagesInspection.java @@ -77,7 +77,7 @@ public class SuspiciousLocalesLanguagesInspection extends BaseLocalInspectionToo @Override public void writeSettings(@NotNull Element node) throws WriteExternalException { if (!myAdditionalLanguages.isEmpty()) { - final ArrayList uniqueLanguages = ContainerUtil.newArrayList(ContainerUtil.newHashSet(myAdditionalLanguages)); + final ArrayList uniqueLanguages = ContainerUtil.newArrayList(new HashSet<>(myAdditionalLanguages)); Collections.sort(uniqueLanguages); final String locales = StringUtil.join(uniqueLanguages, ","); node.setAttribute(ADDITIONAL_LANGUAGES_ATTR_NAME, locales); diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/indices/MavenProjectIndicesManager.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/indices/MavenProjectIndicesManager.java index fb8334242134..21799e6ec9a3 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/indices/MavenProjectIndicesManager.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/indices/MavenProjectIndicesManager.java @@ -43,6 +43,7 @@ import org.jetbrains.idea.maven.utils.MavenSimpleProjectComponent; import java.io.File; import java.util.ArrayList; +import java.util.HashSet; import java.util.List; import java.util.Set; @@ -121,7 +122,7 @@ public class MavenProjectIndicesManager extends MavenSimpleProjectComponent impl private Set> collectRemoteRepositoriesIdsAndUrls() { Set> result = new THashSet<>(); - Set remoteRepositories = ContainerUtil.newHashSet(getMavenProjectManager().getRemoteRepositories()); + Set remoteRepositories = new HashSet<>(getMavenProjectManager().getRemoteRepositories()); for (MavenRepositoryProvider repositoryProvider : MavenRepositoryProvider.EP_NAME.getExtensions()) { ContainerUtil.addAll(remoteRepositories, repositoryProvider.getRemoteRepositories(myProject)); } diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/NestedCopiesHolder.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/NestedCopiesHolder.java index 668db5af3de0..0ba89c4a2b04 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/NestedCopiesHolder.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/NestedCopiesHolder.java @@ -18,6 +18,7 @@ package org.jetbrains.idea.svn; import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.NotNull; +import java.util.HashSet; import java.util.Set; public class NestedCopiesHolder { @@ -29,7 +30,7 @@ public class NestedCopiesHolder { } public synchronized Set getAndClear() { - Set copy = ContainerUtil.newHashSet(mySet); + Set copy = new HashSet<>(mySet); mySet.clear(); return copy; diff --git a/xml/xml-psi-api/src/com/intellij/codeInspection/DefaultXmlSuppressionProvider.java b/xml/xml-psi-api/src/com/intellij/codeInspection/DefaultXmlSuppressionProvider.java index fad97401abcc..cc86a47f669d 100644 --- a/xml/xml-psi-api/src/com/intellij/codeInspection/DefaultXmlSuppressionProvider.java +++ b/xml/xml-psi-api/src/com/intellij/codeInspection/DefaultXmlSuppressionProvider.java @@ -16,7 +16,6 @@ import com.intellij.psi.PsiFile; import com.intellij.psi.codeStyle.CodeStyleManager; import com.intellij.psi.util.PsiTreeUtil; import com.intellij.psi.xml.*; -import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -100,7 +99,7 @@ public class DefaultXmlSuppressionProvider extends XmlSuppressionProvider implem if (id == null) { return true; } - @NonNls final HashSet parts = ContainerUtil.newHashSet(StringUtil.getWordsIn(text)); + @NonNls final HashSet parts = new HashSet<>(StringUtil.getWordsIn(text)); return parts.contains(id) || parts.contains(XmlSuppressableInspectionTool.ALL); }