opendev/gerrit
Code Issues Proposed changes

Rename ApprovalType(s) to LabelType(s)

Browse Source 
Change-Id: Icb860eb84d481d519aa0facbef99392b45784843
This commit is contained in:
Dave Borowitz
2013-02-05 17:20:55 -08:00
parent 41f909fa98
commit 0557fc43c3
40 changed files with 286 additions and 293 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
gerrit-server/src/main/java/gerrit/PRED__load_commit_labels_1.java
View File

@@ -2,8 +2,8 @@
package gerrit;
import com.google.gerrit.common.data.ApprovalType;
import com.google.gerrit.common.data.ApprovalTypes;
import com.google.gerrit.common.data.LabelType;
import com.google.gerrit.common.data.LabelTypes;
import com.google.gerrit.reviewdb.client.PatchSet;
import com.google.gerrit.reviewdb.client.PatchSetApproval;
import com.google.gerrit.reviewdb.server.ReviewDb;
@@ -46,7 +46,7 @@ class PRED__load_commit_labels_1 extends Predicate.P1 {
ReviewDb db = StoredValues.REVIEW_DB.get(engine);
PatchSet patchSet = StoredValues.PATCH_SET.get(engine);
ChangeData cd = StoredValues.CHANGE_DATA.getOrNull(engine);
ApprovalTypes types = env.getInjector().getInstance(ApprovalTypes.class);
LabelTypes types = env.getInjector().getInstance(LabelTypes.class);
Iterable<PatchSetApproval> approvals;
if (cd != null) {
@@ -60,7 +60,7 @@ class PRED__load_commit_labels_1 extends Predicate.P1 {
continue;
}
ApprovalType t = types.byId(a.getCategoryId().get());
LabelType t = types.byId(a.getCategoryId().get());
if (t == null) {
continue;
}

10
gerrit-server/src/main/java/gerrit/PRED_get_legacy_approval_types_1.java
View File

@@ -14,8 +14,8 @@
package gerrit;
import com.google.gerrit.common.data.ApprovalType;
import com.google.gerrit.common.data.ApprovalTypes;
import com.google.gerrit.common.data.LabelType;
import com.google.gerrit.common.data.LabelTypes;
import com.google.gerrit.rules.PrologEnvironment;
import com.googlecode.prolog_cafe.lang.IntegerTerm;
@@ -54,9 +54,9 @@ class PRED_get_legacy_approval_types_1 extends Predicate.P1 {
Term a1 = arg1.dereference();
PrologEnvironment env = (PrologEnvironment) engine.control;
ApprovalTypes types = env.getInjector().getInstance(ApprovalTypes.class);
LabelTypes types = env.getInjector().getInstance(LabelTypes.class);
List<ApprovalType> list = types.getApprovalTypes();
List<LabelType> list = types.getLabelTypes();
Term head = Prolog.Nil;
for (int idx = list.size() - 1; 0 <= idx; idx--) {
head = new ListTerm(export(list.get(idx)), head);
@@ -71,7 +71,7 @@ class PRED_get_legacy_approval_types_1 extends Predicate.P1 {
static final SymbolTerm symApprovalType = SymbolTerm.intern(
"approval_type", 5);
static Term export(ApprovalType type) {
static Term export(LabelType type) {
return new StructureTerm(symApprovalType,
SymbolTerm.intern(type.getName()),
SymbolTerm.intern(type.getId()),