commit 19354aa94dfa98fb34ae937327f30d7aff839666
author Edwin Kempin <ekempin@google.com> Thu Sep 22 16:10:52 2016 +0200
committer Edwin Kempin <ekempin@google.com> Thu Sep 22 18:01:14 2016 +0200
tree a5e90fb6ca018ba062274cbfc5a328dc0fb503d6
parent 4475f68df01109d0a8a709395d17addb97f73436

Adapt comments and names to replacement of PatchLineComment

We now use Comment instead of PatchLineComment.

Change-Id: Ie26195d6aeb2c7822a2eda1e5f9ad86368691b88
Signed-off-by: Edwin Kempin <ekempin@google.com>

gerrit-server/src/main/java/com/google/gerrit/server/change/EmailReviewComments.java

diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/EmailReviewComments.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/EmailReviewComments.java
index f887be4..0b9a877 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/change/EmailReviewComments.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/EmailReviewComments.java
@@ -110,7 +110,7 @@
       cm.setPatchSet(patchSet,
           patchSetInfoFactory.get(notes.getProjectName(), patchSet));
       cm.setChangeMessage(message.getMessage(), message.getWrittenOn());
-      cm.setPatchLineComments(comments);
+      cm.setComments(comments);
       cm.setNotify(notify);
       cm.send();
     } catch (Exception e) {

gerrit-server/src/main/java/com/google/gerrit/server/change/PostReview.java

diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/PostReview.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/PostReview.java
index 1a41f7d..1ac9e11 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/change/PostReview.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/PostReview.java
@@ -371,7 +371,7 @@
   }
 
   /**
-   * Used to compare PatchLineComments with CommentInput comments.
+   * Used to compare Comments with CommentInput comments.
    */
   @AutoValue
   abstract static class CommentSetEntry {

gerrit-server/src/main/java/com/google/gerrit/server/mail/CommentSender.java

diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/mail/CommentSender.java b/gerrit-server/src/main/java/com/google/gerrit/server/mail/CommentSender.java
index 84091ad..93f820d 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/mail/CommentSender.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/mail/CommentSender.java
@@ -64,12 +64,11 @@
     this.commentsUtil = commentsUtil;
   }
 
-  public void setPatchLineComments(List<Comment> plc)
-      throws OrmException {
-    inlineComments = plc;
+  public void setComments(List<Comment> comments) throws OrmException {
+    inlineComments = comments;
 
     Set<String> paths = new HashSet<>();
-    for (Comment c : plc) {
+    for (Comment c : comments) {
       if (!Patch.isMagic(c.key.filename)) {
         paths.add(c.key.filename);
       }