opendev/gerrit
Code Issues Proposed changes

Merge "RPC calling buttons should be disabled during RPCs"

Browse Source
This commit is contained in:
Shawn Pearce
2011-03-27 14:42:48 -07:00
committed by Android Code Review
parent 7e6a8e6072 2a3db6a8d6
commit f324eb6c9f
4 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/AbandonChangeDialog.java
View File

@@ -75,6 +75,7 @@ public class AbandonChangeDialog extends AutoCenterDialogBox implements CloseHan
@Override @Override
public void onClick(final ClickEvent event) { public void onClick(final ClickEvent event) {
sendButton.setEnabled(false); sendButton.setEnabled(false);
cancelButton.setEnabled(false);
Util.MANAGE_SVC.abandonChange(psid, message.getText().trim(), Util.MANAGE_SVC.abandonChange(psid, message.getText().trim(),
new GerritCallback<ChangeDetail>() { new GerritCallback<ChangeDetail>() {
public void onSuccess(ChangeDetail result) { public void onSuccess(ChangeDetail result) {
@@ -88,6 +89,7 @@ public class AbandonChangeDialog extends AutoCenterDialogBox implements CloseHan
@Override @Override
public void onFailure(Throwable caught) { public void onFailure(Throwable caught) {
sendButton.setEnabled(true); sendButton.setEnabled(true);
cancelButton.setEnabled(true);
super.onFailure(caught); super.onFailure(caught);
} }
}); });

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

@@ -232,7 +232,7 @@ public class ApprovalTable extends Composite {
table.setWidget(row, col++, link(ad.getAccount())); table.setWidget(row, col++, link(ad.getAccount()));
if (ad.canRemove()) { if (ad.canRemove()) {
PushButton remove = new PushButton( // final PushButton remove = new PushButton( //
new Image(Util.R.removeReviewerNormal()), // new Image(Util.R.removeReviewerNormal()), //
new Image(Util.R.removeReviewerPressed())); new Image(Util.R.removeReviewerPressed()));
remove.setTitle(Util.M.removeReviewer( // remove.setTitle(Util.M.removeReviewer( //
@@ -241,7 +241,7 @@ public class ApprovalTable extends Composite {
remove.addClickHandler(new ClickHandler() { remove.addClickHandler(new ClickHandler() {
@Override @Override
public void onClick(ClickEvent event) { public void onClick(ClickEvent event) {
doRemove(ad); doRemove(ad, remove);
} }
}); });
table.setWidget(row, col, remove); table.setWidget(row, col, remove);
@@ -294,7 +294,8 @@ public class ApprovalTable extends Composite {
col++; col++;
} }
private void doRemove(final ApprovalDetail ad) { private void doRemove(final ApprovalDetail ad, final PushButton remove) {
remove.setEnabled(false);
PatchUtil.DETAIL_SVC.removeReviewer(changeId, ad.getAccount(), PatchUtil.DETAIL_SVC.removeReviewer(changeId, ad.getAccount(),
new GerritCallback<ReviewerResult>() { new GerritCallback<ReviewerResult>() {
@Override @Override
@@ -306,6 +307,12 @@ public class ApprovalTable extends Composite {
new ErrorDialog(result.getErrors().get(0).toString()).center(); new ErrorDialog(result.getErrors().get(0).toString()).center();
} }
} }
@Override
public void onFailure(final Throwable caught) {
remove.setEnabled(true);
super.onFailure(caught);
}
}); });
} }
} }

2
gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/PatchSetComplexDisclosurePanel.java
View File

@@ -400,6 +400,7 @@ class PatchSetComplexDisclosurePanel extends ComplexDisclosurePanel implements O
b.addClickHandler(new ClickHandler() { b.addClickHandler(new ClickHandler() {
@Override @Override
public void onClick(final ClickEvent event) { public void onClick(final ClickEvent event) {
b.setEnabled(false);
new AbandonChangeDialog(patchSet.getId(), new AbandonChangeDialog(patchSet.getId(),
new AsyncCallback<ChangeDetail>() { new AsyncCallback<ChangeDetail>() {
public void onSuccess(ChangeDetail result) { public void onSuccess(ChangeDetail result) {
@@ -420,6 +421,7 @@ class PatchSetComplexDisclosurePanel extends ComplexDisclosurePanel implements O
b.addClickHandler(new ClickHandler() { b.addClickHandler(new ClickHandler() {
@Override @Override
public void onClick(final ClickEvent event) { public void onClick(final ClickEvent event) {
b.setEnabled(false);
new RestoreChangeDialog(patchSet.getId(), new RestoreChangeDialog(patchSet.getId(),
new AsyncCallback<ChangeDetail>() { new AsyncCallback<ChangeDetail>() {
public void onSuccess(ChangeDetail result) { public void onSuccess(ChangeDetail result) {

2
gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/RestoreChangeDialog.java
View File

@@ -75,6 +75,7 @@ public class RestoreChangeDialog extends AutoCenterDialogBox implements CloseHan
@Override @Override
public void onClick(final ClickEvent event) { public void onClick(final ClickEvent event) {
sendButton.setEnabled(false); sendButton.setEnabled(false);
cancelButton.setEnabled(false);
Util.MANAGE_SVC.restoreChange(psid, message.getText().trim(), Util.MANAGE_SVC.restoreChange(psid, message.getText().trim(),
new GerritCallback<ChangeDetail>() { new GerritCallback<ChangeDetail>() {
@Override @Override
@@ -89,6 +90,7 @@ public class RestoreChangeDialog extends AutoCenterDialogBox implements CloseHan
@Override @Override
public void onFailure(Throwable caught) { public void onFailure(Throwable caught) {
sendButton.setEnabled(true); sendButton.setEnabled(true);
cancelButton.setEnabled(true);
super.onFailure(caught); super.onFailure(caught);
} }
}); });