diff --git a/java/compiler/impl/src/com/intellij/compiler/options/AnnotationProcessorsPanel.java b/java/compiler/impl/src/com/intellij/compiler/options/AnnotationProcessorsPanel.java index 6fadb96589c5..a630fb4151d5 100644 --- a/java/compiler/impl/src/com/intellij/compiler/options/AnnotationProcessorsPanel.java +++ b/java/compiler/impl/src/com/intellij/compiler/options/AnnotationProcessorsPanel.java @@ -85,9 +85,7 @@ public class AnnotationProcessorsPanel extends JPanel { final ProcessorConfigProfile nodeProfile = ((ProfileNode)node.getParent()).myProfile; final List profiles = new ArrayList<>(); profiles.add(myDefaultProfile); - for (ProcessorConfigProfile profile : myModuleProfiles) { - profiles.add(profile); - } + profiles.addAll(myModuleProfiles); profiles.remove(nodeProfile); final JBPopup popup = JBPopupFactory.getInstance() .createPopupChooserBuilder(profiles) diff --git a/java/compiler/openapi/src/com/intellij/compiler/ModuleCompilerUtil.java b/java/compiler/openapi/src/com/intellij/compiler/ModuleCompilerUtil.java index 16c1c46cdcba..6ba17c620e59 100644 --- a/java/compiler/openapi/src/com/intellij/compiler/ModuleCompilerUtil.java +++ b/java/compiler/openapi/src/com/intellij/compiler/ModuleCompilerUtil.java @@ -63,10 +63,7 @@ public final class ModuleCompilerUtil { @NotNull private static List> getSortedChunks(@NotNull Graph graph) { final Graph> chunkGraph = toChunkGraph(graph); - final List> chunks = new ArrayList<>(chunkGraph.getNodes().size()); - for (final Chunk chunk : chunkGraph.getNodes()) { - chunks.add(chunk); - } + final List> chunks = new ArrayList<>(chunkGraph.getNodes()); DFSTBuilder> builder = new DFSTBuilder<>(chunkGraph); if (!builder.isAcyclic()) { LOG.error("Acyclic graph expected"); diff --git a/java/idea-ui/src/com/intellij/util/ui/classpath/ChooseLibrariesFromTablesDialog.java b/java/idea-ui/src/com/intellij/util/ui/classpath/ChooseLibrariesFromTablesDialog.java index 19f8e5f72889..624f1b48e277 100644 --- a/java/idea-ui/src/com/intellij/util/ui/classpath/ChooseLibrariesFromTablesDialog.java +++ b/java/idea-ui/src/com/intellij/util/ui/classpath/ChooseLibrariesFromTablesDialog.java @@ -95,9 +95,7 @@ public class ChooseLibrariesFromTablesDialog extends ChooseLibrariesDialogBase { } tables.add(registrar.getLibraryTable()); if (showCustomLibraryTables) { - for (LibraryTable table : registrar.getCustomLibraryTables()) { - tables.add(table); - } + tables.addAll(registrar.getCustomLibraryTables()); } return tables; } diff --git a/platform/diff-impl/src/com/intellij/openapi/diff/impl/dir/actions/DirDiffToolbarActions.java b/platform/diff-impl/src/com/intellij/openapi/diff/impl/dir/actions/DirDiffToolbarActions.java index a8091eaf934f..87503a6b4ebe 100644 --- a/platform/diff-impl/src/com/intellij/openapi/diff/impl/dir/actions/DirDiffToolbarActions.java +++ b/platform/diff-impl/src/com/intellij/openapi/diff/impl/dir/actions/DirDiffToolbarActions.java @@ -53,9 +53,7 @@ public class DirDiffToolbarActions extends ActionGroup implements DumbAware { actions.add(new SynchronizeDiff(model, false)); } - for (AnAction action : model.getSettings().getExtraActions()) { - actions.add(action); - } + actions.addAll(model.getSettings().getExtraActions()); for (AnAction action : actions) { if (action instanceof ShortcutProvider) { diff --git a/platform/lang-api/src/com/intellij/ide/util/frameworkSupport/FrameworkSupportConfigurableBase.java b/platform/lang-api/src/com/intellij/ide/util/frameworkSupport/FrameworkSupportConfigurableBase.java index 292055e85872..1e9532ae56b0 100644 --- a/platform/lang-api/src/com/intellij/ide/util/frameworkSupport/FrameworkSupportConfigurableBase.java +++ b/platform/lang-api/src/com/intellij/ide/util/frameworkSupport/FrameworkSupportConfigurableBase.java @@ -100,9 +100,7 @@ public class FrameworkSupportConfigurableBase extends FrameworkSupportConfigurab protected void reloadVersions(List frameworkVersions) { myVersions.clear(); - for (FrameworkVersion version : frameworkVersions) { - myVersions.add(version); - } + myVersions.addAll(frameworkVersions); } @Override diff --git a/platform/lang-impl/src/com/intellij/execution/ui/layout/impl/GridImpl.java b/platform/lang-impl/src/com/intellij/execution/ui/layout/impl/GridImpl.java index 4cc1fef87379..b847d44e8197 100644 --- a/platform/lang-impl/src/com/intellij/execution/ui/layout/impl/GridImpl.java +++ b/platform/lang-impl/src/com/intellij/execution/ui/layout/impl/GridImpl.java @@ -34,8 +34,8 @@ import org.jetbrains.annotations.Nullable; import javax.swing.*; import java.awt.*; -import java.util.*; import java.util.List; +import java.util.*; public class GridImpl extends Wrapper implements Grid, Disposable, DataProvider { private final ThreeComponentsSplitter myTopSplit = new ThreeComponentsSplitter(false, true); @@ -48,8 +48,7 @@ public class GridImpl extends Wrapper implements Grid, Disposable, DataProvider private final List myContents = new ArrayList<>(); private final Map myContent2Cell = new HashMap<>(); - private final Comparator myContentComparator = - (o1, o2) -> getCellFor(o1).getPlaceInGrid().compareTo(getCellFor(o2).getPlaceInGrid()); + private final Comparator myContentComparator = Comparator.comparing(o -> getCellFor(o).getPlaceInGrid()); private final ViewContextEx myViewContext; @@ -237,7 +236,7 @@ public class GridImpl extends Wrapper implements Grid, Disposable, DataProvider } if (getParent() instanceof JComponent) { - ((JComponent)getParent()).revalidate(); + getParent().revalidate(); getParent().repaint(); } @@ -361,13 +360,7 @@ public class GridImpl extends Wrapper implements Grid, Disposable, DataProvider } public List getAttachedContents() { - ArrayList result = new ArrayList<>(); - - for (Content each : getContents()) { - result.add(each); - } - - return result; + return new ArrayList<>(getContents()); } @Override diff --git a/platform/lang-impl/src/com/intellij/framework/detection/impl/FrameworkDetectionManager.java b/platform/lang-impl/src/com/intellij/framework/detection/impl/FrameworkDetectionManager.java index 49c875143f1c..be2db123d7e2 100644 --- a/platform/lang-impl/src/com/intellij/framework/detection/impl/FrameworkDetectionManager.java +++ b/platform/lang-impl/src/com/intellij/framework/detection/impl/FrameworkDetectionManager.java @@ -251,9 +251,7 @@ public class FrameworkDetectionManager implements FrameworkDetectionIndexListene final DetectionExcludesConfiguration excludesConfiguration = DetectionExcludesConfiguration.getInstance(myProject); for (Integer id : detectors) { final Collection frameworks = runDetector(id, index, excludesConfiguration, false); - for (DetectedFrameworkDescription framework : frameworks) { - descriptions.add(framework); - } + descriptions.addAll(frameworks); } return FrameworkDetectionUtil.removeDisabled(descriptions); } diff --git a/platform/lang-impl/src/com/intellij/refactoring/ui/ConflictsDialog.java b/platform/lang-impl/src/com/intellij/refactoring/ui/ConflictsDialog.java index 3be75957b13a..e3eb22147c03 100644 --- a/platform/lang-impl/src/com/intellij/refactoring/ui/ConflictsDialog.java +++ b/platform/lang-impl/src/com/intellij/refactoring/ui/ConflictsDialog.java @@ -71,11 +71,8 @@ public class ConflictsDialog extends DialogWrapper{ myProject = project; myDoRefactoringRunnable = doRefactoringRunnable; myCanShowConflictsInView = canShowConflictsInView; - final LinkedHashSet conflicts = new LinkedHashSet<>(); - for (String conflict : conflictDescriptions.values()) { - conflicts.add(conflict); - } + final LinkedHashSet conflicts = new LinkedHashSet<>(conflictDescriptions.values()); myConflictDescriptions = ArrayUtil.toStringArray(conflicts); myElementConflictDescription = conflictDescriptions; setTitle(RefactoringBundle.message("problems.detected.title")); diff --git a/platform/lang-impl/src/com/intellij/webcore/packaging/ManagePackagesDialog.java b/platform/lang-impl/src/com/intellij/webcore/packaging/ManagePackagesDialog.java index ef39dda60d4a..8f20f98b3b18 100644 --- a/platform/lang-impl/src/com/intellij/webcore/packaging/ManagePackagesDialog.java +++ b/platform/lang-impl/src/com/intellij/webcore/packaging/ManagePackagesDialog.java @@ -139,7 +139,7 @@ public class ManagePackagesDialog extends DialogWrapper { } }); - UiNotifyConnector.doWhenFirstShown(myPackages, () -> initModel()); + UiNotifyConnector.doWhenFirstShown(myPackages, this::initModel); myOptionsCheckBox.addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent event) { @@ -395,9 +395,7 @@ public class ManagePackagesDialog extends DialogWrapper { public void filter(List filtered, @Nullable final RepoPackage toSelect){ myView.clear(); myPackages.clearSelection(); - for (RepoPackage repoPackage : filtered) { - myView.add(repoPackage); - } + myView.addAll(filtered); if (toSelect != null) myPackages.setSelectedValue(toSelect, true); Collections.sort(myView); diff --git a/platform/platform-api/src/com/intellij/ui/dualView/DualView.java b/platform/platform-api/src/com/intellij/ui/dualView/DualView.java index c8cf2c9bd5bc..541e4de68f9e 100644 --- a/platform/platform-api/src/com/intellij/ui/dualView/DualView.java +++ b/platform/platform-api/src/com/intellij/ui/dualView/DualView.java @@ -28,7 +28,6 @@ import com.intellij.ui.treeStructure.Tree; import com.intellij.ui.treeStructure.treetable.ListTreeTableModelOnColumns; import com.intellij.ui.treeStructure.treetable.TreeTableModel; import com.intellij.util.config.Storage; -import com.intellij.util.containers.ContainerUtil; import com.intellij.util.ui.ColumnInfo; import com.intellij.util.ui.ListTableModel; import org.jetbrains.annotations.NonNls; @@ -185,9 +184,7 @@ public class DualView extends JPanel { myCurrentView = view; if (myCurrentView != null) { myCurrentView.setAutoResizeMode(JTable.AUTO_RESIZE_LAST_COLUMN); - if (myCurrentView instanceof JBTable) { - myCurrentView.setStriped(true); - } + myCurrentView.setStriped(true); final int row = myCurrentView.getSelectedRow(); myCurrentView.scrollRectToVisible(myCurrentView.getCellRect(row, 0, true)); } @@ -329,12 +326,8 @@ public class DualView extends JPanel { } public List getSelection() { - List result = ContainerUtil.newArrayList(); SelectionProvider visibleTable = (SelectionProvider)getVisibleTable(); - for (Object aSelection : visibleTable.getSelection()) { - result.add(aSelection); - } - return result; + return new ArrayList(visibleTable.getSelection()); } private JTable getVisibleTable() { diff --git a/platform/platform-impl/src/com/intellij/ide/RecentProjectsManagerBase.java b/platform/platform-impl/src/com/intellij/ide/RecentProjectsManagerBase.java index 47e2e1d72ab2..d89dc1099d1c 100644 --- a/platform/platform-impl/src/com/intellij/ide/RecentProjectsManagerBase.java +++ b/platform/platform-impl/src/com/intellij/ide/RecentProjectsManagerBase.java @@ -487,9 +487,7 @@ public abstract class RecentProjectsManagerBase extends RecentProjectsManager im } actions.add(new ProjectGroupActionGroup(group, children)); if (group.isExpanded()) { - for (AnAction child : children) { - actions.add(child); - } + actions.addAll(children); } } } diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/inheritance/AbstractClassWithoutAbstractMethodsInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/inheritance/AbstractClassWithoutAbstractMethodsInspection.java index 99e436ddb376..32d086862533 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/inheritance/AbstractClassWithoutAbstractMethodsInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/inheritance/AbstractClassWithoutAbstractMethodsInspection.java @@ -23,6 +23,7 @@ import com.siyeh.ig.BaseInspection; import com.siyeh.ig.BaseInspectionVisitor; import org.jetbrains.annotations.NotNull; +import java.util.Collections; import java.util.HashSet; import java.util.Set; @@ -93,9 +94,7 @@ public class AbstractClassWithoutAbstractMethodsInspection private static void calculateOverriddenMethods( PsiMethod method, Set overriddenMethods) { final PsiMethod[] superMethods = method.findSuperMethods(); - for (final PsiMethod superMethod : superMethods) { - overriddenMethods.add(superMethod); - } + Collections.addAll(overriddenMethods, superMethods); } } } \ No newline at end of file diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/errorhandling/BadExceptionCaughtInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/errorhandling/BadExceptionCaughtInspection.java index cab005faf52e..40b1b500143e 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/errorhandling/BadExceptionCaughtInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/errorhandling/BadExceptionCaughtInspection.java @@ -50,9 +50,7 @@ public class BadExceptionCaughtInspection extends BaseInspection { if (!exceptionsString.isEmpty()) { exceptions.clear(); final List strings = StringUtil.split(exceptionsString, ","); - for (String string : strings) { - exceptions.add(string); - } + exceptions.addAll(strings); exceptionsString = ""; } } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/errorhandling/BadExceptionDeclaredInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/errorhandling/BadExceptionDeclaredInspection.java index 5084e6acc6c9..24d3d242f2ac 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/errorhandling/BadExceptionDeclaredInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/errorhandling/BadExceptionDeclaredInspection.java @@ -60,9 +60,7 @@ public class BadExceptionDeclaredInspection extends BaseInspection { if (!exceptionsString.isEmpty()) { exceptions.clear(); final List strings = StringUtil.split(exceptionsString, ","); - for (String string : strings) { - exceptions.add(string); - } + exceptions.addAll(strings); exceptionsString = ""; } } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/errorhandling/BadExceptionThrownInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/errorhandling/BadExceptionThrownInspection.java index 7746fdd606a3..c55c56d632aa 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/errorhandling/BadExceptionThrownInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/errorhandling/BadExceptionThrownInspection.java @@ -52,9 +52,7 @@ public class BadExceptionThrownInspection extends BaseInspection { exceptions.clear(); final List strings = StringUtil.split(exceptionsString, ","); - for (String string : strings) { - exceptions.add(string); - } + exceptions.addAll(strings); exceptionsString = ""; } } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/threading/AccessToNonThreadSafeStaticFieldFromInstanceInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/threading/AccessToNonThreadSafeStaticFieldFromInstanceInspection.java index 79f711911d0d..7f6061f7abae 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/threading/AccessToNonThreadSafeStaticFieldFromInstanceInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/threading/AccessToNonThreadSafeStaticFieldFromInstanceInspection.java @@ -50,9 +50,7 @@ public class AccessToNonThreadSafeStaticFieldFromInstanceInspection extends if (!this.nonThreadSafeTypes.isEmpty()) { this.nonThreadSafeClasses.clear(); final List strings = StringUtil.split(this.nonThreadSafeTypes, ","); - for (String string : strings) { - this.nonThreadSafeClasses.add(string); - } + this.nonThreadSafeClasses.addAll(strings); this.nonThreadSafeTypes = ""; } } diff --git a/plugins/ant/src/com/intellij/lang/ant/dom/AntDomPropertyDefiningElement.java b/plugins/ant/src/com/intellij/lang/ant/dom/AntDomPropertyDefiningElement.java index 8d9b9b3d3b8f..6e75a6ab55f8 100644 --- a/plugins/ant/src/com/intellij/lang/ant/dom/AntDomPropertyDefiningElement.java +++ b/plugins/ant/src/com/intellij/lang/ant/dom/AntDomPropertyDefiningElement.java @@ -39,13 +39,11 @@ public abstract class AntDomPropertyDefiningElement extends AntDomElement implem final List result = new ArrayList<>(attribs.size()); for (GenericAttributeValue attribValue : attribs) { final String name = attribValue.getStringValue(); - if (name != null && name.length() > 0) { + if (name != null && !name.isEmpty()) { result.add(name); } } - for (String name : getImplicitPropertyNames()) { - result.add(name); - } + result.addAll(getImplicitPropertyNames()); return result.iterator(); } diff --git a/plugins/git4idea/remote-servers-git/src/com/intellij/remoteServer/util/CloudGitDeploymentRuntime.java b/plugins/git4idea/remote-servers-git/src/com/intellij/remoteServer/util/CloudGitDeploymentRuntime.java index aa5b26ef22b8..32523f88c6d7 100644 --- a/plugins/git4idea/remote-servers-git/src/com/intellij/remoteServer/util/CloudGitDeploymentRuntime.java +++ b/plugins/git4idea/remote-servers-git/src/com/intellij/remoteServer/util/CloudGitDeploymentRuntime.java @@ -469,9 +469,7 @@ public class CloudGitDeploymentRuntime extends CloudDeploymentRuntime { public CloudGitApplication findApplication4Repository() throws ServerRuntimeException { final List repositoryUrls = new ArrayList<>(); for (GitRemote remote : getRepository().getRemotes()) { - for (String url : remote.getUrls()) { - repositoryUrls.add(url); - } + repositoryUrls.addAll(remote.getUrls()); } return getAgentTaskExecutor().execute(() -> getDeployment().findApplication4Repository(ArrayUtil.toStringArray(repositoryUrls))); diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/dataFlow/DFAType.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/dataFlow/DFAType.java index 85e4db43bc0f..3dc3cfafaf03 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/dataFlow/DFAType.java +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/dataFlow/DFAType.java @@ -99,9 +99,7 @@ public class DFAType { public DFAType negate(@NotNull Instruction instruction) { final DFAType type = new DFAType(primary); - for (Mixin mixin : mixins) { - type.mixins.add(mixin); - } + type.mixins.addAll(mixins); for (NegatingGotoInstruction negation: instruction.getNegatingGotoInstruction()) { final Set conditionsToNegate = negation.getCondition().getDependentConditions(); @@ -141,7 +139,7 @@ public class DFAType { return t1 == t2 || Comparing.equal(TypeConversionUtil.erasure(t1), TypeConversionUtil.erasure(t2)); } - @Nullable + @NotNull public static DFAType create(DFAType t1, DFAType t2, PsiManager manager) { if (t1.equals(t2)) return t1; diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/editor/GroovyImportOptimizer.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/editor/GroovyImportOptimizer.java index 983811335c88..8aaf072a8fdc 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/editor/GroovyImportOptimizer.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/editor/GroovyImportOptimizer.java @@ -260,9 +260,7 @@ public class GroovyImportOptimizer implements ImportOptimizer { first.getAnnotationList().replace(factory.createModifierList(allSkippedAnnotations)); } - for (GrImportStatement anImport : unresolvedOnDemandImports) { - explicated.add(anImport); - } + explicated.addAll(unresolvedOnDemandImports); return explicated.toArray(GrImportStatement.EMPTY_ARRAY); } diff --git a/python/psi-api/src/com/jetbrains/python/nameResolver/NameResolverTools.java b/python/psi-api/src/com/jetbrains/python/nameResolver/NameResolverTools.java index b95680600c38..e53f4cf78726 100644 --- a/python/psi-api/src/com/jetbrains/python/nameResolver/NameResolverTools.java +++ b/python/psi-api/src/com/jetbrains/python/nameResolver/NameResolverTools.java @@ -31,7 +31,10 @@ import com.jetbrains.python.psi.types.TypeEvalContext; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.List; /** * @author Ilya.Kazakevich @@ -123,10 +126,7 @@ public final class NameResolverTools { final String callableName = callee.getName(); - final Collection possibleNames = new LinkedList<>(); - for (final String lastComponent : getLastComponents(function)) { - possibleNames.add(lastComponent); - } + final Collection possibleNames = getLastComponents(function); return possibleNames.contains(callableName) && call.isCallee(function); } diff --git a/python/src/com/jetbrains/python/buildout/BuildoutFacetConfiguration.java b/python/src/com/jetbrains/python/buildout/BuildoutFacetConfiguration.java index d330fd16c955..a08eb497494f 100644 --- a/python/src/com/jetbrains/python/buildout/BuildoutFacetConfiguration.java +++ b/python/src/com/jetbrains/python/buildout/BuildoutFacetConfiguration.java @@ -20,7 +20,6 @@ import com.intellij.facet.ui.FacetEditorContext; import com.intellij.facet.ui.FacetEditorTab; import com.intellij.facet.ui.FacetValidatorsManager; import com.intellij.openapi.module.Module; -import com.intellij.openapi.options.ConfigurationException; import com.intellij.openapi.util.InvalidDataException; import com.intellij.openapi.util.JDOMExternalizerUtil; import com.intellij.openapi.util.WriteExternalException; @@ -75,11 +74,7 @@ public class BuildoutFacetConfiguration implements FacetConfiguration { * @param paths what to store; the list will be copied. */ void setPaths(@Nullable List paths) { - if (paths != null) { - myPaths = new ArrayList<>(paths.size()); - for (String s : paths) myPaths.add(s); - } - else myPaths = null; + myPaths = paths == null ? null : new ArrayList<>(paths); } public List getPaths() { @@ -124,7 +119,7 @@ public class BuildoutFacetConfiguration implements FacetConfiguration { } @Override - public void apply() throws ConfigurationException { + public void apply() { myPanel.apply(); }