From 227058b21483f3b5909cdc1be4d57567ccb6d7e4 Mon Sep 17 00:00:00 2001 From: Tomas Daarstad Date: Wed, 1 Feb 2012 12:05:55 +0100 Subject: Updated to use current patch id in loadFileList method. Task-number: QTQAINFRA-411 Change-Id: Id1112d3fe84df347a7c8da65e845c19dc6b63dca Reviewed-by: Tomas Daarstad --- .../google/gerrit/client/patches/AllInOnePatchScreen.java | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) 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 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(); 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() { @Override public void onSuccess(PatchSetDetail result) { -- cgit v1.2.3