Navigation History Entry - Issue eclipse-platform#339

Changes the implementation of the mergeInto method of the class
NavigationHistoryEntry. This is to fix the reported github issue eclipse-platform#339,
where a user has multiple different editors whose EditorInputs are both
FileEditorInputs with the same underlying file. Thus the editorInputs of
the multiple editors were considered the same, and when navigating
between the editors, the navigation history entries were being merged,
incorrectly.

The supplied change checks both if the editor inputs and editorIDs of
two navigation history entries are the same before merging the two
navigation history entries.

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

@@ -15,6 +15,7 @@
 package org.eclipse.ui.internal;
 
 import java.util.ArrayList;
+import java.util.Objects;
 import org.eclipse.ui.IEditorPart;
 import org.eclipse.ui.IMemento;
 import org.eclipse.ui.INavigationLocation;
@@ -165,7 +166,8 @@ void dispose() {
 	 * possible otherwise returns false.
 	 */
 	boolean mergeInto(NavigationHistoryEntry currentEntry) {
-		if (editorInfo.editorInput != null && editorInfo.editorInput.equals(currentEntry.editorInfo.editorInput)) {
+		if (Objects.equals(editorInfo.editorInput, currentEntry.editorInfo.editorInput)
+				&& Objects.equals(editorInfo.editorID, currentEntry.editorInfo.editorID)) {
 			if (location != null) {
 				if (currentEntry.location == null) {
 					currentEntry.location = location;