From 3d6dcffd53d3706ce673e3b52668a6d232c5ab4b Mon Sep 17 00:00:00 2001
From: Dave Borowitz <dborowitz@google.com>
Date: Wed, 10 Oct 2012 10:13:25 -0700
Subject: [PATCH] Warning cleanup in ChangeMergeQueue and MergeOp

Change-Id: I5a9f6e58cc7c25fbf77a7eafbb593faa161acc1d
---
 .../java/com/google/gerrit/server/git/ChangeMergeQueue.java     | 2 ++
 .../src/main/java/com/google/gerrit/server/git/MergeOp.java     | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/ChangeMergeQueue.java b/gerrit-server/src/main/java/com/google/gerrit/server/git/ChangeMergeQueue.java
index 6d1b1556a0..eab27f046a 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/git/ChangeMergeQueue.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/git/ChangeMergeQueue.java
@@ -89,6 +89,7 @@ public class ChangeMergeQueue implements MergeQueue {
         });
       }
 
+      @SuppressWarnings("unused")
       @Provides
       public PerThreadRequestScope.Scoper provideScoper(
           final PerThreadRequestScope.Propagator propagator) {
@@ -243,6 +244,7 @@ public class ChangeMergeQueue implements MergeQueue {
       dest = d;
     }
 
+    @Override
     public void run() {
       unschedule(this);
       mergeImpl(dest);
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/MergeOp.java b/gerrit-server/src/main/java/com/google/gerrit/server/git/MergeOp.java
index 26fd2ea945..8123c64dc8 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/git/MergeOp.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/git/MergeOp.java
@@ -487,6 +487,7 @@ public class MergeOp {
     toMerge.clear();
     toMerge.addAll(heads);
     Collections.sort(toMerge, new Comparator<CodeReviewCommit>() {
+      @Override
       public int compare(final CodeReviewCommit a, final CodeReviewCommit b) {
         return a.originalOrder - b.originalOrder;
       }
@@ -854,6 +855,7 @@ public class MergeOp {
       approvalList =
           db.patchSetApprovals().byPatchSet(n.patchsetId).toList();
       Collections.sort(approvalList, new Comparator<PatchSetApproval>() {
+        @Override
         public int compare(final PatchSetApproval a, final PatchSetApproval b) {
           return a.getGranted().compareTo(b.getGranted());
         }