commit 2f40d793ea11458b6a345fc3907ee5447f60a8c8
author Patrick Hiesel <hiesel@google.com> Wed Aug 16 16:59:06 2017 +0200
committer Patrick Hiesel <hiesel@google.com> Wed Aug 16 16:59:12 2017 +0200
tree 136d98bdb43e2aecefb4ee1ef127aa720411c878
parent 2c76a76449b94574040c5fc6c53cd4684d1717f5

Abandon: Use BooleanCondition for #setVisible

Change-Id: I787dce5f5de57acaf093a0f6a8efe9b730fb0898

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

diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/Abandon.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/Abandon.java
index 5073e4a..14aa108 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/change/Abandon.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/Abandon.java
@@ -14,6 +14,8 @@
 
 package com.google.gerrit.server.change;
 
+import static com.google.gerrit.extensions.conditions.BooleanCondition.and;
+
 import com.google.common.collect.ImmutableListMultimap;
 import com.google.common.collect.ListMultimap;
 import com.google.gerrit.common.TimeUtil;
@@ -191,8 +193,8 @@
         .setLabel("Abandon")
         .setTitle("Abandon the change")
         .setVisible(
-            change.getStatus().isOpen()
-                && change.getStatus() != Change.Status.DRAFT
-                && rsrc.permissions().database(dbProvider).testOrFalse(ChangePermission.ABANDON));
+            and(
+                change.getStatus().isOpen() && change.getStatus() != Change.Status.DRAFT,
+                rsrc.permissions().database(dbProvider).testCond(ChangePermission.ABANDON)));
   }
 }