Fix array merging

java/openapi/src/com/intellij/psi/PsiImportStatementBase.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2009 JetBrains s.r.o.
+ * Copyright 2000-2011 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,6 +15,7 @@
  */
 package com.intellij.psi;
 
+import com.intellij.util.ArrayFactory;
 import org.jetbrains.annotations.Nullable;
 
 /**
@@ -28,6 +29,13 @@ public interface PsiImportStatementBase extends PsiElement {
    */
   PsiImportStatementBase[] EMPTY_ARRAY = new PsiImportStatementBase[0];
 
+  ArrayFactory<PsiImportStatementBase> ARRAY_FACTORY = new ArrayFactory<PsiImportStatementBase>() {
+    @Override
+    public PsiImportStatementBase[] create(final int count) {
+      return count == 0 ? EMPTY_ARRAY : new PsiImportStatementBase[count];
+    }
+  };
+
   /**
    * Checks if the statement represents a single element or on-demand import.
    *

platform/util/src/com/intellij/util/ArrayUtil.java

@@ -146,7 +146,7 @@ public class ArrayUtil {
     return ret;
   }
 
-  /** @deprecated use {@linkplain #mergeArrays(Object[], Object[])} (to remove in IDEA 13) */
+  /** @deprecated use {@linkplain #mergeArrays(Object[], Object[], com.intellij.util.ArrayFactory)} (to remove in IDEA 13) */
   @NotNull
   public static <T> T[] mergeArrays(@NotNull T[] a1, @NotNull T[] a2, @NotNull Class<T> aClass) {
     if (a1.length == 0) {