MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

cleanup

Browse Source
This commit is contained in:
Alexey Kudravtsev
2011-02-18 12:04:16 +03:00
parent 6dc74dc931
commit 944cd16146
27 changed files with 59 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/psi/impl/light/LightModifierList.java
+2 -1
View File
@@ -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);
}
}
platform/lang-api/src/com/intellij/facet/frameworks/beans/ArtifactItem.java
+4 -3
View File
@@ -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<String> classes = ContainerUtil.mapNotNull(myRequiredClasses, new Function<RequiredClass, String>() {
@Override
@@ -67,7 +68,7 @@ public class ArtifactItem {
return requiredClass.getFqn();
}
});
return classes.toArray(new String[classes.size()]);
return ArrayUtil.toStringArray(classes);
}
}
platform/lang-impl/src/com/intellij/ide/util/AbstractTreeClassChooserDialog.java
+3 -3
View File
@@ -429,7 +429,7 @@ abstract public class AbstractTreeClassChooserDialog<T extends PsiNamedElement>
List<T> 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<T> list = new ArrayList<T>(classes.size());
for (T aClass : classes) {
@@ -437,7 +437,7 @@ abstract public class AbstractTreeClassChooserDialog<T extends PsiNamedElement>
list.add(aClass);
}
}
return list.toArray(new Object[list.size()]);
return ArrayUtil.toObjectArray(list);
}
@Nullable
@@ -530,7 +530,7 @@ abstract public class AbstractTreeClassChooserDialog<T extends PsiNamedElement>
myInheritorsProvider.getBaseClass().getName() != null) {
names.add(myInheritorsProvider.getBaseClass().getName());
}
return names.toArray(new String[names.size()]);
return ArrayUtil.toStringArray(names);
}
platform/platform-api/src/com/intellij/ui/components/JBScrollPane.java
+2 -1
View File
@@ -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);
plugins/android/src/org/jetbrains/android/compiler/AndroidCompileUtil.java
+2 -1
View File
@@ -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);
}
}
plugins/android/src/org/jetbrains/android/compiler/AndroidDexCompiler.java
+3 -1
View File
@@ -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<CompilerMessageCategory, List<String>> 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);
plugins/android/src/org/jetbrains/android/facet/AndroidFacetEditorTab.java
+1 -1
View File
@@ -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) {
plugins/ant/src/com/intellij/lang/ant/dom/AntDomRefIdConverter.java
+1 -1
View File
@@ -80,7 +80,7 @@ public class AntDomRefIdConverter extends Converter<AntDomElement> 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() {
plugins/eclipse/testSources/org/jetbrains/idea/eclipse/EclipseLibrariesModificationsTest.java
+2 -1
View File
@@ -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 {
plugins/git4idea/src/git4idea/checkin/GitCheckinEnvironment.java
+2 -1
View File
@@ -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<String> authors = usersList == null ? new ArrayList<String>() : new ArrayList<String>(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);
plugins/git4idea/src/git4idea/config/GitVcsSettings.java
+2 -1
View File
@@ -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<GitVcsSettings.S
* @return array for commit authors
*/
public String[] getCommitAuthors() {
return myCommitAuthors.toArray(new String[myCommitAuthors.size()]);
return ArrayUtil.toStringArray(myCommitAuthors);
}
public State getState() {
plugins/git4idea/src/git4idea/history/browser/ChangesFilter.java
+1 -1
View File
@@ -44,7 +44,7 @@ public class ChangesFilter {
for (Filter filter : filters) {
filter.getCommandParametersFilter().applyToCommandLine(strings);
}
return strings.toArray(new String[strings.size()]);
return ArrayUtil.toStringArray(strings);
}
public abstract static class Merger {
plugins/git4idea/src/git4idea/history/browser/LowLevelAccessImpl.java
+3 -2
View File
@@ -22,6 +22,7 @@ import com.intellij.openapi.util.Getter;
import com.intellij.openapi.vcs.FilePathImpl;
import com.intellij.openapi.vcs.VcsException;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.util.ArrayUtil;
import com.intellij.util.AsynchConsumer;
import git4idea.GitBranch;
import git4idea.GitTag;
@@ -67,7 +68,7 @@ public class LowLevelAccessImpl implements LowLevelAccess {
parameters.add("--max-count=" + useMaxCnt);
}
GitHistoryUtils.hashesWithParents(myProject, new FilePathImpl(myRoot), consumer, isCanceled, parameters.toArray(new String[parameters.size()]));
GitHistoryUtils.hashesWithParents(myProject, new FilePathImpl(myRoot), consumer, isCanceled, ArrayUtil.toStringArray(parameters));
}
@Override
@@ -145,7 +146,7 @@ public class LowLevelAccessImpl implements LowLevelAccess {
}
GitHistoryUtils.historyWithLinks(myProject, new FilePathImpl(myRoot),
refs, consumer, isCanceled, parameters.toArray(new String[parameters.size()]));
refs, consumer, isCanceled, ArrayUtil.toStringArray(parameters));
}
public List<String> getBranchesWithCommit(final SHAHash hash) throws VcsException {
plugins/git4idea/src/git4idea/history/wholeTree/GitCommitToCommitConvertor.java
+2 -1
View File
@@ -12,6 +12,7 @@
*/
package git4idea.history.wholeTree;
import com.intellij.util.ArrayUtil;
import com.intellij.util.containers.Convertor;
import git4idea.history.browser.GitCommit;
@@ -30,7 +31,7 @@ public class GitCommitToCommitConvertor implements Convertor<GitCommit, CommitHa
@Override
public CommitHashPlusParents convert(GitCommit o) {
final Set<String> parentsHashes = o.getParentsHashes();
return new CommitHashPlusParents(o.getShortHash(), parentsHashes.toArray(new String[parentsHashes.size()]), o.getDate().getTime(),
return new CommitHashPlusParents(o.getShortHash(), ArrayUtil.toStringArray(parentsHashes), o.getDate().getTime(),
o.getAuthor());
}
}
plugins/git4idea/src/git4idea/rebase/GitRebaseEntry.java
+1 -1
View File
@@ -75,7 +75,7 @@ class GitRebaseEntry {
*/
public void setAction(final Action action) {
if (action == null) {
log.assertTrue(false, "The action must not be null");
log.error("The action must not be null");
}
else {
myAction = action;
plugins/github/src/org/jetbrains/plugins/github/ui/GithubCloneProjectPane.java
+2 -1
View File
@@ -6,6 +6,7 @@ import com.intellij.openapi.fileChooser.FileChooserDescriptor;
import com.intellij.openapi.ui.TextFieldWithBrowseButton;
import com.intellij.openapi.vfs.LocalFileSystem;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.util.ArrayUtil;
import com.intellij.util.Consumer;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.plugins.github.RepositoryInfo;
@@ -120,7 +121,7 @@ public class GithubCloneProjectPane {
}
public void setAvailableRepos(final List<RepositoryInfo> 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());
plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/api/statements/GrNamedArgumentSearchVisitor.java
+1 -1
View File
@@ -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) {
plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/expressions/GrPropertyForCompletion.java
+2 -1
View File
@@ -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);
}
plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/refactorings/introduce/IntroducePropertyDialog.java
+2 -1
View File
@@ -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<String>(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) {
plugins/maven/src/main/java/org/jetbrains/idea/maven/services/MavenServicesManager.java
+2 -1
View File
@@ -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<Element> {
public static String[] getServiceUrls() {
final List<String> 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/",
plugins/maven/src/main/java/org/jetbrains/idea/maven/utils/MavenGotoFileContributor.java
+2 -1
View File
@@ -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) {
plugins/maven/src/test/java/org/jetbrains/idea/maven/project/MavenProjectReaderTest.java
+2 -1
View File
@@ -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<String> 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);
}
plugins/relaxng/src/org/intellij/plugins/relaxNG/GotoSymbolContributor.java
+2 -1
View File
@@ -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<String> names = RelaxSymbolIndex.getSymbolNames(project);
return names.toArray(new String[names.size()]);
return ArrayUtil.toStringArray(names);
}
}
plugins/relaxng/src/org/intellij/plugins/relaxNG/convert/IdeaDriver.java
+4 -3
View File
@@ -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));
}
plugins/testng/testSources/com/theoryinpractice/testng/referenceContributor/TestNGDataProviderTest.java
+2 -1
View File
@@ -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"}},
};
xml/dom-impl/src/com/intellij/util/dom/generator/MergingFileManager.java
+5 -3
View File
@@ -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<String> list = new ArrayList<String>();
BufferedReader in = null;
try {
@@ -240,7 +242,7 @@ public class MergingFileManager implements FileManager {
}
}
}
return list.toArray(new String[list.size()]);
return ArrayUtil.toStringArray(list);
}
}
xml/dom-impl/src/com/intellij/util/dom/generator/ModelGen.java
+2 -1
View File
@@ -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);
}