Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSam Davis2014-08-11 19:20:56 -0400
committerSam Davis2014-08-18 19:01:14 -0400
commit3463aa185bc26145c10d3899e03181753ab89a43 (patch)
tree8011c247a32c218679d082573a85fd8f42eab34e /org.eclipse.mylyn.reviews.ui/src
parent2303b76a01b385acbc606a0a6bf84fa8631974d3 (diff)
downloadorg.eclipse.mylyn.reviews-3463aa185bc26145c10d3899e03181753ab89a43.tar.gz
org.eclipse.mylyn.reviews-3463aa185bc26145c10d3899e03181753ab89a43.tar.xz
org.eclipse.mylyn.reviews-3463aa185bc26145c10d3899e03181753ab89a43.zip
440821: comment navigation gets stuck on first annotation on right side
Change-Id: Ie1c1eee0d1a43ca4f31564a175821ebceede49b8 Task-Url: https://bugs.eclipse.org/bugs/show_bug.cgi?id=440821
Diffstat (limited to 'org.eclipse.mylyn.reviews.ui/src')
-rw-r--r--org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/internal/reviews/ui/compare/ReviewCompareAnnotationSupport.java6
1 files changed, 6 insertions, 0 deletions
diff --git a/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/internal/reviews/ui/compare/ReviewCompareAnnotationSupport.java b/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/internal/reviews/ui/compare/ReviewCompareAnnotationSupport.java
index a50d4bd6..0fc24897 100644
--- a/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/internal/reviews/ui/compare/ReviewCompareAnnotationSupport.java
+++ b/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/internal/reviews/ui/compare/ReviewCompareAnnotationSupport.java
@@ -279,6 +279,9 @@ public class ReviewCompareAnnotationSupport {
} else if ((nextLeftPosition.offset > currentLeftOffset && nextRightPosition.offset < currentLeftOffset)) {
moveToAnnotation(rightSourceViewer, leftSourceViewer, nextLeftPosition);
return LEFT_SIDE;
+ } else if (nextRightPosition.offset == currentLeftOffset) {
+ moveToAnnotation(rightSourceViewer, leftSourceViewer, nextLeftPosition);
+ return LEFT_SIDE;
} else {
moveToAnnotation(leftSourceViewer, rightSourceViewer, nextRightPosition);
return RIGHT_SIDE;
@@ -328,6 +331,9 @@ public class ReviewCompareAnnotationSupport {
} else if ((nextLeftPosition.offset < currentLeftOffset && nextRightPosition.offset > currentLeftOffset)) {
moveToAnnotation(rightSourceViewer, leftSourceViewer, nextLeftPosition);
return LEFT_SIDE;
+ } else if (nextRightPosition.offset == currentLeftOffset) {
+ moveToAnnotation(rightSourceViewer, leftSourceViewer, nextLeftPosition);
+ return LEFT_SIDE;
} else {
moveToAnnotation(leftSourceViewer, rightSourceViewer, nextRightPosition);
return RIGHT_SIDE;

Back to the top