From 944cd16146372cf76835bb557010388068857582 Mon Sep 17 00:00:00 2001 From: Alexey Kudravtsev Date: Thu, 17 Feb 2011 20:48:52 +0300 Subject: [PATCH] cleanup --- .../com/intellij/psi/impl/light/LightModifierList.java | 3 ++- .../com/intellij/facet/frameworks/beans/ArtifactItem.java | 7 ++++--- .../intellij/ide/util/AbstractTreeClassChooserDialog.java | 6 +++--- .../src/com/intellij/ui/components/JBScrollPane.java | 3 ++- .../jetbrains/android/compiler/AndroidCompileUtil.java | 3 ++- .../jetbrains/android/compiler/AndroidDexCompiler.java | 4 +++- .../jetbrains/android/facet/AndroidFacetEditorTab.java | 2 +- .../com/intellij/lang/ant/dom/AntDomRefIdConverter.java | 2 +- .../idea/eclipse/EclipseLibrariesModificationsTest.java | 3 ++- .../src/git4idea/checkin/GitCheckinEnvironment.java | 3 ++- plugins/git4idea/src/git4idea/config/GitVcsSettings.java | 3 ++- .../src/git4idea/history/browser/ChangesFilter.java | 2 +- .../src/git4idea/history/browser/LowLevelAccessImpl.java | 5 +++-- .../history/wholeTree/GitCommitToCommitConvertor.java | 3 ++- plugins/git4idea/src/git4idea/rebase/GitRebaseEntry.java | 2 +- .../plugins/github/ui/GithubCloneProjectPane.java | 3 ++- .../psi/api/statements/GrNamedArgumentSearchVisitor.java | 2 +- .../statements/expressions/GrPropertyForCompletion.java | 3 ++- .../refactorings/introduce/IntroducePropertyDialog.java | 3 ++- .../idea/maven/services/MavenServicesManager.java | 3 ++- .../idea/maven/utils/MavenGotoFileContributor.java | 3 ++- .../idea/maven/project/MavenProjectReaderTest.java | 3 ++- .../intellij/plugins/relaxNG/GotoSymbolContributor.java | 3 ++- .../org/intellij/plugins/relaxNG/convert/IdeaDriver.java | 7 ++++--- .../referenceContributor/TestNGDataProviderTest.java | 3 ++- .../intellij/util/dom/generator/MergingFileManager.java | 8 +++++--- .../src/com/intellij/util/dom/generator/ModelGen.java | 3 ++- 27 files changed, 59 insertions(+), 36 deletions(-) diff --git a/java/java-impl/src/com/intellij/psi/impl/light/LightModifierList.java b/java/java-impl/src/com/intellij/psi/impl/light/LightModifierList.java index cb95a7dc0e81..22471dd6d98f 100644 --- a/java/java-impl/src/com/intellij/psi/impl/light/LightModifierList.java +++ b/java/java-impl/src/com/intellij/psi/impl/light/LightModifierList.java @@ -18,6 +18,7 @@ package com.intellij.psi.impl.light; import com.intellij.lang.Language; import com.intellij.lang.StdLanguages; import com.intellij.psi.*; +import com.intellij.util.ArrayUtil; import com.intellij.util.IncorrectOperationException; import com.intellij.util.containers.CollectionFactory; import org.jetbrains.annotations.NonNls; @@ -95,7 +96,7 @@ public class LightModifierList extends LightElement implements PsiModifierList{ } public String[] getModifiers() { - return myModifiers.toArray(new String[myModifiers.size()]); + return ArrayUtil.toStringArray(myModifiers); } } diff --git a/platform/lang-api/src/com/intellij/facet/frameworks/beans/ArtifactItem.java b/platform/lang-api/src/com/intellij/facet/frameworks/beans/ArtifactItem.java index 60b671e89eb4..0d801d79e80c 100644 --- a/platform/lang-api/src/com/intellij/facet/frameworks/beans/ArtifactItem.java +++ b/platform/lang-api/src/com/intellij/facet/frameworks/beans/ArtifactItem.java @@ -16,6 +16,7 @@ package com.intellij.facet.frameworks.beans; +import com.intellij.util.ArrayUtil; import com.intellij.util.Function; import com.intellij.util.containers.ContainerUtil; import com.intellij.util.xmlb.annotations.AbstractCollection; @@ -59,7 +60,7 @@ public class ArtifactItem { } public String[] getRequiredClasses() { - if (myRequiredClasses == null) return new String[0]; + if (myRequiredClasses == null) return ArrayUtil.EMPTY_STRING_ARRAY; final List classes = ContainerUtil.mapNotNull(myRequiredClasses, new Function() { @Override @@ -67,7 +68,7 @@ public class ArtifactItem { return requiredClass.getFqn(); } }); - - return classes.toArray(new String[classes.size()]); + + return ArrayUtil.toStringArray(classes); } } \ No newline at end of file diff --git a/platform/lang-impl/src/com/intellij/ide/util/AbstractTreeClassChooserDialog.java b/platform/lang-impl/src/com/intellij/ide/util/AbstractTreeClassChooserDialog.java index 7cba467074d9..756fdfdf9d9c 100644 --- a/platform/lang-impl/src/com/intellij/ide/util/AbstractTreeClassChooserDialog.java +++ b/platform/lang-impl/src/com/intellij/ide/util/AbstractTreeClassChooserDialog.java @@ -429,7 +429,7 @@ abstract public class AbstractTreeClassChooserDialog List classes = myTreeClassChooserDialog.getClassesByName(name, checkBoxState, pattern, myTreeClassChooserDialog.getScope()); if (classes.size() == 0) return ArrayUtil.EMPTY_OBJECT_ARRAY; if (classes.size() == 1) { - return isAccepted(classes.get(0)) ? classes.toArray(new Object[classes.size()]) : ArrayUtil.EMPTY_OBJECT_ARRAY; + return isAccepted(classes.get(0)) ? ArrayUtil.toObjectArray(classes) : ArrayUtil.EMPTY_OBJECT_ARRAY; } List list = new ArrayList(classes.size()); for (T aClass : classes) { @@ -437,7 +437,7 @@ abstract public class AbstractTreeClassChooserDialog list.add(aClass); } } - return list.toArray(new Object[list.size()]); + return ArrayUtil.toObjectArray(list); } @Nullable @@ -530,7 +530,7 @@ abstract public class AbstractTreeClassChooserDialog myInheritorsProvider.getBaseClass().getName() != null) { names.add(myInheritorsProvider.getBaseClass().getName()); } - return names.toArray(new String[names.size()]); + return ArrayUtil.toStringArray(names); } diff --git a/platform/platform-api/src/com/intellij/ui/components/JBScrollPane.java b/platform/platform-api/src/com/intellij/ui/components/JBScrollPane.java index 43a5d7aa2b3b..5d5e8dd98731 100644 --- a/platform/platform-api/src/com/intellij/ui/components/JBScrollPane.java +++ b/platform/platform-api/src/com/intellij/ui/components/JBScrollPane.java @@ -17,6 +17,7 @@ package com.intellij.ui.components; import com.intellij.openapi.wm.IdeGlassPane; import com.intellij.ui.IdeBorderFactory; +import com.intellij.util.ArrayUtil; import com.intellij.util.ui.ButtonlessScrollBarUI; import javax.swing.*; @@ -103,7 +104,7 @@ public class JBScrollPane extends JScrollPane { if (ui instanceof BasicScrollBarUI) { BasicScrollBarUI bui = (BasicScrollBarUI)ui; try { - Method m = BasicScrollBarUI.class.getDeclaredMethod("getThumbBounds", new Class[0]); + Method m = BasicScrollBarUI.class.getDeclaredMethod("getThumbBounds", ArrayUtil.EMPTY_CLASS_ARRAY); m.setAccessible(true); Rectangle rect = (Rectangle)m.invoke(bui); Point point = SwingUtilities.convertPoint(e.getComponent(), e.getX(), e.getY(), bar); diff --git a/plugins/android/src/org/jetbrains/android/compiler/AndroidCompileUtil.java b/plugins/android/src/org/jetbrains/android/compiler/AndroidCompileUtil.java index ef6be3941ba6..c7667409944e 100644 --- a/plugins/android/src/org/jetbrains/android/compiler/AndroidCompileUtil.java +++ b/plugins/android/src/org/jetbrains/android/compiler/AndroidCompileUtil.java @@ -39,6 +39,7 @@ import com.intellij.psi.JavaPsiFacade; import com.intellij.psi.PsiClass; import com.intellij.psi.PsiFile; import com.intellij.psi.search.GlobalSearchScope; +import com.intellij.util.ArrayUtil; import com.intellij.util.containers.HashSet; import org.jetbrains.android.facet.AndroidFacet; import org.jetbrains.android.util.AndroidUtils; @@ -337,6 +338,6 @@ public class AndroidCompileUtil { result.add(depResourceDir.getPath()); } } - return result.toArray(new String[result.size()]); + return ArrayUtil.toStringArray(result); } } diff --git a/plugins/android/src/org/jetbrains/android/compiler/AndroidDexCompiler.java b/plugins/android/src/org/jetbrains/android/compiler/AndroidDexCompiler.java index aa1e56510a62..ae9122f5b12d 100644 --- a/plugins/android/src/org/jetbrains/android/compiler/AndroidDexCompiler.java +++ b/plugins/android/src/org/jetbrains/android/compiler/AndroidDexCompiler.java @@ -31,6 +31,7 @@ import com.intellij.openapi.util.Computable; import com.intellij.openapi.util.io.FileUtil; import com.intellij.openapi.vfs.LocalFileSystem; import com.intellij.openapi.vfs.VirtualFile; +import com.intellij.util.ArrayUtil; import com.intellij.util.containers.HashSet; import org.jetbrains.android.compiler.tools.AndroidDx1; import org.jetbrains.android.dom.manifest.Manifest; @@ -285,7 +286,8 @@ public class AndroidDexCompiler implements ClassPostProcessingCompiler { }*/ Map> messages = - dxTool.execute(dexItem.myModule, dexItem.myAndroidTarget, outputDirPath, files, dexItem.myExcludedFiles.toArray(new String[dexItem.myExcludedFiles.size()])); + dxTool.execute(dexItem.myModule, dexItem.myAndroidTarget, outputDirPath, files, + ArrayUtil.toStringArray(dexItem.myExcludedFiles)); addMessages(messages); if (messages.get(CompilerMessageCategory.ERROR).isEmpty()) { results.add(dexItem); diff --git a/plugins/android/src/org/jetbrains/android/facet/AndroidFacetEditorTab.java b/plugins/android/src/org/jetbrains/android/facet/AndroidFacetEditorTab.java index 99ef1974899a..899772277c95 100644 --- a/plugins/android/src/org/jetbrains/android/facet/AndroidFacetEditorTab.java +++ b/plugins/android/src/org/jetbrains/android/facet/AndroidFacetEditorTab.java @@ -280,7 +280,7 @@ public class AndroidFacetEditorTab extends FacetEditorTab { result.add(FileUtil.toSystemDependentName(buildDirectory + '/' + AndroidFacet.getApkName(module))); } } - return result.toArray(new String[result.size()]); + return ArrayUtil.toStringArray(result); } private boolean isUnderModuleDir(VirtualFile vFile) { diff --git a/plugins/ant/src/com/intellij/lang/ant/dom/AntDomRefIdConverter.java b/plugins/ant/src/com/intellij/lang/ant/dom/AntDomRefIdConverter.java index f67b68bfa070..d0da497ef33e 100644 --- a/plugins/ant/src/com/intellij/lang/ant/dom/AntDomRefIdConverter.java +++ b/plugins/ant/src/com/intellij/lang/ant/dom/AntDomRefIdConverter.java @@ -80,7 +80,7 @@ public class AntDomRefIdConverter extends Converter implements Cu super.visitAntDomElement(element); } }); - return variants.size() > 0? variants.toArray(new Object[variants.size()]) : ArrayUtil.EMPTY_OBJECT_ARRAY; + return variants.size() > 0 ? ArrayUtil.toObjectArray(variants) : ArrayUtil.EMPTY_OBJECT_ARRAY; } public String getUnresolvedMessagePattern() { diff --git a/plugins/eclipse/testSources/org/jetbrains/idea/eclipse/EclipseLibrariesModificationsTest.java b/plugins/eclipse/testSources/org/jetbrains/idea/eclipse/EclipseLibrariesModificationsTest.java index fb20fa5c9126..05dfc5829a4b 100644 --- a/plugins/eclipse/testSources/org/jetbrains/idea/eclipse/EclipseLibrariesModificationsTest.java +++ b/plugins/eclipse/testSources/org/jetbrains/idea/eclipse/EclipseLibrariesModificationsTest.java @@ -30,6 +30,7 @@ import com.intellij.openapi.roots.OrderRootType; import com.intellij.openapi.roots.libraries.Library; import com.intellij.openapi.vfs.JarFileSystem; import com.intellij.openapi.vfs.VirtualFileManager; +import com.intellij.util.ArrayUtil; public class EclipseLibrariesModificationsTest extends EclipseVarsTest { @@ -78,7 +79,7 @@ public class EclipseLibrariesModificationsTest extends EclipseVarsTest { } public void testReplacedExistingWithVariablesCantReplaceSrc() throws Exception { - doTestExisting(new String[]{"/variableidea/test.jar!/"}, new String[]{"/srcvariableidea1/test.jar!/"}, new String[0]); + doTestExisting(new String[]{"/variableidea/test.jar!/"}, new String[]{"/srcvariableidea1/test.jar!/"}, ArrayUtil.EMPTY_STRING_ARRAY); } public void testReplacedExistingWithMultipleJavadocs() throws Exception { diff --git a/plugins/git4idea/src/git4idea/checkin/GitCheckinEnvironment.java b/plugins/git4idea/src/git4idea/checkin/GitCheckinEnvironment.java index 853d27110c6b..fa3b44d163c0 100644 --- a/plugins/git4idea/src/git4idea/checkin/GitCheckinEnvironment.java +++ b/plugins/git4idea/src/git4idea/checkin/GitCheckinEnvironment.java @@ -31,6 +31,7 @@ import com.intellij.openapi.vcs.checkin.CheckinEnvironment; import com.intellij.openapi.vcs.ui.RefreshableOnComponent; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.ui.GuiUtils; +import com.intellij.util.ArrayUtil; import com.intellij.util.NullableFunction; import com.intellij.util.PairConsumer; import com.intellij.util.containers.ContainerUtil; @@ -581,7 +582,7 @@ public class GitCheckinEnvironment implements CheckinEnvironment { final List authors = usersList == null ? new ArrayList() : new ArrayList(usersList); ContainerUtil.addAll(authors, mySettings.getCommitAuthors()); Collections.sort(authors); - myAuthor = new JComboBox(authors.toArray(new Object[authors.size()])); + myAuthor = new JComboBox(ArrayUtil.toObjectArray(authors)); myAuthor.insertItemAt("", 0); myAuthor.setSelectedItem(""); myAuthor.setEditable(true); diff --git a/plugins/git4idea/src/git4idea/config/GitVcsSettings.java b/plugins/git4idea/src/git4idea/config/GitVcsSettings.java index 8b3e6ff5c8b5..16739b22186e 100644 --- a/plugins/git4idea/src/git4idea/config/GitVcsSettings.java +++ b/plugins/git4idea/src/git4idea/config/GitVcsSettings.java @@ -20,6 +20,7 @@ import com.intellij.openapi.components.PersistentStateComponent; import com.intellij.openapi.components.State; import com.intellij.openapi.components.Storage; import com.intellij.openapi.project.Project; +import com.intellij.util.ArrayUtil; import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -156,7 +157,7 @@ public class GitVcsSettings implements PersistentStateComponent repos) { - mySelectRepositoryComboBox.setModel(new DefaultComboBoxModel(repos.toArray(new Object[repos.size()]))); + mySelectRepositoryComboBox.setModel(new DefaultComboBoxModel(ArrayUtil.toObjectArray(repos))); final RepositoryInfo preselectedRepository = (RepositoryInfo)mySelectRepositoryComboBox.getSelectedItem(); if (preselectedRepository != null) { myProjectNameText.setText(preselectedRepository.getName()); diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/api/statements/GrNamedArgumentSearchVisitor.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/api/statements/GrNamedArgumentSearchVisitor.java index e28caa8e0bc0..b4365439ad42 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/api/statements/GrNamedArgumentSearchVisitor.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/api/statements/GrNamedArgumentSearchVisitor.java @@ -45,7 +45,7 @@ public class GrNamedArgumentSearchVisitor extends GroovyRecursiveElementVisitor } public String[] getResult() { - return myResult == null ? ArrayUtil.EMPTY_STRING_ARRAY : myResult.toArray(new String[myResult.size()]); + return myResult == null ? ArrayUtil.EMPTY_STRING_ARRAY : ArrayUtil.toStringArray(myResult); } private void extractArguments(GrArgumentList argumentList) { diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/expressions/GrPropertyForCompletion.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/expressions/GrPropertyForCompletion.java index 8dd8f1d1f3db..a4c859aa59ad 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/expressions/GrPropertyForCompletion.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/expressions/GrPropertyForCompletion.java @@ -19,6 +19,7 @@ import com.intellij.psi.PsiElement; import com.intellij.psi.PsiMethod; import com.intellij.psi.PsiType; import com.intellij.psi.impl.light.LightFieldBuilder; +import com.intellij.util.ArrayUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.plugins.groovy.GroovyIcons; import org.jetbrains.plugins.groovy.lang.psi.api.auxiliary.modifiers.GrModifier; @@ -41,7 +42,7 @@ public class GrPropertyForCompletion extends LightFieldBuilder { if (method.hasModifierProperty(GrModifier.STATIC)) modifiers.add(GrModifier.STATIC); setContainingClass(method.getContainingClass()); - setModifiers(modifiers.toArray(new String[modifiers.size()])); + setModifiers(ArrayUtil.toStringArray(modifiers)); setBaseIcon(GroovyIcons.PROPERTY); } diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/refactorings/introduce/IntroducePropertyDialog.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/refactorings/introduce/IntroducePropertyDialog.java index 38554ca98c37..f5ccaf74f88b 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/refactorings/introduce/IntroducePropertyDialog.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/refactorings/introduce/IntroducePropertyDialog.java @@ -24,6 +24,7 @@ import com.intellij.psi.util.PsiTreeUtil; import com.intellij.psi.xml.XmlElement; import com.intellij.psi.xml.XmlTag; import com.intellij.refactoring.ui.NameSuggestionsField; +import com.intellij.util.ArrayUtil; import com.intellij.util.Function; import com.intellij.util.StringLenComparator; import com.intellij.util.xml.DomElement; @@ -164,7 +165,7 @@ public class IntroducePropertyDialog extends DialogWrapper { result = new ArrayList(result); Collections.sort((List)result, CodeStyleSettingsManager.getSettings(myProject).PREFER_LONGER_NAMES ? StringLenComparator.getDescendingInstance() : StringLenComparator.getInstance()); - return result.toArray(new String[result.size()]); + return ArrayUtil.toStringArray(result); } private static String joinWords(@NotNull String s, @NotNull String delimiter) { diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/services/MavenServicesManager.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/services/MavenServicesManager.java index a511e103b6de..8a877e1c2bf6 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/services/MavenServicesManager.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/services/MavenServicesManager.java @@ -20,6 +20,7 @@ import com.intellij.openapi.components.ServiceManager; import com.intellij.openapi.components.State; import com.intellij.openapi.components.Storage; import com.intellij.openapi.util.text.StringUtil; +import com.intellij.util.ArrayUtil; import org.jdom.Element; import java.util.ArrayList; @@ -43,7 +44,7 @@ public class MavenServicesManager implements PersistentStateComponent { public static String[] getServiceUrls() { final List configured = getInstance().getUrls(); - if (!configured.isEmpty()) return configured.toArray(new String[configured.size()]); + if (!configured.isEmpty()) return ArrayUtil.toStringArray(configured); return new String[]{ "http://oss.sonatype.org/service/local/", "http://repo.jfrog.org/artifactory/api/", diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/utils/MavenGotoFileContributor.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/utils/MavenGotoFileContributor.java index 5fb43df0b448..de916d861d3e 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/utils/MavenGotoFileContributor.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/utils/MavenGotoFileContributor.java @@ -20,6 +20,7 @@ import com.intellij.navigation.NavigationItem; import com.intellij.openapi.project.Project; import com.intellij.psi.PsiFile; import com.intellij.psi.PsiManager; +import com.intellij.util.ArrayUtil; import org.jetbrains.idea.maven.project.MavenProject; import org.jetbrains.idea.maven.project.MavenProjectsManager; @@ -34,7 +35,7 @@ public class MavenGotoFileContributor implements ChooseByNameContributor { result.add(each.getMavenId().getArtifactId()); } - return result.toArray(new String[result.size()]); + return ArrayUtil.toStringArray(result); } public NavigationItem[] getItemsByName(String name, String pattern, Project project, boolean includeNonProjectItems) { diff --git a/plugins/maven/src/test/java/org/jetbrains/idea/maven/project/MavenProjectReaderTest.java b/plugins/maven/src/test/java/org/jetbrains/idea/maven/project/MavenProjectReaderTest.java index 0dc1ddd53958..9a180d612115 100644 --- a/plugins/maven/src/test/java/org/jetbrains/idea/maven/project/MavenProjectReaderTest.java +++ b/plugins/maven/src/test/java/org/jetbrains/idea/maven/project/MavenProjectReaderTest.java @@ -22,6 +22,7 @@ import com.intellij.openapi.util.SystemInfo; import com.intellij.openapi.util.io.FileUtil; import com.intellij.openapi.vfs.VfsUtil; import com.intellij.openapi.vfs.VirtualFile; +import com.intellij.util.ArrayUtil; import com.intellij.util.Function; import com.intellij.util.containers.ContainerUtil; import org.jetbrains.idea.maven.MavenTestCase; @@ -1593,7 +1594,7 @@ public class MavenProjectReaderTest extends MavenTestCase { private void assertActiveProfiles(List explicitProfiles, String... expected) { MavenProjectReaderResult result = - readProject(myProjectPom, new NullProjectLocator(), explicitProfiles.toArray(new String[explicitProfiles.size()])); + readProject(myProjectPom, new NullProjectLocator(), ArrayUtil.toStringArray(explicitProfiles)); assertUnorderedElementsAreEqual(result.activatedProfiles, expected); } diff --git a/plugins/relaxng/src/org/intellij/plugins/relaxNG/GotoSymbolContributor.java b/plugins/relaxng/src/org/intellij/plugins/relaxNG/GotoSymbolContributor.java index 0a9b345dd1b8..a267bcea18b3 100644 --- a/plugins/relaxng/src/org/intellij/plugins/relaxNG/GotoSymbolContributor.java +++ b/plugins/relaxng/src/org/intellij/plugins/relaxNG/GotoSymbolContributor.java @@ -19,6 +19,7 @@ package org.intellij.plugins.relaxNG; import com.intellij.navigation.ChooseByNameContributor; import com.intellij.navigation.NavigationItem; import com.intellij.openapi.project.Project; +import com.intellij.util.ArrayUtil; import org.intellij.plugins.relaxNG.model.resolve.RelaxSymbolIndex; import java.util.Collection; @@ -36,6 +37,6 @@ public class GotoSymbolContributor implements ChooseByNameContributor { public String[] getNames(Project project, boolean includeNonProjectItems) { final Collection names = RelaxSymbolIndex.getSymbolNames(project); - return names.toArray(new String[names.size()]); + return ArrayUtil.toStringArray(names); } } \ No newline at end of file diff --git a/plugins/relaxng/src/org/intellij/plugins/relaxNG/convert/IdeaDriver.java b/plugins/relaxng/src/org/intellij/plugins/relaxNG/convert/IdeaDriver.java index dd3fecede1a6..5d760e6b52fa 100644 --- a/plugins/relaxng/src/org/intellij/plugins/relaxNG/convert/IdeaDriver.java +++ b/plugins/relaxng/src/org/intellij/plugins/relaxNG/convert/IdeaDriver.java @@ -20,6 +20,7 @@ import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.project.Project; import com.intellij.openapi.ui.Messages; import com.intellij.openapi.vfs.VirtualFile; +import com.intellij.util.ArrayUtil; import com.thaiopensource.relaxng.edit.SchemaCollection; import com.thaiopensource.relaxng.input.InputFailedException; import com.thaiopensource.relaxng.input.InputFormat; @@ -103,9 +104,9 @@ public class IdeaDriver { for (int i = 0; i < inputFiles.length; i++) { uris[i] = UriOrFile.toUri(inputFiles[i].getPath()); } - sc = format.load(uris, inputParams.toArray(new String[inputParams.size()]), outputType, errorHandler); + sc = format.load(uris, ArrayUtil.toStringArray(inputParams), outputType, errorHandler); } else { - sc = inFormat.load(uri, inputParams.toArray(new String[inputParams.size()]), outputType, errorHandler); + sc = inFormat.load(uri, ArrayUtil.toStringArray(inputParams), outputType, errorHandler); } } catch (IOException e) { errorHandler.fatalError(new SAXParseException(e.getMessage(), null, uri, -1, -1, e)); @@ -150,7 +151,7 @@ public class IdeaDriver { final OutputFormat of = getOutputFormat(settings.getOutputType()); - of.output(sc, od, outputParams.toArray(new String[outputParams.size()]), inputType.toString().toLowerCase(), errorHandler); + of.output(sc, od, ArrayUtil.toStringArray(outputParams), inputType.toString().toLowerCase(), errorHandler); } catch (IOException e) { errorHandler.fatalError(new SAXParseException(e.getMessage(), null, UriOrFile.fileToUri(outputFile), -1, -1, e)); } diff --git a/plugins/testng/testSources/com/theoryinpractice/testng/referenceContributor/TestNGDataProviderTest.java b/plugins/testng/testSources/com/theoryinpractice/testng/referenceContributor/TestNGDataProviderTest.java index d7a8e582ef2c..53b4f44505b6 100644 --- a/plugins/testng/testSources/com/theoryinpractice/testng/referenceContributor/TestNGDataProviderTest.java +++ b/plugins/testng/testSources/com/theoryinpractice/testng/referenceContributor/TestNGDataProviderTest.java @@ -17,6 +17,7 @@ package com.theoryinpractice.testng.referenceContributor; import com.intellij.openapi.application.PluginPathManager; import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase; +import com.intellij.util.ArrayUtil; import com.intellij.util.ui.UIUtil; import org.testng.annotations.*; @@ -62,7 +63,7 @@ public class TestNGDataProviderTest extends LightCodeInsightFixtureTestCase { public Object[][] data() { return new Object[][]{ new Object[]{"private", new String[]{"data"}}, - new Object[]{"privateinsuper", new String[0]}, + new Object[]{"privateinsuper", ArrayUtil.EMPTY_STRING_ARRAY}, new Object[]{"protectedinsuper", new String[]{"data"}}, new Object[]{"privateindataproviderclass", new String[]{"data"}}, }; diff --git a/xml/dom-impl/src/com/intellij/util/dom/generator/MergingFileManager.java b/xml/dom-impl/src/com/intellij/util/dom/generator/MergingFileManager.java index d8236041964f..ac2ea3179d9b 100644 --- a/xml/dom-impl/src/com/intellij/util/dom/generator/MergingFileManager.java +++ b/xml/dom-impl/src/com/intellij/util/dom/generator/MergingFileManager.java @@ -22,6 +22,8 @@ */ package com.intellij.util.dom.generator; +import com.intellij.util.ArrayUtil; + import java.io.*; import java.util.ArrayList; import java.util.Arrays; @@ -129,7 +131,7 @@ public class MergingFileManager implements FileManager { prevIdx++; } } - String[] mergedLines = merged.toArray(new String[merged.size()]); + String[] mergedLines = ArrayUtil.toStringArray(merged); if (compareLines(mergedLines, prevLines, 2) == 0) { return prevLines; } else if (compareLines(mergedLines, curLines, 2) == 0) { @@ -221,7 +223,7 @@ public class MergingFileManager implements FileManager { private static String[] loadFile(File f1) { - if (!f1.exists()) return new String[0]; + if (!f1.exists()) return ArrayUtil.EMPTY_STRING_ARRAY; ArrayList list = new ArrayList(); BufferedReader in = null; try { @@ -240,7 +242,7 @@ public class MergingFileManager implements FileManager { } } } - return list.toArray(new String[list.size()]); + return ArrayUtil.toStringArray(list); } } diff --git a/xml/dom-impl/src/com/intellij/util/dom/generator/ModelGen.java b/xml/dom-impl/src/com/intellij/util/dom/generator/ModelGen.java index f3e53d6cdd9c..e5625b3f3c13 100644 --- a/xml/dom-impl/src/com/intellij/util/dom/generator/ModelGen.java +++ b/xml/dom-impl/src/com/intellij/util/dom/generator/ModelGen.java @@ -15,6 +15,7 @@ */ package com.intellij.util.dom.generator; +import com.intellij.util.ArrayUtil; import com.intellij.util.containers.ContainerUtil; import org.apache.xerces.xni.XMLResourceIdentifier; import org.apache.xerces.xni.XNIException; @@ -133,7 +134,7 @@ public class ModelGen { if (packageS != null) nsDesc.pkgName = packageS; if (packageEnumS != null) nsDesc.enumPkg = packageEnumS; if (interfaces != null) nsDesc.intfs = interfaces; - if (!list.isEmpty()) nsDesc.pkgNames = list.toArray(new String[list.size()]); + if (!list.isEmpty()) nsDesc.pkgNames = ArrayUtil.toStringArray(list); if (name.length() == 0) def = nsDesc; model.nsdMap.put(name, nsDesc); }