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-65136 diff: fix NPE

Browse Source 
getContentTitles() contains nullable elements
This commit is contained in:
Aleksey Pivovarov
2015-02-20 15:03:28 +03:00
parent c8e6f43fe7
commit 36b00479f9
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/diff-impl/src/com/intellij/diff/util/DiffUtil.java
+7 -1
View File
@@ -57,6 +57,7 @@ import com.intellij.openapi.project.Project;
import com.intellij.openapi.ui.DialogWrapperDialog;
import com.intellij.openapi.ui.WindowWrapper;
import com.intellij.openapi.util.*;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.openapi.vfs.ReadonlyStatusHandler;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.openapi.wm.IdeFocusManager;
@@ -78,6 +79,7 @@ import java.awt.*;
import java.nio.charset.Charset;
import java.util.ArrayList;
import java.util.BitSet;
import java.util.Collections;
import java.util.List;
public class DiffUtil {
@@ -349,8 +351,12 @@ public class DiffUtil {
List<JComponent> result = new ArrayList<JComponent>(contents.size());
if (equalCharsets && equalSeparators && ContainerUtil.find(titles, Condition.NOT_NULL) == null) {
return Collections.nCopies(titles.size(), null);
}
for (int i = 0; i < contents.size(); i++) {
result.add(createTitle(titles.get(i), contents.get(i), equalCharsets, equalSeparators, editors.get(i)));
result.add(createTitle(StringUtil.notNullize(titles.get(i)), contents.get(i), equalCharsets, equalSeparators, editors.get(i)));
}
return result;