diff --git a/RegExpSupport/src/org/intellij/lang/regexp/psi/impl/RegExpPropertyImpl.java b/RegExpSupport/src/org/intellij/lang/regexp/psi/impl/RegExpPropertyImpl.java index 6cb87dccc707..b4b9cfe87dd1 100644 --- a/RegExpSupport/src/org/intellij/lang/regexp/psi/impl/RegExpPropertyImpl.java +++ b/RegExpSupport/src/org/intellij/lang/regexp/psi/impl/RegExpPropertyImpl.java @@ -22,6 +22,7 @@ import com.intellij.lang.ASTNode; import com.intellij.openapi.util.TextRange; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiReference; +import com.intellij.util.ArrayUtil; import com.intellij.util.Icons; import com.intellij.util.IncorrectOperationException; import org.jetbrains.annotations.Nullable; @@ -188,7 +189,7 @@ public class RegExpPropertyImpl extends RegExpElementImpl implements RegExpPrope } } } - UNICODE_BLOCKS = unicodeBlocks.toArray(new String[unicodeBlocks.size()]); + UNICODE_BLOCKS = ArrayUtil.toStringArray(unicodeBlocks); } public static final String[][] PROPERTY_NAMES = { { "Cn", "UNASSIGNED" }, diff --git a/RegExpSupport/test/test/RegExpCompletionTest.java b/RegExpSupport/test/test/RegExpCompletionTest.java index d0b0a2e2c7e1..c58c1ab94282 100644 --- a/RegExpSupport/test/test/RegExpCompletionTest.java +++ b/RegExpSupport/test/test/RegExpCompletionTest.java @@ -17,6 +17,7 @@ package test; import com.intellij.openapi.application.PathManager; import com.intellij.testFramework.fixtures.CodeInsightFixtureTestCase; +import com.intellij.util.ArrayUtil; import org.intellij.lang.regexp.psi.impl.RegExpPropertyImpl; import java.io.File; @@ -54,7 +55,7 @@ public class RegExpCompletionTest extends CodeInsightFixtureTestCase { for (String[] stringArray : RegExpPropertyImpl.PROPERTY_NAMES) { nameList.add("p{" + stringArray[0] + "}"); } - myFixture.testCompletionVariants(getInputDataFileName(getTestName(true)), nameList.toArray(new String[nameList.size()])); + myFixture.testCompletionVariants(getInputDataFileName(getTestName(true)), ArrayUtil.toStringArray(nameList)); } public void testPropertyVariants() throws Throwable { @@ -62,7 +63,7 @@ public class RegExpCompletionTest extends CodeInsightFixtureTestCase { for (String[] stringArray : RegExpPropertyImpl.PROPERTY_NAMES) { nameList.add("{" + stringArray[0] + "}"); } - myFixture.testCompletionVariants(getInputDataFileName(getTestName(true)), nameList.toArray(new String[nameList.size()])); + myFixture.testCompletionVariants(getInputDataFileName(getTestName(true)), ArrayUtil.toStringArray(nameList)); } public void testPropertyAlpha() throws Throwable { diff --git a/java/compiler/impl/src/com/intellij/compiler/RmicSettings.java b/java/compiler/impl/src/com/intellij/compiler/RmicSettings.java index 244e4b68b506..adc68d0b3e93 100644 --- a/java/compiler/impl/src/com/intellij/compiler/RmicSettings.java +++ b/java/compiler/impl/src/com/intellij/compiler/RmicSettings.java @@ -21,6 +21,7 @@ import com.intellij.openapi.project.Project; import com.intellij.openapi.util.DefaultJDOMExternalizer; import com.intellij.openapi.util.InvalidDataException; import com.intellij.openapi.util.WriteExternalException; +import com.intellij.util.ArrayUtil; import org.jdom.Element; import org.jetbrains.annotations.NonNls; @@ -91,7 +92,7 @@ public class RmicSettings implements PersistentStateComponent { } options.add(token); } - return options.toArray(new String[options.size()]); + return ArrayUtil.toStringArray(options); } public static RmicSettings getInstance(Project project) { diff --git a/java/compiler/impl/src/com/intellij/compiler/ant/PropertyFileGeneratorImpl.java b/java/compiler/impl/src/com/intellij/compiler/ant/PropertyFileGeneratorImpl.java index e83ae3bdd6aa..ab93b32dbe35 100644 --- a/java/compiler/impl/src/com/intellij/compiler/ant/PropertyFileGeneratorImpl.java +++ b/java/compiler/impl/src/com/intellij/compiler/ant/PropertyFileGeneratorImpl.java @@ -22,6 +22,7 @@ import com.intellij.openapi.projectRoots.Sdk; import com.intellij.openapi.util.Pair; import com.intellij.openapi.util.text.StringUtil; import com.intellij.openapi.vfs.VfsUtil; +import com.intellij.util.ArrayUtil; import java.io.File; import java.io.IOException; @@ -54,7 +55,7 @@ public class PropertyFileGeneratorImpl extends PropertyFileGenerator { final PathMacros pathMacros = PathMacros.getInstance(); final Set macroNamesSet = pathMacros.getUserMacroNames(); if (macroNamesSet.size() > 0) { - final String[] macroNames = macroNamesSet.toArray(new String[macroNamesSet.size()]); + final String[] macroNames = ArrayUtil.toStringArray(macroNamesSet); Arrays.sort(macroNames); for (final String macroName : macroNames) { addProperty(BuildProperties.getPathMacroProperty(macroName), pathMacros.getValue(macroName)); diff --git a/java/compiler/impl/src/com/intellij/compiler/impl/rmiCompiler/RmicCompiler.java b/java/compiler/impl/src/com/intellij/compiler/impl/rmiCompiler/RmicCompiler.java index 9df8e1541241..7f468f2d3da1 100644 --- a/java/compiler/impl/src/com/intellij/compiler/impl/rmiCompiler/RmicCompiler.java +++ b/java/compiler/impl/src/com/intellij/compiler/impl/rmiCompiler/RmicCompiler.java @@ -39,6 +39,7 @@ import com.intellij.openapi.util.io.FileUtil; import com.intellij.openapi.vfs.LocalFileSystem; import com.intellij.openapi.vfs.VfsUtil; import com.intellij.openapi.vfs.VirtualFile; +import com.intellij.util.ArrayUtil; import com.intellij.util.PathUtil; import com.intellij.util.StringBuilderSpinAllocator; import org.jetbrains.annotations.NonNls; @@ -301,7 +302,7 @@ public class RmicCompiler implements ClassPostProcessingCompiler{ for (RmicProcessingItem item : items) { commandLine.add(item.getClassQName()); } - return commandLine.toArray(new String[commandLine.size()]); + return ArrayUtil.toStringArray(commandLine); } @NotNull diff --git a/java/compiler/openapi/src/com/intellij/compiler/ant/ChunkBuildExtension.java b/java/compiler/openapi/src/com/intellij/compiler/ant/ChunkBuildExtension.java index 48bba0f43159..fb2592366f11 100644 --- a/java/compiler/openapi/src/com/intellij/compiler/ant/ChunkBuildExtension.java +++ b/java/compiler/openapi/src/com/intellij/compiler/ant/ChunkBuildExtension.java @@ -21,6 +21,7 @@ import com.intellij.openapi.extensions.ExtensionPointName; import com.intellij.openapi.extensions.Extensions; import com.intellij.openapi.module.Module; import com.intellij.openapi.project.Project; +import com.intellij.util.ArrayUtil; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; @@ -76,7 +77,7 @@ public abstract class ChunkBuildExtension { if (allTargets.isEmpty()) { allTargets.add(BuildProperties.getCompileTargetName(chunk.getName())); } - return allTargets.toArray(new String[allTargets.size()]); + return ArrayUtil.toStringArray(allTargets); } public static void process(CompositeGenerator generator, ModuleChunk chunk, GenerationOptions genOptions) { 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 7dba0984fba8..b26faef44ac0 100644 --- a/java/java-impl/src/com/intellij/codeInsight/completion/JavaCompletionUtil.java +++ b/java/java-impl/src/com/intellij/codeInsight/completion/JavaCompletionUtil.java @@ -270,7 +270,7 @@ public class JavaCompletionUtil { } - return result.toArray(new String[result.size()]); + return ArrayUtil.toStringArray(result); } private static void tunePreferencePolicy(final List list, final SuggestedNameInfo suggestedNameInfo) { @@ -319,7 +319,7 @@ public class JavaCompletionUtil { newSuggestions.add(suggestion); } } - return newSuggestions.toArray(new String[newSuggestions.size()]); + return ArrayUtil.toStringArray(newSuggestions); } static int getOverlap(final String propertyName, final String prefix) { diff --git a/java/java-impl/src/com/intellij/codeInsight/intention/impl/CreateFieldFromParameterAction.java b/java/java-impl/src/com/intellij/codeInsight/intention/impl/CreateFieldFromParameterAction.java index 724c7e531bb1..ccfb73a23796 100644 --- a/java/java-impl/src/com/intellij/codeInsight/intention/impl/CreateFieldFromParameterAction.java +++ b/java/java-impl/src/com/intellij/codeInsight/intention/impl/CreateFieldFromParameterAction.java @@ -35,6 +35,7 @@ import com.intellij.psi.codeStyle.VariableKind; import com.intellij.psi.search.LocalSearchScope; import com.intellij.psi.search.searches.ReferencesSearch; import com.intellij.psi.util.PsiTreeUtil; +import com.intellij.util.ArrayUtil; import com.intellij.util.IncorrectOperationException; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; @@ -151,7 +152,7 @@ public class CreateFieldFromParameterAction implements IntentionAction { else { namesList.add(0, defaultName); } - names = namesList.toArray(new String[namesList.size()]); + names = ArrayUtil.toStringArray(namesList); boolean myBeFinal = method.isConstructor(); CreateFieldFromParameterDialog dialog = new CreateFieldFromParameterDialog( diff --git a/java/java-impl/src/com/intellij/codeInsight/template/macro/SuggestVariableNameMacro.java b/java/java-impl/src/com/intellij/codeInsight/template/macro/SuggestVariableNameMacro.java index 9b38bcf9d35c..10cbf9420e20 100644 --- a/java/java-impl/src/com/intellij/codeInsight/template/macro/SuggestVariableNameMacro.java +++ b/java/java-impl/src/com/intellij/codeInsight/template/macro/SuggestVariableNameMacro.java @@ -27,6 +27,7 @@ import com.intellij.psi.PsiVariable; import java.util.Arrays; import java.util.LinkedList; +import com.intellij.util.ArrayUtil; import org.jetbrains.annotations.NotNull; public class SuggestVariableNameMacro implements Macro { @@ -88,7 +89,7 @@ public class SuggestVariableNameMacro implements Macro { } } - return (String[]) namesList.toArray(new String[namesList.size()]); + return (String[])ArrayUtil.toStringArray(namesList); } } diff --git a/java/java-impl/src/com/intellij/psi/impl/compiled/ClsStubBuilder.java b/java/java-impl/src/com/intellij/psi/impl/compiled/ClsStubBuilder.java index 7ee585d4867e..fbdcfd040a32 100644 --- a/java/java-impl/src/com/intellij/psi/impl/compiled/ClsStubBuilder.java +++ b/java/java-impl/src/com/intellij/psi/impl/compiled/ClsStubBuilder.java @@ -424,7 +424,7 @@ public class ClsStubBuilder { } if (parsedViaGenericSignature && throwables != null) { - return throwables.toArray(new String[throwables.size()]); + return ArrayUtil.toStringArray(throwables); } else { String[] converted = ArrayUtil.newStringArray(exceptions.length); diff --git a/java/java-impl/src/com/intellij/psi/impl/source/javadoc/PsiDocMethodOrFieldRef.java b/java/java-impl/src/com/intellij/psi/impl/source/javadoc/PsiDocMethodOrFieldRef.java index c6559dfd1a1e..0798658ad3c3 100644 --- a/java/java-impl/src/com/intellij/psi/impl/source/javadoc/PsiDocMethodOrFieldRef.java +++ b/java/java-impl/src/com/intellij/psi/impl/source/javadoc/PsiDocMethodOrFieldRef.java @@ -31,6 +31,7 @@ import com.intellij.psi.scope.PsiScopeProcessor; import com.intellij.psi.scope.processor.FilterScopeProcessor; import com.intellij.psi.util.PsiTreeUtil; import com.intellij.psi.util.TypeConversionUtil; +import com.intellij.util.ArrayUtil; import com.intellij.util.CharTable; import com.intellij.util.IncorrectOperationException; import com.intellij.util.SmartList; @@ -182,7 +183,7 @@ public class PsiDocMethodOrFieldRef extends CompositePsiElement implements PsiDo } } - return types.toArray(new String[types.size()]); + return ArrayUtil.toStringArray(types); } @Nullable diff --git a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/TrafficLightRenderer.java b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/TrafficLightRenderer.java index 0453391a9732..aa603832d71e 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/TrafficLightRenderer.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/TrafficLightRenderer.java @@ -28,6 +28,7 @@ import com.intellij.openapi.util.IconLoader; import com.intellij.openapi.util.text.StringUtil; import com.intellij.psi.PsiFile; import com.intellij.ui.LayeredIcon; +import com.intellij.util.ArrayUtil; import com.intellij.util.ui.EmptyIcon; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.Nullable; @@ -102,8 +103,8 @@ public class TrafficLightRenderer implements ErrorStripeRenderer { } } DaemonCodeAnalyzerStatus status = new DaemonCodeAnalyzerStatus(); - status.noInspectionRoots = noInspectionRoots.isEmpty() ? null : noInspectionRoots.toArray(new String[noInspectionRoots.size()]); - status.noHighlightingRoots = noHighlightingRoots.isEmpty() ? null : noHighlightingRoots.toArray(new String[noHighlightingRoots.size()]); + status.noInspectionRoots = noInspectionRoots.isEmpty() ? null : ArrayUtil.toStringArray(noInspectionRoots); + status.noHighlightingRoots = noHighlightingRoots.isEmpty() ? null : ArrayUtil.toStringArray(noHighlightingRoots); final SeverityRegistrar severityRegistrar = SeverityRegistrar.getInstance(myProject); status.errorCount = new int[severityRegistrar.getSeveritiesCount()]; diff --git a/platform/lang-impl/src/com/intellij/profile/codeInspection/ui/actions/AddScopeAction.java b/platform/lang-impl/src/com/intellij/profile/codeInspection/ui/actions/AddScopeAction.java index c6ac67f224f6..ccbf7926ae83 100644 --- a/platform/lang-impl/src/com/intellij/profile/codeInspection/ui/actions/AddScopeAction.java +++ b/platform/lang-impl/src/com/intellij/profile/codeInspection/ui/actions/AddScopeAction.java @@ -34,6 +34,7 @@ import com.intellij.profile.codeInspection.ui.InspectionConfigTreeNode; import com.intellij.psi.search.scope.packageSet.NamedScope; import com.intellij.psi.search.scope.packageSet.NamedScopesHolder; import com.intellij.ui.treeStructure.Tree; +import com.intellij.util.ArrayUtil; import com.intellij.util.Icons; import javax.swing.tree.DefaultTreeModel; @@ -77,8 +78,7 @@ public abstract class AddScopeAction extends AnAction { final InspectionProfileEntry tool = descriptor.getTool(); //copy final List availableScopes = getAvailableScopes(descriptor, project); - final int idx = Messages.showChooseDialog(myTree, "Scope:", "Choose Scope", - availableScopes.toArray(new String[availableScopes.size()]), availableScopes.get(0), Messages.getQuestionIcon()); + final int idx = Messages.showChooseDialog(myTree, "Scope:", "Choose Scope", ArrayUtil.toStringArray(availableScopes), availableScopes.get(0), Messages.getQuestionIcon()); if (idx == -1) return; final NamedScope chosenScope = NamedScopesHolder.getScope(project, availableScopes.get(idx)); final ScopeToolState scopeToolState = getSelectedProfile().addScope(tool, chosenScope, diff --git a/platform/lang-impl/src/com/intellij/refactoring/safeDelete/SafeDeleteProcessor.java b/platform/lang-impl/src/com/intellij/refactoring/safeDelete/SafeDeleteProcessor.java index 1180a8d798cd..6ff420c02420 100644 --- a/platform/lang-impl/src/com/intellij/refactoring/safeDelete/SafeDeleteProcessor.java +++ b/platform/lang-impl/src/com/intellij/refactoring/safeDelete/SafeDeleteProcessor.java @@ -43,6 +43,7 @@ import com.intellij.usageView.UsageInfo; import com.intellij.usageView.UsageViewDescriptor; import com.intellij.usageView.UsageViewUtil; import com.intellij.usages.*; +import com.intellij.util.ArrayUtil; import com.intellij.util.IncorrectOperationException; import com.intellij.util.Processor; import com.intellij.util.containers.HashMap; @@ -173,7 +174,7 @@ public class SafeDeleteProcessor extends BaseRefactoringProcessor { throw new ConflictsInTestsException(conflicts); } else { - UnsafeUsagesDialog dialog = new UnsafeUsagesDialog(conflicts.toArray(new String[conflicts.size()]), myProject); + UnsafeUsagesDialog dialog = new UnsafeUsagesDialog(ArrayUtil.toStringArray(conflicts), myProject); dialog.show(); if (!dialog.isOK()) { final int exitCode = dialog.getExitCode(); diff --git a/platform/lang-impl/src/com/intellij/refactoring/ui/ConflictsDialog.java b/platform/lang-impl/src/com/intellij/refactoring/ui/ConflictsDialog.java index 32778e1dcca5..7aac82f5272b 100644 --- a/platform/lang-impl/src/com/intellij/refactoring/ui/ConflictsDialog.java +++ b/platform/lang-impl/src/com/intellij/refactoring/ui/ConflictsDialog.java @@ -59,7 +59,7 @@ public class ConflictsDialog extends DialogWrapper{ for (String conflict : conflictDescriptions.values()) { conflicts.add(conflict); } - myConflictDescriptions = conflicts.toArray(new String[conflicts.size()]); + myConflictDescriptions = ArrayUtil.toStringArray(conflicts); myElementConflictDescription = conflictDescriptions; setTitle(RefactoringBundle.message("problems.detected.title")); setOKButtonText(RefactoringBundle.message("continue.button")); diff --git a/platform/lang-impl/src/com/intellij/ui/tabs/FileColorConfigurationEditDialog.java b/platform/lang-impl/src/com/intellij/ui/tabs/FileColorConfigurationEditDialog.java index 0e31bccfc52a..27c596f0a4a7 100644 --- a/platform/lang-impl/src/com/intellij/ui/tabs/FileColorConfigurationEditDialog.java +++ b/platform/lang-impl/src/com/intellij/ui/tabs/FileColorConfigurationEditDialog.java @@ -22,6 +22,7 @@ import com.intellij.openapi.ui.DialogWrapper; import com.intellij.psi.search.scope.packageSet.NamedScope; import com.intellij.psi.search.scope.packageSet.NamedScopeManager; import com.intellij.psi.search.scope.packageSet.NamedScopesHolder; +import com.intellij.util.ArrayUtil; import com.intellij.util.containers.HashMap; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -71,7 +72,7 @@ public class FileColorConfigurationEditDialog extends DialogWrapper { } } - myScopeComboBox = new JComboBox(scopeNames.toArray(new String[scopeNames.size()])); + myScopeComboBox = new JComboBox(ArrayUtil.toStringArray(scopeNames)); myScopeComboBox.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { updateOKButton(); diff --git a/platform/lang-impl/testSrc/com/intellij/dependencies/SearchCyclesTest.java b/platform/lang-impl/testSrc/com/intellij/dependencies/SearchCyclesTest.java index 5f099a8053ce..446b45909e99 100644 --- a/platform/lang-impl/testSrc/com/intellij/dependencies/SearchCyclesTest.java +++ b/platform/lang-impl/testSrc/com/intellij/dependencies/SearchCyclesTest.java @@ -151,7 +151,7 @@ public class SearchCyclesTest extends TestCase{ private static void checkResult(String[][] expected, Set> cycles){ assertEquals(expected.length, cycles.size()); for (List strings : cycles) { - assertTrue(findInMatrix(expected, strings.toArray(new String[strings.size()])) > -1); + assertTrue(findInMatrix(expected, ArrayUtil.toStringArray(strings)) > -1); } } diff --git a/platform/platform-api/src/com/intellij/openapi/fileChooser/FileSaverDescriptor.java b/platform/platform-api/src/com/intellij/openapi/fileChooser/FileSaverDescriptor.java index ebcf30238c78..a5b7fc9ac345 100644 --- a/platform/platform-api/src/com/intellij/openapi/fileChooser/FileSaverDescriptor.java +++ b/platform/platform-api/src/com/intellij/openapi/fileChooser/FileSaverDescriptor.java @@ -17,6 +17,7 @@ package com.intellij.openapi.fileChooser; import com.intellij.openapi.vfs.VirtualFile; +import com.intellij.util.ArrayUtil; import org.jetbrains.annotations.NotNull; import java.util.Arrays; @@ -61,6 +62,6 @@ public class FileSaverDescriptor extends FileChooserDescriptor implements Clonea * @return accepted file extentions */ public String[] getFileExtentions() { - return extentions.toArray(new String[extentions.size()]); + return ArrayUtil.toStringArray(extentions); } } diff --git a/platform/platform-api/src/com/intellij/openapi/fileTypes/NativeFileType.java b/platform/platform-api/src/com/intellij/openapi/fileTypes/NativeFileType.java index 3543d1f1e907..63054d33e92a 100644 --- a/platform/platform-api/src/com/intellij/openapi/fileTypes/NativeFileType.java +++ b/platform/platform-api/src/com/intellij/openapi/fileTypes/NativeFileType.java @@ -18,6 +18,7 @@ package com.intellij.openapi.fileTypes; import com.intellij.openapi.util.IconLoader; import com.intellij.openapi.util.SystemInfo; import com.intellij.openapi.vfs.VirtualFile; +import com.intellij.util.ArrayUtil; import org.jetbrains.annotations.NotNull; import javax.swing.*; @@ -86,7 +87,7 @@ public class NativeFileType implements FileType { } commands.add(file.getPath()); try { - Runtime.getRuntime().exec(commands.toArray(new String[commands.size()])); + Runtime.getRuntime().exec(ArrayUtil.toStringArray(commands)); } catch (IOException e) { return false; diff --git a/platform/platform-impl/src/com/intellij/openapi/vfs/impl/VirtualFilePointerContainerImpl.java b/platform/platform-impl/src/com/intellij/openapi/vfs/impl/VirtualFilePointerContainerImpl.java index 4d8c4ca8bfd0..e516be41d7a2 100644 --- a/platform/platform-impl/src/com/intellij/openapi/vfs/impl/VirtualFilePointerContainerImpl.java +++ b/platform/platform-impl/src/com/intellij/openapi/vfs/impl/VirtualFilePointerContainerImpl.java @@ -160,7 +160,7 @@ public class VirtualFilePointerContainerImpl implements VirtualFilePointerContai for (VirtualFilePointer smartVirtualFilePointer : myList) { result.add(smartVirtualFilePointer.getUrl()); } - return result.toArray(new String[result.size()]); + return ArrayUtil.toStringArray(result); } private VirtualFile[] myCachedFiles; diff --git a/platform/platform-impl/src/com/intellij/openapi/vfs/impl/win32/Win32Kernel.java b/platform/platform-impl/src/com/intellij/openapi/vfs/impl/win32/Win32Kernel.java index bad5d66e9c16..0b0e39dacc0a 100644 --- a/platform/platform-impl/src/com/intellij/openapi/vfs/impl/win32/Win32Kernel.java +++ b/platform/platform-impl/src/com/intellij/openapi/vfs/impl/win32/Win32Kernel.java @@ -15,6 +15,7 @@ */ package com.intellij.openapi.vfs.impl.win32; +import com.intellij.util.ArrayUtil; import com.sun.jna.Library; import com.sun.jna.Native; import com.sun.jna.Pointer; @@ -87,7 +88,7 @@ public class Win32Kernel { finally { myKernel.FindClose(hFind); } - return list.toArray(new String[list.size()]); + return ArrayUtil.toStringArray(list); } public boolean exists(String path) { diff --git a/platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/persistent/PersistentFS.java b/platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/persistent/PersistentFS.java index 5d41c364693e..c5485df7a5b5 100644 --- a/platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/persistent/PersistentFS.java +++ b/platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/persistent/PersistentFS.java @@ -153,7 +153,7 @@ public class PersistentFS extends ManagingFS implements ApplicationComponent { Set allNamesSet = new LinkedHashSet((currentNames.length + delegateNames.length) * 2); allNamesSet.addAll(Arrays.asList(currentNames)); allNamesSet.addAll(Arrays.asList(delegateNames)); - names = allNamesSet.toArray(new String[allNamesSet.size()]); + names = ArrayUtil.toStringArray(allNamesSet); } final int[] childrenIds = ArrayUtil.newIntArray(names.length); diff --git a/platform/usageView/src/com/intellij/usages/impl/UsageViewManagerImpl.java b/platform/usageView/src/com/intellij/usages/impl/UsageViewManagerImpl.java index c6ad2ec5445d..a3dc057b5ea0 100644 --- a/platform/usageView/src/com/intellij/usages/impl/UsageViewManagerImpl.java +++ b/platform/usageView/src/com/intellij/usages/impl/UsageViewManagerImpl.java @@ -43,6 +43,7 @@ import com.intellij.ui.content.Content; import com.intellij.usageView.UsageViewBundle; import com.intellij.usages.*; import com.intellij.usages.rules.PsiElementUsage; +import com.intellij.util.ArrayUtil; import com.intellij.util.Processor; import com.intellij.util.ui.RangeBlinker; import com.intellij.xml.util.XmlStringUtil; @@ -344,7 +345,7 @@ public class UsageViewManagerImpl extends UsageViewManager { } int option = Messages.showDialog(myProject, message, UsageViewBundle.message("dialog.title.information"), - titles.toArray(new String[titles.size()]), 0, Messages.getInformationIcon()); + ArrayUtil.toStringArray(titles), 0, Messages.getInformationIcon()); if (option > 0) { notFoundActions.get(option - 1).actionPerformed(new ActionEvent(this, 0, titles.get(option))); diff --git a/platform/util/src/com/intellij/openapi/util/text/LineTokenizer.java b/platform/util/src/com/intellij/openapi/util/text/LineTokenizer.java index 8948242bd840..ef44d545b40a 100644 --- a/platform/util/src/com/intellij/openapi/util/text/LineTokenizer.java +++ b/platform/util/src/com/intellij/openapi/util/text/LineTokenizer.java @@ -57,7 +57,7 @@ public class LineTokenizer { if (!skipLastEmptyLine && stringEdnsWithSeparator(tokenizer)) lines.add(""); - return lines.toArray(new String[lines.size()]); + return ArrayUtil.toStringArray(lines); } public static int calcLineCount(final CharSequence chars, final boolean skipLastEmptyLine) { diff --git a/platform/util/src/com/intellij/util/EnvironmentUtil.java b/platform/util/src/com/intellij/util/EnvironmentUtil.java index d97f519c4c8a..154dc077e339 100644 --- a/platform/util/src/com/intellij/util/EnvironmentUtil.java +++ b/platform/util/src/com/intellij/util/EnvironmentUtil.java @@ -63,7 +63,7 @@ public class EnvironmentUtil { result.add(envName + "=" + enviromentProperties.get(envName)); } } - return result.toArray(new String[result.size()]); + return ArrayUtil.toStringArray(result); } private static synchronized List getProcEnvironment() { diff --git a/platform/vcs-api/src/com/intellij/openapi/vcs/VcsException.java b/platform/vcs-api/src/com/intellij/openapi/vcs/VcsException.java index c7f08867cff1..76f54a1bc6fa 100644 --- a/platform/vcs-api/src/com/intellij/openapi/vcs/VcsException.java +++ b/platform/vcs-api/src/com/intellij/openapi/vcs/VcsException.java @@ -16,6 +16,7 @@ package com.intellij.openapi.vcs; import com.intellij.openapi.vfs.VirtualFile; +import com.intellij.util.ArrayUtil; import java.util.Collection; import java.util.Collections; @@ -60,7 +61,7 @@ public class VcsException extends Exception { } public String[] getMessages() { - return myMessages.toArray(new String[myMessages.size()]); + return ArrayUtil.toStringArray(myMessages); } public VcsException setIsWarning(boolean warning) { diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/ColumnFilteringStrategy.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/ColumnFilteringStrategy.java index e84760c6c36f..f97df916144a 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/ColumnFilteringStrategy.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/ColumnFilteringStrategy.java @@ -21,6 +21,7 @@ import com.intellij.openapi.vcs.VcsBundle; import com.intellij.openapi.vcs.versionBrowser.CommittedChangeList; import com.intellij.ui.ColoredListCellRenderer; import com.intellij.ui.SimpleTextAttributes; +import com.intellij.util.ArrayUtil; import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -98,7 +99,7 @@ public class ColumnFilteringStrategy extends JPanel implements ChangeListFilteri values.add(myColumn.getValue(ReceivedChangeList.unwrap(changeList)).toString()); } } - final String[] valueArray = values.toArray(new String[values.size()]); + final String[] valueArray = ArrayUtil.toStringArray(values); myValueList.setModel(new AbstractListModel() { public int getSize() { return valueArray.length+1; diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/conflicts/ChangelistConflictConfigurable.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/conflicts/ChangelistConflictConfigurable.java index ff0e027f2276..193241b2aa87 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/conflicts/ChangelistConflictConfigurable.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/conflicts/ChangelistConflictConfigurable.java @@ -21,6 +21,7 @@ import com.intellij.openapi.options.binding.BindControl; import com.intellij.openapi.options.binding.BindableConfigurable; import com.intellij.openapi.options.binding.ControlBinder; import com.intellij.openapi.vcs.changes.ChangeListManagerImpl; +import com.intellij.util.ArrayUtil; import com.intellij.util.ui.UIUtil; import org.jetbrains.annotations.Nls; @@ -83,7 +84,7 @@ public class ChangelistConflictConfigurable extends BindableConfigurable impleme public void reset() { super.reset(); Collection conflicts = myConflictTracker.getIgnoredConflicts(); - myIgnoredFiles.setListData(conflicts.toArray(new String[conflicts.size()])); + myIgnoredFiles.setListData(ArrayUtil.toStringArray(conflicts)); myClearButton.setEnabled(!conflicts.isEmpty()); UIUtil.setEnabled(myOptionsPanel, myEnableCheckBox.isSelected(), true); } diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/IgnoreUnversionedDialog.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/IgnoreUnversionedDialog.java index c10e40e2e455..37600d93fda3 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/IgnoreUnversionedDialog.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/IgnoreUnversionedDialog.java @@ -27,6 +27,7 @@ import com.intellij.openapi.vcs.changes.*; import com.intellij.openapi.vfs.VfsUtil; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.ui.DocumentAdapter; +import com.intellij.util.ArrayUtil; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.Nullable; @@ -171,7 +172,7 @@ public class IgnoreUnversionedDialog extends DialogWrapper { } } if (extensions.size() > 0) { - final String[] extensionArray = extensions.toArray(new String[extensions.size()]); + final String[] extensionArray = ArrayUtil.toStringArray(extensions); myIgnoreMaskTextField.setText("*." + extensionArray [0]); } else { diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/ex/RangesBuilder.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/ex/RangesBuilder.java index c7169a0ee095..f64ea80bf5fd 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/ex/RangesBuilder.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/ex/RangesBuilder.java @@ -17,6 +17,7 @@ package com.intellij.openapi.vcs.ex; import com.intellij.openapi.editor.Document; import com.intellij.openapi.editor.EditorFactory; +import com.intellij.util.ArrayUtil; import com.intellij.util.diff.Diff; import java.util.ArrayList; @@ -67,7 +68,7 @@ public class RangesBuilder { } } - Diff.Change ch = Diff.buildChanges(upToDate.toArray(new String[upToDate.size()]), current.toArray(new String[current.size()])); + Diff.Change ch = Diff.buildChanges(ArrayUtil.toStringArray(upToDate), ArrayUtil.toStringArray(current)); while (ch != null) { diff --git a/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/inject/InjectedLanguage.java b/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/inject/InjectedLanguage.java index f6dadded8d69..4f4d4ac963a1 100644 --- a/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/inject/InjectedLanguage.java +++ b/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/inject/InjectedLanguage.java @@ -18,6 +18,7 @@ package org.intellij.plugins.intelliLang.inject; import com.intellij.lang.*; import com.intellij.psi.templateLanguages.TemplateLanguage; import com.intellij.openapi.fileTypes.FileTypes; +import com.intellij.util.ArrayUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -86,7 +87,7 @@ public final class InjectedLanguage { initLanguageCache(); } final Set keys = ourLanguageCache.keySet(); - return keys.toArray(new String[keys.size()]); + return ArrayUtil.toStringArray(keys); } } diff --git a/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/pattern/compiler/impl/PatternValidationCompiler.java b/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/pattern/compiler/impl/PatternValidationCompiler.java index 99e558004d07..d2f9f66459be 100644 --- a/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/pattern/compiler/impl/PatternValidationCompiler.java +++ b/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/pattern/compiler/impl/PatternValidationCompiler.java @@ -78,7 +78,7 @@ public class PatternValidationCompiler extends AnnotationBasedInstrumentingCompi myAnnotations.put(patternAnnotation.first, null); final Set names = myAnnotations.keySet(); - return names.toArray(new String[names.size()]); + return ArrayUtil.toStringArray(names); } } diff --git a/plugins/ant/src/com/intellij/lang/ant/config/execution/AntMessage.java b/plugins/ant/src/com/intellij/lang/ant/config/execution/AntMessage.java index c5c9995a185b..8c7784620684 100644 --- a/plugins/ant/src/com/intellij/lang/ant/config/execution/AntMessage.java +++ b/plugins/ant/src/com/intellij/lang/ant/config/execution/AntMessage.java @@ -16,6 +16,7 @@ package com.intellij.lang.ant.config.execution; import com.intellij.openapi.vfs.VirtualFile; +import com.intellij.util.ArrayUtil; import com.intellij.util.StringBuilderSpinAllocator; import java.util.ArrayList; @@ -42,7 +43,7 @@ final class AntMessage { while (tokenizer.hasMoreTokens()) { lines.add(tokenizer.nextToken()); } - myTextLines = lines.toArray(new String[lines.size()]); + myTextLines = ArrayUtil.toStringArray(lines); } public AntMessage(AntBuildMessageView.MessageType type, int priority, String[] lines, VirtualFile file, int line, int column) { diff --git a/plugins/ant/src/com/intellij/lang/ant/config/impl/ExecuteCompositeTargetEvent.java b/plugins/ant/src/com/intellij/lang/ant/config/impl/ExecuteCompositeTargetEvent.java index 853d6c55f124..09e4e69f26c5 100644 --- a/plugins/ant/src/com/intellij/lang/ant/config/impl/ExecuteCompositeTargetEvent.java +++ b/plugins/ant/src/com/intellij/lang/ant/config/impl/ExecuteCompositeTargetEvent.java @@ -18,6 +18,7 @@ package com.intellij.lang.ant.config.impl; import com.intellij.lang.ant.config.ExecutionEvent; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.InvalidDataException; +import com.intellij.util.ArrayUtil; import com.intellij.util.StringBuilderSpinAllocator; import org.jdom.Element; import org.jetbrains.annotations.NonNls; @@ -44,7 +45,7 @@ public final class ExecuteCompositeTargetEvent extends ExecutionEvent { while (tokenizer.hasMoreTokens()) { targetNames.add(tokenizer.nextToken().trim()); } - myTargetNames = targetNames.toArray(new String[targetNames.size()]); + myTargetNames = ArrayUtil.toStringArray(targetNames); myPresentableName = compositeName; } diff --git a/plugins/ant/src/com/intellij/lang/ant/psi/impl/AntPropertyImpl.java b/plugins/ant/src/com/intellij/lang/ant/psi/impl/AntPropertyImpl.java index ac373b1dd9a7..5617d379736f 100644 --- a/plugins/ant/src/com/intellij/lang/ant/psi/impl/AntPropertyImpl.java +++ b/plugins/ant/src/com/intellij/lang/ant/psi/impl/AntPropertyImpl.java @@ -390,7 +390,7 @@ public class AntPropertyImpl extends AntTaskImpl implements AntProperty { } } } - return strings.toArray(new String[strings.size()]); + return ArrayUtil.toStringArray(strings); } finally { StringSetSpinAllocator.dispose(strings); @@ -404,7 +404,7 @@ public class AntPropertyImpl extends AntTaskImpl implements AntProperty { for (final String prefix : getAntFile().getEnvironmentPrefixes()) { strings.add(prefix + sourceName); } - return strings.toArray(new String[strings.size()]); + return ArrayUtil.toStringArray(strings); } finally { StringSetSpinAllocator.dispose(strings); diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/application/CvsEntriesManager.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/application/CvsEntriesManager.java index 3ef022176d4d..b4912864b40b 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/application/CvsEntriesManager.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/application/CvsEntriesManager.java @@ -33,6 +33,7 @@ import com.intellij.openapi.project.ProjectManager; import com.intellij.openapi.vcs.FileStatusManager; import com.intellij.openapi.vcs.changes.VcsDirtyScopeManager; import com.intellij.openapi.vfs.*; +import com.intellij.util.ArrayUtil; import com.intellij.util.containers.HashMap; import com.intellij.util.containers.HashSet; import org.jetbrains.annotations.NotNull; @@ -353,7 +354,7 @@ public class CvsEntriesManager extends VirtualFileAdapter { private void ensureFilesCached() { String[] paths; synchronized (myFilesToRefresh) { - paths = myFilesToRefresh.toArray(new String[myFilesToRefresh.size()]); + paths = ArrayUtil.toStringArray(myFilesToRefresh); myFilesToRefresh.clear(); } for (String path : paths) { diff --git a/plugins/devkit/src/inspections/RegistrationProblemsInspection.java b/plugins/devkit/src/inspections/RegistrationProblemsInspection.java index c6e79a0493a0..ef47c1015aa7 100644 --- a/plugins/devkit/src/inspections/RegistrationProblemsInspection.java +++ b/plugins/devkit/src/inspections/RegistrationProblemsInspection.java @@ -25,6 +25,7 @@ import com.intellij.openapi.actionSystem.AnAction; import com.intellij.psi.*; import com.intellij.psi.search.GlobalSearchScope; import com.intellij.psi.xml.*; +import com.intellij.util.ArrayUtil; import com.intellij.util.SmartList; import gnu.trove.THashSet; import org.jetbrains.annotations.NonNls; @@ -301,7 +302,7 @@ public class RegistrationProblemsInspection extends DevKitInspectionBase { names.add(fqn + "#" + moduleType); } } - return names.toArray(new String[names.size()]); + return ArrayUtil.toStringArray(names); } } return new String[]{ fqn }; diff --git a/plugins/devkit/src/inspections/quickfix/CreateHtmlDescriptionFix.java b/plugins/devkit/src/inspections/quickfix/CreateHtmlDescriptionFix.java index 4c447de39f36..4853ac231fbe 100644 --- a/plugins/devkit/src/inspections/quickfix/CreateHtmlDescriptionFix.java +++ b/plugins/devkit/src/inspections/quickfix/CreateHtmlDescriptionFix.java @@ -36,6 +36,7 @@ import com.intellij.psi.PsiDirectory; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiFile; import com.intellij.psi.PsiManager; +import com.intellij.util.ArrayUtil; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; import org.jetbrains.idea.devkit.DevKitBundle; @@ -87,7 +88,7 @@ public class CreateHtmlDescriptionFix implements LocalQuickFix, Iconable { for (VirtualFile file : roots) { options.add(file.getPresentableUrl() + File.separator + DESCRIPTIONS_FOLDER + File.separator + myFilename); } - final JList files = new JList(options.toArray(new String[options.size()])); + final JList files = new JList(ArrayUtil.toStringArray(options)); final PopupChooserBuilder builder = JBPopupFactory.getInstance().createListPopupBuilder(files); final JBPopup popup = builder.setTitle(DevKitBundle.message("select.target.location.of.description", myFilename)).setItemChoosenCallback(new Runnable() { public void run() { diff --git a/plugins/devkit/src/projectRoots/IdeaJdk.java b/plugins/devkit/src/projectRoots/IdeaJdk.java index 589af3a32359..3a20c535ca63 100644 --- a/plugins/devkit/src/projectRoots/IdeaJdk.java +++ b/plugins/devkit/src/projectRoots/IdeaJdk.java @@ -31,6 +31,7 @@ import com.intellij.openapi.vfs.JarFileSystem; import com.intellij.openapi.vfs.LocalFileSystem; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.openapi.vfs.VirtualFileManager; +import com.intellij.util.ArrayUtil; import com.intellij.util.cls.BytePointer; import com.intellij.util.cls.ClsFormatException; import com.intellij.util.cls.ClsUtil; @@ -219,8 +220,7 @@ public class IdeaJdk extends SdkType implements JavaSdkType { } final int choice = Messages - .showChooseDialog("Select Java SDK to be used as IDEA internal platform", - "Select internal Java platform", javaSdks.toArray(new String[javaSdks.size()]), javaSdks.get(0), Messages.getQuestionIcon()); + .showChooseDialog("Select Java SDK to be used as IDEA internal platform", "Select internal Java platform", ArrayUtil.toStringArray(javaSdks), javaSdks.get(0), Messages.getQuestionIcon()); if (choice != -1) { final String name = javaSdks.get(choice); diff --git a/plugins/git4idea/src/git4idea/config/GitVcsSettings.java b/plugins/git4idea/src/git4idea/config/GitVcsSettings.java index cd05fe91b9ed..87d9adca947e 100644 --- a/plugins/git4idea/src/git4idea/config/GitVcsSettings.java +++ b/plugins/git4idea/src/git4idea/config/GitVcsSettings.java @@ -24,6 +24,7 @@ import com.intellij.openapi.progress.ProcessCanceledException; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.Computable; import com.intellij.openapi.util.SystemInfo; +import com.intellij.util.ArrayUtil; import com.intellij.util.xmlb.XmlSerializerUtil; import org.jetbrains.annotations.NonNls; @@ -111,7 +112,7 @@ public class GitVcsSettings implements PersistentStateComponent authors.removeLast(); } authors.addFirst(author); - PREVIOUS_COMMIT_AUTHORS = authors.toArray(new String[authors.size()]); + PREVIOUS_COMMIT_AUTHORS = ArrayUtil.toStringArray(authors); } /** diff --git a/plugins/git4idea/src/git4idea/merge/GitPullDialog.java b/plugins/git4idea/src/git4idea/merge/GitPullDialog.java index 2e3f5945cec4..f87ac516f8dd 100644 --- a/plugins/git4idea/src/git4idea/merge/GitPullDialog.java +++ b/plugins/git4idea/src/git4idea/merge/GitPullDialog.java @@ -21,6 +21,7 @@ import com.intellij.openapi.ui.DialogWrapper; import com.intellij.openapi.vcs.VcsException; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.ui.DocumentAdapter; +import com.intellij.util.ArrayUtil; import git4idea.GitRemote; import git4idea.GitVcs; import git4idea.commands.GitHandler; @@ -214,7 +215,7 @@ public class GitPullDialog extends DialogWrapper { h.addParameters("-v"); h.addParameters(getRemote()); final List markedBranches = myBranchChooser.getMarkedElements(); - h.addParameters(markedBranches.toArray(new String[markedBranches.size()])); + h.addParameters(ArrayUtil.toStringArray(markedBranches)); return h; } diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/actions/GroovyTemplatesFactory.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/actions/GroovyTemplatesFactory.java index 7670ba7a97f4..228fbddfeb83 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/actions/GroovyTemplatesFactory.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/actions/GroovyTemplatesFactory.java @@ -21,6 +21,7 @@ import com.intellij.openapi.fileTypes.FileTypeManager; import com.intellij.psi.PsiDirectory; import com.intellij.psi.PsiFile; import com.intellij.psi.PsiFileFactory; +import com.intellij.util.ArrayUtil; import com.intellij.util.IncorrectOperationException; import org.jetbrains.annotations.NonNls; import org.jetbrains.plugins.groovy.GroovyBundle; @@ -103,6 +104,6 @@ public class GroovyTemplatesFactory implements FileTemplateGroupDescriptorFactor } public String[] getCustomTemplates() { - return myCustomTemplates.toArray(new String[myCustomTemplates.size()]); + return ArrayUtil.toStringArray(myCustomTemplates); } } diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/actions/generate/constructors/ConstructorGenerateHandler.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/actions/generate/constructors/ConstructorGenerateHandler.java index fad374f7c97b..45dd61030793 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/actions/generate/constructors/ConstructorGenerateHandler.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/actions/generate/constructors/ConstructorGenerateHandler.java @@ -18,6 +18,7 @@ package org.jetbrains.plugins.groovy.actions.generate.constructors; import com.intellij.codeInsight.generation.*; import com.intellij.openapi.project.Project; import com.intellij.psi.*; +import com.intellij.util.ArrayUtil; import com.intellij.util.IncorrectOperationException; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -100,7 +101,7 @@ public class ConstructorGenerateHandler extends GenerateConstructorHandler { parametersNames.add(parameter.getName()); } - final String[] paramNames = parametersNames.toArray(new String[parametersNames.size()]); + final String[] paramNames = ArrayUtil.toStringArray(parametersNames); assert constructorName != null; grConstructor = GroovyPsiElementFactory.getInstance(aClass.getProject()).createConstructorFromText(constructorName, null, paramNames, body); diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/annotator/intentions/QuickfixUtil.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/annotator/intentions/QuickfixUtil.java index b9849b603cce..76a77e901217 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/annotator/intentions/QuickfixUtil.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/annotator/intentions/QuickfixUtil.java @@ -30,6 +30,7 @@ import com.intellij.psi.codeStyle.SuggestedNameInfo; import com.intellij.psi.codeStyle.VariableKind; import com.intellij.psi.util.PsiTreeUtil; import com.intellij.psi.util.PsiTypesUtil; +import com.intellij.util.ArrayUtil; import gnu.trove.THashSet; import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.NotNull; @@ -160,7 +161,7 @@ public class QuickfixUtil { result.add(type); } - return result.toArray(new String[result.size()]); + return ArrayUtil.toStringArray(result); } public static String[] getArgumentsNames(List listOfPairs) { @@ -170,7 +171,7 @@ public class QuickfixUtil { result.add(name); } - return result.toArray(new String[result.size()]); + return ArrayUtil.toStringArray(result); } public static String shortenType(String typeText) { diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/annotator/intentions/dynamic/DynamicManagerImpl.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/annotator/intentions/dynamic/DynamicManagerImpl.java index 3bb16e1f945a..9184413df5fa 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/annotator/intentions/dynamic/DynamicManagerImpl.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/annotator/intentions/dynamic/DynamicManagerImpl.java @@ -26,6 +26,7 @@ import com.intellij.openapi.project.Project; import com.intellij.openapi.startup.StartupManager; import com.intellij.openapi.wm.ToolWindow; import com.intellij.psi.*; +import com.intellij.util.ArrayUtil; import com.intellij.util.Function; import com.intellij.util.containers.ContainerUtil; import com.intellij.util.ui.tree.TreeUtil; @@ -229,7 +230,7 @@ public class DynamicManagerImpl extends DynamicManager { result.add(propertyElement.getName()); } } - return result.toArray(new String[result.size()]); + return ArrayUtil.toStringArray(result); } @Nullable diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/debugger/GroovyCodeFragmentFactory.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/debugger/GroovyCodeFragmentFactory.java index 1e84abe8d2d6..8a64c4a3af45 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/debugger/GroovyCodeFragmentFactory.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/debugger/GroovyCodeFragmentFactory.java @@ -23,6 +23,7 @@ import com.intellij.openapi.util.TextRange; import com.intellij.openapi.util.text.StringUtil; import com.intellij.psi.*; import com.intellij.psi.util.PsiTreeUtil; +import com.intellij.util.ArrayUtil; import com.intellij.util.containers.HashSet; import org.jetbrains.plugins.groovy.GroovyFileType; import org.jetbrains.plugins.groovy.debugger.fragments.GroovyCodeFragment; @@ -165,8 +166,8 @@ public class GroovyCodeFragmentFactory implements CodeFragmentFactory { text = toEval.getText(); - String[] names = namesList.toArray(new String[namesList.size()]); - String[] vals = valList.toArray(new String[valList.size()]); + String[] names = ArrayUtil.toStringArray(namesList); + String[] vals = ArrayUtil.toStringArray(valList); PsiClass contextClass = PsiUtil.getContextClass(context); boolean isStatic = isStaticContext(context); diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/doc/GroovyDocGenerationPanel.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/doc/GroovyDocGenerationPanel.java index 276dbd76e7b5..7fc086466679 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/doc/GroovyDocGenerationPanel.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/doc/GroovyDocGenerationPanel.java @@ -24,6 +24,7 @@ import com.intellij.openapi.ui.TextFieldWithBrowseButton; import com.intellij.ui.IdeBorderFactory; import com.intellij.ui.NonFocusableCheckBox; import com.intellij.ui.ScrollPaneFactory; +import com.intellij.util.ArrayUtil; import org.jetbrains.annotations.Nullable; import org.jetbrains.plugins.groovy.doc.actions.GroovyDocAddPackageAction; import org.jetbrains.plugins.groovy.doc.actions.GroovyDocReducePackageAction; @@ -171,7 +172,7 @@ private static String[] toStringArray(final DefaultListModel model) { result.add((String)o); } - return result.toArray(new String[result.size()]); + return ArrayUtil.toStringArray(result); } public JPanel getPanel() { diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/gotoclass/GroovyGoToSymbolContributor.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/gotoclass/GroovyGoToSymbolContributor.java index 93ac73684da7..e66196a3cf2d 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/gotoclass/GroovyGoToSymbolContributor.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/gotoclass/GroovyGoToSymbolContributor.java @@ -20,6 +20,7 @@ import com.intellij.navigation.NavigationItem; import com.intellij.openapi.project.Project; import com.intellij.psi.search.GlobalSearchScope; import com.intellij.psi.stubs.StubIndex; +import com.intellij.util.ArrayUtil; import org.jetbrains.plugins.groovy.lang.psi.stubs.index.GrAnnotationMethodNameIndex; import org.jetbrains.plugins.groovy.lang.psi.stubs.index.GrFieldNameIndex; import org.jetbrains.plugins.groovy.lang.psi.stubs.index.GrMethodNameIndex; @@ -40,7 +41,7 @@ public class GroovyGoToSymbolContributor implements ChooseByNameContributor { symbols.addAll(StubIndex.getInstance().getAllKeys(GrFieldNameIndex.KEY, project)); symbols.addAll(StubIndex.getInstance().getAllKeys(GrMethodNameIndex.KEY, project)); symbols.addAll(StubIndex.getInstance().getAllKeys(GrAnnotationMethodNameIndex.KEY, project)); - return symbols.toArray(new String[symbols.size()]); + return ArrayUtil.toStringArray(symbols); } public NavigationItem[] getItemsByName(String name, String pattern, Project project, boolean includeNonProjectItems) { diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/documentation/GroovyPresentationUtil.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/documentation/GroovyPresentationUtil.java index 27d9b8a9d750..17aaa9e18853 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/documentation/GroovyPresentationUtil.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/documentation/GroovyPresentationUtil.java @@ -15,6 +15,7 @@ */ package org.jetbrains.plugins.groovy.lang.documentation; +import com.intellij.util.ArrayUtil; import org.jetbrains.plugins.groovy.lang.psi.api.statements.params.GrParameter; import org.jetbrains.plugins.groovy.lang.psi.api.statements.expressions.GrReferenceExpression; import org.jetbrains.plugins.groovy.lang.psi.util.PsiUtil; @@ -79,7 +80,7 @@ public class GroovyPresentationUtil { if (!structural.isEmpty()) { builder.append("."); - String[] array = structural.toArray(new String[structural.size()]); + String[] array = ArrayUtil.toStringArray(structural); if (array.length> 1) builder.append("["); for (int i = 0; i < array.length; i++) { if (i > 0) builder.append(", "); diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/expressions/CompleteReferenceExpression.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/expressions/CompleteReferenceExpression.java index 79165b3d4d94..ffbe24d8458b 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/expressions/CompleteReferenceExpression.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/expressions/CompleteReferenceExpression.java @@ -329,7 +329,7 @@ public class CompleteReferenceExpression { final PsiElement scope = PsiTreeUtil.getParentOfType(refExpr, GrMember.class, GroovyFileBase.class); Set result = new LinkedHashSet(); addVariantsWithSameQualifier(scope, refExpr, qualifier, result); - return result.toArray(new String[result.size()]); + return ArrayUtil.toStringArray(result); } private static void addVariantsWithSameQualifier(PsiElement element, diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/typedef/GrTypeDefinitionImpl.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/typedef/GrTypeDefinitionImpl.java index 893584941d54..118ff640db9e 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/typedef/GrTypeDefinitionImpl.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/typedef/GrTypeDefinitionImpl.java @@ -184,7 +184,7 @@ public abstract class GrTypeDefinitionImpl extends GroovyBaseElementImpl classNames = StubIndex.getInstance().getAllKeys(GrShortClassNameIndex.KEY, myProject); Collection scriptNames = StubIndex.getInstance().getAllKeys(GrScriptClassNameIndex.KEY, myProject); classNames.addAll(scriptNames); - return classNames.toArray(new String[classNames.size()]); + return ArrayUtil.toStringArray(classNames); } @@ -148,7 +148,7 @@ public class GroovyShortNamesCache extends PsiShortNamesCache { public String[] getAllMethodNames() { Collection keys = StubIndex.getInstance().getAllKeys(GrMethodNameIndex.KEY, myProject); keys.addAll(StubIndex.getInstance().getAllKeys(GrAnnotationMethodNameIndex.KEY, myProject)); - return keys.toArray(new String[keys.size()]); + return ArrayUtil.toStringArray(keys); } public void getAllMethodNames(@NotNull HashSet set) { @@ -165,7 +165,7 @@ public class GroovyShortNamesCache extends PsiShortNamesCache { @NotNull public String[] getAllFieldNames() { Collection fields = StubIndex.getInstance().getAllKeys(GrFieldNameIndex.KEY, myProject); - return fields.toArray(new String[fields.size()]); + return ArrayUtil.toStringArray(fields); } public void getAllFieldNames(@NotNull HashSet set) { diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/GroovyNameSuggestionUtil.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/GroovyNameSuggestionUtil.java index 086eec97bbad..5e4b22685a3d 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/GroovyNameSuggestionUtil.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/GroovyNameSuggestionUtil.java @@ -22,6 +22,7 @@ import com.intellij.openapi.util.text.StringUtil; import com.intellij.psi.*; import com.intellij.psi.util.PsiTypesUtil; import com.intellij.psi.util.TypeConversionUtil; +import com.intellij.util.ArrayUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.plugins.groovy.lang.psi.api.statements.expressions.GrExpression; import org.jetbrains.plugins.groovy.lang.psi.api.statements.expressions.GrReferenceExpression; @@ -62,7 +63,7 @@ public class GroovyNameSuggestionUtil { if (possibleNames.size() == 0) { possibleNames.add(validator.validateName("var", true)); } - return possibleNames.toArray(new String[possibleNames.size()]); + return ArrayUtil.toStringArray(possibleNames); } diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/extractMethod/ExtractMethodUtil.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/extractMethod/ExtractMethodUtil.java index 48f1a4e46a8d..84b041283049 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/extractMethod/ExtractMethodUtil.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/extractMethod/ExtractMethodUtil.java @@ -285,7 +285,7 @@ public class ExtractMethodUtil { i++; } } - return params.toArray(new String[params.size()]); + return ArrayUtil.toStringArray(params); } static String getTypeString(ExtractMethodInfoHelper helper, boolean forPresentation) { diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/FacetImporter.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/FacetImporter.java index 4651c80e3d2a..3977af7d044f 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/FacetImporter.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/FacetImporter.java @@ -19,6 +19,7 @@ import com.intellij.facet.*; import com.intellij.facet.impl.autodetecting.FacetAutodetectingManager; import com.intellij.openapi.module.Module; import com.intellij.openapi.util.io.FileUtil; +import com.intellij.util.ArrayUtil; import com.intellij.util.PathUtil; import org.jdom.Element; import org.jetbrains.idea.maven.project.*; @@ -153,7 +154,7 @@ public abstract class FacetImporter elements = new ArrayList(); elements.add(p.getBuildDirectory()); Collections.addAll(elements, subFoldersAndFile); - return makePath(p, elements.toArray(new String[elements.size()])); + return makePath(p, ArrayUtil.toStringArray(elements)); } protected String makePath(MavenProject p, String... elements) { diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/MavenProjectImporter.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/MavenProjectImporter.java index 88d8f9b71db9..8c45bee635a9 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/MavenProjectImporter.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/MavenProjectImporter.java @@ -32,6 +32,7 @@ import com.intellij.openapi.util.Pair; import com.intellij.openapi.util.text.StringUtil; import com.intellij.openapi.vfs.LocalFileSystem; import com.intellij.openapi.vfs.VirtualFile; +import com.intellij.util.ArrayUtil; import com.intellij.util.Function; import com.intellij.util.containers.Stack; import gnu.trove.THashMap; @@ -500,7 +501,7 @@ public class MavenProjectImporter { return; } - myModuleModel.setModuleGroupPath(module, groups.isEmpty() ? null : groups.toArray(new String[groups.size()])); + myModuleModel.setModuleGroupPath(module, groups.isEmpty() ? null : ArrayUtil.toStringArray(groups)); } public void leave(MavenProject each) { diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/utils/MavenGotoSettingsFileContibutor.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/utils/MavenGotoSettingsFileContibutor.java index e88815f479bb..8f85811c785e 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/utils/MavenGotoSettingsFileContibutor.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/utils/MavenGotoSettingsFileContibutor.java @@ -22,6 +22,7 @@ import com.intellij.openapi.project.Project; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.psi.PsiFile; import com.intellij.psi.PsiManager; +import com.intellij.util.ArrayUtil; import gnu.trove.THashSet; import org.jetbrains.idea.maven.project.MavenProjectsManager; @@ -35,7 +36,7 @@ public class MavenGotoSettingsFileContibutor implements ChooseByNameContributor, for (VirtualFile each : getSettingsFiles(project)) { result.add(each.getName()); } - 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/MavenImportingTestCase.java b/plugins/maven/src/test/java/org/jetbrains/idea/maven/MavenImportingTestCase.java index 0b13a8d89153..4177a87dbbdd 100644 --- a/plugins/maven/src/test/java/org/jetbrains/idea/maven/MavenImportingTestCase.java +++ b/plugins/maven/src/test/java/org/jetbrains/idea/maven/MavenImportingTestCase.java @@ -35,6 +35,7 @@ import com.intellij.openapi.util.io.FileUtil; import com.intellij.openapi.util.text.StringUtil; import com.intellij.openapi.vfs.VfsUtil; import com.intellij.openapi.vfs.VirtualFile; +import com.intellij.util.ArrayUtil; import com.intellij.util.PathUtil; import org.jetbrains.idea.maven.project.MavenException; import org.jetbrains.idea.maven.project.MavenProjectsManager; @@ -185,7 +186,7 @@ public abstract class MavenImportingTestCase extends MavenTestCase { private void assertModuleLibDepPath(LibraryOrderEntry lib, OrderRootType type, List paths) { if (paths == null) return; - assertUnorderedElementsAreEqual(lib.getUrls(type), paths.toArray(new String[paths.size()])); + assertUnorderedElementsAreEqual(lib.getUrls(type), ArrayUtil.toStringArray(paths)); } protected void assertModuleLibDepScope(String moduleName, String depName, DependencyScope scope) { diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnUtil.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnUtil.java index efd05d956d97..0e18a44a0f03 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnUtil.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnUtil.java @@ -201,7 +201,7 @@ public class SvnUtil { ProgressManager.getInstance().runProcessWithProgressSynchronously(command, SvnBundle.message("progress.title.lock.files"), false, project); if (!failedLocks.isEmpty()) { - String[] failedFiles = failedLocks.toArray(new String[failedLocks.size()]); + String[] failedFiles = ArrayUtil.toStringArray(failedLocks); List exceptions = new ArrayList(); for (String file : failedFiles) { @@ -265,7 +265,7 @@ public class SvnUtil { ProgressManager.getInstance().runProcessWithProgressSynchronously(command, SvnBundle.message("progress.title.unlock.files"), false, project); if (!failedUnlocks.isEmpty()) { - String[] failedFiles = failedUnlocks.toArray(new String[failedUnlocks.size()]); + String[] failedFiles = ArrayUtil.toStringArray(failedUnlocks); List exceptions = new ArrayList(); for (String file : failedFiles) { diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/actions/MarkResolvedAction.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/actions/MarkResolvedAction.java index e87f40755d45..59cce972387e 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/actions/MarkResolvedAction.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/actions/MarkResolvedAction.java @@ -27,6 +27,7 @@ import com.intellij.openapi.vcs.VcsException; import com.intellij.openapi.vcs.FileStatus; import com.intellij.openapi.vcs.changes.VcsDirtyScopeManager; import com.intellij.openapi.vfs.VirtualFile; +import com.intellij.util.ArrayUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.idea.svn.SvnBundle; import org.jetbrains.idea.svn.SvnStatusUtil; @@ -75,7 +76,7 @@ public class MarkResolvedAction extends BasicAction { Messages.showInfoMessage(project, SvnBundle.message("message.text.no.conflicts.found"), SvnBundle.message("message.title.no.conflicts.found")); return; } - String[] pathsArray = paths.toArray(new String[paths.size()]); + String[] pathsArray = ArrayUtil.toStringArray(paths); SelectFilesDialog dialog = new SelectFilesDialog(project, SvnBundle.message("label.select.files.and.directories.to.mark.resolved"), SvnBundle.message("dialog.title.mark.resolved"), SvnBundle.message("action.name.mark.resolved"), pathsArray, "vcs.subversion.resolve" diff --git a/plugins/testng/src/com/theoryinpractice/testng/configuration/browser/GroupList.java b/plugins/testng/src/com/theoryinpractice/testng/configuration/browser/GroupList.java index 27cc347d4eb2..eec60740df42 100644 --- a/plugins/testng/src/com/theoryinpractice/testng/configuration/browser/GroupList.java +++ b/plugins/testng/src/com/theoryinpractice/testng/configuration/browser/GroupList.java @@ -20,6 +20,7 @@ import com.intellij.psi.PsiClass; import com.intellij.ui.ListScrollingUtil; import com.intellij.ui.ScrollPaneFactory; import com.intellij.ui.SortedListModel; +import com.intellij.util.ArrayUtil; import com.theoryinpractice.testng.util.TestNGUtil; import javax.swing.*; @@ -43,7 +44,7 @@ public class GroupList extends JPanel }); list = new JList(model); Set groups = TestNGUtil.getAnnotationValues("groups", classes); - String[] array = groups.toArray(new String[groups.size()]); + String[] array = ArrayUtil.toStringArray(groups); Arrays.sort(array); model.addAll(array); add(ScrollPaneFactory.createScrollPane(list)); diff --git a/plugins/testng/src/com/theoryinpractice/testng/inspection/DependsOnGroupsInspection.java b/plugins/testng/src/com/theoryinpractice/testng/inspection/DependsOnGroupsInspection.java index e4eb7986a54b..3c37abc01856 100644 --- a/plugins/testng/src/com/theoryinpractice/testng/inspection/DependsOnGroupsInspection.java +++ b/plugins/testng/src/com/theoryinpractice/testng/inspection/DependsOnGroupsInspection.java @@ -29,6 +29,7 @@ import com.intellij.psi.PsiAnnotation; import com.intellij.psi.PsiClass; import com.intellij.psi.PsiNameValuePair; import com.intellij.ui.DocumentAdapter; +import com.intellij.util.ArrayUtil; import com.theoryinpractice.testng.util.TestNGUtil; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; @@ -80,7 +81,7 @@ public class DependsOnGroupsInspection extends BaseJavaLocalInspectionTool { public JComponent createOptionsPanel() { final LabeledComponent definedGroups = new LabeledComponent(); definedGroups.setText("&Defined Groups"); - final JTextField textField = new JTextField(StringUtil.join(groups.toArray(new String[groups.size()]), ",")); + final JTextField textField = new JTextField(StringUtil.join(ArrayUtil.toStringArray(groups), ",")); textField.getDocument().addDocumentListener(new DocumentAdapter() { protected void textChanged(final DocumentEvent e) { groups.clear(); diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/inspections/AssignMnemonicFix.java b/plugins/ui-designer/src/com/intellij/uiDesigner/inspections/AssignMnemonicFix.java index 21f066578d6a..5199f93a0c2e 100644 --- a/plugins/ui-designer/src/com/intellij/uiDesigner/inspections/AssignMnemonicFix.java +++ b/plugins/ui-designer/src/com/intellij/uiDesigner/inspections/AssignMnemonicFix.java @@ -30,6 +30,7 @@ import com.intellij.uiDesigner.propertyInspector.properties.IntroStringProperty; import com.intellij.uiDesigner.quickFixes.QuickFix; import com.intellij.uiDesigner.radComponents.RadComponent; import com.intellij.uiDesigner.radComponents.RadContainer; +import com.intellij.util.ArrayUtil; import java.util.ArrayList; @@ -111,6 +112,6 @@ public class AssignMnemonicFix extends QuickFix { if (variants.size() == 0) { variants.add(value); } - return variants.toArray(new String[variants.size()]); + return ArrayUtil.toStringArray(variants); } } diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/propertyInspector/editors/BindingEditor.java b/plugins/ui-designer/src/com/intellij/uiDesigner/propertyInspector/editors/BindingEditor.java index e4757904e033..c2d23088a6f3 100644 --- a/plugins/ui-designer/src/com/intellij/uiDesigner/propertyInspector/editors/BindingEditor.java +++ b/plugins/ui-designer/src/com/intellij/uiDesigner/propertyInspector/editors/BindingEditor.java @@ -32,6 +32,7 @@ import com.intellij.uiDesigner.radComponents.RadComponent; import com.intellij.uiDesigner.radComponents.RadErrorComponent; import com.intellij.uiDesigner.radComponents.RadHSpacer; import com.intellij.uiDesigner.radComponents.RadVSpacer; +import com.intellij.util.ArrayUtil; import com.intellij.util.IncorrectOperationException; import javax.swing.*; @@ -84,12 +85,12 @@ public final class BindingEditor extends ComboBoxPropertyEditor { final IRootContainer root = FormEditingUtil.getRoot(component); final String className = root.getClassToBind(); if (className == null) { - return result.toArray(new String[result.size()]); + return ArrayUtil.toStringArray(result); } final PsiClass aClass = FormEditingUtil.findClassToBind(component.getModule(), className); if (aClass == null) { - return result.toArray(new String[result.size()]); + return ArrayUtil.toStringArray(result); } final PsiField[] fields = aClass.getFields(); @@ -145,7 +146,7 @@ public final class BindingEditor extends ComboBoxPropertyEditor { } } - final String[] names = result.toArray(new String[result.size()]); + final String[] names = ArrayUtil.toStringArray(result); Arrays.sort(names); return names; } diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/propertyInspector/editors/string/StringEditorDialog.java b/plugins/ui-designer/src/com/intellij/uiDesigner/propertyInspector/editors/string/StringEditorDialog.java index 8d326be9df76..f3d3d5df40de 100644 --- a/plugins/ui-designer/src/com/intellij/uiDesigner/propertyInspector/editors/string/StringEditorDialog.java +++ b/plugins/ui-designer/src/com/intellij/uiDesigner/propertyInspector/editors/string/StringEditorDialog.java @@ -51,6 +51,7 @@ import com.intellij.uiDesigner.binding.FormReferenceProvider; import com.intellij.uiDesigner.compiler.AsmCodeGenerator; import com.intellij.uiDesigner.designSurface.GuiEditor; import com.intellij.uiDesigner.lw.StringDescriptor; +import com.intellij.util.ArrayUtil; import com.intellij.util.IncorrectOperationException; import com.intellij.util.Processor; import org.jetbrains.annotations.NonNls; @@ -352,7 +353,7 @@ public final class StringEditorDialog extends DialogWrapper{ myDefaultBundleInitialized = true; Set bundleNames = FormEditingUtil.collectUsedBundleNames(myEditor.getRootContainer()); if (bundleNames.size() > 0) { - myTfBundleName.setText(bundleNames.toArray(new String[bundleNames.size()]) [0]); + myTfBundleName.setText(ArrayUtil.toStringArray(bundleNames)[0]); } } CardLayout cardLayout = (CardLayout) myCardHolder.getLayout(); diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/radComponents/LayoutManagerRegistry.java b/plugins/ui-designer/src/com/intellij/uiDesigner/radComponents/LayoutManagerRegistry.java index f98043d597f8..0071a2b87a39 100644 --- a/plugins/ui-designer/src/com/intellij/uiDesigner/radComponents/LayoutManagerRegistry.java +++ b/plugins/ui-designer/src/com/intellij/uiDesigner/radComponents/LayoutManagerRegistry.java @@ -19,6 +19,7 @@ package com.intellij.uiDesigner.radComponents; import com.intellij.uiDesigner.UIFormXmlConstants; import com.intellij.uiDesigner.GuiDesignerConfiguration; import com.intellij.openapi.project.Project; +import com.intellij.util.ArrayUtil; import com.jgoodies.forms.layout.FormLayout; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.Nullable; @@ -73,7 +74,7 @@ public class LayoutManagerRegistry { } } Collections.sort(layoutManagerNames); - return layoutManagerNames.toArray(new String[layoutManagerNames.size()]); + return ArrayUtil.toStringArray(layoutManagerNames); } public static String getLayoutManagerDisplayName(String name) { diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/radComponents/RadButtonGroup.java b/plugins/ui-designer/src/com/intellij/uiDesigner/radComponents/RadButtonGroup.java index c7b01aec8d96..34cf97bcc963 100644 --- a/plugins/ui-designer/src/com/intellij/uiDesigner/radComponents/RadButtonGroup.java +++ b/plugins/ui-designer/src/com/intellij/uiDesigner/radComponents/RadButtonGroup.java @@ -18,6 +18,7 @@ package com.intellij.uiDesigner.radComponents; import com.intellij.uiDesigner.XmlWriter; import com.intellij.uiDesigner.UIFormXmlConstants; import com.intellij.uiDesigner.lw.IButtonGroup; +import com.intellij.util.ArrayUtil; import java.util.ArrayList; import java.util.List; @@ -84,7 +85,7 @@ public class RadButtonGroup implements IButtonGroup { } public String[] getComponentIds() { - return myComponentIds.toArray(new String[myComponentIds.size()]); + return ArrayUtil.toStringArray(myComponentIds); } public boolean isEmpty() { diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/snapShooter/SnapShooterDaemon.java b/plugins/ui-designer/src/com/intellij/uiDesigner/snapShooter/SnapShooterDaemon.java index 1cb9304ea95a..6334cfb4b026 100644 --- a/plugins/ui-designer/src/com/intellij/uiDesigner/snapShooter/SnapShooterDaemon.java +++ b/plugins/ui-designer/src/com/intellij/uiDesigner/snapShooter/SnapShooterDaemon.java @@ -20,6 +20,7 @@ import com.intellij.openapi.vfs.CharsetToolkit; import com.intellij.uiDesigner.XmlWriter; import com.intellij.uiDesigner.radComponents.RadComponent; import com.intellij.uiDesigner.radComponents.RadRootContainer; +import com.intellij.util.ArrayUtil; import org.jetbrains.annotations.NonNls; import javax.accessibility.AccessibleContext; @@ -128,7 +129,7 @@ public class SnapShooterDaemon implements Runnable { getChildText(child)); result.add(rc.toProtocolString()); } - return result.toArray(new String[result.size()]); + return ArrayUtil.toStringArray(result); } private static String getLayoutManagerClass(final Component component) { diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/wizard/Generator.java b/plugins/ui-designer/src/com/intellij/uiDesigner/wizard/Generator.java index 610f6cb668ee..e39864c71e15 100644 --- a/plugins/ui-designer/src/com/intellij/uiDesigner/wizard/Generator.java +++ b/plugins/ui-designer/src/com/intellij/uiDesigner/wizard/Generator.java @@ -41,6 +41,7 @@ import com.intellij.uiDesigner.compiler.AlienFormFileException; import com.intellij.uiDesigner.compiler.Utils; import com.intellij.uiDesigner.lw.LwComponent; import com.intellij.uiDesigner.lw.LwRootContainer; +import com.intellij.util.ArrayUtil; import com.intellij.util.IncorrectOperationException; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; @@ -475,7 +476,7 @@ public final class Generator { property2fqClassName.put(binding.myBeanProperty.myName, propertyClassName); } - generateBean(beanClass, properties.toArray(new String[properties.size()]), property2fqClassName); + generateBean(beanClass, ArrayUtil.toStringArray(properties), property2fqClassName); return beanClass; } diff --git a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/impl/XsltChooseByNameContributor.java b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/impl/XsltChooseByNameContributor.java index 2628cafec4df..e1b6444a6951 100644 --- a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/impl/XsltChooseByNameContributor.java +++ b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/impl/XsltChooseByNameContributor.java @@ -18,13 +18,14 @@ package org.intellij.lang.xpath.xslt.impl; import com.intellij.navigation.ChooseByNameContributor; import com.intellij.navigation.NavigationItem; import com.intellij.openapi.project.Project; +import com.intellij.util.ArrayUtil; import java.util.Collection; class XsltChooseByNameContributor implements ChooseByNameContributor { public String[] getNames(Project project, boolean includeNonProjectItems) { final Collection symbols = XsltSymbolIndex.getSymbolNames(project, includeNonProjectItems); - return symbols.toArray(new String[symbols.size()]); + return ArrayUtil.toStringArray(symbols); } public NavigationItem[] getItemsByName(String name, String pattern, Project project, boolean includeNonProjectItems) { diff --git a/plugins/xpath/xpath-view/src/org/intellij/plugins/xpathView/ui/AddNamespaceDialog.java b/plugins/xpath/xpath-view/src/org/intellij/plugins/xpathView/ui/AddNamespaceDialog.java index 1508ccc553f3..88a807d8f3dd 100644 --- a/plugins/xpath/xpath-view/src/org/intellij/plugins/xpathView/ui/AddNamespaceDialog.java +++ b/plugins/xpath/xpath-view/src/org/intellij/plugins/xpathView/ui/AddNamespaceDialog.java @@ -20,6 +20,7 @@ import com.intellij.openapi.ui.ComboBox; import com.intellij.openapi.ui.DialogWrapper; import com.intellij.openapi.ui.Messages; import com.intellij.ui.DocumentAdapter; +import com.intellij.util.ArrayUtil; import javax.swing.*; import javax.swing.event.DocumentEvent; @@ -46,12 +47,12 @@ public class AddNamespaceDialog extends DialogWrapper { myIcon.setText(null); myIcon.setIcon(Messages.getQuestionIcon()); - myURI.setModel(new DefaultComboBoxModel(uriList.toArray(new String[uriList.size()]))); + myURI.setModel(new DefaultComboBoxModel(ArrayUtil.toStringArray(uriList))); myURI.setSelectedItem(""); myURI.setEditable(mode == Mode.EDITABLE || mode == Mode.URI_EDITABLE); addUpdateListener(myURI); - myPrefix.setModel(new DefaultComboBoxModel(unresolvedPrefixes.toArray(new String[unresolvedPrefixes.size()]))); + myPrefix.setModel(new DefaultComboBoxModel(ArrayUtil.toStringArray(unresolvedPrefixes))); myPrefix.setEditable(mode == Mode.EDITABLE || mode == Mode.PREFIX_EDITABLE); if (unresolvedPrefixes.size() == 1) { myPrefix.setSelectedItem(unresolvedPrefixes.iterator().next()); diff --git a/xml/impl/src/com/intellij/codeInsight/daemon/impl/analysis/CreateNSDeclarationIntentionFix.java b/xml/impl/src/com/intellij/codeInsight/daemon/impl/analysis/CreateNSDeclarationIntentionFix.java index b2d986e6126f..41f392ac4da8 100644 --- a/xml/impl/src/com/intellij/codeInsight/daemon/impl/analysis/CreateNSDeclarationIntentionFix.java +++ b/xml/impl/src/com/intellij/codeInsight/daemon/impl/analysis/CreateNSDeclarationIntentionFix.java @@ -197,7 +197,7 @@ public class CreateNSDeclarationIntentionFix implements HintAction, LocalQuickFi private static boolean checkIfGivenXmlHasTheseWords(final String name, final XmlFile tldFileByUri) { if (name == null || name.length() == 0) return true; final List list = StringUtil.getWordsIn(name); - final String[] words = list.toArray(new String[list.size()]); + final String[] words = ArrayUtil.toStringArray(list); final boolean[] wordsFound = new boolean[words.length]; final int[] wordsFoundCount = new int[1]; diff --git a/xml/impl/src/com/intellij/xml/actions/xmlbeans/GenerateInstanceDocumentFromSchemaAction.java b/xml/impl/src/com/intellij/xml/actions/xmlbeans/GenerateInstanceDocumentFromSchemaAction.java index e1de1b4f8ba0..58576150b025 100644 --- a/xml/impl/src/com/intellij/xml/actions/xmlbeans/GenerateInstanceDocumentFromSchemaAction.java +++ b/xml/impl/src/com/intellij/xml/actions/xmlbeans/GenerateInstanceDocumentFromSchemaAction.java @@ -28,6 +28,7 @@ import com.intellij.openapi.vfs.VfsUtil; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.psi.PsiManager; import com.intellij.psi.xml.XmlFile; +import com.intellij.util.ArrayUtil; import com.intellij.xml.XmlBundle; import gnu.trove.THashMap; import org.jetbrains.annotations.NonNls; @@ -129,7 +130,7 @@ public class GenerateInstanceDocumentFromSchemaAction extends AnAction { parameters.add("-name"); parameters.add(dialog.getElementName()); - String xml = Xsd2InstanceUtils.generate(parameters.toArray(new String[parameters.size()])); + String xml = Xsd2InstanceUtils.generate(ArrayUtil.toStringArray(parameters)); final VirtualFile baseDirForCreatedInstanceDocument1 = relativeFileDir; diff --git a/xml/impl/src/com/intellij/xml/actions/xmlbeans/GenerateInstanceDocumentFromSchemaDialog.java b/xml/impl/src/com/intellij/xml/actions/xmlbeans/GenerateInstanceDocumentFromSchemaDialog.java index f980bbf17664..3ddd31936db3 100644 --- a/xml/impl/src/com/intellij/xml/actions/xmlbeans/GenerateInstanceDocumentFromSchemaDialog.java +++ b/xml/impl/src/com/intellij/xml/actions/xmlbeans/GenerateInstanceDocumentFromSchemaDialog.java @@ -26,6 +26,7 @@ import com.intellij.psi.PsiFile; import com.intellij.psi.PsiManager; import com.intellij.psi.xml.XmlFile; import com.intellij.psi.xml.XmlTag; +import com.intellij.util.ArrayUtil; import com.intellij.xml.XmlBundle; import com.intellij.xml.XmlElementDescriptor; import org.jetbrains.annotations.Nullable; @@ -140,7 +141,7 @@ public class GenerateInstanceDocumentFromSchemaDialog extends DialogWrapper { } public void configureComboBox(JComboBox combo, List lastValues) { // without -editor.selectAll- no focus - combo.setModel(new DefaultComboBoxModel(lastValues.toArray(new String[lastValues.size()]))); + combo.setModel(new DefaultComboBoxModel(ArrayUtil.toStringArray(lastValues))); } private void updateFile() { diff --git a/xml/impl/src/com/intellij/xml/actions/xmlbeans/GenerateSchemaFromInstanceDocumentAction.java b/xml/impl/src/com/intellij/xml/actions/xmlbeans/GenerateSchemaFromInstanceDocumentAction.java index e4055797f72a..62bdcb7b177a 100644 --- a/xml/impl/src/com/intellij/xml/actions/xmlbeans/GenerateSchemaFromInstanceDocumentAction.java +++ b/xml/impl/src/com/intellij/xml/actions/xmlbeans/GenerateSchemaFromInstanceDocumentAction.java @@ -28,6 +28,7 @@ import com.intellij.openapi.ui.Messages; import com.intellij.openapi.vfs.LocalFileSystem; import com.intellij.openapi.vfs.VfsUtil; import com.intellij.openapi.vfs.VirtualFile; +import com.intellij.util.ArrayUtil; import com.intellij.xml.XmlBundle; import org.apache.xmlbeans.impl.inst2xsd.Inst2Xsd; import org.jetbrains.annotations.NonNls; @@ -136,7 +137,7 @@ public class GenerateSchemaFromInstanceDocumentAction extends AnAction { }); } - Inst2Xsd.main(parameters.toArray(new String[parameters.size()])); + Inst2Xsd.main(ArrayUtil.toStringArray(parameters)); if (expectedSchemaFile.exists()) { final boolean renamed = expectedSchemaFile.renameTo(xsd); if (! renamed) { diff --git a/xml/impl/src/com/intellij/xml/actions/xmlbeans/GenerateSchemaFromInstanceDocumentDialog.java b/xml/impl/src/com/intellij/xml/actions/xmlbeans/GenerateSchemaFromInstanceDocumentDialog.java index 08e703816edd..10c7294ef28b 100644 --- a/xml/impl/src/com/intellij/xml/actions/xmlbeans/GenerateSchemaFromInstanceDocumentDialog.java +++ b/xml/impl/src/com/intellij/xml/actions/xmlbeans/GenerateSchemaFromInstanceDocumentDialog.java @@ -20,6 +20,7 @@ import com.intellij.openapi.ui.ComboBox; import com.intellij.openapi.ui.DialogWrapper; import com.intellij.openapi.ui.TextFieldWithBrowseButton; import com.intellij.openapi.vfs.VirtualFile; +import com.intellij.util.ArrayUtil; import com.intellij.xml.XmlBundle; import javax.swing.*; @@ -102,7 +103,7 @@ public class GenerateSchemaFromInstanceDocumentDialog extends DialogWrapper { } public static void configureComboBox(JComboBox combo, List lastValues) { - combo.setModel(new DefaultComboBoxModel(lastValues.toArray(new String[lastValues.size()]))); + combo.setModel(new DefaultComboBoxModel(ArrayUtil.toStringArray(lastValues))); if (combo.getItemCount() != 0) { combo.setSelectedIndex(0); combo.getEditor().selectAll(); diff --git a/xml/impl/src/com/intellij/xml/impl/schema/XmlAttributeDescriptorImpl.java b/xml/impl/src/com/intellij/xml/impl/schema/XmlAttributeDescriptorImpl.java index d3145cfcb3dd..281ba5a99b6a 100644 --- a/xml/impl/src/com/intellij/xml/impl/schema/XmlAttributeDescriptorImpl.java +++ b/xml/impl/src/com/intellij/xml/impl/schema/XmlAttributeDescriptorImpl.java @@ -180,7 +180,7 @@ public class XmlAttributeDescriptorImpl extends BasicXmlAttributeDescriptor impl final boolean exaustive = XmlUtil.collectEnumerationValues(declaration, variants); if (variants.size() > 0) { - return new EnumerationData(variants.toArray(new String[variants.size()]), exaustive); + return new EnumerationData(ArrayUtil.toStringArray(variants), exaustive); } return null; } diff --git a/xml/openapi/src/com/intellij/xml/util/XmlTagUtil.java b/xml/openapi/src/com/intellij/xml/util/XmlTagUtil.java index 243cc03d4f11..30f7998f6078 100644 --- a/xml/openapi/src/com/intellij/xml/util/XmlTagUtil.java +++ b/xml/openapi/src/com/intellij/xml/util/XmlTagUtil.java @@ -22,6 +22,7 @@ import com.intellij.psi.xml.XmlToken; import com.intellij.psi.xml.XmlTokenType; import com.intellij.psi.xml.XmlTagValue; import com.intellij.openapi.util.TextRange; +import com.intellij.util.ArrayUtil; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -94,7 +95,7 @@ public class XmlTagUtil extends XmlTagUtilBase { public static String[] getCharacterEntityNames() { Set strings = ourCharacterEntities.keySet(); - return strings.toArray(new String[strings.size()]); + return ArrayUtil.toStringArray(strings); } public static Character getCharacterByEntityName(String entityName) {