diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/typedef/GrTypeDefinitionMembersCache.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/typedef/GrTypeDefinitionMembersCache.java index 969725628d91..5af6486c9a41 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/typedef/GrTypeDefinitionMembersCache.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/typedef/GrTypeDefinitionMembersCache.java @@ -183,8 +183,8 @@ public class GrTypeDefinitionMembersCache { private class TraitMethodCollector { private class TraitProcessor { - private final ArrayList result = newArrayList(); - private final Set processed = newHashSet(); + private final ArrayList result = ContainerUtil.newArrayList(); + private final Set processed = ContainerUtil.newHashSet(); public TraitProcessor(@NotNull GrTypeDefinition superClass, @NotNull PsiSubstitutor substitutor) { processTraits(superClass, substitutor); @@ -228,14 +228,14 @@ public class GrTypeDefinitionMembersCache { List traits = getSuperTraits(types); if (traits.isEmpty()) return Collections.emptyList(); - Set existingSignatures = newHashSet(map(codeMethods, new Function() { + Set existingSignatures = ContainerUtil.newHashSet(ContainerUtil.map(codeMethods, new Function() { @Override public MethodSignature fun(PsiMethod method) { return method.getSignature(PsiSubstitutor.EMPTY); } })); - List result = newArrayList(); + List result = ContainerUtil.newArrayList(); for (PsiClassType.ClassResolveResult resolveResult : traits) { GrTypeDefinition trait = (GrTypeDefinition)resolveResult.getElement(); @@ -266,7 +266,7 @@ public class GrTypeDefinitionMembersCache { @NotNull private List getSuperTraits(@NotNull PsiClassType[] types) { - List traits = newArrayList(); + List traits = ContainerUtil.newArrayList(); for (PsiClassType type : types) { PsiClassType.ClassResolveResult resolveResult = type.resolveGenerics(); PsiClass superClass = resolveResult.getElement();