488164: use IComment instead of Comment when going to an annotation

Change-Id: I51cb87102e354c7074abe43d0f47dc98d4dd8f2b
Task-Url: https://bugs.eclipse.org/bugs/show_bug.cgi?id=488164
Signed-off-by: Jaxsun McCarthy Huggan <jaxsun.mccarthy@tasktop.com>

2 files changed, 5 insertions, 5 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 6d76a659d..5d2eb276a 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
@@ -45,9 +45,9 @@ import org.eclipse.mylyn.internal.reviews.ui.annotations.CommentAnnotation;
 import org.eclipse.mylyn.internal.reviews.ui.annotations.CommentAnnotationHoverInput;
 import org.eclipse.mylyn.internal.reviews.ui.annotations.CommentPopupDialog;
 import org.eclipse.mylyn.internal.reviews.ui.annotations.ReviewAnnotationModel;
+import org.eclipse.mylyn.reviews.core.model.IComment;
 import org.eclipse.mylyn.reviews.core.model.IFileItem;
 import org.eclipse.mylyn.reviews.core.model.IReviewItem;
-import org.eclipse.mylyn.reviews.internal.core.model.Comment;
 import org.eclipse.mylyn.reviews.ui.ReviewBehavior;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.StyledText;
@@ -223,7 +223,7 @@ public class ReviewCompareAnnotationSupport {
 		return null;
 	}
 
-	public void gotoAnnotationWithComment(final Comment comment) {
+	public void gotoAnnotationWithComment(IComment comment) {
 		CommentAnnotation rightAnnotation = findComment(rightAnnotationModel, comment);
 		if (rightAnnotation != null) {
 			selectAndReveal(rightSourceViewer, rightAnnotation.getPosition());
@@ -235,7 +235,7 @@ public class ReviewCompareAnnotationSupport {
 		}
 	}
 
-	private CommentAnnotation findComment(ReviewAnnotationModel annotationModel, final Comment comment) {
+	private CommentAnnotation findComment(ReviewAnnotationModel annotationModel, final IComment comment) {
 		Optional<Annotation> annotation = Iterators.tryFind(annotationModel.getAnnotationIterator(),
 				new Predicate<Annotation>() {
 					public boolean apply(Annotation annotation) {
diff --git a/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/internal/reviews/ui/compare/ReviewItemCompareEditorInput.java b/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/internal/reviews/ui/compare/ReviewItemCompareEditorInput.java
index 0d8ad6f9f..cab64b4ad 100644
--- a/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/internal/reviews/ui/compare/ReviewItemCompareEditorInput.java
+++ b/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/internal/reviews/ui/compare/ReviewItemCompareEditorInput.java
@@ -32,7 +32,7 @@ import org.eclipse.mylyn.commons.core.StatusHandler;
 import org.eclipse.mylyn.internal.reviews.ui.Messages;
 import org.eclipse.mylyn.internal.reviews.ui.ReviewsImages;
 import org.eclipse.mylyn.internal.reviews.ui.ReviewsUiPlugin;
-import org.eclipse.mylyn.reviews.internal.core.model.Comment;
+import org.eclipse.mylyn.reviews.core.model.IComment;
 import org.eclipse.mylyn.reviews.ui.ReviewBehavior;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.widgets.Composite;
@@ -107,7 +107,7 @@ public abstract class ReviewItemCompareEditorInput extends CompareEditorInput {
 		return contentViewer;
 	}
 
-	public void gotoComment(Comment comment) {
+	public void gotoComment(IComment comment) {
 		if (currentSupport != null) {
 			currentSupport.gotoAnnotationWithComment(comment);
 		}