Merge "Add additional information in Groups Table."

This commit is contained in:
Martin Fick
2011-08-25 14:14:17 -07:00
committed by Android Code Review
9 changed files with 70 additions and 19 deletions

View File

@@ -15,9 +15,9 @@
package com.google.gerrit.common.data;
import com.google.gerrit.common.auth.SignInRequired;
import com.google.gerrit.common.data.GroupDetail;
import com.google.gerrit.reviewdb.Account;
import com.google.gerrit.reviewdb.AccountExternalId;
import com.google.gerrit.reviewdb.AccountGroup;
import com.google.gerrit.reviewdb.AccountSshKey;
import com.google.gerrit.reviewdb.ContactInformation;
import com.google.gerrit.reviewdb.ContributorAgreement;
@@ -57,7 +57,7 @@ public interface AccountSecurity extends RemoteJsonService {
void myExternalIds(AsyncCallback<List<AccountExternalId>> callback);
@SignInRequired
void myGroups(AsyncCallback<List<AccountGroup>> callback);
void myGroups(AsyncCallback<List<GroupDetail>> callback);
@SignInRequired
void deleteExternalIds(Set<AccountExternalId.Key> keys,

View File

@@ -14,19 +14,19 @@
package com.google.gerrit.common.data;
import com.google.gerrit.reviewdb.AccountGroup;
import com.google.gerrit.common.data.GroupDetail;
import java.util.List;
public class GroupList {
protected List<AccountGroup> groups;
protected List<GroupDetail> groups;
protected boolean canCreateGroup;
public List<AccountGroup> getGroups() {
public List<GroupDetail> getGroups() {
return groups;
}
public void setGroups(List<AccountGroup> groups) {
public void setGroups(List<GroupDetail> groups) {
this.groups = groups;
}