tag 5b972a2db199655f8d00ae3e2068657bf1f4a6fb
tagger Laurent Delaigue <laurent.delaigue@obeo.fr> Wed May 10 15:12:09 2017 +0200
object 237891798f6e45ea75fc67a8ed2728fc7fe6fd9a

EMF Compare 3.3.1M7a - Oxygen M7 - 201705101247

commit 237891798f6e45ea75fc67a8ed2728fc7fe6fd9a
author Philip Langer <planger@eclipsesource.com> Mon Jan 09 10:17:02 2017 +0100
committer Laurent Goubet <laurent.goubet@obeo.fr> Tue May 09 11:50:11 2017 +0200
tree 0c035746a711f6ef1475423f5507801455c4cbb3
parent 777109436f09549e4608abf59379071c3e5fe03f

[509975] Selection should be considered for "next" or "previous" change

To avoid affecting the behavior of jumping to the next unresolved diff,
which is performed at the end of running the MergeAction, this change
adapts Navigatable.getNextUnresolvedDiff(TreeItem) to start looking for
the next unresolved diff from the beginning if there is no next
unresolved diff AFTER the currently selected diff.

Bug: 509975
Change-Id: Ic011cbf8f6b5e187740a0e3949cded947a2390ad
Signed-off-by: Philip Langer <planger@eclipsesource.com>
Also-by: Conor O'Mahony <conor.s.omahony@gmail.com>