From 1d7de014a236b8a1ba687d3315a56842f50abc6a Mon Sep 17 00:00:00 2001
From: Dave Borowitz <dborowitz@google.com>
Date: Wed, 29 Apr 2015 07:46:32 -0700
Subject: [PATCH] Rename PatchLineCommentComparator to PLC_ORDER

Change-Id: I26fd5cf4442e2bb1036bc6304c9e3e37902a0dc9
---
 .../java/com/google/gerrit/server/PatchLineCommentsUtil.java    | 2 +-
 .../main/java/com/google/gerrit/server/notedb/ChangeNotes.java  | 2 +-
 .../com/google/gerrit/server/notedb/CommentsInNotesUtil.java    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/PatchLineCommentsUtil.java b/gerrit-server/src/main/java/com/google/gerrit/server/PatchLineCommentsUtil.java
index f67fa75ba9..e412f9857a 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/PatchLineCommentsUtil.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/PatchLineCommentsUtil.java
@@ -345,7 +345,7 @@ public class PatchLineCommentsUtil {
   }
 
   private static List<PatchLineComment> sort(List<PatchLineComment> comments) {
-    Collections.sort(comments, ChangeNotes.PatchLineCommentComparator);
+    Collections.sort(comments, ChangeNotes.PLC_ORDER);
     return comments;
   }
 }
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/notedb/ChangeNotes.java b/gerrit-server/src/main/java/com/google/gerrit/server/notedb/ChangeNotes.java
index 6d4f3a4225..8cb72e93ef 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/notedb/ChangeNotes.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/notedb/ChangeNotes.java
@@ -76,7 +76,7 @@ public class ChangeNotes extends AbstractChangeNotes<ChangeNotes> {
           }
         });
 
-  public static Comparator<PatchLineComment> PatchLineCommentComparator =
+  public static Comparator<PatchLineComment> PLC_ORDER =
       new Comparator<PatchLineComment>() {
     @Override
     public int compare(PatchLineComment c1, PatchLineComment c2) {
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/notedb/CommentsInNotesUtil.java b/gerrit-server/src/main/java/com/google/gerrit/server/notedb/CommentsInNotesUtil.java
index 34ecbc0ec6..f3e03c0110 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/notedb/CommentsInNotesUtil.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/notedb/CommentsInNotesUtil.java
@@ -531,7 +531,7 @@ public class CommentsInNotesUtil {
         "No comments to write; to delete, use removeNoteFromNoteMap().");
     ObjectId commit =
         ObjectId.fromString(allComments.get(0).getRevId().get());
-    Collections.sort(allComments, ChangeNotes.PatchLineCommentComparator);
+    Collections.sort(allComments, ChangeNotes.PLC_ORDER);
     noteMap.set(commit, inserter.insert(OBJ_BLOB, buildNote(allComments)));
   }