Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJaxsun McCarthy Huggan2016-03-24 16:18:54 -0400
committerSam Davis2016-03-24 18:05:55 -0400
commitd435f1971ee587f8e3b6a7e6d57db169a4d7f2de (patch)
tree6d6e36c8db7cb487e6333124c4256b45a0673dbf /org.eclipse.mylyn.reviews.ui/src
parent8980fe273e992b30019a1d6e014da5112c53adaf (diff)
downloadorg.eclipse.mylyn.reviews-d435f1971ee587f8e3b6a7e6d57db169a4d7f2de.tar.gz
org.eclipse.mylyn.reviews-d435f1971ee587f8e3b6a7e6d57db169a4d7f2de.tar.xz
org.eclipse.mylyn.reviews-d435f1971ee587f8e3b6a7e6d57db169a4d7f2de.zip
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>
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
-rw-r--r--org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/internal/reviews/ui/compare/ReviewItemCompareEditorInput.java4
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 6d76a659..5d2eb276 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 0d8ad6f9..cab64b4a 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);
}

Back to the top