diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/ReviewedPanel.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/ReviewedPanel.java index 750f4664cf..7792879268 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/ReviewedPanel.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/ReviewedPanel.java @@ -32,7 +32,6 @@ import com.google.gwt.user.client.ui.Anchor; import com.google.gwt.user.client.ui.CheckBox; import com.google.gwt.user.client.ui.Composite; import com.google.gwt.user.client.ui.HTMLPanel; -import com.google.gwt.user.client.ui.UIObject; class ReviewedPanel extends Composite { interface Binder extends UiBinder {} @@ -50,44 +49,17 @@ class ReviewedPanel extends Composite { private PatchSet.Id patchId; private String fileId; - private ReviewedPanel other; - ReviewedPanel(PatchSet.Id id, String path, boolean bottom) { + ReviewedPanel(PatchSet.Id id, String path) { initWidget(uiBinder.createAndBindUi(this)); patchId = id; fileId = path; - if (bottom) { - UIObject.setVisible(fileName, false); - } else { - fileName.setInnerText(path); - } + fileName.setInnerText(path); nextLink.setHTML(PatchUtil.C.next() + Util.C.nextPatchLinkIcon()); } - static void link(ReviewedPanel top, ReviewedPanel bottom) { - top.other = bottom; - bottom.other = top; - } - void setReviewed(boolean reviewed) { - RestApi api = ChangeApi.revision(patchId) - .view("files") - .id(fileId) - .view("reviewed"); - if (reviewed) { - api.put(CallbackGroup.emptyCallback()); - } else { - api.delete(CallbackGroup.emptyCallback()); - } - toggleReviewedBox(reviewed); - } - - private void toggleReviewedBox(boolean reviewed) { - checkBox.setValue(reviewed); - CheckBox otherBox = other.checkBox; - if (otherBox.getValue() != reviewed) { - otherBox.setValue(reviewed); - } + checkBox.setValue(true, true); } boolean isReviewed() { @@ -96,7 +68,15 @@ class ReviewedPanel extends Composite { @UiHandler("checkBox") void onValueChange(ValueChangeEvent event) { - setReviewed(event.getValue()); + RestApi api = ChangeApi.revision(patchId) + .view("files") + .id(fileId) + .view("reviewed"); + if (event.getValue()) { + api.put(CallbackGroup.emptyCallback()); + } else { + api.delete(CallbackGroup.emptyCallback()); + } } // TODO: Implement this to go to the next file in the patchset. diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/SideBySide2.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/SideBySide2.java index 6a2a6827c6..6bd57538a6 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/SideBySide2.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/SideBySide2.java @@ -78,17 +78,14 @@ public class SideBySide2 extends Screen { interface Binder extends UiBinder {} private static Binder uiBinder = GWT.create(Binder.class); - private static final int HEADER_FOOTER = 60 + 15 * 2 + 16 + 26 * 2; + private static final int HEADER_FOOTER = 60 + 15 * 2 + 16 + 26; private static final JsArrayString EMPTY = JavaScriptObject.createArray().cast(); - @UiField(provided=true) + @UiField(provided = true) ReviewedPanel reviewedTop; - @UiField(provided=true) - ReviewedPanel reviewedBottom; - - @UiField(provided=true) + @UiField(provided = true) DiffTable diffTable; private final PatchSet.Id base; @@ -127,9 +124,7 @@ public class SideBySide2 extends Screen { this.keyHandlers = new ArrayList(4); // TODO: Re-implement necessary GlobalKey bindings. addDomHandler(GlobalKey.STOP_PROPAGATION, KeyPressEvent.getType()); - reviewedTop = new ReviewedPanel(revision, path, false); - reviewedBottom = new ReviewedPanel(revision, path, true); - ReviewedPanel.link(reviewedTop, reviewedBottom); + reviewedTop = new ReviewedPanel(revision, path); add(diffTable = new DiffTable()); add(uiBinder.createAndBindUi(this)); } diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/SideBySide2.ui.xml b/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/SideBySide2.ui.xml index b1d386e460..d7dfcff856 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/SideBySide2.ui.xml +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/SideBySide2.ui.xml @@ -20,6 +20,5 @@ limitations under the License. -