diff --git a/java/java-impl/src/com/intellij/refactoring/extractMethod/ExtractMethodProcessor.java b/java/java-impl/src/com/intellij/refactoring/extractMethod/ExtractMethodProcessor.java index 87abba067121..a1ba3ef08c0b 100644 --- a/java/java-impl/src/com/intellij/refactoring/extractMethod/ExtractMethodProcessor.java +++ b/java/java-impl/src/com/intellij/refactoring/extractMethod/ExtractMethodProcessor.java @@ -404,8 +404,8 @@ public class ExtractMethodProcessor implements MatchProvider { }); for(PsiClass localClass: localClasses) { final boolean classExtracted = isExtractedElement(localClass); - final List extractedReferences = new ArrayList(); - final List remainingReferences = new ArrayList(); + final List extractedReferences = Collections.synchronizedList(new ArrayList()); + final List remainingReferences = Collections.synchronizedList(new ArrayList()); ReferencesSearch.search(localClass).forEach(new Processor() { public boolean process(final PsiReference psiReference) { final PsiElement element = psiReference.getElement(); diff --git a/java/java-impl/src/com/intellij/refactoring/inline/InlineLocalHandler.java b/java/java-impl/src/com/intellij/refactoring/inline/InlineLocalHandler.java index 037672f39297..0057655ee02b 100644 --- a/java/java-impl/src/com/intellij/refactoring/inline/InlineLocalHandler.java +++ b/java/java-impl/src/com/intellij/refactoring/inline/InlineLocalHandler.java @@ -86,8 +86,8 @@ public class InlineLocalHandler extends JavaInlineActionHandler { } final PsiClass containingClass = PsiTreeUtil.getParentOfType(local, PsiClass.class); - final List innerClassesWithUsages = new ArrayList(); - final List innerClassUsages = new ArrayList(); + final List innerClassesWithUsages = Collections.synchronizedList(new ArrayList()); + final List innerClassUsages = Collections.synchronizedList(new ArrayList()); query.forEach(new Processor() { public boolean process(final PsiReference psiReference) { final PsiElement element = psiReference.getElement(); diff --git a/java/java-impl/src/com/intellij/refactoring/inline/InlineParameterHandler.java b/java/java-impl/src/com/intellij/refactoring/inline/InlineParameterHandler.java index b8631b4fb909..27d7827ff8ad 100644 --- a/java/java-impl/src/com/intellij/refactoring/inline/InlineParameterHandler.java +++ b/java/java-impl/src/com/intellij/refactoring/inline/InlineParameterHandler.java @@ -40,10 +40,7 @@ import com.intellij.refactoring.util.RefactoringMessageDialog; import com.intellij.util.Processor; import org.jetbrains.annotations.Nullable; -import java.util.ArrayList; -import java.util.Collection; -import java.util.HashSet; -import java.util.List; +import java.util.*; /** * @author yole @@ -74,8 +71,8 @@ public class InlineParameterHandler extends JavaInlineActionHandler { final Ref refInitializer = new Ref(); final Ref refConstantInitializer = new Ref(); final Ref refMethodCall = new Ref(); - final List occurrences = new ArrayList(); - final Collection containingFiles = new HashSet(); + final List occurrences = Collections.synchronizedList(new ArrayList()); + final Collection containingFiles = Collections.synchronizedSet(new HashSet()); containingFiles.add(psiParameter.getContainingFile()); boolean result = ReferencesSearch.search(method).forEach(new Processor() { public boolean process(final PsiReference psiReference) { diff --git a/java/java-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/MoveClassToInnerProcessor.java b/java/java-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/MoveClassToInnerProcessor.java index 2ffcd8d6df01..8097599a0eba 100644 --- a/java/java-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/MoveClassToInnerProcessor.java +++ b/java/java-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/MoveClassToInnerProcessor.java @@ -407,7 +407,7 @@ public class MoveClassToInnerProcessor extends BaseRefactoringProcessor { myConflicts = conflicts; } - public void addConflict(final PsiElement targetElement, final PsiElement sourceElement) { + public synchronized void addConflict(final PsiElement targetElement, final PsiElement sourceElement) { PsiElement container = ConflictsUtil.getContainer(sourceElement); if (!myReportedContainers.contains(container)) { myReportedContainers.add(container); diff --git a/java/java-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/MoveClassesOrPackagesProcessor.java b/java/java-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/MoveClassesOrPackagesProcessor.java index 711661ca5d14..a1f370567f5d 100644 --- a/java/java-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/MoveClassesOrPackagesProcessor.java +++ b/java/java-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/MoveClassesOrPackagesProcessor.java @@ -560,7 +560,7 @@ public class MoveClassesOrPackagesProcessor extends BaseRefactoringProcessor { } } - private void visitMemberReference(final PsiModifierListOwner member, PsiReferenceExpression qualified, final RefactoringUtil.IsDescendantOf descendantOf) { + private synchronized void visitMemberReference(final PsiModifierListOwner member, PsiReferenceExpression qualified, final RefactoringUtil.IsDescendantOf descendantOf) { if (member.hasModifierProperty(PsiModifier.PACKAGE_LOCAL)) { visitPackageLocalMemberReference(qualified, member); } else if (member.hasModifierProperty(PsiModifier.PROTECTED)) { diff --git a/java/java-impl/src/com/intellij/refactoring/util/FixableUsagesRefactoringProcessor.java b/java/java-impl/src/com/intellij/refactoring/util/FixableUsagesRefactoringProcessor.java index 520ec65049c9..7865e23e46c4 100644 --- a/java/java-impl/src/com/intellij/refactoring/util/FixableUsagesRefactoringProcessor.java +++ b/java/java-impl/src/com/intellij/refactoring/util/FixableUsagesRefactoringProcessor.java @@ -27,6 +27,7 @@ import com.intellij.xml.util.XmlUtil; import org.jetbrains.annotations.NotNull; import java.util.ArrayList; +import java.util.Collections; import java.util.List; public abstract class FixableUsagesRefactoringProcessor extends BaseRefactoringProcessor { @@ -56,7 +57,7 @@ public abstract class FixableUsagesRefactoringProcessor extends BaseRefactoringP @NotNull protected final UsageInfo[] findUsages() { - final List usages = new ArrayList(); + final List usages = Collections.synchronizedList(new ArrayList()); findUsages(usages); final int numUsages = usages.size(); final FixableUsageInfo[] usageArray = usages.toArray(new FixableUsageInfo[numUsages]); diff --git a/java/java-impl/src/com/intellij/refactoring/util/InlineUtil.java b/java/java-impl/src/com/intellij/refactoring/util/InlineUtil.java index a605ca4a8125..50c89f5ffc25 100644 --- a/java/java-impl/src/com/intellij/refactoring/util/InlineUtil.java +++ b/java/java-impl/src/com/intellij/refactoring/util/InlineUtil.java @@ -33,6 +33,7 @@ import org.jetbrains.annotations.NonNls; import java.util.ArrayList; import java.util.Arrays; +import java.util.Collections; import java.util.List; /** @@ -254,7 +255,7 @@ public class InlineUtil { } public static boolean allUsagesAreTailCalls(final PsiMethod method) { - final List nonTailCallUsages = new ArrayList(); + final List nonTailCallUsages = Collections.synchronizedList(new ArrayList()); boolean result = ProgressManager.getInstance().runProcessWithProgressSynchronously(new Runnable() { public void run() { ReferencesSearch.search(method).forEach(new Processor() { diff --git a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/IdentifierHighlighterPass.java b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/IdentifierHighlighterPass.java index c98fc38545e1..bfa9492d395e 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/IdentifierHighlighterPass.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/IdentifierHighlighterPass.java @@ -55,8 +55,8 @@ public class IdentifierHighlighterPass extends TextEditorHighlightingPass { private final PsiFile myFile; private final Editor myEditor; - private final Collection myReadAccessRanges = new ArrayList(); - private final Collection myWriteAccessRanges = new ArrayList(); + private final Collection myReadAccessRanges = Collections.synchronizedList(new ArrayList()); + private final Collection myWriteAccessRanges = Collections.synchronizedList(new ArrayList()); private final int myCaretOffset; private static final HighlightInfoType ourReadHighlightInfoType = new HighlightInfoType.HighlightInfoTypeImpl(HighlightSeverity.INFORMATION, EditorColors.IDENTIFIER_UNDER_CARET_ATTRIBUTES); diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/style/parameterToEntry/ConvertParameterToMapEntryIntention.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/style/parameterToEntry/ConvertParameterToMapEntryIntention.java index 822b7b270af4..e1ee9296e15c 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/style/parameterToEntry/ConvertParameterToMapEntryIntention.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/style/parameterToEntry/ConvertParameterToMapEntryIntention.java @@ -69,6 +69,7 @@ import org.jetbrains.plugins.groovy.refactoring.GroovyValidationUtil; import java.util.ArrayList; import java.util.Collection; +import java.util.Collections; import static org.jetbrains.plugins.groovy.intentions.style.parameterToEntry.ConvertParameterToMapEntryIntention.FIRST_PARAMETER_KIND.*; @@ -447,7 +448,7 @@ public class ConvertParameterToMapEntryIntention extends Intention { .message("find.method.ro.closure.usages.0", owner instanceof GrClosableBlock ? CLOSURE_CAPTION : METHOD_CAPTION), true) { public void run(@NotNull final ProgressIndicator indicator) { final GlobalSearchScope projectScope = GlobalSearchScope.projectScope(getProject()); - final Collection references = new ArrayList(); + final Collection references = Collections.synchronizedList(new ArrayList()); final Processor consumer = new Processor() { @Override public boolean process(PsiReference psiReference) { diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/documentation/GroovyPresentationUtil.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/documentation/GroovyPresentationUtil.java index f1077df5aa0b..14ffc51c7b34 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/documentation/GroovyPresentationUtil.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/documentation/GroovyPresentationUtil.java @@ -28,6 +28,7 @@ import org.jetbrains.plugins.groovy.lang.psi.api.statements.expressions.GrRefere import org.jetbrains.plugins.groovy.lang.psi.api.statements.params.GrParameter; import org.jetbrains.plugins.groovy.lang.psi.util.PsiUtil; +import java.util.Collections; import java.util.LinkedHashSet; import java.util.Set; @@ -45,7 +46,7 @@ public class GroovyPresentationUtil { return builder.append(type.getPresentableText()).append(" ").append(parameter.getName()).toString(); } else { builder.append(parameter.getName()); - final Set structural = new LinkedHashSet(); + final Set structural = Collections.synchronizedSet(new LinkedHashSet()); ReferencesSearch.search(parameter).forEach(new Processor() { public boolean process(PsiReference ref) { PsiElement parent = ref.getElement().getParent(); diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/introduce/GrIntroduceHandlerBase.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/introduce/GrIntroduceHandlerBase.java index 16f439914eb0..506742e891d6 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/introduce/GrIntroduceHandlerBase.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/introduce/GrIntroduceHandlerBase.java @@ -57,6 +57,7 @@ import org.jetbrains.plugins.groovy.refactoring.NameValidator; import org.jetbrains.plugins.groovy.refactoring.introduce.field.GrIntroduceFieldHandler; import java.util.ArrayList; +import java.util.Collections; import java.util.List; /** @@ -202,7 +203,7 @@ public abstract class GrIntroduceHandlerBase list = new ArrayList(); + final List list = Collections.synchronizedList(new ArrayList()); ReferencesSearch.search(variable, new LocalSearchScope(scope)).forEach(new Processor() { @Override public boolean process(PsiReference psiReference) { diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/propertyInspector/editors/string/StringEditorDialog.java b/plugins/ui-designer/src/com/intellij/uiDesigner/propertyInspector/editors/string/StringEditorDialog.java index f3d3d5df40de..1c42ca2a1f4d 100644 --- a/plugins/ui-designer/src/com/intellij/uiDesigner/propertyInspector/editors/string/StringEditorDialog.java +++ b/plugins/ui-designer/src/com/intellij/uiDesigner/propertyInspector/editors/string/StringEditorDialog.java @@ -63,10 +63,7 @@ import java.awt.*; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.awt.event.KeyEvent; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Locale; -import java.util.Set; +import java.util.*; /** * @author Anton Katilin @@ -208,7 +205,7 @@ public final class StringEditorDialog extends DialogWrapper{ } private static Collection findPropertyReferences(final Property pproperty, final Module module) { - final Collection references = new ArrayList(); + final Collection references = Collections.synchronizedList(new ArrayList()); ProgressManager.getInstance().runProcessWithProgressSynchronously( new Runnable() { public void run() {