diff --git a/java/java-impl/src/com/intellij/codeInsight/completion/JavaCompletionUtil.java b/java/java-impl/src/com/intellij/codeInsight/completion/JavaCompletionUtil.java index 15390d50d1d2..2eacf4bfc08b 100644 --- a/java/java-impl/src/com/intellij/codeInsight/completion/JavaCompletionUtil.java +++ b/java/java-impl/src/com/intellij/codeInsight/completion/JavaCompletionUtil.java @@ -63,7 +63,7 @@ import com.intellij.util.IncorrectOperationException; import com.intellij.util.NullableFunction; import com.intellij.util.PairConsumer; import com.intellij.util.PairFunction; -import com.intellij.util.containers.CollectionFactory; +import com.intellij.util.containers.ContainerUtil; import gnu.trove.THashSet; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; @@ -615,7 +615,7 @@ public class JavaCompletionUtil { } public static Set getAllLookupStrings(@NotNull PsiMember member) { - Set allLookupStrings = CollectionFactory.linkedHashSet(); + Set allLookupStrings = ContainerUtil.newLinkedHashSet(); String name = member.getName(); allLookupStrings.add(name); PsiClass containingClass = member.getContainingClass(); diff --git a/java/java-impl/src/com/intellij/codeInsight/completion/StaticMemberProcessor.java b/java/java-impl/src/com/intellij/codeInsight/completion/StaticMemberProcessor.java index ec59d18e78ab..e523c83dda0f 100644 --- a/java/java-impl/src/com/intellij/codeInsight/completion/StaticMemberProcessor.java +++ b/java/java-impl/src/com/intellij/codeInsight/completion/StaticMemberProcessor.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2012 JetBrains s.r.o. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package com.intellij.codeInsight.completion; import com.intellij.codeInsight.daemon.impl.quickfix.StaticImportMethodFix; @@ -10,25 +25,20 @@ import com.intellij.psi.impl.java.stubs.index.JavaStaticMemberNameIndex; import com.intellij.psi.search.GlobalSearchScope; import com.intellij.util.Consumer; import com.intellij.util.PairConsumer; -import com.intellij.util.containers.CollectionFactory; import com.intellij.util.containers.ContainerUtil; import gnu.trove.THashSet; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; -import java.util.Set; +import java.util.*; -import static com.intellij.util.containers.CollectionFactory.hashSet; import static com.intellij.util.containers.ContainerUtil.addIfNotNull; /** * @author peter */ public abstract class StaticMemberProcessor { - private final Set myStaticImportedClasses = hashSet(); + private final Set myStaticImportedClasses = ContainerUtil.newHashSet(); private final PsiElement myPosition; private final Project myProject; private final PsiResolveHelper myResolveHelper; @@ -98,7 +108,7 @@ public abstract class StaticMemberProcessor { } public List processMembersOfRegisteredClasses(final PrefixMatcher matcher, PairConsumer consumer) { - final ArrayList result = CollectionFactory.arrayList(); + final ArrayList result = ContainerUtil.newArrayList(); for (final PsiClass psiClass : myStaticImportedClasses) { for (final PsiMethod method : psiClass.getAllMethods()) { if (matcher.prefixMatches(method.getName())) { diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/analysis/GenericsHighlightUtil.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/analysis/GenericsHighlightUtil.java index 76c3d3d8cfec..c1564f92743d 100644 --- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/analysis/GenericsHighlightUtil.java +++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/analysis/GenericsHighlightUtil.java @@ -15,7 +15,6 @@ */ package com.intellij.codeInsight.daemon.impl.analysis; -import com.intellij.util.containers.CollectionFactory; import com.intellij.codeInsight.AnnotationUtil; import com.intellij.codeInsight.daemon.JavaErrorMessages; import com.intellij.codeInsight.daemon.impl.HighlightInfo; @@ -37,6 +36,7 @@ import com.intellij.psi.search.searches.ReferencesSearch; import com.intellij.psi.search.searches.SuperMethodsSearch; import com.intellij.psi.util.*; import com.intellij.util.ArrayUtil; +import com.intellij.util.containers.ContainerUtil; import com.intellij.util.containers.HashMap; import com.intellij.util.containers.HashSet; import gnu.trove.THashMap; @@ -950,7 +950,7 @@ public class GenericsHighlightUtil { @Nullable public static Collection checkCatchParameterIsClass(PsiParameter parameter) { if (!(parameter.getDeclarationScope() instanceof PsiCatchSection)) return null; - final Collection result = CollectionFactory.arrayList(); + final Collection result = ContainerUtil.newArrayList(); final List typeElements = PsiUtil.getParameterTypeElements(parameter); for (PsiTypeElement typeElement : typeElements) { diff --git a/java/java-impl/src/com/intellij/codeInsight/template/macro/ComponentTypeOfMacro.java b/java/java-impl/src/com/intellij/codeInsight/template/macro/ComponentTypeOfMacro.java index 29208b4d579d..653553c75bdb 100644 --- a/java/java-impl/src/com/intellij/codeInsight/template/macro/ComponentTypeOfMacro.java +++ b/java/java-impl/src/com/intellij/codeInsight/template/macro/ComponentTypeOfMacro.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2009 JetBrains s.r.o. + * Copyright 2000-2012 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -23,7 +23,7 @@ import com.intellij.psi.PsiArrayType; import com.intellij.psi.PsiDocumentManager; import com.intellij.psi.PsiExpression; import com.intellij.psi.PsiType; -import com.intellij.util.containers.CollectionFactory; +import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.NotNull; import java.util.List; @@ -42,7 +42,7 @@ public class ComponentTypeOfMacro extends Macro { LookupElement[] lookupItems = params[0].calculateLookupItems(context); if (lookupItems == null) return null; - List result = CollectionFactory.arrayList(); + List result = ContainerUtil.newArrayList(); for (LookupElement element : lookupItems) { PsiTypeLookupItem lookupItem = element.as(PsiTypeLookupItem.CLASS_CONDITION_KEY); if (lookupItem != null) { diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/light/LightModifierList.java b/java/java-psi-impl/src/com/intellij/psi/impl/light/LightModifierList.java index e3ff814bad09..beabfe469619 100644 --- a/java/java-psi-impl/src/com/intellij/psi/impl/light/LightModifierList.java +++ b/java/java-psi-impl/src/com/intellij/psi/impl/light/LightModifierList.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2011 JetBrains s.r.o. + * Copyright 2000-2012 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -20,7 +20,7 @@ import com.intellij.lang.java.JavaLanguage; import com.intellij.psi.*; import com.intellij.util.ArrayUtil; import com.intellij.util.IncorrectOperationException; -import com.intellij.util.containers.CollectionFactory; +import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; @@ -40,7 +40,7 @@ public class LightModifierList extends LightElement implements PsiModifierList { public LightModifierList(PsiManager manager, final Language language, String... modifiers) { super(manager, language); - myModifiers = CollectionFactory.troveSet(modifiers); + myModifiers = ContainerUtil.newTroveSet(modifiers); } public void addModifier(String modifier) { diff --git a/platform/core-api/src/com/intellij/psi/stubs/LightStubBuilder.java b/platform/core-api/src/com/intellij/psi/stubs/LightStubBuilder.java index 7d4761cb9b15..c08771302c5b 100644 --- a/platform/core-api/src/com/intellij/psi/stubs/LightStubBuilder.java +++ b/platform/core-api/src/com/intellij/psi/stubs/LightStubBuilder.java @@ -27,7 +27,7 @@ import com.intellij.psi.tree.IElementType; import com.intellij.psi.tree.IFileElementType; import com.intellij.psi.tree.ILightStubFileElementType; import com.intellij.util.CharTable; -import com.intellij.util.containers.CollectionFactory; +import com.intellij.util.containers.ContainerUtil; import com.intellij.util.containers.Stack; import com.intellij.util.diff.FlyweightCapableTreeStructure; import gnu.trove.TIntStack; @@ -35,7 +35,6 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import java.util.ArrayList; -import java.util.Collections; import java.util.List; @@ -74,8 +73,8 @@ public class LightStubBuilder implements StubBuilder { return rootStub; } + @SuppressWarnings("unchecked") protected StubElement createStubForFile(final PsiFile file, final LighterAST tree) { - //noinspection unchecked return new PsiFileStubImpl(file); } @@ -190,7 +189,7 @@ public class LightStubBuilder implements StubBuilder { public List getChildren(@NotNull final LighterASTNode parent) { final Ref into = new Ref(); final int numKids = myTreeStructure.getChildren(myTreeStructure.prepareForGetChildren(parent), into); - return numKids > 0 ? CollectionFactory.arrayList(into.get(), 0, numKids) : Collections.emptyList(); + return numKids > 0 ? ContainerUtil.newArrayList(into.get(), 0, numKids) : ContainerUtil.emptyList(); } } @@ -220,7 +219,7 @@ public class LightStubBuilder implements StubBuilder { public List getChildren(@NotNull final LighterASTNode parent) { final ASTNode[] children = ((NodeWrapper)parent).myNode.getChildren(null); if (children == null || children.length == 0) { - return Collections.emptyList(); + return ContainerUtil.emptyList(); } final ArrayList result = new ArrayList(children.length); for (final ASTNode child : children) { diff --git a/platform/core-impl/src/com/intellij/lang/impl/PsiBuilderImpl.java b/platform/core-impl/src/com/intellij/lang/impl/PsiBuilderImpl.java index 6905f01f2b3a..eb8e7e9aaf3a 100644 --- a/platform/core-impl/src/com/intellij/lang/impl/PsiBuilderImpl.java +++ b/platform/core-impl/src/com/intellij/lang/impl/PsiBuilderImpl.java @@ -38,10 +38,7 @@ import com.intellij.util.CharTable; import com.intellij.util.ExceptionUtil; import com.intellij.util.ThreeState; import com.intellij.util.TripleFunction; -import com.intellij.util.containers.CollectionFactory; -import com.intellij.util.containers.Convertor; -import com.intellij.util.containers.LimitedPool; -import com.intellij.util.containers.Stack; +import com.intellij.util.containers.*; import com.intellij.util.diff.DiffTreeChangeBuilder; import com.intellij.util.diff.FlyweightCapableTreeStructure; import com.intellij.util.diff.ShallowNodeComparator; @@ -1074,7 +1071,7 @@ public class PsiBuilderImpl extends UserDataHolderBase implements PsiBuilder, AS final StartMarker rootMarker = (StartMarker)myProduction.get(0); rootMarker.myParent = rootMarker.myFirstChild = rootMarker.myLastChild = rootMarker.myNext = null; StartMarker curNode = rootMarker; - final Stack nodes = new Stack(); + final Stack nodes = ContainerUtil.newStack(); nodes.push(rootMarker); @SuppressWarnings({"MultipleVariablesInDeclaration"}) int lastErrorIndex = -1, maxDepth = 0, curDepth = 0; @@ -1107,12 +1104,12 @@ public class PsiBuilderImpl extends UserDataHolderBase implements PsiBuilder, AS } if (myCurrentLexeme < myLexemeCount) { - final List missed = CollectionFactory.arrayList(myLexTypes, myCurrentLexeme, myLexemeCount); + final List missed = ContainerUtil.newArrayList(myLexTypes, myCurrentLexeme, myLexemeCount); LOG.error("Tokens " + missed + " were not inserted into the tree. " +(myFile != null? myFile.getLanguage()+", ":"")+"Text:\n" + myText); } if (rootMarker.myDoneMarker.myLexemeIndex < myLexemeCount) { - final List missed = CollectionFactory.arrayList(myLexTypes, rootMarker.myDoneMarker.myLexemeIndex, myLexemeCount); + final List missed = ContainerUtil.newArrayList(myLexTypes, rootMarker.myDoneMarker.myLexemeIndex, myLexemeCount); LOG.error("Tokens " + missed + " are outside of root element \"" + rootMarker.myType + "\". Text:\n" + myText); } @@ -1686,7 +1683,7 @@ public class PsiBuilderImpl extends UserDataHolderBase implements PsiBuilder, AS myFile = (PsiFile)value; return; } - if (myUserData == null) myUserData = CollectionFactory.hashMap(); + if (myUserData == null) myUserData = ContainerUtil.newHashMap(); myUserData.put(key, value); } } diff --git a/platform/indexing-api/src/com/intellij/psi/search/SearchRequestCollector.java b/platform/indexing-api/src/com/intellij/psi/search/SearchRequestCollector.java index 88881db85e1f..ea7f247546a2 100644 --- a/platform/indexing-api/src/com/intellij/psi/search/SearchRequestCollector.java +++ b/platform/indexing-api/src/com/intellij/psi/search/SearchRequestCollector.java @@ -19,7 +19,7 @@ import com.intellij.psi.PsiElement; import com.intellij.psi.PsiFileSystemItem; import com.intellij.psi.PsiReference; import com.intellij.util.Processor; -import com.intellij.util.containers.CollectionFactory; +import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.NotNull; import java.util.ArrayList; @@ -30,9 +30,9 @@ import java.util.List; */ public class SearchRequestCollector { private final Object lock = new Object(); - private final List myWordRequests = CollectionFactory.arrayList(); - private final List myQueryRequests = CollectionFactory.arrayList(); - private final List>> myCustomSearchActions = CollectionFactory.arrayList(); + private final List myWordRequests = ContainerUtil.newArrayList(); + private final List myQueryRequests = ContainerUtil.newArrayList(); + private final List>> myCustomSearchActions = ContainerUtil.newArrayList(); private final SearchSession mySession; public SearchRequestCollector(SearchSession session) { diff --git a/platform/indexing-impl/src/com/intellij/psi/impl/search/PsiSearchHelperImpl.java b/platform/indexing-impl/src/com/intellij/psi/impl/search/PsiSearchHelperImpl.java index f4ec73509aaa..a04c09f1ac69 100644 --- a/platform/indexing-impl/src/com/intellij/psi/impl/search/PsiSearchHelperImpl.java +++ b/platform/indexing-impl/src/com/intellij/psi/impl/search/PsiSearchHelperImpl.java @@ -40,7 +40,6 @@ import com.intellij.util.CommonProcessors; import com.intellij.util.Processor; import com.intellij.util.SmartList; import com.intellij.util.codeInsight.CommentUtilCore; -import com.intellij.util.containers.CollectionFactory; import com.intellij.util.containers.ContainerUtil; import com.intellij.util.containers.MultiMap; import com.intellij.util.indexing.FileBasedIndex; @@ -475,7 +474,7 @@ public class PsiSearchHelperImpl implements PsiSearchHelper { @Override public boolean processRequests(@NotNull SearchRequestCollector collector, @NotNull Processor processor) { - Map> collectors = CollectionFactory.hashMap(); + Map> collectors = ContainerUtil.newHashMap(); collectors.put(collector, processor); appendCollectorsFromQueryRequests(collectors); @@ -483,8 +482,8 @@ public class PsiSearchHelperImpl implements PsiSearchHelper { ProgressIndicator progress = ProgressIndicatorProvider.getInstance().getProgressIndicator(); do { final MultiMap, RequestWithProcessor> globals = new MultiMap, RequestWithProcessor>(); - final List> customs = CollectionFactory.arrayList(); - final LinkedHashSet locals = CollectionFactory.linkedHashSet(); + final List> customs = ContainerUtil.newArrayList(); + final LinkedHashSet locals = ContainerUtil.newLinkedHashSet(); distributePrimitives(collectors, locals, globals, customs); if (!processGlobalRequestsOptimized(globals, progress)) { diff --git a/platform/lang-impl/src/com/intellij/codeInsight/TargetElementUtilBase.java b/platform/lang-impl/src/com/intellij/codeInsight/TargetElementUtilBase.java index e7da919f9609..c325ecbf1998 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/TargetElementUtilBase.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/TargetElementUtilBase.java @@ -45,7 +45,7 @@ import com.intellij.pom.references.PomService; import com.intellij.psi.*; import com.intellij.psi.util.PsiTreeUtil; import com.intellij.util.Consumer; -import com.intellij.util.containers.CollectionFactory; +import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -227,7 +227,7 @@ public class TargetElementUtilBase { public PsiElement getNamedElement(@Nullable final PsiElement element, final int offsetInElement) { if (element == null) return null; - final List targets = CollectionFactory.arrayList(); + final List targets = ContainerUtil.newArrayList(); final Consumer consumer = new Consumer() { public void consume(PomTarget target) { if (target instanceof PsiDeclaredTarget) { diff --git a/platform/lang-impl/src/com/intellij/codeInsight/completion/impl/LiftShorterItemsClassifier.java b/platform/lang-impl/src/com/intellij/codeInsight/completion/impl/LiftShorterItemsClassifier.java index ce3d521efacc..bc10ff06258a 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/completion/impl/LiftShorterItemsClassifier.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/completion/impl/LiftShorterItemsClassifier.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2011 JetBrains s.r.o. + * Copyright 2000-2012 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -26,9 +26,10 @@ import gnu.trove.THashSet; import org.jetbrains.annotations.Nullable; import java.util.*; +import java.util.LinkedHashMap; -import static com.intellij.util.containers.CollectionFactory.identityHashMap; -import static com.intellij.util.containers.CollectionFactory.identityTroveSet; +import static com.intellij.util.containers.ContainerUtil.newIdentityHashMap; +import static com.intellij.util.containers.ContainerUtil.newIdentityTroveSet; /** * @author peter @@ -46,9 +47,9 @@ public class LiftShorterItemsClassifier extends Classifier { return new ArrayList(1); } }; - private final Map> myToLiftForSorting = identityHashMap(); - private final Map> myToLiftForPreselection = identityHashMap(); - private final IdentityHashMap, IdentityHashMap>> myPrepends = identityHashMap(); + private final Map> myToLiftForSorting = newIdentityHashMap(); + private final Map> myToLiftForPreselection = newIdentityHashMap(); + private final IdentityHashMap, IdentityHashMap>> myPrepends = newIdentityHashMap(); private final Classifier myNext; private final LiftingCondition myCondition; private int myCount = 0; @@ -93,7 +94,7 @@ public class LiftShorterItemsClassifier extends Classifier { private FList prependOrReuse(FList tail, LookupElement head) { IdentityHashMap> cache = myPrepends.get(tail); if (cache == null) { - myPrepends.put(tail, cache = identityHashMap()); + myPrepends.put(tail, cache = newIdentityHashMap()); } FList result = cache.get(head); if (result == null) { @@ -134,7 +135,7 @@ public class LiftShorterItemsClassifier extends Classifier { private Iterable liftShorterElements(final Iterable source, @Nullable final THashSet lifted, final ProcessingContext context) { - final Set srcSet = identityTroveSet(source instanceof Collection ? ((Collection)source).size() : myCount); + final Set srcSet = newIdentityTroveSet(source instanceof Collection ? ((Collection)source).size() : myCount); ContainerUtil.addAll(srcSet, source); if (srcSet.size() < 2) { @@ -146,8 +147,8 @@ public class LiftShorterItemsClassifier extends Classifier { @Override public void describeItems(LinkedHashMap map, ProcessingContext context) { - final THashSet lifted = identityTroveSet(); - CollectionFactory.arrayList(liftShorterElements(new ArrayList(map.keySet()), lifted, context)); + final THashSet lifted = newIdentityTroveSet(); + ContainerUtil.newArrayList(liftShorterElements(new ArrayList(map.keySet()), lifted, context)); if (!lifted.isEmpty()) { for (LookupElement element : map.keySet()) { final StringBuilder builder = map.get(element); @@ -185,8 +186,8 @@ public class LiftShorterItemsClassifier extends Classifier { @Override public Iterator iterator() { - final Set processed = identityTroveSet(mySrcSet.size()); - final Set> arraysProcessed = identityTroveSet(); + final Set processed = newIdentityTroveSet(mySrcSet.size()); + final Set> arraysProcessed = newIdentityTroveSet(); final boolean forSorting = myContext.get(CompletionLookupArranger.PURE_RELEVANCE) != Boolean.TRUE; final Iterable next = myNext.classify(mySource, myContext); diff --git a/platform/lang-impl/src/com/intellij/codeInsight/controlflow/ControlFlowBuilder.java b/platform/lang-impl/src/com/intellij/codeInsight/controlflow/ControlFlowBuilder.java index 2fb0a580e835..d16801da027e 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/controlflow/ControlFlowBuilder.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/controlflow/ControlFlowBuilder.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2012 JetBrains s.r.o. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package com.intellij.codeInsight.controlflow; import com.intellij.codeInsight.controlflow.impl.ConditionalInstructionImpl; @@ -7,7 +22,7 @@ import com.intellij.openapi.util.Pair; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiElementVisitor; import com.intellij.psi.util.PsiTreeUtil; -import com.intellij.util.containers.CollectionFactory; +import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -31,8 +46,8 @@ public class ControlFlowBuilder { public int instructionCount; public ControlFlowBuilder() { - instructions = CollectionFactory.arrayList(); - pending = CollectionFactory.arrayList(); + instructions = ContainerUtil.newArrayList(); + pending = ContainerUtil.newArrayList(); instructionCount = 0; } @@ -200,4 +215,4 @@ public class ControlFlowBuilder { processor.process(pair.getFirst(), pair.getSecond()); } } -} \ No newline at end of file +} diff --git a/platform/lang-impl/src/com/intellij/codeInsight/editorActions/wordSelection/NaturalLanguageTextSelectioner.java b/platform/lang-impl/src/com/intellij/codeInsight/editorActions/wordSelection/NaturalLanguageTextSelectioner.java index 422d1f8ba08c..1089fc06b16e 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/editorActions/wordSelection/NaturalLanguageTextSelectioner.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/editorActions/wordSelection/NaturalLanguageTextSelectioner.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2009 JetBrains s.r.o. + * Copyright 2000-2012 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -22,7 +22,7 @@ import com.intellij.openapi.util.TextRange; import com.intellij.psi.PsiComment; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiPlainText; -import com.intellij.util.containers.CollectionFactory; +import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.Nullable; import java.util.ArrayList; @@ -31,8 +31,8 @@ import java.util.List; import java.util.Set; public class NaturalLanguageTextSelectioner extends ExtendWordSelectionHandlerBase { - private static final Set NATURAL = CollectionFactory.troveSet('(', ')', '.', ',', ':', ';', '!', '?', '$', '@', '%', '\"', '\'', '<', '>', '[', ']'); - private static final Set SENTENCE_END = CollectionFactory.troveSet('.', '!', '?'); + private static final Set NATURAL = ContainerUtil.newTroveSet('(', ')', '.', ',', ':', ';', '!', '?', '$', '@', '%', '\"', '\'', '<', '>', '[', ']'); + private static final Set SENTENCE_END = ContainerUtil.newTroveSet('.', '!', '?'); public boolean canSelect(PsiElement e) { return e instanceof PsiPlainText || e instanceof PsiComment; @@ -162,4 +162,4 @@ public class NaturalLanguageTextSelectioner extends ExtendWordSelectionHandlerBa private static boolean isNatural(char c) { return Character.isWhitespace(c) || Character.isLetterOrDigit(c) || NATURAL.contains(c); } -} \ No newline at end of file +} diff --git a/platform/lang-impl/src/com/intellij/codeInsight/folding/impl/UpdateFoldRegionsOperation.java b/platform/lang-impl/src/com/intellij/codeInsight/folding/impl/UpdateFoldRegionsOperation.java index 7250bd6314b4..e44bb6b69c8d 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/folding/impl/UpdateFoldRegionsOperation.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/folding/impl/UpdateFoldRegionsOperation.java @@ -35,8 +35,8 @@ import java.util.Collection; import java.util.List; import java.util.Map; -import static com.intellij.util.containers.CollectionFactory.arrayList; -import static com.intellij.util.containers.CollectionFactory.troveMap; +import static com.intellij.util.containers.ContainerUtil.newArrayList; +import static com.intellij.util.containers.ContainerUtil.newTroveMap; /** * @author cdr @@ -70,12 +70,12 @@ class UpdateFoldRegionsOperation implements Runnable { public void run() { EditorFoldingInfo info = EditorFoldingInfo.get(myEditor); FoldingModelEx foldingModel = (FoldingModelEx)myEditor.getFoldingModel(); - Map rangeToExpandStatusMap = troveMap(); + Map rangeToExpandStatusMap = newTroveMap(); removeInvalidRegions(info, foldingModel, rangeToExpandStatusMap); - Map shouldExpand = troveMap(); - Map groupExpand = troveMap(); + Map shouldExpand = newTroveMap(); + Map groupExpand = newTroveMap(); List newRegions = addNewRegions(info, foldingModel, rangeToExpandStatusMap, shouldExpand, groupExpand); applyExpandStatus(newRegions, shouldExpand, groupExpand); @@ -99,7 +99,7 @@ class UpdateFoldRegionsOperation implements Runnable { @NotNull Map rangeToExpandStatusMap, @NotNull Map shouldExpand, @NotNull Map groupExpand) { - List newRegions = arrayList(); + List newRegions = newArrayList(); SmartPointerManager smartPointerManager = SmartPointerManager.getInstance(myProject); for (PsiElement element : myElementsToFoldMap.keySet()) { ProgressManager.checkCanceled(); @@ -156,7 +156,7 @@ class UpdateFoldRegionsOperation implements Runnable { private void removeInvalidRegions(@NotNull EditorFoldingInfo info, @NotNull FoldingModelEx foldingModel, @NotNull Map rangeToExpandStatusMap) { - List toRemove = arrayList(); + List toRemove = newArrayList(); InjectedLanguageManager injectedManager = InjectedLanguageManager.getInstance(myProject); for (FoldRegion region : foldingModel.getAllFoldRegions()) { PsiElement element = info.getPsiElement(region); diff --git a/platform/lang-impl/src/com/intellij/codeInsight/template/impl/ListTemplatesHandler.java b/platform/lang-impl/src/com/intellij/codeInsight/template/impl/ListTemplatesHandler.java index 6001c529fce2..086b2942fc29 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/template/impl/ListTemplatesHandler.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/template/impl/ListTemplatesHandler.java @@ -1,18 +1,18 @@ /* -* Copyright 2000-2009 JetBrains s.r.o. -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ + * Copyright 2000-2012 JetBrains s.r.o. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package com.intellij.codeInsight.template.impl; @@ -34,7 +34,7 @@ import com.intellij.openapi.project.Project; import com.intellij.openapi.util.Pair; import com.intellij.psi.PsiDocumentManager; import com.intellij.psi.PsiFile; -import com.intellij.util.containers.CollectionFactory; +import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -96,7 +96,7 @@ public class ListTemplatesHandler implements CodeInsightActionHandler { if (description == null) { return super.getAllLookupStrings(); } - return CollectionFactory.hashSet(getLookupString(), description); + return ContainerUtil.newHashSet(getLookupString(), description); } }; } diff --git a/platform/lang-impl/src/com/intellij/codeInsight/template/impl/LiveTemplateCompletionContributor.java b/platform/lang-impl/src/com/intellij/codeInsight/template/impl/LiveTemplateCompletionContributor.java index 6c1bc1123a2b..51b6c7fb9697 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/template/impl/LiveTemplateCompletionContributor.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/template/impl/LiveTemplateCompletionContributor.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2010 JetBrains s.r.o. + * Copyright 2000-2012 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -25,7 +25,6 @@ import com.intellij.patterns.PlatformPatterns; import com.intellij.psi.PsiFile; import com.intellij.util.Consumer; import com.intellij.util.ProcessingContext; -import com.intellij.util.containers.CollectionFactory; import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -95,7 +94,7 @@ public class LiveTemplateCompletionContributor extends CompletionContributor { private static List listApplicableTemplates(PsiFile file, int offset) { Set contextTypes = TemplateManagerImpl.getApplicableContextTypes(file, offset); - final ArrayList result = CollectionFactory.arrayList(); + final ArrayList result = ContainerUtil.newArrayList(); for (final TemplateImpl template : TemplateSettings.getInstance().getTemplates()) { if (!template.isDeactivated() && !template.isSelectionTemplate() && TemplateManagerImpl.isApplicable(template, contextTypes)) { result.add(template); diff --git a/platform/lang-impl/src/com/intellij/codeInspection/AbstractInspectionToolStarter.java b/platform/lang-impl/src/com/intellij/codeInspection/AbstractInspectionToolStarter.java index 08efa6c3682d..6573ab8afd05 100644 --- a/platform/lang-impl/src/com/intellij/codeInspection/AbstractInspectionToolStarter.java +++ b/platform/lang-impl/src/com/intellij/codeInspection/AbstractInspectionToolStarter.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2011 JetBrains s.r.o. + * Copyright 2000-2012 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,7 +17,7 @@ package com.intellij.codeInspection; import com.intellij.execution.configurations.ParametersList; import com.intellij.openapi.application.ApplicationStarter; -import com.intellij.util.containers.CollectionFactory; +import com.intellij.util.containers.ContainerUtil; import com.sampullara.cli.Args; import org.jetbrains.annotations.NotNull; @@ -99,7 +99,7 @@ public abstract class AbstractInspectionToolStarter implements ApplicationStarte buff.append(" no arguments"); } else { - final String argString = ParametersList.join(CollectionFactory.arrayList(args, 1, args.length)); + final String argString = ParametersList.join(ContainerUtil.newArrayList(args, 1, args.length)); buff.append(argString); } } diff --git a/platform/lang-impl/src/com/intellij/execution/console/ConsoleFoldingSettings.java b/platform/lang-impl/src/com/intellij/execution/console/ConsoleFoldingSettings.java index b0665954529f..20f96b7af132 100644 --- a/platform/lang-impl/src/com/intellij/execution/console/ConsoleFoldingSettings.java +++ b/platform/lang-impl/src/com/intellij/execution/console/ConsoleFoldingSettings.java @@ -16,7 +16,7 @@ package com.intellij.execution.console; import com.intellij.openapi.components.*; -import com.intellij.util.containers.CollectionFactory; +import com.intellij.util.containers.ContainerUtil; import java.util.ArrayList; import java.util.HashSet; @@ -70,7 +70,7 @@ public class ConsoleFoldingSettings implements PersistentStateComponent added, List removed, boolean negated) { - Set baseline = CollectionFactory.troveSet(); + Set baseline = ContainerUtil.newTroveSet(); for (CustomizableConsoleFoldingBean regexp : CustomizableConsoleFoldingBean.EP_NAME.getExtensions()) { if (regexp.negate == negated) { baseline.add(regexp.substring); diff --git a/platform/lang-impl/src/com/intellij/ide/actions/GotoActionBase.java b/platform/lang-impl/src/com/intellij/ide/actions/GotoActionBase.java index 28e9fb53427d..b5a4e7063194 100644 --- a/platform/lang-impl/src/com/intellij/ide/actions/GotoActionBase.java +++ b/platform/lang-impl/src/com/intellij/ide/actions/GotoActionBase.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2009 JetBrains s.r.o. + * Copyright 2000-2012 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -35,7 +35,7 @@ import com.intellij.psi.PsiDocumentManager; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiFile; import com.intellij.ui.speedSearch.SpeedSearchSupply; -import com.intellij.util.containers.CollectionFactory; +import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -50,7 +50,7 @@ public abstract class GotoActionBase extends AnAction { private static final Logger LOG = Logger.getInstance("#com.intellij.ide.actions.GotoActionBase"); protected static Class myInAction = null; - private static final Map> ourLastStrings = CollectionFactory.hashMap(); + private static final Map> ourLastStrings = ContainerUtil.newHashMap(); public final void actionPerformed(AnActionEvent e) { diff --git a/platform/lang-impl/src/com/intellij/psi/impl/cache/impl/id/PlatformIdTableBuilding.java b/platform/lang-impl/src/com/intellij/psi/impl/cache/impl/id/PlatformIdTableBuilding.java index 94e663d5abe9..835f9263ef0d 100644 --- a/platform/lang-impl/src/com/intellij/psi/impl/cache/impl/id/PlatformIdTableBuilding.java +++ b/platform/lang-impl/src/com/intellij/psi/impl/cache/impl/id/PlatformIdTableBuilding.java @@ -39,7 +39,7 @@ import com.intellij.psi.impl.cache.impl.todo.TodoIndexers; import com.intellij.psi.search.IndexPattern; import com.intellij.psi.tree.IElementType; import com.intellij.psi.tree.TokenSet; -import com.intellij.util.containers.CollectionFactory; +import com.intellij.util.containers.ContainerUtil; import com.intellij.util.indexing.DataIndexer; import com.intellij.util.indexing.FileBasedIndexImpl; import com.intellij.util.indexing.FileContent; @@ -131,7 +131,7 @@ public abstract class PlatformIdTableBuilding { @NotNull @Override public Map map(FileContent inputData) { - Map result = CollectionFactory.troveMap(); + Map result = ContainerUtil.newTroveMap(); for (DataIndexer indexer : indexers) { for (Map.Entry entry : indexer.map(inputData).entrySet()) { TodoIndexEntry key = entry.getKey(); diff --git a/platform/platform-api/src/com/intellij/execution/configurations/ParametersList.java b/platform/platform-api/src/com/intellij/execution/configurations/ParametersList.java index 762ba6c55400..9e86dc523e0f 100644 --- a/platform/platform-api/src/com/intellij/execution/configurations/ParametersList.java +++ b/platform/platform-api/src/com/intellij/execution/configurations/ParametersList.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2011 JetBrains s.r.o. + * Copyright 2000-2012 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -23,7 +23,6 @@ import com.intellij.openapi.util.text.StringUtil; import com.intellij.util.ArrayUtil; import com.intellij.util.EnvironmentUtil; import com.intellij.util.StringBuilderSpinAllocator; -import com.intellij.util.containers.CollectionFactory; import com.intellij.util.containers.ContainerUtil; import gnu.trove.THashMap; import org.jetbrains.annotations.NonNls; @@ -393,7 +392,7 @@ public class ParametersList implements Cloneable { public static List decode(@NotNull String parameterString) { parameterString = parameterString.trim(); - final ArrayList params = CollectionFactory.arrayList(); + final ArrayList params = ContainerUtil.newArrayList(); final StringBuilder token = new StringBuilder(128); boolean inQuotes = false; boolean escapedQuote = false; diff --git a/platform/platform-api/src/com/intellij/ui/ListCellRendererWrapper.java b/platform/platform-api/src/com/intellij/ui/ListCellRendererWrapper.java index 9b09b97b7d9d..4e7ec93d92fe 100644 --- a/platform/platform-api/src/com/intellij/ui/ListCellRendererWrapper.java +++ b/platform/platform-api/src/com/intellij/ui/ListCellRendererWrapper.java @@ -85,7 +85,7 @@ public abstract class ListCellRendererWrapper implements ListCellRenderer { return separator; } - final Component component = myOriginalRenderer.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus); + final Component component = new JComboBox().getRenderer().getListCellRendererComponent(list, value, index, isSelected, cellHasFocus); if (component instanceof JLabel) { final JLabel label = (JLabel)component; label.setIcon(myIcon); diff --git a/platform/platform-api/src/com/intellij/ui/SimpleColoredComponent.java b/platform/platform-api/src/com/intellij/ui/SimpleColoredComponent.java index a3c59359ebd1..0b30c4ba5ff1 100644 --- a/platform/platform-api/src/com/intellij/ui/SimpleColoredComponent.java +++ b/platform/platform-api/src/com/intellij/ui/SimpleColoredComponent.java @@ -46,14 +46,14 @@ import java.util.Map; @SuppressWarnings({"NonPrivateFieldAccessedInSynchronizedContext", "FieldAccessedSynchronizedAndUnsynchronized", "UnusedDeclaration"}) public class SimpleColoredComponent extends JComponent implements Accessible { private static final Logger LOG = Logger.getInstance("#com.intellij.ui.SimpleColoredComponent"); + public static final Color STYLE_SEARCH_MATCH_BACKGROUND = new Color(250, 250, 250, 140); + public static final int FRAGMENT_ICON = -2; private final ArrayList myFragments; private final ArrayList myAttributes; private ArrayList myFragmentTags = null; - public static final int FRAGMENT_ICON = -2; - /** * Component's icon. It can be null. */ diff --git a/platform/platform-impl/src/com/intellij/ide/actions/CreateDesktopEntryAction.java b/platform/platform-impl/src/com/intellij/ide/actions/CreateDesktopEntryAction.java index 5a70803f7af5..d8d95c462d42 100644 --- a/platform/platform-impl/src/com/intellij/ide/actions/CreateDesktopEntryAction.java +++ b/platform/platform-impl/src/com/intellij/ide/actions/CreateDesktopEntryAction.java @@ -44,7 +44,7 @@ import javax.swing.*; import java.io.File; import java.io.IOException; -import static com.intellij.util.containers.CollectionFactory.hashMap; +import static com.intellij.util.containers.ContainerUtil.newHashMap; import static java.util.Arrays.asList; public class CreateDesktopEntryAction extends DumbAwareAction { @@ -151,8 +151,8 @@ public class CreateDesktopEntryAction extends DumbAwareAction { final String wmClass = AppUIUtil.getFrameClass(); final String content = ExecUtil.loadTemplate(CreateDesktopEntryAction.class.getClassLoader(), "entry.desktop", - hashMap(asList("$NAME$", "$SCRIPT$", "$ICON$", "$WM_CLASS$"), - asList(name, execPath, iconPath, wmClass))); + newHashMap(asList("$NAME$", "$SCRIPT$", "$ICON$", "$WM_CLASS$"), + asList(name, execPath, iconPath, wmClass))); final String entryName = wmClass + ".desktop"; final File entryFile = new File(FileUtil.getTempDirectory(), entryName); diff --git a/platform/platform-impl/src/com/intellij/ide/actions/CreateLauncherScriptAction.java b/platform/platform-impl/src/com/intellij/ide/actions/CreateLauncherScriptAction.java index 8fdd59ec92fc..a1bc98b8511d 100644 --- a/platform/platform-impl/src/com/intellij/ide/actions/CreateLauncherScriptAction.java +++ b/platform/platform-impl/src/com/intellij/ide/actions/CreateLauncherScriptAction.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2011 JetBrains s.r.o. + * Copyright 2000-2012 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -37,7 +37,7 @@ import javax.swing.*; import java.io.File; import java.io.IOException; -import static com.intellij.util.containers.CollectionFactory.hashMap; +import static com.intellij.util.containers.ContainerUtil.newHashMap; import static java.util.Arrays.asList; /** @@ -139,8 +139,8 @@ public class CreateLauncherScriptAction extends DumbAwareAction { runPath += "/bin/" + productName + ".sh"; } final String launcherContents = ExecUtil.loadTemplate(CreateLauncherScriptAction.class.getClassLoader(), "launcher.py", - hashMap(asList("$CONFIG_PATH$", "$RUN_PATH$"), - asList(PathManager.getConfigPath(), runPath))); + newHashMap(asList("$CONFIG_PATH$", "$RUN_PATH$"), + asList(PathManager.getConfigPath(), runPath))); return ExecUtil.createTempExecutableScript("launcher", "", launcherContents); } diff --git a/platform/platform-impl/src/com/intellij/notification/EventLog.java b/platform/platform-impl/src/com/intellij/notification/EventLog.java index db99e0b3e909..163bae316a15 100644 --- a/platform/platform-impl/src/com/intellij/notification/EventLog.java +++ b/platform/platform-impl/src/com/intellij/notification/EventLog.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2011 JetBrains s.r.o. + * Copyright 2000-2012 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -46,7 +46,6 @@ import com.intellij.openapi.wm.*; import com.intellij.ui.awt.RelativePoint; import com.intellij.ui.content.Content; import com.intellij.ui.content.ContentFactory; -import com.intellij.util.containers.CollectionFactory; import com.intellij.util.containers.ContainerUtil; import com.intellij.util.containers.hash.LinkedHashMap; import com.intellij.util.text.CharArrayUtil; @@ -73,7 +72,7 @@ public class EventLog { private static final String A_CLOSING = ""; private static final Pattern TAG_PATTERN = Pattern.compile("<[^>]*>"); private static final Pattern A_PATTERN = Pattern.compile("]* )?href=[\"\']([^>]*)[\"\'][^>]*>"); - private static final Set NEW_LINES = CollectionFactory.hashSet("
", "
", "
", "

", "

", "

"); + private static final Set NEW_LINES = ContainerUtil.newHashSet("
", "
", "
", "

", "

", "

"); public EventLog() { ApplicationManager.getApplication().getMessageBus().connect().subscribe(Notifications.TOPIC, new Notifications() { diff --git a/platform/platform-impl/src/com/intellij/openapi/editor/impl/FoldRegionsTree.java b/platform/platform-impl/src/com/intellij/openapi/editor/impl/FoldRegionsTree.java index dfe2ed1c6f07..6f9174b1ae90 100644 --- a/platform/platform-impl/src/com/intellij/openapi/editor/impl/FoldRegionsTree.java +++ b/platform/platform-impl/src/com/intellij/openapi/editor/impl/FoldRegionsTree.java @@ -20,7 +20,7 @@ import com.intellij.openapi.editor.FoldRegion; import com.intellij.openapi.editor.RangeMarker; import com.intellij.openapi.util.TextRange; import com.intellij.util.ArrayUtil; -import com.intellij.util.containers.CollectionFactory; +import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -40,7 +40,7 @@ abstract class FoldRegionsTree { private int[] myCachedStartOffsets; private int[] myCachedFoldedLines; int myCachedLastIndex = -1; - private ArrayList myRegions = CollectionFactory.arrayList(); //sorted in tree left-to-right topdown traversal order + private ArrayList myRegions = ContainerUtil.newArrayList(); //sorted in tree left-to-right topdown traversal order private static final Comparator BY_END_OFFSET = new Comparator() { @Override public int compare(FoldRegion r1, FoldRegion r2) { diff --git a/platform/platform-impl/src/com/intellij/openapi/wm/impl/ToolWindowManagerImpl.java b/platform/platform-impl/src/com/intellij/openapi/wm/impl/ToolWindowManagerImpl.java index bfb5bd98b779..42d86b531d93 100644 --- a/platform/platform-impl/src/com/intellij/openapi/wm/impl/ToolWindowManagerImpl.java +++ b/platform/platform-impl/src/com/intellij/openapi/wm/impl/ToolWindowManagerImpl.java @@ -56,7 +56,7 @@ import com.intellij.ui.switcher.QuickAccessSettings; import com.intellij.ui.switcher.SwitchManager; import com.intellij.util.Alarm; import com.intellij.util.ArrayUtil; -import com.intellij.util.containers.CollectionFactory; +import com.intellij.util.containers.ContainerUtil; import com.intellij.util.containers.HashMap; import com.intellij.util.ui.PositionTracker; import com.intellij.util.ui.UIUtil; @@ -93,7 +93,7 @@ public final class ToolWindowManagerImpl extends ToolWindowManagerEx implements private final Map myId2FloatingDecorator; private final Map myId2StripeButton; private final Map myId2FocusWatcher; - private final Set myDumbAwareIds = Collections.synchronizedSet(CollectionFactory.troveSet()); + private final Set myDumbAwareIds = Collections.synchronizedSet(ContainerUtil.newTroveSet()); private final EditorComponentFocusWatcher myEditorComponentFocusWatcher; private final MyToolWindowPropertyChangeListener myToolWindowPropertyChangeListener; diff --git a/platform/platform-tests/testSrc/com/intellij/psi/util/NameUtilTest.java b/platform/platform-tests/testSrc/com/intellij/psi/util/NameUtilTest.java index cf5ea8bdb826..6e5fa28ee42c 100644 --- a/platform/platform-tests/testSrc/com/intellij/psi/util/NameUtilTest.java +++ b/platform/platform-tests/testSrc/com/intellij/psi/util/NameUtilTest.java @@ -14,9 +14,6 @@ * limitations under the License. */ -/* - * @author max - */ package com.intellij.psi.util; import com.intellij.openapi.util.TextRange; @@ -26,7 +23,7 @@ import com.intellij.testFramework.PlatformTestUtil; import com.intellij.testFramework.UsefulTestCase; import com.intellij.ui.SpeedSearchComparator; import com.intellij.util.ThrowableRunnable; -import com.intellij.util.containers.CollectionFactory; +import com.intellij.util.containers.ContainerUtil; import com.intellij.util.text.Matcher; import org.jetbrains.annotations.NonNls; @@ -34,6 +31,7 @@ import java.util.ArrayList; import java.util.List; /** + * @author max * @author peter * @author Konstantin Bulenkov */ @@ -504,10 +502,10 @@ public class NameUtilTest extends UsefulTestCase { final List matching = new ArrayList(); final List nonMatching = new ArrayList(); - for (String s : CollectionFactory.ar("*", "*i", "*a", "*u", "T", "ti", longName, longName.substring(0, 20))) { + for (String s : ContainerUtil.ar("*", "*i", "*a", "*u", "T", "ti", longName, longName.substring(0, 20))) { matching.add(new MinusculeMatcher(s, NameUtil.MatchingCaseSensitivity.NONE)); } - for (String s : CollectionFactory.ar("A", "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa", "tag")) { + for (String s : ContainerUtil.ar("A", "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa", "tag")) { nonMatching.add(new MinusculeMatcher(s, NameUtil.MatchingCaseSensitivity.NONE)); } diff --git a/platform/testFramework/src/com/intellij/testFramework/LightPlatformTestCase.java b/platform/testFramework/src/com/intellij/testFramework/LightPlatformTestCase.java index fb48375fccf1..e7e6aa9a64a0 100644 --- a/platform/testFramework/src/com/intellij/testFramework/LightPlatformTestCase.java +++ b/platform/testFramework/src/com/intellij/testFramework/LightPlatformTestCase.java @@ -88,7 +88,7 @@ import com.intellij.psi.impl.source.tree.injected.InjectedLanguageManagerImpl; import com.intellij.psi.templateLanguages.TemplateDataLanguageMappings; import com.intellij.util.IncorrectOperationException; import com.intellij.util.LocalTimeCounter; -import com.intellij.util.containers.CollectionFactory; +import com.intellij.util.containers.ContainerUtil; import com.intellij.util.indexing.FileBasedIndex; import com.intellij.util.indexing.IndexableFileSet; import com.intellij.util.messages.MessageBusConnection; @@ -812,7 +812,7 @@ public abstract class LightPlatformTestCase extends UsefulTestCase implements Da final String[] myUrls = mySdk.getRootProvider().getUrls(OrderRootType.CLASSES); final String[] newUrls = newSdk.getRootProvider().getUrls(OrderRootType.CLASSES); - return CollectionFactory.hashSet(myUrls).equals(CollectionFactory.hashSet(newUrls)); + return ContainerUtil.newHashSet(myUrls).equals(ContainerUtil.newHashSet(newUrls)); } } } diff --git a/platform/util-rt/src/com/intellij/util/containers/ContainerUtilRt.java b/platform/util-rt/src/com/intellij/util/containers/ContainerUtilRt.java index 5f9d45301a26..d6175aa23b7d 100644 --- a/platform/util-rt/src/com/intellij/util/containers/ContainerUtilRt.java +++ b/platform/util-rt/src/com/intellij/util/containers/ContainerUtilRt.java @@ -31,7 +31,7 @@ import java.util.concurrent.CopyOnWriteArrayList; * * @since 12.0 */ -@SuppressWarnings({"UtilityClassWithoutPrivateConstructor"}) +@SuppressWarnings({"UtilityClassWithoutPrivateConstructor", "UnusedDeclaration"}) public class ContainerUtilRt { private static final int ARRAY_COPY_THRESHOLD = 20; @@ -45,6 +45,19 @@ public class ContainerUtilRt { return new com.intellij.util.containers.HashMap(map); } + @NotNull + public static Map newHashMap(@NotNull List keys, @NotNull List values) { + if (keys.size() != values.size()) { + throw new IllegalArgumentException(keys + " should have same length as " + values); + } + + Map map = newHashMap(); + for (int i = 0; i < keys.size(); ++i) { + map.put(keys.get(i), values.get(i)); + } + return map; + } + @NotNull public static TreeMap newTreeMap() { return new TreeMap(); @@ -60,22 +73,55 @@ public class ContainerUtilRt { return new LinkedList(); } + @NotNull + public static LinkedList newLinkedList(T... elements) { + final LinkedList list = newLinkedList(); + Collections.addAll(list, elements); + return list; + } + + @NotNull + public static LinkedList newLinkedList(@NotNull Iterable elements) { + return copy(ContainerUtilRt.newLinkedList(), elements); + } + @NotNull public static ArrayList newArrayList() { return new ArrayList(); } @NotNull - public static ArrayList newArrayList(E... array) { - ArrayList list = new ArrayList(computeArrayListCapacity(array.length)); - Collections.addAll(list, array); + public static ArrayList newArrayList(T... elements) { + ArrayList list = newArrayListWithCapacity(elements.length); + Collections.addAll(list, elements); return list; } @NotNull - public static ArrayList newArrayList(Iterable iterable) { - ArrayList list = newArrayList(); - for (E anIterable : iterable) { + public static ArrayList newArrayList(@NotNull Iterable elements) { + if (elements instanceof Collection) { + @SuppressWarnings("unchecked") Collection collection = (Collection)elements; + return new ArrayList(collection); + } + return copy(ContainerUtilRt.newArrayList(), elements); + } + + @NotNull + public static ArrayList newArrayListWithExpectedSize(int size) { + return new ArrayList(size); + } + + @NotNull + public static ArrayList newArrayListWithCapacity(int size) { + return new ArrayList(computeArrayListCapacity(size)); + } + + private static int computeArrayListCapacity(int size) { + return 5 + size + size / 5; + } + + private static > LT copy(LT list, @NotNull Iterable elements) { + for (T anIterable : elements) { list.add(anIterable); } return list; @@ -88,9 +134,7 @@ public class ContainerUtilRt { @NotNull public static HashSet newHashSet(T... elements) { - HashSet set = newHashSet(); - Collections.addAll(set, elements); - return set; + return new com.intellij.util.containers.HashSet(Arrays.asList(elements)); } @NotNull @@ -105,30 +149,41 @@ public class ContainerUtilRt { return set; } + @NotNull + public static LinkedHashSet newLinkedHashSet() { + return new LinkedHashSet(); + } + + @NotNull + public static LinkedHashSet newLinkedHashSet(@NotNull Collection elements) { + return new LinkedHashSet(elements); + } + + @NotNull + public static LinkedHashSet newLinkedHashSet(T... elements) { + return newLinkedHashSet(Arrays.asList(elements)); + } + @NotNull public static TreeSet newTreeSet() { return new TreeSet(); } + @NotNull + public static TreeSet newTreeSet(@NotNull Collection elements) { + return new TreeSet(elements); + } + + @NotNull + public static TreeSet newTreeSet(@NotNull T... elements) { + return newTreeSet(Arrays.asList(elements)); + } + @NotNull public static TreeSet newTreeSet(Comparator comparator) { return new TreeSet(comparator); } - @NotNull - public static ArrayList newArrayListWithExpectedSize(int size) { - return new ArrayList(size); - } - - @NotNull - public static ArrayList newArrayListWithCapacity(int size) { - return new ArrayList(computeArrayListCapacity(size)); - } - - private static int computeArrayListCapacity(int size) { - return 5 + size + size / 5; - } - @NotNull public static Stack newStack() { return new Stack(); diff --git a/platform/util/src/com/intellij/util/containers/CollectionFactory.java b/platform/util/src/com/intellij/util/containers/CollectionFactory.java index 2ec5d4e20169..9377e15b669e 100644 --- a/platform/util/src/com/intellij/util/containers/CollectionFactory.java +++ b/platform/util/src/com/intellij/util/containers/CollectionFactory.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2011 JetBrains s.r.o. + * Copyright 2000-2012 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,98 +17,100 @@ package com.intellij.util.containers; import gnu.trove.THashMap; import gnu.trove.THashSet; -import gnu.trove.TObjectHashingStrategy; import org.jetbrains.annotations.NotNull; import java.util.*; -import java.util.Stack; import java.util.HashSet; +import java.util.LinkedHashMap; +import java.util.LinkedHashSet; +import java.util.Stack; /** * @author peter + * @deprecated please use corresponding methods of {@linkplain ContainerUtil} class (to remove in IDEA 13). */ +@SuppressWarnings("UnusedDeclaration") public class CollectionFactory { - private CollectionFactory() { - } + private CollectionFactory() { } @NotNull public static HashSet hashSet() { - return new HashSet(); + return ContainerUtil.newHashSet(); } @NotNull public static HashSet hashSet(@NotNull Collection elements) { - return new HashSet(elements); + return ContainerUtil.newHashSet(elements); } @NotNull public static HashSet hashSet(@NotNull T... elements) { - return hashSet(Arrays.asList(elements)); + return ContainerUtil.newHashSet(elements); } @NotNull public static LinkedHashSet linkedHashSet() { - return new LinkedHashSet(); + return ContainerUtil.newLinkedHashSet(); } @NotNull public static LinkedHashSet linkedHashSet(@NotNull Collection elements) { - return new LinkedHashSet(elements); + return ContainerUtil.newLinkedHashSet(elements); } @NotNull public static LinkedHashSet linkedHashSet(@NotNull T... elements) { - return linkedHashSet(Arrays.asList(elements)); + return ContainerUtil.newLinkedHashSet(elements); } @NotNull public static THashSet troveSet(@NotNull T... elements) { - return troveSet(Arrays.asList(elements)); + return ContainerUtil.newTroveSet(elements); } @NotNull public static THashSet troveSet(@NotNull Collection elements) { - return new THashSet(elements); + return ContainerUtil.newTroveSet(elements); } @NotNull public static TreeSet treeSet() { - return new TreeSet(); + return ContainerUtil.newTreeSet(); } @NotNull public static TreeSet treeSet(@NotNull Collection elements) { - return new TreeSet(elements); + return ContainerUtil.newTreeSet(elements); } @NotNull public static TreeSet treeSet(@NotNull T... elements) { - return treeSet(Arrays.asList(elements)); + return ContainerUtil.newTreeSet(Arrays.asList(elements)); } @NotNull public static TreeSet treeSet(@NotNull Comparator comparator) { - return new TreeSet(comparator); + return ContainerUtil.newTreeSet(comparator); } @NotNull public static Set unmodifiableHashSet(@NotNull T... elements) { - return unmodifiableHashSet(Arrays.asList(elements)); + return ContainerUtil.immutableSet(elements); } @NotNull public static Set unmodifiableHashSet(@NotNull Collection elements) { - return Collections.unmodifiableSet(hashSet(elements)); + return Collections.unmodifiableSet(ContainerUtil.newHashSet(elements)); } @NotNull public static HashMap hashMap() { - return new HashMap(); + return (HashMap)ContainerUtil.newHashMap(); } @NotNull public static HashMap hashMap(@NotNull Map map) { - return new HashMap(map); + return (HashMap)ContainerUtil.newHashMap(map); } @NotNull @@ -118,29 +120,27 @@ public class CollectionFactory { @NotNull public static THashMap troveMap() { - return new THashMap(); + return ContainerUtil.newTroveMap(); } @NotNull public static IdentityHashMap identityHashMap() { - return new IdentityHashMap(); + return ContainerUtil.newIdentityHashMap(); } @NotNull public static THashSet identityTroveSet() { - //noinspection unchecked - return new THashSet(TObjectHashingStrategy.IDENTITY); + return ContainerUtil.newIdentityTroveSet(); } @NotNull public static THashSet identityTroveSet(int initialCapacity) { - //noinspection unchecked - return new THashSet(initialCapacity, TObjectHashingStrategy.IDENTITY); + return ContainerUtil.newIdentityTroveSet(initialCapacity); } @NotNull public static LinkedHashMap linkedHashMap() { - return new LinkedHashMap(); + return ContainerUtil.newLinkedHashMap(); } @NotNull @@ -154,97 +154,58 @@ public class CollectionFactory { } @NotNull - public static Map hashMap(@NotNull final List keys, @NotNull final List values) { - if (keys.size() != values.size()) { - throw new IllegalArgumentException(keys + " should have same length as " + values); - } - - final HashMap map = new HashMap(); - for (int i = 0; i < keys.size(); ++i) { - map.put(keys.get(i), values.get(i)); - } - return map; + public static Map hashMap(@NotNull List keys, @NotNull List values) { + return ContainerUtil.newHashMap(keys, values); } @NotNull public static ArrayList arrayList() { - return new ArrayList(); + return ContainerUtil.newArrayList(); } @NotNull public static ArrayList arrayList(int initialCapacity) { - return new ArrayList(initialCapacity); + return ContainerUtil.newArrayListWithCapacity(initialCapacity); } @NotNull public static ArrayList arrayList(@NotNull Collection elements) { - return new ArrayList(elements); + return ContainerUtil.newArrayList(elements); } @NotNull public static ArrayList arrayList(T... elements) { - return arrayList(Arrays.asList(elements)); + return ContainerUtil.newArrayList(elements); } @NotNull public static ArrayList arrayList(@NotNull Iterable elements) { - if (elements instanceof Collection) { - return arrayList((Collection)elements); - } - - return copy(elements, CollectionFactory.arrayList()); + return ContainerUtil.newArrayList(elements); } @NotNull public static List arrayList(@NotNull final T[] elements, final int start, final int end) { - if (start < 0 || start > end || end > elements.length) throw new IllegalArgumentException("start:" + start + " end:" + end + " length:" + elements.length); - - return new AbstractList() { - private final int size = end - start; - - @Override - public T get(final int index) { - if (index < 0 || index >= size) throw new IndexOutOfBoundsException("index:" + index + " size:" + size); - return elements[start + index]; - } - - @Override - public int size() { - return size; - } - }; + return ContainerUtil.newArrayList(elements, start, end); } @NotNull public static LinkedList linkedList() { - return new LinkedList(); + return ContainerUtil.newLinkedList(); } @NotNull public static LinkedList linkedList(@NotNull Collection elements) { - return new LinkedList(elements); + return ContainerUtil.newLinkedList(elements); } @NotNull public static LinkedList linkedList(T... elements) { - return linkedList(Arrays.asList(elements)); + return ContainerUtil.newLinkedList(elements); } @NotNull public static LinkedList linkedList(@NotNull Iterable elements) { - if (elements instanceof Collection) { - return linkedList((Collection)elements); - } - - return copy(elements, CollectionFactory.linkedList()); - } - - @NotNull - private static > C copy(@NotNull Iterable

source, @NotNull C target) { - for (P e : source) { - target.add(e); - } - return target; + return ContainerUtil.newLinkedList(elements); } @NotNull diff --git a/platform/util/src/com/intellij/util/containers/ContainerUtil.java b/platform/util/src/com/intellij/util/containers/ContainerUtil.java index 009746a0bfcc..6b4858128d26 100644 --- a/platform/util/src/com/intellij/util/containers/ContainerUtil.java +++ b/platform/util/src/com/intellij/util/containers/ContainerUtil.java @@ -32,6 +32,8 @@ import java.lang.reflect.Array; import java.util.*; import java.util.HashMap; import java.util.HashSet; +import java.util.LinkedHashMap; +import java.util.LinkedHashSet; import java.util.concurrent.ConcurrentMap; import java.util.concurrent.CopyOnWriteArrayList; @@ -39,6 +41,11 @@ import java.util.concurrent.CopyOnWriteArrayList; public class ContainerUtil extends ContainerUtilRt { private static final int INSERTION_SORT_THRESHOLD = 10; + @NotNull + public static T[] ar(T... elements) { + return elements; + } + @NotNull public static HashMap newHashMap() { return ContainerUtilRt.newHashMap(); @@ -49,6 +56,11 @@ public class ContainerUtil extends ContainerUtilRt { return ContainerUtilRt.newHashMap(map); } + @NotNull + public static Map newHashMap(@NotNull List keys, @NotNull List values) { + return ContainerUtilRt.newHashMap(keys, values); + } + @NotNull public static TreeMap newTreeMap() { return ContainerUtilRt.newTreeMap(); @@ -59,11 +71,31 @@ public class ContainerUtil extends ContainerUtilRt { return ContainerUtilRt.newLinkedHashMap(); } + @NotNull + public static THashMap newTroveMap() { + return new THashMap(); + } + + @NotNull + public static IdentityHashMap newIdentityHashMap() { + return new IdentityHashMap(); + } + @NotNull public static LinkedList newLinkedList() { return ContainerUtilRt.newLinkedList(); } + @NotNull + public static LinkedList newLinkedList(T... elements) { + return ContainerUtilRt.newLinkedList(elements); + } + + @NotNull + public static LinkedList newLinkedList(@NotNull Iterable elements) { + return ContainerUtilRt.newLinkedList(elements); + } + @NotNull public static ArrayList newArrayList() { return ContainerUtilRt.newArrayList(); @@ -75,10 +107,42 @@ public class ContainerUtil extends ContainerUtilRt { } @NotNull - public static ArrayList newArrayList(Iterable iterable) { + public static ArrayList newArrayList(@NotNull Iterable iterable) { return ContainerUtilRt.newArrayList(iterable); } + @NotNull + public static ArrayList newArrayListWithExpectedSize(int size) { + return ContainerUtilRt.newArrayListWithExpectedSize(size); + } + + @NotNull + public static ArrayList newArrayListWithCapacity(int size) { + return ContainerUtilRt.newArrayListWithCapacity(size); + } + + @NotNull + public static List newArrayList(@NotNull final T[] elements, final int start, final int end) { + if (start < 0 || start > end || end > elements.length) { + throw new IllegalArgumentException("start:" + start + " end:" + end + " length:" + elements.length); + } + + return new AbstractList() { + private final int size = end - start; + + @Override + public T get(final int index) { + if (index < 0 || index >= size) throw new IndexOutOfBoundsException("index:" + index + " size:" + size); + return elements[start + index]; + } + + @Override + public int size() { + return size; + } + }; + } + @NotNull public static HashSet newHashSet() { return ContainerUtilRt.newHashSet(); @@ -99,26 +163,68 @@ public class ContainerUtil extends ContainerUtilRt { return ContainerUtilRt.newHashSet(iterator); } + @NotNull + public static LinkedHashSet newLinkedHashSet() { + return ContainerUtilRt.newLinkedHashSet(); + } + + @NotNull + public static LinkedHashSet newLinkedHashSet(@NotNull Collection elements) { + return ContainerUtilRt.newLinkedHashSet(elements); + } + + @NotNull + public static LinkedHashSet newLinkedHashSet(T... elements) { + return ContainerUtilRt.newLinkedHashSet(elements); + } + + @NotNull + public static THashSet newTroveSet() { + return new THashSet(); + } + + @NotNull + public static THashSet newTroveSet(T... elements) { + return newTroveSet(Arrays.asList(elements)); + } + + @NotNull + public static THashSet newTroveSet(@NotNull Collection elements) { + return new THashSet(elements); + } + + @NotNull + public static THashSet newIdentityTroveSet() { + @SuppressWarnings("unchecked") final TObjectHashingStrategy identity = TObjectHashingStrategy.IDENTITY; + return new THashSet(identity); + } + + @NotNull + public static THashSet newIdentityTroveSet(int initialCapacity) { + @SuppressWarnings("unchecked") final TObjectHashingStrategy identity = TObjectHashingStrategy.IDENTITY; + return new THashSet(initialCapacity, identity); + } + @NotNull public static TreeSet newTreeSet() { return ContainerUtilRt.newTreeSet(); } + @NotNull + public static TreeSet newTreeSet(@NotNull Collection elements) { + return ContainerUtilRt.newTreeSet(elements); + } + + @NotNull + public static TreeSet newTreeSet(@NotNull T... elements) { + return ContainerUtilRt.newTreeSet(elements); + } + @NotNull public static TreeSet newTreeSet(Comparator comparator) { return ContainerUtilRt.newTreeSet(comparator); } - @NotNull - public static ArrayList newArrayListWithExpectedSize(int size) { - return ContainerUtilRt.newArrayListWithExpectedSize(size); - } - - @NotNull - public static ArrayList newArrayListWithCapacity(int size) { - return ContainerUtilRt.newArrayListWithCapacity(size); - } - @NotNull public static ConcurrentMap newConcurrentMap() { return new ConcurrentHashMap(); 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 2069b92425f2..c3dd21912177 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 @@ -1,5 +1,5 @@ /* - * Copyright 2000-2009 JetBrains s.r.o. + * Copyright 2000-2012 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -44,7 +44,7 @@ import com.intellij.openapi.vcs.changes.ui.RollbackProgressModifier; import com.intellij.openapi.vcs.rollback.RollbackEnvironment; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.openapi.vfs.VirtualFileManager; -import com.intellij.util.containers.CollectionFactory; +import com.intellij.util.containers.ContainerUtil; import com.intellij.util.ui.UIUtil; import com.intellij.vcsUtil.RollbackUtil; import org.jetbrains.annotations.Nullable; @@ -168,7 +168,7 @@ public class RollbackAction extends AnAction implements DumbAware { @Nullable private static List getChanges(final Project project, final AnActionEvent e) { final ChangesCheckHelper helper = new ChangesCheckHelper(project, e); - if (helper.isChangesSet() && helper.getChanges() != null) return CollectionFactory.arrayList(helper.getChanges()); + if (helper.isChangesSet() && helper.getChanges() != null) return ContainerUtil.newArrayList(helper.getChanges()); final VirtualFile[] virtualFiles = e.getData(PlatformDataKeys.VIRTUAL_FILE_ARRAY); if (virtualFiles != null && virtualFiles.length > 0) { diff --git a/plugins/devkit/src/dom/impl/ExtensionDomExtender.java b/plugins/devkit/src/dom/impl/ExtensionDomExtender.java index e93e2b30e64c..2ea061c05251 100644 --- a/plugins/devkit/src/dom/impl/ExtensionDomExtender.java +++ b/plugins/devkit/src/dom/impl/ExtensionDomExtender.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2009 JetBrains s.r.o. + * Copyright 2000-2012 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -26,7 +26,6 @@ import com.intellij.psi.xml.XmlElement; import com.intellij.psi.xml.XmlFile; import com.intellij.psi.xml.XmlTag; import com.intellij.refactoring.psi.PropertyUtils; -import com.intellij.util.containers.CollectionFactory; import com.intellij.util.containers.ContainerUtil; import com.intellij.util.containers.LinkedMultiMap; import com.intellij.util.containers.MultiMap; @@ -100,7 +99,7 @@ public class ExtensionDomExtender extends DomExtender { } private static Set getVisiblePlugins(IdeaPlugin ideaPlugin) { - Set result = CollectionFactory.hashSet(); + Set result = ContainerUtil.newHashSet(); MultiMap byId = getPluginMap(ideaPlugin.getManager().getProject()); collectDependencies(ideaPlugin, result, byId); //noinspection NullableProblems diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/codeInspection/untypedUnresolvedAccess/GroovyUnresolvedAccessInspection.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/codeInspection/untypedUnresolvedAccess/GroovyUnresolvedAccessInspection.java index 21b8a1073e38..45eb0dae6ba3 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/codeInspection/untypedUnresolvedAccess/GroovyUnresolvedAccessInspection.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/codeInspection/untypedUnresolvedAccess/GroovyUnresolvedAccessInspection.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2009 JetBrains s.r.o. + * Copyright 2000-2012 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,7 +17,7 @@ package org.jetbrains.plugins.groovy.codeInspection.untypedUnresolvedAccess; import com.intellij.psi.*; -import com.intellij.util.containers.CollectionFactory; +import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.Nls; import org.jetbrains.annotations.NotNull; import org.jetbrains.plugins.groovy.annotator.GrHighlightUtil; @@ -111,7 +111,7 @@ public class GroovyUnresolvedAccessInspection extends BaseInspection { boolean gpp = GppTypeConverter.hasTypedContext(target) && GppTypeConverter.hasTypedContext(refExpr); if (refExpr.getParent() instanceof GrCall) { List toSearch = - CollectionFactory.arrayList(target.findMethodsByName(gpp ? "invokeUnresolvedMethod" : "invokeMethod", true)); + ContainerUtil.newArrayList(target.findMethodsByName(gpp ? "invokeUnresolvedMethod" : "invokeMethod", true)); for (Iterator iterator = toSearch.iterator(); iterator.hasNext(); ) { PsiMethod method = iterator.next(); if (!gpp && @@ -124,7 +124,7 @@ public class GroovyUnresolvedAccessInspection extends BaseInspection { } if (PsiUtil.isLValue(refExpr)) { - List toSearch = CollectionFactory.arrayList(target.findMethodsByName(gpp ? "setUnresolvedProperty" : "setProperty", true)); + List toSearch = ContainerUtil.newArrayList(target.findMethodsByName(gpp ? "setUnresolvedProperty" : "setProperty", true)); for (Iterator iterator = toSearch.iterator(); iterator.hasNext(); ) { PsiMethod method = iterator.next(); if (method.getParameterList().getParametersCount() != 2 || (!gpp && !method.getParameterList().getParameters()[1].getType() @@ -135,7 +135,7 @@ public class GroovyUnresolvedAccessInspection extends BaseInspection { return toSearch; } - List toSearch = CollectionFactory.arrayList(target.findMethodsByName(gpp ? "getUnresolvedProperty" : "getProperty", true)); + List toSearch = ContainerUtil.newArrayList(target.findMethodsByName(gpp ? "getUnresolvedProperty" : "getProperty", true)); for (Iterator iterator = toSearch.iterator(); iterator.hasNext(); ) { if (iterator.next().getParameterList().getParametersCount() != 1) { iterator.remove(); diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/compiler/generator/GroovycStubGenerator.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/compiler/generator/GroovycStubGenerator.java index 0768efdcbb16..2ca34e4780c2 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/compiler/generator/GroovycStubGenerator.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/compiler/generator/GroovycStubGenerator.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2009 JetBrains s.r.o. + * Copyright 2000-2012 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -47,7 +47,6 @@ import com.intellij.psi.PsiManager; import com.intellij.psi.search.GlobalSearchScope; import com.intellij.util.Chunk; import com.intellij.util.Processor; -import com.intellij.util.containers.CollectionFactory; import com.intellij.util.containers.ContainerUtil; import com.intellij.util.containers.FactoryMap; import org.jetbrains.annotations.NotNull; @@ -253,7 +252,7 @@ public class GroovycStubGenerator extends GroovyCompilerBase { } private static List writeStubs(VirtualFile outputRootDirectory, Map output, VirtualFile src) { - final ArrayList stubs = CollectionFactory.arrayList(); + final ArrayList stubs = ContainerUtil.newArrayList(); for (String relativePath : output.keySet()) { final File stubFile = new File(outputRootDirectory.getPath(), relativePath); FileUtil.createIfDoesntExist(stubFile); 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 02d2448b1afe..46a5386a34fb 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/editor/GroovyImportOptimizer.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/editor/GroovyImportOptimizer.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2009 JetBrains s.r.o. + * Copyright 2000-2012 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -21,7 +21,6 @@ import com.intellij.openapi.project.Project; import com.intellij.openapi.util.text.StringUtil; import com.intellij.psi.*; import com.intellij.psi.codeStyle.CodeStyleSettingsManager; -import com.intellij.util.containers.CollectionFactory; import com.intellij.util.containers.ContainerUtil; import com.intellij.util.containers.HashSet; import gnu.trove.TObjectIntHashMap; @@ -351,7 +350,7 @@ public class GroovyImportOptimizer implements ImportOptimizer { } }); - List explicated = CollectionFactory.arrayList(); + List explicated = ContainerUtil.newArrayList(); for (String importedClass : importedClasses) { final String parentName = StringUtil.getPackageName(importedClass); if (!annotations.containsKey(importedClass) && !aliased.containsKey(importedClass)) { diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/gant/AntTasksProvider.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/gant/AntTasksProvider.java index 8ef3340cc160..be6a13004210 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/gant/AntTasksProvider.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/gant/AntTasksProvider.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2009 JetBrains s.r.o. + * Copyright 2000-2012 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -36,7 +36,6 @@ import com.intellij.psi.util.CachedValuesManager; import com.intellij.psi.util.PsiModificationTracker; import com.intellij.reference.SoftReference; import com.intellij.util.PathUtil; -import com.intellij.util.containers.CollectionFactory; import com.intellij.util.containers.ContainerUtil; import com.intellij.util.lang.UrlClassLoader; import org.jetbrains.annotations.NotNull; @@ -126,7 +125,7 @@ public class AntTasksProvider { final Map, SoftReference> map = CachedValuesManager.getManager(project).getCachedValue(project, new CachedValueProvider, SoftReference>>() { @Override public Result, SoftReference>> compute() { - final Map, SoftReference> map = CollectionFactory.hashMap(); + final Map, SoftReference> map = ContainerUtil.newHashMap(); return Result.create(map, ProjectRootManager.getInstance(project)); } }); diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/gant/GantRunner.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/gant/GantRunner.java index 173916b74ece..e9cda8c9a57c 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/gant/GantRunner.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/gant/GantRunner.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2009 JetBrains s.r.o. + * Copyright 2000-2012 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -36,7 +36,7 @@ import org.jetbrains.plugins.groovy.util.LibrariesUtil; import java.io.File; -import static com.intellij.util.containers.CollectionFactory.ar; +import static com.intellij.util.containers.ContainerUtil.ar; /** * @author ilyas diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/gpp/GppReferenceContributor.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/gpp/GppReferenceContributor.java index 8db2295ace72..ef9072bd97c2 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/gpp/GppReferenceContributor.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/gpp/GppReferenceContributor.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2012 JetBrains s.r.o. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package org.jetbrains.plugins.groovy.gpp; import com.intellij.openapi.util.Pair; @@ -6,7 +21,7 @@ import com.intellij.psi.*; import com.intellij.psi.util.PropertyUtil; import com.intellij.util.ArrayUtil; import com.intellij.util.ProcessingContext; -import com.intellij.util.containers.CollectionFactory; +import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.plugins.groovy.findUsages.LiteralConstructorReference; import org.jetbrains.plugins.groovy.lang.psi.api.auxiliary.GrListOrMap; @@ -94,10 +109,10 @@ public class GppReferenceContributor extends PsiReferenceContributor { private List addMethodCandidates(PsiClassType classType, GrExpression value) { PsiType valueType = value == null ? null : value.getType(); - final List applicable = CollectionFactory.arrayList(); + final List applicable = ContainerUtil.newArrayList(); if (value == null || GroovyPsiManager.isInheritorCached(valueType, GroovyCommonClassNames.GROOVY_LANG_CLOSURE)) { - final List byName = CollectionFactory.arrayList(); + final List byName = ContainerUtil.newArrayList(); for (Pair variant : GppClosureParameterTypeProvider.getMethodsToOverrideImplementInInheritor(classType, false)) { final PsiMethod method = variant.first; if (getValue().equals(method.getName())) { diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/grape/GrabDependencies.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/grape/GrabDependencies.java index c4d58ae4fe04..90206c47cf84 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/grape/GrabDependencies.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/grape/GrabDependencies.java @@ -57,7 +57,6 @@ import com.intellij.psi.PsiFile; import com.intellij.psi.PsiRecursiveElementWalkingVisitor; import com.intellij.psi.util.PsiTreeUtil; import com.intellij.util.*; -import com.intellij.util.containers.CollectionFactory; import com.intellij.util.containers.ContainerUtil; import gnu.trove.THashSet; import org.jetbrains.annotations.NotNull; @@ -260,7 +259,7 @@ public class GrabDependencies implements IntentionAction { if (jarRoot != null) { OrderRootType rootType = OrderRootType.CLASSES; String libName = "Grab:" + jar.getName(); - for (String classifier : CollectionFactory.ar("sources", "source", "src")) { + for (String classifier : ContainerUtil.ar("sources", "source", "src")) { if (libName.endsWith("-" + classifier + ".jar")) { rootType = OrderRootType.SOURCES; libName = StringUtil.trimEnd(libName, "-" + classifier + ".jar") + ".jar"; diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/GroovyCompletionContributor.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/GroovyCompletionContributor.java index 399283de483d..9bdf142363e6 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/GroovyCompletionContributor.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/GroovyCompletionContributor.java @@ -79,7 +79,7 @@ import java.util.Set; import static com.intellij.patterns.PlatformPatterns.psiElement; import static com.intellij.patterns.PsiJavaPatterns.elementType; -import static com.intellij.util.containers.CollectionFactory.*; +import static com.intellij.util.containers.ContainerUtil.*; import static org.jetbrains.plugins.groovy.lang.lexer.GroovyTokenTypes.*; import static org.jetbrains.plugins.groovy.lang.lexer.TokenSets.SEPARATORS; import static org.jetbrains.plugins.groovy.lang.lexer.TokenSets.WHITE_SPACES_OR_COMMENTS; @@ -404,7 +404,7 @@ public class GroovyCompletionContributor extends CompletionContributor { static Runnable completeReference(final CompletionParameters parameters, GrReferenceElement reference, final InheritorsHolder inheritorsHolder, final PrefixMatcher matcher, final Consumer _consumer) { final Consumer consumer = new Consumer() { - final Set added = hashSet(); + final Set added = newHashSet(); @Override public void consume(LookupElement element) { if (added.add(element)) { @@ -413,7 +413,7 @@ public class GroovyCompletionContributor extends CompletionContributor { } }; - final Map staticMembers = hashMap(); + final Map staticMembers = newHashMap(); final PsiElement qualifier = reference.getQualifier(); final PsiType qualifierType = qualifier instanceof GrExpression ? ((GrExpression)qualifier).getType() : null; @@ -435,7 +435,7 @@ public class GroovyCompletionContributor extends CompletionContributor { unresolvedProps = Collections.emptySet(); } - final List zeroPriority = arrayList(); + final List zeroPriority = newArrayList(); reference.processVariants(matcher, parameters, new Consumer() { public void consume(LookupElement lookupElement) { Object object = lookupElement.getObject(); diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/GroovyCompletionUtil.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/GroovyCompletionUtil.java index b3c871356cf6..e6d6842befe0 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/GroovyCompletionUtil.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/GroovyCompletionUtil.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2009 JetBrains s.r.o. + * Copyright 2000-2012 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -42,7 +42,7 @@ import com.intellij.psi.tree.TokenSet; import com.intellij.psi.util.*; import com.intellij.util.Function; import com.intellij.util.IncorrectOperationException; -import com.intellij.util.containers.CollectionFactory; +import com.intellij.util.containers.ContainerUtil; import com.intellij.util.text.CharArrayUtil; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; @@ -229,7 +229,7 @@ public class GroovyCompletionUtil { boolean afterNew, PrefixMatcher matcher, PsiElement position) { - List result = CollectionFactory.arrayList(); + List result = ContainerUtil.newArrayList(); for (GroovyResolveResult candidate : candidates) { result.addAll(createLookupElements(candidate, afterNew, matcher, position)); ProgressManager.checkCanceled(); @@ -482,11 +482,11 @@ public class GroovyCompletionUtil { return TailType.insertChar(editor, offset, ')'); } - public static final Set OPERATOR_METHOD_NAMES = CollectionFactory.hashSet( + public static final Set OPERATOR_METHOD_NAMES = ContainerUtil.newHashSet( "plus", "minus", "multiply", "power", "div", "mod", "or", "and", "xor", "next", "previous", "getAt", "putAt", "leftShift", "rightShift", "isCase", "bitwiseNegate", "negative", "positive", "call" ); - + public static boolean skipDefGroovyMethod(GrGdkMethod gdkMethod, PsiSubstitutor substitutor, @Nullable PsiType type) { if (type == null) return false; String name = gdkMethod.getStaticMethod().getName(); diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/weighers/GrKindWeigher.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/weighers/GrKindWeigher.java index 36e6063a6ea0..c7a83f888d97 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/weighers/GrKindWeigher.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/weighers/GrKindWeigher.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2010 JetBrains s.r.o. + * Copyright 2000-2012 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -24,7 +24,7 @@ import com.intellij.psi.impl.light.LightElement; import com.intellij.psi.impl.source.tree.java.PsiAnnotationImpl; import com.intellij.psi.util.InheritanceUtil; import com.intellij.psi.util.PsiTreeUtil; -import com.intellij.util.containers.CollectionFactory; +import com.intellij.util.containers.ContainerUtil; import com.intellij.util.containers.hash.HashSet; import org.jetbrains.annotations.NotNull; import org.jetbrains.plugins.groovy.extensions.NamedArgumentDescriptor; @@ -46,7 +46,7 @@ import java.util.Set; */ public class GrKindWeigher extends CompletionWeigher { private static final Set TRASH_CLASSES = new HashSet(10); - private static final Set PRIORITY_KEYWORDS = CollectionFactory.hashSet( + private static final Set PRIORITY_KEYWORDS = ContainerUtil.newHashSet( PsiKeyword.RETURN, PsiKeyword.INSTANCEOF, "in", PsiKeyword.PRIVATE, PsiKeyword.PROTECTED, PsiKeyword.PUBLIC, PsiKeyword.STATIC, "def", PsiKeyword.TRUE, PsiKeyword.FALSE, PsiKeyword.NULL); diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/stubs/GrStubUtils.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/stubs/GrStubUtils.java index 35551ddd20be..ef5a268f6081 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/stubs/GrStubUtils.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/stubs/GrStubUtils.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2009 JetBrains s.r.o. + * Copyright 2000-2012 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -25,7 +25,7 @@ import com.intellij.psi.stubs.StubElement; import com.intellij.psi.stubs.StubInputStream; import com.intellij.psi.stubs.StubOutputStream; import com.intellij.util.ArrayUtil; -import com.intellij.util.containers.CollectionFactory; +import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.plugins.groovy.lang.parser.GroovyElementTypes; @@ -79,7 +79,7 @@ public class GrStubUtils { } public static String[] getAnnotationNames(PsiModifierListOwner psi) { - List annoNames = CollectionFactory.arrayList(); + List annoNames = ContainerUtil.newArrayList(); final PsiModifierList modifierList = psi.getModifierList(); if (modifierList instanceof GrModifierList) { for (GrAnnotation annotation : ((GrModifierList)modifierList).getAnnotations()) { diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/util/GdkMethodUtil.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/util/GdkMethodUtil.java index 0a5de49d1973..0988fffd986e 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/util/GdkMethodUtil.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/util/GdkMethodUtil.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2011 JetBrains s.r.o. + * Copyright 2000-2012 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -19,7 +19,7 @@ import com.intellij.openapi.diagnostic.Logger; import com.intellij.psi.*; import com.intellij.psi.scope.DelegatingScopeProcessor; import com.intellij.psi.scope.PsiScopeProcessor; -import com.intellij.util.containers.CollectionFactory; +import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -44,7 +44,7 @@ public class GdkMethodUtil { private static final Logger LOG = Logger.getInstance(GdkMethodUtil.class); - public static final Set COLLECTION_METHOD_NAMES = CollectionFactory.hashSet( + public static final Set COLLECTION_METHOD_NAMES = ContainerUtil.newHashSet( "each", "eachWithIndex", "any", "every", "reverseEach", "collect", "collectAll", "find", "findAll", "retainAll", "removeAll", "split", "groupBy", "groupEntriesBy", "findLastIndexOf", "findIndexValues", "findIndexOf" ); diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/stubs/GroovyShortNamesCache.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/stubs/GroovyShortNamesCache.java index 87e84bbdc8cf..4e1d21d756fa 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/stubs/GroovyShortNamesCache.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/stubs/GroovyShortNamesCache.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2009 JetBrains s.r.o. + * Copyright 2000-2012 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -28,7 +28,6 @@ import com.intellij.psi.stubs.StubIndexImpl; import com.intellij.util.ArrayUtil; import com.intellij.util.ObjectUtils; import com.intellij.util.Processor; -import com.intellij.util.containers.CollectionFactory; import com.intellij.util.containers.ContainerUtil; import com.intellij.util.containers.HashSet; import org.jetbrains.annotations.NonNls; @@ -109,7 +108,7 @@ public class GroovyShortNamesCache extends PsiShortNamesCache { } private Collection getAllScriptClasses(String shortName, GlobalSearchScope scope) { - final ArrayList result = CollectionFactory.arrayList(); + final ArrayList result = ContainerUtil.newArrayList(); for (GroovyFile file : StubIndex.getInstance().get(GrScriptClassNameIndex.KEY, shortName, myProject, new GrSourceFilterScope(scope))) { ContainerUtil.addIfNotNull(file.getScriptClass(), result); } diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/mvc/MvcModuleStructureUtil.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/mvc/MvcModuleStructureUtil.java index fa8c9d30ac39..452e974f69b8 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/mvc/MvcModuleStructureUtil.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/mvc/MvcModuleStructureUtil.java @@ -44,7 +44,6 @@ import com.intellij.util.ArrayUtil; import com.intellij.util.CommonProcessors; import com.intellij.util.Consumer; import com.intellij.util.SmartList; -import com.intellij.util.containers.CollectionFactory; import com.intellij.util.containers.ContainerUtil; import com.intellij.util.containers.MultiMap; import org.jetbrains.annotations.NonNls; @@ -92,7 +91,7 @@ public class MvcModuleStructureUtil { root.refresh(false, true); - final List> actions = CollectionFactory.arrayList(); + final List> actions = ContainerUtil.newArrayList(); for (final String src : structure.getSourceFolders()) { addSourceFolder(root, src, false, actions, sourceRoots); @@ -269,7 +268,7 @@ public class MvcModuleStructureUtil { appRoot.refresh(false, false); } - List> actions = CollectionFactory.arrayList(); + List> actions = ContainerUtil.newArrayList(); removeInvalidSourceRoots(actions, structure); cleanupDefaultLibrary(structure.myModule, actions, appRoots, structure.getUserLibraryName()); moveupLibrariesFromMavenPlugin(structure.myModule, actions); @@ -336,8 +335,8 @@ public class MvcModuleStructureUtil { } private static void removeInvalidSourceRoots(List> actions, MvcProjectStructure structure) { - final Set toRemove = CollectionFactory.troveSet(); - final Set toRemoveContent = CollectionFactory.troveSet(); + final Set toRemove = ContainerUtil.newTroveSet(); + final Set toRemoveContent = ContainerUtil.newTroveSet(); for (ContentEntry entry : ModuleRootManager.getInstance(structure.myModule).getContentEntries()) { final VirtualFile file = entry.getFile(); if (file == null || !structure.isValidContentRoot(file)) { diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/mvc/MvcPathMacros.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/mvc/MvcPathMacros.java index a90bd96e4e5a..df6fdc5fc17a 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/mvc/MvcPathMacros.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/mvc/MvcPathMacros.java @@ -1,10 +1,25 @@ +/* + * Copyright 2000-2012 JetBrains s.r.o. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package org.jetbrains.plugins.groovy.mvc; import com.intellij.openapi.application.PathMacros; import com.intellij.openapi.util.io.FileUtil; import com.intellij.openapi.util.text.StringUtil; import com.intellij.util.SystemProperties; -import com.intellij.util.containers.CollectionFactory; +import com.intellij.util.containers.ContainerUtil; import java.util.Set; @@ -16,7 +31,7 @@ public class MvcPathMacros { public MvcPathMacros() { Set macroNames = PathMacros.getInstance().getUserMacroNames(); - for (String framework : CollectionFactory.ar("grails", "griffon")) { + for (String framework : ContainerUtil.ar("grails", "griffon")) { String name = "USER_HOME_" + framework.toUpperCase(); if (!macroNames.contains(name)) { // OK, it may appear/disappear during the application lifetime, but we ignore that for now. Restart will help anyway PathMacros.getInstance().addLegacyMacro(name, StringUtil.trimEnd(getSdkWorkDirParent(framework), "/")); diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/convertToJava/StubGenerator.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/convertToJava/StubGenerator.java index 09aab643117f..fbd13b630655 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/convertToJava/StubGenerator.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/convertToJava/StubGenerator.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2011 JetBrains s.r.o. + * Copyright 2000-2012 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -26,7 +26,7 @@ import com.intellij.psi.util.MethodSignatureBackedByPsiMethod; import com.intellij.psi.util.PsiUtil; import com.intellij.psi.util.TypeConversionUtil; import com.intellij.util.ArrayUtil; -import com.intellij.util.containers.CollectionFactory; +import com.intellij.util.containers.ContainerUtil; import gnu.trove.THashSet; import org.jetbrains.annotations.Nullable; import org.jetbrains.plugins.groovy.lang.psi.api.GroovyResolveResult; @@ -167,7 +167,7 @@ public class StubGenerator implements ClassItemGenerator { return Collections.emptySet(); } - final Set result = CollectionFactory.troveSet(ArrayUtil.EMPTY_STRING_ARRAY); + final Set result = ContainerUtil.newTroveSet(ArrayUtil.EMPTY_STRING_ARRAY); for (PsiClassType type : chainedConstructor.getThrowsList().getReferencedTypes()) { StringBuilder builder = new StringBuilder(); writeType(builder, substitutor.substitute(type), constructor, classNameProvider); diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/spock/SpockTest.groovy b/plugins/groovy/test/org/jetbrains/plugins/groovy/spock/SpockTest.groovy index 16756d18eed4..3299df42ec84 100644 --- a/plugins/groovy/test/org/jetbrains/plugins/groovy/spock/SpockTest.groovy +++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/spock/SpockTest.groovy @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2012 JetBrains s.r.o. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package org.jetbrains.plugins.groovy.spock import com.intellij.codeInsight.lookup.LookupElement @@ -5,7 +20,7 @@ import com.intellij.psi.CommonClassNames import com.intellij.psi.PsiFile import com.intellij.psi.PsiVariable import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase -import com.intellij.util.containers.CollectionFactory +import com.intellij.util.containers.ContainerUtil import org.jetbrains.plugins.groovy.codeInspection.assignment.GroovyAssignabilityCheckInspection import org.jetbrains.plugins.groovy.codeInspection.untypedUnresolvedAccess.GroovyUnresolvedAccessInspection @@ -190,7 +205,7 @@ class FooSpec extends spock.lang.Specification { assertNotNull(lookupElements); - Set missedVariants = CollectionFactory.hashSet(expectedVariants); + Set missedVariants = ContainerUtil.newHashSet(expectedVariants); for (LookupElement lookupElement : lookupElements) { missedVariants.remove(lookupElement.getLookupString()); diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/util/TestUtils.java b/plugins/groovy/test/org/jetbrains/plugins/groovy/util/TestUtils.java index e59a73812db0..516c717b603b 100644 --- a/plugins/groovy/test/org/jetbrains/plugins/groovy/util/TestUtils.java +++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/util/TestUtils.java @@ -1,5 +1,6 @@ /* - * Copyright 2000-2008 JetBrains s.r.o. + * Copyright 2000-2012 JetBrains s.r.o. + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -25,7 +26,7 @@ import com.intellij.psi.*; import com.intellij.testFramework.fixtures.JavaCodeInsightTestFixture; import com.intellij.util.IncorrectOperationException; import com.intellij.util.LocalTimeCounter; -import com.intellij.util.containers.CollectionFactory; +import com.intellij.util.containers.ContainerUtil; import org.jetbrains.plugins.groovy.extensions.NamedArgumentDescriptor; import org.junit.Assert; @@ -154,7 +155,7 @@ public abstract class TestUtils { Assert.assertNotNull(lookupElements); - Set missedVariants = CollectionFactory.hashSet(expectedVariants); + Set missedVariants = ContainerUtil.newHashSet(expectedVariants); for (LookupElement lookupElement : lookupElements) { String lookupString = lookupElement.getLookupString(); diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/compiler/MavenResourceCompiler.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/compiler/MavenResourceCompiler.java index 5bfcb796f12d..5b040fb72a6b 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/compiler/MavenResourceCompiler.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/compiler/MavenResourceCompiler.java @@ -33,7 +33,7 @@ import com.intellij.openapi.util.io.FileUtil; import com.intellij.openapi.util.text.StringUtil; import com.intellij.openapi.vfs.*; import com.intellij.testFramework.LightVirtualFile; -import com.intellij.util.containers.CollectionFactory; +import com.intellij.util.containers.ContainerUtil; import gnu.trove.THashMap; import gnu.trove.THashSet; import org.jdom.Element; @@ -56,7 +56,7 @@ import java.util.regex.Pattern; public class MavenResourceCompiler implements ClassPostProcessingCompiler { private static final Key> FILES_TO_DELETE_KEY = Key.create(MavenResourceCompiler.class.getSimpleName() + ".FILES_TO_DELETE"); - private static final Set DEFAULT_NON_FILTERED_EXTENSIONS = CollectionFactory.hashSet("jpg", "jpeg", "gif", "bmp", "png"); + private static final Set DEFAULT_NON_FILTERED_EXTENSIONS = ContainerUtil.newHashSet("jpg", "jpeg", "gif", "bmp", "png"); private Map> myOutputItemsCache = new THashMap>(); diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/MavenDomUtil.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/MavenDomUtil.java index 7ccb889706b5..143136dd6233 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/MavenDomUtil.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/MavenDomUtil.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2009 JetBrains s.r.o. + * Copyright 2000-2012 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -37,7 +37,7 @@ import com.intellij.psi.util.PsiTreeUtil; import com.intellij.psi.xml.XmlElement; import com.intellij.psi.xml.XmlFile; import com.intellij.psi.xml.XmlTag; -import com.intellij.util.containers.CollectionFactory; +import com.intellij.util.containers.ContainerUtil; import com.intellij.util.xml.*; import com.intellij.util.xml.reflect.DomCollectionChildDescription; import org.jetbrains.annotations.NotNull; @@ -59,7 +59,7 @@ import java.util.regex.Pattern; public class MavenDomUtil { // see http://maven.apache.org/settings.html - private static final Set SUBTAGS_IN_SETTINGS_FILE = CollectionFactory.hashSet("localRepository", "interactiveMode", + private static final Set SUBTAGS_IN_SETTINGS_FILE = ContainerUtil.newHashSet("localRepository", "interactiveMode", "usePluginRegistry", "offline", "pluginGroups", "servers", "mirrors", "proxies", "profiles", "activeProfiles"); diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/MavenResumeAction.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/MavenResumeAction.java index 1c728d3a4d17..dba1095df2ac 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/MavenResumeAction.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/MavenResumeAction.java @@ -34,7 +34,7 @@ import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.project.Project; import com.intellij.openapi.ui.Messages; import com.intellij.openapi.util.Key; -import com.intellij.util.containers.CollectionFactory; +import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.idea.maven.project.MavenProject; @@ -51,7 +51,7 @@ public class MavenResumeAction extends AnAction { private static final Logger LOG = Logger.getInstance(MavenResumeAction.class); - private static final Set PARAMS_DISABLING_RESUME = CollectionFactory.hashSet("-rf", "-resume-from", "-pl", "-projects", "-am", + private static final Set PARAMS_DISABLING_RESUME = ContainerUtil.newHashSet("-rf", "-resume-from", "-pl", "-projects", "-am", "-also-make", "-amd", "-also-make-dependents"); public static final int STATE_INITIAL = 0; diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenProject.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenProject.java index 1629566e04ca..4a5445afea8e 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenProject.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenProject.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2009 JetBrains s.r.o. + * Copyright 2000-2012 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -29,7 +29,6 @@ import com.intellij.openapi.util.text.StringUtil; import com.intellij.openapi.vfs.LocalFileSystem; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.util.SmartList; -import com.intellij.util.containers.CollectionFactory; import com.intellij.util.containers.ContainerUtil; import gnu.trove.THashSet; import org.jdom.Element; @@ -744,7 +743,7 @@ public class MavenProject { @NotNull public Set getSupportedPackagings() { - Set result = CollectionFactory.hashSet(MavenConstants.TYPE_POM, + Set result = ContainerUtil.newHashSet(MavenConstants.TYPE_POM, MavenConstants.TYPE_JAR, "ejb", "ejb-client", "war", "ear", "bundle", "maven-plugin"); for (MavenImporter each : getSuitableImporters()) { diff --git a/xml/dom-impl/src/com/intellij/util/xml/impl/AddToCompositeCollectionInvocation.java b/xml/dom-impl/src/com/intellij/util/xml/impl/AddToCompositeCollectionInvocation.java index b512067ec9a5..da04e8edd1df 100644 --- a/xml/dom-impl/src/com/intellij/util/xml/impl/AddToCompositeCollectionInvocation.java +++ b/xml/dom-impl/src/com/intellij/util/xml/impl/AddToCompositeCollectionInvocation.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2009 JetBrains s.r.o. + * Copyright 2000-2012 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,7 +16,7 @@ package com.intellij.util.xml.impl; import com.intellij.psi.xml.XmlTag; -import com.intellij.util.containers.CollectionFactory; +import com.intellij.util.containers.ContainerUtil; import com.intellij.util.xml.EvaluatedXmlName; import java.lang.reflect.Type; @@ -37,7 +37,7 @@ class AddToCompositeCollectionInvocation implements Invocation { } public Object invoke(final DomInvocationHandler handler, final Object[] args) throws Throwable { - Set set = CollectionFactory.troveSet(); + Set set = ContainerUtil.newTroveSet(); for (final CollectionChildDescriptionImpl qname : myQnames) { set.addAll(qname.getTagsGetter().fun(handler)); } 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 f4ea7b353ff3..fc87e83264b2 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 @@ -1,5 +1,5 @@ /* - * Copyright 2000-2009 JetBrains s.r.o. + * Copyright 2000-2012 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -35,7 +35,7 @@ import java.util.List; import java.util.Map; import java.util.Set; -import static com.intellij.util.containers.CollectionFactory.arrayList; +import static com.intellij.util.containers.ContainerUtil.newArrayList; /** * @author peter @@ -114,7 +114,7 @@ public class DomApplicationComponent { } public synchronized List getAllFileDescriptions() { - final List result = arrayList(); + final List result = newArrayList(); for (Set descriptions : myRootTagName2FileDescription.values()) { result.addAll(descriptions); } diff --git a/xml/impl/src/com/intellij/javaee/ExternalResourceManagerImpl.java b/xml/impl/src/com/intellij/javaee/ExternalResourceManagerImpl.java index 048f666ed2c6..51ee002fc38d 100644 --- a/xml/impl/src/com/intellij/javaee/ExternalResourceManagerImpl.java +++ b/xml/impl/src/com/intellij/javaee/ExternalResourceManagerImpl.java @@ -30,7 +30,7 @@ import com.intellij.openapi.vfs.VirtualFile; import com.intellij.psi.PsiFile; import com.intellij.psi.xml.XmlFile; import com.intellij.util.ArrayUtil; -import com.intellij.util.containers.CollectionFactory; +import com.intellij.util.containers.ContainerUtil; import com.intellij.util.containers.HashMap; import com.intellij.xml.Html5SchemaProvider; import com.intellij.xml.XmlSchemaProvider; @@ -125,7 +125,7 @@ public class ExternalResourceManagerImpl extends ExternalResourceManagerEx imple Map map = resources.get(version); if (map == null) { if (create) { - map = CollectionFactory.hashMap(); + map = ContainerUtil.newHashMap(); resources.put(version, map); } else if (version == null || !version.equals(DEFAULT_VERSION)) {