mirror of
https://gitflic.ru/project/openide/openide.git
synced 2026-09-27 10:03:11 +07:00
Get rid of all ContainerUtil#toArray occurrences
This commit is contained in:
@@ -133,7 +133,7 @@ public class BuildArtifactAction extends DumbAwareAction {
|
||||
for (ArtifactPopupItem item : items) {
|
||||
artifacts.addAll(item.getArtifacts(project));
|
||||
}
|
||||
return ContainerUtil.toArray(artifacts, new Artifact[artifacts.size()]);
|
||||
return artifacts.toArray(new Artifact[0]);
|
||||
}
|
||||
|
||||
private static class BuildArtifactItem extends ArtifactActionItem {
|
||||
|
||||
@@ -18,7 +18,6 @@ import com.intellij.ui.RowIcon;
|
||||
import com.intellij.util.ArrayUtil;
|
||||
import com.intellij.util.IncorrectOperationException;
|
||||
import com.intellij.util.PlatformIcons;
|
||||
import com.intellij.util.containers.ContainerUtil;
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
import org.jetbrains.annotations.Nullable;
|
||||
|
||||
@@ -65,7 +64,7 @@ public abstract class PsiPackageBase extends PsiElementBase implements PsiDirect
|
||||
@NotNull
|
||||
public PsiDirectory[] getDirectories() {
|
||||
final Collection<PsiDirectory> collection = getAllDirectories();
|
||||
return ContainerUtil.toArray(collection, new PsiDirectory[collection.size()]);
|
||||
return collection.toArray(PsiDirectory.EMPTY_ARRAY);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -34,9 +34,9 @@ import com.intellij.ui.stripe.TreeUpdater;
|
||||
import com.intellij.ui.tree.AsyncTreeModel;
|
||||
import com.intellij.ui.tree.RestoreSelectionListener;
|
||||
import com.intellij.ui.tree.TreeVisitor;
|
||||
import com.intellij.util.ArrayUtil;
|
||||
import com.intellij.util.EditSourceOnDoubleClickHandler;
|
||||
import com.intellij.util.OpenSourceUtil;
|
||||
import com.intellij.util.containers.ContainerUtil;
|
||||
import com.intellij.util.ui.accessibility.ScreenReader;
|
||||
import com.intellij.util.ui.tree.TreeUtil;
|
||||
import org.jetbrains.annotations.NonNls;
|
||||
@@ -288,7 +288,7 @@ public final class ScopeViewPane extends AbstractProjectViewPane {
|
||||
public String[] getSubIds() {
|
||||
LinkedHashMap<String, NamedScopeFilter> map = myFilters;
|
||||
if (map == null || map.isEmpty()) return EMPTY_STRING_ARRAY;
|
||||
return ContainerUtil.toArray(map.keySet(), EMPTY_STRING_ARRAY);
|
||||
return ArrayUtil.toStringArray(map.keySet());
|
||||
}
|
||||
|
||||
@NotNull
|
||||
|
||||
@@ -27,7 +27,6 @@ import com.intellij.psi.PsiFile;
|
||||
import com.intellij.psi.PsiReference;
|
||||
import com.intellij.psi.xml.XmlFile;
|
||||
import com.intellij.refactoring.rename.PsiElementRenameHandler;
|
||||
import com.intellij.util.containers.ContainerUtil;
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
import org.jetbrains.annotations.Nullable;
|
||||
|
||||
@@ -73,7 +72,7 @@ public final class AntRenameHandler extends PsiElementRenameHandler {
|
||||
return null;
|
||||
}
|
||||
final Collection<PsiElement> candidates = TargetElementUtil.getInstance().getTargetCandidates(reference);
|
||||
return ContainerUtil.toArray(candidates, new PsiElement[candidates.size()]);
|
||||
return candidates.toArray(PsiElement.EMPTY_ARRAY);
|
||||
}
|
||||
catch (IndexNotReadyException e) {
|
||||
return null;
|
||||
|
||||
+1
-2
@@ -2,12 +2,11 @@
|
||||
package org.jetbrains.plugins.groovy.lang.resolve
|
||||
|
||||
import com.intellij.psi.scope.PsiScopeProcessor
|
||||
import com.intellij.util.containers.ContainerUtil.toArray
|
||||
import org.jetbrains.plugins.groovy.lang.psi.api.GroovyResolveResult
|
||||
|
||||
interface GrResolverProcessor<out T : GroovyResolveResult> : PsiScopeProcessor {
|
||||
|
||||
val results: List<T>
|
||||
|
||||
val resultsArray: Array<GroovyResolveResult> get() = toArray(results, GroovyResolveResult.EMPTY_ARRAY)
|
||||
val resultsArray: Array<GroovyResolveResult> get() = if (results.isEmpty()) GroovyResolveResult.EMPTY_ARRAY else results.toTypedArray()
|
||||
}
|
||||
|
||||
@@ -8,7 +8,6 @@ import com.intellij.psi.NonClasspathClassFinder
|
||||
import com.intellij.psi.PsiPackage
|
||||
import com.intellij.psi.impl.file.PsiPackageImpl
|
||||
import com.intellij.psi.search.GlobalSearchScope
|
||||
import com.intellij.util.containers.ContainerUtil
|
||||
import org.jetbrains.plugins.groovy.GroovyFileType
|
||||
|
||||
class BundledGroovyClassFinder(project: Project) : NonClasspathClassFinder(project, GroovyFileType.DEFAULT_EXTENSION) {
|
||||
@@ -26,6 +25,6 @@ class BundledGroovyClassFinder(project: Project) : NonClasspathClassFinder(proje
|
||||
val subPackageFqn = getQualifiedName(pkgName, name)
|
||||
PsiPackageImpl(psiManager, subPackageFqn)
|
||||
}
|
||||
return ContainerUtil.toArray(packages, PsiPackage.EMPTY_ARRAY)
|
||||
return if (packages.isEmpty()) PsiPackage.EMPTY_ARRAY else packages.toTypedArray()
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user