From afd3bcc61b6a7cb072f6421f4d573b1c1763bc3b Mon Sep 17 00:00:00 2001 From: nik Date: Fri, 4 Mar 2011 11:16:00 +0300 Subject: [PATCH] migrated for new method to merge string arrays --- .../intellij/codeInsight/ExternalAnnotationsManagerImpl.java | 2 +- .../src/com/intellij/ide/projectView/impl/ProjectViewImpl.java | 2 +- platform/util/src/com/intellij/util/ArrayUtil.java | 3 +-- .../lang/psi/impl/statements/typedef/GrTypeDefinitionImpl.java | 2 +- .../intellij/plugins/relaxNG/compact/RncCompletionData.java | 3 +-- .../util/xml/converters/values/BooleanValueConverter.java | 2 +- xml/dom-openapi/src/com/intellij/util/xml/ui/TooltipUtils.java | 2 +- .../intellij/psi/filters/getters/XmlAttributeValueGetter.java | 2 +- .../source/resolve/reference/impl/providers/URLReference.java | 2 +- 9 files changed, 9 insertions(+), 11 deletions(-) diff --git a/java/java-impl/src/com/intellij/codeInsight/ExternalAnnotationsManagerImpl.java b/java/java-impl/src/com/intellij/codeInsight/ExternalAnnotationsManagerImpl.java index be0f4675a887..e402e73435f7 100644 --- a/java/java-impl/src/com/intellij/codeInsight/ExternalAnnotationsManagerImpl.java +++ b/java/java-impl/src/com/intellij/codeInsight/ExternalAnnotationsManagerImpl.java @@ -438,7 +438,7 @@ public class ExternalAnnotationsManagerImpl extends ExternalAnnotationsManager { else if (entry instanceof ModuleSourceOrderEntry) { final ModifiableRootModel model = ModuleRootManager.getInstance(entry.getOwnerModule()).getModifiableModel(); model.setRootUrls(AnnotationOrderRootType.getInstance(), ArrayUtil.mergeArrays( - model.getRootUrls(AnnotationOrderRootType.getInstance()), new String[]{vFile.getUrl()}, ArrayUtil.STRING_ARRAY_FACTORY)); + model.getRootUrls(AnnotationOrderRootType.getInstance()), vFile.getUrl())); model.commit(); } else if (entry instanceof JdkOrderEntry) { diff --git a/platform/lang-impl/src/com/intellij/ide/projectView/impl/ProjectViewImpl.java b/platform/lang-impl/src/com/intellij/ide/projectView/impl/ProjectViewImpl.java index b72c14c6b5bd..849cf1acc0ca 100644 --- a/platform/lang-impl/src/com/intellij/ide/projectView/impl/ProjectViewImpl.java +++ b/platform/lang-impl/src/com/intellij/ide/projectView/impl/ProjectViewImpl.java @@ -445,7 +445,7 @@ public final class ProjectViewImpl extends ProjectView implements PersistentStat final String id = newPane.getId(); myId2Pane.put(id, newPane); String[] subIds = newPane.getSubIds(); - subIds = ArrayUtil.mergeArrays(new String[]{null}, subIds, ArrayUtil.STRING_ARRAY_FACTORY); + subIds = ArrayUtil.mergeArrays(new String[]{null}, subIds); for (String subId : subIds) { myCombo.insertItemAt(Pair.create(id, subId), index++); } diff --git a/platform/util/src/com/intellij/util/ArrayUtil.java b/platform/util/src/com/intellij/util/ArrayUtil.java index f94a10063b3d..40e9191af38d 100644 --- a/platform/util/src/com/intellij/util/ArrayUtil.java +++ b/platform/util/src/com/intellij/util/ArrayUtil.java @@ -171,9 +171,8 @@ public class ArrayUtil { return result; } - //todo[nik] use this method where possible @NotNull - public static String[] mergeArrays(@NotNull String[] a1, @NotNull String[] a2) { + public static String[] mergeArrays(@NotNull String[] a1, @NotNull String... a2) { return mergeArrays(a1, a2, STRING_ARRAY_FACTORY); } 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 43108833d68c..cbebd79ba5e0 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 @@ -186,7 +186,7 @@ public abstract class GrTypeDefinitionImpl extends GrStubElementBase { @NonNls public String[] getAllValues() { - final String[] strings = ArrayUtil.mergeArrays(getTrueValues(), getFalseValues(), ArrayUtil.STRING_ARRAY_FACTORY); + final String[] strings = ArrayUtil.mergeArrays(getTrueValues(), getFalseValues()); Arrays.sort(strings); diff --git a/xml/dom-openapi/src/com/intellij/util/xml/ui/TooltipUtils.java b/xml/dom-openapi/src/com/intellij/util/xml/ui/TooltipUtils.java index dbe742dd000e..4aefe41ca91f 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/ui/TooltipUtils.java +++ b/xml/dom-openapi/src/com/intellij/util/xml/ui/TooltipUtils.java @@ -35,7 +35,7 @@ public class TooltipUtils { } public static String getTooltipText(List annotations, String[] messages) { - return getTooltipText(ArrayUtil.mergeArrays(getMessages(annotations), messages, ArrayUtil.STRING_ARRAY_FACTORY)); + return getTooltipText(ArrayUtil.mergeArrays(getMessages(annotations), messages)); } private static String[] getMessages(final List problems) { diff --git a/xml/impl/src/com/intellij/psi/filters/getters/XmlAttributeValueGetter.java b/xml/impl/src/com/intellij/psi/filters/getters/XmlAttributeValueGetter.java index b7de7d7cd02e..dbcf28dd89c7 100644 --- a/xml/impl/src/com/intellij/psi/filters/getters/XmlAttributeValueGetter.java +++ b/xml/impl/src/com/intellij/psi/filters/getters/XmlAttributeValueGetter.java @@ -67,7 +67,7 @@ public class XmlAttributeValueGetter implements ContextGetter { if(values == null || values.length==0) { values = strings; } else if (strings != null) { - values = ArrayUtil.mergeArrays(values, strings, ArrayUtil.STRING_ARRAY_FACTORY); + values = ArrayUtil.mergeArrays(values, strings); } return values == null ? ArrayUtil.EMPTY_OBJECT_ARRAY : values; diff --git a/xml/impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/URLReference.java b/xml/impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/URLReference.java index 4ce1814163f9..65719f836096 100644 --- a/xml/impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/URLReference.java +++ b/xml/impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/URLReference.java @@ -211,7 +211,7 @@ public class URLReference implements PsiReference, QuickFixProvider, EmptyResolv return true; } }); - resourceUrls = ArrayUtil.mergeArrays(resourceUrls, ArrayUtil.toStringArray(additionalNs), ArrayUtil.STRING_ARRAY_FACTORY); + resourceUrls = ArrayUtil.mergeArrays(resourceUrls, ArrayUtil.toStringArray(additionalNs)); return resourceUrls; }