Skip to content

Commit 3002012

Browse files
sratziloveeclipse
authored andcommitted
WorkbookEditorsHandler: Fix NPE in case name is null
Regression was introduced in 03277d3, where getTitle() was accidentally changed to getName(). Revert that back to getTitle(). getTitle() is already null-safe in most cases, but to be 100% safe, guard it using Util.safeString() again. Fixes #1275.
1 parent 4c5fccc commit 3002012

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkbookEditorsHandler.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@
5252
import org.eclipse.ui.commands.ICommandService;
5353
import org.eclipse.ui.dialogs.SearchPattern;
5454
import org.eclipse.ui.dialogs.StyledStringHighlighter;
55+
import org.eclipse.ui.internal.util.Util;
5556
import org.eclipse.ui.themes.ITheme;
5657

5758
/**
@@ -163,7 +164,7 @@ private List<EditorReference> getParts(WorkbenchPage page) {
163164
private Map<EditorReference, String> generateColumnLabelTexts(List<EditorReference> editorReferences) {
164165
Map<EditorReference, String> editorReferenceLabelTexts = new HashMap<>(editorReferences.size());
165166
Map<String, List<EditorReference>> collisionsMap = editorReferences.stream()
166-
.collect(Collectors.groupingBy(r -> r.getName()));
167+
.collect(Collectors.groupingBy(r -> Util.safeString(r.getTitle())));
167168

168169
for (Entry<String, List<EditorReference>> groupedEditorReferences : collisionsMap.entrySet()) {
169170
if (groupedEditorReferences.getValue().size() == 1) {

0 commit comments

Comments
 (0)