Add hasEditBasedOnCurrentPatchSet() to ChangeInfo
So far this method was contained in ChangeScreen2, but it rather
belongs to ChangeInfo. Having it in ChangeInfo makes it reusable from
other places.
Also simplify the method implementation.
Change-Id: Ib209913f14bc33bba50b6a0fda20cbf78a9c7140
Signed-off-by: Edwin Kempin <edwin.kempin@sap.com>
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/ChangeScreen2.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/ChangeScreen2.java
index fb2d250..6992597 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/ChangeScreen2.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/ChangeScreen2.java
@@ -494,7 +494,7 @@
}
if (rev.is_edit()) {
- if (isEditBasedOnCurrentPatchSet(info)) {
+ if (info.hasEditBasedOnCurrentPatchSet()) {
publishEdit.setVisible(true);
} else {
rebaseEdit.setVisible(true);
@@ -515,13 +515,6 @@
info.revisions().values());
}
- private boolean isEditBasedOnCurrentPatchSet(ChangeInfo info) {
- JsArray<RevisionInfo> revList = info.revisions().values();
- RevisionInfo.sortRevisionInfoByNumber(revList);
- int currentPatchSetOrEdit = revList.get(revList.length() - 1)._number();
- return currentPatchSetOrEdit == 0;
- }
-
@UiHandler("publishEdit")
void onPublishEdit(@SuppressWarnings("unused") ClickEvent e) {
EditActions.publishEdit(changeId);
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ChangeInfo.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ChangeInfo.java
index a9dec39..fff792f 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ChangeInfo.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ChangeInfo.java
@@ -62,6 +62,12 @@
return ts;
}
+ public final boolean hasEditBasedOnCurrentPatchSet() {
+ JsArray<RevisionInfo> revList = revisions().values();
+ RevisionInfo.sortRevisionInfoByNumber(revList);
+ return revList.get(revList.length() - 1).is_edit();
+ }
+
private final native Timestamp _get_cts() /*-{ return this._cts; }-*/;
private final native void _set_cts(Timestamp ts) /*-{ this._cts = ts; }-*/;
