opendev/gerrit
Code Issues Proposed changes

Merge "Use SafeHtml for confirmation dialog"

Browse Source
This commit is contained in:
Shawn Pearce
2012-01-24 07:48:44 -08:00
committed by gerrit code review
parent fb61967081 ac462fbb89
commit 2957dba4e4
3 changed files with 23 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
gerrit-gwtui/src/main/java/com/google/gerrit/client/ConfirmationDialog.java
View File

@@ -19,8 +19,9 @@ import com.google.gwt.event.dom.client.ClickHandler;
import com.google.gwt.user.client.DOM;
import com.google.gwt.user.client.ui.Button;
import com.google.gwt.user.client.ui.FlowPanel;
import com.google.gwt.user.client.ui.HTML;
import com.google.gwt.user.client.ui.Widget;
import com.google.gwtexpui.globalkey.client.GlobalKey;
import com.google.gwtexpui.safehtml.client.SafeHtml;
import com.google.gwtexpui.user.client.AutoCenterDialogBox;
public class ConfirmationDialog extends AutoCenterDialogBox {
@@ -28,7 +29,7 @@ public class ConfirmationDialog extends AutoCenterDialogBox {
private Button cancelButton;
public ConfirmationDialog(final String dialogTitle, final HTML message,
public ConfirmationDialog(final String dialogTitle, final SafeHtml message,
final ConfirmationCallback callback) {
super(/* auto hide */false, /* modal */true);
setGlassEnabled(true);
@@ -59,11 +60,12 @@ public class ConfirmationDialog extends AutoCenterDialogBox {
buttons.add(cancelButton);
final FlowPanel center = new FlowPanel();
center.add(message);
final Widget msgWidget = message.toBlockWidget();
center.add(msgWidget);
center.add(buttons);
add(center);
message.setWidth("400px");
msgWidget.setWidth("400px");
setWidget(center);
}

19
gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/ProjectBranchesScreen.java
View File

@@ -40,8 +40,8 @@ import com.google.gwt.user.client.ui.CheckBox;
import com.google.gwt.user.client.ui.FlexTable.FlexCellFormatter;
import com.google.gwt.user.client.ui.FlowPanel;
import com.google.gwt.user.client.ui.Grid;
import com.google.gwt.user.client.ui.HTML;
import com.google.gwt.user.client.ui.Label;
import com.google.gwtexpui.safehtml.client.SafeHtmlBuilder;
import com.google.gwtjsonrpc.client.RemoteJsonException;
import java.util.HashSet;
@@ -232,29 +232,32 @@ public class ProjectBranchesScreen extends ProjectScreen {
}
void deleteChecked() {
final StringBuilder message = new StringBuilder();
message.append("<b>").append(Gerrit.C.branchDeletionConfirmationMessage()).append("</b>");
message.append("<p>");
final SafeHtmlBuilder b = new SafeHtmlBuilder();
b.openElement("b");
b.append(Gerrit.C.branchDeletionConfirmationMessage());
b.closeElement("b");
b.openElement("p");
final HashSet<Branch.NameKey> ids = new HashSet<Branch.NameKey>();
for (int row = 1; row < table.getRowCount(); row++) {
final Branch k = getRowItem(row);
if (k != null && table.getWidget(row, 1) instanceof CheckBox
&& ((CheckBox) table.getWidget(row, 1)).getValue()) {
if (!ids.isEmpty()) {
message.append(", <br>");
b.append(",").br();
}
message.append(k.getName());
b.append(k.getName());
ids.add(k.getNameKey());
}
}
message.append("</p>");
b.closeElement("p");
if (ids.isEmpty()) {
return;
}
ConfirmationDialog confirmationDialog =
new ConfirmationDialog(Gerrit.C.branchDeletionDialogTitle(),
new HTML(message.toString()), new ConfirmationCallback() {
b.toSafeHtml(), new ConfirmationCallback() {
@Override
public void onOk() {
Util.PROJECT_SVC.deleteBranch(getProjectKey(), ids,

13
gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ApprovalTable.java
View File

@@ -41,7 +41,6 @@ import com.google.gwt.user.client.Element;
import com.google.gwt.user.client.ui.Composite;
import com.google.gwt.user.client.ui.FlowPanel;
import com.google.gwt.user.client.ui.Grid;
import com.google.gwt.user.client.ui.HTML;
import com.google.gwt.user.client.ui.HTMLTable.CellFormatter;
import com.google.gwt.user.client.ui.Image;
import com.google.gwt.user.client.ui.Panel;
@@ -330,15 +329,15 @@ public class ApprovalTable extends Composite {
private void askForConfirmation(final String groupName,
final int memberCount) {
final StringBuilder message = new StringBuilder();
message.append("<b>");
message.append(Util.M.groupManyMembersConfirmation(groupName,
memberCount));
message.append("</b>");
final SafeHtmlBuilder b = new SafeHtmlBuilder();
b.openElement("b");
b.append(Util.M
.groupManyMembersConfirmation(groupName, memberCount));
b.closeElement("b");
final ConfirmationDialog confirmationDialog =
new ConfirmationDialog(Util.C
.approvalTableAddManyReviewersConfirmationDialogTitle(),
new HTML(message.toString()), new ConfirmationCallback() {
b.toSafeHtml(), new ConfirmationCallback() {
@Override
public void onOk() {
addReviewers(reviewers, true);