Rename ApprovalType(s) to LabelType(s)

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

View File

@@ -14,7 +14,7 @@
package com.google.gerrit.sshd.commands;
import com.google.gerrit.common.data.ApprovalType;
import com.google.gerrit.common.data.LabelType;
import com.google.gerrit.common.data.LabelValue;
import org.kohsuke.args4j.CmdLineException;
@@ -30,11 +30,11 @@ import java.lang.annotation.Annotation;
final class ApproveOption implements Option, Setter<Short> {
private final String name;
private final String usage;
private final ApprovalType type;
private final LabelType type;
private Short value;
ApproveOption(final String name, final String usage, final ApprovalType type) {
ApproveOption(final String name, final String usage, final LabelType type) {
this.name = name;
this.usage = usage;
this.type = type;

View File

@@ -16,8 +16,8 @@ package com.google.gerrit.sshd.commands;
import com.google.common.base.Strings;
import com.google.common.collect.Maps;
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.common.data.LabelValue;
import com.google.gerrit.common.data.ReviewResult;
import com.google.gerrit.common.data.ReviewResult.Error.Type;
@@ -116,7 +116,7 @@ public class ReviewCommand extends SshCommand {
private ReviewDb db;
@Inject
private ApprovalTypes approvalTypes;
private LabelTypes labelTypes;
@Inject
private DeleteDraftPatchSet.Factory deleteDraftPatchSetFactory;
@@ -400,7 +400,7 @@ public class ReviewCommand extends SshCommand {
protected void parseCommandLine() throws UnloggedFailure {
optionList = new ArrayList<ApproveOption>();
for (ApprovalType type : approvalTypes.getApprovalTypes()) {
for (LabelType type : labelTypes.getLabelTypes()) {
String usage = "";
usage = "score for " + type.getName() + "\n";