From 9f145780c4f401b48c27e3e389c2e3afdc7531cf Mon Sep 17 00:00:00 2001 From: David Pursehouse Date: Thu, 18 Feb 2016 16:37:01 +0900 Subject: [PATCH] PermissionEditor: Use REST API instead of RPC service Change-Id: Ib190552e4c4c15ac99373a8c26a86f702e09a785 --- .../gerrit/client/admin/PermissionEditor.java | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/PermissionEditor.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/PermissionEditor.java index b9baccc76c..91107d37f3 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/PermissionEditor.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/PermissionEditor.java @@ -14,8 +14,8 @@ package com.google.gerrit.client.admin; +import com.google.gerrit.client.groups.GroupMap; import com.google.gerrit.client.rpc.GerritCallback; -import com.google.gerrit.client.ui.SuggestUtil; import com.google.gerrit.common.data.AccessSection; import com.google.gerrit.common.data.GlobalCapability; import com.google.gerrit.common.data.GroupInfo; @@ -241,14 +241,16 @@ public class PermissionEditor extends Composite implements Editor, // If the oracle didn't get to complete a UUID, resolve it now. // addRule.setEnabled(false); - SuggestUtil.SVC.suggestAccountGroupForProject( - projectName, ref.getName(), 1, - new GerritCallback>() { + GroupMap.suggestAccountGroupForProject( + projectName.get(), ref.getName(), 1, + new GerritCallback() { @Override - public void onSuccess(List result) { + public void onSuccess(GroupMap result) { addRule.setEnabled(true); - if (result.size() == 1) { - addGroup(result.get(0)); + if (result.values().length() == 1) { + addGroup(new GroupReference( + result.values().get(0).getGroupUUID(), + result.values().get(0).name())); } else { groupToAdd.setFocus(true); }