From e647c3547490348c1612ada297fa7352efa14ae1 Mon Sep 17 00:00:00 2001 From: Edwin Kempin Date: Mon, 5 Feb 2018 10:11:01 +0100 Subject: [PATCH] Don't use Account class in GWT UI code We would like to move the Account class out of the reviewdb.client package and then the GWT UI can no longer use it. Change-Id: Ic3cc3603ca4924ba8293d8d858a786d44f433868 Signed-off-by: Edwin Kempin --- .../com/google/gerrit/client/info/AccountInfo.java | 5 ----- .../java/com/google/gerrit/client/Dispatcher.java | 12 +++++------- .../gerrit/client/account/MyProfileScreen.java | 2 +- .../com/google/gerrit/client/change/ReplyBox.java | 4 ++-- .../client/changes/AccountDashboardScreen.java | 9 ++++----- .../google/gerrit/client/changes/ChangeTable.java | 2 +- 6 files changed, 13 insertions(+), 21 deletions(-) diff --git a/gerrit-gwtui-common/src/main/java/com/google/gerrit/client/info/AccountInfo.java b/gerrit-gwtui-common/src/main/java/com/google/gerrit/client/info/AccountInfo.java index dc372855ea..e4c008c354 100644 --- a/gerrit-gwtui-common/src/main/java/com/google/gerrit/client/info/AccountInfo.java +++ b/gerrit-gwtui-common/src/main/java/com/google/gerrit/client/info/AccountInfo.java @@ -14,7 +14,6 @@ package com.google.gerrit.client.info; -import com.google.gerrit.reviewdb.client.Account; import com.google.gwt.core.client.JavaScriptObject; import com.google.gwt.core.client.JsArray; import com.google.gwt.core.client.JsArrayString; @@ -22,10 +21,6 @@ import com.google.gwtjsonrpc.client.impl.ser.JavaSqlTimestamp_JsonSerializer; import java.sql.Timestamp; public class AccountInfo extends JavaScriptObject { - public final Account.Id getId() { - return new Account.Id(_accountId()); - } - public final native int _accountId() /*-{ return this._account_id || 0; }-*/; public final native String name() /*-{ return this.name; }-*/; diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/Dispatcher.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/Dispatcher.java index 42d3fa0616..c9346f49a9 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/Dispatcher.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/Dispatcher.java @@ -96,7 +96,6 @@ import com.google.gerrit.client.ui.Screen; import com.google.gerrit.common.Nullable; import com.google.gerrit.common.PageLinks; import com.google.gerrit.extensions.client.GeneralPreferencesInfo.DiffView; -import com.google.gerrit.reviewdb.client.Account; import com.google.gerrit.reviewdb.client.AccountGroup; import com.google.gerrit.reviewdb.client.Change; import com.google.gerrit.reviewdb.client.Patch; @@ -107,7 +106,6 @@ import com.google.gwt.core.client.RunAsyncCallback; import com.google.gwt.http.client.URL; import com.google.gwtexpui.user.client.UserAgent; import com.google.gwtorm.client.KeyUtil; -import java.util.Optional; public class Dispatcher { public static String toPatch( @@ -300,7 +298,7 @@ public class Dispatcher { private static Screen mine() { if (Gerrit.isSignedIn()) { - return new AccountDashboardScreen(Gerrit.getUserAccount().getId()); + return new AccountDashboardScreen(Gerrit.getUserAccount()._accountId()); } Screen r = new AccountDashboardScreen(null); r.setRequiresSignIn(true); @@ -309,15 +307,15 @@ public class Dispatcher { private static void dashboard(String token) { String rest = skip(token); - Optional accountId = Account.Id.tryParse(rest); - if (accountId.isPresent()) { - Gerrit.display(token, new AccountDashboardScreen(accountId.get())); + if (rest.matches("[0-9]+")) { + int accountId = Integer.parseInt(rest); + Gerrit.display(token, new AccountDashboardScreen(accountId)); return; } if (rest.equals("self")) { if (Gerrit.isSignedIn()) { - Gerrit.display(token, new AccountDashboardScreen(Gerrit.getUserAccount().getId())); + Gerrit.display(token, new AccountDashboardScreen(Gerrit.getUserAccount()._accountId())); } else { Screen s = new AccountDashboardScreen(null); s.setRequiresSignIn(true); diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/MyProfileScreen.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/MyProfileScreen.java index 177fc09877..02759482a7 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/MyProfileScreen.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/MyProfileScreen.java @@ -122,6 +122,6 @@ public class MyProfileScreen extends SettingsScreen { info.setText(row++, fieldIdx, account.name()); info.setText(row++, fieldIdx, account.email()); info.setText(row++, fieldIdx, mediumFormat(account.registeredOn())); - info.setText(row, fieldIdx, account.getId().toString()); + info.setText(row, fieldIdx, Integer.toString(account._accountId())); } } diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/ReplyBox.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/ReplyBox.java index 80b179605c..0bbd6149e6 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/ReplyBox.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/ReplyBox.java @@ -373,7 +373,7 @@ public class ReplyBox extends Composite { fmt.setStyleName(row, labelHelpColumn, style.label_help()); ApprovalInfo self = - Gerrit.isSignedIn() ? lv.info.forUser(Gerrit.getUserAccount().getId().get()) : null; + Gerrit.isSignedIn() ? lv.info.forUser(Gerrit.getUserAccount()._accountId()) : null; final LabelRadioGroup group = new LabelRadioGroup(row, id, lv.permitted.size()); for (int i = 0; i < columns.size(); i++) { @@ -395,7 +395,7 @@ public class ReplyBox extends Composite { private void renderCheckBox(int row, LabelAndValues lv) { ApprovalInfo self = - Gerrit.isSignedIn() ? lv.info.forUser(Gerrit.getUserAccount().getId().get()) : null; + Gerrit.isSignedIn() ? lv.info.forUser(Gerrit.getUserAccount()._accountId()) : null; final String id = lv.info.name(); final CheckBox b = new CheckBox(); diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/AccountDashboardScreen.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/AccountDashboardScreen.java index 0465902d8b..c6e4e2f247 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/AccountDashboardScreen.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/AccountDashboardScreen.java @@ -23,7 +23,6 @@ import com.google.gerrit.client.ui.InlineHyperlink; import com.google.gerrit.client.ui.Screen; import com.google.gerrit.common.PageLinks; import com.google.gerrit.extensions.client.ListChangesOption; -import com.google.gerrit.reviewdb.client.Account; import com.google.gwt.core.client.JsArray; import com.google.gwt.event.dom.client.KeyPressEvent; import com.google.gwtexpui.globalkey.client.KeyCommand; @@ -43,7 +42,7 @@ public class AccountDashboardScreen extends Screen implements ChangeListScreen { MY_DASHBOARD_OPTIONS = Collections.unmodifiableSet(options); } - private final Account.Id ownerId; + private final Integer ownerId; private final boolean mine; private ChangeTable table; private ChangeTable.Section workInProgress; @@ -51,9 +50,9 @@ public class AccountDashboardScreen extends Screen implements ChangeListScreen { private ChangeTable.Section incoming; private ChangeTable.Section closed; - public AccountDashboardScreen(Account.Id id) { - ownerId = id; - mine = Gerrit.isSignedIn() && ownerId.equals(Gerrit.getUserAccount().getId()); + public AccountDashboardScreen(Integer accountId) { + ownerId = accountId; + mine = Gerrit.isSignedIn() && ownerId == Gerrit.getUserAccount()._accountId(); } @Override diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ChangeTable.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ChangeTable.java index 7243208e2f..425fe691cc 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ChangeTable.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ChangeTable.java @@ -259,7 +259,7 @@ public class ChangeTable extends NavigationTable { if (c.assignee() != null) { table.setWidget(row, C_ASSIGNEE, AccountLinkPanel.forAssignee(c.assignee())); if (Gerrit.getUserPreferences().highlightAssigneeInChangeTable() - && Objects.equals(c.assignee().getId(), Gerrit.getUserAccount().getId())) { + && Objects.equals(c.assignee()._accountId(), Gerrit.getUserAccount()._accountId())) { table.getRowFormatter().addStyleName(row, Gerrit.RESOURCES.css().cASSIGNEDTOME()); } } else {