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

EA-36502 - IAE: ArrayUtil.mergeArrays

Browse Source
This commit is contained in:
Anna Kozlova
2012-06-08 18:02:30 +04:00
parent 4b3fdfb213
commit c19a212d1f
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/refactoring/copy/CopyClassesHandler.java
+7 -3
View File
@@ -138,10 +138,14 @@ public class CopyClassesHandler extends CopyHandlerDelegateBase {
private static void fillResultsMap(Map<PsiFile, PsiClass[]> result, PsiFile containingFile, PsiClass[] topLevelClasses) {
PsiClass[] classes = result.get(containingFile);
if (classes != null) {
topLevelClasses = ArrayUtil.mergeArrays(classes, topLevelClasses, PsiClass.ARRAY_FACTORY);
if (topLevelClasses != null) {
if (classes != null) {
topLevelClasses = ArrayUtil.mergeArrays(classes, topLevelClasses, PsiClass.ARRAY_FACTORY);
}
result.put(containingFile, topLevelClasses);
} else {
result.put(containingFile, classes);
}
result.put(containingFile, topLevelClasses);
}
public void doCopy(PsiElement[] elements, PsiDirectory defaultTargetDirectory) {