From 97a21420c2c32f166771e651bcfaed7c44afba65 Mon Sep 17 00:00:00 2001 From: "Shawn O. Pearce" Date: Tue, 6 Jan 2009 18:45:19 -0800 Subject: [PATCH] Make a magic constant for the Submit approval category This category has special meaning to Gerrit as it triggers magic code in the change workflow. Signed-off-by: Shawn O. Pearce --- .../com/google/gerrit/client/reviewdb/ApprovalCategory.java | 4 ++++ appjar/src/main/java/com/google/gerrit/pgm/ImportGerrit1.java | 2 +- .../src/main/java/com/google/gerrit/server/GerritServer.java | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/appjar/src/main/java/com/google/gerrit/client/reviewdb/ApprovalCategory.java b/appjar/src/main/java/com/google/gerrit/client/reviewdb/ApprovalCategory.java index 5ab3b60302..b44c7a9d1c 100644 --- a/appjar/src/main/java/com/google/gerrit/client/reviewdb/ApprovalCategory.java +++ b/appjar/src/main/java/com/google/gerrit/client/reviewdb/ApprovalCategory.java @@ -20,6 +20,10 @@ import com.google.gwtorm.client.StringKey; /** Types of approvals that can be associated with a {@link Change}. */ public final class ApprovalCategory { + /** Id of the special "Submit" action (and category). */ + public static final ApprovalCategory.Id SUBMIT = + new ApprovalCategory.Id("SUBM"); + public static class Id extends StringKey> { @Column(length = 4) protected String id; diff --git a/appjar/src/main/java/com/google/gerrit/pgm/ImportGerrit1.java b/appjar/src/main/java/com/google/gerrit/pgm/ImportGerrit1.java index b8046a161d..05ddec8d1d 100644 --- a/appjar/src/main/java/com/google/gerrit/pgm/ImportGerrit1.java +++ b/appjar/src/main/java/com/google/gerrit/pgm/ImportGerrit1.java @@ -77,7 +77,7 @@ public class ImportGerrit1 { try { verifyCategory = db.approvalCategories().byName("Verified"); approveCategory = db.approvalCategories().byName("Code Review"); - submitCategory = db.approvalCategories().byName("Submit"); + submitCategory = db.approvalCategories().get(ApprovalCategory.SUBMIT); final Statement query = sql.createStatement(); java.sql.ResultSet srcs; diff --git a/appjar/src/main/java/com/google/gerrit/server/GerritServer.java b/appjar/src/main/java/com/google/gerrit/server/GerritServer.java index 96f7ee8c9f..8804706cdd 100644 --- a/appjar/src/main/java/com/google/gerrit/server/GerritServer.java +++ b/appjar/src/main/java/com/google/gerrit/server/GerritServer.java @@ -232,7 +232,7 @@ public class GerritServer { final ApprovalCategory cat; final ArrayList vals; - cat = new ApprovalCategory(new ApprovalCategory.Id("SUBM"), "Submit"); + cat = new ApprovalCategory(ApprovalCategory.SUBMIT, "Submit"); cat.setPosition((short) -1); vals = new ArrayList(); vals.add(value(cat, 1, "Submit"));