From b4b74b445da5bd67189a32d04a6639cc77b44930 Mon Sep 17 00:00:00 2001 From: Bruce Zu Date: Wed, 10 Apr 2013 16:21:58 +0800 Subject: [PATCH] No longer need to switch to Unified mode for binary file On SideBySide diff UI, click the InlineHyperlink to navigate previous/next patch, Gerrit will switch to Unified mode if the next patch is binary file and will never switch back to SideBySide mode even if it would run into non-binary file later. As 6963c5f is available in stable-2.6, Gerrit need not to switch from SideBySide mode to Unified mode for binary file anymore. Change-Id: I0963ffb08933857ffb62fe0f4592fe51fd3469d1 --- .../main/java/com/google/gerrit/client/changes/PatchTable.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/PatchTable.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/PatchTable.java index 5791f68e2a..b2e8b01aff 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/PatchTable.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/PatchTable.java @@ -244,8 +244,7 @@ public class PatchTable extends Composite { Key thisKey = patch.getKey(); PatchLink link; - if (patchType == PatchScreen.Type.SIDE_BY_SIDE - && patch.getPatchType() == Patch.PatchType.UNIFIED) { + if (patchType == PatchScreen.Type.SIDE_BY_SIDE) { link = new PatchLink.SideBySide("", base, thisKey, index, detail, this); } else { link = new PatchLink.Unified("", base, thisKey, index, detail, this);