opendev/gerrit
Code Issues Proposed changes

Remove unused label details from old RPC handlers

Browse Source 
Change-Id: Ibe2ea9dc416e0e824cfacc5e5e26855b051734a2
This commit is contained in:
Dave Borowitz
2013-02-14 12:22:26 -08:00
committed by Gerrit Code Review
parent 105af8beea
commit 5e9744faa1
5 changed files with 1 additions and 279 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
gerrit-common/src/main/java/com/google/gerrit/common/data/ApprovalDetail.java
View File

@@ -15,12 +15,9 @@
package com.google.gerrit.common.data;
import com.google.gerrit.reviewdb.client.Account;
import com.google.gerrit.reviewdb.client.ApprovalCategory;
import com.google.gerrit.reviewdb.client.PatchSetApproval;
import java.sql.Timestamp;
import java.util.ArrayList;
import java.util.Comparator;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
@@ -28,19 +25,6 @@ import java.util.Map;
import java.util.Set;
public class ApprovalDetail {
public static final Comparator<ApprovalDetail> SORT =
new Comparator<ApprovalDetail>() {
public int compare(final ApprovalDetail o1, final ApprovalDetail o2) {
int cmp;
cmp = o2.hasNonZero - o1.hasNonZero;
if (cmp != 0) return cmp;
return o1.sortOrder.compareTo(o2.sortOrder);
}
};
static final Timestamp EG_0 = new Timestamp(0);
static final Timestamp EG_D = new Timestamp(Long.MAX_VALUE);
protected Account.Id account;
protected List<PatchSetApproval> approvals;
protected boolean canRemove;
@@ -49,8 +33,6 @@ public class ApprovalDetail {
private transient Set<String> approved;
private transient Set<String> rejected;
private transient Map<String, Integer> values;
private transient int hasNonZero;
private transient Timestamp sortOrder = EG_D;
protected ApprovalDetail() {
}
@@ -72,41 +54,6 @@ public class ApprovalDetail {
canRemove = removeable;
}
@Deprecated
public List<PatchSetApproval> getPatchSetApprovals() {
return approvals;
}
@Deprecated
public PatchSetApproval getPatchSetApproval(ApprovalCategory.Id category) {
for (PatchSetApproval psa : approvals) {
if (psa.getCategoryId().equals(category)) {
return psa;
}
}
return null;
}
public void sortFirst() {
hasNonZero = 1;
sortOrder = ApprovalDetail.EG_0;
}
@Deprecated
public void add(final PatchSetApproval ca) {
approvals.add(ca);
final Timestamp g = ca.getGranted();
if (g != null && g.compareTo(sortOrder) < 0) {
sortOrder = g;
// Value is not set, but code calling this deprecated method does not
// call getValue.
}
if (ca.getValue() != 0) {
hasNonZero = 1;
}
}
public void approved(String label) {
if (approved == null) {
approved = new HashSet<String>();

13
gerrit-common/src/main/java/com/google/gerrit/common/data/ChangeDetail.java
View File

@@ -19,9 +19,6 @@ import com.google.gerrit.reviewdb.client.ChangeMessage;
import com.google.gerrit.reviewdb.client.PatchSet;
import com.google.gerrit.reviewdb.client.Project;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
/** Detail necessary to display a change. */
@@ -40,7 +37,6 @@ public class ChangeDetail {
protected List<ChangeInfo> dependsOn;
protected List<ChangeInfo> neededBy;
protected List<PatchSet> patchSets;
protected List<ApprovalDetail> approvals;
protected List<SubmitRecord> submitRecords;
protected Project.SubmitType submitType;
protected SubmitTypeRecord submitTypeRecord;
@@ -191,15 +187,6 @@ public class ChangeDetail {
patchSets = s;
}
public List<ApprovalDetail> getApprovals() {
return approvals;
}
public void setApprovals(Collection<ApprovalDetail> list) {
approvals = new ArrayList<ApprovalDetail>(list);
Collections.sort(approvals, ApprovalDetail.SORT);
}
public void setSubmitRecords(List<SubmitRecord> all) {
submitRecords = all;
}

58
gerrit-common/src/main/java/com/google/gerrit/common/data/PatchSetPublishDetail.java
View File

@@ -16,12 +16,8 @@ package com.google.gerrit.common.data;
import com.google.gerrit.reviewdb.client.Change;
import com.google.gerrit.reviewdb.client.PatchLineComment;
import com.google.gerrit.reviewdb.client.PatchSetApproval;
import com.google.gerrit.reviewdb.client.PatchSetInfo;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
public class PatchSetPublishDetail {
@@ -29,38 +25,10 @@ public class PatchSetPublishDetail {
protected PatchSetInfo patchSetInfo;
protected Change change;
protected List<PatchLineComment> drafts;
protected List<PermissionRange> labels;
protected List<ApprovalDetail> approvals;
protected List<SubmitRecord> submitRecords;
protected SubmitTypeRecord submitTypeRecord;
protected List<PatchSetApproval> given;
protected boolean canSubmit;
public List<PermissionRange> getLabels() {
return labels;
}
public void setLabels(List<PermissionRange> labels) {
this.labels = labels;
}
public List<ApprovalDetail> getApprovals() {
return approvals;
}
public void setApprovals(Collection<ApprovalDetail> list) {
approvals = new ArrayList<ApprovalDetail>(list);
Collections.sort(approvals, ApprovalDetail.SORT);
}
public void setSubmitRecords(List<SubmitRecord> all) {
submitRecords = all;
}
public List<SubmitRecord> getSubmitRecords() {
return submitRecords;
}
public void setSubmitTypeRecord(SubmitTypeRecord submitTypeRecord) {
this.submitTypeRecord = submitTypeRecord;
}
@@ -69,14 +37,6 @@ public class PatchSetPublishDetail {
return submitTypeRecord;
}
public List<PatchSetApproval> getGiven() {
return given;
}
public void setGiven(List<PatchSetApproval> given) {
this.given = given;
}
public void setAccounts(AccountInfoCache accounts) {
this.accounts = accounts;
}
@@ -113,24 +73,6 @@ public class PatchSetPublishDetail {
return drafts;
}
public PermissionRange getRange(final String permissionName) {
for (PermissionRange s : labels) {
if (s.getName().equals(permissionName)) {
return s;
}
}
return null;
}
public PatchSetApproval getChangeApproval(String label) {
for (PatchSetApproval a : given) {
if (a.getLabel() != null && a.getLabel().equals(label)) {
return a;
}
}
return null;
}
public boolean canSubmit() {
return canSubmit;
}