diff options
| author | Tomas Ljunggren <tomas.ljunggren@tieto.com> | 2012-02-03 13:26:17 +0100 |
|---|---|---|
| committer | Tomas Ljunggren <tomas.ljunggren@tieto.com> | 2012-02-03 13:46:16 +0100 |
| commit | b74f47856a07b2ed3f90f28f9b4a5c4bed1a9462 (patch) | |
| tree | b2e74d5c5fe045fdb92787eddf7bba6b74b72ca6 | |
| parent | f65d3294576cae74e1874b60a06c540b81e3d92b (diff) | |
| parent | 648b82a40c6c9788368bf348b467df905e4432e0 (diff) | |
Release of NQT GerritV2.2.1-NQT-005
Fixed JIRA issues:
220 Added a check to prevent NumberFormatException
348 Fixed cherry pick footer settings
355 Hide review panel also on diff and topic pages
372 Validate topic current change set
375 Topic permalink copy to clipboard corrected
381 Do not permit trailing slash when pushing
411 Updated to use current patch id in loadFileList method.
Change-Id: Ic3507c02495bd56796d3d750f257fc9cc04b7dc5
| -rw-r--r-- | gerrit-gwtui/src/main/java/com/google/gerrit/client/patches/AllInOnePatchScreen.java | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/patches/AllInOnePatchScreen.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/patches/AllInOnePatchScreen.java index 90fb7e3d0b..a4ad60e760 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/patches/AllInOnePatchScreen.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/patches/AllInOnePatchScreen.java @@ -33,6 +33,7 @@ import com.google.gerrit.reviewdb.AccountDiffPreference; import com.google.gerrit.reviewdb.Change; import com.google.gerrit.reviewdb.Patch; import com.google.gerrit.reviewdb.PatchSet; +import com.google.gerrit.reviewdb.PatchSet.Id; import com.google.gwt.core.client.Scheduler; import com.google.gwt.core.client.Scheduler.ScheduledCommand; import com.google.gwt.event.dom.client.KeyPressEvent; @@ -215,11 +216,13 @@ public class AllInOnePatchScreen extends AbstractPatchScreen implements private KeyNavigation keyNavigation; private List<Diff> diffs; private Diff.Factory diffFactory; + private Id id; public AllInOnePatchScreen(final PatchSet.Id patchSetId, final PatchSetDetail detail, final PatchTable patchTable, AbstractPatchScreen.Type patchScreenType) { super(null, patchSetId, detail, patchTable); + setPatchId(patchSetId); diffs = new ArrayList<Diff>(); keyNavigation = new KeyNavigation(this); keyNavigation.addNavigationKey(new UpToChangeCommand(patchSetId, 0, 'u')); @@ -318,6 +321,14 @@ public class AllInOnePatchScreen extends AbstractPatchScreen implements lastScript = null; } + private Id getPatchId() { + return id; + } + + private void setPatchId(Id id) { + this.id = id; + } + private boolean canReuse(AccountDiffPreference dp, PatchScript last) { if (last.getDiffPrefs().getIgnoreWhitespace() != dp.getIgnoreWhitespace()) { // Whitespace ignore setting requires server computation. @@ -399,7 +410,7 @@ public class AllInOnePatchScreen extends AbstractPatchScreen implements private void loadFileList() { if (patchSetDetail == null) { - Util.DETAIL_SVC.patchSetDetail(idSideB, + Util.DETAIL_SVC.patchSetDetail(getPatchId(), new GerritCallback<PatchSetDetail>() { @Override public void onSuccess(PatchSetDetail result) { |